diff -Nru lensfun-0.2.8/debian/changelog lensfun-0.2.8/debian/changelog
--- lensfun-0.2.8/debian/changelog	2016-12-07 18:26:32.000000000 +0000
+++ lensfun-0.2.8/debian/changelog	2017-12-04 18:29:58.000000000 +0000
@@ -1,13 +1,20 @@
+lensfun (0.2.8-3pmjdebruijn3~xenial) xenial; urgency=low
+
+  * debian/patches/lens_db_20171104.diff:
+    - Update lens database
+
+ -- Pascal de Bruijn <pmjdebruijn@pcode.nl>  Mon, 04 Dec 2017 19:29:39 +0100
+
 lensfun (0.2.8-3pmjdebruijn2~xenial) xenial; urgency=low
 
-  * debian/patches/update_db_20161122.diff:
+  * debian/patches/lens_db_20161122.diff:
     - Update lens database
 
  -- Pascal de Bruijn <pmjdebruijn@pcode.nl>  Wed, 07 Dec 2016 19:23:26 +0100
 
 lensfun (0.2.8-3pmjdebruijn1~xenial) xenial; urgency=low
 
-  * debian/patches/update_db_20160425.diff:
+  * debian/patches/lens_db_20160425.diff:
     - Update lens database 
 
  -- Pascal de Bruijn <pmjdebruijn@pcode.nl>  Mon, 25 Apr 2016 19:05:37 +0200
diff -Nru lensfun-0.2.8/debian/patches/lens_db_20171104.diff lensfun-0.2.8/debian/patches/lens_db_20171104.diff
--- lensfun-0.2.8/debian/patches/lens_db_20171104.diff	1970-01-01 00:00:00.000000000 +0000
+++ lensfun-0.2.8/debian/patches/lens_db_20171104.diff	2017-12-04 18:28:09.000000000 +0000
@@ -0,0 +1,43818 @@
+diff -Nurpd a/data/db/6x6.xml b/data/db/6x6.xml
+--- a/data/db/6x6.xml	2007-12-12 21:49:44.000000000 +0100
++++ b/data/db/6x6.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,90 +1,85 @@
+ <lensdatabase>
+-
+     <mount>
+-        <name>rollei6x6</name>
++        <name>Rollei 6x6</name>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+-        <name>mamiya645</name>
++        <name>Mamiya 645</name>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>Mamiya 645</maker>
+-        <model>All models</model>
+-        <mount>mamiya645</mount>
+-        <cropfactor>.577</cropfactor>
++        <maker>Mamiya</maker>
++        <model>Mamiya 645</model>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.577</cropfactor>
++    </camera>
++    <camera>
++        <maker>Mamiya</maker>
++        <model>Mamiya ZD</model>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.721</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Phase One</maker>
+         <model>P 25</model>
+-        <mount>mamiya645</mount>
+-        <cropfactor>.577</cropfactor>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.577</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Rolleiflex</maker>
+         <model>2.8E</model>
+-        <mount>rollei6x6</mount>
+-        <cropfactor>.5</cropfactor>
++        <mount>Rollei 6x6</mount>
++        <cropfactor>0.510</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Schneider</maker>
+         <model>Schneider 28mm Digitar f/2.8</model>
+-        <mount>mamiya645</mount>
+-        <cropfactor>.577</cropfactor>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.577</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.027509" b="-0.054383" c="0" />
++            <distortion model="ptlens" focal="28" a="0.027509" b="-0.054383" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Mamiya</maker>
+         <model>Mamiya 35mm f/3.5</model>
+-        <mount>mamiya645</mount>
+-        <cropfactor>.577</cropfactor>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.577</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.025471" b="-0.05106" c="0" />
++            <distortion model="ptlens" focal="35" a="0.025471" b="-0.05106" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Mamiya</maker>
+         <model>Mamiya 80mm f/2.8</model>
+-        <mount>mamiya645</mount>
+-        <cropfactor>.577</cropfactor>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.577</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="-0.008173" b="0.015478" c="0" />
++            <distortion model="ptlens" focal="80" a="-0.008173" b="0.015478" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Mamiya</maker>
+         <model>Mamiya 55-110mm f/4.5</model>
+-        <mount>mamiya645</mount>
+-        <cropfactor>.577</cropfactor>
++        <mount>Mamiya 645</mount>
++        <cropfactor>0.577</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="55" a="-0.001633" b="-0.002243" c="0" />
+-            <distortion model="ptlens" focal="65" a="-0.00477" b="0.008348" c="0" />
+-            <distortion model="ptlens" focal="75" a="0" b="0.002136" c="0" />
+-            <distortion model="ptlens" focal="83" a="-0.009877" b="0.021454" c="0" />
+-            <distortion model="ptlens" focal="90" a="-0.007302" b="0.019618" c="0" />
+-            <distortion model="ptlens" focal="100" a="-0.010183" b="0.025981" c="0" />
+-            <distortion model="ptlens" focal="110" a="-0.012796" b="0.029683" c="0" />
++            <distortion model="ptlens" focal="55" a="-0.001633" b="-0.002243" c="0"/>
++            <distortion model="ptlens" focal="65" a="-0.00477" b="0.008348" c="0"/>
++            <distortion model="ptlens" focal="75" a="0" b="0.002136" c="0"/>
++            <distortion model="ptlens" focal="83" a="-0.009877" b="0.021454" c="0"/>
++            <distortion model="ptlens" focal="90" a="-0.007302" b="0.019618" c="0"/>
++            <distortion model="ptlens" focal="100" a="-0.010183" b="0.025981" c="0"/>
++            <distortion model="ptlens" focal="110" a="-0.012796" b="0.029683" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Schneider</maker>
+         <model>Schneider 80mm Xenotar f/2.8</model>
+-        <mount>rollei6x6</mount>
+-        <cropfactor>.5</cropfactor>
++        <mount>Rollei 6x6</mount>
++        <cropfactor>0.510</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="0" b="-0.009721" c="0" />
++            <distortion model="poly3" focal="80" k1="-0.009721"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/actioncams.xml b/data/db/actioncams.xml
+--- a/data/db/actioncams.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/actioncams.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,200 @@
++<lensdatabase>
++    <camera>
++        <maker>GoPro</maker>
++        <model>HD2</model>
++        <mount>goProHero</mount>
++        <cropfactor>6.4</cropfactor>
++    </camera>
++    <camera>
++        <maker>GoPro</maker>
++        <model>Hero3+ black</model>
++        <mount>goProHero3+</mount>
++        <cropfactor>5.42</cropfactor>
++    </camera>
++    <camera>
++        <maker>GoPro</maker>
++        <model>HERO4 Silver</model>
++        <mount>goProHero4</mount>
++        <cropfactor>7.66</cropfactor>
++    </camera>
++    <camera>
++        <maker>GoPro</maker>
++        <model>HERO4 Black</model>
++        <mount>goProHero4black</mount>
++        <cropfactor>5</cropfactor>
++    </camera>
++    <camera>
++        <maker>GoPro</maker>
++        <model>HERO5 Black</model>
++        <mount>goProHero4black</mount>
++        <cropfactor>5</cropfactor>
++    </camera>
++    <camera>
++        <maker>DJI</maker>
++        <model>Phantom Vision FC200</model>
++        <mount>dijPhantomVisionFC200</mount>
++        <cropfactor>6</cropfactor>
++    </camera>
++    <camera>
++        <maker>DJI</maker>
++        <model>Phantom 3 Pro FC300X</model>
++        <mount>dijPhantom3ProFC300X</mount>
++        <cropfactor>5.5</cropfactor>
++    </camera>
++    <camera>
++        <!-- This camera has been rebranded as Hama Action-Cam "Star-60",
++             fantec BeastVision XHD and possibly others. -->
++        <maker>AEE DV</maker>
++        <maker lang="en">AEE</maker>
++        <model>AEE DV</model>
++        <model lang="en">AEE MagiCam SD19 &amp; compatibles</model>
++        <mount>aeeDV</mount>
++        <!-- The crop factor is only estimated from the 1/2.5" specs. -->
++        <cropfactor>6</cropfactor>
++    </camera>
++    <camera>
++        <maker>GitUp</maker>
++        <model>Git2</model>
++        <mount>git2</mount>
++        <cropfactor>5.57</cropfactor>
++    </camera>
++    <camera>
++        <maker>DJI</maker>
++        <model>Mavic Pro FC220</model>
++        <mount>djiMavicProFC220</mount>
++        <cropfactor>5.64</cropfactor>
++    </camera>
++    <camera>
++        <maker>DJI</maker>
++        <model>FC6310</model>
++        <mount>djiFC6310</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <lens>
++        <maker>GoPro</maker>
++        <model>HD2 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>goProHero</mount>
++        <type>fisheye</type>
++        <cropfactor>6.4</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="2.5" a="-0.07664" b="0.21934" c="-0.10671"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>GoPro</maker>
++        <model>GoPro Hero3+ black &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>goProHero3+</mount>
++        <cropfactor>5.42</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="15" a="0.01049" b="0.01663" c="-0.40901"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>GoPro</maker>
++        <model>HERO4</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>goProHero4</mount>
++        <type>equisolid</type>
++        <cropfactor>7.66</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="3" a="0.03183" b="-0.11592" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>DJI</maker>
++        <model>Phantom Vision FC200 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>dijPhantomVisionFC200</mount>
++        <type>equisolid</type>
++        <cropfactor>6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5" a="0.02707" b="-0.10021" c="-0.09787"/>
++            <tca model="poly3" focal="5" vr="1.0002" vb="1.0007"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>AEE</maker>
++        <model>AEE SD19 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>aeeDV</mount>
++        <type>equisolid</type>
++        <!-- The crop factor is only estimated from the 1/2.5" specs. -->
++        <cropfactor>6</cropfactor>
++        <calibration>
++            <!-- Measured with 360° panorama -->
++            <!--distortion model="ptlens" focal="5" a="0.0525" b="-0.1258" c="0.15228" real-focal="2.5" /-->
++            <!-- Measured with a single image, assuming the same FOV as above -->
++            <distortion model="ptlens" focal="5" a="0.05109" b="-0.12092" c="0.10955"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>DJI</maker>
++        <model>Phantom 3 Pro</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>dijPhantom3ProFC300X</mount>
++        <cropfactor>5.5</cropfactor>
++        <calibration>
++            <vignetting model="pa" focal="3.6" aperture="2.8" distance="10" k1="-0.9228" k2="0.5367" k3="-0.2985"/>
++            <vignetting model="pa" focal="3.6" aperture="2.8" distance="1000" k1="-0.9228" k2="0.5367" k3="-0.2985"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>GitUp</maker>
++        <model>Git2 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>git2</mount>
++        <type>equisolid</type>
++        <cropfactor>5.57</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="3" k1="0.01419"/>
++            <tca model="poly3" focal="3" br="-0.0000201" vr="1.0001473" bb="-0.0001084" vb="1.0005537"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>GoPro</maker>
++        <model>HERO4 black</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>goProHero4black</mount>
++        <type>stereographic</type>
++        <cropfactor>5</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="3" k1="-0.03012"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>DJI</maker>
++        <model>Mavic Pro FC220 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>djiMavicProFC220</mount>
++        <cropfactor>5.64</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.7" a="0" b="-0.014" c="0.033"/>
++            <tca model="poly3" focal="4.7" br="-0.0000054" vr="1.0000535" bb="-0.0000279" vb="1.0000246"/>
++            <vignetting model="pa" focal="4.7" aperture="2.2" distance="10" k1="-1.550" k2="1.055" k3="-0.195"/>
++            <vignetting model="pa" focal="4.7" aperture="2.2" distance="1000" k1="-1.550" k2="1.055" k3="-0.195"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>DJI</maker>
++        <model>FC6310 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>djiFC6310</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="8.8" a="0.00961599" b="-0.0582928" c="-0.00551691"/>
++            <tca model="poly3" focal="8.8" vr="1.0000759" vb="1.0000033"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/compact-canon.xml b/data/db/compact-canon.xml
+--- a/data/db/compact-canon.xml	2013-08-31 21:43:54.000000000 +0200
++++ b/data/db/compact-canon.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,170 +1,4 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>canonG3</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG7</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG9</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG10</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG11</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG12</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG1X</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonG15</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonA510</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonPro90</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonIxusI</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonIxusII</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonIxus400</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonS1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonS2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonS5</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonA610</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonA70</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonS70</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonS30</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonPro1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonPro70</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonA80</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonSX1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonS90</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonSD200</name>
+-        <compat>Generic</compat>
+-    </mount>    
+-    
+-    <mount>
+-        <name>canonSD500</name>
+-        <compat>Generic</compat>
+-    </mount>    
+-
+-    <mount>
+-        <name>canonSD950</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonD2000C</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonA650IS</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>canonSX150IS</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot Pro1</model>
+@@ -172,7 +6,6 @@
+         <mount>canonPro1</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot Pro70</model>
+@@ -180,7 +13,6 @@
+         <mount>canonPro70</mount>
+         <cropfactor>5.47</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G6</model>
+@@ -188,7 +20,6 @@
+         <mount>canonG3</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G5</model>
+@@ -196,7 +27,6 @@
+         <mount>canonG3</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G3</model>
+@@ -204,7 +34,6 @@
+         <mount>canonG3</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G2</model>
+@@ -212,7 +41,6 @@
+         <mount>canonG2</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G1</model>
+@@ -220,7 +48,6 @@
+         <mount>canonG1</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G7</model>
+@@ -228,7 +55,48 @@
+         <mount>canonG7</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G7 X</model>
++        <model lang="en">PowerShot G7 X (3:2)</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.72</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G7 X 4:3</model>
++        <model lang="en">PowerShot G7 X (4:3)</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.94</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G7 X 16:9</model>
++        <model lang="en">PowerShot G7 X (16:9)</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.85</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G7 X Mark II</model>
++        <model lang="en">PowerShot G7 X Mark II (3:2)</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.72</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G7 X Mark II 4:3</model>
++        <model lang="en">PowerShot G7 X Mark II (4:3)</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.94</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G7 X Mark II 16:9</model>
++        <model lang="en">PowerShot G7 X Mark II (16:9)</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.85</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G9</model>
+@@ -236,7 +104,13 @@
+         <mount>canonG9</mount>
+         <cropfactor>4.605</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon Powershot G9 X</model>
++        <model lang="en">PowerShot G9 X</model>
++        <mount>canonG9X</mount>
++        <cropfactor>2.72</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G10</model>
+@@ -244,7 +118,6 @@
+         <mount>canonG10</mount>
+         <cropfactor>4.605</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G11</model>
+@@ -252,7 +125,6 @@
+         <mount>canonG11</mount>
+         <cropfactor>4.554</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G12</model>
+@@ -260,15 +132,20 @@
+         <mount>canonG12</mount>
+         <cropfactor>4.63</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+-        <model>Canon PowerShot G1X</model>
+-        <model lang="en">PowerShot G1X</model>
++        <model>Canon PowerShot G1 X</model>
++        <model lang="en">PowerShot G1 X</model>
+         <mount>canonG1X</mount>
+         <cropfactor>1.85</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G1 X Mark II</model>
++        <model lang="en">PowerShot G1 X Mark II</model>
++        <mount>canonG1X2</mount>
++        <cropfactor>1.93</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot G15</model>
+@@ -276,7 +153,13 @@
+         <mount>canonG15</mount>
+         <cropfactor>4.65</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G16</model>
++        <model lang="en">PowerShot G16</model>
++        <mount>canonG16</mount>
++        <cropfactor>4.67</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD550</model>
+@@ -284,15 +167,13 @@
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-        
+-     <camera>
++    <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD950 IS</model>
+         <model lang="en">PowerShot SD950 IS</model>
+         <mount>canonSD950</mount>
+         <cropfactor>4.7</cropfactor>
+-    </camera>    
+-
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 750</model>
+@@ -300,14 +181,12 @@
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>IXY Digital 700</model>
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD500</model>
+@@ -315,7 +194,6 @@
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 700</model>
+@@ -323,14 +201,12 @@
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>IXY Digital 600</model>
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD450</model>
+@@ -338,7 +214,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 55</model>
+@@ -346,7 +221,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD400</model>
+@@ -354,7 +228,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 55</model>
+@@ -362,7 +235,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 50</model>
+@@ -370,7 +242,13 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon DIGITAL IXUS 70</model>
++        <model lang="en">IXUS 70</model>
++        <mount>canonSD200</mount>
++        <cropfactor>6.05</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD300</model>
+@@ -378,7 +256,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 50</model>
+@@ -386,7 +263,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 40</model>
+@@ -394,7 +270,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD200</model>
+@@ -402,7 +277,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 40</model>
+@@ -410,7 +284,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 30</model>
+@@ -418,7 +291,6 @@
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S200</model>
+@@ -426,7 +298,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS v2</model>
+@@ -434,7 +305,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 200a</model>
+@@ -442,7 +312,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD110</model>
+@@ -450,7 +319,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS II</model>
+@@ -458,7 +326,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 30</model>
+@@ -466,7 +333,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD100</model>
+@@ -474,7 +340,6 @@
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS i</model>
+@@ -482,7 +347,6 @@
+         <mount>canonIxusI</mount>
+         <cropfactor>6.144</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SD10</model>
+@@ -490,7 +354,6 @@
+         <mount>canonIxusI</mount>
+         <cropfactor>6.144</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S500</model>
+@@ -498,7 +361,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 500</model>
+@@ -506,7 +368,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 500</model>
+@@ -514,7 +375,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S410</model>
+@@ -522,7 +382,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 430</model>
+@@ -530,7 +389,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 450</model>
+@@ -538,7 +396,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S400</model>
+@@ -546,7 +403,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 400</model>
+@@ -554,7 +410,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon IXY DIGITAL 400</model>
+@@ -562,7 +417,6 @@
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S80</model>
+@@ -570,7 +424,6 @@
+         <mount>canonS70</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S70</model>
+@@ -578,7 +431,6 @@
+         <mount>canonS70</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S60</model>
+@@ -586,7 +438,6 @@
+         <mount>canonS70</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S50</model>
+@@ -594,7 +445,6 @@
+         <mount>canonS30</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S45</model>
+@@ -602,7 +452,6 @@
+         <mount>canonS30</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S40</model>
+@@ -610,7 +459,6 @@
+         <mount>canonS30</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S30</model>
+@@ -618,23 +466,20 @@
+         <mount>canonS30</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+-        <model>Canon PowerShot A620</model>
+-        <model lang="en">PowerShot A620</model>
++        <model>Canon PowerShot A610</model>
++        <model lang="en">PowerShot A610</model>
+         <mount>canonA610</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+-        <model>Canon PowerShot A610</model>
+-        <model lang="en">PowerShot A610</model>
++        <model>Canon PowerShot A620</model>
++        <model lang="en">PowerShot A620</model>
+         <mount>canonA610</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A520</model>
+@@ -642,7 +487,6 @@
+         <mount>canonA510</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A510</model>
+@@ -650,7 +494,6 @@
+         <mount>canonA510</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A95</model>
+@@ -658,7 +501,6 @@
+         <mount>canonA80</mount>
+         <cropfactor>4.85</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A80</model>
+@@ -666,7 +508,6 @@
+         <mount>canonA80</mount>
+         <cropfactor>4.85</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A85</model>
+@@ -674,7 +515,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A75</model>
+@@ -682,7 +522,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A70</model>
+@@ -690,7 +529,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A60</model>
+@@ -698,7 +536,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A40</model>
+@@ -706,7 +543,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A30</model>
+@@ -714,7 +550,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A20</model>
+@@ -722,7 +557,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A10</model>
+@@ -730,7 +564,6 @@
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S2 IS</model>
+@@ -738,7 +571,6 @@
+         <mount>canonS2</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S1 IS</model>
+@@ -746,7 +578,6 @@
+         <mount>canonS1</mount>
+         <cropfactor>6.56</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S5 IS</model>
+@@ -754,7 +585,6 @@
+         <mount>canonS5</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot Pro90 IS</model>
+@@ -762,39 +592,27 @@
+         <mount>canonPro90</mount>
+         <cropfactor>5.28</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon DIGITAL IXUS 80 IS</model>
+-        <model lang="en">Canon DIGITAL IXUS 80 IS</model>
++        <model lang="en">IXUS 80 IS</model>
+         <mount>canonIxus80IS</mount>
+-        <cropfactor>6.1</cropfactor>
++        <cropfactor>6.02</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SX1 IS</model>
+-        <model lang="en">Canon PowerShot SX1 IS</model>
++        <model lang="en">PowerShot SX1 IS</model>
+         <mount>canonSX1</mount>
+         <cropfactor>5.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot S90</model>
+-        <model lang="en">Canon PowerShot S90</model>
++        <model lang="en">PowerShot S90</model>
+         <mount>canonS90</mount>
+-        <cropfactor>4.6</cropfactor>
+-    </camera>
+-
+-    <camera>
+-        <maker>Canon</maker>
+-        <model>EOS D2000C</model>
+-        <model lang="en">Canon EOS D2000C</model>
+-        <mount>canonD2000C</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>4.67</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot A650 IS</model>
+@@ -802,7 +620,6 @@
+         <mount>canonA650IS</mount>
+         <cropfactor>4.67712</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon PowerShot SX150 IS</model>
+@@ -810,610 +627,2179 @@
+         <mount>canonSX150IS</mount>
+         <cropfactor>5.62</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX10 IS</model>
++        <model lang="en">PowerShot SX10 IS</model>
++        <mount>canonSX10IS</mount>
++        <cropfactor>5.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX130 IS</model>
++        <model lang="en">PowerShot SX130 IS</model>
++        <mount>canonSX150IS</mount>
++        <cropfactor>5.62</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX220 HS</model>
++        <model lang="en">PowerShot SX220 HS</model>
++        <mount>canonSX220HS</mount>
++        <cropfactor>5.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX230 HS</model>
++        <model lang="en">PowerShot SX230 HS</model>
++        <mount>canonSX230HS</mount>
++        <cropfactor>5.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A720 IS</model>
++        <model lang="en">PowerShot A720 IS</model>
++        <mount>canonA720IS</mount>
++        <cropfactor>6.03</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S120</model>
++        <model lang="en">PowerShot S120</model>
++        <mount>canonS120</mount>
++        <cropfactor>4.62</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A640</model>
++        <model lang="en">PowerShot A640</model>
++        <mount>canonA640</mount>
++        <cropfactor>4.79</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX260 HS</model>
++        <model lang="en">PowerShot SX260 HS</model>
++        <mount>canonSX260HS</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon IXUS 220 HS</model>
++        <model lang="en">IXUS 220 HS</model>
++        <mount>canonIxus220HS</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S95</model>
++        <model lang="en">PowerShot S95</model>
++        <mount>canonS95</mount>
++        <cropfactor>4.67</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S100</model>
++        <model lang="en">PowerShot S100</model>
++        <mount>canonS100</mount>
++        <cropfactor>4.62</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A4000 IS</model>
++        <model lang="en">PowerShot A4000 IS</model>
++        <mount>canonA4000IS</mount>
++        <cropfactor>5.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot ELPH 110 HS</model>
++        <model lang="en">Powershot ELPH 110 HS</model>
++        <mount>canonIxus125HS</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon IXUS 125 HS</model>
++        <model lang="en">IXUS 125 HS</model>
++        <mount>canonIxus125HS</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX510 HS</model>
++        <model lang="en">PowerShot SX510 HS</model>
++        <mount>canonSX510HS</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S110</model>
++        <model lang="en">PowerShot S110</model>
++        <mount>canonS110</mount>
++        <cropfactor>4.62</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SD1100 IS</model>
++        <model lang="en">PowerShot SD1100 IS</model>
++        <mount>canonIxus80IS</mount>
++        <cropfactor>6.02</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX160 IS</model>
++        <model lang="en">PowerShot SX160 IS</model>
++        <mount>canonSX160IS</mount>
++        <cropfactor>5.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A495</model>
++        <model lang="en">PowerShot A495</model>
++        <mount>canonA495</mount>
++        <cropfactor>5.39</cropfactor>
++    </camera>
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot Pro1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonPro1</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.188" a="0.01839" b="-0.04535" c="0" />
+-            <distortion model="ptlens" focal="8.875" a="0.016286" b="-0.032262" c="0" />
+-            <distortion model="ptlens" focal="10.125" a="0.005988" b="-0.010532" c="0" />
+-            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="50.813" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="7.188" a="0.01839" b="-0.04535" c="0"/>
++            <distortion model="ptlens" focal="8.875" a="0.016286" b="-0.032262" c="0"/>
++            <distortion model="ptlens" focal="10.125" a="0.005988" b="-0.010532" c="0"/>
++            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="50.813" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G3 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG3</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.188" a="0.013088" b="-0.036387" c="0" />
+-            <distortion model="ptlens" focal="8" a="0.013092" b="-0.031149" c="0" />
+-            <distortion model="ptlens" focal="9.094" a="0.009637" b="-0.019881" c="0" />
+-            <distortion model="ptlens" focal="10.188" a="0.00983" b="-0.017385" c="0" />
+-            <distortion model="ptlens" focal="11.188" a="0.005089" b="-0.006514" c="0" />
+-            <distortion model="ptlens" focal="14.406" a="0.001788" b="0.00205" c="0" />
+-            <distortion model="ptlens" focal="17.594" a="0.001189" b="0.002614" c="0" />
+-            <distortion model="ptlens" focal="20.688" a="0.000468" b="0.003817" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.000298" b="0.00272" c="0" />
+-            <distortion model="ptlens" focal="25.094" a="0.00274" b="-0.002048" c="0" />
+-            <distortion model="ptlens" focal="28.813" a="-8.6e-05" b="0.005193" c="0" />
++            <distortion model="ptlens" focal="7.188" a="0.013088" b="-0.036387" c="0"/>
++            <distortion model="ptlens" focal="8" a="0.013092" b="-0.031149" c="0"/>
++            <distortion model="ptlens" focal="9.094" a="0.009637" b="-0.019881" c="0"/>
++            <distortion model="ptlens" focal="10.188" a="0.00983" b="-0.017385" c="0"/>
++            <distortion model="ptlens" focal="11.188" a="0.005089" b="-0.006514" c="0"/>
++            <distortion model="ptlens" focal="14.406" a="0.001788" b="0.00205" c="0"/>
++            <distortion model="ptlens" focal="17.594" a="0.001189" b="0.002614" c="0"/>
++            <distortion model="ptlens" focal="20.688" a="0.000468" b="0.003817" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.000298" b="0.00272" c="0"/>
++            <distortion model="ptlens" focal="25.094" a="0.00274" b="-0.002048" c="0"/>
++            <distortion model="ptlens" focal="28.813" a="-8.6e-05" b="0.005193" c="0"/>
++            <vignetting model="pa" focal="7.2" aperture="2.1" distance="10" k1="-0.6006" k2="0.6441" k3="-0.4877"/>
++            <vignetting model="pa" focal="7.2" aperture="2.1" distance="1000" k1="-0.6006" k2="0.6441" k3="-0.4877"/>
++            <vignetting model="pa" focal="7.2" aperture="2.8" distance="10" k1="-0.1840" k2="0.0559" k3="-0.0745"/>
++            <vignetting model="pa" focal="7.2" aperture="2.8" distance="1000" k1="-0.1840" k2="0.0559" k3="-0.0745"/>
++            <vignetting model="pa" focal="7.2" aperture="4" distance="10" k1="-0.1569" k2="-0.0417" k3="0.0214"/>
++            <vignetting model="pa" focal="7.2" aperture="4" distance="1000" k1="-0.1569" k2="-0.0417" k3="0.0214"/>
++            <vignetting model="pa" focal="7.2" aperture="5.6" distance="10" k1="-0.1526" k2="-0.0567" k3="0.0318"/>
++            <vignetting model="pa" focal="7.2" aperture="5.6" distance="1000" k1="-0.1526" k2="-0.0567" k3="0.0318"/>
++            <vignetting model="pa" focal="7.2" aperture="8" distance="10" k1="-0.1457" k2="-0.0669" k3="0.0358"/>
++            <vignetting model="pa" focal="7.2" aperture="8" distance="1000" k1="-0.1457" k2="-0.0669" k3="0.0358"/>
++            <vignetting model="pa" focal="9.1" aperture="2.2" distance="10" k1="-0.5785" k2="0.6503" k3="-0.4309"/>
++            <vignetting model="pa" focal="9.1" aperture="2.2" distance="1000" k1="-0.5785" k2="0.6503" k3="-0.4309"/>
++            <vignetting model="pa" focal="9.1" aperture="2.8" distance="10" k1="-0.1286" k2="0.0111" k3="-0.0407"/>
++            <vignetting model="pa" focal="9.1" aperture="2.8" distance="1000" k1="-0.1286" k2="0.0111" k3="-0.0407"/>
++            <vignetting model="pa" focal="9.1" aperture="4" distance="10" k1="-0.1170" k2="-0.0419" k3="0.0236"/>
++            <vignetting model="pa" focal="9.1" aperture="4" distance="1000" k1="-0.1170" k2="-0.0419" k3="0.0236"/>
++            <vignetting model="pa" focal="9.1" aperture="5.6" distance="10" k1="-0.1157" k2="-0.0395" k3="0.0212"/>
++            <vignetting model="pa" focal="9.1" aperture="5.6" distance="1000" k1="-0.1157" k2="-0.0395" k3="0.0212"/>
++            <vignetting model="pa" focal="9.1" aperture="8" distance="10" k1="-0.1135" k2="-0.0441" k3="0.0223"/>
++            <vignetting model="pa" focal="9.1" aperture="8" distance="1000" k1="-0.1135" k2="-0.0441" k3="0.0223"/>
++            <vignetting model="pa" focal="11.2" aperture="2.2" distance="10" k1="-0.5068" k2="0.5177" k3="-0.3084"/>
++            <vignetting model="pa" focal="11.2" aperture="2.2" distance="1000" k1="-0.5068" k2="0.5177" k3="-0.3084"/>
++            <vignetting model="pa" focal="11.2" aperture="2.8" distance="10" k1="-0.0759" k2="-0.0812" k3="0.0158"/>
++            <vignetting model="pa" focal="11.2" aperture="2.8" distance="1000" k1="-0.0759" k2="-0.0812" k3="0.0158"/>
++            <vignetting model="pa" focal="11.2" aperture="4" distance="10" k1="-0.0903" k2="-0.0420" k3="0.0301"/>
++            <vignetting model="pa" focal="11.2" aperture="4" distance="1000" k1="-0.0903" k2="-0.0420" k3="0.0301"/>
++            <vignetting model="pa" focal="11.2" aperture="5.6" distance="10" k1="-0.0905" k2="-0.0384" k3="0.0262"/>
++            <vignetting model="pa" focal="11.2" aperture="5.6" distance="1000" k1="-0.0905" k2="-0.0384" k3="0.0262"/>
++            <vignetting model="pa" focal="11.2" aperture="8" distance="10" k1="-0.0905" k2="-0.0322" k3="0.0179"/>
++            <vignetting model="pa" focal="11.2" aperture="8" distance="1000" k1="-0.0905" k2="-0.0322" k3="0.0179"/>
++            <vignetting model="pa" focal="14.4" aperture="2.5" distance="10" k1="-0.5166" k2="0.5726" k3="-0.2825"/>
++            <vignetting model="pa" focal="14.4" aperture="2.5" distance="1000" k1="-0.5166" k2="0.5726" k3="-0.2825"/>
++            <vignetting model="pa" focal="14.4" aperture="2.8" distance="10" k1="-0.0425" k2="-0.2407" k3="0.1378"/>
++            <vignetting model="pa" focal="14.4" aperture="2.8" distance="1000" k1="-0.0425" k2="-0.2407" k3="0.1378"/>
++            <vignetting model="pa" focal="14.4" aperture="4" distance="10" k1="-0.0721" k2="-0.0052" k3="0.0048"/>
++            <vignetting model="pa" focal="14.4" aperture="4" distance="1000" k1="-0.0721" k2="-0.0052" k3="0.0048"/>
++            <vignetting model="pa" focal="14.4" aperture="5.6" distance="10" k1="-0.0631" k2="-0.0252" k3="0.0152"/>
++            <vignetting model="pa" focal="14.4" aperture="5.6" distance="1000" k1="-0.0631" k2="-0.0252" k3="0.0152"/>
++            <vignetting model="pa" focal="14.4" aperture="8" distance="10" k1="-0.0618" k2="-0.0225" k3="0.0123"/>
++            <vignetting model="pa" focal="14.4" aperture="8" distance="1000" k1="-0.0618" k2="-0.0225" k3="0.0123"/>
++            <vignetting model="pa" focal="17.6" aperture="2.6" distance="10" k1="-0.3533" k2="0.3135" k3="-0.1397"/>
++            <vignetting model="pa" focal="17.6" aperture="2.6" distance="1000" k1="-0.3533" k2="0.3135" k3="-0.1397"/>
++            <vignetting model="pa" focal="17.6" aperture="2.8" distance="10" k1="-0.3623" k2="0.3079" k3="-0.1290"/>
++            <vignetting model="pa" focal="17.6" aperture="2.8" distance="1000" k1="-0.3623" k2="0.3079" k3="-0.1290"/>
++            <vignetting model="pa" focal="17.6" aperture="4" distance="10" k1="-0.0517" k2="0.0046" k3="-0.0067"/>
++            <vignetting model="pa" focal="17.6" aperture="4" distance="1000" k1="-0.0517" k2="0.0046" k3="-0.0067"/>
++            <vignetting model="pa" focal="17.6" aperture="5.6" distance="10" k1="-0.0418" k2="-0.0111" k3="0.0010"/>
++            <vignetting model="pa" focal="17.6" aperture="5.6" distance="1000" k1="-0.0418" k2="-0.0111" k3="0.0010"/>
++            <vignetting model="pa" focal="17.6" aperture="8" distance="10" k1="-0.0374" k2="-0.0232" k3="0.0116"/>
++            <vignetting model="pa" focal="17.6" aperture="8" distance="1000" k1="-0.0374" k2="-0.0232" k3="0.0116"/>
++            <vignetting model="pa" focal="23" aperture="2.9" distance="10" k1="-0.2349" k2="0.1656" k3="-0.0639"/>
++            <vignetting model="pa" focal="23" aperture="2.9" distance="1000" k1="-0.2349" k2="0.1656" k3="-0.0639"/>
++            <vignetting model="pa" focal="23" aperture="4" distance="10" k1="-0.0204" k2="-0.0113" k3="-0.0092"/>
++            <vignetting model="pa" focal="23" aperture="4" distance="1000" k1="-0.0204" k2="-0.0113" k3="-0.0092"/>
++            <vignetting model="pa" focal="23" aperture="5.6" distance="10" k1="-0.0120" k2="-0.0280" k3="0.0031"/>
++            <vignetting model="pa" focal="23" aperture="5.6" distance="1000" k1="-0.0120" k2="-0.0280" k3="0.0031"/>
++            <vignetting model="pa" focal="23" aperture="8" distance="10" k1="-0.0106" k2="-0.0314" k3="0.0089"/>
++            <vignetting model="pa" focal="23" aperture="8" distance="1000" k1="-0.0106" k2="-0.0314" k3="0.0089"/>
++            <vignetting model="pa" focal="25.1" aperture="3" distance="10" k1="-0.2287" k2="0.2431" k3="-0.1595"/>
++            <vignetting model="pa" focal="25.1" aperture="3" distance="1000" k1="-0.2287" k2="0.2431" k3="-0.1595"/>
++            <vignetting model="pa" focal="25.1" aperture="4" distance="10" k1="-0.0579" k2="0.1425" k3="-0.1538"/>
++            <vignetting model="pa" focal="25.1" aperture="4" distance="1000" k1="-0.0579" k2="0.1425" k3="-0.1538"/>
++            <vignetting model="pa" focal="25.1" aperture="5.6" distance="10" k1="-0.0061" k2="-0.0323" k3="0.0025"/>
++            <vignetting model="pa" focal="25.1" aperture="5.6" distance="1000" k1="-0.0061" k2="-0.0323" k3="0.0025"/>
++            <vignetting model="pa" focal="25.1" aperture="8" distance="10" k1="-0.0117" k2="-0.0144" k3="-0.0067"/>
++            <vignetting model="pa" focal="25.1" aperture="8" distance="1000" k1="-0.0117" k2="-0.0144" k3="-0.0067"/>
++            <vignetting model="pa" focal="28.8" aperture="3.2" distance="10" k1="-0.2551" k2="0.3908" k3="-0.3442"/>
++            <vignetting model="pa" focal="28.8" aperture="3.2" distance="1000" k1="-0.2551" k2="0.3908" k3="-0.3442"/>
++            <vignetting model="pa" focal="28.8" aperture="4" distance="10" k1="-0.1426" k2="0.4409" k3="-0.4791"/>
++            <vignetting model="pa" focal="28.8" aperture="4" distance="1000" k1="-0.1426" k2="0.4409" k3="-0.4791"/>
++            <vignetting model="pa" focal="28.8" aperture="5.6" distance="10" k1="-0.0624" k2="0.1261" k3="-0.1605"/>
++            <vignetting model="pa" focal="28.8" aperture="5.6" distance="1000" k1="-0.0624" k2="0.1261" k3="-0.1605"/>
++            <vignetting model="pa" focal="28.8" aperture="8" distance="10" k1="-0.0048" k2="-0.0636" k3="0.0103"/>
++            <vignetting model="pa" focal="28.8" aperture="8" distance="1000" k1="-0.0048" k2="-0.0636" k3="0.0103"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>WC-DC58N</model>
++        <model>Canon PowerShot G3 &amp; compatibles, with WC-DC58N</model>
++        <model lang="en">fixed lens, with WC-DC58N</model>
++        <model lang="de">festes Objektiv, mit WC-DC58N</model>
+         <mount>canonG3</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.19" a="0.016762" b="-0.065439" c="0" />
+-            <distortion model="ptlens" focal="8" a="0.015048" b="-0.055117" c="0" />
+-            <distortion model="ptlens" focal="9.09" a="0.013772" b="-0.045475" c="0" />
+-            <distortion model="ptlens" focal="10.2" a="0.008903" b="-0.030862" c="0" />
++            <distortion model="ptlens" focal="7.19" a="0.016762" b="-0.065439" c="0"/>
++            <distortion model="ptlens" focal="8" a="0.015048" b="-0.055117" c="0"/>
++            <distortion model="ptlens" focal="9.09" a="0.013772" b="-0.045475" c="0"/>
++            <distortion model="ptlens" focal="10.2" a="0.008903" b="-0.030862" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G2 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG2</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.01966" b="-0.051543" c="0" />
+-            <distortion model="ptlens" focal="7.5" a="0.01713" b="-0.044177" c="0" />
+-            <distortion model="ptlens" focal="8.313" a="0.013359" b="-0.032611" c="0" />
+-            <distortion model="ptlens" focal="9.313" a="0.00832" b="-0.020187" c="0" />
+-            <distortion model="ptlens" focal="10.688" a="0.006918" b="-0.015168" c="0" />
+-            <distortion model="ptlens" focal="12.5" a="0.002267" b="-0.005193" c="0" />
+-            <distortion model="ptlens" focal="14.594" a="0.003567" b="-0.007044" c="0" />
+-            <distortion model="ptlens" focal="16.813" a="0.000696" b="-0.001567" c="0" />
+-            <distortion model="ptlens" focal="18.813" a="0.000325" b="-0.000456" c="0" />
+-            <distortion model="ptlens" focal="20.313" a="0.0023" b="-0.003959" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.001324" b="-0.0012" c="0" />
++            <distortion model="ptlens" focal="7" a="0.01966" b="-0.051543" c="0"/>
++            <distortion model="ptlens" focal="7.5" a="0.01713" b="-0.044177" c="0"/>
++            <distortion model="ptlens" focal="8.313" a="0.013359" b="-0.032611" c="0"/>
++            <distortion model="ptlens" focal="9.313" a="0.00832" b="-0.020187" c="0"/>
++            <distortion model="ptlens" focal="10.688" a="0.006918" b="-0.015168" c="0"/>
++            <distortion model="ptlens" focal="12.5" a="0.002267" b="-0.005193" c="0"/>
++            <distortion model="ptlens" focal="14.594" a="0.003567" b="-0.007044" c="0"/>
++            <distortion model="ptlens" focal="16.813" a="0.000696" b="-0.001567" c="0"/>
++            <distortion model="ptlens" focal="18.813" a="0.000325" b="-0.000456" c="0"/>
++            <distortion model="ptlens" focal="20.313" a="0.0023" b="-0.003959" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.001324" b="-0.0012" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Geobartic 0.5x Converter</model>
++        <model>Canon PowerShot G2 &amp; compatibles, with Geobartic 0.5x converter</model>
++        <model lang="en">fixed lens, with Geobartic 0.5x converter</model>
++        <model lang="de">festes Objektiv, mit Geobartic 0.5x-Konverter</model>
+         <mount>canonG2</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0" b="-0.030599" c="-0.037374" />
+-            <distortion model="ptlens" focal="7.5" a="0" b="-0.023359" c="-0.040861" />
+-            <distortion model="ptlens" focal="8.313" a="0" b="-0.016976" c="-0.035516" />
+-            <distortion model="ptlens" focal="10.688" a="0" b="-0.009919" c="-0.016346" />
+-            <distortion model="ptlens" focal="12.5" a="0" b="-0.002436" c="-0.026822" />
++            <distortion model="ptlens" focal="7" a="0" b="-0.030599" c="-0.037374"/>
++            <distortion model="ptlens" focal="7.5" a="0" b="-0.023359" c="-0.040861"/>
++            <distortion model="ptlens" focal="8.313" a="0" b="-0.016976" c="-0.035516"/>
++            <distortion model="ptlens" focal="10.688" a="0" b="-0.009919" c="-0.016346"/>
++            <distortion model="ptlens" focal="12.5" a="0" b="-0.002436" c="-0.026822"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG1</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.013759" b="-0.037638" c="0" />
+-            <distortion model="ptlens" focal="9.344" a="0.006407" b="-0.013665" c="0" />
+-            <distortion model="ptlens" focal="10.75" a="0" b="0.004427" c="-0.008376" />
+-            <distortion model="ptlens" focal="12.5" a="0" b="0.001899" c="0" />
+-            <distortion model="ptlens" focal="18.781" a="0" b="0.003174" c="0" />
+-            <distortion model="ptlens" focal="21" a="0" b="0.003938" c="0" />
++            <distortion model="ptlens" focal="7" a="0.013759" b="-0.037638" c="0"/>
++            <distortion model="ptlens" focal="9.344" a="0.006407" b="-0.013665" c="0"/>
++            <distortion model="ptlens" focal="10.75" a="0" b="0.004427" c="-0.008376"/>
++            <distortion model="ptlens" focal="12.5" a="0" b="0.001899" c="0"/>
++            <distortion model="ptlens" focal="18.781" a="0" b="0.003174" c="0"/>
++            <distortion model="ptlens" focal="21" a="0" b="0.003938" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G12 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG12</mount>
+         <cropfactor>4.63</cropfactor>
+         <calibration>
+-            <distortion model="poly5" focal="6.1" k1="-0.030571633" k2="0.004658548" />
+-            <distortion model="poly5" focal="8.108" k1="-0.015375784" k2="0.001669650" />
+-            <distortion model="poly5" focal="12.074" k1="-0.010041248" k2="-0.001118356" />
+-            <distortion model="poly5" focal="18.098" k1="-0.002054377" k2="0.000011075" />
+-            <distortion model="poly5" focal="30.5" k1="-0.000323237" k2="-0.000346917" />
+-            <tca model="poly3" focal="6.1" br="-0.0002616" vr="1.0007448" bb="-0.0000455" vb="1.0003314" />
+-            <tca model="poly3" focal="10.8" br="-0.0000003" vr="1.0004612" bb="0.0000253" vb="1.0001464" />
+-            <tca model="poly3" focal="30.5" br="0.0000326" vr="0.9996400" bb="-0.0003242" vb="1.0008367" />
++            <distortion model="poly5" focal="6.1" k1="-0.030571633" k2="0.004658548"/>
++            <distortion model="poly5" focal="8.108" k1="-0.015375784" k2="0.001669650"/>
++            <distortion model="poly5" focal="12.074" k1="-0.010041248" k2="-0.001118356"/>
++            <distortion model="poly5" focal="18.098" k1="-0.002054377" k2="0.000011075"/>
++            <distortion model="poly5" focal="30.5" k1="-0.000323237" k2="-0.000346917"/>
++            <tca model="poly3" focal="6.1" br="-0.0002616" vr="1.0007448" bb="-0.0000455" vb="1.0003314"/>
++            <tca model="poly3" focal="10.8" br="-0.0000003" vr="1.0004612" bb="0.0000253" vb="1.0001464"/>
++            <tca model="poly3" focal="30.5" br="0.0000326" vr="0.9996400" bb="-0.0003242" vb="1.0008367"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G1X &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG1X</mount>
+         <cropfactor>1.85</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="15.1" a="0.02381" b="-0.08242" c="-0.01669" />
+-            <distortion model="ptlens" focal="17.0" a="0.00081" b="-0.02913" c="-0.03657" />
+-            <distortion model="ptlens" focal="19.56" a="0.01803" b="-0.06927" c="0.014" />
+-            <distortion model="ptlens" focal="21.3" a="-0.001127" b="-0.001957" c="-0.005056" />
+-            <distortion model="ptlens" focal="22.45" a="0.04317" b="-0.09935" c="0.03411" />
+-            <distortion model="ptlens" focal="29.3" a="-0.01981" b="0.03978" c="-0.03657" />
+-            <distortion model="ptlens" focal="31.92" a="-0.04093" b="0.10365" c="-0.08171" />
+-            <distortion model="ptlens" focal="41.88" a="-0.01251" b="0.02732" c="-0.02112" />
+-            <distortion model="ptlens" focal="51.33" a="-0.00187" b="-0.00664" c="0.01155" />
+-            <distortion model="ptlens" focal="60.4" a="-0.00854" b="0.01168" c="-0.00657" />
+-            <tca model="poly3" focal="15.1" br="-0.0001342" vr="1.0000807" bb="-0.0002196" vb="1.0003494" />
+-            <tca model="poly3" focal="18.6" br="-0.0001530" vr="1.0002444" bb="0.0002246" vb="1.0000649" />
+-            <tca model="poly3" focal="27.8" br="-0.0001638" vr="1.0003579" bb="-0.0000102" vb="1.0000196" />
+-            <tca model="poly3" focal="39.1" br="-0.0001589" vr="1.0002615" bb="-0.0001130" vb="1.0000930" />
+-            <tca model="poly3" focal="51.8" br="-0.0000189" vr="1.0000769" bb="-0.0002135" vb="1.0000094" />
+-            <tca model="poly3" focal="60.4" br="0.0000465" vr="0.9998852" bb="-0.0002431" vb="0.9999720" />
++            <distortion model="ptlens" focal="15.1" a="0.02381" b="-0.08242" c="-0.01669"/>
++            <distortion model="ptlens" focal="17.0" a="0.00081" b="-0.02913" c="-0.03657"/>
++            <distortion model="ptlens" focal="19.56" a="0.01803" b="-0.06927" c="0.014"/>
++            <distortion model="ptlens" focal="21.3" a="-0.001127" b="-0.001957" c="-0.005056"/>
++            <distortion model="ptlens" focal="22.45" a="0.04317" b="-0.09935" c="0.03411"/>
++            <distortion model="ptlens" focal="29.3" a="-0.01981" b="0.03978" c="-0.03657"/>
++            <distortion model="ptlens" focal="31.92" a="-0.04093" b="0.10365" c="-0.08171"/>
++            <distortion model="ptlens" focal="41.88" a="-0.01251" b="0.02732" c="-0.02112"/>
++            <distortion model="ptlens" focal="51.33" a="-0.00187" b="-0.00664" c="0.01155"/>
++            <distortion model="ptlens" focal="60.4" a="-0.00854" b="0.01168" c="-0.00657"/>
++            <tca model="poly3" focal="15.1" br="-0.0001342" vr="1.0000807" bb="-0.0002196" vb="1.0003494"/>
++            <tca model="poly3" focal="18.6" br="-0.0001530" vr="1.0002444" bb="0.0002246" vb="1.0000649"/>
++            <tca model="poly3" focal="27.8" br="-0.0001638" vr="1.0003579" bb="-0.0000102" vb="1.0000196"/>
++            <tca model="poly3" focal="39.1" br="-0.0001589" vr="1.0002615" bb="-0.0001130" vb="1.0000930"/>
++            <tca model="poly3" focal="51.8" br="-0.0000189" vr="1.0000769" bb="-0.0002135" vb="1.0000094"/>
++            <tca model="poly3" focal="60.4" br="0.0000465" vr="0.9998852" bb="-0.0002431" vb="0.9999720"/>
+         </calibration>
+     </lens>
+-
+-   <lens>
++    <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G15 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG15</mount>
+         <cropfactor>4.65</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.1" a="0.022578" b="-0.081031" c="0.011077" />
+-            <distortion model="ptlens" focal="6.8" a="0.016019" b="-0.060546" c="0.008729" />
+-            <distortion model="ptlens" focal="6.9" a="0.011908" b="-0.051294" c="0.003986" />
+-            <distortion model="ptlens" focal="8.0" a="0.006519" b="-0.032045" c="0.003748" />
+-            <distortion model="ptlens" focal="8.2" a="0.005826" b="-0.027978" c="0.001562" />
+-            <distortion model="ptlens" focal="9.4" a="0.002976" b="-0.015660" c="0.000956" />
+-            <distortion model="ptlens" focal="10.0" a="0.004576" b="-0.018882" c="0.006355" />
+-            <distortion model="ptlens" focal="12.1" a="0.003211" b="-0.009651" c="0.004608" />
+-            <distortion model="ptlens" focal="12.3" a="0.000000" b="-0.002265" c="0.000000" />
+-            <distortion model="ptlens" focal="15.0" a="0.000553" b="-0.002150" c="0.002442" />
+-            <distortion model="ptlens" focal="16.6" a="-0.000575" b="0.001992" c="-0.002180" />
+-            <distortion model="ptlens" focal="19.7" a="-0.000420" b="0.001545" c="-0.001722" />
+-            <distortion model="ptlens" focal="22.1" a="0.000308" b="-0.001009" c="0.000940" />
+-            <distortion model="ptlens" focal="27.8" a="-0.000202" b="0.000728" c="-0.000847" />
+-            <distortion model="ptlens" focal="30.5" a="0.000350" b="-0.001210" c="0.001200" />
++            <distortion model="ptlens" focal="6.1" a="0.022578" b="-0.081031" c="0.011077"/>
++            <distortion model="ptlens" focal="6.8" a="0.016019" b="-0.060546" c="0.008729"/>
++            <distortion model="ptlens" focal="6.9" a="0.011908" b="-0.051294" c="0.003986"/>
++            <distortion model="ptlens" focal="8.0" a="0.006519" b="-0.032045" c="0.003748"/>
++            <distortion model="ptlens" focal="8.2" a="0.005826" b="-0.027978" c="0.001562"/>
++            <distortion model="ptlens" focal="9.4" a="0.002976" b="-0.015660" c="0.000956"/>
++            <distortion model="ptlens" focal="10.0" a="0.004576" b="-0.018882" c="0.006355"/>
++            <distortion model="ptlens" focal="12.1" a="0.003211" b="-0.009651" c="0.004608"/>
++            <distortion model="ptlens" focal="12.3" a="0.000000" b="-0.002265" c="0.000000"/>
++            <distortion model="ptlens" focal="15.0" a="0.000553" b="-0.002150" c="0.002442"/>
++            <distortion model="ptlens" focal="16.6" a="-0.000575" b="0.001992" c="-0.002180"/>
++            <distortion model="ptlens" focal="19.7" a="-0.000420" b="0.001545" c="-0.001722"/>
++            <distortion model="ptlens" focal="22.1" a="0.000308" b="-0.001009" c="0.000940"/>
++            <distortion model="ptlens" focal="27.8" a="-0.000202" b="0.000728" c="-0.000847"/>
++            <distortion model="ptlens" focal="30.5" a="0.000350" b="-0.001210" c="0.001200"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot SD500 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonSD500</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.7" a="0.006629" b="-0.024613" c="0" />
+-            <distortion model="ptlens" focal="9.028" a="0.00359" b="-0.017262" c="0" />
+-            <distortion model="ptlens" focal="10.487" a="0" b="-0.008536" c="0" />
+-            <distortion model="ptlens" focal="12.523" a="0" b="-0.006646" c="0" />
+-            <distortion model="ptlens" focal="15.599" a="0" b="-0.003511" c="0" />
+-            <distortion model="ptlens" focal="18.776" a="0" b="-0.001002" c="0" />
+-            <distortion model="ptlens" focal="23.1" a="0" b="0.000834" c="0" />
++            <distortion model="ptlens" focal="7.7" a="0.006629" b="-0.024613" c="0"/>
++            <distortion model="ptlens" focal="9.028" a="0.00359" b="-0.017262" c="0"/>
++            <distortion model="ptlens" focal="10.487" a="0" b="-0.008536" c="0"/>
++            <distortion model="ptlens" focal="12.523" a="0" b="-0.006646" c="0"/>
++            <distortion model="ptlens" focal="15.599" a="0" b="-0.003511" c="0"/>
++            <distortion model="ptlens" focal="18.776" a="0" b="-0.001002" c="0"/>
++            <distortion model="ptlens" focal="23.1" a="0" b="0.000834" c="0"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot SD950 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonSD950</mount>
+         <cropfactor>4.7</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.7" a="0" b="-0.01427" c="0" />
+-            <distortion model="ptlens" focal="11.45" a="0" b="-0.00828" c="0" />
+-            <distortion model="ptlens" focal="13.68" a="0" b="-0.00693" c="0" />
+-            <distortion model="ptlens" focal="19.55" a="0" b="-0.00304" c="0" />
+-            <distortion model="ptlens" focal="28.5" a="0" b="-0.00073" c="0" />
++            <distortion model="poly3" focal="7.7" k1="-0.01427"/>
++            <distortion model="poly3" focal="11.45" k1="-0.00828"/>
++            <distortion model="poly3" focal="13.68" k1="-0.00693"/>
++            <distortion model="poly3" focal="19.55" k1="-0.00304"/>
++            <distortion model="poly3" focal="28.5" k1="-0.00073"/>
+         </calibration>
+-    </lens>    
+-
++    </lens>
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot SD200 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonSD200</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.009753" b="-0.025366" c="0" />
+-            <distortion model="ptlens" focal="7.109" a="0" b="-0.008832" c="0" />
+-            <distortion model="ptlens" focal="8.462" a="0" b="-0.007422" c="0" />
+-            <distortion model="ptlens" focal="10.093" a="0" b="-0.006845" c="0" />
+-            <distortion model="ptlens" focal="14.421" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0" b="0.001424" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.009753" b="-0.025366" c="0"/>
++            <distortion model="ptlens" focal="7.109" a="0" b="-0.008832" c="0"/>
++            <distortion model="ptlens" focal="8.462" a="0" b="-0.007422" c="0"/>
++            <distortion model="ptlens" focal="10.093" a="0" b="-0.006845" c="0"/>
++            <distortion model="ptlens" focal="14.421" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="0.001424" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon DIGITAL IXUS II &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonIxusII</mount>
+         <cropfactor>6.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.406" a="0" b="-0.009326" c="0" />
+-            <distortion model="ptlens" focal="6.719" a="0" b="-0.005177" c="0" />
+-            <distortion model="ptlens" focal="7.938" a="0" b="-0.005364" c="0" />
+-            <distortion model="ptlens" focal="9.188" a="0" b="-0.004363" c="0" />
+-            <distortion model="ptlens" focal="10.813" a="0" b="-0.003325" c="0" />
++            <distortion model="poly3" focal="5.406" k1="-0.009326"/>
++            <distortion model="poly3" focal="6.719" k1="-0.005177"/>
++            <distortion model="poly3" focal="7.938" k1="-0.005364"/>
++            <distortion model="poly3" focal="9.188" k1="-0.004363"/>
++            <distortion model="poly3" focal="10.813" k1="-0.003325"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon DIGITAL IXUS i &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonIxusI</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.406" a="0" b="-0.007998" c="-0.009906" />
++            <distortion model="ptlens" focal="6.406" a="0" b="-0.007998" c="-0.009906"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon DIGITAL IXUS 400 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.406" a="0.009324" b="-0.03174" c="0" />
+-            <distortion model="ptlens" focal="9.094" a="0.00233" b="-0.016863" c="0" />
+-            <distortion model="ptlens" focal="10.813" a="0.001054" b="-0.01068" c="0" />
+-            <distortion model="ptlens" focal="12.875" a="-0.000662" b="-0.005582" c="0" />
+-            <distortion model="ptlens" focal="15.438" a="-0.001583" b="-0.001308" c="0" />
+-            <distortion model="ptlens" focal="18.344" a="-0.001857" b="-3.2e-05" c="0" />
+-            <distortion model="ptlens" focal="22.219" a="0.00044" b="-0.003014" c="0" />
++            <distortion model="ptlens" focal="7.406" a="0.009324" b="-0.03174" c="0"/>
++            <distortion model="ptlens" focal="9.094" a="0.00233" b="-0.016863" c="0"/>
++            <distortion model="ptlens" focal="10.813" a="0.001054" b="-0.01068" c="0"/>
++            <distortion model="ptlens" focal="12.875" a="-0.000662" b="-0.005582" c="0"/>
++            <distortion model="ptlens" focal="15.438" a="-0.001583" b="-0.001308" c="0"/>
++            <distortion model="ptlens" focal="18.344" a="-0.001857" b="-3.2e-05" c="0"/>
++            <distortion model="ptlens" focal="22.219" a="0.00044" b="-0.003014" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Tiffen MegaPlus 0.56 Converter</model>
++        <model>Canon DIGITAL IXUS 400 &amp; compatibles, with Tiffen MegaPlus 0.56 converter</model>
++        <model lang="en">fixed lens, with Tiffen MegaPlus 0.56 converter</model>
++        <model lang="de">festes Objektiv, mit Tiffen MegaPlus 0.56-Konverter</model>
+         <mount>canonIxus400</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.406" a="0.020376" b="-0.071126" c="0" />
+-            <distortion model="ptlens" focal="9.094" a="0.007209" b="-0.039397" c="0" />
+-            <distortion model="ptlens" focal="10.813" a="0.011956" b="-0.043268" c="0" />
+-            <distortion model="ptlens" focal="12.875" a="0.004586" b="-0.023343" c="0" />
+-            <distortion model="ptlens" focal="15.438" a="-0.000285" b="-0.006557" c="0" />
+-            <distortion model="ptlens" focal="18.344" a="-0.002035" b="-0.002635" c="0" />
+-            <distortion model="ptlens" focal="22.219" a="0.005671" b="-0.017739" c="0" />
++            <distortion model="ptlens" focal="7.406" a="0.020376" b="-0.071126" c="0"/>
++            <distortion model="ptlens" focal="9.094" a="0.007209" b="-0.039397" c="0"/>
++            <distortion model="ptlens" focal="10.813" a="0.011956" b="-0.043268" c="0"/>
++            <distortion model="ptlens" focal="12.875" a="0.004586" b="-0.023343" c="0"/>
++            <distortion model="ptlens" focal="15.438" a="-0.000285" b="-0.006557" c="0"/>
++            <distortion model="ptlens" focal="18.344" a="-0.002035" b="-0.002635" c="0"/>
++            <distortion model="ptlens" focal="22.219" a="0.005671" b="-0.017739" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot S70 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonS70</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.813" a="0.018497" b="-0.049501" c="0" />
+-            <distortion model="ptlens" focal="7.281" a="0.009117" b="-0.029053" c="0" />
+-            <distortion model="ptlens" focal="8.563" a="0.002901" b="-0.013311" c="0" />
+-            <distortion model="ptlens" focal="9.906" a="0.001689" b="-0.008652" c="0" />
+-            <distortion model="ptlens" focal="11.406" a="0" b="-0.00346" c="0" />
+-            <distortion model="ptlens" focal="13.156" a="0" b="-0.001674" c="0" />
+-            <distortion model="ptlens" focal="15.156" a="0" b="-0.001123" c="0" />
+-            <distortion model="ptlens" focal="17.469" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="20.688" a="0" b="0.000898" c="0" />
++            <distortion model="ptlens" focal="5.813" a="0.018497" b="-0.049501" c="0"/>
++            <distortion model="ptlens" focal="7.281" a="0.009117" b="-0.029053" c="0"/>
++            <distortion model="ptlens" focal="8.563" a="0.002901" b="-0.013311" c="0"/>
++            <distortion model="ptlens" focal="9.906" a="0.001689" b="-0.008652" c="0"/>
++            <distortion model="ptlens" focal="11.406" a="0" b="-0.00346" c="0"/>
++            <distortion model="ptlens" focal="13.156" a="0" b="-0.001674" c="0"/>
++            <distortion model="ptlens" focal="15.156" a="0" b="-0.001123" c="0"/>
++            <distortion model="ptlens" focal="17.469" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="20.688" a="0" b="0.000898" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon TC-DC 10 2x Converter</model>
++        <model>Canon PowerShot S70 &amp; compatibles, with TC-DC10 2x converter</model>
++        <model lang="en">fixed lens, with TC-DC10 2× converter</model>
++        <model lang="de">festes Objektiv, mit TC-DC10 2×-Konverter</model>
+         <mount>canonS70</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="13.156" a="0" b="0.002149" c="0" />
+-            <distortion model="ptlens" focal="15.156" a="0" b="0.0023" c="0" />
+-            <distortion model="ptlens" focal="17.469" a="0" b="0.002178" c="0" />
+-            <distortion model="ptlens" focal="20.688" a="0" b="0.002601" c="0" />
++            <distortion model="poly3" focal="13.156" k1="0.002149"/>
++            <distortion model="poly3" focal="15.156" k1="0.0023"/>
++            <distortion model="poly3" focal="17.469" k1="0.002178"/>
++            <distortion model="poly3" focal="20.688" k1="0.002601"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot S30 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonS30</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.094" a="0.007715" b="-0.026731" c="0" />
+-            <distortion model="ptlens" focal="8.625" a="0.002869" b="-0.017441" c="0" />
+-            <distortion model="ptlens" focal="10.313" a="-0.002159" b="-0.005133" c="0" />
+-            <distortion model="ptlens" focal="12.281" a="-0.000263" b="-0.008304" c="0" />
+-            <distortion model="ptlens" focal="14.719" a="-0.000643" b="-0.004951" c="0" />
+-            <distortion model="ptlens" focal="17.5" a="-0.000855" b="-0.00274" c="0" />
+-            <distortion model="ptlens" focal="21.313" a="-0.001024" b="-0.001516" c="0" />
++            <distortion model="ptlens" focal="7.094" a="0.007715" b="-0.026731" c="0"/>
++            <distortion model="ptlens" focal="8.625" a="0.002869" b="-0.017441" c="0"/>
++            <distortion model="ptlens" focal="10.313" a="-0.002159" b="-0.005133" c="0"/>
++            <distortion model="ptlens" focal="12.281" a="-0.000263" b="-0.008304" c="0"/>
++            <distortion model="ptlens" focal="14.719" a="-0.000643" b="-0.004951" c="0"/>
++            <distortion model="ptlens" focal="17.5" a="-0.000855" b="-0.00274" c="0"/>
++            <distortion model="ptlens" focal="21.313" a="-0.001024" b="-0.001516" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot A610 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonA610</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.3" a="0.013142" b="-0.038236" c="0" />
+-            <distortion model="ptlens" focal="9.565" a="0.011837" b="-0.029698" c="0" />
+-            <distortion model="ptlens" focal="12.565" a="0.003459" b="-0.005793" c="0" />
+-            <distortion model="ptlens" focal="14.926" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="17.342" a="0" b="0.001577" c="0" />
+-            <distortion model="ptlens" focal="21.709" a="0" b="0.001875" c="0" />
+-            <distortion model="ptlens" focal="29.2" a="0" b="0.004818" c="0" />
++            <distortion model="ptlens" focal="7.3" a="0.013142" b="-0.038236" c="0"/>
++            <distortion model="ptlens" focal="9.565" a="0.011837" b="-0.029698" c="0"/>
++            <distortion model="ptlens" focal="12.565" a="0.003459" b="-0.005793" c="0"/>
++            <distortion model="ptlens" focal="14.926" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="17.342" a="0" b="0.001577" c="0"/>
++            <distortion model="ptlens" focal="21.709" a="0" b="0.001875" c="0"/>
++            <distortion model="ptlens" focal="29.2" a="0" b="0.004818" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot A610 &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonA610</mount>
++        <cropfactor>4.8</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="7.3" a="0.006931" b="-0.02547" c="0.006226"/>
++            <distortion model="ptlens" focal="8.5" a="0.007764" b="-0.02951" c="0.016444"/>
++            <distortion model="ptlens" focal="9.6" a="0.007302" b="-0.023408" c="0.013186"/>
++            <distortion model="ptlens" focal="10.8" a="-0.003107" b="0.009694" c="-0.011024"/>
++            <distortion model="ptlens" focal="12.6" a="-0.003635" b="0.007541" c="-0.002584"/>
++            <distortion model="ptlens" focal="14.9" a="-0.0013" b="0.002528" c="0"/>
++            <distortion model="ptlens" focal="17.3" a="-0.001404" b="0.014591" c="-0.024707"/>
++            <distortion model="ptlens" focal="21.7" a="0.000238" b="0.005374" c="-0.016188"/>
++            <distortion model="ptlens" focal="29.2" a="-0.035658" b="0.101639" c="-0.087315"/>
++            <tca model="poly3" focal="7.3" vr="1.0004523" vb="1.0001479"/>
++            <tca model="poly3" focal="8.5" vr="1.0006219" vb="0.9999944"/>
++            <tca model="poly3" focal="9.6" vr="1.0004274" vb="1.0000258"/>
++            <tca model="poly3" focal="10.8" vr="1.0002813" vb="1.0001387"/>
++            <tca model="poly3" focal="12.6" vr="1.0001260" vb="1.0001707"/>
++            <tca model="poly3" focal="14.9" vr="1.0000493" vb="1.0002103"/>
++            <tca model="poly3" focal="17.3" vr="0.9999945" vb="1.0002257"/>
++            <tca model="poly3" focal="21.7" vr="1.0000291" vb="1.0001431"/>
++            <tca model="poly3" focal="29.2" vr="1.0000026" vb="1.0000523"/>
++            <vignetting model="pa" focal="7.3" aperture="2.8" distance="10" k1="-0.4086" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="7.3" aperture="2.8" distance="1000" k1="-0.4086" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="7.3" aperture="3.1" distance="10" k1="-0.4089" k2="1.5607" k3="-1.3926"/>
++            <vignetting model="pa" focal="7.3" aperture="3.1" distance="1000" k1="-0.4089" k2="1.5607" k3="-1.3926"/>
++            <vignetting model="pa" focal="7.3" aperture="3.5" distance="10" k1="-0.4089" k2="1.5606" k3="-1.3925"/>
++            <vignetting model="pa" focal="7.3" aperture="3.5" distance="1000" k1="-0.4089" k2="1.5606" k3="-1.3925"/>
++            <vignetting model="pa" focal="7.3" aperture="4" distance="10" k1="-0.4085" k2="1.5591" k3="-1.3911"/>
++            <vignetting model="pa" focal="7.3" aperture="4" distance="1000" k1="-0.4085" k2="1.5591" k3="-1.3911"/>
++            <vignetting model="pa" focal="7.3" aperture="4.4" distance="10" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
++            <vignetting model="pa" focal="7.3" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
++            <vignetting model="pa" focal="7.3" aperture="5" distance="10" k1="-0.4087" k2="1.5601" k3="-1.3920"/>
++            <vignetting model="pa" focal="7.3" aperture="5" distance="1000" k1="-0.4087" k2="1.5601" k3="-1.3920"/>
++            <vignetting model="pa" focal="7.3" aperture="5.6" distance="10" k1="-0.4088" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="7.3" aperture="5.6" distance="1000" k1="-0.4088" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="7.3" aperture="6.3" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
++            <vignetting model="pa" focal="7.3" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
++            <vignetting model="pa" focal="7.3" aperture="7.1" distance="10" k1="-0.4086" k2="1.5595" k3="-1.3915"/>
++            <vignetting model="pa" focal="7.3" aperture="7.1" distance="1000" k1="-0.4086" k2="1.5595" k3="-1.3915"/>
++            <vignetting model="pa" focal="7.3" aperture="8" distance="10" k1="-0.4087" k2="1.5600" k3="-1.3918"/>
++            <vignetting model="pa" focal="7.3" aperture="8" distance="1000" k1="-0.4087" k2="1.5600" k3="-1.3918"/>
++            <vignetting model="pa" focal="8.5" aperture="2.9" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
++            <vignetting model="pa" focal="8.5" aperture="2.9" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
++            <vignetting model="pa" focal="8.5" aperture="3.1" distance="10" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="3.1" distance="1000" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="3.5" distance="10" k1="-0.4087" k2="1.5598" k3="-1.3918"/>
++            <vignetting model="pa" focal="8.5" aperture="3.5" distance="1000" k1="-0.4087" k2="1.5598" k3="-1.3918"/>
++            <vignetting model="pa" focal="8.5" aperture="4" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="8.5" aperture="4" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="8.5" aperture="4.4" distance="10" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="5" distance="10" k1="-0.4085" k2="1.5593" k3="-1.3912"/>
++            <vignetting model="pa" focal="8.5" aperture="5" distance="1000" k1="-0.4085" k2="1.5593" k3="-1.3912"/>
++            <vignetting model="pa" focal="8.5" aperture="5.6" distance="10" k1="-0.4086" k2="1.5598" k3="-1.3918"/>
++            <vignetting model="pa" focal="8.5" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5598" k3="-1.3918"/>
++            <vignetting model="pa" focal="8.5" aperture="6.3" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="8.5" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="8.5" aperture="7.1" distance="10" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="7.1" distance="1000" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="8" distance="10" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="8.5" aperture="8" distance="1000" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="9.6" aperture="3" distance="10" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
++            <vignetting model="pa" focal="9.6" aperture="3" distance="1000" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
++            <vignetting model="pa" focal="9.6" aperture="3.1" distance="10" k1="-0.4085" k2="1.5593" k3="-1.3913"/>
++            <vignetting model="pa" focal="9.6" aperture="3.1" distance="1000" k1="-0.4085" k2="1.5593" k3="-1.3913"/>
++            <vignetting model="pa" focal="9.6" aperture="3.5" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="9.6" aperture="3.5" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="9.6" aperture="4" distance="10" k1="-0.4089" k2="1.5607" k3="-1.3925"/>
++            <vignetting model="pa" focal="9.6" aperture="4" distance="1000" k1="-0.4089" k2="1.5607" k3="-1.3925"/>
++            <vignetting model="pa" focal="9.6" aperture="4.4" distance="10" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="9.6" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
++            <vignetting model="pa" focal="9.6" aperture="5" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3915"/>
++            <vignetting model="pa" focal="9.6" aperture="5" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3915"/>
++            <vignetting model="pa" focal="9.6" aperture="5.6" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
++            <vignetting model="pa" focal="9.6" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
++            <vignetting model="pa" focal="9.6" aperture="6.3" distance="10" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
++            <vignetting model="pa" focal="9.6" aperture="6.3" distance="1000" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
++            <vignetting model="pa" focal="9.6" aperture="7.1" distance="10" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
++            <vignetting model="pa" focal="9.6" aperture="7.1" distance="1000" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
++            <vignetting model="pa" focal="9.6" aperture="8" distance="10" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="9.6" aperture="8" distance="1000" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="10.8" aperture="3.1" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
++            <vignetting model="pa" focal="10.8" aperture="3.1" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
++            <vignetting model="pa" focal="10.8" aperture="3.5" distance="10" k1="-0.4083" k2="1.5587" k3="-1.3907"/>
++            <vignetting model="pa" focal="10.8" aperture="3.5" distance="1000" k1="-0.4083" k2="1.5587" k3="-1.3907"/>
++            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.4087" k2="1.5600" k3="-1.3919"/>
++            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.4087" k2="1.5600" k3="-1.3919"/>
++            <vignetting model="pa" focal="10.8" aperture="4.4" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="10.8" aperture="4.4" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="10.8" aperture="5" distance="10" k1="-0.4085" k2="1.5595" k3="-1.3915"/>
++            <vignetting model="pa" focal="10.8" aperture="5" distance="1000" k1="-0.4085" k2="1.5595" k3="-1.3915"/>
++            <vignetting model="pa" focal="10.8" aperture="5.6" distance="10" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
++            <vignetting model="pa" focal="10.8" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
++            <vignetting model="pa" focal="10.8" aperture="6.3" distance="10" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
++            <vignetting model="pa" focal="10.8" aperture="6.3" distance="1000" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
++            <vignetting model="pa" focal="10.8" aperture="7.1" distance="10" k1="-0.4084" k2="1.5589" k3="-1.3909"/>
++            <vignetting model="pa" focal="10.8" aperture="7.1" distance="1000" k1="-0.4084" k2="1.5589" k3="-1.3909"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.4082" k2="1.5582" k3="-1.3903"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.4082" k2="1.5582" k3="-1.3903"/>
++            <vignetting model="pa" focal="12.6" aperture="3.2" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="12.6" aperture="3.2" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="12.6" aperture="3.5" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
++            <vignetting model="pa" focal="12.6" aperture="3.5" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
++            <vignetting model="pa" focal="12.6" aperture="4" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="12.6" aperture="4" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="12.6" aperture="4.4" distance="10" k1="-0.4087" k2="1.5599" k3="-1.3919"/>
++            <vignetting model="pa" focal="12.6" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5599" k3="-1.3919"/>
++            <vignetting model="pa" focal="12.6" aperture="5" distance="10" k1="-0.4086" k2="1.5595" k3="-1.3914"/>
++            <vignetting model="pa" focal="12.6" aperture="5" distance="1000" k1="-0.4086" k2="1.5595" k3="-1.3914"/>
++            <vignetting model="pa" focal="12.6" aperture="5.6" distance="10" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
++            <vignetting model="pa" focal="12.6" aperture="5.6" distance="1000" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
++            <vignetting model="pa" focal="12.6" aperture="6.3" distance="10" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
++            <vignetting model="pa" focal="12.6" aperture="6.3" distance="1000" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
++            <vignetting model="pa" focal="12.6" aperture="7.1" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
++            <vignetting model="pa" focal="12.6" aperture="7.1" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
++            <vignetting model="pa" focal="12.6" aperture="8" distance="10" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
++            <vignetting model="pa" focal="12.6" aperture="8" distance="1000" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
++            <vignetting model="pa" focal="14.9" aperture="3.4" distance="10" k1="-0.4083" k2="1.5589" k3="-1.3909"/>
++            <vignetting model="pa" focal="14.9" aperture="3.4" distance="1000" k1="-0.4083" k2="1.5589" k3="-1.3909"/>
++            <vignetting model="pa" focal="14.9" aperture="3.5" distance="10" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
++            <vignetting model="pa" focal="14.9" aperture="3.5" distance="1000" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
++            <vignetting model="pa" focal="14.9" aperture="4" distance="10" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
++            <vignetting model="pa" focal="14.9" aperture="4" distance="1000" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
++            <vignetting model="pa" focal="14.9" aperture="4.4" distance="10" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
++            <vignetting model="pa" focal="14.9" aperture="4.4" distance="1000" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
++            <vignetting model="pa" focal="14.9" aperture="5" distance="10" k1="-0.4084" k2="1.5591" k3="-1.3912"/>
++            <vignetting model="pa" focal="14.9" aperture="5" distance="1000" k1="-0.4084" k2="1.5591" k3="-1.3912"/>
++            <vignetting model="pa" focal="14.9" aperture="5.6" distance="10" k1="-0.4084" k2="1.5588" k3="-1.3909"/>
++            <vignetting model="pa" focal="14.9" aperture="5.6" distance="1000" k1="-0.4084" k2="1.5588" k3="-1.3909"/>
++            <vignetting model="pa" focal="14.9" aperture="6.3" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="14.9" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
++            <vignetting model="pa" focal="14.9" aperture="7.1" distance="10" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="14.9" aperture="7.1" distance="1000" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
++            <vignetting model="pa" focal="14.9" aperture="8" distance="10" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
++            <vignetting model="pa" focal="14.9" aperture="8" distance="1000" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
++            <vignetting model="pa" focal="17.3" aperture="3.5" distance="10" k1="-0.4086" k2="1.5595" k3="-1.3913"/>
++            <vignetting model="pa" focal="17.3" aperture="3.5" distance="1000" k1="-0.4086" k2="1.5595" k3="-1.3913"/>
++            <vignetting model="pa" focal="17.3" aperture="4" distance="10" k1="-0.4087" k2="1.5600" k3="-1.3917"/>
++            <vignetting model="pa" focal="17.3" aperture="4" distance="1000" k1="-0.4087" k2="1.5600" k3="-1.3917"/>
++            <vignetting model="pa" focal="17.3" aperture="4.4" distance="10" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
++            <vignetting model="pa" focal="17.3" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
++            <vignetting model="pa" focal="17.3" aperture="5" distance="10" k1="-0.4089" k2="1.5602" k3="-1.3918"/>
++            <vignetting model="pa" focal="17.3" aperture="5" distance="1000" k1="-0.4089" k2="1.5602" k3="-1.3918"/>
++            <vignetting model="pa" focal="17.3" aperture="5.6" distance="10" k1="-0.4084" k2="1.5588" k3="-1.3907"/>
++            <vignetting model="pa" focal="17.3" aperture="5.6" distance="1000" k1="-0.4084" k2="1.5588" k3="-1.3907"/>
++            <vignetting model="pa" focal="17.3" aperture="6.3" distance="10" k1="-0.4085" k2="1.5590" k3="-1.3908"/>
++            <vignetting model="pa" focal="17.3" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5590" k3="-1.3908"/>
++            <vignetting model="pa" focal="17.3" aperture="7.1" distance="10" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
++            <vignetting model="pa" focal="17.3" aperture="7.1" distance="1000" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
++            <vignetting model="pa" focal="17.3" aperture="8" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3913"/>
++            <vignetting model="pa" focal="17.3" aperture="8" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3913"/>
++            <vignetting model="pa" focal="21.7" aperture="3.8" distance="10" k1="-0.4089" k2="1.5591" k3="-1.3907"/>
++            <vignetting model="pa" focal="21.7" aperture="3.8" distance="1000" k1="-0.4089" k2="1.5591" k3="-1.3907"/>
++            <vignetting model="pa" focal="21.7" aperture="4" distance="10" k1="-0.4090" k2="1.5595" k3="-1.3911"/>
++            <vignetting model="pa" focal="21.7" aperture="4" distance="1000" k1="-0.4090" k2="1.5595" k3="-1.3911"/>
++            <vignetting model="pa" focal="21.7" aperture="4.4" distance="10" k1="-0.4085" k2="1.5582" k3="-1.3901"/>
++            <vignetting model="pa" focal="21.7" aperture="4.4" distance="1000" k1="-0.4085" k2="1.5582" k3="-1.3901"/>
++            <vignetting model="pa" focal="21.7" aperture="5" distance="10" k1="-0.4086" k2="1.5584" k3="-1.3902"/>
++            <vignetting model="pa" focal="21.7" aperture="5" distance="1000" k1="-0.4086" k2="1.5584" k3="-1.3902"/>
++            <vignetting model="pa" focal="21.7" aperture="5.6" distance="10" k1="-0.4086" k2="1.5585" k3="-1.3903"/>
++            <vignetting model="pa" focal="21.7" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5585" k3="-1.3903"/>
++            <vignetting model="pa" focal="21.7" aperture="6.3" distance="10" k1="-0.4088" k2="1.5588" k3="-1.3905"/>
++            <vignetting model="pa" focal="21.7" aperture="6.3" distance="1000" k1="-0.4088" k2="1.5588" k3="-1.3905"/>
++            <vignetting model="pa" focal="21.7" aperture="7.1" distance="10" k1="-0.4089" k2="1.5591" k3="-1.3908"/>
++            <vignetting model="pa" focal="21.7" aperture="7.1" distance="1000" k1="-0.4089" k2="1.5591" k3="-1.3908"/>
++            <vignetting model="pa" focal="21.7" aperture="8" distance="10" k1="-0.4087" k2="1.5587" k3="-1.3905"/>
++            <vignetting model="pa" focal="21.7" aperture="8" distance="1000" k1="-0.4087" k2="1.5587" k3="-1.3905"/>
++            <vignetting model="pa" focal="29.2" aperture="4.2" distance="10" k1="-0.4098" k2="1.5606" k3="-1.3914"/>
++            <vignetting model="pa" focal="29.2" aperture="4.2" distance="1000" k1="-0.4098" k2="1.5606" k3="-1.3914"/>
++            <vignetting model="pa" focal="29.2" aperture="4.4" distance="10" k1="-0.4099" k2="1.5607" k3="-1.3914"/>
++            <vignetting model="pa" focal="29.2" aperture="4.4" distance="1000" k1="-0.4099" k2="1.5607" k3="-1.3914"/>
++            <vignetting model="pa" focal="29.2" aperture="5" distance="10" k1="-0.4099" k2="1.5613" k3="-1.3919"/>
++            <vignetting model="pa" focal="29.2" aperture="5" distance="1000" k1="-0.4099" k2="1.5613" k3="-1.3919"/>
++            <vignetting model="pa" focal="29.2" aperture="5.6" distance="10" k1="-0.4095" k2="1.5596" k3="-1.3906"/>
++            <vignetting model="pa" focal="29.2" aperture="5.6" distance="1000" k1="-0.4095" k2="1.5596" k3="-1.3906"/>
++            <vignetting model="pa" focal="29.2" aperture="6.3" distance="10" k1="-0.4096" k2="1.5602" k3="-1.3911"/>
++            <vignetting model="pa" focal="29.2" aperture="6.3" distance="1000" k1="-0.4096" k2="1.5602" k3="-1.3911"/>
++            <vignetting model="pa" focal="29.2" aperture="7.1" distance="10" k1="-0.4099" k2="1.5615" k3="-1.3922"/>
++            <vignetting model="pa" focal="29.2" aperture="7.1" distance="1000" k1="-0.4099" k2="1.5615" k3="-1.3922"/>
++            <vignetting model="pa" focal="29.2" aperture="8" distance="10" k1="-0.4094" k2="1.5597" k3="-1.3907"/>
++            <vignetting model="pa" focal="29.2" aperture="8" distance="1000" k1="-0.4094" k2="1.5597" k3="-1.3907"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A510 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonA510</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.813" a="0.008099" b="-0.03097" c="0" />
+-            <distortion model="ptlens" focal="7.813" a="0" b="-0.010876" c="0" />
+-            <distortion model="ptlens" focal="9.813" a="0" b="-0.007821" c="0" />
+-            <distortion model="ptlens" focal="11.813" a="0" b="-0.006082" c="0" />
+-            <distortion model="ptlens" focal="13.813" a="0" b="-0.00366" c="0" />
+-            <distortion model="ptlens" focal="16" a="0" b="-0.001945" c="0" />
+-            <distortion model="ptlens" focal="18.688" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="23.188" a="0" b="0.001312" c="0" />
++            <distortion model="ptlens" focal="5.813" a="0.008099" b="-0.03097" c="0"/>
++            <distortion model="ptlens" focal="7.813" a="0" b="-0.010876" c="0"/>
++            <distortion model="ptlens" focal="9.813" a="0" b="-0.007821" c="0"/>
++            <distortion model="ptlens" focal="11.813" a="0" b="-0.006082" c="0"/>
++            <distortion model="ptlens" focal="13.813" a="0" b="-0.00366" c="0"/>
++            <distortion model="ptlens" focal="16" a="0" b="-0.001945" c="0"/>
++            <distortion model="ptlens" focal="18.688" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="23.188" a="0" b="0.001312" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot A80 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonA80</mount>
+         <cropfactor>4.85</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.813" a="0.004902" b="-0.021392" c="0" />
+-            <distortion model="ptlens" focal="9.625" a="0" b="-0.011" c="0" />
+-            <distortion model="ptlens" focal="11.438" a="0" b="-0.008375" c="0" />
+-            <distortion model="ptlens" focal="16.219" a="0" b="-0.004156" c="0" />
+-            <distortion model="ptlens" focal="19.25" a="0" b="-0.002078" c="0" />
+-            <distortion model="ptlens" focal="23.406" a="0" b="-0" c="0" />
++            <distortion model="ptlens" focal="7.813" a="0.004902" b="-0.021392" c="0"/>
++            <distortion model="ptlens" focal="9.625" a="0" b="-0.011" c="0"/>
++            <distortion model="ptlens" focal="11.438" a="0" b="-0.008375" c="0"/>
++            <distortion model="ptlens" focal="16.219" a="0" b="-0.004156" c="0"/>
++            <distortion model="ptlens" focal="19.25" a="0" b="-0.002078" c="0"/>
++            <distortion model="ptlens" focal="23.406" a="0" b="-0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Tiffen .56x converter</model>
++        <model>Canon PowerShot A80 &amp; compatibles, with Tiffen 0.56x converter</model>
++        <model lang="en">fixed lens, with Tiffen 0.56× converter</model>
++        <model lang="de">festes Objektiv, mit Tiffen 0.56×-Konverter</model>
+         <mount>canonA80</mount>
+         <cropfactor>4.85</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.813" a="0.025867" b="-0.072267" c="0" />
+-            <distortion model="ptlens" focal="9.625" a="0.012406" b="-0.044804" c="0" />
+-            <distortion model="ptlens" focal="11.438" a="0.005944" b="-0.029328" c="0" />
+-            <distortion model="ptlens" focal="13.594" a="0.005648" b="-0.024829" c="0" />
+-            <distortion model="ptlens" focal="16.219" a="0" b="-0.010682" c="0" />
+-            <distortion model="ptlens" focal="19.25" a="0" b="-0.006784" c="0" />
+-            <distortion model="ptlens" focal="23.406" a="0" b="-0.004297" c="0" />
++            <distortion model="ptlens" focal="7.813" a="0.025867" b="-0.072267" c="0"/>
++            <distortion model="ptlens" focal="9.625" a="0.012406" b="-0.044804" c="0"/>
++            <distortion model="ptlens" focal="11.438" a="0.005944" b="-0.029328" c="0"/>
++            <distortion model="ptlens" focal="13.594" a="0.005648" b="-0.024829" c="0"/>
++            <distortion model="ptlens" focal="16.219" a="0" b="-0.010682" c="0"/>
++            <distortion model="ptlens" focal="19.25" a="0" b="-0.006784" c="0"/>
++            <distortion model="ptlens" focal="23.406" a="0" b="-0.004297" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Tiffen 2x converter</model>
++        <model>Canon PowerShot A80 &amp; compatibles, with Tiffen 2x converter</model>
++        <model lang="en">fixed lens, with Tiffen 2× converter</model>
++        <model lang="de">festes Objektiv, mit Tiffen 2×-Konverter</model>
+         <mount>canonA80</mount>
+         <cropfactor>4.85</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="11.438" a="0" b="0.010621" c="0" />
+-            <distortion model="ptlens" focal="13.594" a="0" b="0.002913" c="0" />
+-            <distortion model="ptlens" focal="16.219" a="0" b="0.000742" c="0" />
+-            <distortion model="ptlens" focal="19.25" a="0" b="0.001395" c="0" />
+-            <distortion model="ptlens" focal="23.406" a="0" b="0.001399" c="0" />
++            <distortion model="poly3" focal="11.438" k1="0.010621"/>
++            <distortion model="poly3" focal="13.594" k1="0.002913"/>
++            <distortion model="poly3" focal="16.219" k1="0.000742"/>
++            <distortion model="poly3" focal="19.25" k1="0.001395"/>
++            <distortion model="poly3" focal="23.406" k1="0.001399"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot A70 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonA70</mount>
+         <cropfactor>6.500</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.406" a="0.007133" b="-0.026098" c="0" />
+-            <distortion model="ptlens" focal="6.594" a="0.002986" b="-0.017472" c="0" />
+-            <distortion model="ptlens" focal="7.844" a="0" b="-0.009721" c="0" />
+-            <distortion model="ptlens" focal="9.406" a="0" b="-0.00769" c="0" />
+-            <distortion model="ptlens" focal="11.313" a="0" b="-0.005908" c="0" />
+-            <distortion model="ptlens" focal="13.438" a="0" b="-0.003555" c="0" />
+-            <distortion model="ptlens" focal="16.219" a="0" b="-0.003735" c="0" />
++            <distortion model="ptlens" focal="5.406" a="0.007133" b="-0.026098" c="0"/>
++            <distortion model="ptlens" focal="6.594" a="0.002986" b="-0.017472" c="0"/>
++            <distortion model="ptlens" focal="7.844" a="0" b="-0.009721" c="0"/>
++            <distortion model="ptlens" focal="9.406" a="0" b="-0.00769" c="0"/>
++            <distortion model="ptlens" focal="11.313" a="0" b="-0.005908" c="0"/>
++            <distortion model="ptlens" focal="13.438" a="0" b="-0.003555" c="0"/>
++            <distortion model="ptlens" focal="16.219" a="0" b="-0.003735" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot S2 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonS2</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0" />
+-            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0" />
+-            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0" />
+-            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0" />
+-            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0" />
+-            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0" />
+-            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0"/>
++            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0"/>
++            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0"/>
++            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0"/>
++            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0"/>
++            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0"/>
++            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>TC-DC58B</model>
++        <model>Canon PowerShot S2 IS &amp; compatibles, with TC-DC58B</model>
++        <model lang="en">fixed lens, with TC-DC58B</model>
++        <model lang="de">festes Objektiv, mit TC-DC58B</model>
+         <mount>canonS2</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16.4" a="0" b="0.01755" c="0" />
+-            <distortion model="ptlens" focal="20.7" a="0" b="0.01163" c="0" />
+-            <distortion model="ptlens" focal="26.8" a="0" b="0.008009" c="0" />
+-            <distortion model="ptlens" focal="34.3" a="0" b="0.005827" c="0" />
+-            <distortion model="ptlens" focal="40.3" a="0" b="0.003938" c="0" />
+-            <distortion model="ptlens" focal="51.8" a="0" b="0.003021" c="0" />
+-            <distortion model="ptlens" focal="64.7" a="0" b="0.003778" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.003404" c="0" />
++            <distortion model="poly3" focal="16.4" k1="0.01755"/>
++            <distortion model="poly3" focal="20.7" k1="0.01163"/>
++            <distortion model="poly3" focal="26.8" k1="0.008009"/>
++            <distortion model="poly3" focal="34.3" k1="0.005827"/>
++            <distortion model="poly3" focal="40.3" k1="0.003938"/>
++            <distortion model="poly3" focal="51.8" k1="0.003021"/>
++            <distortion model="poly3" focal="64.7" k1="0.003778"/>
++            <distortion model="poly3" focal="72" k1="0.003404"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot S1 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonS1</mount>
+         <cropfactor>6.56</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.020538" b="-0.050896" c="0" />
+-            <distortion model="ptlens" focal="7.334" a="0.012341" b="-0.02551" c="0" />
+-            <distortion model="ptlens" focal="10.492" a="0.018784" b="-0.035873" c="0" />
+-            <distortion model="ptlens" focal="12.5" a="0" b="0.003562" c="0" />
+-            <distortion model="ptlens" focal="58" a="0" b="0.003236" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.020538" b="-0.050896" c="0"/>
++            <distortion model="ptlens" focal="7.334" a="0.012341" b="-0.02551" c="0"/>
++            <distortion model="ptlens" focal="10.492" a="0.018784" b="-0.035873" c="0"/>
++            <distortion model="ptlens" focal="12.5" a="0" b="0.003562" c="0"/>
++            <distortion model="ptlens" focal="58" a="0" b="0.003236" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot Pro90 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonPro90</mount>
+         <cropfactor>5.28</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.014317" b="-0.036991" c="0" />
+-            <distortion model="ptlens" focal="8.7" a="0.007393" b="-0.012077" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="0.007132" c="0" />
+-            <distortion model="ptlens" focal="12.6" a="0" b="0.00894" c="0" />
+-            <distortion model="ptlens" focal="14.8" a="0" b="0.006866" c="0" />
+-            <distortion model="ptlens" focal="18.7" a="0" b="0.004872" c="0" />
+-            <distortion model="ptlens" focal="22.9" a="0" b="0.003074" c="0" />
+-            <distortion model="ptlens" focal="50.5" a="0" b="0.000264" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="7" a="0.014317" b="-0.036991" c="0"/>
++            <distortion model="ptlens" focal="8.7" a="0.007393" b="-0.012077" c="0"/>
++            <distortion model="ptlens" focal="10" a="0" b="0.007132" c="0"/>
++            <distortion model="ptlens" focal="12.6" a="0" b="0.00894" c="0"/>
++            <distortion model="ptlens" focal="14.8" a="0" b="0.006866" c="0"/>
++            <distortion model="ptlens" focal="18.7" a="0" b="0.004872" c="0"/>
++            <distortion model="ptlens" focal="22.9" a="0" b="0.003074" c="0"/>
++            <distortion model="ptlens" focal="50.5" a="0" b="0.000264" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot S5 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonS5</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0" />
+-            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0" />
+-            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0" />
+-            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0" />
+-            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0" />
+-            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0" />
+-            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0"/>
++            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0"/>
++            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0"/>
++            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0"/>
++            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0"/>
++            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0"/>
++            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>TC-DC58B</model>
++        <model>Canon PowerShot S5 IS &amp; compatibles, with TC-DC58B</model>
++        <model lang="en">fixed lens, with TC-DC58B</model>
++        <model lang="de">festes Objektiv, mit TC-DC58B</model>
+         <mount>canonS5</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16.4" a="0" b="0.01755" c="0" />
+-            <distortion model="ptlens" focal="20.7" a="0" b="0.01163" c="0" />
+-            <distortion model="ptlens" focal="26.8" a="0" b="0.008009" c="0" />
+-            <distortion model="ptlens" focal="34.3" a="0" b="0.005827" c="0" />
+-            <distortion model="ptlens" focal="40.3" a="0" b="0.003938" c="0" />
+-            <distortion model="ptlens" focal="51.8" a="0" b="0.003021" c="0" />
+-            <distortion model="ptlens" focal="64.7" a="0" b="0.003778" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.003404" c="0" />
++            <distortion model="poly3" focal="16.4" k1="0.01755"/>
++            <distortion model="poly3" focal="20.7" k1="0.01163"/>
++            <distortion model="poly3" focal="26.8" k1="0.008009"/>
++            <distortion model="poly3" focal="34.3" k1="0.005827"/>
++            <distortion model="poly3" focal="40.3" k1="0.003938"/>
++            <distortion model="poly3" focal="51.8" k1="0.003021"/>
++            <distortion model="poly3" focal="64.7" k1="0.003778"/>
++            <distortion model="poly3" focal="72" k1="0.003404"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon DIGITAL IXUS 80 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonIxus80IS</mount>
+-        <cropfactor>5.9</cropfactor>
++        <cropfactor>6.02</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.2" a="-0.032" b="0.125" c="-0.188" />
+-            <distortion model="ptlens" focal="7.2" a="0.047" b="-0.154" c="0.140" />
+-            <distortion model="ptlens" focal="8.3" a="-0.340" b="1.135" c="-1.264" />
+-            <distortion model="ptlens" focal="9.7" a="0.025" b="-0.087" c="0.085" />
+-            <distortion model="ptlens" focal="11.6" a="0.099" b="-0.302" c="0.288" />
+-            <distortion model="ptlens" focal="18.6" a="0.054" b="-0.169" c="0.179" />
++            <distortion model="ptlens" focal="6.2" a="0.01576" b="-0.05512" c="0.01877"/>
++            <distortion model="ptlens" focal="7.2" a="0.01258" b="-0.04518" c="0.01608"/>
++            <distortion model="ptlens" focal="8.3" a="0.00121" b="-0.01475" c="-0.0003"/>
++            <distortion model="ptlens" focal="9.7" a="-0.00339" b="0.00445" c="-0.0226"/>
++            <distortion model="ptlens" focal="11.6" a="-0.00224" b="0.00479" c="-0.01497"/>
++            <distortion model="ptlens" focal="14.3" a="0.00113" b="-0.00504" c="-0.0008"/>
++            <distortion model="ptlens" focal="18.6" a="0.00169" b="-0.00608" c="0.00632"/>
++            <tca model="poly3" focal="6.2" br="0.00011134" vr="0.99992608" bb="-0.00032684" vb="1.00078204"/>
++            <tca model="poly3" focal="7.2" br="9.438e-05" vr="0.99995248" bb="-0.00024726" vb="1.00060098"/>
++            <tca model="poly3" focal="8.3" br="6.66666666667e-05" vr="1.0000135" bb="-0.000196133333333" vb="1.00046133333"/>
++            <tca model="poly3" focal="9.7" br="5.34333333333e-05" vr="1.00004393333" bb="-0.0001843" vb="1.00042996667"/>
++            <tca model="poly3" focal="11.6" br="4.09333333333e-05" vr="1.00009023333" bb="-0.000115333333333" vb="1.00028556667"/>
++            <tca model="poly3" focal="14.3" br="-9.9e-06" vr="1.0001817" bb="-7.975e-05" vb="1.00016265"/>
++            <tca model="poly3" focal="18.6" br="-5.495e-05" vr="1.0003695" bb="4.15e-06" vb="0.99987525"/>
++            <vignetting model="pa" focal="6.2" aperture="2.8" distance="10" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
++            <vignetting model="pa" focal="6.2" aperture="2.8" distance="1000" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
++            <vignetting model="pa" focal="6.2" aperture="8" distance="10" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
++            <vignetting model="pa" focal="6.2" aperture="8" distance="1000" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
++            <vignetting model="pa" focal="7.2" aperture="3" distance="10" k1="-0.3531" k2="0.0549" k3="0.0001"/>
++            <vignetting model="pa" focal="7.2" aperture="3" distance="1000" k1="-0.3531" k2="0.0549" k3="0.0001"/>
++            <vignetting model="pa" focal="7.2" aperture="9" distance="10" k1="-0.3531" k2="0.0549" k3="0.0001"/>
++            <vignetting model="pa" focal="7.2" aperture="9" distance="1000" k1="-0.3531" k2="0.0549" k3="0.0001"/>
++            <vignetting model="pa" focal="8.3" aperture="3.2" distance="10" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
++            <vignetting model="pa" focal="8.3" aperture="3.2" distance="1000" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
++            <vignetting model="pa" focal="8.3" aperture="9" distance="10" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
++            <vignetting model="pa" focal="8.3" aperture="9" distance="1000" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
++            <vignetting model="pa" focal="9.7" aperture="3.5" distance="10" k1="-0.2591" k2="0.0305" k3="0.0157"/>
++            <vignetting model="pa" focal="9.7" aperture="3.5" distance="1000" k1="-0.2591" k2="0.0305" k3="0.0157"/>
++            <vignetting model="pa" focal="9.7" aperture="10" distance="10" k1="-0.2591" k2="0.0305" k3="0.0157"/>
++            <vignetting model="pa" focal="9.7" aperture="10" distance="1000" k1="-0.2591" k2="0.0305" k3="0.0157"/>
++            <vignetting model="pa" focal="11.6" aperture="3.8" distance="10" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
++            <vignetting model="pa" focal="11.6" aperture="3.8" distance="1000" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
++            <vignetting model="pa" focal="11.6" aperture="11" distance="10" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
++            <vignetting model="pa" focal="11.6" aperture="11" distance="1000" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
++            <vignetting model="pa" focal="14.3" aperture="4.3" distance="10" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
++            <vignetting model="pa" focal="14.3" aperture="4.3" distance="1000" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
++            <vignetting model="pa" focal="14.3" aperture="13" distance="10" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
++            <vignetting model="pa" focal="14.3" aperture="13" distance="1000" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
++            <vignetting model="pa" focal="18.6" aperture="5" distance="10" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
++            <vignetting model="pa" focal="18.6" aperture="5" distance="1000" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
++            <vignetting model="pa" focal="18.6" aperture="14" distance="10" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
++            <vignetting model="pa" focal="18.6" aperture="14" distance="1000" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot S90 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonS90</mount>
++        <cropfactor>4.67</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6" a="0.01801" b="-0.09667" c="0.02041"/>
++            <distortion model="ptlens" focal="7.5" a="0.00793" b="-0.0524" c="-0.00156"/>
++            <distortion model="ptlens" focal="10.7" a="-0.01274" b="0.02428" c="-0.04366"/>
++            <distortion model="ptlens" focal="18.2" a="0.02233" b="-0.0766" c="0.07502"/>
++            <distortion model="ptlens" focal="22.5" a="-0.00256" b="0.01016" c="-0.01643"/>
++            <tca model="poly3" focal="6" br="0.0004594" vr="0.9997919" bb="-0.0004823" vb="1.0009686"/>
++            <tca model="poly3" focal="7.5" br="0.0002156" vr="0.9998923" bb="-0.0003540" vb="1.0009066"/>
++            <tca model="poly3" focal="10.7" br="0.0000737" vr="1.0000337" bb="-0.0001950" vb="1.0005510"/>
++            <tca model="poly3" focal="18.2" br="0.0000189" vr="1.0001247" bb="-0.0000461" vb="1.0001230"/>
++            <tca model="poly3" focal="22.5" br="-0.0000520" vr="1.0003164" bb="-0.0000220" vb="1.0000067"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A650 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonA650IS</mount>
+         <cropfactor>4.67712</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.4" a="0.02" b="-0.06" c="0.021" />
+-            <distortion model="ptlens" focal="9" a="0.021" b="-0.045" c="0.022" />
+-            <distortion model="ptlens" focal="10.7" a="-0.013" b="0.036" c="-0.036" />
+-            <distortion model="ptlens" focal="14.8" a="0.007" b="-0.012" c="0.003" />
+-            <distortion model="ptlens" focal="18.9" a="-0.002" b="0.02" c="-0.027" />
+-            <distortion model="ptlens" focal="25" a="-0.004" b="0.013" c="-0.009" />
+-            <distortion model="ptlens" focal="44.4" a="0.002" b="0.008" c="-0.005" />
++            <distortion model="ptlens" focal="7.4" a="0.02" b="-0.06" c="0.021"/>
++            <distortion model="ptlens" focal="9" a="0.021" b="-0.045" c="0.022"/>
++            <distortion model="ptlens" focal="10.7" a="-0.013" b="0.036" c="-0.036"/>
++            <distortion model="ptlens" focal="14.8" a="0.007" b="-0.012" c="0.003"/>
++            <distortion model="ptlens" focal="18.9" a="-0.002" b="0.02" c="-0.027"/>
++            <distortion model="ptlens" focal="25" a="-0.004" b="0.013" c="-0.009"/>
++            <distortion model="ptlens" focal="44.4" a="0.002" b="0.008" c="-0.005"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot G11 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonG11</mount>
+         <cropfactor>4.554</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.1" a="0.01606" b="-0.0393" c="-0.0167" />
+-            <distortion model="ptlens" focal="6.8" a="0.01748" b="-0.04705" c="0.00205" />
+-            <distortion model="ptlens" focal="7.4" a="0.01142" b="-0.03243" c="-0.00035" />
+-            <distortion model="ptlens" focal="8.1" a="0.00543" b="-0.01716" c="-0.0055" />
+-            <distortion model="ptlens" focal="8.9" a="0.02055" b="-0.07109" c="0.0607" />
+-            <distortion model="ptlens" focal="9.8" a="0.00921" b="-0.03151" c="0.01933" />
+-            <distortion model="ptlens" focal="10.8" a="0.01856" b="-0.06136" c="0.05221" />
+-            <distortion model="ptlens" focal="12.1" a="0.00658" b="-0.01928" c="0.00538" />
+-            <distortion model="ptlens" focal="13.8" a="0.00985" b="-0.03216" c="0.02499" />
+-            <distortion model="ptlens" focal="18.1" a="-0.00766" b="-0.00228" c="0.03218" />
+-            <distortion model="ptlens" focal="21.5" a="0.01669" b="-0.05429" c="0.04885" />
+-            <distortion model="ptlens" focal="25" a="0.01337" b="-0.04578" c="0.04414" />
+-            <distortion model="ptlens" focal="30.5" a="-0.00269" b="0.00762" c="-0.00738" />
++            <distortion model="ptlens" focal="6.1" a="0.01606" b="-0.0393" c="-0.0167"/>
++            <distortion model="ptlens" focal="6.8" a="0.01748" b="-0.04705" c="0.00205"/>
++            <distortion model="ptlens" focal="7.4" a="0.01142" b="-0.03243" c="-0.00035"/>
++            <distortion model="ptlens" focal="8.1" a="0.00543" b="-0.01716" c="-0.0055"/>
++            <distortion model="ptlens" focal="8.9" a="0.02055" b="-0.07109" c="0.0607"/>
++            <distortion model="ptlens" focal="9.8" a="0.00921" b="-0.03151" c="0.01933"/>
++            <distortion model="ptlens" focal="10.8" a="0.01856" b="-0.06136" c="0.05221"/>
++            <distortion model="ptlens" focal="12.1" a="0.00658" b="-0.01928" c="0.00538"/>
++            <distortion model="ptlens" focal="13.8" a="0.00985" b="-0.03216" c="0.02499"/>
++            <distortion model="ptlens" focal="18.1" a="-0.00766" b="-0.00228" c="0.03218"/>
++            <distortion model="ptlens" focal="21.5" a="0.01669" b="-0.05429" c="0.04885"/>
++            <distortion model="ptlens" focal="25" a="0.01337" b="-0.04578" c="0.04414"/>
++            <distortion model="ptlens" focal="30.5" a="-0.00269" b="0.00762" c="-0.00738"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard</model>
++        <model>Canon PowerShot SX150 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>canonSX150IS</mount>
+         <cropfactor>5.62</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5" a="0.00489" b="-0.0203" c="0.00662" />
+-            <distortion model="ptlens" focal="5.4" a="0.00131" b="-0.00473" c="-0.0147" />
+-            <distortion model="ptlens" focal="6.6" a="0.00482" b="-0.02275" c="0.00513" />
+-            <distortion model="ptlens" focal="8.2" a="0.00464" b="-0.02242" c="0.00179" />
+-            <distortion model="ptlens" focal="10.4" a="0.00692" b="-0.02854" c="0.01552" />
+-            <distortion model="ptlens" focal="12" a="-0.00161" b="-0.00072" c="-0.00297" />
+-            <distortion model="ptlens" focal="21.8" a="0.00766" b="-0.02324" c="0.02432" />
+-            <distortion model="ptlens" focal="38.1" a="0" b="0.00149" c="0" />
+-            <distortion model="ptlens" focal="47.4" a="0" b="0.00284" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.00312" c="0" />
++            <distortion model="ptlens" focal="5" a="0.00489" b="-0.0203" c="0.00662"/>
++            <distortion model="ptlens" focal="5.4" a="0.00131" b="-0.00473" c="-0.0147"/>
++            <distortion model="ptlens" focal="6.6" a="0.00482" b="-0.02275" c="0.00513"/>
++            <distortion model="ptlens" focal="8.2" a="0.00464" b="-0.02242" c="0.00179"/>
++            <distortion model="ptlens" focal="10.4" a="0.00692" b="-0.02854" c="0.01552"/>
++            <distortion model="ptlens" focal="12" a="-0.00161" b="-0.00072" c="-0.00297"/>
++            <distortion model="ptlens" focal="21.8" a="0.00766" b="-0.02324" c="0.02432"/>
++            <distortion model="ptlens" focal="38.1" a="0" b="0.00149" c="0"/>
++            <distortion model="ptlens" focal="47.4" a="0" b="0.00284" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.00312" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Standard (CHDK's DNG)</model>
++        <model>Canon PowerShot SX150 IS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
+         <mount>canonSX150IS</mount>
+         <cropfactor>5.62</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5" a="0.02028" b="-0.08888" c="-0.01226" />
+-            <distortion model="ptlens" focal="5.4" a="0.01979" b="-0.08316" c="-0.00808" />
+-            <distortion model="ptlens" focal="6.6" a="0.01447" b="-0.06509" c="0.01205" />
+-            <distortion model="ptlens" focal="8.2" a="0.00557" b="-0.03164" c="0.00251" />
+-            <distortion model="ptlens" focal="10.4" a="0.00188" b="-0.01367" c="0.00334" />
+-            <distortion model="ptlens" focal="12" a="0.00808" b="-0.03209" c="0.02894" />
+-            <distortion model="ptlens" focal="21.8" a="0" b="0.00062" c="0" />
+-            <distortion model="ptlens" focal="38.1" a="0" b="0.00309" c="0" />
+-            <distortion model="ptlens" focal="47.4" a="0" b="0.00314" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.00298" c="0" />
+-            <tca model="poly3" focal="5" br="-0.0000799" vr="1.0004457" bb="-0.0000680" vb="1.0003187" />
+-            <tca model="poly3" focal="5.4" br="-0.0000744" vr="1.0004390" bb="-0.0000547" vb="1.0002936" />
+-            <tca model="poly3" focal="6.6" br="-0.0001092" vr="1.0004490" bb="-0.0000238" vb="1.0002605" />
+-            <tca model="poly3" focal="8.2" br="-0.0000718" vr="1.0003682" bb="0.0000340" vb="1.0001946" />
+-            <tca model="poly3" focal="10.4" br="-0.0000597" vr="1.0002592" bb="0.0000078" vb="1.0002011" />
+-            <tca model="poly3" focal="12" br="-0.0000367" vr="1.0001774" bb="0.0000003" vb="1.0001767" />
+-            <tca model="poly3" focal="21.8" br="-0.0000233" vr="1.0000005" bb="-0.0000274" vb="1.0000798" />
+-            <tca model="poly3" focal="38.1" br="-0.0000047" vr="0.9998767" bb="-0.0000423" vb="0.9999487" />
+-            <tca model="poly3" focal="47.4" br="-0.0000220" vr="0.9998718" bb="-0.0000519" vb="0.9999109" />
+-            <tca model="poly3" focal="60" br="-0.0000047" vr="0.9997923" bb="-0.0000699" vb="0.9998986" />
++            <distortion model="ptlens" focal="5" a="0.02028" b="-0.08888" c="-0.01226"/>
++            <distortion model="ptlens" focal="5.4" a="0.01979" b="-0.08316" c="-0.00808"/>
++            <distortion model="ptlens" focal="6.6" a="0.01447" b="-0.06509" c="0.01205"/>
++            <distortion model="ptlens" focal="8.2" a="0.00557" b="-0.03164" c="0.00251"/>
++            <distortion model="ptlens" focal="10.4" a="0.00188" b="-0.01367" c="0.00334"/>
++            <distortion model="ptlens" focal="12" a="0.00808" b="-0.03209" c="0.02894"/>
++            <distortion model="ptlens" focal="21.8" a="0" b="0.00062" c="0"/>
++            <distortion model="ptlens" focal="38.1" a="0" b="0.00309" c="0"/>
++            <distortion model="ptlens" focal="47.4" a="0" b="0.00314" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.00298" c="0"/>
++            <tca model="poly3" focal="5" br="-0.0000799" vr="1.0004457" bb="-0.0000680" vb="1.0003187"/>
++            <tca model="poly3" focal="5.4" br="-0.0000744" vr="1.0004390" bb="-0.0000547" vb="1.0002936"/>
++            <tca model="poly3" focal="6.6" br="-0.0001092" vr="1.0004490" bb="-0.0000238" vb="1.0002605"/>
++            <tca model="poly3" focal="8.2" br="-0.0000718" vr="1.0003682" bb="0.0000340" vb="1.0001946"/>
++            <tca model="poly3" focal="10.4" br="-0.0000597" vr="1.0002592" bb="0.0000078" vb="1.0002011"/>
++            <tca model="poly3" focal="12" br="-0.0000367" vr="1.0001774" bb="0.0000003" vb="1.0001767"/>
++            <tca model="poly3" focal="21.8" br="-0.0000233" vr="1.0000005" bb="-0.0000274" vb="1.0000798"/>
++            <tca model="poly3" focal="38.1" br="-0.0000047" vr="0.9998767" bb="-0.0000423" vb="0.9999487"/>
++            <tca model="poly3" focal="47.4" br="-0.0000220" vr="0.9998718" bb="-0.0000519" vb="0.9999109"/>
++            <tca model="poly3" focal="60" br="-0.0000047" vr="0.9997923" bb="-0.0000699" vb="0.9998986"/>
++            <vignetting model="pa" focal="5" aperture="3.7" distance="10" k1="-0.6199" k2="2.0448" k3="-2.2211"/>
++            <vignetting model="pa" focal="5" aperture="3.7" distance="1000" k1="-0.6199" k2="2.0448" k3="-2.2211"/>
++            <vignetting model="pa" focal="5" aperture="4.1" distance="10" k1="-0.6753" k2="2.2212" k3="-2.3289"/>
++            <vignetting model="pa" focal="5" aperture="4.1" distance="1000" k1="-0.6753" k2="2.2212" k3="-2.3289"/>
++            <vignetting model="pa" focal="5" aperture="5.9" distance="10" k1="-0.8781" k2="2.8833" k3="-2.7814"/>
++            <vignetting model="pa" focal="5" aperture="5.9" distance="1000" k1="-0.8781" k2="2.8833" k3="-2.7814"/>
++            <vignetting model="pa" focal="5" aperture="8" distance="10" k1="-0.9592" k2="3.1347" k3="-2.9511"/>
++            <vignetting model="pa" focal="5" aperture="8" distance="1000" k1="-0.9592" k2="3.1347" k3="-2.9511"/>
++            <vignetting model="pa" focal="6.6" aperture="3.6" distance="10" k1="-0.1295" k2="0.0227" k3="-0.1148"/>
++            <vignetting model="pa" focal="6.6" aperture="3.6" distance="1000" k1="-0.1295" k2="0.0227" k3="-0.1148"/>
++            <vignetting model="pa" focal="6.6" aperture="4" distance="10" k1="-0.1662" k2="0.1419" k3="-0.1471"/>
++            <vignetting model="pa" focal="6.6" aperture="4" distance="1000" k1="-0.1662" k2="0.1419" k3="-0.1471"/>
++            <vignetting model="pa" focal="6.6" aperture="5.6" distance="10" k1="-0.1450" k2="0.0529" k3="-0.0498"/>
++            <vignetting model="pa" focal="6.6" aperture="5.6" distance="1000" k1="-0.1450" k2="0.0529" k3="-0.0498"/>
++            <vignetting model="pa" focal="6.6" aperture="7.7" distance="10" k1="-0.1468" k2="0.0540" k3="-0.0494"/>
++            <vignetting model="pa" focal="6.6" aperture="7.7" distance="1000" k1="-0.1468" k2="0.0540" k3="-0.0494"/>
++            <vignetting model="pa" focal="8.2" aperture="3.9" distance="10" k1="-0.1364" k2="0.0861" k3="-0.1207"/>
++            <vignetting model="pa" focal="8.2" aperture="3.9" distance="1000" k1="-0.1364" k2="0.0861" k3="-0.1207"/>
++            <vignetting model="pa" focal="8.2" aperture="5.5" distance="10" k1="-0.1225" k2="0.0388" k3="-0.0368"/>
++            <vignetting model="pa" focal="8.2" aperture="5.5" distance="1000" k1="-0.1225" k2="0.0388" k3="-0.0368"/>
++            <vignetting model="pa" focal="8.2" aperture="7.9" distance="10" k1="-0.1250" k2="0.0450" k3="-0.0400"/>
++            <vignetting model="pa" focal="8.2" aperture="7.9" distance="1000" k1="-0.1250" k2="0.0450" k3="-0.0400"/>
++            <vignetting model="pa" focal="10.7" aperture="4" distance="10" k1="-0.0730" k2="-0.0719" k3="-0.0334"/>
++            <vignetting model="pa" focal="10.7" aperture="4" distance="1000" k1="-0.0730" k2="-0.0719" k3="-0.0334"/>
++            <vignetting model="pa" focal="10.7" aperture="5.7" distance="10" k1="-0.0971" k2="0.0327" k3="-0.0346"/>
++            <vignetting model="pa" focal="10.7" aperture="5.7" distance="1000" k1="-0.0971" k2="0.0327" k3="-0.0346"/>
++            <vignetting model="pa" focal="10.7" aperture="8" distance="10" k1="-0.0998" k2="0.0419" k3="-0.0396"/>
++            <vignetting model="pa" focal="10.7" aperture="8" distance="1000" k1="-0.0998" k2="0.0419" k3="-0.0396"/>
++            <vignetting model="pa" focal="17.8" aperture="4.6" distance="10" k1="-0.0843" k2="0.0140" k3="-0.0787"/>
++            <vignetting model="pa" focal="17.8" aperture="4.6" distance="1000" k1="-0.0843" k2="0.0140" k3="-0.0787"/>
++            <vignetting model="pa" focal="17.8" aperture="5.6" distance="10" k1="-0.0834" k2="0.0480" k3="-0.0480"/>
++            <vignetting model="pa" focal="17.8" aperture="5.6" distance="1000" k1="-0.0834" k2="0.0480" k3="-0.0480"/>
++            <vignetting model="pa" focal="17.8" aperture="8" distance="10" k1="-0.0780" k2="0.0458" k3="-0.0464"/>
++            <vignetting model="pa" focal="17.8" aperture="8" distance="1000" k1="-0.0780" k2="0.0458" k3="-0.0464"/>
++            <vignetting model="pa" focal="29.7" aperture="5.1" distance="10" k1="-0.1719" k2="0.5148" k3="-0.5598"/>
++            <vignetting model="pa" focal="29.7" aperture="5.1" distance="1000" k1="-0.1719" k2="0.5148" k3="-0.5598"/>
++            <vignetting model="pa" focal="29.7" aperture="5.8" distance="10" k1="-0.1549" k2="0.4257" k3="-0.4136"/>
++            <vignetting model="pa" focal="29.7" aperture="5.8" distance="1000" k1="-0.1549" k2="0.4257" k3="-0.4136"/>
++            <vignetting model="pa" focal="29.7" aperture="8" distance="10" k1="-0.0671" k2="0.0825" k3="-0.0785"/>
++            <vignetting model="pa" focal="29.7" aperture="8" distance="1000" k1="-0.0671" k2="0.0825" k3="-0.0785"/>
++            <vignetting model="pa" focal="40.2" aperture="5.2" distance="10" k1="-0.0135" k2="0.1099" k3="-0.4321"/>
++            <vignetting model="pa" focal="40.2" aperture="5.2" distance="1000" k1="-0.0135" k2="0.1099" k3="-0.4321"/>
++            <vignetting model="pa" focal="40.2" aperture="5.8" distance="10" k1="-0.0802" k2="0.3473" k3="-0.5449"/>
++            <vignetting model="pa" focal="40.2" aperture="5.8" distance="1000" k1="-0.0802" k2="0.3473" k3="-0.5449"/>
++            <vignetting model="pa" focal="40.2" aperture="8" distance="10" k1="-0.1508" k2="0.4995" k3="-0.4912"/>
++            <vignetting model="pa" focal="40.2" aperture="8" distance="1000" k1="-0.1508" k2="0.4995" k3="-0.4912"/>
++            <vignetting model="pa" focal="46.6" aperture="5.3" distance="10" k1="0.0949" k2="-0.3337" k3="-0.1263"/>
++            <vignetting model="pa" focal="46.6" aperture="5.3" distance="1000" k1="0.0949" k2="-0.3337" k3="-0.1263"/>
++            <vignetting model="pa" focal="46.6" aperture="5.8" distance="10" k1="0.0271" k2="-0.0224" k3="-0.3168"/>
++            <vignetting model="pa" focal="46.6" aperture="5.8" distance="1000" k1="0.0271" k2="-0.0224" k3="-0.3168"/>
++            <vignetting model="pa" focal="46.6" aperture="8" distance="10" k1="-0.1507" k2="0.5364" k3="-0.5678"/>
++            <vignetting model="pa" focal="46.6" aperture="8" distance="1000" k1="-0.1507" k2="0.5364" k3="-0.5678"/>
++            <vignetting model="pa" focal="49.9" aperture="5.9" distance="10" k1="0.0364" k2="-0.0850" k3="-0.2581"/>
++            <vignetting model="pa" focal="49.9" aperture="5.9" distance="1000" k1="0.0364" k2="-0.0850" k3="-0.2581"/>
++            <vignetting model="pa" focal="49.9" aperture="6.7" distance="10" k1="-0.0625" k2="0.2666" k3="-0.4673"/>
++            <vignetting model="pa" focal="49.9" aperture="6.7" distance="1000" k1="-0.0625" k2="0.2666" k3="-0.4673"/>
++            <vignetting model="pa" focal="49.9" aperture="7.5" distance="10" k1="-0.1259" k2="0.4597" k3="-0.5425"/>
++            <vignetting model="pa" focal="49.9" aperture="7.5" distance="1000" k1="-0.1259" k2="0.4597" k3="-0.5425"/>
++            <vignetting model="pa" focal="49.9" aperture="8" distance="10" k1="-0.1393" k2="0.4823" k3="-0.5259"/>
++            <vignetting model="pa" focal="49.9" aperture="8" distance="1000" k1="-0.1393" k2="0.4823" k3="-0.5259"/>
++            <vignetting model="pa" focal="53.5" aperture="5.6" distance="10" k1="0.0942" k2="-0.3878" k3="-0.0434"/>
++            <vignetting model="pa" focal="53.5" aperture="5.6" distance="1000" k1="0.0942" k2="-0.3878" k3="-0.0434"/>
++            <vignetting model="pa" focal="53.5" aperture="6.6" distance="10" k1="-0.0311" k2="0.1168" k3="-0.3565"/>
++            <vignetting model="pa" focal="53.5" aperture="6.6" distance="1000" k1="-0.0311" k2="0.1168" k3="-0.3565"/>
++            <vignetting model="pa" focal="53.5" aperture="7.4" distance="10" k1="-0.1189" k2="0.3956" k3="-0.4930"/>
++            <vignetting model="pa" focal="53.5" aperture="7.4" distance="1000" k1="-0.1189" k2="0.3956" k3="-0.4930"/>
++            <vignetting model="pa" focal="53.5" aperture="8" distance="10" k1="-0.1362" k2="0.4301" k3="-0.4730"/>
++            <vignetting model="pa" focal="53.5" aperture="8" distance="1000" k1="-0.1362" k2="0.4301" k3="-0.4730"/>
++            <vignetting model="pa" focal="60" aperture="5.7" distance="10" k1="0.0815" k2="-0.4384" k3="0.0211"/>
++            <vignetting model="pa" focal="60" aperture="5.7" distance="1000" k1="0.0815" k2="-0.4384" k3="0.0211"/>
++            <vignetting model="pa" focal="60" aperture="6.2" distance="10" k1="0.0320" k2="-0.1938" k3="-0.1355"/>
++            <vignetting model="pa" focal="60" aperture="6.2" distance="1000" k1="0.0320" k2="-0.1938" k3="-0.1355"/>
++            <vignetting model="pa" focal="60" aperture="6.9" distance="10" k1="-0.0590" k2="0.1369" k3="-0.3344"/>
++            <vignetting model="pa" focal="60" aperture="6.9" distance="1000" k1="-0.0590" k2="0.1369" k3="-0.3344"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.1351" k2="0.3622" k3="-0.4197"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.1351" k2="0.3622" k3="-0.4197"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX220 HS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonSX220HS</mount>
++        <mount>canonSX230HS</mount>
++        <cropfactor>5.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5" a="0.02746" b="-0.1202" c="0.01599"/>
++            <distortion model="ptlens" focal="5.6" a="0.02357" b="-0.10154" c="0.00125"/>
++            <distortion model="ptlens" focal="6.1" a="0.01844" b="-0.08194" c="0.00145"/>
++            <distortion model="ptlens" focal="7" a="0.01068" b="-0.05292" c="-0.00089"/>
++            <distortion model="ptlens" focal="9.2" a="0.00078" b="-0.01168" c="-0.01592"/>
++            <distortion model="ptlens" focal="11.5" a="0.00335" b="-0.01376" c="-0.00191"/>
++            <distortion model="ptlens" focal="14.7" a="0.00628" b="-0.02587" c="0.02812"/>
++            <distortion model="ptlens" focal="27.2" a="0.00104" b="-0.00722" c="0.01207"/>
++            <distortion model="ptlens" focal="49.2" a="0.00194" b="-0.01058" c="0.01279"/>
++            <distortion model="ptlens" focal="70" a="-0.00025" b="0.00848" c="-0.00985"/>
++            <tca model="poly3" focal="5" vr="1.00035" vb="1.00052"/>
++            <tca model="poly3" focal="5.6" vr="1.00044" vb="1.00053"/>
++            <tca model="poly3" focal="6.1" vr="1.0003" vb="1.0003"/>
++            <tca model="poly3" focal="7" vr="1.0005" vb="1.0005"/>
++            <tca model="poly3" focal="9.2" vr="1.0005" vb="1.0004"/>
++            <tca model="poly3" focal="11.5" vr="1.0005" vb="1.0002"/>
++            <tca model="poly3" focal="14.7" vr="1.0005" vb="1.0001"/>
++            <tca model="poly3" focal="27.2" vr="1.0003" vb="0.9996"/>
++            <tca model="poly3" focal="49.2" vr="1.0000" vb="0.9990"/>
++            <tca model="poly3" focal="70" vr="0.9996" vb="0.9986"/>
++            <vignetting model="pa" focal="5" aperture="3.1" distance="10" k1="-0.4514" k2="1.5033" k3="-2.0306"/>
++            <vignetting model="pa" focal="5" aperture="3.1" distance="1000" k1="-0.4514" k2="1.5033" k3="-2.0306"/>
++            <vignetting model="pa" focal="5" aperture="3.9" distance="10" k1="-0.4059" k2="1.4383" k3="-2.0302"/>
++            <vignetting model="pa" focal="5" aperture="3.9" distance="1000" k1="-0.4059" k2="1.4383" k3="-2.0302"/>
++            <vignetting model="pa" focal="5" aperture="5.6" distance="10" k1="-0.4112" k2="1.5784" k3="-2.1670"/>
++            <vignetting model="pa" focal="5" aperture="5.6" distance="1000" k1="-0.4112" k2="1.5784" k3="-2.1670"/>
++            <vignetting model="pa" focal="5" aperture="7.9" distance="10" k1="-0.4473" k2="1.7002" k3="-2.2789"/>
++            <vignetting model="pa" focal="5" aperture="7.9" distance="1000" k1="-0.4473" k2="1.7002" k3="-2.2789"/>
++            <vignetting model="pa" focal="5.6" aperture="3.2" distance="10" k1="-0.6270" k2="2.0131" k3="-2.2359"/>
++            <vignetting model="pa" focal="5.6" aperture="3.2" distance="1000" k1="-0.6270" k2="2.0131" k3="-2.2359"/>
++            <vignetting model="pa" focal="5.6" aperture="4.1" distance="10" k1="-0.6633" k2="2.2167" k3="-2.4273"/>
++            <vignetting model="pa" focal="5.6" aperture="4.1" distance="1000" k1="-0.6633" k2="2.2167" k3="-2.4273"/>
++            <vignetting model="pa" focal="5.6" aperture="5.7" distance="10" k1="-0.8022" k2="2.7481" k3="-2.8641"/>
++            <vignetting model="pa" focal="5.6" aperture="5.7" distance="1000" k1="-0.8022" k2="2.7481" k3="-2.8641"/>
++            <vignetting model="pa" focal="5.6" aperture="8" distance="10" k1="-0.9367" k2="3.2100" k3="-3.1988"/>
++            <vignetting model="pa" focal="5.6" aperture="8" distance="1000" k1="-0.9367" k2="3.2100" k3="-3.1988"/>
++            <vignetting model="pa" focal="6.1" aperture="3.5" distance="10" k1="-0.4580" k2="1.2422" k3="-1.3381"/>
++            <vignetting model="pa" focal="6.1" aperture="3.5" distance="1000" k1="-0.4580" k2="1.2422" k3="-1.3381"/>
++            <vignetting model="pa" focal="6.1" aperture="4" distance="10" k1="-0.5216" k2="1.4862" k3="-1.4595"/>
++            <vignetting model="pa" focal="6.1" aperture="4" distance="1000" k1="-0.5216" k2="1.4862" k3="-1.4595"/>
++            <vignetting model="pa" focal="6.1" aperture="5.6" distance="10" k1="-0.5683" k2="1.6043" k3="-1.4711"/>
++            <vignetting model="pa" focal="6.1" aperture="5.6" distance="1000" k1="-0.5683" k2="1.6043" k3="-1.4711"/>
++            <vignetting model="pa" focal="6.1" aperture="7.9" distance="10" k1="-0.5347" k2="1.4654" k3="-1.3293"/>
++            <vignetting model="pa" focal="6.1" aperture="7.9" distance="1000" k1="-0.5347" k2="1.4654" k3="-1.3293"/>
++            <vignetting model="pa" focal="6.8" aperture="3.6" distance="10" k1="-0.2713" k2="0.4826" k3="-0.5024"/>
++            <vignetting model="pa" focal="6.8" aperture="3.6" distance="1000" k1="-0.2713" k2="0.4826" k3="-0.5024"/>
++            <vignetting model="pa" focal="6.8" aperture="4" distance="10" k1="-0.2603" k2="0.4582" k3="-0.4190"/>
++            <vignetting model="pa" focal="6.8" aperture="4" distance="1000" k1="-0.2603" k2="0.4582" k3="-0.4190"/>
++            <vignetting model="pa" focal="6.8" aperture="5.6" distance="10" k1="-0.1603" k2="0.0885" k3="-0.0782"/>
++            <vignetting model="pa" focal="6.8" aperture="5.6" distance="1000" k1="-0.1603" k2="0.0885" k3="-0.0782"/>
++            <vignetting model="pa" focal="6.8" aperture="8" distance="10" k1="-0.1379" k2="0.0139" k3="-0.0140"/>
++            <vignetting model="pa" focal="6.8" aperture="8" distance="1000" k1="-0.1379" k2="0.0139" k3="-0.0140"/>
++            <vignetting model="pa" focal="8.5" aperture="3.7" distance="10" k1="-0.1295" k2="0.0408" k3="-0.0723"/>
++            <vignetting model="pa" focal="8.5" aperture="3.7" distance="1000" k1="-0.1295" k2="0.0408" k3="-0.0723"/>
++            <vignetting model="pa" focal="8.5" aperture="4.1" distance="10" k1="-0.1337" k2="0.0637" k3="-0.0720"/>
++            <vignetting model="pa" focal="8.5" aperture="4.1" distance="1000" k1="-0.1337" k2="0.0637" k3="-0.0720"/>
++            <vignetting model="pa" focal="8.5" aperture="5.8" distance="10" k1="-0.1071" k2="-0.0178" k3="0.0224"/>
++            <vignetting model="pa" focal="8.5" aperture="5.8" distance="1000" k1="-0.1071" k2="-0.0178" k3="0.0224"/>
++            <vignetting model="pa" focal="8.5" aperture="8" distance="10" k1="-0.0988" k2="-0.0318" k3="0.0299"/>
++            <vignetting model="pa" focal="8.5" aperture="8" distance="1000" k1="-0.0988" k2="-0.0318" k3="0.0299"/>
++            <vignetting model="pa" focal="8.6" aperture="4" distance="10" k1="-0.1234" k2="0.0624" k3="-0.0726"/>
++            <vignetting model="pa" focal="8.6" aperture="4" distance="1000" k1="-0.1234" k2="0.0624" k3="-0.0726"/>
++            <vignetting model="pa" focal="8.6" aperture="5.8" distance="10" k1="-0.0956" k2="-0.0189" k3="0.0225"/>
++            <vignetting model="pa" focal="8.6" aperture="5.8" distance="1000" k1="-0.0956" k2="-0.0189" k3="0.0225"/>
++            <vignetting model="pa" focal="8.6" aperture="8" distance="10" k1="-0.0912" k2="-0.0215" k3="0.0212"/>
++            <vignetting model="pa" focal="8.6" aperture="8" distance="1000" k1="-0.0912" k2="-0.0215" k3="0.0212"/>
++            <vignetting model="pa" focal="12.2" aperture="4.2" distance="10" k1="-0.0962" k2="0.0722" k3="-0.0894"/>
++            <vignetting model="pa" focal="12.2" aperture="4.2" distance="1000" k1="-0.0962" k2="0.0722" k3="-0.0894"/>
++            <vignetting model="pa" focal="12.2" aperture="5.8" distance="10" k1="-0.0794" k2="0.0156" k3="-0.0009"/>
++            <vignetting model="pa" focal="12.2" aperture="5.8" distance="1000" k1="-0.0794" k2="0.0156" k3="-0.0009"/>
++            <vignetting model="pa" focal="12.2" aperture="8" distance="10" k1="-0.0732" k2="0.0110" k3="-0.0010"/>
++            <vignetting model="pa" focal="12.2" aperture="8" distance="1000" k1="-0.0732" k2="0.0110" k3="-0.0010"/>
++            <vignetting model="pa" focal="14.7" aperture="4.5" distance="10" k1="-0.0725" k2="0.0795" k3="-0.1002"/>
++            <vignetting model="pa" focal="14.7" aperture="4.5" distance="1000" k1="-0.0725" k2="0.0795" k3="-0.1002"/>
++            <vignetting model="pa" focal="14.7" aperture="5.7" distance="10" k1="-0.0616" k2="0.0306" k3="-0.0112"/>
++            <vignetting model="pa" focal="14.7" aperture="5.7" distance="1000" k1="-0.0616" k2="0.0306" k3="-0.0112"/>
++            <vignetting model="pa" focal="14.7" aperture="8" distance="10" k1="-0.0565" k2="0.0281" k3="-0.0118"/>
++            <vignetting model="pa" focal="14.7" aperture="8" distance="1000" k1="-0.0565" k2="0.0281" k3="-0.0118"/>
++            <vignetting model="pa" focal="18.8" aperture="4.7" distance="10" k1="-0.0712" k2="0.0961" k3="-0.0988"/>
++            <vignetting model="pa" focal="18.8" aperture="4.7" distance="1000" k1="-0.0712" k2="0.0961" k3="-0.0988"/>
++            <vignetting model="pa" focal="18.8" aperture="5.8" distance="10" k1="-0.0583" k2="0.0464" k3="-0.0230"/>
++            <vignetting model="pa" focal="18.8" aperture="5.8" distance="1000" k1="-0.0583" k2="0.0464" k3="-0.0230"/>
++            <vignetting model="pa" focal="18.8" aperture="8" distance="10" k1="-0.0531" k2="0.0420" k3="-0.0210"/>
++            <vignetting model="pa" focal="18.8" aperture="8" distance="1000" k1="-0.0531" k2="0.0420" k3="-0.0210"/>
++            <vignetting model="pa" focal="22.4" aperture="5.1" distance="10" k1="-0.0720" k2="0.1924" k3="-0.1811"/>
++            <vignetting model="pa" focal="22.4" aperture="5.1" distance="1000" k1="-0.0720" k2="0.1924" k3="-0.1811"/>
++            <vignetting model="pa" focal="22.4" aperture="5.7" distance="10" k1="-0.0466" k2="0.0950" k3="-0.0695"/>
++            <vignetting model="pa" focal="22.4" aperture="5.7" distance="1000" k1="-0.0466" k2="0.0950" k3="-0.0695"/>
++            <vignetting model="pa" focal="22.4" aperture="6.4" distance="10" k1="-0.0339" k2="0.0476" k3="-0.0239"/>
++            <vignetting model="pa" focal="22.4" aperture="6.4" distance="1000" k1="-0.0339" k2="0.0476" k3="-0.0239"/>
++            <vignetting model="pa" focal="22.4" aperture="8" distance="10" k1="-0.0296" k2="0.0411" k3="-0.0194"/>
++            <vignetting model="pa" focal="22.4" aperture="8" distance="1000" k1="-0.0296" k2="0.0411" k3="-0.0194"/>
++            <vignetting model="pa" focal="33" aperture="5.2" distance="10" k1="-0.0966" k2="0.5183" k3="-0.6242"/>
++            <vignetting model="pa" focal="33" aperture="5.2" distance="1000" k1="-0.0966" k2="0.5183" k3="-0.6242"/>
++            <vignetting model="pa" focal="33" aperture="5.8" distance="10" k1="-0.1067" k2="0.5290" k3="-0.5738"/>
++            <vignetting model="pa" focal="33" aperture="5.8" distance="1000" k1="-0.1067" k2="0.5290" k3="-0.5738"/>
++            <vignetting model="pa" focal="33" aperture="6.5" distance="10" k1="-0.1067" k2="0.4816" k3="-0.4699"/>
++            <vignetting model="pa" focal="33" aperture="6.5" distance="1000" k1="-0.1067" k2="0.4816" k3="-0.4699"/>
++            <vignetting model="pa" focal="33" aperture="8" distance="10" k1="-0.0698" k2="0.3120" k3="-0.2741"/>
++            <vignetting model="pa" focal="33" aperture="8" distance="1000" k1="-0.0698" k2="0.3120" k3="-0.2741"/>
++            <vignetting model="pa" focal="40.3" aperture="5.3" distance="10" k1="0.1238" k2="-0.1322" k3="-0.2918"/>
++            <vignetting model="pa" focal="40.3" aperture="5.3" distance="1000" k1="0.1238" k2="-0.1322" k3="-0.2918"/>
++            <vignetting model="pa" focal="40.3" aperture="5.8" distance="10" k1="0.0788" k2="0.0301" k3="-0.3739"/>
++            <vignetting model="pa" focal="40.3" aperture="5.8" distance="1000" k1="0.0788" k2="0.0301" k3="-0.3739"/>
++            <vignetting model="pa" focal="40.3" aperture="6.5" distance="10" k1="-0.0010" k2="0.3061" k3="-0.5212"/>
++            <vignetting model="pa" focal="40.3" aperture="6.5" distance="1000" k1="-0.0010" k2="0.3061" k3="-0.5212"/>
++            <vignetting model="pa" focal="40.3" aperture="8" distance="10" k1="-0.0839" k2="0.5579" k3="-0.6183"/>
++            <vignetting model="pa" focal="40.3" aperture="8" distance="1000" k1="-0.0839" k2="0.5579" k3="-0.6183"/>
++            <vignetting model="pa" focal="42.9" aperture="5.8" distance="10" k1="0.1483" k2="-0.2135" k3="-0.2300"/>
++            <vignetting model="pa" focal="42.9" aperture="5.8" distance="1000" k1="0.1483" k2="-0.2135" k3="-0.2300"/>
++            <vignetting model="pa" focal="42.9" aperture="6.6" distance="10" k1="0.0415" k2="0.1903" k3="-0.4785"/>
++            <vignetting model="pa" focal="42.9" aperture="6.6" distance="1000" k1="0.0415" k2="0.1903" k3="-0.4785"/>
++            <vignetting model="pa" focal="42.9" aperture="7.3" distance="10" k1="-0.0347" k2="0.4463" k3="-0.6207"/>
++            <vignetting model="pa" focal="42.9" aperture="7.3" distance="1000" k1="-0.0347" k2="0.4463" k3="-0.6207"/>
++            <vignetting model="pa" focal="42.9" aperture="8" distance="10" k1="-0.0742" k2="0.5689" k3="-0.6752"/>
++            <vignetting model="pa" focal="42.9" aperture="8" distance="1000" k1="-0.0742" k2="0.5689" k3="-0.6752"/>
++            <vignetting model="pa" focal="57.6" aperture="5.9" distance="10" k1="0.3294" k2="-1.2764" k3="0.5831"/>
++            <vignetting model="pa" focal="57.6" aperture="5.9" distance="1000" k1="0.3294" k2="-1.2764" k3="0.5831"/>
++            <vignetting model="pa" focal="57.6" aperture="6.7" distance="10" k1="0.2906" k2="-0.9020" k3="0.2822"/>
++            <vignetting model="pa" focal="57.6" aperture="6.7" distance="1000" k1="0.2906" k2="-0.9020" k3="0.2822"/>
++            <vignetting model="pa" focal="57.6" aperture="7.5" distance="10" k1="0.1840" k2="-0.3988" k3="-0.0835"/>
++            <vignetting model="pa" focal="57.6" aperture="7.5" distance="1000" k1="0.1840" k2="-0.3988" k3="-0.0835"/>
++            <vignetting model="pa" focal="57.6" aperture="8" distance="10" k1="0.1187" k2="-0.1355" k3="-0.2634"/>
++            <vignetting model="pa" focal="57.6" aperture="8" distance="1000" k1="0.1187" k2="-0.1355" k3="-0.2634"/>
++            <vignetting model="pa" focal="70" aperture="6.6" distance="10" k1="0.2333" k2="-1.1394" k3="0.5647"/>
++            <vignetting model="pa" focal="70" aperture="6.6" distance="1000" k1="0.2333" k2="-1.1394" k3="0.5647"/>
++            <vignetting model="pa" focal="70" aperture="7.4" distance="10" k1="0.1877" k2="-0.7321" k3="0.2385"/>
++            <vignetting model="pa" focal="70" aperture="7.4" distance="1000" k1="0.1877" k2="-0.7321" k3="0.2385"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="0.1299" k2="-0.4542" k3="0.0414"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="0.1299" k2="-0.4542" k3="0.0414"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX220 HS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonSX220HS</mount>
++        <cropfactor>5.6</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="5" k1="-0.00538"/>
++            <distortion model="poly3" focal="5.6" k1="-0.01139"/>
++            <distortion model="poly3" focal="6.1" k1="-0.01057"/>
++            <distortion model="poly3" focal="8.5" k1="-0.00697"/>
++            <distortion model="poly3" focal="17.3" k1="-0.00102"/>
++            <distortion model="poly3" focal="27.2" k1="-0.00042"/>
++            <distortion model="poly3" focal="49.2" k1="-0.00202"/>
++            <distortion model="poly3" focal="70" k1="0.0042"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A720 IS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonA720IS</mount>
++        <cropfactor>6.03</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5.8" a="0.02218" b="-0.07779" c="0.05524"/>
++            <distortion model="ptlens" focal="6.4" a="0.01639" b="-0.0598" c="0.04786"/>
++            <distortion model="ptlens" focal="7.1" a="0.01223" b="-0.04113" c="0.02913"/>
++            <distortion model="ptlens" focal="11.5" a="0.0015" b="-0.00506" c="0.00807"/>
++            <distortion model="ptlens" focal="26.7" a="-0.00758" b="0.02306" c="-0.02099"/>
++            <distortion model="ptlens" focal="34.8" a="-0.00352" b="0.01759" c="-0.01439"/>
++            <vignetting model="pa" focal="5.8" aperture="2.8" distance="10" k1="-0.1720" k2="0.2156" k3="-0.3874"/>
++            <vignetting model="pa" focal="5.8" aperture="2.8" distance="1000" k1="-0.1720" k2="0.2156" k3="-0.3874"/>
++            <vignetting model="pa" focal="5.8" aperture="3.9" distance="10" k1="-0.2631" k2="0.5089" k3="-0.4309"/>
++            <vignetting model="pa" focal="5.8" aperture="3.9" distance="1000" k1="-0.2631" k2="0.5089" k3="-0.4309"/>
++            <vignetting model="pa" focal="5.8" aperture="5.5" distance="10" k1="-0.2016" k2="0.2547" k3="-0.2347"/>
++            <vignetting model="pa" focal="5.8" aperture="5.5" distance="1000" k1="-0.2016" k2="0.2547" k3="-0.2347"/>
++            <vignetting model="pa" focal="5.8" aperture="7.5" distance="10" k1="-0.1389" k2="0.0163" k3="-0.0184"/>
++            <vignetting model="pa" focal="5.8" aperture="7.5" distance="1000" k1="-0.1389" k2="0.0163" k3="-0.0184"/>
++            <vignetting model="pa" focal="7.7" aperture="2.9" distance="10" k1="-0.2064" k2="0.3295" k3="-0.4093"/>
++            <vignetting model="pa" focal="7.7" aperture="2.9" distance="1000" k1="-0.2064" k2="0.3295" k3="-0.4093"/>
++            <vignetting model="pa" focal="7.7" aperture="4.2" distance="10" k1="-0.1875" k2="0.3053" k3="-0.2610"/>
++            <vignetting model="pa" focal="7.7" aperture="4.2" distance="1000" k1="-0.1875" k2="0.3053" k3="-0.2610"/>
++            <vignetting model="pa" focal="7.7" aperture="5.9" distance="10" k1="-0.1223" k2="0.0857" k3="-0.0666"/>
++            <vignetting model="pa" focal="7.7" aperture="5.9" distance="1000" k1="-0.1223" k2="0.0857" k3="-0.0666"/>
++            <vignetting model="pa" focal="7.7" aperture="8" distance="10" k1="-0.0991" k2="0.0023" k3="0.0045"/>
++            <vignetting model="pa" focal="7.7" aperture="8" distance="1000" k1="-0.0991" k2="0.0023" k3="0.0045"/>
++            <vignetting model="pa" focal="10" aperture="3.1" distance="10" k1="-0.1770" k2="0.3495" k3="-0.4393"/>
++            <vignetting model="pa" focal="10" aperture="3.1" distance="1000" k1="-0.1770" k2="0.3495" k3="-0.4393"/>
++            <vignetting model="pa" focal="10" aperture="3.8" distance="10" k1="-0.1951" k2="0.4568" k3="-0.4082"/>
++            <vignetting model="pa" focal="10" aperture="3.8" distance="1000" k1="-0.1951" k2="0.4568" k3="-0.4082"/>
++            <vignetting model="pa" focal="10" aperture="5.3" distance="10" k1="-0.1019" k2="0.1131" k3="-0.0868"/>
++            <vignetting model="pa" focal="10" aperture="5.3" distance="1000" k1="-0.1019" k2="0.1131" k3="-0.0868"/>
++            <vignetting model="pa" focal="10" aperture="7.5" distance="10" k1="-0.0613" k2="-0.0024" k3="0.0037"/>
++            <vignetting model="pa" focal="10" aperture="7.5" distance="1000" k1="-0.0613" k2="-0.0024" k3="0.0037"/>
++            <vignetting model="pa" focal="14.7" aperture="3.4" distance="10" k1="-0.1399" k2="0.3507" k3="-0.4171"/>
++            <vignetting model="pa" focal="14.7" aperture="3.4" distance="1000" k1="-0.1399" k2="0.3507" k3="-0.4171"/>
++            <vignetting model="pa" focal="14.7" aperture="3.8" distance="10" k1="-0.1610" k2="0.4957" k3="-0.4625"/>
++            <vignetting model="pa" focal="14.7" aperture="3.8" distance="1000" k1="-0.1610" k2="0.4957" k3="-0.4625"/>
++            <vignetting model="pa" focal="14.7" aperture="5.5" distance="10" k1="-0.0513" k2="0.0673" k3="-0.0453"/>
++            <vignetting model="pa" focal="14.7" aperture="5.5" distance="1000" k1="-0.0513" k2="0.0673" k3="-0.0453"/>
++            <vignetting model="pa" focal="14.7" aperture="7.8" distance="10" k1="-0.0317" k2="0.0205" k3="-0.0126"/>
++            <vignetting model="pa" focal="14.7" aperture="7.8" distance="1000" k1="-0.0317" k2="0.0205" k3="-0.0126"/>
++            <vignetting model="pa" focal="22.8" aperture="4" distance="10" k1="-0.0796" k2="0.1648" k3="-0.2315"/>
++            <vignetting model="pa" focal="22.8" aperture="4" distance="1000" k1="-0.0796" k2="0.1648" k3="-0.2315"/>
++            <vignetting model="pa" focal="22.8" aperture="5.6" distance="10" k1="-0.0215" k2="0.0048" k3="-0.0059"/>
++            <vignetting model="pa" focal="22.8" aperture="5.6" distance="1000" k1="-0.0215" k2="0.0048" k3="-0.0059"/>
++            <vignetting model="pa" focal="22.8" aperture="7.8" distance="10" k1="-0.0155" k2="-0.0143" k3="0.0078"/>
++            <vignetting model="pa" focal="22.8" aperture="7.8" distance="1000" k1="-0.0155" k2="-0.0143" k3="0.0078"/>
++            <vignetting model="pa" focal="34.8" aperture="4.9" distance="10" k1="-0.1268" k2="-0.0734" k3="-0.0007"/>
++            <vignetting model="pa" focal="34.8" aperture="4.9" distance="1000" k1="-0.1268" k2="-0.0734" k3="-0.0007"/>
++            <vignetting model="pa" focal="34.8" aperture="5.6" distance="10" k1="-0.1098" k2="-0.1022" k3="0.0460"/>
++            <vignetting model="pa" focal="34.8" aperture="5.6" distance="1000" k1="-0.1098" k2="-0.1022" k3="0.0460"/>
++            <vignetting model="pa" focal="34.8" aperture="7.9" distance="10" k1="-0.0949" k2="-0.1558" k3="0.0878"/>
++            <vignetting model="pa" focal="34.8" aperture="7.9" distance="1000" k1="-0.0949" k2="-0.1558" k3="0.0878"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A640 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonA640</mount>
++        <cropfactor>4.79</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="7.3" a="0.02127" b="-0.05684" c="0.0111"/>
++            <distortion model="ptlens" focal="8.5" a="0.01234" b="-0.03216" c="-0.00418"/>
++            <distortion model="ptlens" focal="9.6" a="0.00595" b="-0.01344" c="-0.01032"/>
++            <distortion model="ptlens" focal="10.8" a="0.01574" b="-0.04867" c="0.03964"/>
++            <distortion model="ptlens" focal="12.6" a="0" b="0.00126" c="0"/>
++            <distortion model="ptlens" focal="29.2" a="0" b="0.00432" c="0"/>
++            <vignetting model="pa" focal="7.3" aperture="2.9" distance="10" k1="-0.2680" k2="0.2617" k3="-0.4865"/>
++            <vignetting model="pa" focal="7.3" aperture="2.9" distance="1000" k1="-0.2680" k2="0.2617" k3="-0.4865"/>
++            <vignetting model="pa" focal="7.3" aperture="4.2" distance="10" k1="-0.4023" k2="0.6843" k3="-0.6517"/>
++            <vignetting model="pa" focal="7.3" aperture="4.2" distance="1000" k1="-0.4023" k2="0.6843" k3="-0.6517"/>
++            <vignetting model="pa" focal="7.3" aperture="5.8" distance="10" k1="-0.3638" k2="0.4933" k3="-0.4203"/>
++            <vignetting model="pa" focal="7.3" aperture="5.8" distance="1000" k1="-0.3638" k2="0.4933" k3="-0.4203"/>
++            <vignetting model="pa" focal="7.3" aperture="8" distance="10" k1="-0.2783" k2="0.1703" k3="-0.1221"/>
++            <vignetting model="pa" focal="7.3" aperture="8" distance="1000" k1="-0.2783" k2="0.1703" k3="-0.1221"/>
++            <vignetting model="pa" focal="8.5" aperture="2.9" distance="10" k1="-0.3603" k2="0.3063" k3="-0.2459"/>
++            <vignetting model="pa" focal="8.5" aperture="2.9" distance="1000" k1="-0.3603" k2="0.3063" k3="-0.2459"/>
++            <vignetting model="pa" focal="8.5" aperture="3.9" distance="10" k1="-0.2402" k2="0.0817" k3="-0.0274"/>
++            <vignetting model="pa" focal="8.5" aperture="3.9" distance="1000" k1="-0.2402" k2="0.0817" k3="-0.0274"/>
++            <vignetting model="pa" focal="8.5" aperture="5.5" distance="10" k1="-0.2470" k2="0.1125" k3="-0.0481"/>
++            <vignetting model="pa" focal="8.5" aperture="5.5" distance="1000" k1="-0.2470" k2="0.1125" k3="-0.0481"/>
++            <vignetting model="pa" focal="8.5" aperture="7.8" distance="10" k1="-0.2472" k2="0.1190" k3="-0.0526"/>
++            <vignetting model="pa" focal="8.5" aperture="7.8" distance="1000" k1="-0.2472" k2="0.1190" k3="-0.0526"/>
++            <vignetting model="pa" focal="9.6" aperture="3.1" distance="10" k1="-0.2337" k2="0.0955" k3="-0.0709"/>
++            <vignetting model="pa" focal="9.6" aperture="3.1" distance="1000" k1="-0.2337" k2="0.0955" k3="-0.0709"/>
++            <vignetting model="pa" focal="9.6" aperture="3.9" distance="10" k1="-0.2110" k2="0.0608" k3="-0.0086"/>
++            <vignetting model="pa" focal="9.6" aperture="3.9" distance="1000" k1="-0.2110" k2="0.0608" k3="-0.0086"/>
++            <vignetting model="pa" focal="9.6" aperture="5.3" distance="10" k1="-0.2204" k2="0.0976" k3="-0.0333"/>
++            <vignetting model="pa" focal="9.6" aperture="5.3" distance="1000" k1="-0.2204" k2="0.0976" k3="-0.0333"/>
++            <vignetting model="pa" focal="9.6" aperture="7.8" distance="10" k1="-0.2181" k2="0.0976" k3="-0.0318"/>
++            <vignetting model="pa" focal="9.6" aperture="7.8" distance="1000" k1="-0.2181" k2="0.0976" k3="-0.0318"/>
++            <vignetting model="pa" focal="10.8" aperture="3.1" distance="10" k1="-0.2932" k2="0.2521" k3="-0.1823"/>
++            <vignetting model="pa" focal="10.8" aperture="3.1" distance="1000" k1="-0.2932" k2="0.2521" k3="-0.1823"/>
++            <vignetting model="pa" focal="10.8" aperture="3.9" distance="10" k1="-0.1899" k2="0.0732" k3="-0.0228"/>
++            <vignetting model="pa" focal="10.8" aperture="3.9" distance="1000" k1="-0.1899" k2="0.0732" k3="-0.0228"/>
++            <vignetting model="pa" focal="10.8" aperture="5.5" distance="10" k1="-0.1956" k2="0.0996" k3="-0.0386"/>
++            <vignetting model="pa" focal="10.8" aperture="5.5" distance="1000" k1="-0.1956" k2="0.0996" k3="-0.0386"/>
++            <vignetting model="pa" focal="10.8" aperture="7.8" distance="10" k1="-0.1960" k2="0.0990" k3="-0.0354"/>
++            <vignetting model="pa" focal="10.8" aperture="7.8" distance="1000" k1="-0.1960" k2="0.0990" k3="-0.0354"/>
++            <vignetting model="pa" focal="12.6" aperture="3.4" distance="10" k1="-0.2295" k2="0.3265" k3="-0.2752"/>
++            <vignetting model="pa" focal="12.6" aperture="3.4" distance="1000" k1="-0.2295" k2="0.3265" k3="-0.2752"/>
++            <vignetting model="pa" focal="12.6" aperture="4.3" distance="10" k1="-0.1610" k2="0.0788" k3="-0.0313"/>
++            <vignetting model="pa" focal="12.6" aperture="4.3" distance="1000" k1="-0.1610" k2="0.0788" k3="-0.0313"/>
++            <vignetting model="pa" focal="12.6" aperture="5.9" distance="10" k1="-0.1724" k2="0.1119" k3="-0.0513"/>
++            <vignetting model="pa" focal="12.6" aperture="5.9" distance="1000" k1="-0.1724" k2="0.1119" k3="-0.0513"/>
++            <vignetting model="pa" focal="12.6" aperture="7.8" distance="10" k1="-0.1679" k2="0.1075" k3="-0.0493"/>
++            <vignetting model="pa" focal="12.6" aperture="7.8" distance="1000" k1="-0.1679" k2="0.1075" k3="-0.0493"/>
++            <vignetting model="pa" focal="14.9" aperture="3.4" distance="10" k1="-0.3008" k2="0.4667" k3="-0.3934"/>
++            <vignetting model="pa" focal="14.9" aperture="3.4" distance="1000" k1="-0.3008" k2="0.4667" k3="-0.3934"/>
++            <vignetting model="pa" focal="14.9" aperture="3.9" distance="10" k1="-0.1616" k2="0.1845" k3="-0.1445"/>
++            <vignetting model="pa" focal="14.9" aperture="3.9" distance="1000" k1="-0.1616" k2="0.1845" k3="-0.1445"/>
++            <vignetting model="pa" focal="14.9" aperture="5.3" distance="10" k1="-0.1155" k2="0.0275" k3="-0.0039"/>
++            <vignetting model="pa" focal="14.9" aperture="5.3" distance="1000" k1="-0.1155" k2="0.0275" k3="-0.0039"/>
++            <vignetting model="pa" focal="14.9" aperture="7.8" distance="10" k1="-0.1101" k2="0.0214" k3="-0.0012"/>
++            <vignetting model="pa" focal="14.9" aperture="7.8" distance="1000" k1="-0.1101" k2="0.0214" k3="-0.0012"/>
++            <vignetting model="pa" focal="17.3" aperture="3.7" distance="10" k1="-0.1976" k2="0.3892" k3="-0.3529"/>
++            <vignetting model="pa" focal="17.3" aperture="3.7" distance="1000" k1="-0.1976" k2="0.3892" k3="-0.3529"/>
++            <vignetting model="pa" focal="17.3" aperture="4" distance="10" k1="-0.1543" k2="0.2125" k3="-0.1756"/>
++            <vignetting model="pa" focal="17.3" aperture="4" distance="1000" k1="-0.1543" k2="0.2125" k3="-0.1756"/>
++            <vignetting model="pa" focal="17.3" aperture="5.7" distance="10" k1="-0.1067" k2="0.0393" k3="-0.0183"/>
++            <vignetting model="pa" focal="17.3" aperture="5.7" distance="1000" k1="-0.1067" k2="0.0393" k3="-0.0183"/>
++            <vignetting model="pa" focal="17.3" aperture="7.8" distance="10" k1="-0.1103" k2="0.0556" k3="-0.0284"/>
++            <vignetting model="pa" focal="17.3" aperture="7.8" distance="1000" k1="-0.1103" k2="0.0556" k3="-0.0284"/>
++            <vignetting model="pa" focal="21.7" aperture="3.8" distance="10" k1="-0.2461" k2="0.4028" k3="-0.3947"/>
++            <vignetting model="pa" focal="21.7" aperture="3.8" distance="1000" k1="-0.2461" k2="0.4028" k3="-0.3947"/>
++            <vignetting model="pa" focal="21.7" aperture="3.9" distance="10" k1="-0.1864" k2="0.3345" k3="-0.3495"/>
++            <vignetting model="pa" focal="21.7" aperture="3.9" distance="1000" k1="-0.1864" k2="0.3345" k3="-0.3495"/>
++            <vignetting model="pa" focal="21.7" aperture="5.4" distance="10" k1="-0.0940" k2="-0.0208" k3="0.0074"/>
++            <vignetting model="pa" focal="21.7" aperture="5.4" distance="1000" k1="-0.0940" k2="-0.0208" k3="0.0074"/>
++            <vignetting model="pa" focal="21.7" aperture="7.8" distance="10" k1="-0.0995" k2="-0.0149" k3="0.0066"/>
++            <vignetting model="pa" focal="21.7" aperture="7.8" distance="1000" k1="-0.0995" k2="-0.0149" k3="0.0066"/>
++            <vignetting model="pa" focal="29.2" aperture="4.2" distance="10" k1="-0.2987" k2="0.1795" k3="-0.2567"/>
++            <vignetting model="pa" focal="29.2" aperture="4.2" distance="1000" k1="-0.2987" k2="0.1795" k3="-0.2567"/>
++            <vignetting model="pa" focal="29.2" aperture="4.6" distance="10" k1="-0.2306" k2="0.0499" k3="-0.1285"/>
++            <vignetting model="pa" focal="29.2" aperture="4.6" distance="1000" k1="-0.2306" k2="0.0499" k3="-0.1285"/>
++            <vignetting model="pa" focal="29.2" aperture="5.9" distance="10" k1="-0.1686" k2="-0.2201" k3="0.1324"/>
++            <vignetting model="pa" focal="29.2" aperture="5.9" distance="1000" k1="-0.1686" k2="-0.2201" k3="0.1324"/>
++            <vignetting model="pa" focal="29.2" aperture="7.8" distance="10" k1="-0.1722" k2="-0.2226" k3="0.1348"/>
++            <vignetting model="pa" focal="29.2" aperture="7.8" distance="1000" k1="-0.1722" k2="-0.2226" k3="0.1348"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A640 &amp; compatibles, with WC-DC58N</model>
++        <model lang="en">fixed lens, with WC-DC58N</model>
++        <model lang="de">festes Objektiv, mit WC-DC58N</model>
++        <mount>canonA640</mount>
++        <cropfactor>4.79</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="7.3" a="0.0204767" b="-0.0650704" c="-0.0334725"/>
++            <distortion model="ptlens" focal="10.835" a="0.00860135" b="-0.0295857" c="-0.0141913"/>
++            <distortion model="ptlens" focal="12.565" a="-0.00165163" b="0.0102251" c="-0.0502586"/>
++            <distortion model="ptlens" focal="17.342" a="0" b="-0.0050918" c="0"/>
++            <distortion model="ptlens" focal="29.2" a="0" b="0.00169117" c="0"/>
++            <tca model="poly3" focal="7.3" vr="1.0006000" vb="1.0001000"/>
++            <tca model="poly3" focal="10.8" vr="1.0005000" vb="1.0007000"/>
++            <tca model="poly3" focal="12.6" vr="1.0001000" vb="1.0007000"/>
++            <tca model="poly3" focal="17.3" vr="0.9995000" vb="1.0012000"/>
++            <tca model="poly3" focal="29.2" vr="0.9992000" vb="1.0014000"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S120 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonS120</mount>
++        <cropfactor>4.62</cropfactor>
++        <calibration>
++            <!-- Refers to 4:3 RAW images. -->
++            <distortion model="ptlens" focal="5.2" a="0.03458" b="-0.14652" c="-0.00567"/>
++            <distortion model="ptlens" focal="6" a="0.02428" b="-0.11282" c="0.00044"/>
++            <distortion model="ptlens" focal="7.5" a="0.00729" b="-0.05338" c="-0.00784"/>
++            <distortion model="ptlens" focal="10.8" a="0" b="-0.01923" c="0"/>
++            <distortion model="ptlens" focal="21.7" a="-0.00889" b="0.02672" c="-0.03212"/>
++            <distortion model="ptlens" focal="26" a="0" b="-0.00284" c="0"/>
++            <tca model="poly3" focal="5.2" vr="1.0006" vb="1.0005"/>
++            <tca model="poly3" focal="6" br="0.0007064" vr="0.9997865" bb="-0.0009831" vb="1.0024057"/>
++            <tca model="poly3" focal="7.5" br="0.0002859" vr="0.9999269" bb="-0.0007185" vb="1.0019609"/>
++            <tca model="poly3" focal="10.8" br="0.0001012" vr="1.0000603" bb="0.0000902" vb="1.0003115"/>
++            <tca model="poly3" focal="21.7" br="-0.0001198" vr="1.0005061" bb="-0.0000715" vb="1.0003314"/>
++            <tca model="poly3" focal="26" br="0.0000121" vr="1.0005797" bb="0.0000653" vb="0.9999953"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX260 HS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonSX260HS</mount>
++        <cropfactor>5.56</cropfactor>
++        <!-- The following center point is correct for the camera I measured.
++             I commented it out because I cannot tell whether this is typical
++             for all specimen of this camera.  If commented in again, at least
++             distortion parameters need to be re-calculated.  The parameters
++             correspond to a shift of (-30px, +90px). -->
++        <!--center x="-0.0198" y="0.0593276203032"/-->
++        <calibration>
++            <distortion model="ptlens" focal="4.5" a="0.06245" b="-0.20795" c="0.06699"/>
++            <distortion model="ptlens" focal="6.5" a="-0.00555" b="0.01217" c="-0.07664"/>
++            <distortion model="ptlens" focal="10.9" a="0" b="-0.0069" c="0"/>
++            <distortion model="ptlens" focal="18.7" a="0" b="-0.00279" c="0"/>
++            <distortion model="ptlens" focal="33.6" a="0" b="-0.00472" c="0"/>
++            <distortion model="ptlens" focal="65.6" a="0" b="-0.00556" c="0"/>
++            <distortion model="ptlens" focal="90" a="0" b="0.002" c="0"/>
++            <!-- TCA could not be measured because the CHDK RAW generator seems
++                 to shift the colour planes relatively to each other. -->
++            <vignetting model="pa" focal="4.5" aperture="3.6" distance="10" k1="0.1268" k2="-0.0324" k3="-1.1226"/>
++            <vignetting model="pa" focal="4.5" aperture="3.6" distance="1000" k1="0.1268" k2="-0.0324" k3="-1.1226"/>
++            <vignetting model="pa" focal="4.5" aperture="4" distance="10" k1="0.0572" k2="0.2721" k3="-1.3648"/>
++            <vignetting model="pa" focal="4.5" aperture="4" distance="1000" k1="0.0572" k2="0.2721" k3="-1.3648"/>
++            <vignetting model="pa" focal="4.5" aperture="4.4" distance="10" k1="0.0147" k2="0.4460" k3="-1.5023"/>
++            <vignetting model="pa" focal="4.5" aperture="4.4" distance="1000" k1="0.0147" k2="0.4460" k3="-1.5023"/>
++            <vignetting model="pa" focal="4.5" aperture="5" distance="10" k1="-0.0505" k2="0.6998" k3="-1.6953"/>
++            <vignetting model="pa" focal="4.5" aperture="5" distance="1000" k1="-0.0505" k2="0.6998" k3="-1.6953"/>
++            <vignetting model="pa" focal="4.5" aperture="5.6" distance="10" k1="-0.0950" k2="0.8710" k3="-1.8243"/>
++            <vignetting model="pa" focal="4.5" aperture="5.6" distance="1000" k1="-0.0950" k2="0.8710" k3="-1.8243"/>
++            <vignetting model="pa" focal="4.5" aperture="6.3" distance="10" k1="-0.1449" k2="1.0515" k3="-1.9562"/>
++            <vignetting model="pa" focal="4.5" aperture="6.3" distance="1000" k1="-0.1449" k2="1.0515" k3="-1.9562"/>
++            <vignetting model="pa" focal="4.5" aperture="7.1" distance="10" k1="-0.1873" k2="1.2117" k3="-2.0752"/>
++            <vignetting model="pa" focal="4.5" aperture="7.1" distance="1000" k1="-0.1873" k2="1.2117" k3="-2.0752"/>
++            <vignetting model="pa" focal="4.5" aperture="8" distance="10" k1="-0.2203" k2="1.3289" k3="-2.1586"/>
++            <vignetting model="pa" focal="4.5" aperture="8" distance="1000" k1="-0.2203" k2="1.3289" k3="-2.1586"/>
++            <vignetting model="pa" focal="6.5" aperture="4" distance="10" k1="-0.0798" k2="0.2036" k3="-0.2248"/>
++            <vignetting model="pa" focal="6.5" aperture="4" distance="1000" k1="-0.0798" k2="0.2036" k3="-0.2248"/>
++            <vignetting model="pa" focal="6.5" aperture="4.4" distance="10" k1="-0.0749" k2="0.1766" k3="-0.1856"/>
++            <vignetting model="pa" focal="6.5" aperture="4.4" distance="1000" k1="-0.0749" k2="0.1766" k3="-0.1856"/>
++            <vignetting model="pa" focal="6.5" aperture="5" distance="10" k1="-0.0707" k2="0.1660" k3="-0.1772"/>
++            <vignetting model="pa" focal="6.5" aperture="5" distance="1000" k1="-0.0707" k2="0.1660" k3="-0.1772"/>
++            <vignetting model="pa" focal="6.5" aperture="5.6" distance="10" k1="-0.0700" k2="0.1642" k3="-0.1755"/>
++            <vignetting model="pa" focal="6.5" aperture="5.6" distance="1000" k1="-0.0700" k2="0.1642" k3="-0.1755"/>
++            <vignetting model="pa" focal="6.5" aperture="6.3" distance="10" k1="-0.0715" k2="0.1691" k3="-0.1785"/>
++            <vignetting model="pa" focal="6.5" aperture="6.3" distance="1000" k1="-0.0715" k2="0.1691" k3="-0.1785"/>
++            <vignetting model="pa" focal="6.5" aperture="7.1" distance="10" k1="-0.0401" k2="0.0339" k3="-0.0303"/>
++            <vignetting model="pa" focal="6.5" aperture="7.1" distance="1000" k1="-0.0401" k2="0.0339" k3="-0.0303"/>
++            <vignetting model="pa" focal="6.5" aperture="8" distance="10" k1="-0.0378" k2="0.0286" k3="-0.0266"/>
++            <vignetting model="pa" focal="6.5" aperture="8" distance="1000" k1="-0.0378" k2="0.0286" k3="-0.0266"/>
++            <vignetting model="pa" focal="10.9" aperture="4.4" distance="10" k1="-0.0308" k2="0.1240" k3="-0.1811"/>
++            <vignetting model="pa" focal="10.9" aperture="4.4" distance="1000" k1="-0.0308" k2="0.1240" k3="-0.1811"/>
++            <vignetting model="pa" focal="10.9" aperture="5" distance="10" k1="-0.0506" k2="0.1821" k3="-0.1820"/>
++            <vignetting model="pa" focal="10.9" aperture="5" distance="1000" k1="-0.0506" k2="0.1821" k3="-0.1820"/>
++            <vignetting model="pa" focal="10.9" aperture="5.6" distance="10" k1="-0.0485" k2="0.1761" k3="-0.1766"/>
++            <vignetting model="pa" focal="10.9" aperture="5.6" distance="1000" k1="-0.0485" k2="0.1761" k3="-0.1766"/>
++            <vignetting model="pa" focal="10.9" aperture="6.3" distance="10" k1="-0.0486" k2="0.1766" k3="-0.1771"/>
++            <vignetting model="pa" focal="10.9" aperture="6.3" distance="1000" k1="-0.0486" k2="0.1766" k3="-0.1771"/>
++            <vignetting model="pa" focal="10.9" aperture="7.1" distance="10" k1="-0.0341" k2="0.1112" k3="-0.1077"/>
++            <vignetting model="pa" focal="10.9" aperture="7.1" distance="1000" k1="-0.0341" k2="0.1112" k3="-0.1077"/>
++            <vignetting model="pa" focal="10.9" aperture="8" distance="10" k1="-0.0318" k2="0.1059" k3="-0.1043"/>
++            <vignetting model="pa" focal="10.9" aperture="8" distance="1000" k1="-0.0318" k2="0.1059" k3="-0.1043"/>
++            <vignetting model="pa" focal="18.7" aperture="5" distance="10" k1="-0.0235" k2="0.1808" k3="-0.2309"/>
++            <vignetting model="pa" focal="18.7" aperture="5" distance="1000" k1="-0.0235" k2="0.1808" k3="-0.2309"/>
++            <vignetting model="pa" focal="18.7" aperture="5.6" distance="10" k1="-0.0346" k2="0.2360" k3="-0.2244"/>
++            <vignetting model="pa" focal="18.7" aperture="5.6" distance="1000" k1="-0.0346" k2="0.2360" k3="-0.2244"/>
++            <vignetting model="pa" focal="18.7" aperture="6.3" distance="10" k1="-0.0280" k2="0.2087" k3="-0.1995"/>
++            <vignetting model="pa" focal="18.7" aperture="6.3" distance="1000" k1="-0.0280" k2="0.2087" k3="-0.1995"/>
++            <vignetting model="pa" focal="18.7" aperture="7.1" distance="10" k1="-0.0288" k2="0.2090" k3="-0.1989"/>
++            <vignetting model="pa" focal="18.7" aperture="7.1" distance="1000" k1="-0.0288" k2="0.2090" k3="-0.1989"/>
++            <vignetting model="pa" focal="18.7" aperture="8" distance="10" k1="-0.0281" k2="0.2043" k3="-0.1949"/>
++            <vignetting model="pa" focal="18.7" aperture="8" distance="1000" k1="-0.0281" k2="0.2043" k3="-0.1949"/>
++            <vignetting model="pa" focal="33.6" aperture="5.6" distance="10" k1="-0.0762" k2="0.6718" k3="-0.8158"/>
++            <vignetting model="pa" focal="33.6" aperture="5.6" distance="1000" k1="-0.0762" k2="0.6718" k3="-0.8158"/>
++            <vignetting model="pa" focal="33.6" aperture="6.3" distance="10" k1="-0.1297" k2="0.8456" k3="-0.8534"/>
++            <vignetting model="pa" focal="33.6" aperture="6.3" distance="1000" k1="-0.1297" k2="0.8456" k3="-0.8534"/>
++            <vignetting model="pa" focal="33.6" aperture="7.1" distance="10" k1="-0.1336" k2="0.8124" k3="-0.7759"/>
++            <vignetting model="pa" focal="33.6" aperture="7.1" distance="1000" k1="-0.1336" k2="0.8124" k3="-0.7759"/>
++            <vignetting model="pa" focal="33.6" aperture="8" distance="10" k1="-0.1073" k2="0.6860" k3="-0.6364"/>
++            <vignetting model="pa" focal="33.6" aperture="8" distance="1000" k1="-0.1073" k2="0.6860" k3="-0.6364"/>
++            <vignetting model="pa" focal="65.6" aperture="6.3" distance="10" k1="0.2398" k2="-0.6323" k3="0.0972"/>
++            <vignetting model="pa" focal="65.6" aperture="6.3" distance="1000" k1="0.2398" k2="-0.6323" k3="0.0972"/>
++            <vignetting model="pa" focal="65.6" aperture="7.1" distance="10" k1="0.1386" k2="-0.1479" k3="-0.2298"/>
++            <vignetting model="pa" focal="65.6" aperture="7.1" distance="1000" k1="0.1386" k2="-0.1479" k3="-0.2298"/>
++            <vignetting model="pa" focal="65.6" aperture="8" distance="10" k1="0.0349" k2="0.2419" k3="-0.4829"/>
++            <vignetting model="pa" focal="65.6" aperture="8" distance="1000" k1="0.0349" k2="0.2419" k3="-0.4829"/>
++            <vignetting model="pa" focal="90" aperture="7.1" distance="10" k1="-0.0583" k2="-0.4605" k3="0.1786"/>
++            <vignetting model="pa" focal="90" aperture="7.1" distance="1000" k1="-0.0583" k2="-0.4605" k3="0.1786"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="10" k1="0.0380" k2="-0.1847" k3="-0.0881"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="0.0380" k2="-0.1847" k3="-0.0881"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S95 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonS95</mount>
++        <cropfactor>4.67</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6" a="0.01786" b="-0.08833" c="0.00128"/>
++            <distortion model="ptlens" focal="7.5" a="0.01778" b="-0.09282" c="0.05441"/>
++            <distortion model="ptlens" focal="9.6" a="0.00629" b="-0.04712" c="0.0346"/>
++            <distortion model="ptlens" focal="12.8" a="0" b="-0.01177" c="0"/>
++            <distortion model="ptlens" focal="22.5" a="0" b="-0.0028" c="0"/>
++            <tca model="poly3" focal="6" br="0.0001280" vr="0.9999715" bb="-0.0004378" vb="1.0008838"/>
++            <tca model="poly3" focal="7.5" br="0.0000993" vr="0.9999354" bb="-0.0003050" vb="1.0007215"/>
++            <tca model="poly3" focal="9.6" br="0.0000870" vr="0.9999529" bb="-0.0001707" vb="1.0005589"/>
++            <tca model="poly3" focal="12.8" br="0.0000514" vr="0.9999909" bb="-0.0001475" vb="1.0004201"/>
++            <tca model="poly3" focal="18.2" br="0.0000120" vr="1.0000810" bb="-0.0000387" vb="1.0001960"/>
++            <tca model="poly3" focal="22.5" br="-0.0000057" vr="1.0001253" bb="0.0000043" vb="1.0000429"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon IXUS 220 HS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonIxus220HS</mount>
++        <cropfactor>5.58</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.3" a="0.02693" b="-0.08681" c="-0.06074"/>
++            <distortion model="ptlens" focal="7.8" a="0.00825" b="-0.03964" c="0.00656"/>
++            <distortion model="ptlens" focal="11.7" a="0" b="-0.00228" c="0"/>
++            <distortion model="ptlens" focal="17.5" a="0" b="0.00576" c="0"/>
++            <distortion model="ptlens" focal="21.5" a="0" b="0.00674" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This calibration works for 3:2 (crop 1.924) as well as for 4:3
++             (crop 1.936) -->
++        <maker>Canon</maker>
++        <model>Canon PowerShot G1X Mark II &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonG1X2</mount>
++        <cropfactor>1.93</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="12.5" a="0.05797" b="-0.1878" c="-0.00495"/>
++            <distortion model="ptlens" focal="14.1" a="0.06523" b="-0.20887" c="0.04553"/>
++            <distortion model="ptlens" focal="19.1" a="0.01625" b="-0.06262" c="-0.02229"/>
++            <distortion model="ptlens" focal="25.4" a="0.00807" b="-0.03785" c="-0.01218"/>
++            <distortion model="ptlens" focal="34.9" a="0.00387" b="-0.02733" c="0.00371"/>
++            <distortion model="ptlens" focal="48.3" a="0" b="-0.00928" c="0"/>
++            <distortion model="ptlens" focal="62.5" a="0" b="0.0002" c="0"/>
++            <tca model="poly3" focal="12.5" br="-0.0002147" vr="1.0004482" bb="0.0001968" vb="0.9999579"/>
++            <tca model="poly3" focal="16.4" br="-0.0001815" vr="1.0004752" bb="0.0001768" vb="0.9998345"/>
++            <tca model="poly3" focal="30.8" br="0.0000359" vr="1.0002206" bb="0.0000003" vb="0.9998014"/>
++            <tca model="poly3" focal="44.9" br="0.0000223" vr="1.0000700" bb="-0.0000771" vb="0.9998645"/>
++            <tca model="poly3" focal="62.5" br="-0.0000494" vr="0.9998549" bb="0.0000108" vb="0.9999408"/>
++            <vignetting model="pa" focal="12.5" aperture="2" distance="10" k1="-0.9531" k2="0.7634" k3="-0.7955"/>
++            <vignetting model="pa" focal="12.5" aperture="2" distance="1000" k1="-0.9531" k2="0.7634" k3="-0.7955"/>
++            <vignetting model="pa" focal="12.5" aperture="2.8" distance="10" k1="-0.3673" k2="0.9591" k3="-2.5313"/>
++            <vignetting model="pa" focal="12.5" aperture="2.8" distance="1000" k1="-0.3673" k2="0.9591" k3="-2.5313"/>
++            <vignetting model="pa" focal="12.5" aperture="4" distance="10" k1="-0.4086" k2="1.3336" k3="-2.5076"/>
++            <vignetting model="pa" focal="12.5" aperture="4" distance="1000" k1="-0.4086" k2="1.3336" k3="-2.5076"/>
++            <vignetting model="pa" focal="12.5" aperture="5.6" distance="10" k1="-0.3427" k2="0.8066" k3="-1.1632"/>
++            <vignetting model="pa" focal="12.5" aperture="5.6" distance="1000" k1="-0.3427" k2="0.8066" k3="-1.1632"/>
++            <vignetting model="pa" focal="12.5" aperture="16" distance="10" k1="-0.3297" k2="0.5187" k3="-0.7346"/>
++            <vignetting model="pa" focal="12.5" aperture="16" distance="1000" k1="-0.3297" k2="0.5187" k3="-0.7346"/>
++            <vignetting model="pa" focal="15.5" aperture="3.2" distance="10" k1="-0.6293" k2="2.7379" k3="-3.6045"/>
++            <vignetting model="pa" focal="15.5" aperture="3.2" distance="1000" k1="-0.6293" k2="2.7379" k3="-3.6045"/>
++            <vignetting model="pa" focal="15.5" aperture="4.5" distance="10" k1="-0.5561" k2="2.3704" k3="-3.0067"/>
++            <vignetting model="pa" focal="15.5" aperture="4.5" distance="1000" k1="-0.5561" k2="2.3704" k3="-3.0067"/>
++            <vignetting model="pa" focal="15.5" aperture="6.3" distance="10" k1="-0.4115" k2="1.5709" k3="-1.9334"/>
++            <vignetting model="pa" focal="15.5" aperture="6.3" distance="1000" k1="-0.4115" k2="1.5709" k3="-1.9334"/>
++            <vignetting model="pa" focal="15.5" aperture="9" distance="10" k1="-0.1658" k2="0.4121" k3="-0.5816"/>
++            <vignetting model="pa" focal="15.5" aperture="9" distance="1000" k1="-0.1658" k2="0.4121" k3="-0.5816"/>
++            <vignetting model="pa" focal="15.5" aperture="16" distance="10" k1="-0.3101" k2="0.7715" k3="-0.8110"/>
++            <vignetting model="pa" focal="15.5" aperture="16" distance="1000" k1="-0.3101" k2="0.7715" k3="-0.8110"/>
++            <vignetting model="pa" focal="22.8" aperture="3.5" distance="10" k1="-0.3207" k2="1.8672" k3="-2.2892"/>
++            <vignetting model="pa" focal="22.8" aperture="3.5" distance="1000" k1="-0.3207" k2="1.8672" k3="-2.2892"/>
++            <vignetting model="pa" focal="22.8" aperture="5" distance="10" k1="-0.2163" k2="1.1589" k3="-1.2452"/>
++            <vignetting model="pa" focal="22.8" aperture="5" distance="1000" k1="-0.2163" k2="1.1589" k3="-1.2452"/>
++            <vignetting model="pa" focal="22.8" aperture="7.1" distance="10" k1="-0.1127" k2="0.4963" k3="-0.3717"/>
++            <vignetting model="pa" focal="22.8" aperture="7.1" distance="1000" k1="-0.1127" k2="0.4963" k3="-0.3717"/>
++            <vignetting model="pa" focal="22.8" aperture="10" distance="10" k1="-0.1126" k2="0.5403" k3="-0.4332"/>
++            <vignetting model="pa" focal="22.8" aperture="10" distance="1000" k1="-0.1126" k2="0.5403" k3="-0.4332"/>
++            <vignetting model="pa" focal="22.8" aperture="16" distance="10" k1="-0.0259" k2="0.2870" k3="-0.2076"/>
++            <vignetting model="pa" focal="22.8" aperture="16" distance="1000" k1="-0.0259" k2="0.2870" k3="-0.2076"/>
++            <vignetting model="pa" focal="33.1" aperture="3.5" distance="10" k1="-0.1855" k2="1.7440" k3="-2.3172"/>
++            <vignetting model="pa" focal="33.1" aperture="3.5" distance="1000" k1="-0.1855" k2="1.7440" k3="-2.3172"/>
++            <vignetting model="pa" focal="33.1" aperture="5" distance="10" k1="-0.2138" k2="1.6075" k3="-1.8266"/>
++            <vignetting model="pa" focal="33.1" aperture="5" distance="1000" k1="-0.2138" k2="1.6075" k3="-1.8266"/>
++            <vignetting model="pa" focal="33.1" aperture="7.1" distance="10" k1="0.0150" k2="0.4054" k3="-0.3323"/>
++            <vignetting model="pa" focal="33.1" aperture="7.1" distance="1000" k1="0.0150" k2="0.4054" k3="-0.3323"/>
++            <vignetting model="pa" focal="33.1" aperture="10" distance="10" k1="-0.0619" k2="0.5726" k3="-0.4036"/>
++            <vignetting model="pa" focal="33.1" aperture="10" distance="1000" k1="-0.0619" k2="0.5726" k3="-0.4036"/>
++            <vignetting model="pa" focal="33.1" aperture="16" distance="10" k1="-0.0356" k2="0.4489" k3="-0.2885"/>
++            <vignetting model="pa" focal="33.1" aperture="16" distance="1000" k1="-0.0356" k2="0.4489" k3="-0.2885"/>
++            <vignetting model="pa" focal="62.5" aperture="3.9" distance="10" k1="0.2538" k2="-1.0627" k3="0.3821"/>
++            <vignetting model="pa" focal="62.5" aperture="3.9" distance="1000" k1="0.2538" k2="-1.0627" k3="0.3821"/>
++            <vignetting model="pa" focal="62.5" aperture="5.6" distance="10" k1="0.0640" k2="0.1181" k3="-0.5040"/>
++            <vignetting model="pa" focal="62.5" aperture="5.6" distance="1000" k1="0.0640" k2="0.1181" k3="-0.5040"/>
++            <vignetting model="pa" focal="62.5" aperture="8" distance="10" k1="-0.1957" k2="0.9094" k3="-0.9272"/>
++            <vignetting model="pa" focal="62.5" aperture="8" distance="1000" k1="-0.1957" k2="0.9094" k3="-0.9272"/>
++            <vignetting model="pa" focal="62.5" aperture="11" distance="10" k1="-0.1708" k2="0.6235" k3="-0.5459"/>
++            <vignetting model="pa" focal="62.5" aperture="11" distance="1000" k1="-0.1708" k2="0.6235" k3="-0.5459"/>
++            <vignetting model="pa" focal="62.5" aperture="16" distance="10" k1="-0.0073" k2="0.0746" k3="-0.0742"/>
++            <vignetting model="pa" focal="62.5" aperture="16" distance="1000" k1="-0.0073" k2="0.0746" k3="-0.0742"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot A4000 IS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonA4000IS</mount>
++        <cropfactor>5.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5" a="0.01814" b="-0.07704" c="-0.04865"/>
++            <distortion model="ptlens" focal="6" a="0.01693" b="-0.06826" c="-0.02449"/>
++            <distortion model="ptlens" focal="9.1" a="0.00385" b="-0.02753" c="0.00657"/>
++            <distortion model="ptlens" focal="14.5" a="0" b="-0.00296" c="0"/>
++            <distortion model="ptlens" focal="23.2" a="0" b="0.00351" c="0"/>
++            <distortion model="ptlens" focal="30.3" a="0" b="0.00471" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.00466" c="0"/>
++            <tca model="poly3" focal="5" vr="1.0006427" vb="0.9999543"/>
++            <tca model="poly3" focal="6" vr="1.0005864" vb="0.9999365"/>
++            <tca model="poly3" focal="9.1" vr="1.0004020" vb="0.9998541"/>
++            <tca model="poly3" focal="14.5" vr="1.0002037" vb="0.9997161"/>
++            <tca model="poly3" focal="23.2" vr="1.0000605" vb="0.9997287"/>
++            <tca model="poly3" focal="30.3" vr="0.9999841" vb="0.9998124"/>
++            <tca model="poly3" focal="40" vr="0.9999261" vb="0.9997613"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon G7 X &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonG7X</mount>
++        <cropfactor>2.72</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="8.8" a="0.03872" b="-0.15563" c="0.02544"/>
++            <distortion model="ptlens" focal="10.2" a="0.02069" b="-0.08948" c="-0.00758"/>
++            <distortion model="ptlens" focal="12.8" a="0.00157" b="-0.01787" c="-0.04424"/>
++            <distortion model="ptlens" focal="18.1" a="0" b="-0.01038" c="0"/>
++            <distortion model="ptlens" focal="31" a="0" b="0.00302" c="0"/>
++            <distortion model="ptlens" focal="36.8" a="0" b="0.00625" c="0"/>
++            <tca model="poly3" focal="8.8" br="-0.0005162" vr="1.0016034" bb="0.0004383" vb="0.9993909"/>
++            <tca model="poly3" focal="11.5" br="-0.0002728" vr="1.0011909" bb="0.0002069" vb="0.9996313"/>
++            <tca model="poly3" focal="14.2" br="-0.0001588" vr="1.0008252" bb="0.0001122" vb="0.9998027"/>
++            <tca model="poly3" focal="18.4" br="-0.0001077" vr="1.0004530" bb="0.0000610" vb="0.9999249"/>
++            <tca model="poly3" focal="25.2" br="-0.0000678" vr="1.0001331" bb="0.0000333" vb="0.9999687"/>
++            <tca model="poly3" focal="36.8" br="-0.0000631" vr="0.9998836" bb="0.0000158" vb="0.9999238"/>
++            <vignetting model="pa" focal="8.8" aperture="1.8" distance="10" k1="-0.2553" k2="-0.1170" k3="-0.7056"/>
++            <vignetting model="pa" focal="8.8" aperture="1.8" distance="1000" k1="-0.2553" k2="-0.1170" k3="-0.7056"/>
++            <vignetting model="pa" focal="8.8" aperture="2.5" distance="10" k1="0.0116" k2="-0.3654" k3="-0.7260"/>
++            <vignetting model="pa" focal="8.8" aperture="2.5" distance="1000" k1="0.0116" k2="-0.3654" k3="-0.7260"/>
++            <vignetting model="pa" focal="8.8" aperture="3.5" distance="10" k1="-0.0396" k2="-0.0536" k3="-0.9917"/>
++            <vignetting model="pa" focal="8.8" aperture="3.5" distance="1000" k1="-0.0396" k2="-0.0536" k3="-0.9917"/>
++            <vignetting model="pa" focal="8.8" aperture="5" distance="10" k1="-0.2345" k2="0.8117" k3="-1.6607"/>
++            <vignetting model="pa" focal="8.8" aperture="5" distance="1000" k1="-0.2345" k2="0.8117" k3="-1.6607"/>
++            <vignetting model="pa" focal="8.8" aperture="11" distance="10" k1="-0.3502" k2="1.3201" k3="-2.0550"/>
++            <vignetting model="pa" focal="8.8" aperture="11" distance="1000" k1="-0.3502" k2="1.3201" k3="-2.0550"/>
++            <vignetting model="pa" focal="12.2" aperture="2.2" distance="10" k1="-0.9433" k2="1.5959" k3="-1.1783"/>
++            <vignetting model="pa" focal="12.2" aperture="2.2" distance="1000" k1="-0.9433" k2="1.5959" k3="-1.1783"/>
++            <vignetting model="pa" focal="12.2" aperture="3.2" distance="10" k1="-0.0705" k2="-0.0631" k3="-0.2402"/>
++            <vignetting model="pa" focal="12.2" aperture="3.2" distance="1000" k1="-0.0705" k2="-0.0631" k3="-0.2402"/>
++            <vignetting model="pa" focal="12.2" aperture="4.5" distance="10" k1="-0.3210" k2="0.6479" k3="-0.6690"/>
++            <vignetting model="pa" focal="12.2" aperture="4.5" distance="1000" k1="-0.3210" k2="0.6479" k3="-0.6690"/>
++            <vignetting model="pa" focal="12.2" aperture="6.3" distance="10" k1="-0.3130" k2="0.5326" k3="-0.4661"/>
++            <vignetting model="pa" focal="12.2" aperture="6.3" distance="1000" k1="-0.3130" k2="0.5326" k3="-0.4661"/>
++            <vignetting model="pa" focal="12.2" aperture="9" distance="10" k1="-0.2301" k2="0.2070" k3="-0.1677"/>
++            <vignetting model="pa" focal="12.2" aperture="9" distance="1000" k1="-0.2301" k2="0.2070" k3="-0.1677"/>
++            <vignetting model="pa" focal="12.2" aperture="11" distance="10" k1="-0.2130" k2="0.1342" k3="-0.0993"/>
++            <vignetting model="pa" focal="12.2" aperture="11" distance="1000" k1="-0.2130" k2="0.1342" k3="-0.0993"/>
++            <vignetting model="pa" focal="16.8" aperture="2.5" distance="10" k1="-0.5504" k2="0.5311" k3="-0.3166"/>
++            <vignetting model="pa" focal="16.8" aperture="2.5" distance="1000" k1="-0.5504" k2="0.5311" k3="-0.3166"/>
++            <vignetting model="pa" focal="16.8" aperture="3.5" distance="10" k1="-0.0703" k2="-0.1104" k3="-0.1004"/>
++            <vignetting model="pa" focal="16.8" aperture="3.5" distance="1000" k1="-0.0703" k2="-0.1104" k3="-0.1004"/>
++            <vignetting model="pa" focal="16.8" aperture="5" distance="10" k1="-0.2687" k2="0.5568" k3="-0.4949"/>
++            <vignetting model="pa" focal="16.8" aperture="5" distance="1000" k1="-0.2687" k2="0.5568" k3="-0.4949"/>
++            <vignetting model="pa" focal="16.8" aperture="7.1" distance="10" k1="-0.2001" k2="0.2552" k3="-0.1775"/>
++            <vignetting model="pa" focal="16.8" aperture="7.1" distance="1000" k1="-0.2001" k2="0.2552" k3="-0.1775"/>
++            <vignetting model="pa" focal="16.8" aperture="10" distance="10" k1="-0.1708" k2="0.1409" k3="-0.0725"/>
++            <vignetting model="pa" focal="16.8" aperture="10" distance="1000" k1="-0.1708" k2="0.1409" k3="-0.0725"/>
++            <vignetting model="pa" focal="16.8" aperture="11" distance="10" k1="-0.1797" k2="0.1623" k3="-0.0873"/>
++            <vignetting model="pa" focal="16.8" aperture="11" distance="1000" k1="-0.1797" k2="0.1623" k3="-0.0873"/>
++            <vignetting model="pa" focal="23.4" aperture="2.8" distance="10" k1="-0.3289" k2="0.9280" k3="-0.8241"/>
++            <vignetting model="pa" focal="23.4" aperture="2.8" distance="1000" k1="-0.3289" k2="0.9280" k3="-0.8241"/>
++            <vignetting model="pa" focal="23.4" aperture="4" distance="10" k1="-0.1598" k2="0.2689" k3="-0.2806"/>
++            <vignetting model="pa" focal="23.4" aperture="4" distance="1000" k1="-0.1598" k2="0.2689" k3="-0.2806"/>
++            <vignetting model="pa" focal="23.4" aperture="5.6" distance="10" k1="-0.1551" k2="0.1893" k3="-0.1145"/>
++            <vignetting model="pa" focal="23.4" aperture="5.6" distance="1000" k1="-0.1551" k2="0.1893" k3="-0.1145"/>
++            <vignetting model="pa" focal="23.4" aperture="8" distance="10" k1="-0.1492" k2="0.1581" k3="-0.0767"/>
++            <vignetting model="pa" focal="23.4" aperture="8" distance="1000" k1="-0.1492" k2="0.1581" k3="-0.0767"/>
++            <vignetting model="pa" focal="23.4" aperture="11" distance="10" k1="-0.1533" k2="0.1661" k3="-0.0794"/>
++            <vignetting model="pa" focal="23.4" aperture="11" distance="1000" k1="-0.1533" k2="0.1661" k3="-0.0794"/>
++            <vignetting model="pa" focal="36.8" aperture="2.8" distance="10" k1="-0.1704" k2="-0.2258" k3="0.0705"/>
++            <vignetting model="pa" focal="36.8" aperture="2.8" distance="1000" k1="-0.1704" k2="-0.2258" k3="0.0705"/>
++            <vignetting model="pa" focal="36.8" aperture="4" distance="10" k1="-0.1958" k2="0.4549" k3="-0.4959"/>
++            <vignetting model="pa" focal="36.8" aperture="4" distance="1000" k1="-0.1958" k2="0.4549" k3="-0.4959"/>
++            <vignetting model="pa" focal="36.8" aperture="5.6" distance="10" k1="-0.2475" k2="0.3334" k3="-0.2460"/>
++            <vignetting model="pa" focal="36.8" aperture="5.6" distance="1000" k1="-0.2475" k2="0.3334" k3="-0.2460"/>
++            <vignetting model="pa" focal="36.8" aperture="8" distance="10" k1="-0.1842" k2="0.0868" k3="-0.0198"/>
++            <vignetting model="pa" focal="36.8" aperture="8" distance="1000" k1="-0.1842" k2="0.0868" k3="-0.0198"/>
++            <vignetting model="pa" focal="36.8" aperture="11" distance="10" k1="-0.1869" k2="0.0890" k3="-0.0178"/>
++            <vignetting model="pa" focal="36.8" aperture="11" distance="1000" k1="-0.1869" k2="0.0890" k3="-0.0178"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon Powershot G9 X &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonG9X</mount>
++        <cropfactor>2.72</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="10.2" a="0.0263809" b="-0.139829" c="0.0743743"/>
++            <distortion model="ptlens" focal="16.017" a="0" b="-0.0219906" c="0"/>
++            <distortion model="ptlens" focal="20.144" a="0" b="-0.0118092" c="0"/>
++            <distortion model="ptlens" focal="30.6" a="0" b="-0.00463501" c="0"/>
++            <tca model="poly3" focal="10.2" vr="1.0002000" vb="1.0006000"/>
++            <tca model="poly3" focal="16" vr="1.0002000" vb="1.0004000"/>
++            <tca model="poly3" focal="20.1" vr="1.0003000" vb="1.0006000"/>
++            <tca model="poly3" focal="30.6" vr="1.0002000" vb="1.0001000"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S100 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonS100</mount>
++        <cropfactor>4.62</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5.2" a="0.02214" b="-0.10656" c="-0.01315"/>
++            <distortion model="ptlens" focal="7" a="0.00303" b="-0.042" c="-0.00608"/>
++            <distortion model="ptlens" focal="9.5" a="0" b="-0.0205" c="0"/>
++            <distortion model="ptlens" focal="12.3" a="0" b="-0.01071" c="0"/>
++            <distortion model="ptlens" focal="21.7" a="0" b="-0.00119" c="0"/>
++            <distortion model="ptlens" focal="26" a="0" b="-0.00143" c="0"/>
++            <tca model="poly3" focal="5.2" br="0.0005532" vr="0.9997686" bb="-0.0005614" vb="1.0010464"/>
++            <tca model="poly3" focal="7" br="0.0000637" vr="0.9999826" bb="-0.0002196" vb="1.0006293"/>
++            <tca model="poly3" focal="9.5" br="0.0000138" vr="1.0000004" bb="-0.0001379" vb="1.0003524"/>
++            <tca model="poly3" focal="12.3" br="-0.0000172" vr="1.0000424" bb="-0.0000860" vb="1.0002696"/>
++            <tca model="poly3" focal="21.7" br="-0.0000362" vr="1.0000884" bb="-0.0000442" vb="1.0000962"/>
++            <tca model="poly3" focal="26" br="0.0000709" vr="1.0000116" bb="-0.0000173" vb="1.0000555"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon IXUS 125 HS &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonIxus125HS</mount>
++        <cropfactor>5.58</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.3" a="0.0414" b="-0.15308" c="0.04158"/>
++            <distortion model="ptlens" focal="7.8" a="0" b="-0.01745" c="0"/>
++            <distortion model="ptlens" focal="11.2" a="0" b="-0.00357" c="0"/>
++            <distortion model="ptlens" focal="16.2" a="0" b="0.00377" c="0"/>
++            <distortion model="ptlens" focal="21.5" a="0" b="0.00709" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX510 HS &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonSX510HS</mount>
++        <cropfactor>5.58</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="4.3" k1="-0.00676"/>
++            <distortion model="poly3" focal="7.3" k1="-0.00704"/>
++            <distortion model="poly3" focal="13.5" k1="-0.00508"/>
++            <distortion model="poly3" focal="38.02" k1="-0.0009"/>
++            <distortion model="poly3" focal="129" k1="0.01651"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX510 HS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonSX510HS</mount>
++        <cropfactor>5.58</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.3" a="0.09431" b="-0.30906" c="0.16325"/>
++            <distortion model="ptlens" focal="7.3" a="-0.01391" b="0.04723" c="-0.1158"/>
++            <distortion model="ptlens" focal="13.5" a="-0.00449" b="0.00424" c="-0.00131"/>
++            <distortion model="ptlens" focal="38" a="0" b="-0.00112" c="0"/>
++            <distortion model="ptlens" focal="129" a="0" b="0.00284" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot S110 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonS110</mount>
++        <aperture min="2" max="8"/>
++        <cropfactor>4.62</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5.2" a="0.02413" b="-0.13243" c="0.04812"/>
++            <distortion model="ptlens" focal="7.3" a="0" b="-0.03409" c="0"/>
++            <distortion model="ptlens" focal="11.6" a="0" b="-0.0117" c="0"/>
++            <distortion model="ptlens" focal="15.1" a="0" b="-0.00591" c="0"/>
++            <distortion model="ptlens" focal="26" a="0" b="-0.00051" c="0"/>
++            <tca model="poly3" focal="5.2" br="0.0005406" vr="0.9997708" bb="-0.0005534" vb="1.0010173"/>
++            <tca model="poly3" focal="6" br="0.0003573" vr="0.9998093" bb="-0.0004156" vb="1.0008989"/>
++            <tca model="poly3" focal="7.5" br="0.0001571" vr="0.9998835" bb="-0.0003592" vb="1.0010216"/>
++            <tca model="poly3" focal="10.8" br="0.0000533" vr="0.9999270" bb="-0.0002132" vb="1.0006859"/>
++            <tca model="poly3" focal="18.4" br="0.0000095" vr="1.0000614" bb="-0.0000490" vb="1.0002302"/>
++            <tca model="poly3" focal="21.6" br="0.0000129" vr="1.0000749" bb="-0.0000119" vb="1.0000899"/>
++            <tca model="poly3" focal="26" br="0.0000498" vr="1.0001549" bb="-0.0000029" vb="0.9999835"/>
++            <vignetting model="pa" focal="5.2" aperture="2" distance="10" k1="-1.5437" k2="2.1484" k3="-1.3830"/>
++            <vignetting model="pa" focal="5.2" aperture="2" distance="1000" k1="-1.5437" k2="2.1484" k3="-1.3830"/>
++            <vignetting model="pa" focal="5.2" aperture="8" distance="10" k1="-0.8800" k2="0.7319" k3="-0.5745"/>
++            <vignetting model="pa" focal="5.2" aperture="8" distance="1000" k1="-0.8800" k2="0.7319" k3="-0.5745"/>
++            <vignetting model="pa" focal="6" aperture="2.2" distance="10" k1="-1.3579" k2="1.6044" k3="-0.8169"/>
++            <vignetting model="pa" focal="6" aperture="2.2" distance="1000" k1="-1.3579" k2="1.6044" k3="-0.8169"/>
++            <vignetting model="pa" focal="6" aperture="8" distance="10" k1="-0.7565" k2="0.7208" k3="-0.5473"/>
++            <vignetting model="pa" focal="6" aperture="8" distance="1000" k1="-0.7565" k2="0.7208" k3="-0.5473"/>
++            <vignetting model="pa" focal="7.5" aperture="2.8" distance="10" k1="-0.5935" k2="0.1245" k3="-0.0121"/>
++            <vignetting model="pa" focal="7.5" aperture="2.8" distance="1000" k1="-0.5935" k2="0.1245" k3="-0.0121"/>
++            <vignetting model="pa" focal="7.5" aperture="8" distance="10" k1="-0.5321" k2="0.4279" k3="-0.3660"/>
++            <vignetting model="pa" focal="7.5" aperture="8" distance="1000" k1="-0.5321" k2="0.4279" k3="-0.3660"/>
++            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.5609" k2="0.2939" k3="-0.1218"/>
++            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.5609" k2="0.2939" k3="-0.1218"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.3058" k2="0.1651" k3="-0.1433"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.3058" k2="0.1651" k3="-0.1433"/>
++            <vignetting model="pa" focal="18.4" aperture="5" distance="10" k1="-0.7490" k2="0.7164" k3="-0.3594"/>
++            <vignetting model="pa" focal="18.4" aperture="5" distance="1000" k1="-0.7490" k2="0.7164" k3="-0.3594"/>
++            <vignetting model="pa" focal="18.4" aperture="8" distance="10" k1="-0.1028" k2="-0.0527" k3="-0.0295"/>
++            <vignetting model="pa" focal="18.4" aperture="8" distance="1000" k1="-0.1028" k2="-0.0527" k3="-0.0295"/>
++            <vignetting model="pa" focal="21.6" aperture="5.6" distance="10" k1="-0.5749" k2="0.4969" k3="-0.2498"/>
++            <vignetting model="pa" focal="21.6" aperture="5.6" distance="1000" k1="-0.5749" k2="0.4969" k3="-0.2498"/>
++            <vignetting model="pa" focal="21.6" aperture="8" distance="10" k1="-0.1005" k2="-0.0963" k3="0.0222"/>
++            <vignetting model="pa" focal="21.6" aperture="8" distance="1000" k1="-0.1005" k2="-0.0963" k3="0.0222"/>
++            <vignetting model="pa" focal="26" aperture="5.9" distance="10" k1="-0.5277" k2="0.5043" k3="-0.2849"/>
++            <vignetting model="pa" focal="26" aperture="5.9" distance="1000" k1="-0.5277" k2="0.5043" k3="-0.2849"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="10" k1="-0.0260" k2="-0.3116" k3="0.1489"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.0260" k2="-0.3116" k3="0.1489"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX160 IS &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonSX160IS</mount>
++        <cropfactor>5.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5" a="0.0255" b="-0.1025" c="-0.00421"/>
++            <distortion model="ptlens" focal="7.1" a="0.0084" b="-0.0439" c="-0.0017"/>
++            <distortion model="ptlens" focal="10.8" a="0.0011" b="-0.0061" c="-0.0160"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="-0.0003" c="0"/>
++            <distortion model="ptlens" focal="27.9" a="0" b="0.0007" c="0"/>
++            <distortion model="ptlens" focal="40.9" a="0" b="0.0012" c="0"/>
++            <distortion model="ptlens" focal="54.9" a="0" b="0.0001" c="0"/>
++            <distortion model="ptlens" focal="69.9" a="0" b="0.0016" c="0"/>
++            <distortion model="ptlens" focal="80" a="0" b="0.0008" c="0"/>
++            <tca model="poly3" focal="5" br="-0.0000523" vr="1.0006404" bb="-0.0000974" vb="1.0002674"/>
++            <tca model="poly3" focal="7.1" br="0.0002367" vr="1.0003713" bb="-0.0000596" vb="1.0001844"/>
++            <tca model="poly3" focal="10.8" br="0.0001696" vr="1.0001994" bb="-0.0000226" vb="1.0001132"/>
++            <tca model="poly3" focal="17.4" br="-0.0000184" vr="1.0001719" bb="-0.0000195" vb="1.0000951"/>
++            <tca model="poly3" focal="27.9" br="-0.0000180" vr="1.0000102" bb="-0.0000229" vb="1.0000386"/>
++            <tca model="poly3" focal="40.9" br="-0.0000046" vr="0.9999705" bb="0.0000079" vb="0.9998960"/>
++            <tca model="poly3" focal="54.9" br="0.0000662" vr="0.9998481" bb="0.0000304" vb="0.9998485"/>
++            <tca model="poly3" focal="69.9" br="0.0001013" vr="0.9997226" bb="0.0000740" vb="0.9997565"/>
++            <tca model="poly3" focal="80" br="0.0000576" vr="0.9998020" bb="0.0000875" vb="0.9997326"/>
++            <vignetting model="pa" focal="5" aperture="3.6" distance="10" k1="-0.5210" k2="1.2701" k3="-1.3864"/>
++            <vignetting model="pa" focal="5" aperture="3.6" distance="1000" k1="-0.5210" k2="1.2701" k3="-1.3864"/>
++            <vignetting model="pa" focal="5" aperture="4.1" distance="10" k1="-0.6445" k2="1.7156" k3="-1.6579"/>
++            <vignetting model="pa" focal="5" aperture="4.1" distance="1000" k1="-0.6445" k2="1.7156" k3="-1.6579"/>
++            <vignetting model="pa" focal="5" aperture="4.7" distance="10" k1="-0.6582" k2="1.7247" k3="-1.6191"/>
++            <vignetting model="pa" focal="5" aperture="4.7" distance="1000" k1="-0.6582" k2="1.7247" k3="-1.6191"/>
++            <vignetting model="pa" focal="5" aperture="5.2" distance="10" k1="-0.6937" k2="1.8245" k3="-1.6778"/>
++            <vignetting model="pa" focal="5" aperture="5.2" distance="1000" k1="-0.6937" k2="1.8245" k3="-1.6778"/>
++            <vignetting model="pa" focal="5" aperture="5.6" distance="10" k1="-0.6947" k2="1.8150" k3="-1.6527"/>
++            <vignetting model="pa" focal="5" aperture="5.6" distance="1000" k1="-0.6947" k2="1.8150" k3="-1.6527"/>
++            <vignetting model="pa" focal="5" aperture="6" distance="10" k1="-0.7102" k2="1.8686" k3="-1.6883"/>
++            <vignetting model="pa" focal="5" aperture="6" distance="1000" k1="-0.7102" k2="1.8686" k3="-1.6883"/>
++            <vignetting model="pa" focal="5" aperture="6.3" distance="10" k1="-0.7211" k2="1.8893" k3="-1.6911"/>
++            <vignetting model="pa" focal="5" aperture="6.3" distance="1000" k1="-0.7211" k2="1.8893" k3="-1.6911"/>
++            <vignetting model="pa" focal="5" aperture="7.1" distance="10" k1="-0.7360" k2="1.9351" k3="-1.7071"/>
++            <vignetting model="pa" focal="5" aperture="7.1" distance="1000" k1="-0.7360" k2="1.9351" k3="-1.7071"/>
++            <vignetting model="pa" focal="5" aperture="8" distance="10" k1="-0.7416" k2="1.9438" k3="-1.7032"/>
++            <vignetting model="pa" focal="5" aperture="8" distance="1000" k1="-0.7416" k2="1.9438" k3="-1.7032"/>
++            <vignetting model="pa" focal="7.1" aperture="3.8" distance="10" k1="-0.1774" k2="0.0002" k3="-0.0356"/>
++            <vignetting model="pa" focal="7.1" aperture="3.8" distance="1000" k1="-0.1774" k2="0.0002" k3="-0.0356"/>
++            <vignetting model="pa" focal="7.1" aperture="4.1" distance="10" k1="-0.1835" k2="0.1249" k3="-0.1335"/>
++            <vignetting model="pa" focal="7.1" aperture="4.1" distance="1000" k1="-0.1835" k2="0.1249" k3="-0.1335"/>
++            <vignetting model="pa" focal="7.1" aperture="4.7" distance="10" k1="-0.2082" k2="0.1922" k3="-0.1313"/>
++            <vignetting model="pa" focal="7.1" aperture="4.7" distance="1000" k1="-0.2082" k2="0.1922" k3="-0.1313"/>
++            <vignetting model="pa" focal="7.1" aperture="5.2" distance="10" k1="-0.1994" k2="0.1570" k3="-0.0978"/>
++            <vignetting model="pa" focal="7.1" aperture="5.2" distance="1000" k1="-0.1994" k2="0.1570" k3="-0.0978"/>
++            <vignetting model="pa" focal="7.1" aperture="5.6" distance="10" k1="-0.2040" k2="0.1553" k3="-0.0911"/>
++            <vignetting model="pa" focal="7.1" aperture="5.6" distance="1000" k1="-0.2040" k2="0.1553" k3="-0.0911"/>
++            <vignetting model="pa" focal="7.1" aperture="6" distance="10" k1="-0.2014" k2="0.1571" k3="-0.0962"/>
++            <vignetting model="pa" focal="7.1" aperture="6" distance="1000" k1="-0.2014" k2="0.1571" k3="-0.0962"/>
++            <vignetting model="pa" focal="7.1" aperture="6.3" distance="10" k1="-0.2037" k2="0.1613" k3="-0.0992"/>
++            <vignetting model="pa" focal="7.1" aperture="6.3" distance="1000" k1="-0.2037" k2="0.1613" k3="-0.0992"/>
++            <vignetting model="pa" focal="7.1" aperture="7.1" distance="10" k1="-0.1990" k2="0.1594" k3="-0.1003"/>
++            <vignetting model="pa" focal="7.1" aperture="7.1" distance="1000" k1="-0.1990" k2="0.1594" k3="-0.1003"/>
++            <vignetting model="pa" focal="7.1" aperture="8" distance="10" k1="-0.2025" k2="0.1611" k3="-0.0986"/>
++            <vignetting model="pa" focal="7.1" aperture="8" distance="1000" k1="-0.2025" k2="0.1611" k3="-0.0986"/>
++            <vignetting model="pa" focal="10.8" aperture="4.2" distance="10" k1="-0.1587" k2="0.0021" k3="-0.0350"/>
++            <vignetting model="pa" focal="10.8" aperture="4.2" distance="1000" k1="-0.1587" k2="0.0021" k3="-0.0350"/>
++            <vignetting model="pa" focal="10.8" aperture="4.7" distance="10" k1="-0.1967" k2="0.2501" k3="-0.2043"/>
++            <vignetting model="pa" focal="10.8" aperture="4.7" distance="1000" k1="-0.1967" k2="0.2501" k3="-0.2043"/>
++            <vignetting model="pa" focal="10.8" aperture="5.2" distance="10" k1="-0.2017" k2="0.2469" k3="-0.1654"/>
++            <vignetting model="pa" focal="10.8" aperture="5.2" distance="1000" k1="-0.2017" k2="0.2469" k3="-0.1654"/>
++            <vignetting model="pa" focal="10.8" aperture="5.6" distance="10" k1="-0.1833" k2="0.2128" k3="-0.1439"/>
++            <vignetting model="pa" focal="10.8" aperture="5.6" distance="1000" k1="-0.1833" k2="0.2128" k3="-0.1439"/>
++            <vignetting model="pa" focal="10.8" aperture="6" distance="10" k1="-0.1934" k2="0.2253" k3="-0.1479"/>
++            <vignetting model="pa" focal="10.8" aperture="6" distance="1000" k1="-0.1934" k2="0.2253" k3="-0.1479"/>
++            <vignetting model="pa" focal="10.8" aperture="6.3" distance="10" k1="-0.1868" k2="0.2088" k3="-0.1370"/>
++            <vignetting model="pa" focal="10.8" aperture="6.3" distance="1000" k1="-0.1868" k2="0.2088" k3="-0.1370"/>
++            <vignetting model="pa" focal="10.8" aperture="7.1" distance="10" k1="-0.1898" k2="0.2107" k3="-0.1335"/>
++            <vignetting model="pa" focal="10.8" aperture="7.1" distance="1000" k1="-0.1898" k2="0.2107" k3="-0.1335"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.2090" k2="0.2350" k3="-0.1475"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.2090" k2="0.2350" k3="-0.1475"/>
++            <vignetting model="pa" focal="17.4" aperture="4.6" distance="10" k1="-0.1674" k2="0.0206" k3="-0.0326"/>
++            <vignetting model="pa" focal="17.4" aperture="4.6" distance="1000" k1="-0.1674" k2="0.0206" k3="-0.0326"/>
++            <vignetting model="pa" focal="17.4" aperture="4.7" distance="10" k1="-0.1802" k2="0.1413" k3="-0.1258"/>
++            <vignetting model="pa" focal="17.4" aperture="4.7" distance="1000" k1="-0.1802" k2="0.1413" k3="-0.1258"/>
++            <vignetting model="pa" focal="17.4" aperture="5.2" distance="10" k1="-0.2029" k2="0.3170" k3="-0.2385"/>
++            <vignetting model="pa" focal="17.4" aperture="5.2" distance="1000" k1="-0.2029" k2="0.3170" k3="-0.2385"/>
++            <vignetting model="pa" focal="17.4" aperture="5.6" distance="10" k1="-0.2162" k2="0.3364" k3="-0.2328"/>
++            <vignetting model="pa" focal="17.4" aperture="5.6" distance="1000" k1="-0.2162" k2="0.3364" k3="-0.2328"/>
++            <vignetting model="pa" focal="17.4" aperture="6" distance="10" k1="-0.2004" k2="0.2855" k3="-0.1949"/>
++            <vignetting model="pa" focal="17.4" aperture="6" distance="1000" k1="-0.2004" k2="0.2855" k3="-0.1949"/>
++            <vignetting model="pa" focal="17.4" aperture="6.3" distance="10" k1="-0.1938" k2="0.2764" k3="-0.1889"/>
++            <vignetting model="pa" focal="17.4" aperture="6.3" distance="1000" k1="-0.1938" k2="0.2764" k3="-0.1889"/>
++            <vignetting model="pa" focal="17.4" aperture="7.1" distance="10" k1="-0.1992" k2="0.2834" k3="-0.1903"/>
++            <vignetting model="pa" focal="17.4" aperture="7.1" distance="1000" k1="-0.1992" k2="0.2834" k3="-0.1903"/>
++            <vignetting model="pa" focal="17.4" aperture="8" distance="10" k1="-0.1844" k2="0.2544" k3="-0.1721"/>
++            <vignetting model="pa" focal="17.4" aperture="8" distance="1000" k1="-0.1844" k2="0.2544" k3="-0.1721"/>
++            <vignetting model="pa" focal="27.9" aperture="4.9" distance="10" k1="-0.2313" k2="0.3015" k3="-0.2820"/>
++            <vignetting model="pa" focal="27.9" aperture="4.9" distance="1000" k1="-0.2313" k2="0.3015" k3="-0.2820"/>
++            <vignetting model="pa" focal="27.9" aperture="5.2" distance="10" k1="-0.2349" k2="0.4133" k3="-0.3557"/>
++            <vignetting model="pa" focal="27.9" aperture="5.2" distance="1000" k1="-0.2349" k2="0.4133" k3="-0.3557"/>
++            <vignetting model="pa" focal="27.9" aperture="5.6" distance="10" k1="-0.2325" k2="0.4443" k3="-0.3418"/>
++            <vignetting model="pa" focal="27.9" aperture="5.6" distance="1000" k1="-0.2325" k2="0.4443" k3="-0.3418"/>
++            <vignetting model="pa" focal="27.9" aperture="6" distance="10" k1="-0.2004" k2="0.3306" k3="-0.2288"/>
++            <vignetting model="pa" focal="27.9" aperture="6" distance="1000" k1="-0.2004" k2="0.3306" k3="-0.2288"/>
++            <vignetting model="pa" focal="27.9" aperture="6.3" distance="10" k1="-0.1970" k2="0.3206" k3="-0.2180"/>
++            <vignetting model="pa" focal="27.9" aperture="6.3" distance="1000" k1="-0.1970" k2="0.3206" k3="-0.2180"/>
++            <vignetting model="pa" focal="27.9" aperture="7.1" distance="10" k1="-0.1962" k2="0.3168" k3="-0.2127"/>
++            <vignetting model="pa" focal="27.9" aperture="7.1" distance="1000" k1="-0.1962" k2="0.3168" k3="-0.2127"/>
++            <vignetting model="pa" focal="27.9" aperture="8" distance="10" k1="-0.1992" k2="0.3181" k3="-0.2152"/>
++            <vignetting model="pa" focal="27.9" aperture="8" distance="1000" k1="-0.1992" k2="0.3181" k3="-0.2152"/>
++            <vignetting model="pa" focal="40.9" aperture="5" distance="10" k1="-0.1321" k2="0.2134" k3="-0.4636"/>
++            <vignetting model="pa" focal="40.9" aperture="5" distance="1000" k1="-0.1321" k2="0.2134" k3="-0.4636"/>
++            <vignetting model="pa" focal="40.9" aperture="5.2" distance="10" k1="-0.1591" k2="0.3885" k3="-0.5863"/>
++            <vignetting model="pa" focal="40.9" aperture="5.2" distance="1000" k1="-0.1591" k2="0.3885" k3="-0.5863"/>
++            <vignetting model="pa" focal="40.9" aperture="5.6" distance="10" k1="-0.2385" k2="0.7011" k3="-0.7793"/>
++            <vignetting model="pa" focal="40.9" aperture="5.6" distance="1000" k1="-0.2385" k2="0.7011" k3="-0.7793"/>
++            <vignetting model="pa" focal="40.9" aperture="6" distance="10" k1="-0.2850" k2="0.8239" k3="-0.8053"/>
++            <vignetting model="pa" focal="40.9" aperture="6" distance="1000" k1="-0.2850" k2="0.8239" k3="-0.8053"/>
++            <vignetting model="pa" focal="40.9" aperture="6.3" distance="10" k1="-0.3062" k2="0.9034" k3="-0.8442"/>
++            <vignetting model="pa" focal="40.9" aperture="6.3" distance="1000" k1="-0.3062" k2="0.9034" k3="-0.8442"/>
++            <vignetting model="pa" focal="40.9" aperture="7.1" distance="10" k1="-0.3260" k2="0.9092" k3="-0.7925"/>
++            <vignetting model="pa" focal="40.9" aperture="7.1" distance="1000" k1="-0.3260" k2="0.9092" k3="-0.7925"/>
++            <vignetting model="pa" focal="40.9" aperture="8" distance="10" k1="-0.3224" k2="0.8446" k3="-0.6884"/>
++            <vignetting model="pa" focal="40.9" aperture="8" distance="1000" k1="-0.3224" k2="0.8446" k3="-0.6884"/>
++            <vignetting model="pa" focal="54.9" aperture="5.2" distance="10" k1="0.1045" k2="-0.7404" k3="0.2500"/>
++            <vignetting model="pa" focal="54.9" aperture="5.2" distance="1000" k1="0.1045" k2="-0.7404" k3="0.2500"/>
++            <vignetting model="pa" focal="54.9" aperture="5.6" distance="10" k1="0.0589" k2="-0.4842" k3="0.0332"/>
++            <vignetting model="pa" focal="54.9" aperture="5.6" distance="1000" k1="0.0589" k2="-0.4842" k3="0.0332"/>
++            <vignetting model="pa" focal="54.9" aperture="6" distance="10" k1="0.0276" k2="-0.2987" k3="-0.1235"/>
++            <vignetting model="pa" focal="54.9" aperture="6" distance="1000" k1="0.0276" k2="-0.2987" k3="-0.1235"/>
++            <vignetting model="pa" focal="54.9" aperture="6.3" distance="10" k1="-0.0343" k2="-0.0478" k3="-0.2891"/>
++            <vignetting model="pa" focal="54.9" aperture="6.3" distance="1000" k1="-0.0343" k2="-0.0478" k3="-0.2891"/>
++            <vignetting model="pa" focal="54.9" aperture="7.1" distance="10" k1="-0.1265" k2="0.3221" k3="-0.5603"/>
++            <vignetting model="pa" focal="54.9" aperture="7.1" distance="1000" k1="-0.1265" k2="0.3221" k3="-0.5603"/>
++            <vignetting model="pa" focal="54.9" aperture="8" distance="10" k1="-0.2444" k2="0.7164" k3="-0.8066"/>
++            <vignetting model="pa" focal="54.9" aperture="8" distance="1000" k1="-0.2444" k2="0.7164" k3="-0.8066"/>
++            <vignetting model="pa" focal="69.9" aperture="5.7" distance="10" k1="0.0375" k2="-0.7925" k3="0.4020"/>
++            <vignetting model="pa" focal="69.9" aperture="5.7" distance="1000" k1="0.0375" k2="-0.7925" k3="0.4020"/>
++            <vignetting model="pa" focal="69.9" aperture="6" distance="10" k1="0.0247" k2="-0.7167" k3="0.3104"/>
++            <vignetting model="pa" focal="69.9" aperture="6" distance="1000" k1="0.0247" k2="-0.7167" k3="0.3104"/>
++            <vignetting model="pa" focal="69.9" aperture="6.3" distance="10" k1="-0.0097" k2="-0.4681" k3="0.1359"/>
++            <vignetting model="pa" focal="69.9" aperture="6.3" distance="1000" k1="-0.0097" k2="-0.4681" k3="0.1359"/>
++            <vignetting model="pa" focal="69.9" aperture="7.1" distance="10" k1="-0.0778" k2="-0.0921" k3="-0.1703"/>
++            <vignetting model="pa" focal="69.9" aperture="7.1" distance="1000" k1="-0.0778" k2="-0.0921" k3="-0.1703"/>
++            <vignetting model="pa" focal="69.9" aperture="8" distance="10" k1="-0.2033" k2="0.3078" k3="-0.4295"/>
++            <vignetting model="pa" focal="69.9" aperture="8" distance="1000" k1="-0.2033" k2="0.3078" k3="-0.4295"/>
++            <vignetting model="pa" focal="80" aperture="6" distance="10" k1="0.0390" k2="-0.7304" k3="0.3437"/>
++            <vignetting model="pa" focal="80" aperture="6" distance="1000" k1="0.0390" k2="-0.7304" k3="0.3437"/>
++            <vignetting model="pa" focal="80" aperture="6.3" distance="10" k1="-0.0327" k2="-0.4345" k3="0.1550"/>
++            <vignetting model="pa" focal="80" aperture="6.3" distance="1000" k1="-0.0327" k2="-0.4345" k3="0.1550"/>
++            <vignetting model="pa" focal="80" aperture="7.1" distance="10" k1="-0.0925" k2="-0.1107" k3="-0.1209"/>
++            <vignetting model="pa" focal="80" aperture="7.1" distance="1000" k1="-0.0925" k2="-0.1107" k3="-0.1209"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.2243" k2="0.3069" k3="-0.3503"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.2243" k2="0.3069" k3="-0.3503"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon Powershot A495 &amp; compatibles, with CHDK's DNG</model>
++        <model lang="en">fixed lens, with CHDK's DNG</model>
++        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
++        <mount>canonA495</mount>
++        <cropfactor>5.39</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6.6" a="0.00718" b="-0.033603" c="0.028263"/>
++            <distortion model="ptlens" focal="8.1" a="0.010729" b="-0.041438" c="0.033314"/>
++            <distortion model="ptlens" focal="9.8" a="-0.000152" b="-0.006941" c="0.006815"/>
++            <distortion model="ptlens" focal="12.1" a="-0.002237" b="-0.00272" c="0.011421"/>
++            <distortion model="ptlens" focal="14.8" a="0.00785" b="-0.036605" c="0.053183"/>
++            <distortion model="ptlens" focal="17.5" a="0.013399" b="-0.045269" c="0.048979"/>
++            <distortion model="ptlens" focal="21.6" a="0.004399" b="-0.009577" c="0.002762"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot G16 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonG16</mount>
++        <cropfactor>4.67</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6.1" a="0.02662" b="-0.08597" c="0.00168"/>
++            <distortion model="ptlens" focal="9.3" a="0.00732" b="-0.02562" c="-0.00453"/>
++            <distortion model="ptlens" focal="12.5" a="-0.00131" b="0.00129" c="-0.00833"/>
++            <distortion model="ptlens" focal="19.7" a="0.00083" b="-0.00329" c="0.00391"/>
++            <distortion model="ptlens" focal="30.5" a="0.00382" b="0.00241" c="-0.01637"/>
++            <tca model="poly3" focal="6.1" vr="1.0005845" vb="1.0000965"/>
++            <tca model="poly3" focal="9.3" vr="1.0005620" vb="0.9999360"/>
++            <tca model="poly3" focal="12.5" vr="1.0003889" vb="0.9998557"/>
++            <tca model="poly3" focal="19.7" vr="1.0000832" vb="0.9997096"/>
++            <tca model="poly3" focal="30.5" vr="0.9998091" vb="0.9998656"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon PowerShot SX10 IS</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>canonSX10IS</mount>
++        <cropfactor>5.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="7.9" a="0.02144" b="-0.0514" c="0.02812"/>
++            <distortion model="ptlens" focal="13.7" a="0.00104" b="0.00887" c="0.01012"/>
++            <distortion model="ptlens" focal="23" a="0.00606" b="-0.01354" c="0.01202"/>
++            <distortion model="ptlens" focal="33.5" a="0.00333" b="-0.01698" c="0.03222"/>
++            <distortion model="ptlens" focal="49.8" a="-0.00278" b="-0.00161" c="0.01773"/>
++            <distortion model="ptlens" focal="67.4" a="0.00474" b="-0.02254" c="0.03282"/>
++            <distortion model="ptlens" focal="95.5" a="0.01336" b="-0.04402" c="0.05062"/>
++            <tca model="poly3" focal="7.9" vr="1.0002362" vb="1.0000038"/>
++            <tca model="poly3" focal="13.7" vr="1.0001858" vb="0.9999953"/>
++            <tca model="poly3" focal="23" vr="1.0002228" vb="0.9998707"/>
++            <tca model="poly3" focal="31.7" vr="1.0002011" vb="0.9997086"/>
++            <tca model="poly3" focal="33.5" vr="1.0002194" vb="0.9996814"/>
++            <tca model="poly3" focal="49.8" vr="1.0001195" vb="0.9999249"/>
++            <tca model="poly3" focal="67.4" vr="1.0000258" vb="0.9998699"/>
++            <tca model="poly3" focal="95.5" vr="0.9999331" vb="0.9999027"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-casio.xml b/data/db/compact-casio.xml
+--- a/data/db/compact-casio.xml	2010-02-18 20:34:13.000000000 +0100
++++ b/data/db/compact-casio.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,204 +1,172 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>casioZ750</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>casioP600</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>casioQV3500</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>casioZ4</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>casioEX-FH20</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-Z750</model>
+         <mount>casioZ750</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-P700</model>
+         <mount>casioP600</mount>
+         <cropfactor>4.65</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-P600</model>
+         <mount>casioP600</mount>
+         <cropfactor>4.65</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-Z4</model>
+         <mount>casioZ4</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-Z3</model>
+         <mount>casioZ4</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-Z55</model>
+         <mount>casioZ4</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-Z40</model>
+         <mount>casioZ4</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD</maker>
++        <maker>Casio Computer Co.,Ltd</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-Z30</model>
+         <mount>casioZ4</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO</maker>
++        <maker>Casio</maker>
+         <maker lang="en">Casio</maker>
+         <model>QV-4000</model>
+         <mount>canonG2</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO</maker>
++        <maker>Casio</maker>
+         <maker lang="en">Casio</maker>
+         <model>QV-3500EX</model>
+         <mount>casioQV3500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO</maker>
++        <maker>Casio</maker>
+         <maker lang="en">Casio</maker>
+         <model>QV-3000EX</model>
+         <mount>casioQV3500</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>CASIO COMPUTER CO.,LTD.</maker>
++        <maker>Casio Computer Co.,Ltd.</maker>
+         <maker lang="en">Casio</maker>
+         <model>EX-FH20</model>
+         <mount>casioEX-FH20</mount>
+         <cropfactor>5.68</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Casio</maker>
+-        <model>Standard</model>
++        <model>EX-Z750 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>casioZ750</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.9" a="0" b="-0.015843" c="0" />
+-            <distortion model="ptlens" focal="9.5" a="0" b="-0.008169" c="0" />
+-            <distortion model="ptlens" focal="11.8" a="0" b="-0.006286" c="0" />
+-            <distortion model="ptlens" focal="14.2" a="0" b="-0.004511" c="0" />
+-            <distortion model="ptlens" focal="16.6" a="0" b="-0.003361" c="0" />
+-            <distortion model="ptlens" focal="19.7" a="0" b="-0.004139" c="0" />
+-            <distortion model="ptlens" focal="23.7" a="0" b="-0.00471" c="0" />
++            <distortion model="poly3" focal="7.9" k1="-0.015843"/>
++            <distortion model="poly3" focal="9.5" k1="-0.008169"/>
++            <distortion model="poly3" focal="11.8" k1="-0.006286"/>
++            <distortion model="poly3" focal="14.2" k1="-0.004511"/>
++            <distortion model="poly3" focal="16.6" k1="-0.003361"/>
++            <distortion model="poly3" focal="19.7" k1="-0.004139"/>
++            <distortion model="poly3" focal="23.7" k1="-0.00471"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Casio</maker>
+-        <model>Standard</model>
++        <model>EX-P600 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>casioP600</mount>
+         <cropfactor>4.65</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.020742" b="-0.051562" c="0" />
+-            <distortion model="ptlens" focal="7.81" a="0.015463" b="-0.04079" c="0" />
+-            <distortion model="ptlens" focal="9.2" a="0.009382" b="-0.022587" c="0" />
+-            <distortion model="ptlens" focal="11.3" a="0" b="0.00109" c="0" />
+-            <distortion model="ptlens" focal="14.2" a="0" b="0.003042" c="0" />
+-            <distortion model="ptlens" focal="19.2" a="0" b="0.00582" c="0" />
+-            <distortion model="ptlens" focal="23.4" a="0" b="0.005834" c="0" />
+-            <distortion model="ptlens" focal="28.4" a="0" b="0.00818" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.020742" b="-0.051562" c="0"/>
++            <distortion model="ptlens" focal="7.81" a="0.015463" b="-0.04079" c="0"/>
++            <distortion model="ptlens" focal="9.2" a="0.009382" b="-0.022587" c="0"/>
++            <distortion model="ptlens" focal="11.3" a="0" b="0.00109" c="0"/>
++            <distortion model="ptlens" focal="14.2" a="0" b="0.003042" c="0"/>
++            <distortion model="ptlens" focal="19.2" a="0" b="0.00582" c="0"/>
++            <distortion model="ptlens" focal="23.4" a="0" b="0.005834" c="0"/>
++            <distortion model="ptlens" focal="28.4" a="0" b="0.00818" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Casio</maker>
+-        <model>WC-DC58A</model>
++        <model>EX-P600 &amp; compatibles, with WC-DC58A</model>
++        <model lang="en">fixed lens, with WC-DC58A</model>
++        <model lang="de">festes Objektiv, mit WC-DC58A</model>
+         <mount>casioP600</mount>
+         <cropfactor>4.65</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.020587" b="-0.07417" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.020587" b="-0.07417" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Casio</maker>
+-        <model>Standard</model>
++        <model>EX-Z4 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>casioZ4</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.016943" b="-0.048353" c="0" />
+-            <distortion model="ptlens" focal="6.8" a="0.01652" b="-0.044474" c="0" />
+-            <distortion model="ptlens" focal="8.2" a="0.002124" b="-0.01133" c="0" />
+-            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.016943" b="-0.048353" c="0"/>
++            <distortion model="ptlens" focal="6.8" a="0.01652" b="-0.044474" c="0"/>
++            <distortion model="ptlens" focal="8.2" a="0.002124" b="-0.01133" c="0"/>
++            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Casio</maker>
+-        <model>Standard</model>
++        <model>QV-3500EX &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>casioQV3500</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.13" a="0.012733" b="-0.03693" c="0" />
+-            <distortion model="ptlens" focal="9.82" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="14.22" a="0" b="0.003219" c="0" />
+-            <distortion model="ptlens" focal="20.74" a="0" b="0.004435" c="0" />
++            <distortion model="ptlens" focal="7.13" a="0.012733" b="-0.03693" c="0"/>
++            <distortion model="ptlens" focal="9.82" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="14.22" a="0" b="0.003219" c="0"/>
++            <distortion model="ptlens" focal="20.74" a="0" b="0.004435" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Casio</maker>
+-        <model>Raynox 0.66x</model>
++        <model>QV-3500EX &amp; compatibles, with Raynox 0.66x</model>
++        <model lang="en">fixed lens, with Raynox 0.66×</model>
++        <model lang="de">festes Objektiv, mit Raynox 0.66×</model>
+         <mount>casioQV3500</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.13" a="0" b="0.02562" c="-0.106136" />
++            <distortion model="ptlens" focal="7.13" a="0" b="0.02562" c="-0.106136"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-fujifilm.xml b/data/db/compact-fujifilm.xml
+--- a/data/db/compact-fujifilm.xml	2013-09-02 21:38:12.000000000 +0200
++++ b/data/db/compact-fujifilm.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,698 +1,921 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>fuji810</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fujiS9000</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fuji2800</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fujiF11</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fujiS5500</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fuji601</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fuji602</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fujiF200exr</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fujix100s</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>fujix10</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F11</model>
+         <mount>fujiF11</mount>
+         <cropfactor>4.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F10</model>
+         <mount>fujiF11</mount>
+         <cropfactor>4.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S9000</model>
+         <mount>fujiS9000</mount>
+         <cropfactor>4.48</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S9500</model>
+         <mount>fujiS9000</mount>
+         <cropfactor>4.48</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
++        <model>FinePix S9600</model>
++        <mount>fujiS9000</mount>
++        <cropfactor>4.48</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
+         <model>FinePix S5500</model>
+         <mount>fujiS5500</mount>
+         <cropfactor>6.491</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S5100</model>
+         <mount>fujiS5500</mount>
+         <cropfactor>6.491</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S7000</model>
+         <mount>fuji602</mount>
+         <cropfactor>4.487</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S20Pro</model>
+         <mount>fuji602</mount>
+         <cropfactor>4.487</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S602 ZOOM</model>
+         <mount>fuji602</mount>
+         <cropfactor>4.487</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F601 ZOOM</model>
+         <mount>fuji601</mount>
+         <cropfactor>4.487</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F810</model>
+         <mount>fuji810</mount>
+         <cropfactor>4.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F810</model>
+         <variant>widescreen mode</variant>
+         <mount>fuji810</mount>
+         <cropfactor>4.9</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F710</model>
+         <mount>fuji810</mount>
+         <cropfactor>4.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix E550</model>
+         <mount>fuji810</mount>
+         <cropfactor>4.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix 3800</model>
+         <mount>fuji2800</mount>
+         <cropfactor>6.3333333</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S304</model>
+         <mount>fuji2800</mount>
+         <cropfactor>6.3333333</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S3000</model>
+         <mount>fuji2800</mount>
+         <cropfactor>6.3333333</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix2800ZOOM</model>
+         <mount>fuji2800</mount>
+         <cropfactor>6.3333333</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix F200EXR</model>
+         <mount>fujiF200exr</mount>
+         <cropfactor>4.341</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
++        <model>FinePix X100</model>
++        <mount>fujix100</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
+         <model>X100S</model>
+-        <mount>fujix100s</mount>
+-        <cropfactor>1.523</cropfactor>
++        <mount>fujix100</mount>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
++        <model>X100T</model>
++        <mount>fujix100</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
+         <model>X10</model>
+         <mount>fujix10</mount>
+         <cropfactor>3.93</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X70</model>
++        <mount>fujix70</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X20</model>
++        <!-- Optically equivalent to X10, see
++             https://secure.flickr.com/groups/darktable/discuss/72157646611511061/ and
++             <http://www.photoreview.com.au/reviews/advanced-compact-cameras/fixed-lens/fujifilm-x20>. -->
++        <mount>fujix10</mount>
++        <cropfactor>3.93</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X30</model>
++        <!-- Optically equivalent to X10, see
++             http://www.heise.de/foto/artikel/Test-Edelkompakte-Fujifilm-X30-2444045.html
++             (German). -->
++        <mount>fujix10</mount>
++        <cropfactor>3.93</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>FinePix HS20EXR</model>
++        <mount>fujihs20exr</mount>
++        <cropfactor>5.71</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>FinePix F770EXR</model>
++        <mount>fujif770exr</mount>
++        <cropfactor>5.43</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>FinePix S5600</model>
++        <mount>fujiS5600</mount>
++        <cropfactor>6.03</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>XQ1</model>
++        <mount>fujiXQ1</mount>
++        <cropfactor>3.91</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>FinePix A370</model>
++        <mount>fujiA370</mount>
++        <cropfactor>6.03</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-S1</model>
++        <mount>fujiXS1</mount>
++        <cropfactor>3.93</cropfactor>
++    </camera>
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix F11 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fujiF11</mount>
+         <cropfactor>4.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8" a="0" b="-0.00618" c="0" />
+-            <distortion model="ptlens" focal="10.4" a="0" b="-0.005407" c="0" />
+-            <distortion model="ptlens" focal="12.2" a="0" b="-0.005171" c="0" />
+-            <distortion model="ptlens" focal="14.1" a="0" b="-0.004634" c="0" />
+-            <distortion model="ptlens" focal="16.1" a="0" b="-0.001624" c="0" />
+-            <distortion model="ptlens" focal="18.1" a="0" b="-0.001948" c="0" />
+-            <distortion model="ptlens" focal="20.1" a="0" b="-0.000215" c="0" />
+-            <distortion model="ptlens" focal="22.1" a="0" b="0.000376" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="0" c="0" />
++            <distortion model="poly3" focal="8" k1="-0.00618"/>
++            <distortion model="poly3" focal="10.4" k1="-0.005407"/>
++            <distortion model="poly3" focal="12.2" k1="-0.005171"/>
++            <distortion model="poly3" focal="14.1" k1="-0.004634"/>
++            <distortion model="poly3" focal="16.1" k1="-0.001624"/>
++            <distortion model="poly3" focal="18.1" k1="-0.001948"/>
++            <distortion model="poly3" focal="20.1" k1="-0.000215"/>
++            <distortion model="poly3" focal="22.1" k1="0.000376"/>
++            <distortion model="poly3" focal="24" k1="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix S9000 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fujiS9000</mount>
+         <cropfactor>4.48</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.2" a="0.022449" b="-0.05488" c="0" />
+-            <distortion model="ptlens" focal="7.2" a="0.014932" b="-0.036434" c="0" />
+-            <distortion model="ptlens" focal="8.1" a="0.006337" b="-0.018767" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0.005262" b="-0.0146" c="0" />
+-            <distortion model="ptlens" focal="10.8" a="0.005679" b="-0.011186" c="0" />
+-            <distortion model="ptlens" focal="12.8" a="0.004792" b="-0.00467" c="0" />
+-            <distortion model="ptlens" focal="17" a="0" b="0.004675" c="0" />
+-            <distortion model="ptlens" focal="21.6" a="0" b="0.003203" c="0" />
+-            <distortion model="ptlens" focal="42.6" a="0" b="0.002282" c="0" />
+-            <distortion model="ptlens" focal="67" a="0" b="0.003859" c="0" />
++            <distortion model="ptlens" focal="6.2" a="0.022449" b="-0.05488" c="0"/>
++            <distortion model="ptlens" focal="7.2" a="0.014932" b="-0.036434" c="0"/>
++            <distortion model="ptlens" focal="8.1" a="0.006337" b="-0.018767" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0.005262" b="-0.0146" c="0"/>
++            <distortion model="ptlens" focal="10.8" a="0.005679" b="-0.011186" c="0"/>
++            <distortion model="ptlens" focal="12.8" a="0.004792" b="-0.00467" c="0"/>
++            <distortion model="ptlens" focal="17" a="0" b="0.004675" c="0"/>
++            <distortion model="ptlens" focal="21.6" a="0" b="0.003203" c="0"/>
++            <distortion model="ptlens" focal="42.6" a="0" b="0.002282" c="0"/>
++            <distortion model="ptlens" focal="67" a="0" b="0.003859" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix S5500 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fujiS5500</mount>
+         <cropfactor>6.491</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.7" a="0.011881" b="-0.03472" c="0" />
+-            <distortion model="ptlens" focal="6.7" a="0.009745" b="-0.023435" c="0" />
+-            <distortion model="ptlens" focal="7.5" a="0.008247" b="-0.018865" c="0" />
+-            <distortion model="ptlens" focal="8.4" a="0.006006" b="-0.010909" c="0" />
+-            <distortion model="ptlens" focal="10.7" a="0" b="0.003268" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="0.002961" c="0" />
+-            <distortion model="ptlens" focal="13.6" a="0" b="0.00352" c="0" />
+-            <distortion model="ptlens" focal="17.2" a="0" b="0.002228" c="0" />
+-            <distortion model="ptlens" focal="19.6" a="0" b="0.002639" c="0" />
+-            <distortion model="ptlens" focal="25.1" a="0" b="0.003074" c="0" />
+-            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="51.3" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="57" a="0" b="0.002197" c="0" />
++            <distortion model="ptlens" focal="5.7" a="0.011881" b="-0.03472" c="0"/>
++            <distortion model="ptlens" focal="6.7" a="0.009745" b="-0.023435" c="0"/>
++            <distortion model="ptlens" focal="7.5" a="0.008247" b="-0.018865" c="0"/>
++            <distortion model="ptlens" focal="8.4" a="0.006006" b="-0.010909" c="0"/>
++            <distortion model="ptlens" focal="10.7" a="0" b="0.003268" c="0"/>
++            <distortion model="ptlens" focal="12" a="0" b="0.002961" c="0"/>
++            <distortion model="ptlens" focal="13.6" a="0" b="0.00352" c="0"/>
++            <distortion model="ptlens" focal="17.2" a="0" b="0.002228" c="0"/>
++            <distortion model="ptlens" focal="19.6" a="0" b="0.002639" c="0"/>
++            <distortion model="ptlens" focal="25.1" a="0" b="0.003074" c="0"/>
++            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="51.3" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="57" a="0" b="0.002197" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix S602 ZOOM &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fuji602</mount>
+         <cropfactor>4.487</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.8" a="0.00554" b="-0.018984" c="0" />
+-            <distortion model="ptlens" focal="10" a="0.011917" b="-0.024177" c="0" />
+-            <distortion model="ptlens" focal="12" a="0.012384" b="-0.016734" c="0" />
+-            <distortion model="ptlens" focal="14" a="0.009613" b="-0.007388" c="0" />
+-            <distortion model="ptlens" focal="17" a="0.004389" b="0.003994" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.003743" b="0.004964" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.007011" b="-0.002673" c="0" />
+-            <distortion model="ptlens" focal="29" a="0.009838" b="-0.008207" c="0" />
+-            <distortion model="ptlens" focal="38" a="0.005981" b="0.000177" c="0" />
+-            <distortion model="ptlens" focal="46.8" a="0.001412" b="0.009081" c="0" />
++            <distortion model="ptlens" focal="7.8" a="0.00554" b="-0.018984" c="0"/>
++            <distortion model="ptlens" focal="10" a="0.011917" b="-0.024177" c="0"/>
++            <distortion model="ptlens" focal="12" a="0.012384" b="-0.016734" c="0"/>
++            <distortion model="ptlens" focal="14" a="0.009613" b="-0.007388" c="0"/>
++            <distortion model="ptlens" focal="17" a="0.004389" b="0.003994" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.003743" b="0.004964" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.007011" b="-0.002673" c="0"/>
++            <distortion model="ptlens" focal="29" a="0.009838" b="-0.008207" c="0"/>
++            <distortion model="ptlens" focal="38" a="0.005981" b="0.000177" c="0"/>
++            <distortion model="ptlens" focal="46.8" a="0.001412" b="0.009081" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix F601 ZOOM &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fuji601</mount>
+         <cropfactor>4.487</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.3" a="0" b="-0.024191" c="0" />
+-            <distortion model="ptlens" focal="9.4" a="0" b="-0.018667" c="0" />
+-            <distortion model="ptlens" focal="10.6" a="0" b="-0.017396" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="-0.014467" c="0" />
+-            <distortion model="ptlens" focal="15.3" a="0" b="-0.01029" c="0" />
+-            <distortion model="ptlens" focal="19.5" a="0" b="-0.008176" c="0" />
+-            <distortion model="ptlens" focal="24.9" a="0" b="-0.005081" c="0" />
++            <distortion model="poly3" focal="8.3" k1="-0.024191"/>
++            <distortion model="poly3" focal="9.4" k1="-0.018667"/>
++            <distortion model="poly3" focal="10.6" k1="-0.017396"/>
++            <distortion model="poly3" focal="12" k1="-0.014467"/>
++            <distortion model="poly3" focal="15.3" k1="-0.01029"/>
++            <distortion model="poly3" focal="19.5" k1="-0.008176"/>
++            <distortion model="poly3" focal="24.9" k1="-0.005081"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix F810 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fuji810</mount>
+         <cropfactor>4.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.2" a="0.013263" b="-0.038383" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="-0.011186" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="0" b="-0.00645" c="0" />
+-            <distortion model="ptlens" focal="13.5" a="0" b="-0.003957" c="0" />
+-            <distortion model="ptlens" focal="16.8" a="0" b="-0.002027" c="0" />
+-            <distortion model="ptlens" focal="20.2" a="0" b="-0.001391" c="0" />
+-            <distortion model="ptlens" focal="24.5" a="0" b="-0.000731" c="0" />
+-            <distortion model="ptlens" focal="28.8" a="0" b="0.0005" c="0" />
++            <distortion model="ptlens" focal="7.2" a="0.013263" b="-0.038383" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0" b="-0.011186" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="0" b="-0.00645" c="0"/>
++            <distortion model="ptlens" focal="13.5" a="0" b="-0.003957" c="0"/>
++            <distortion model="ptlens" focal="16.8" a="0" b="-0.002027" c="0"/>
++            <distortion model="ptlens" focal="20.2" a="0" b="-0.001391" c="0"/>
++            <distortion model="ptlens" focal="24.5" a="0" b="-0.000731" c="0"/>
++            <distortion model="ptlens" focal="28.8" a="0" b="0.0005" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>WL-FXE01 (full wide)</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix F810 &amp; compatibles, with WL-FXE01 (full wide)</model>
++        <model lang="en">fixed lens, with WL-FXE01 (full wide)</model>
++        <model lang="de">festes Objektiv, mit WL-FXE01 (kürzeste Brennw.)</model>
+         <mount>fuji810</mount>
+         <cropfactor>4.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.2" a="0.023137" b="-0.073048" c="0" />
++            <distortion model="ptlens" focal="7.2" a="0.023137" b="-0.073048" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix 2800 ZOOM &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fuji2800</mount>
+         <cropfactor>6.3333333</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0" b="0" c="-0.035" />
+-            <distortion model="ptlens" focal="6.1" a="0" b="0" c="-0.034364" />
+-            <distortion model="ptlens" focal="6.2" a="0" b="0" c="-0.033709" />
+-            <distortion model="ptlens" focal="6.3" a="0" b="0" c="-0.033016" />
+-            <distortion model="ptlens" focal="6.4" a="0" b="0" c="-0.032258" />
+-            <distortion model="ptlens" focal="6.5" a="0" b="0" c="-0.031404" />
+-            <distortion model="ptlens" focal="6.6" a="0" b="0" c="-0.030404" />
+-            <distortion model="ptlens" focal="6.7" a="0" b="0" c="-0.029175" />
+-            <distortion model="ptlens" focal="6.8" a="0" b="0" c="-0.027545" />
+-            <distortion model="ptlens" focal="6.9" a="0" b="0" c="-0.025" />
+-            <distortion model="ptlens" focal="7" a="0" b="0" c="-0.020295" />
+-            <distortion model="ptlens" focal="7.1" a="0" b="0" c="-0.016679" />
+-            <distortion model="ptlens" focal="7.2" a="0" b="0" c="-0.014386" />
+-            <distortion model="ptlens" focal="7.3" a="0" b="0" c="-0.012691" />
+-            <distortion model="ptlens" focal="7.4" a="0" b="0" c="-0.011332" />
+-            <distortion model="ptlens" focal="7.5" a="0" b="0" c="-0.010188" />
+-            <distortion model="ptlens" focal="7.6" a="0" b="0" c="-0.009196" />
+-            <distortion model="ptlens" focal="7.7" a="0" b="0" c="-0.00832" />
+-            <distortion model="ptlens" focal="7.8" a="0" b="0" c="-0.007533" />
+-            <distortion model="ptlens" focal="7.9" a="0" b="0" c="-0.006818" />
+-            <distortion model="ptlens" focal="8" a="0" b="0" c="-0.006164" />
+-            <distortion model="ptlens" focal="8.1" a="0" b="0" c="-0.00556" />
+-            <distortion model="ptlens" focal="8.2" a="0" b="0" c="-0.005" />
+-            <distortion model="ptlens" focal="8.3" a="0" b="0" c="-0.004477" />
+-            <distortion model="ptlens" focal="8.4" a="0" b="0" c="-0.003986" />
+-            <distortion model="ptlens" focal="8.5" a="0" b="0" c="-0.00352" />
+-            <distortion model="ptlens" focal="8.6" a="0" b="0" c="-0.003077" />
+-            <distortion model="ptlens" focal="8.7" a="0" b="0" c="-0.002652" />
+-            <distortion model="ptlens" focal="8.8" a="0" b="0" c="-0.002245" />
+-            <distortion model="ptlens" focal="8.9" a="0" b="0" c="-0.001852" />
+-            <distortion model="ptlens" focal="9" a="0" b="0" c="-0.001473" />
+-            <distortion model="ptlens" focal="9.1" a="0" b="0" c="-0.001106" />
+-            <distortion model="ptlens" focal="9.2" a="0" b="0" c="-0.000749" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="0" c="-0.000403" />
+-            <distortion model="ptlens" focal="9.4" a="0" b="0" c="-6.5e-05" />
+-            <distortion model="ptlens" focal="9.5" a="0" b="0" c="0.000263" />
+-            <distortion model="ptlens" focal="9.6" a="0" b="0" c="0.000585" />
+-            <distortion model="ptlens" focal="9.7" a="0" b="0" c="0.000898" />
+-            <distortion model="ptlens" focal="9.8" a="0" b="0" c="0.001206" />
+-            <distortion model="ptlens" focal="9.9" a="0" b="0" c="0.001506" />
+-            <distortion model="ptlens" focal="10" a="0" b="0" c="0.001801" />
+-            <distortion model="ptlens" focal="10.1" a="0" b="0" c="0.00209" />
+-            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0.002375" />
+-            <distortion model="ptlens" focal="10.3" a="0" b="0" c="0.002654" />
+-            <distortion model="ptlens" focal="10.4" a="0" b="0" c="0.002928" />
+-            <distortion model="ptlens" focal="10.5" a="0" b="0" c="0.003198" />
+-            <distortion model="ptlens" focal="10.6" a="0" b="0" c="0.003464" />
+-            <distortion model="ptlens" focal="10.7" a="0" b="0" c="0.003725" />
+-            <distortion model="ptlens" focal="10.8" a="0" b="0" c="0.003983" />
+-            <distortion model="ptlens" focal="10.9" a="0" b="0" c="0.004237" />
+-            <distortion model="ptlens" focal="11" a="0" b="0" c="0.004488" />
+-            <distortion model="ptlens" focal="11.1" a="0" b="0" c="0.004736" />
+-            <distortion model="ptlens" focal="11.2" a="0" b="0" c="0.00498" />
+-            <distortion model="ptlens" focal="11.3" a="0" b="0" c="0.005221" />
+-            <distortion model="ptlens" focal="11.4" a="0" b="0" c="0.00546" />
+-            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0.005696" />
+-            <distortion model="ptlens" focal="11.6" a="0" b="0" c="0.005929" />
+-            <distortion model="ptlens" focal="11.7" a="0" b="0" c="0.006159" />
+-            <distortion model="ptlens" focal="11.8" a="0" b="0" c="0.006387" />
+-            <distortion model="ptlens" focal="11.9" a="0" b="0" c="0.006613" />
+-            <distortion model="ptlens" focal="12" a="0" b="0" c="0.006837" />
+-            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0.007059" />
+-            <distortion model="ptlens" focal="12.2" a="0" b="0" c="0.007279" />
+-            <distortion model="ptlens" focal="12.3" a="0" b="0" c="0.007498" />
+-            <distortion model="ptlens" focal="12.4" a="0" b="0" c="0.007715" />
+-            <distortion model="ptlens" focal="12.5" a="0" b="0" c="0.007931" />
+-            <distortion model="ptlens" focal="12.6" a="0" b="0" c="0.008145" />
+-            <distortion model="ptlens" focal="12.7" a="0" b="0" c="0.008359" />
+-            <distortion model="ptlens" focal="12.8" a="0" b="0" c="0.008572" />
+-            <distortion model="ptlens" focal="12.9" a="0" b="0" c="0.008786" />
+-            <distortion model="ptlens" focal="13" a="0" b="0" c="0.009" />
+-            <distortion model="ptlens" focal="13.1" a="0" b="0" c="0.009216" />
+-            <distortion model="ptlens" focal="13.2" a="0" b="0" c="0.009434" />
+-            <distortion model="ptlens" focal="13.3" a="0" b="0" c="0.009656" />
+-            <distortion model="ptlens" focal="13.4" a="0" b="0" c="0.009882" />
+-            <distortion model="ptlens" focal="13.5" a="0" b="0" c="0.010114" />
+-            <distortion model="ptlens" focal="13.6" a="0" b="0" c="0.010357" />
+-            <distortion model="ptlens" focal="13.7" a="0" b="0" c="0.01062" />
+-            <distortion model="ptlens" focal="13.8" a="0" b="0" c="0.010921" />
+-            <distortion model="ptlens" focal="13.9" a="0" b="0" c="0.011236" />
+-            <distortion model="ptlens" focal="14" a="0" b="0" c="0.011512" />
+-            <distortion model="ptlens" focal="14.1" a="0" b="0" c="0.011762" />
+-            <distortion model="ptlens" focal="14.2" a="0" b="0" c="0.012" />
+-            <distortion model="ptlens" focal="14.3" a="0" b="0" c="0.01223" />
+-            <distortion model="ptlens" focal="14.4" a="0" b="0" c="0.012454" />
+-            <distortion model="ptlens" focal="14.5" a="0" b="0" c="0.012673" />
+-            <distortion model="ptlens" focal="14.6" a="0" b="0" c="0.012888" />
+-            <distortion model="ptlens" focal="14.7" a="0" b="0" c="0.013098" />
+-            <distortion model="ptlens" focal="14.8" a="0" b="0" c="0.013304" />
+-            <distortion model="ptlens" focal="14.9" a="0" b="0" c="0.013507" />
+-            <distortion model="ptlens" focal="15" a="0" b="0" c="0.013706" />
+-            <distortion model="ptlens" focal="15.1" a="0" b="0" c="0.013902" />
+-            <distortion model="ptlens" focal="15.2" a="0" b="0" c="0.014094" />
+-            <distortion model="ptlens" focal="15.3" a="0" b="0" c="0.014283" />
+-            <distortion model="ptlens" focal="15.4" a="0" b="0" c="0.014469" />
+-            <distortion model="ptlens" focal="15.5" a="0" b="0" c="0.014652" />
+-            <distortion model="ptlens" focal="15.6" a="0" b="0" c="0.014832" />
+-            <distortion model="ptlens" focal="15.7" a="0" b="0" c="0.01501" />
+-            <distortion model="ptlens" focal="15.8" a="0" b="0" c="0.015184" />
+-            <distortion model="ptlens" focal="15.9" a="0" b="0" c="0.015355" />
+-            <distortion model="ptlens" focal="16" a="0" b="0" c="0.015524" />
+-            <distortion model="ptlens" focal="16.1" a="0" b="0" c="0.01569" />
+-            <distortion model="ptlens" focal="16.2" a="0" b="0" c="0.015853" />
+-            <distortion model="ptlens" focal="16.3" a="0" b="0" c="0.016014" />
+-            <distortion model="ptlens" focal="16.4" a="0" b="0" c="0.016172" />
+-            <distortion model="ptlens" focal="16.5" a="0" b="0" c="0.016327" />
+-            <distortion model="ptlens" focal="16.6" a="0" b="0" c="0.016479" />
+-            <distortion model="ptlens" focal="16.7" a="0" b="0" c="0.016629" />
+-            <distortion model="ptlens" focal="16.8" a="0" b="0" c="0.016777" />
+-            <distortion model="ptlens" focal="16.9" a="0" b="0" c="0.016922" />
+-            <distortion model="ptlens" focal="17" a="0" b="0" c="0.017064" />
+-            <distortion model="ptlens" focal="17.1" a="0" b="0" c="0.017204" />
+-            <distortion model="ptlens" focal="17.2" a="0" b="0" c="0.017341" />
+-            <distortion model="ptlens" focal="17.3" a="0" b="0" c="0.017476" />
+-            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0.017608" />
+-            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0.017738" />
+-            <distortion model="ptlens" focal="17.6" a="0" b="0" c="0.017865" />
+-            <distortion model="ptlens" focal="17.7" a="0" b="0" c="0.017989" />
+-            <distortion model="ptlens" focal="17.8" a="0" b="0" c="0.018112" />
+-            <distortion model="ptlens" focal="17.9" a="0" b="0" c="0.018231" />
+-            <distortion model="ptlens" focal="18" a="0" b="0" c="0.018349" />
+-            <distortion model="ptlens" focal="18.1" a="0" b="0" c="0.018463" />
+-            <distortion model="ptlens" focal="18.2" a="0" b="0" c="0.018576" />
+-            <distortion model="ptlens" focal="18.3" a="0" b="0" c="0.018685" />
+-            <distortion model="ptlens" focal="18.4" a="0" b="0" c="0.018793" />
+-            <distortion model="ptlens" focal="18.5" a="0" b="0" c="0.018898" />
+-            <distortion model="ptlens" focal="18.6" a="0" b="0" c="0.019" />
+-            <distortion model="ptlens" focal="18.7" a="0" b="0" c="0.0191" />
+-            <distortion model="ptlens" focal="18.8" a="0" b="0" c="0.019197" />
+-            <distortion model="ptlens" focal="18.9" a="0" b="0" c="0.019293" />
+-            <distortion model="ptlens" focal="19" a="0" b="0" c="0.019386" />
+-            <distortion model="ptlens" focal="19.1" a="0" b="0" c="0.019476" />
+-            <distortion model="ptlens" focal="19.2" a="0" b="0" c="0.019565" />
+-            <distortion model="ptlens" focal="19.3" a="0" b="0" c="0.019652" />
+-            <distortion model="ptlens" focal="19.4" a="0" b="0" c="0.019737" />
+-            <distortion model="ptlens" focal="19.5" a="0" b="0" c="0.019819" />
+-            <distortion model="ptlens" focal="19.6" a="0" b="0" c="0.0199" />
+-            <distortion model="ptlens" focal="19.7" a="0" b="0" c="0.019979" />
+-            <distortion model="ptlens" focal="19.8" a="0" b="0" c="0.020057" />
+-            <distortion model="ptlens" focal="19.9" a="0" b="0" c="0.020133" />
+-            <distortion model="ptlens" focal="20" a="0" b="0" c="0.020207" />
+-            <distortion model="ptlens" focal="20.1" a="0" b="0" c="0.020279" />
+-            <distortion model="ptlens" focal="20.2" a="0" b="0" c="0.02035" />
+-            <distortion model="ptlens" focal="20.3" a="0" b="0" c="0.02042" />
+-            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0.020488" />
+-            <distortion model="ptlens" focal="20.5" a="0" b="0" c="0.020554" />
+-            <distortion model="ptlens" focal="20.6" a="0" b="0" c="0.02062" />
+-            <distortion model="ptlens" focal="20.7" a="0" b="0" c="0.020684" />
+-            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0.020746" />
+-            <distortion model="ptlens" focal="20.9" a="0" b="0" c="0.020808" />
+-            <distortion model="ptlens" focal="21" a="0" b="0" c="0.020868" />
+-            <distortion model="ptlens" focal="21.1" a="0" b="0" c="0.020927" />
+-            <distortion model="ptlens" focal="21.2" a="0" b="0" c="0.020985" />
+-            <distortion model="ptlens" focal="21.3" a="0" b="0" c="0.021041" />
+-            <distortion model="ptlens" focal="21.4" a="0" b="0" c="0.021097" />
+-            <distortion model="ptlens" focal="21.5" a="0" b="0" c="0.021151" />
+-            <distortion model="ptlens" focal="21.6" a="0" b="0" c="0.021205" />
+-            <distortion model="ptlens" focal="21.7" a="0" b="0" c="0.021257" />
+-            <distortion model="ptlens" focal="21.8" a="0" b="0" c="0.021309" />
+-            <distortion model="ptlens" focal="21.9" a="0" b="0" c="0.021359" />
+-            <distortion model="ptlens" focal="22" a="0" b="0" c="0.021409" />
+-            <distortion model="ptlens" focal="22.1" a="0" b="0" c="0.021458" />
+-            <distortion model="ptlens" focal="22.2" a="0" b="0" c="0.021505" />
+-            <distortion model="ptlens" focal="22.3" a="0" b="0" c="0.021552" />
+-            <distortion model="ptlens" focal="22.4" a="0" b="0" c="0.021599" />
+-            <distortion model="ptlens" focal="22.5" a="0" b="0" c="0.021644" />
+-            <distortion model="ptlens" focal="22.6" a="0" b="0" c="0.021688" />
+-            <distortion model="ptlens" focal="22.7" a="0" b="0" c="0.021732" />
+-            <distortion model="ptlens" focal="22.8" a="0" b="0" c="0.021775" />
+-            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0.021818" />
+-            <distortion model="ptlens" focal="23" a="0" b="0" c="0.021859" />
+-            <distortion model="ptlens" focal="23.1" a="0" b="0" c="0.0219" />
+-            <distortion model="ptlens" focal="23.2" a="0" b="0" c="0.02194" />
+-            <distortion model="ptlens" focal="23.3" a="0" b="0" c="0.02198" />
+-            <distortion model="ptlens" focal="23.4" a="0" b="0" c="0.022019" />
+-            <distortion model="ptlens" focal="23.5" a="0" b="0" c="0.022057" />
+-            <distortion model="ptlens" focal="23.6" a="0" b="0" c="0.022095" />
+-            <distortion model="ptlens" focal="23.7" a="0" b="0" c="0.022132" />
+-            <distortion model="ptlens" focal="23.8" a="0" b="0" c="0.022169" />
+-            <distortion model="ptlens" focal="23.9" a="0" b="0" c="0.022205" />
+-            <distortion model="ptlens" focal="24" a="0" b="0" c="0.022241" />
+-            <distortion model="ptlens" focal="24.1" a="0" b="0" c="0.022276" />
+-            <distortion model="ptlens" focal="24.2" a="0" b="0" c="0.02231" />
+-            <distortion model="ptlens" focal="24.3" a="0" b="0" c="0.022344" />
+-            <distortion model="ptlens" focal="24.4" a="0" b="0" c="0.022378" />
+-            <distortion model="ptlens" focal="24.5" a="0" b="0" c="0.022411" />
+-            <distortion model="ptlens" focal="24.6" a="0" b="0" c="0.022444" />
+-            <distortion model="ptlens" focal="24.7" a="0" b="0" c="0.022476" />
+-            <distortion model="ptlens" focal="24.8" a="0" b="0" c="0.022508" />
+-            <distortion model="ptlens" focal="24.9" a="0" b="0" c="0.02254" />
+-            <distortion model="ptlens" focal="25" a="0" b="0" c="0.022571" />
+-            <distortion model="ptlens" focal="25.1" a="0" b="0" c="0.022602" />
+-            <distortion model="ptlens" focal="25.2" a="0" b="0" c="0.022632" />
+-            <distortion model="ptlens" focal="25.3" a="0" b="0" c="0.022662" />
+-            <distortion model="ptlens" focal="25.4" a="0" b="0" c="0.022692" />
+-            <distortion model="ptlens" focal="25.5" a="0" b="0" c="0.022721" />
+-            <distortion model="ptlens" focal="25.6" a="0" b="0" c="0.02275" />
+-            <distortion model="ptlens" focal="25.7" a="0" b="0" c="0.022779" />
+-            <distortion model="ptlens" focal="25.8" a="0" b="0" c="0.022808" />
+-            <distortion model="ptlens" focal="25.9" a="0" b="0" c="0.022836" />
+-            <distortion model="ptlens" focal="26" a="0" b="0" c="0.022864" />
+-            <distortion model="ptlens" focal="26.1" a="0" b="0" c="0.022891" />
+-            <distortion model="ptlens" focal="26.2" a="0" b="0" c="0.022919" />
+-            <distortion model="ptlens" focal="26.3" a="0" b="0" c="0.022946" />
+-            <distortion model="ptlens" focal="26.4" a="0" b="0" c="0.022973" />
+-            <distortion model="ptlens" focal="26.5" a="0" b="0" c="0.023" />
+-            <distortion model="ptlens" focal="26.6" a="0" b="0" c="0.023027" />
+-            <distortion model="ptlens" focal="26.7" a="0" b="0" c="0.023053" />
+-            <distortion model="ptlens" focal="26.8" a="0" b="0" c="0.023079" />
+-            <distortion model="ptlens" focal="26.9" a="0" b="0" c="0.023105" />
+-            <distortion model="ptlens" focal="27" a="0" b="0" c="0.023131" />
+-            <distortion model="ptlens" focal="27.1" a="0" b="0" c="0.023157" />
+-            <distortion model="ptlens" focal="27.2" a="0" b="0" c="0.023182" />
+-            <distortion model="ptlens" focal="27.3" a="0" b="0" c="0.023208" />
+-            <distortion model="ptlens" focal="27.4" a="0" b="0" c="0.023233" />
+-            <distortion model="ptlens" focal="27.5" a="0" b="0" c="0.023258" />
+-            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0.023282" />
+-            <distortion model="ptlens" focal="27.7" a="0" b="0" c="0.023307" />
+-            <distortion model="ptlens" focal="27.8" a="0" b="0" c="0.023331" />
+-            <distortion model="ptlens" focal="27.9" a="0" b="0" c="0.023356" />
+-            <distortion model="ptlens" focal="28" a="0" b="0" c="0.02338" />
+-            <distortion model="ptlens" focal="28.1" a="0" b="0" c="0.023404" />
+-            <distortion model="ptlens" focal="28.2" a="0" b="0" c="0.023428" />
+-            <distortion model="ptlens" focal="28.3" a="0" b="0" c="0.023451" />
+-            <distortion model="ptlens" focal="28.4" a="0" b="0" c="0.023475" />
+-            <distortion model="ptlens" focal="28.5" a="0" b="0" c="0.023498" />
+-            <distortion model="ptlens" focal="28.6" a="0" b="0" c="0.023522" />
+-            <distortion model="ptlens" focal="28.7" a="0" b="0" c="0.023545" />
+-            <distortion model="ptlens" focal="28.8" a="0" b="0" c="0.023568" />
+-            <distortion model="ptlens" focal="28.9" a="0" b="0" c="0.023591" />
+-            <distortion model="ptlens" focal="29" a="0" b="0" c="0.023613" />
+-            <distortion model="ptlens" focal="29.1" a="0" b="0" c="0.023636" />
+-            <distortion model="ptlens" focal="29.2" a="0" b="0" c="0.023658" />
+-            <distortion model="ptlens" focal="29.3" a="0" b="0" c="0.023681" />
+-            <distortion model="ptlens" focal="29.4" a="0" b="0" c="0.023703" />
+-            <distortion model="ptlens" focal="29.5" a="0" b="0" c="0.023725" />
+-            <distortion model="ptlens" focal="29.6" a="0" b="0" c="0.023747" />
+-            <distortion model="ptlens" focal="29.7" a="0" b="0" c="0.023769" />
+-            <distortion model="ptlens" focal="29.8" a="0" b="0" c="0.02379" />
+-            <distortion model="ptlens" focal="29.9" a="0" b="0" c="0.023812" />
+-            <distortion model="ptlens" focal="30" a="0" b="0" c="0.023834" />
+-            <distortion model="ptlens" focal="30.1" a="0" b="0" c="0.023855" />
+-            <distortion model="ptlens" focal="30.2" a="0" b="0" c="0.023876" />
+-            <distortion model="ptlens" focal="30.3" a="0" b="0" c="0.023898" />
+-            <distortion model="ptlens" focal="30.4" a="0" b="0" c="0.023919" />
+-            <distortion model="ptlens" focal="30.5" a="0" b="0" c="0.02394" />
+-            <distortion model="ptlens" focal="30.6" a="0" b="0" c="0.023961" />
+-            <distortion model="ptlens" focal="30.7" a="0" b="0" c="0.023981" />
+-            <distortion model="ptlens" focal="30.8" a="0" b="0" c="0.024002" />
+-            <distortion model="ptlens" focal="30.9" a="0" b="0" c="0.024023" />
+-            <distortion model="ptlens" focal="31" a="0" b="0" c="0.024043" />
+-            <distortion model="ptlens" focal="31.1" a="0" b="0" c="0.024064" />
+-            <distortion model="ptlens" focal="31.2" a="0" b="0" c="0.024084" />
+-            <distortion model="ptlens" focal="31.3" a="0" b="0" c="0.024105" />
+-            <distortion model="ptlens" focal="31.4" a="0" b="0" c="0.024125" />
+-            <distortion model="ptlens" focal="31.5" a="0" b="0" c="0.024145" />
+-            <distortion model="ptlens" focal="31.6" a="0" b="0" c="0.024165" />
+-            <distortion model="ptlens" focal="31.7" a="0" b="0" c="0.024185" />
+-            <distortion model="ptlens" focal="31.8" a="0" b="0" c="0.024205" />
+-            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0.024225" />
+-            <distortion model="ptlens" focal="32" a="0" b="0" c="0.024245" />
+-            <distortion model="ptlens" focal="32.1" a="0" b="0" c="0.024264" />
+-            <distortion model="ptlens" focal="32.2" a="0" b="0" c="0.024284" />
+-            <distortion model="ptlens" focal="32.3" a="0" b="0" c="0.024304" />
+-            <distortion model="ptlens" focal="32.4" a="0" b="0" c="0.024323" />
+-            <distortion model="ptlens" focal="32.5" a="0" b="0" c="0.024343" />
+-            <distortion model="ptlens" focal="32.6" a="0" b="0" c="0.024362" />
+-            <distortion model="ptlens" focal="32.7" a="0" b="0" c="0.024381" />
+-            <distortion model="ptlens" focal="32.8" a="0" b="0" c="0.024401" />
+-            <distortion model="ptlens" focal="32.9" a="0" b="0" c="0.02442" />
+-            <distortion model="ptlens" focal="33" a="0" b="0" c="0.024439" />
+-            <distortion model="ptlens" focal="33.1" a="0" b="0" c="0.024458" />
+-            <distortion model="ptlens" focal="33.2" a="0" b="0" c="0.024477" />
+-            <distortion model="ptlens" focal="33.3" a="0" b="0" c="0.024497" />
+-            <distortion model="ptlens" focal="33.4" a="0" b="0" c="0.024516" />
+-            <distortion model="ptlens" focal="33.5" a="0" b="0" c="0.024534" />
+-            <distortion model="ptlens" focal="33.6" a="0" b="0" c="0.024553" />
+-            <distortion model="ptlens" focal="33.7" a="0" b="0" c="0.024572" />
+-            <distortion model="ptlens" focal="33.8" a="0" b="0" c="0.024591" />
+-            <distortion model="ptlens" focal="33.9" a="0" b="0" c="0.02461" />
+-            <distortion model="ptlens" focal="34" a="0" b="0" c="0.024629" />
+-            <distortion model="ptlens" focal="34.1" a="0" b="0" c="0.024648" />
+-            <distortion model="ptlens" focal="34.2" a="0" b="0" c="0.024666" />
+-            <distortion model="ptlens" focal="34.3" a="0" b="0" c="0.024685" />
+-            <distortion model="ptlens" focal="34.4" a="0" b="0" c="0.024704" />
+-            <distortion model="ptlens" focal="34.5" a="0" b="0" c="0.024722" />
+-            <distortion model="ptlens" focal="34.6" a="0" b="0" c="0.024741" />
+-            <distortion model="ptlens" focal="34.7" a="0" b="0" c="0.02476" />
+-            <distortion model="ptlens" focal="34.8" a="0" b="0" c="0.024778" />
+-            <distortion model="ptlens" focal="34.9" a="0" b="0" c="0.024797" />
+-            <distortion model="ptlens" focal="35" a="0" b="0" c="0.024815" />
+-            <distortion model="ptlens" focal="35.1" a="0" b="0" c="0.024834" />
+-            <distortion model="ptlens" focal="35.2" a="0" b="0" c="0.024852" />
+-            <distortion model="ptlens" focal="35.3" a="0" b="0" c="0.024871" />
+-            <distortion model="ptlens" focal="35.4" a="0" b="0" c="0.024889" />
+-            <distortion model="ptlens" focal="35.5" a="0" b="0" c="0.024908" />
+-            <distortion model="ptlens" focal="35.6" a="0" b="0" c="0.024926" />
+-            <distortion model="ptlens" focal="35.7" a="0" b="0" c="0.024945" />
+-            <distortion model="ptlens" focal="35.8" a="0" b="0" c="0.024963" />
+-            <distortion model="ptlens" focal="35.9" a="0" b="0" c="0.024982" />
+-            <distortion model="ptlens" focal="36" a="0" b="0" c="0.025" />
++            <distortion model="ptlens" focal="6" a="0" b="0" c="-0.035"/>
++            <distortion model="ptlens" focal="6.1" a="0" b="0" c="-0.034364"/>
++            <distortion model="ptlens" focal="6.2" a="0" b="0" c="-0.033709"/>
++            <distortion model="ptlens" focal="6.3" a="0" b="0" c="-0.033016"/>
++            <distortion model="ptlens" focal="6.4" a="0" b="0" c="-0.032258"/>
++            <distortion model="ptlens" focal="6.5" a="0" b="0" c="-0.031404"/>
++            <distortion model="ptlens" focal="6.6" a="0" b="0" c="-0.030404"/>
++            <distortion model="ptlens" focal="6.7" a="0" b="0" c="-0.029175"/>
++            <distortion model="ptlens" focal="6.8" a="0" b="0" c="-0.027545"/>
++            <distortion model="ptlens" focal="6.9" a="0" b="0" c="-0.025"/>
++            <distortion model="ptlens" focal="7" a="0" b="0" c="-0.020295"/>
++            <distortion model="ptlens" focal="7.1" a="0" b="0" c="-0.016679"/>
++            <distortion model="ptlens" focal="7.2" a="0" b="0" c="-0.014386"/>
++            <distortion model="ptlens" focal="7.3" a="0" b="0" c="-0.012691"/>
++            <distortion model="ptlens" focal="7.4" a="0" b="0" c="-0.011332"/>
++            <distortion model="ptlens" focal="7.5" a="0" b="0" c="-0.010188"/>
++            <distortion model="ptlens" focal="7.6" a="0" b="0" c="-0.009196"/>
++            <distortion model="ptlens" focal="7.7" a="0" b="0" c="-0.00832"/>
++            <distortion model="ptlens" focal="7.8" a="0" b="0" c="-0.007533"/>
++            <distortion model="ptlens" focal="7.9" a="0" b="0" c="-0.006818"/>
++            <distortion model="ptlens" focal="8" a="0" b="0" c="-0.006164"/>
++            <distortion model="ptlens" focal="8.1" a="0" b="0" c="-0.00556"/>
++            <distortion model="ptlens" focal="8.2" a="0" b="0" c="-0.005"/>
++            <distortion model="ptlens" focal="8.3" a="0" b="0" c="-0.004477"/>
++            <distortion model="ptlens" focal="8.4" a="0" b="0" c="-0.003986"/>
++            <distortion model="ptlens" focal="8.5" a="0" b="0" c="-0.00352"/>
++            <distortion model="ptlens" focal="8.6" a="0" b="0" c="-0.003077"/>
++            <distortion model="ptlens" focal="8.7" a="0" b="0" c="-0.002652"/>
++            <distortion model="ptlens" focal="8.8" a="0" b="0" c="-0.002245"/>
++            <distortion model="ptlens" focal="8.9" a="0" b="0" c="-0.001852"/>
++            <distortion model="ptlens" focal="9" a="0" b="0" c="-0.001473"/>
++            <distortion model="ptlens" focal="9.1" a="0" b="0" c="-0.001106"/>
++            <distortion model="ptlens" focal="9.2" a="0" b="0" c="-0.000749"/>
++            <distortion model="ptlens" focal="9.3" a="0" b="0" c="-0.000403"/>
++            <distortion model="ptlens" focal="9.4" a="0" b="0" c="-6.5e-05"/>
++            <distortion model="ptlens" focal="9.5" a="0" b="0" c="0.000263"/>
++            <distortion model="ptlens" focal="9.6" a="0" b="0" c="0.000585"/>
++            <distortion model="ptlens" focal="9.7" a="0" b="0" c="0.000898"/>
++            <distortion model="ptlens" focal="9.8" a="0" b="0" c="0.001206"/>
++            <distortion model="ptlens" focal="9.9" a="0" b="0" c="0.001506"/>
++            <distortion model="ptlens" focal="10" a="0" b="0" c="0.001801"/>
++            <distortion model="ptlens" focal="10.1" a="0" b="0" c="0.00209"/>
++            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0.002375"/>
++            <distortion model="ptlens" focal="10.3" a="0" b="0" c="0.002654"/>
++            <distortion model="ptlens" focal="10.4" a="0" b="0" c="0.002928"/>
++            <distortion model="ptlens" focal="10.5" a="0" b="0" c="0.003198"/>
++            <distortion model="ptlens" focal="10.6" a="0" b="0" c="0.003464"/>
++            <distortion model="ptlens" focal="10.7" a="0" b="0" c="0.003725"/>
++            <distortion model="ptlens" focal="10.8" a="0" b="0" c="0.003983"/>
++            <distortion model="ptlens" focal="10.9" a="0" b="0" c="0.004237"/>
++            <distortion model="ptlens" focal="11" a="0" b="0" c="0.004488"/>
++            <distortion model="ptlens" focal="11.1" a="0" b="0" c="0.004736"/>
++            <distortion model="ptlens" focal="11.2" a="0" b="0" c="0.00498"/>
++            <distortion model="ptlens" focal="11.3" a="0" b="0" c="0.005221"/>
++            <distortion model="ptlens" focal="11.4" a="0" b="0" c="0.00546"/>
++            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0.005696"/>
++            <distortion model="ptlens" focal="11.6" a="0" b="0" c="0.005929"/>
++            <distortion model="ptlens" focal="11.7" a="0" b="0" c="0.006159"/>
++            <distortion model="ptlens" focal="11.8" a="0" b="0" c="0.006387"/>
++            <distortion model="ptlens" focal="11.9" a="0" b="0" c="0.006613"/>
++            <distortion model="ptlens" focal="12" a="0" b="0" c="0.006837"/>
++            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0.007059"/>
++            <distortion model="ptlens" focal="12.2" a="0" b="0" c="0.007279"/>
++            <distortion model="ptlens" focal="12.3" a="0" b="0" c="0.007498"/>
++            <distortion model="ptlens" focal="12.4" a="0" b="0" c="0.007715"/>
++            <distortion model="ptlens" focal="12.5" a="0" b="0" c="0.007931"/>
++            <distortion model="ptlens" focal="12.6" a="0" b="0" c="0.008145"/>
++            <distortion model="ptlens" focal="12.7" a="0" b="0" c="0.008359"/>
++            <distortion model="ptlens" focal="12.8" a="0" b="0" c="0.008572"/>
++            <distortion model="ptlens" focal="12.9" a="0" b="0" c="0.008786"/>
++            <distortion model="ptlens" focal="13" a="0" b="0" c="0.009"/>
++            <distortion model="ptlens" focal="13.1" a="0" b="0" c="0.009216"/>
++            <distortion model="ptlens" focal="13.2" a="0" b="0" c="0.009434"/>
++            <distortion model="ptlens" focal="13.3" a="0" b="0" c="0.009656"/>
++            <distortion model="ptlens" focal="13.4" a="0" b="0" c="0.009882"/>
++            <distortion model="ptlens" focal="13.5" a="0" b="0" c="0.010114"/>
++            <distortion model="ptlens" focal="13.6" a="0" b="0" c="0.010357"/>
++            <distortion model="ptlens" focal="13.7" a="0" b="0" c="0.01062"/>
++            <distortion model="ptlens" focal="13.8" a="0" b="0" c="0.010921"/>
++            <distortion model="ptlens" focal="13.9" a="0" b="0" c="0.011236"/>
++            <distortion model="ptlens" focal="14" a="0" b="0" c="0.011512"/>
++            <distortion model="ptlens" focal="14.1" a="0" b="0" c="0.011762"/>
++            <distortion model="ptlens" focal="14.2" a="0" b="0" c="0.012"/>
++            <distortion model="ptlens" focal="14.3" a="0" b="0" c="0.01223"/>
++            <distortion model="ptlens" focal="14.4" a="0" b="0" c="0.012454"/>
++            <distortion model="ptlens" focal="14.5" a="0" b="0" c="0.012673"/>
++            <distortion model="ptlens" focal="14.6" a="0" b="0" c="0.012888"/>
++            <distortion model="ptlens" focal="14.7" a="0" b="0" c="0.013098"/>
++            <distortion model="ptlens" focal="14.8" a="0" b="0" c="0.013304"/>
++            <distortion model="ptlens" focal="14.9" a="0" b="0" c="0.013507"/>
++            <distortion model="ptlens" focal="15" a="0" b="0" c="0.013706"/>
++            <distortion model="ptlens" focal="15.1" a="0" b="0" c="0.013902"/>
++            <distortion model="ptlens" focal="15.2" a="0" b="0" c="0.014094"/>
++            <distortion model="ptlens" focal="15.3" a="0" b="0" c="0.014283"/>
++            <distortion model="ptlens" focal="15.4" a="0" b="0" c="0.014469"/>
++            <distortion model="ptlens" focal="15.5" a="0" b="0" c="0.014652"/>
++            <distortion model="ptlens" focal="15.6" a="0" b="0" c="0.014832"/>
++            <distortion model="ptlens" focal="15.7" a="0" b="0" c="0.01501"/>
++            <distortion model="ptlens" focal="15.8" a="0" b="0" c="0.015184"/>
++            <distortion model="ptlens" focal="15.9" a="0" b="0" c="0.015355"/>
++            <distortion model="ptlens" focal="16" a="0" b="0" c="0.015524"/>
++            <distortion model="ptlens" focal="16.1" a="0" b="0" c="0.01569"/>
++            <distortion model="ptlens" focal="16.2" a="0" b="0" c="0.015853"/>
++            <distortion model="ptlens" focal="16.3" a="0" b="0" c="0.016014"/>
++            <distortion model="ptlens" focal="16.4" a="0" b="0" c="0.016172"/>
++            <distortion model="ptlens" focal="16.5" a="0" b="0" c="0.016327"/>
++            <distortion model="ptlens" focal="16.6" a="0" b="0" c="0.016479"/>
++            <distortion model="ptlens" focal="16.7" a="0" b="0" c="0.016629"/>
++            <distortion model="ptlens" focal="16.8" a="0" b="0" c="0.016777"/>
++            <distortion model="ptlens" focal="16.9" a="0" b="0" c="0.016922"/>
++            <distortion model="ptlens" focal="17" a="0" b="0" c="0.017064"/>
++            <distortion model="ptlens" focal="17.1" a="0" b="0" c="0.017204"/>
++            <distortion model="ptlens" focal="17.2" a="0" b="0" c="0.017341"/>
++            <distortion model="ptlens" focal="17.3" a="0" b="0" c="0.017476"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0.017608"/>
++            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0.017738"/>
++            <distortion model="ptlens" focal="17.6" a="0" b="0" c="0.017865"/>
++            <distortion model="ptlens" focal="17.7" a="0" b="0" c="0.017989"/>
++            <distortion model="ptlens" focal="17.8" a="0" b="0" c="0.018112"/>
++            <distortion model="ptlens" focal="17.9" a="0" b="0" c="0.018231"/>
++            <distortion model="ptlens" focal="18" a="0" b="0" c="0.018349"/>
++            <distortion model="ptlens" focal="18.1" a="0" b="0" c="0.018463"/>
++            <distortion model="ptlens" focal="18.2" a="0" b="0" c="0.018576"/>
++            <distortion model="ptlens" focal="18.3" a="0" b="0" c="0.018685"/>
++            <distortion model="ptlens" focal="18.4" a="0" b="0" c="0.018793"/>
++            <distortion model="ptlens" focal="18.5" a="0" b="0" c="0.018898"/>
++            <distortion model="ptlens" focal="18.6" a="0" b="0" c="0.019"/>
++            <distortion model="ptlens" focal="18.7" a="0" b="0" c="0.0191"/>
++            <distortion model="ptlens" focal="18.8" a="0" b="0" c="0.019197"/>
++            <distortion model="ptlens" focal="18.9" a="0" b="0" c="0.019293"/>
++            <distortion model="ptlens" focal="19" a="0" b="0" c="0.019386"/>
++            <distortion model="ptlens" focal="19.1" a="0" b="0" c="0.019476"/>
++            <distortion model="ptlens" focal="19.2" a="0" b="0" c="0.019565"/>
++            <distortion model="ptlens" focal="19.3" a="0" b="0" c="0.019652"/>
++            <distortion model="ptlens" focal="19.4" a="0" b="0" c="0.019737"/>
++            <distortion model="ptlens" focal="19.5" a="0" b="0" c="0.019819"/>
++            <distortion model="ptlens" focal="19.6" a="0" b="0" c="0.0199"/>
++            <distortion model="ptlens" focal="19.7" a="0" b="0" c="0.019979"/>
++            <distortion model="ptlens" focal="19.8" a="0" b="0" c="0.020057"/>
++            <distortion model="ptlens" focal="19.9" a="0" b="0" c="0.020133"/>
++            <distortion model="ptlens" focal="20" a="0" b="0" c="0.020207"/>
++            <distortion model="ptlens" focal="20.1" a="0" b="0" c="0.020279"/>
++            <distortion model="ptlens" focal="20.2" a="0" b="0" c="0.02035"/>
++            <distortion model="ptlens" focal="20.3" a="0" b="0" c="0.02042"/>
++            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0.020488"/>
++            <distortion model="ptlens" focal="20.5" a="0" b="0" c="0.020554"/>
++            <distortion model="ptlens" focal="20.6" a="0" b="0" c="0.02062"/>
++            <distortion model="ptlens" focal="20.7" a="0" b="0" c="0.020684"/>
++            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0.020746"/>
++            <distortion model="ptlens" focal="20.9" a="0" b="0" c="0.020808"/>
++            <distortion model="ptlens" focal="21" a="0" b="0" c="0.020868"/>
++            <distortion model="ptlens" focal="21.1" a="0" b="0" c="0.020927"/>
++            <distortion model="ptlens" focal="21.2" a="0" b="0" c="0.020985"/>
++            <distortion model="ptlens" focal="21.3" a="0" b="0" c="0.021041"/>
++            <distortion model="ptlens" focal="21.4" a="0" b="0" c="0.021097"/>
++            <distortion model="ptlens" focal="21.5" a="0" b="0" c="0.021151"/>
++            <distortion model="ptlens" focal="21.6" a="0" b="0" c="0.021205"/>
++            <distortion model="ptlens" focal="21.7" a="0" b="0" c="0.021257"/>
++            <distortion model="ptlens" focal="21.8" a="0" b="0" c="0.021309"/>
++            <distortion model="ptlens" focal="21.9" a="0" b="0" c="0.021359"/>
++            <distortion model="ptlens" focal="22" a="0" b="0" c="0.021409"/>
++            <distortion model="ptlens" focal="22.1" a="0" b="0" c="0.021458"/>
++            <distortion model="ptlens" focal="22.2" a="0" b="0" c="0.021505"/>
++            <distortion model="ptlens" focal="22.3" a="0" b="0" c="0.021552"/>
++            <distortion model="ptlens" focal="22.4" a="0" b="0" c="0.021599"/>
++            <distortion model="ptlens" focal="22.5" a="0" b="0" c="0.021644"/>
++            <distortion model="ptlens" focal="22.6" a="0" b="0" c="0.021688"/>
++            <distortion model="ptlens" focal="22.7" a="0" b="0" c="0.021732"/>
++            <distortion model="ptlens" focal="22.8" a="0" b="0" c="0.021775"/>
++            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0.021818"/>
++            <distortion model="ptlens" focal="23" a="0" b="0" c="0.021859"/>
++            <distortion model="ptlens" focal="23.1" a="0" b="0" c="0.0219"/>
++            <distortion model="ptlens" focal="23.2" a="0" b="0" c="0.02194"/>
++            <distortion model="ptlens" focal="23.3" a="0" b="0" c="0.02198"/>
++            <distortion model="ptlens" focal="23.4" a="0" b="0" c="0.022019"/>
++            <distortion model="ptlens" focal="23.5" a="0" b="0" c="0.022057"/>
++            <distortion model="ptlens" focal="23.6" a="0" b="0" c="0.022095"/>
++            <distortion model="ptlens" focal="23.7" a="0" b="0" c="0.022132"/>
++            <distortion model="ptlens" focal="23.8" a="0" b="0" c="0.022169"/>
++            <distortion model="ptlens" focal="23.9" a="0" b="0" c="0.022205"/>
++            <distortion model="ptlens" focal="24" a="0" b="0" c="0.022241"/>
++            <distortion model="ptlens" focal="24.1" a="0" b="0" c="0.022276"/>
++            <distortion model="ptlens" focal="24.2" a="0" b="0" c="0.02231"/>
++            <distortion model="ptlens" focal="24.3" a="0" b="0" c="0.022344"/>
++            <distortion model="ptlens" focal="24.4" a="0" b="0" c="0.022378"/>
++            <distortion model="ptlens" focal="24.5" a="0" b="0" c="0.022411"/>
++            <distortion model="ptlens" focal="24.6" a="0" b="0" c="0.022444"/>
++            <distortion model="ptlens" focal="24.7" a="0" b="0" c="0.022476"/>
++            <distortion model="ptlens" focal="24.8" a="0" b="0" c="0.022508"/>
++            <distortion model="ptlens" focal="24.9" a="0" b="0" c="0.02254"/>
++            <distortion model="ptlens" focal="25" a="0" b="0" c="0.022571"/>
++            <distortion model="ptlens" focal="25.1" a="0" b="0" c="0.022602"/>
++            <distortion model="ptlens" focal="25.2" a="0" b="0" c="0.022632"/>
++            <distortion model="ptlens" focal="25.3" a="0" b="0" c="0.022662"/>
++            <distortion model="ptlens" focal="25.4" a="0" b="0" c="0.022692"/>
++            <distortion model="ptlens" focal="25.5" a="0" b="0" c="0.022721"/>
++            <distortion model="ptlens" focal="25.6" a="0" b="0" c="0.02275"/>
++            <distortion model="ptlens" focal="25.7" a="0" b="0" c="0.022779"/>
++            <distortion model="ptlens" focal="25.8" a="0" b="0" c="0.022808"/>
++            <distortion model="ptlens" focal="25.9" a="0" b="0" c="0.022836"/>
++            <distortion model="ptlens" focal="26" a="0" b="0" c="0.022864"/>
++            <distortion model="ptlens" focal="26.1" a="0" b="0" c="0.022891"/>
++            <distortion model="ptlens" focal="26.2" a="0" b="0" c="0.022919"/>
++            <distortion model="ptlens" focal="26.3" a="0" b="0" c="0.022946"/>
++            <distortion model="ptlens" focal="26.4" a="0" b="0" c="0.022973"/>
++            <distortion model="ptlens" focal="26.5" a="0" b="0" c="0.023"/>
++            <distortion model="ptlens" focal="26.6" a="0" b="0" c="0.023027"/>
++            <distortion model="ptlens" focal="26.7" a="0" b="0" c="0.023053"/>
++            <distortion model="ptlens" focal="26.8" a="0" b="0" c="0.023079"/>
++            <distortion model="ptlens" focal="26.9" a="0" b="0" c="0.023105"/>
++            <distortion model="ptlens" focal="27" a="0" b="0" c="0.023131"/>
++            <distortion model="ptlens" focal="27.1" a="0" b="0" c="0.023157"/>
++            <distortion model="ptlens" focal="27.2" a="0" b="0" c="0.023182"/>
++            <distortion model="ptlens" focal="27.3" a="0" b="0" c="0.023208"/>
++            <distortion model="ptlens" focal="27.4" a="0" b="0" c="0.023233"/>
++            <distortion model="ptlens" focal="27.5" a="0" b="0" c="0.023258"/>
++            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0.023282"/>
++            <distortion model="ptlens" focal="27.7" a="0" b="0" c="0.023307"/>
++            <distortion model="ptlens" focal="27.8" a="0" b="0" c="0.023331"/>
++            <distortion model="ptlens" focal="27.9" a="0" b="0" c="0.023356"/>
++            <distortion model="ptlens" focal="28" a="0" b="0" c="0.02338"/>
++            <distortion model="ptlens" focal="28.1" a="0" b="0" c="0.023404"/>
++            <distortion model="ptlens" focal="28.2" a="0" b="0" c="0.023428"/>
++            <distortion model="ptlens" focal="28.3" a="0" b="0" c="0.023451"/>
++            <distortion model="ptlens" focal="28.4" a="0" b="0" c="0.023475"/>
++            <distortion model="ptlens" focal="28.5" a="0" b="0" c="0.023498"/>
++            <distortion model="ptlens" focal="28.6" a="0" b="0" c="0.023522"/>
++            <distortion model="ptlens" focal="28.7" a="0" b="0" c="0.023545"/>
++            <distortion model="ptlens" focal="28.8" a="0" b="0" c="0.023568"/>
++            <distortion model="ptlens" focal="28.9" a="0" b="0" c="0.023591"/>
++            <distortion model="ptlens" focal="29" a="0" b="0" c="0.023613"/>
++            <distortion model="ptlens" focal="29.1" a="0" b="0" c="0.023636"/>
++            <distortion model="ptlens" focal="29.2" a="0" b="0" c="0.023658"/>
++            <distortion model="ptlens" focal="29.3" a="0" b="0" c="0.023681"/>
++            <distortion model="ptlens" focal="29.4" a="0" b="0" c="0.023703"/>
++            <distortion model="ptlens" focal="29.5" a="0" b="0" c="0.023725"/>
++            <distortion model="ptlens" focal="29.6" a="0" b="0" c="0.023747"/>
++            <distortion model="ptlens" focal="29.7" a="0" b="0" c="0.023769"/>
++            <distortion model="ptlens" focal="29.8" a="0" b="0" c="0.02379"/>
++            <distortion model="ptlens" focal="29.9" a="0" b="0" c="0.023812"/>
++            <distortion model="ptlens" focal="30" a="0" b="0" c="0.023834"/>
++            <distortion model="ptlens" focal="30.1" a="0" b="0" c="0.023855"/>
++            <distortion model="ptlens" focal="30.2" a="0" b="0" c="0.023876"/>
++            <distortion model="ptlens" focal="30.3" a="0" b="0" c="0.023898"/>
++            <distortion model="ptlens" focal="30.4" a="0" b="0" c="0.023919"/>
++            <distortion model="ptlens" focal="30.5" a="0" b="0" c="0.02394"/>
++            <distortion model="ptlens" focal="30.6" a="0" b="0" c="0.023961"/>
++            <distortion model="ptlens" focal="30.7" a="0" b="0" c="0.023981"/>
++            <distortion model="ptlens" focal="30.8" a="0" b="0" c="0.024002"/>
++            <distortion model="ptlens" focal="30.9" a="0" b="0" c="0.024023"/>
++            <distortion model="ptlens" focal="31" a="0" b="0" c="0.024043"/>
++            <distortion model="ptlens" focal="31.1" a="0" b="0" c="0.024064"/>
++            <distortion model="ptlens" focal="31.2" a="0" b="0" c="0.024084"/>
++            <distortion model="ptlens" focal="31.3" a="0" b="0" c="0.024105"/>
++            <distortion model="ptlens" focal="31.4" a="0" b="0" c="0.024125"/>
++            <distortion model="ptlens" focal="31.5" a="0" b="0" c="0.024145"/>
++            <distortion model="ptlens" focal="31.6" a="0" b="0" c="0.024165"/>
++            <distortion model="ptlens" focal="31.7" a="0" b="0" c="0.024185"/>
++            <distortion model="ptlens" focal="31.8" a="0" b="0" c="0.024205"/>
++            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0.024225"/>
++            <distortion model="ptlens" focal="32" a="0" b="0" c="0.024245"/>
++            <distortion model="ptlens" focal="32.1" a="0" b="0" c="0.024264"/>
++            <distortion model="ptlens" focal="32.2" a="0" b="0" c="0.024284"/>
++            <distortion model="ptlens" focal="32.3" a="0" b="0" c="0.024304"/>
++            <distortion model="ptlens" focal="32.4" a="0" b="0" c="0.024323"/>
++            <distortion model="ptlens" focal="32.5" a="0" b="0" c="0.024343"/>
++            <distortion model="ptlens" focal="32.6" a="0" b="0" c="0.024362"/>
++            <distortion model="ptlens" focal="32.7" a="0" b="0" c="0.024381"/>
++            <distortion model="ptlens" focal="32.8" a="0" b="0" c="0.024401"/>
++            <distortion model="ptlens" focal="32.9" a="0" b="0" c="0.02442"/>
++            <distortion model="ptlens" focal="33" a="0" b="0" c="0.024439"/>
++            <distortion model="ptlens" focal="33.1" a="0" b="0" c="0.024458"/>
++            <distortion model="ptlens" focal="33.2" a="0" b="0" c="0.024477"/>
++            <distortion model="ptlens" focal="33.3" a="0" b="0" c="0.024497"/>
++            <distortion model="ptlens" focal="33.4" a="0" b="0" c="0.024516"/>
++            <distortion model="ptlens" focal="33.5" a="0" b="0" c="0.024534"/>
++            <distortion model="ptlens" focal="33.6" a="0" b="0" c="0.024553"/>
++            <distortion model="ptlens" focal="33.7" a="0" b="0" c="0.024572"/>
++            <distortion model="ptlens" focal="33.8" a="0" b="0" c="0.024591"/>
++            <distortion model="ptlens" focal="33.9" a="0" b="0" c="0.02461"/>
++            <distortion model="ptlens" focal="34" a="0" b="0" c="0.024629"/>
++            <distortion model="ptlens" focal="34.1" a="0" b="0" c="0.024648"/>
++            <distortion model="ptlens" focal="34.2" a="0" b="0" c="0.024666"/>
++            <distortion model="ptlens" focal="34.3" a="0" b="0" c="0.024685"/>
++            <distortion model="ptlens" focal="34.4" a="0" b="0" c="0.024704"/>
++            <distortion model="ptlens" focal="34.5" a="0" b="0" c="0.024722"/>
++            <distortion model="ptlens" focal="34.6" a="0" b="0" c="0.024741"/>
++            <distortion model="ptlens" focal="34.7" a="0" b="0" c="0.02476"/>
++            <distortion model="ptlens" focal="34.8" a="0" b="0" c="0.024778"/>
++            <distortion model="ptlens" focal="34.9" a="0" b="0" c="0.024797"/>
++            <distortion model="ptlens" focal="35" a="0" b="0" c="0.024815"/>
++            <distortion model="ptlens" focal="35.1" a="0" b="0" c="0.024834"/>
++            <distortion model="ptlens" focal="35.2" a="0" b="0" c="0.024852"/>
++            <distortion model="ptlens" focal="35.3" a="0" b="0" c="0.024871"/>
++            <distortion model="ptlens" focal="35.4" a="0" b="0" c="0.024889"/>
++            <distortion model="ptlens" focal="35.5" a="0" b="0" c="0.024908"/>
++            <distortion model="ptlens" focal="35.6" a="0" b="0" c="0.024926"/>
++            <distortion model="ptlens" focal="35.7" a="0" b="0" c="0.024945"/>
++            <distortion model="ptlens" focal="35.8" a="0" b="0" c="0.024963"/>
++            <distortion model="ptlens" focal="35.9" a="0" b="0" c="0.024982"/>
++            <distortion model="ptlens" focal="36" a="0" b="0" c="0.025"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>FinePix F200EXR &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fujiF200exr</mount>
+         <cropfactor>4.341</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.4" a="0.01564" b="-0.04677" c="0.01961" />
+-            <distortion model="ptlens" focal="8.1" a="-0.00375" b="0.0034" c="-0.01065" />
+-            <distortion model="ptlens" focal="13" a="-0.00638" b="0.01208" c="-0.01137" />
+-            <distortion model="ptlens" focal="16" a="-0.00790" b="0.02297" c="-0.02505" />
+-            <distortion model="ptlens" focal="25" a="-0.00176" b="0.00648" c="-0.00065" />
+-            <distortion model="ptlens" focal="32" a="-0.00962" b="0.02592" c="-0.01447" />
++            <distortion model="ptlens" focal="6.4" a="0.01564" b="-0.04677" c="0.01961"/>
++            <distortion model="ptlens" focal="8.1" a="-0.00375" b="0.0034" c="-0.01065"/>
++            <distortion model="ptlens" focal="13" a="-0.00638" b="0.01208" c="-0.01137"/>
++            <distortion model="ptlens" focal="16" a="-0.00790" b="0.02297" c="-0.02505"/>
++            <distortion model="ptlens" focal="25" a="-0.00176" b="0.00648" c="-0.00065"/>
++            <distortion model="ptlens" focal="32" a="-0.00962" b="0.02592" c="-0.01447"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
+-        <mount>fujix100s</mount>
+-        <cropfactor>1.523</cropfactor>
++        <maker>Fujifilm</maker>
++        <model>X100 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujix100</mount>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="23" a="0.02159" b="-0.0618" c="0.04364" />
+-            <tca model="poly3" focal="23" br="-0.0001543" vr="1.0006122" bb="0.0001753" vb="0.9996422" />
++            <distortion model="ptlens" focal="23" a="0.02159" b="-0.0618" c="0.04364"/>
++            <tca model="poly3" focal="23" br="-0.0001543" vr="1.0006122" bb="0.0001753" vb="0.9996422"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Fuji</maker>
+-        <model>Standard</model>
++        <maker>Fujifilm</maker>
++        <model>X100 &amp; compatibles (Standard) + TCL-X100</model>
++        <model lang="en">TCL-X100</model>
++        <mount>fujix100</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X100s -->
++            <distortion model="ptlens" focal="33" a="0.02986" b="-0.05994" c="0.05518"/>
++            <tca model="poly3" focal="33" vr="1.0000047" vb="0.9999998"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>X10 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>fujix10</mount>
+         <cropfactor>3.93</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.02972" b="-0.09564" c="0.0155" />
+-            <distortion model="ptlens" focal="8.9" a="0.02083" b="-0.07255" c="0.03871" />
+-            <distortion model="ptlens" focal="12.2" a="0.01649" b="-0.03788" c="0.01562" />
+-            <distortion model="ptlens" focal="19.5" a="0.00142" b="0.01461" c="-0.01538" />
+-            <distortion model="ptlens" focal="28.4" a="0" b="0.00718" c="0" />
+-            <tca model="poly3" focal="7.1" vr="1.0007" vb="1.00012" />
+-            <tca model="poly3" focal="8.9" vr="1.00046" vb="0.99992" />
+-            <tca model="poly3" focal="12.2" vr="1.00043" vb="1.00008" />
+-            <tca model="poly3" focal="19.5" />
+-            <tca model="poly3" focal="28.4" vr="0.9998" vb="0.9996" />
++            <distortion model="ptlens" focal="7.1" a="0.02972" b="-0.09564" c="0.0155"/>
++            <distortion model="ptlens" focal="8.9" a="0.02083" b="-0.07255" c="0.03871"/>
++            <distortion model="ptlens" focal="12.2" a="0.01649" b="-0.03788" c="0.01562"/>
++            <distortion model="ptlens" focal="19.5" a="0.00142" b="0.01461" c="-0.01538"/>
++            <distortion model="ptlens" focal="28.4" a="0" b="0.00718" c="0"/>
++            <tca model="poly3" focal="7.1" vr="1.0007" vb="1.00012"/>
++            <tca model="poly3" focal="8.9" vr="1.00046" vb="0.99992"/>
++            <tca model="poly3" focal="12.2" vr="1.00043" vb="1.00008"/>
++            <tca model="poly3" focal="19.5"/>
++            <tca model="poly3" focal="28.4" vr="0.9998" vb="0.9996"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>FinePix HS20EXR &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujihs20exr</mount>
++        <cropfactor>5.71</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.2" a="0.01557" b="-0.05066" c="-0.04858"/>
++            <distortion model="ptlens" focal="5" a="0.00758" b="-0.01443" c="-0.03499"/>
++            <distortion model="ptlens" focal="5.4" a="0.01195" b="-0.02342" c="-0.00966"/>
++            <distortion model="ptlens" focal="5.6" a="0.02236" b="-0.05672" c="0.04049"/>
++            <distortion model="ptlens" focal="7.1" a="0.03547" b="-0.07378" c="0.07626"/>
++            <distortion model="ptlens" focal="8.6" a="0.01117" b="0.00674" c="0.01696"/>
++            <distortion model="ptlens" focal="12.3" a="0.03635" b="-0.05129" c="0.06929"/>
++            <distortion model="ptlens" focal="16.1" a="0.04961" b="-0.09542" c="0.11586"/>
++            <distortion model="ptlens" focal="21.2" a="0.03377" b="-0.02899" c="0.03685"/>
++            <distortion model="ptlens" focal="24.9" a="-0.00438" b="0.0363" c="0.04379"/>
++            <distortion model="ptlens" focal="28" a="-0.02454" b="0.13049" c="-0.09839"/>
++            <distortion model="ptlens" focal="30.3" a="-0.03533" b="0.14051" c="-0.06339"/>
++            <distortion model="ptlens" focal="43.1" a="-0.00121" b="0.04359" c="0.01142"/>
++            <distortion model="ptlens" focal="59" a="-0.02082" b="0.09605" c="-0.04338"/>
++            <distortion model="ptlens" focal="84.1" a="-0.03895" b="0.14772" c="-0.08548"/>
++            <distortion model="ptlens" focal="126" a="-0.00275" b="0.03685" c="0.0165"/>
++            <tca model="poly3" focal="4.2" br="-0.0006044" vr="1.0015583" bb="0.0003064" vb="0.9996509"/>
++            <tca model="poly3" focal="5" br="-0.0006921" vr="1.0015321" bb="0.0002984" vb="0.9996267"/>
++            <tca model="poly3" focal="5.4" br="-0.0004830" vr="1.0012212" bb="0.0002778" vb="0.9996477"/>
++            <tca model="poly3" focal="5.6" br="-0.0005000" vr="1.0012408" bb="0.0002717" vb="0.9996562"/>
++            <tca model="poly3" focal="7.1" br="-0.0005363" vr="1.0012541" bb="0.0001994" vb="0.9997148"/>
++            <tca model="poly3" focal="8.6" br="-0.0004482" vr="1.0008582" bb="0.0002015" vb="0.9997459"/>
++            <tca model="poly3" focal="12.3" br="-0.0002563" vr="1.0006152" bb="0.0001535" vb="0.9998155"/>
++            <tca model="poly3" focal="16.1" br="-0.0002135" vr="1.0004230" bb="0.0001455" vb="0.9998099"/>
++            <tca model="poly3" focal="21.2" br="-0.0001491" vr="1.0002478" bb="0.0000214" vb="0.9999322"/>
++            <tca model="poly3" focal="24.9" br="-0.0000712" vr="1.0001499" bb="0.0000178" vb="0.9999370"/>
++            <tca model="poly3" focal="28" br="-0.0002714" vr="1.0005178" bb="0.0001966" vb="0.9995914"/>
++            <tca model="poly3" focal="30.3" br="-0.0000742" vr="1.0000964" bb="0.0000090" vb="0.9999415"/>
++            <tca model="poly3" focal="43.1" br="-0.0001378" vr="1.0002126" bb="0.0000720" vb="0.9995407"/>
++            <tca model="poly3" focal="59" br="-0.0001059" vr="0.9999289" bb="0.0001135" vb="0.9996203"/>
++            <tca model="poly3" focal="84.1" br="-0.0001983" vr="0.9999666" bb="0.0000523" vb="0.9996942"/>
++            <tca model="poly3" focal="126" br="0.0000220" vr="0.9994784" bb="0.0001868" vb="0.9993445"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>FinePix F770EXR &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujif770exr</mount>
++        <cropfactor>5.43</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.6" a="0.01272" b="-0.05766" c="-0.00271"/>
++            <distortion model="ptlens" focal="9.2" a="0.0079" b="-0.00036" c="0.00893"/>
++            <distortion model="ptlens" focal="19.1" a="-0.02764" b="0.10049" c="-0.08307"/>
++            <distortion model="ptlens" focal="36.3" a="-0.01688" b="0.04463" c="-0.02165"/>
++            <distortion model="ptlens" focal="60.4" a="-0.01809" b="0.02613" c="0.00016"/>
++            <distortion model="ptlens" focal="92" a="-0.01825" b="0.02645" c="-0.01387"/>
++            <tca model="poly3" focal="4.6" vr="1.0004912" vb="1.0002067"/>
++            <tca model="poly3" focal="9.2" vr="1.0002420" vb="1.0001037"/>
++            <tca model="poly3" focal="19.1" vr="1.0000862" vb="1.0000509"/>
++            <tca model="poly3" focal="36.3" vr="0.9999841" vb="0.9999159"/>
++            <tca model="poly3" focal="60.4" vr="0.9999076" vb="0.9999219"/>
++            <tca model="poly3" focal="92" vr="0.999" vb="0.999"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>FinePix S5600</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujiS5600</mount>
++        <cropfactor>6.03</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="6.3" k1="-0.01437"/>
++            <distortion model="poly3" focal="6.9" k1="-0.00883"/>
++            <distortion model="poly3" focal="7.5" k1="-0.005619"/>
++            <distortion model="poly3" focal="9" k1="0.00042"/>
++            <distortion model="poly3" focal="16.7" k1="0.00266"/>
++            <distortion model="poly3" focal="21.6" k1="0.00156"/>
++            <distortion model="poly3" focal="28.6" k1="0.00094"/>
++            <distortion model="poly3" focal="63" k1="0.00021"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>Fujifilm XQ1</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujiXQ1</mount>
++        <cropfactor>3.91</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6.4" a="0.01267" b="-0.07641" c="0.00242"/>
++            <distortion model="ptlens" focal="9.7" a="-0.00489" b="-0.00182" c="-0.02868"/>
++            <distortion model="ptlens" focal="14.9" a="0" b="-0.00793" c="0"/>
++            <distortion model="ptlens" focal="22.2" a="0" b="-0.00295" c="0"/>
++            <distortion model="ptlens" focal="25.6" a="0" b="-0.00116" c="0"/>
++            <tca model="poly3" focal="6.4" br="0.0003842" vr="0.9998453" bb="-0.0003690" vb="1.0009162"/>
++            <tca model="poly3" focal="9.7" br="0.0001230" vr="0.9998798" bb="-0.0001439" vb="1.0005130"/>
++            <tca model="poly3" focal="14.9" br="0.0000232" vr="0.9999439" bb="0.0000423" vb="1.0004204"/>
++            <tca model="poly3" focal="22.2" br="-0.0000659" vr="1.0001220" bb="-0.0000503" vb="1.0002306"/>
++            <tca model="poly3" focal="25.6" br="-0.0000914" vr="1.0001901" bb="-0.0000653" vb="1.0001226"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>Fujifilm FinePix A370</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujiA370</mount>
++        <cropfactor>6.03</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5.9" a="0.01077" b="-0.03642" c="0.0168"/>
++            <distortion model="ptlens" focal="7.6" a="0.01088" b="-0.03855" c="0.03003"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="0.00062" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>Fujifilm X-S1</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>fujiXS1</mount>
++        <cropfactor>3.93</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6.1" a="0.04173" b="-0.1255" c="0.03337"/>
++            <distortion model="ptlens" focal="9.2" a="0.05507" b="-0.14991" c="0.16436"/>
++            <distortion model="ptlens" focal="12" a="0.03847" b="-0.07323" c="0.07359"/>
++            <distortion model="ptlens" focal="15.1" a="0.00645" b="0.01798" c="0.01622"/>
++            <distortion model="ptlens" focal="16.3" a="-0.00502" b="0.06208" c="-0.04238"/>
++            <distortion model="ptlens" focal="25.7" a="0.02044" b="-0.0267" c="0.07563"/>
++            <distortion model="ptlens" focal="30" a="0.00802" b="0.01586" c="0.01124"/>
++            <distortion model="ptlens" focal="49.1" a="-0.00692" b="0.05513" c="-0.00162"/>
++            <distortion model="ptlens" focal="51" a="0.02053" b="-0.03035" c="0.0728"/>
++            <distortion model="ptlens" focal="61.8" a="-0.0162" b="0.07471" c="-0.01617"/>
++            <distortion model="ptlens" focal="77.6" a="-0.03119" b="0.11626" c="-0.04673"/>
++            <distortion model="ptlens" focal="118" a="-0.03622" b="0.12026" c="-0.05082"/>
++            <distortion model="ptlens" focal="158.6" a="-0.03593" b="0.1124" c="-0.03696"/>
++            <tca model="poly3" focal="6.1" br="-0.0006698" vr="1.0015060" bb="0.0001771" vb="0.9997757"/>
++            <tca model="poly3" focal="9.2" br="-0.0003439" vr="1.0011847" bb="0.0001094" vb="0.9997936"/>
++            <tca model="poly3" focal="12" br="-0.0001715" vr="1.0005107" bb="0.0000503" vb="0.9998925"/>
++            <tca model="poly3" focal="13" br="-0.0002957" vr="1.0011080" bb="0.0000873" vb="0.9998131"/>
++            <tca model="poly3" focal="15.1" br="-0.0001575" vr="1.0004048" bb="0.0000547" vb="0.9999092"/>
++            <tca model="poly3" focal="16.3" br="-0.0001187" vr="1.0004237" bb="0.0000731" vb="0.9998992"/>
++            <tca model="poly3" focal="20.5" br="-0.0001369" vr="1.0005299" bb="0.0000650" vb="0.9998692"/>
++            <tca model="poly3" focal="25.7" br="-0.0000855" vr="1.0002196" bb="0.0000465" vb="0.9999389"/>
++            <tca model="poly3" focal="30" br="-0.0000874" vr="1.0002188" bb="0.0000667" vb="0.9998927"/>
++            <tca model="poly3" focal="40.6" br="-0.0000627" vr="1.0001223" bb="0.0000768" vb="0.9998504"/>
++            <tca model="poly3" focal="49.1" br="-0.0000789" vr="1.0000674" bb="0.0000261" vb="0.9999830"/>
++            <tca model="poly3" focal="61.8" br="-0.0000792" vr="0.9999716" bb="0.0000256" vb="0.9999884"/>
++            <tca model="poly3" focal="64.2" br="-0.0000833" vr="0.9999308" bb="-0.0001554" vb="1.0000881"/>
++            <tca model="poly3" focal="77.6" br="-0.0001047" vr="0.9998898" bb="0.0000203" vb="1.0000117"/>
++            <tca model="poly3" focal="90.4" br="-0.0001352" vr="0.9999454" bb="-0.0001451" vb="1.0001396"/>
++            <tca model="poly3" focal="118" br="-0.0002359" vr="0.9999663" bb="-0.0000332" vb="1.0000257"/>
++            <tca model="poly3" focal="158.6" br="-0.0005435" vr="0.9996900" bb="0.0001082" vb="0.9999633"/>
++            <vignetting model="pa" focal="6.1" aperture="2.8" distance="10" k1="-0.6581" k2="0.7127" k3="-0.5429"/>
++            <vignetting model="pa" focal="6.1" aperture="2.8" distance="1000" k1="-0.6581" k2="0.7127" k3="-0.5429"/>
++            <vignetting model="pa" focal="6.1" aperture="3.2" distance="10" k1="-0.6793" k2="0.7144" k3="-0.4351"/>
++            <vignetting model="pa" focal="6.1" aperture="3.2" distance="1000" k1="-0.6793" k2="0.7144" k3="-0.4351"/>
++            <vignetting model="pa" focal="6.1" aperture="3.6" distance="10" k1="-0.6629" k2="0.6624" k3="-0.4054"/>
++            <vignetting model="pa" focal="6.1" aperture="3.6" distance="1000" k1="-0.6629" k2="0.6624" k3="-0.4054"/>
++            <vignetting model="pa" focal="6.1" aperture="4" distance="10" k1="-0.6061" k2="0.4407" k3="-0.1881"/>
++            <vignetting model="pa" focal="6.1" aperture="4" distance="1000" k1="-0.6061" k2="0.4407" k3="-0.1881"/>
++            <vignetting model="pa" focal="6.1" aperture="11" distance="10" k1="-0.5866" k2="0.5655" k3="-0.2802"/>
++            <vignetting model="pa" focal="6.1" aperture="11" distance="1000" k1="-0.5866" k2="0.5655" k3="-0.2802"/>
++            <vignetting model="pa" focal="15.1" aperture="3.6" distance="10" k1="-0.6070" k2="0.7431" k3="-0.4935"/>
++            <vignetting model="pa" focal="15.1" aperture="3.6" distance="1000" k1="-0.6070" k2="0.7431" k3="-0.4935"/>
++            <vignetting model="pa" focal="15.1" aperture="4" distance="10" k1="-0.5303" k2="0.4250" k3="-0.1861"/>
++            <vignetting model="pa" focal="15.1" aperture="4" distance="1000" k1="-0.5303" k2="0.4250" k3="-0.1861"/>
++            <vignetting model="pa" focal="15.1" aperture="4.5" distance="10" k1="-0.5090" k2="0.3295" k3="-0.0886"/>
++            <vignetting model="pa" focal="15.1" aperture="4.5" distance="1000" k1="-0.5090" k2="0.3295" k3="-0.0886"/>
++            <vignetting model="pa" focal="15.1" aperture="5" distance="10" k1="-0.5044" k2="0.3137" k3="-0.0776"/>
++            <vignetting model="pa" focal="15.1" aperture="5" distance="1000" k1="-0.5044" k2="0.3137" k3="-0.0776"/>
++            <vignetting model="pa" focal="15.1" aperture="11" distance="10" k1="-0.4872" k2="0.2816" k3="-0.0957"/>
++            <vignetting model="pa" focal="15.1" aperture="11" distance="1000" k1="-0.4872" k2="0.2816" k3="-0.0957"/>
++            <vignetting model="pa" focal="34.9" aperture="4.5" distance="10" k1="-0.5227" k2="0.3657" k3="-0.1251"/>
++            <vignetting model="pa" focal="34.9" aperture="4.5" distance="1000" k1="-0.5227" k2="0.3657" k3="-0.1251"/>
++            <vignetting model="pa" focal="34.9" aperture="5" distance="10" k1="-0.4981" k2="0.2696" k3="-0.0351"/>
++            <vignetting model="pa" focal="34.9" aperture="5" distance="1000" k1="-0.4981" k2="0.2696" k3="-0.0351"/>
++            <vignetting model="pa" focal="34.9" aperture="5.6" distance="10" k1="-0.5072" k2="0.3208" k3="-0.0827"/>
++            <vignetting model="pa" focal="34.9" aperture="5.6" distance="1000" k1="-0.5072" k2="0.3208" k3="-0.0827"/>
++            <vignetting model="pa" focal="34.9" aperture="6.4" distance="10" k1="-0.5611" k2="0.4349" k3="-0.1608"/>
++            <vignetting model="pa" focal="34.9" aperture="6.4" distance="1000" k1="-0.5611" k2="0.4349" k3="-0.1608"/>
++            <vignetting model="pa" focal="34.9" aperture="11" distance="10" k1="-0.5332" k2="0.3572" k3="-0.0624"/>
++            <vignetting model="pa" focal="34.9" aperture="11" distance="1000" k1="-0.5332" k2="0.3572" k3="-0.0624"/>
++            <vignetting model="pa" focal="77.6" aperture="5.6" distance="10" k1="-0.5770" k2="0.4783" k3="-0.1440"/>
++            <vignetting model="pa" focal="77.6" aperture="5.6" distance="1000" k1="-0.5770" k2="0.4783" k3="-0.1440"/>
++            <vignetting model="pa" focal="77.6" aperture="6.4" distance="10" k1="-0.5468" k2="0.4264" k3="-0.1121"/>
++            <vignetting model="pa" focal="77.6" aperture="6.4" distance="1000" k1="-0.5468" k2="0.4264" k3="-0.1121"/>
++            <vignetting model="pa" focal="77.6" aperture="7.1" distance="10" k1="-0.5350" k2="0.3480" k3="-0.0305"/>
++            <vignetting model="pa" focal="77.6" aperture="7.1" distance="1000" k1="-0.5350" k2="0.3480" k3="-0.0305"/>
++            <vignetting model="pa" focal="77.6" aperture="8" distance="10" k1="-0.5479" k2="0.4077" k3="-0.0887"/>
++            <vignetting model="pa" focal="77.6" aperture="8" distance="1000" k1="-0.5479" k2="0.4077" k3="-0.0887"/>
++            <vignetting model="pa" focal="77.6" aperture="11" distance="10" k1="-0.5119" k2="0.2929" k3="0.0091"/>
++            <vignetting model="pa" focal="77.6" aperture="11" distance="1000" k1="-0.5119" k2="0.2929" k3="0.0091"/>
++            <vignetting model="pa" focal="158.6" aperture="5.6" distance="10" k1="-0.7216" k2="0.1993" k3="0.1109"/>
++            <vignetting model="pa" focal="158.6" aperture="5.6" distance="1000" k1="-0.7216" k2="0.1993" k3="0.1109"/>
++            <vignetting model="pa" focal="158.6" aperture="6.4" distance="10" k1="-0.5204" k2="0.2966" k3="-0.0631"/>
++            <vignetting model="pa" focal="158.6" aperture="6.4" distance="1000" k1="-0.5204" k2="0.2966" k3="-0.0631"/>
++            <vignetting model="pa" focal="158.6" aperture="7.1" distance="10" k1="-0.5705" k2="0.4937" k3="-0.1689"/>
++            <vignetting model="pa" focal="158.6" aperture="7.1" distance="1000" k1="-0.5705" k2="0.4937" k3="-0.1689"/>
++            <vignetting model="pa" focal="158.6" aperture="8" distance="10" k1="-0.5619" k2="0.4321" k3="-0.0672"/>
++            <vignetting model="pa" focal="158.6" aperture="8" distance="1000" k1="-0.5619" k2="0.4321" k3="-0.0672"/>
++            <vignetting model="pa" focal="158.6" aperture="11" distance="10" k1="-0.5375" k2="0.3770" k3="-0.0282"/>
++            <vignetting model="pa" focal="158.6" aperture="11" distance="1000" k1="-0.5375" k2="0.3770" k3="-0.0282"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>X70 &amp; compatibles (Standard)</model>
++        <mount>fujix70</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="18.5" a="0.0246309" b="-0.0712065" c="0.0634822"/>
++            <tca model="poly3" focal="18.5" br="-0.0002189" vr="1.0006596" bb="0.0002054" vb="0.9994221"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-kodak.xml b/data/db/compact-kodak.xml
+--- a/data/db/compact-kodak.xml	2010-02-18 20:34:13.000000000 +0100
++++ b/data/db/compact-kodak.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,31 +1,42 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>KodakDC120</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>KodakDC50</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+         <maker>Eastman Kodak Company</maker>
+         <maker lang="en">Kodak</maker>
+         <model>Kodak DC120 ZOOM Digital Camera</model>
+         <model lang="en">Kodak DC120</model>
+-        <mount>KodakDC120</mount>
++        <mount>kodakDC120</mount>
+         <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Eastman Kodak Company</maker>
+         <maker lang="en">Kodak</maker>
+         <model>Kodak Digital Science DC50 Zoom Camera</model>
+         <model lang="en">Kodak DC50</model>
+-        <mount>KodakDC50</mount>
++        <mount>kodakDC50</mount>
+         <cropfactor>1</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Eastman Kodak Company</maker>
++        <maker lang="en">Kodak</maker>
++        <model>Kodak CX6330 Zoom Digital Camera</model>
++        <model lang="en">Kodak CX6330</model>
++        <mount>kodakCX6330</mount>
++        <cropfactor>6.593</cropfactor>
++    </camera>
++    <lens>
++        <maker>Kodak</maker>
++        <model>Kodak CX6330 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>kodakCX6330</mount>
++        <cropfactor>6.593</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="5.6" a="0.02078" b="-0.06962" c="0.04229"/>
++            <distortion model="ptlens" focal="7" a="0" b="-0.0089" c="0"/>
++            <distortion model="ptlens" focal="8.6" a="0.00856" b="-0.03587" c="0.0327"/>
++            <distortion model="ptlens" focal="10.8" a="0" b="-0.00465" c="0"/>
++            <distortion model="ptlens" focal="13.5" a="0" b="-0.00357" c="0"/>
++            <distortion model="ptlens" focal="16.8" a="0" b="-0.00293" c="0"/>
++        </calibration>
++    </lens>
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-konica-minolta.xml b/data/db/compact-konica-minolta.xml
+--- a/data/db/compact-konica-minolta.xml	2008-06-02 00:24:54.000000000 +0200
++++ b/data/db/compact-konica-minolta.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,64 +1,22 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>kmG400</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>kmXt</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>kmZ2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>kmZ3</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>kmZ1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>kmD7</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>kmZ10</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
++        <maker>Konica Minolta</maker>
+         <model>DiMAGE Z6</model>
+         <mount>kmZ3</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
++        <maker>Konica Minolta</maker>
+         <model>DiMAGE Z5</model>
+         <mount>kmZ3</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
++        <maker>Konica Minolta</maker>
+         <model>DiMAGE Z3</model>
+         <mount>kmZ3</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Konica Minolta Camera, Inc.</maker>
+         <maker lang="en">Konica Minolta</maker>
+@@ -66,7 +24,6 @@
+         <mount>kmZ2</mount>
+         <cropfactor>6.03</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -74,31 +31,24 @@
+         <mount>kmZ1</mount>
+         <cropfactor>6.545</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
++        <maker>Konica Minolta</maker>
+         <model>DiMAGE Z20</model>
+         <mount>kmZ10</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
++        <maker>Konica Minolta</maker>
+         <model>DiMAGE Z10</model>
+         <mount>kmZ10</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
++        <maker>Konica Minolta</maker>
+         <model>DiMAGE A200</model>
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Konica Minolta Camera, Inc.</maker>
+         <maker lang="en">Konica Minolta</maker>
+@@ -106,7 +56,6 @@
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -114,7 +63,6 @@
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -122,7 +70,6 @@
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -130,7 +77,6 @@
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -138,7 +84,6 @@
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -146,7 +91,6 @@
+         <mount>kmXt</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -154,7 +98,6 @@
+         <mount>kmXt</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Minolta Co., Ltd.</maker>
+         <maker lang="en">Minolta</maker>
+@@ -162,186 +105,194 @@
+         <mount>kmXt</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA CAMERA, Inc.</maker>
++        <maker>Konica Minolta Camera, Inc.</maker>
+         <maker lang="en">Konica Minolta</maker>
+         <model>DiMAGE G400</model>
+         <mount>kmG400</mount>
+         <cropfactor>6.144</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA CAMERA, Inc.</maker>
++        <maker>Konica Minolta Camera, Inc.</maker>
+         <maker lang="en">Konica Minolta</maker>
+         <model>Revio KD-420Z</model>
+         <mount>kmG400</mount>
+         <cropfactor>6.144</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE Z3 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmZ3</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.859" a="0.008857" b="-0.033348" c="0" />
+-            <distortion model="ptlens" focal="6.542" a="0" b="-0.008767" c="0" />
+-            <distortion model="ptlens" focal="7.61" a="0" b="-0.005089" c="0" />
+-            <distortion model="ptlens" focal="8.747" a="0" b="-0.003083" c="0" />
+-            <distortion model="ptlens" focal="9.911" a="0" b="-0.001565" c="0" />
+-            <distortion model="ptlens" focal="12.821" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="37.832" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="69.454" a="0" b="0.00172" c="0" />
++            <distortion model="ptlens" focal="5.859" a="0.008857" b="-0.033348" c="0"/>
++            <distortion model="ptlens" focal="6.542" a="0" b="-0.008767" c="0"/>
++            <distortion model="ptlens" focal="7.61" a="0" b="-0.005089" c="0"/>
++            <distortion model="ptlens" focal="8.747" a="0" b="-0.003083" c="0"/>
++            <distortion model="ptlens" focal="9.911" a="0" b="-0.001565" c="0"/>
++            <distortion model="ptlens" focal="12.821" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="37.832" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="69.454" a="0" b="0.00172" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE Z2 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmZ2</mount>
+         <cropfactor>6.03</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.3" a="0.024434" b="-0.049454" c="0" />
+-            <distortion model="ptlens" focal="8.6" a="0.012009" b="-0.022336" c="0" />
+-            <distortion model="ptlens" focal="12.1" a="0" b="-0.001567" c="0" />
+-            <distortion model="ptlens" focal="17.5" a="0" b="-0.002328" c="0" />
+-            <distortion model="ptlens" focal="24.8" a="0" b="-0.002045" c="0" />
+-            <distortion model="ptlens" focal="34.7" a="0" b="-0.004272" c="0" />
+-            <distortion model="ptlens" focal="52.4" a="0" b="-0.003142" c="0" />
+-            <distortion model="ptlens" focal="63" a="0" b="0.000531" c="0" />
++            <distortion model="ptlens" focal="6.3" a="0.024434" b="-0.049454" c="0"/>
++            <distortion model="ptlens" focal="8.6" a="0.012009" b="-0.022336" c="0"/>
++            <distortion model="ptlens" focal="12.1" a="0" b="-0.001567" c="0"/>
++            <distortion model="ptlens" focal="17.5" a="0" b="-0.002328" c="0"/>
++            <distortion model="ptlens" focal="24.8" a="0" b="-0.002045" c="0"/>
++            <distortion model="ptlens" focal="34.7" a="0" b="-0.004272" c="0"/>
++            <distortion model="ptlens" focal="52.4" a="0" b="-0.003142" c="0"/>
++            <distortion model="ptlens" focal="63" a="0" b="0.000531" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>ZCW-100</model>
++        <model>DiMAGE Z2 &amp; compatibles, with ZCW-100</model>
++        <model lang="en">fixed lens, with ZCW-100</model>
++        <model lang="de">festes Objektiv, mit ZCW-100</model>
+         <mount>kmZ2</mount>
+         <cropfactor>6.03</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.3" a="0.020234" b="-0.07549" c="0" />
+-            <distortion model="ptlens" focal="7.4" a="0.013032" b="-0.054808" c="0" />
+-            <distortion model="ptlens" focal="10.4" a="-0.001905" b="-0.017509" c="0" />
++            <distortion model="ptlens" focal="6.3" a="0.020234" b="-0.07549" c="0"/>
++            <distortion model="ptlens" focal="7.4" a="0.013032" b="-0.054808" c="0"/>
++            <distortion model="ptlens" focal="10.4" a="-0.001905" b="-0.017509" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE Z1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmZ1</mount>
+         <cropfactor>6.545</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.025087" b="-0.065158" c="0" />
+-            <distortion model="ptlens" focal="6" a="0.021188" b="-0.052445" c="0" />
+-            <distortion model="ptlens" focal="6.6" a="0.020944" b="-0.047765" c="0" />
+-            <distortion model="ptlens" focal="7.3" a="0.015342" b="-0.033767" c="0" />
+-            <distortion model="ptlens" focal="10.5" a="0.008218" b="-0.019123" c="0" />
+-            <distortion model="ptlens" focal="15.2" a="0.007013" b="-0.016335" c="0" />
+-            <distortion model="ptlens" focal="22.9" a="0.002611" b="-0.00752" c="0" />
+-            <distortion model="ptlens" focal="30.1" a="0" b="-0.00372" c="0" />
+-            <distortion model="ptlens" focal="39.6" a="0" b="-0.0046" c="0" />
+-            <distortion model="ptlens" focal="45.4" a="0" b="-0.004482" c="0" />
+-            <distortion model="ptlens" focal="49.8" a="0" b="-0.004394" c="0" />
+-            <distortion model="ptlens" focal="58" a="0" b="0.000217" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.025087" b="-0.065158" c="0"/>
++            <distortion model="ptlens" focal="6" a="0.021188" b="-0.052445" c="0"/>
++            <distortion model="ptlens" focal="6.6" a="0.020944" b="-0.047765" c="0"/>
++            <distortion model="ptlens" focal="7.3" a="0.015342" b="-0.033767" c="0"/>
++            <distortion model="ptlens" focal="10.5" a="0.008218" b="-0.019123" c="0"/>
++            <distortion model="ptlens" focal="15.2" a="0.007013" b="-0.016335" c="0"/>
++            <distortion model="ptlens" focal="22.9" a="0.002611" b="-0.00752" c="0"/>
++            <distortion model="ptlens" focal="30.1" a="0" b="-0.00372" c="0"/>
++            <distortion model="ptlens" focal="39.6" a="0" b="-0.0046" c="0"/>
++            <distortion model="ptlens" focal="45.4" a="0" b="-0.004482" c="0"/>
++            <distortion model="ptlens" focal="49.8" a="0" b="-0.004394" c="0"/>
++            <distortion model="ptlens" focal="58" a="0" b="0.000217" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>ZCW-100</model>
++        <model>DiMAGE Z1 &amp; compatibles, with ZCW-100</model>
++        <model lang="en">fixed lens, with ZCW-100</model>
++        <model lang="de">festes Objektiv, mit ZCW-100</model>
+         <mount>kmZ1</mount>
+         <cropfactor>6.545</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="4.4" a="0.030707" b="-0.10549" c="0" />
++            <distortion model="ptlens" focal="4.4" a="0.030707" b="-0.10549" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE Z10 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmZ10</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.012869" b="-0.041112" c="0" />
+-            <distortion model="ptlens" focal="7.4" a="0.020326" b="-0.036191" c="0" />
+-            <distortion model="ptlens" focal="8.9" a="0.015295" b="-0.018566" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="0.012247" b="-0.010229" c="0" />
+-            <distortion model="ptlens" focal="13.4" a="0.011031" b="-0.010002" c="0" />
+-            <distortion model="ptlens" focal="17.3" a="0.006649" b="-0.001496" c="0" />
+-            <distortion model="ptlens" focal="27.8" a="0.005224" b="-0.000697" c="0" />
+-            <distortion model="ptlens" focal="35.9" a="0.006913" b="-0.002215" c="0" />
+-            <distortion model="ptlens" focal="48" a="0.006184" b="0.003347" c="0" />
++            <distortion model="ptlens" focal="6" a="0.012869" b="-0.041112" c="0"/>
++            <distortion model="ptlens" focal="7.4" a="0.020326" b="-0.036191" c="0"/>
++            <distortion model="ptlens" focal="8.9" a="0.015295" b="-0.018566" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="0.012247" b="-0.010229" c="0"/>
++            <distortion model="ptlens" focal="13.4" a="0.011031" b="-0.010002" c="0"/>
++            <distortion model="ptlens" focal="17.3" a="0.006649" b="-0.001496" c="0"/>
++            <distortion model="ptlens" focal="27.8" a="0.005224" b="-0.000697" c="0"/>
++            <distortion model="ptlens" focal="35.9" a="0.006913" b="-0.002215" c="0"/>
++            <distortion model="ptlens" focal="48" a="0.006184" b="0.003347" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>ZCW-200</model>
++        <model>DiMAGE Z10 &amp; compatibles, with ZCW-200</model>
++        <model lang="en">fixed lens, with ZCW-200</model>
++        <model lang="de">festes Objektiv, mit ZCW-200</model>
+         <mount>kmZ10</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="4.2" a="0.024186" b="-0.107425" c="0" />
++            <distortion model="ptlens" focal="4.2" a="0.024186" b="-0.107425" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE 7 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.3" a="0.025" b="-0.065" c="0" />
+-            <distortion model="ptlens" focal="8.9" a="0.015" b="-0.033" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="0" b="0.003" c="0" />
+-            <distortion model="ptlens" focal="25.4" a="0" b="0.005" c="0" />
+-            <distortion model="ptlens" focal="38.1" a="0" b="0.008" c="0" />
+-            <distortion model="ptlens" focal="50.8" a="0" b="0.008" c="0" />
++            <distortion model="ptlens" focal="7.3" a="0.025" b="-0.065" c="0"/>
++            <distortion model="ptlens" focal="8.9" a="0.015" b="-0.033" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="0" b="0.003" c="0"/>
++            <distortion model="ptlens" focal="25.4" a="0" b="0.005" c="0"/>
++            <distortion model="ptlens" focal="38.1" a="0" b="0.008" c="0"/>
++            <distortion model="ptlens" focal="50.8" a="0" b="0.008" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>ACW-100 Converter</model>
++        <model>DiMAGE 7 &amp; compatibles, with ACW-100 converter</model>
++        <model lang="en">fixed lens, with ACW-100 converter</model>
++        <model lang="de">festes Objektiv, mit ACW-100-Konverter</model>
+         <mount>kmD7</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.3" a="0" b="0.02892" c="-0.106517" />
++            <distortion model="ptlens" focal="7.3" a="0" b="0.02892" c="-0.106517"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE X &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmXt</mount>
+         <cropfactor>6.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.7" a="0.006514" b="-0.029243" c="0" />
+-            <distortion model="ptlens" focal="6" a="0.006797" b="-0.025877" c="0" />
+-            <distortion model="ptlens" focal="6.5" a="0.005866" b="-0.017735" c="0" />
+-            <distortion model="ptlens" focal="8" a="0" b="0.002707" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="0.006484" c="0" />
+-            <distortion model="ptlens" focal="10.2" a="0" b="0.006944" c="0" />
+-            <distortion model="ptlens" focal="11.3" a="0" b="0.006926" c="0" />
+-            <distortion model="ptlens" focal="13" a="0" b="0.006213" c="0" />
+-            <distortion model="ptlens" focal="15.7" a="0" b="0.009464" c="0" />
+-            <distortion model="ptlens" focal="17.1" a="0" b="0.009984" c="0" />
++            <distortion model="ptlens" focal="5.7" a="0.006514" b="-0.029243" c="0"/>
++            <distortion model="ptlens" focal="6" a="0.006797" b="-0.025877" c="0"/>
++            <distortion model="ptlens" focal="6.5" a="0.005866" b="-0.017735" c="0"/>
++            <distortion model="ptlens" focal="8" a="0" b="0.002707" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0" b="0.006484" c="0"/>
++            <distortion model="ptlens" focal="10.2" a="0" b="0.006944" c="0"/>
++            <distortion model="ptlens" focal="11.3" a="0" b="0.006926" c="0"/>
++            <distortion model="ptlens" focal="13" a="0" b="0.006213" c="0"/>
++            <distortion model="ptlens" focal="15.7" a="0" b="0.009464" c="0"/>
++            <distortion model="ptlens" focal="17.1" a="0" b="0.009984" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>Standard</model>
++        <model>DiMAGE G400 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>kmG400</mount>
+         <cropfactor>6.144</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.6" a="0.006939" b="-0.026729" c="0" />
+-            <distortion model="ptlens" focal="6.3" a="-0.00032" b="-0.008211" c="0" />
+-            <distortion model="ptlens" focal="7.7" a="-0.001922" b="0.000251" c="0" />
+-            <distortion model="ptlens" focal="9.9" a="-0.002401" b="0.002342" c="0" />
+-            <distortion model="ptlens" focal="12.4" a="-0.004609" b="0.008805" c="0" />
+-            <distortion model="ptlens" focal="14.7" a="-0.002296" b="0.004882" c="0" />
+-            <distortion model="ptlens" focal="16.8" a="-0.005442" b="0.012752" c="0" />
++            <distortion model="ptlens" focal="5.6" a="0.006939" b="-0.026729" c="0"/>
++            <distortion model="ptlens" focal="6.3" a="-0.00032" b="-0.008211" c="0"/>
++            <distortion model="ptlens" focal="7.7" a="-0.001922" b="0.000251" c="0"/>
++            <distortion model="ptlens" focal="9.9" a="-0.002401" b="0.002342" c="0"/>
++            <distortion model="ptlens" focal="12.4" a="-0.004609" b="0.008805" c="0"/>
++            <distortion model="ptlens" focal="14.7" a="-0.002296" b="0.004882" c="0"/>
++            <distortion model="ptlens" focal="16.8" a="-0.005442" b="0.012752" c="0"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-leica.xml b/data/db/compact-leica.xml
+--- a/data/db/compact-leica.xml	2013-02-02 18:11:04.000000000 +0100
++++ b/data/db/compact-leica.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,72 +1,74 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>leicaDigilux2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>LEICA</maker>
+-        <maker lang="en">Leica</maker>
+-        <model>DIGILUX 2</model>
+-        <model lang="en">Digilux 2</model>
++        <maker>Leica</maker>
++        <model>Digilux 2</model>
+         <mount>leicaDigilux2</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>LEICA</maker>
+-        <maker lang="en">Leica</maker>
++        <maker>Leica</maker>
+         <model>D-LUX2</model>
+         <model lang="en">Digilux 2</model>
+-        <variant>16:9</variant>
+         <mount>panasonicLX1</mount>
+         <cropfactor>4.45</cropfactor>
++        <!-- aspect ratio 16:9 -->
+     </camera>
+-
+     <camera>
+-        <maker>LEICA</maker>
+-        <maker lang="en">Leica</maker>
++        <maker>Leica</maker>
+         <model>D-LUX 4</model>
+         <model lang="en">Digilux 4</model>
+-        <variant>16:9</variant>
+-        <variant>4:3</variant>
+-        <mount>panasonicLX3</mount>
++        <mount>panasonicLX4</mount>
+         <cropfactor>4.33</cropfactor>
++        <!-- aspect ratio 4:3 -->
+     </camera>
+-
+     <camera>
+-        <maker>LEICA</maker>
+-        <maker lang="en">Leica</maker>
++        <maker>Leica</maker>
+         <model>D-LUX 3</model>
+         <model lang="en">Digilux 3</model>
+-        <variant>16:9</variant>
+-        <variant>4:3</variant>
+         <mount>panasonicLX3</mount>
+         <cropfactor>4.33</cropfactor>
++        <!-- aspect ratio 16:9 -->
++    </camera>
++    <camera>
++        <maker>Leica Camera AG</maker>
++        <model>Leica Q (Typ 116)</model>
++        <mount>leicaQTyp116</mount>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>Digilux 2 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>leicaDigilux2</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0" b="0.009873" c="-0.057763" />
+-            <distortion model="ptlens" focal="7.6" a="0" b="0.003123" c="-0.039833" />
+-            <distortion model="ptlens" focal="8.3" a="0" b="-0.003305" c="-0.03234" />
+-            <distortion model="ptlens" focal="9.1" a="0" b="-0.006188" c="-0.01791" />
+-            <distortion model="ptlens" focal="9.8" a="0" b="-0.01067" c="-0.008812" />
+-            <distortion model="ptlens" focal="10.6" a="0" b="-0.007992" c="-0.009762" />
+-            <distortion model="ptlens" focal="11.6" a="0" b="-0.009507" c="-0.002939" />
+-            <distortion model="ptlens" focal="12.8" a="0" b="-0.00301" c="-0.00523" />
+-            <distortion model="ptlens" focal="13.8" a="0" b="-0.002981" c="-0.008074" />
+-            <distortion model="ptlens" focal="14.7" a="0" b="-0.010144" c="0.002157" />
+-            <distortion model="ptlens" focal="16" a="0" b="-0.007409" c="0.003268" />
+-            <distortion model="ptlens" focal="17.3" a="0" b="-0.010874" c="0.007128" />
+-            <distortion model="ptlens" focal="19.1" a="0" b="-0.009048" c="0.005592" />
+-            <distortion model="ptlens" focal="22.5" a="0" b="-0.003695" c="0.005038" />
++            <distortion model="ptlens" focal="7" a="0" b="0.009873" c="-0.057763"/>
++            <distortion model="ptlens" focal="7.6" a="0" b="0.003123" c="-0.039833"/>
++            <distortion model="ptlens" focal="8.3" a="0" b="-0.003305" c="-0.03234"/>
++            <distortion model="ptlens" focal="9.1" a="0" b="-0.006188" c="-0.01791"/>
++            <distortion model="ptlens" focal="9.8" a="0" b="-0.01067" c="-0.008812"/>
++            <distortion model="ptlens" focal="10.6" a="0" b="-0.007992" c="-0.009762"/>
++            <distortion model="ptlens" focal="11.6" a="0" b="-0.009507" c="-0.002939"/>
++            <distortion model="ptlens" focal="12.8" a="0" b="-0.00301" c="-0.00523"/>
++            <distortion model="ptlens" focal="13.8" a="0" b="-0.002981" c="-0.008074"/>
++            <distortion model="ptlens" focal="14.7" a="0" b="-0.010144" c="0.002157"/>
++            <distortion model="ptlens" focal="16" a="0" b="-0.007409" c="0.003268"/>
++            <distortion model="ptlens" focal="17.3" a="0" b="-0.010874" c="0.007128"/>
++            <distortion model="ptlens" focal="19.1" a="0" b="-0.009048" c="0.005592"/>
++            <distortion model="ptlens" focal="22.5" a="0" b="-0.003695" c="0.005038"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica Camera AG</maker>
++        <maker lang="en">Leica</maker>
++        <model>28.0mm f/1.7</model>
++        <mount>leicaQTyp116</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- results obtained using sample RAW from dpreview.com -->
++            <distortion model="ptlens" focal="28" a="0.00098" b="-0.043" c="0.01683"/>
++            <tca model="poly3" focal="28" br="-0.0000329" vr="1.0002023" bb="0.0000845" vb="0.9999781"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-nikon.xml b/data/db/compact-nikon.xml
+--- a/data/db/compact-nikon.xml	2013-08-14 10:09:02.000000000 +0200
++++ b/data/db/compact-nikon.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,653 +1,664 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>nikon8400</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon7900</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon4800</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon995</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon950</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon5400</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon5000</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon5700</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon990</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon8800</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon4500</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikonP330</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikonP6000</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>nikon60</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
+-        <model>COOLPIX P60</model>
+-        <mount>nikon60</mount>
++        <maker>Nikon</maker>
++        <model>Coolpix P60</model>
++        <mount>nikonP60</mount>
+         <cropfactor>5.62</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E8800</model>
+-        <variant>CP8800</variant>
++        <model lang="en">Coolpix 8800</model>
+         <mount>nikon8800</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E8700</model>
+-        <variant>CP8700</variant>
++        <model lang="en">Coolpix 8700</model>
+         <mount>nikon5700</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E5700</model>
+-        <variant>CP5700</variant>
++        <model lang="en">Coolpix 5700</model>
+         <mount>nikon5700</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E7900</model>
+-        <variant>CP7900</variant>
++        <model lang="en">Coolpix 7900</model>
+         <mount>nikon7900</mount>
+         <cropfactor>4.86</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E7600</model>
+-        <variant>CP7600</variant>
++        <model lang="en">Coolpix 7600</model>
+         <mount>nikon7900</mount>
+         <cropfactor>4.86</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E5900</model>
+-        <variant>CP5900</variant>
++        <model lang="en">Coolpix 5900</model>
+         <mount>nikon7900</mount>
+         <cropfactor>4.86</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E5200</model>
+-        <variant>CP5200</variant>
++        <model lang="en">Coolpix 5200</model>
+         <mount>nikon7900</mount>
+         <cropfactor>4.86</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E4200</model>
+-        <variant>CP4200</variant>
++        <model lang="en">Coolpix 4200</model>
+         <mount>nikon7900</mount>
+         <cropfactor>4.86</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E5400</model>
+-        <variant>CP5400</variant>
++        <model lang="en">Coolpix 5400</model>
+         <mount>nikon5400</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E5000</model>
+-        <variant>CP5000</variant>
++        <model lang="en">Coolpix 5000</model>
+         <mount>nikon5000</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E4800</model>
+-        <variant>CP4800</variant>
++        <model lang="en">Coolpix 4800</model>
+         <mount>nikon4800</mount>
+         <cropfactor>6</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E4500</model>
+-        <variant>CP4500</variant>
++        <model lang="en">Coolpix 4500</model>
+         <mount>nikon4500</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E995</model>
+-        <variant>CP995</variant>
++        <model lang="en">Coolpix 995</model>
+         <mount>nikon995</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E990</model>
+-        <variant>CP990</variant>
++        <model lang="en">Coolpix 990</model>
+         <mount>nikon990</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E950</model>
+-        <variant>CP950</variant>
++        <model lang="en">Coolpix 950</model>
+         <mount>nikon950</mount>
+         <cropfactor>5.408</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
+-        <model>COOLPIX P330</model>
++        <maker>Nikon</maker>
++        <model>Coolpix P330</model>
+         <mount>nikonP330</mount>
+         <cropfactor>4.706</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
+-        <model>COOLPIX P6000</model>
++        <maker>Nikon</maker>
++        <model>Coolpix S3300</model>
++        <mount>nikonS3300</mount>
++        <cropfactor>5.65</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon</maker>
++        <model>Coolpix P6000</model>
+         <mount>nikonP6000</mount>
+         <cropfactor>4.6</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON</maker>
+-        <maker lang="en">Nikon</maker>
++        <maker>Nikon</maker>
+         <model>E8400</model>
+-        <variant>CP8400</variant>
++        <model lang="en">Coolpix 8400</model>
+         <mount>nikon8400</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Nikon</maker>
++        <model>Coolpix P7000</model>
++        <mount>nikonP7000</mount>
++        <cropfactor>4.69</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon</maker>
++        <model>Coolpix P7800</model>
++        <mount>nikonP7800</mount>
++        <cropfactor>4.67</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Coolpix A</model>
++        <mount>nikonA</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E8800 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon8800</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.9" a="0.013454" b="-0.041694" c="0" />
+-            <distortion model="ptlens" focal="9.5" a="0.013174" b="-0.037229" c="0" />
+-            <distortion model="ptlens" focal="11" a="0.011875" b="-0.027921" c="0" />
+-            <distortion model="ptlens" focal="13.8" a="0.011533" b="-0.021238" c="0" />
+-            <distortion model="ptlens" focal="19.8" a="0.005936" b="-0.007387" c="0" />
+-            <distortion model="ptlens" focal="29.3" a="0.004248" b="-0.004453" c="0" />
+-            <distortion model="ptlens" focal="40" a="0" b="0.004755" c="0" />
+-            <distortion model="ptlens" focal="49" a="0" b="0.003129" c="0" />
+-            <distortion model="ptlens" focal="89" a="0" b="0.002974" c="0" />
++            <distortion model="ptlens" focal="8.9" a="0.013454" b="-0.041694" c="0"/>
++            <distortion model="ptlens" focal="9.5" a="0.013174" b="-0.037229" c="0"/>
++            <distortion model="ptlens" focal="11" a="0.011875" b="-0.027921" c="0"/>
++            <distortion model="ptlens" focal="13.8" a="0.011533" b="-0.021238" c="0"/>
++            <distortion model="ptlens" focal="19.8" a="0.005936" b="-0.007387" c="0"/>
++            <distortion model="ptlens" focal="29.3" a="0.004248" b="-0.004453" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.004755" c="0"/>
++            <distortion model="ptlens" focal="49" a="0" b="0.003129" c="0"/>
++            <distortion model="ptlens" focal="89" a="0" b="0.002974" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WM-E80</model>
++        <model>E8800 &amp; compatibles, with WM-E80</model>
++        <model lang="en">fixed lens, with WM-E80</model>
++        <model lang="de">festes Objektiv, mit WM-E80</model>
+         <mount>nikon8800</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.9" a="0.015468" b="-0.07614" c="0" />
+-            <distortion model="ptlens" focal="11" a="0.009214" b="-0.051437" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="0.007165" b="-0.041386" c="0" />
+-            <distortion model="ptlens" focal="15" a="0.004854" b="-0.032212" c="0" />
+-            <distortion model="ptlens" focal="21.8" a="0.003889" b="-0.022494" c="0" />
+-            <distortion model="ptlens" focal="26.5" a="-0.001886" b="-0.00899" c="0" />
+-            <distortion model="ptlens" focal="35.9" a="-0.0024" b="-0.006042" c="0" />
++            <distortion model="ptlens" focal="8.9" a="0.015468" b="-0.07614" c="0"/>
++            <distortion model="ptlens" focal="11" a="0.009214" b="-0.051437" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="0.007165" b="-0.041386" c="0"/>
++            <distortion model="ptlens" focal="15" a="0.004854" b="-0.032212" c="0"/>
++            <distortion model="ptlens" focal="21.8" a="0.003889" b="-0.022494" c="0"/>
++            <distortion model="ptlens" focal="26.5" a="-0.001886" b="-0.00899" c="0"/>
++            <distortion model="ptlens" focal="35.9" a="-0.0024" b="-0.006042" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E8400 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon8400</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.1" a="0" b="-0.014928" c="0" />
+-            <distortion model="ptlens" focal="7" a="0" b="-0.011637" c="0" />
+-            <distortion model="ptlens" focal="8.1" a="0" b="-0.009313" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="-0.006115" c="0" />
+-            <distortion model="ptlens" focal="12.3" a="0" b="-0.004044" c="0" />
+-            <distortion model="ptlens" focal="15.2" a="0" b="-0.001226" c="0" />
+-            <distortion model="ptlens" focal="21.6" a="0" b="0" c="0" />
++            <distortion model="poly3" focal="6.1" k1="-0.014928"/>
++            <distortion model="poly3" focal="7" k1="-0.011637"/>
++            <distortion model="poly3" focal="8.1" k1="-0.009313"/>
++            <distortion model="poly3" focal="10" k1="-0.006115"/>
++            <distortion model="poly3" focal="12.3" k1="-0.004044"/>
++            <distortion model="poly3" focal="15.2" k1="-0.001226"/>
++            <distortion model="poly3" focal="21.6" k1="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E75</model>
++        <model>E8400 &amp; compatibles, with WC-E75</model>
++        <model lang="en">fixed lens, with WC-E75</model>
++        <model lang="de">festes Objektiv, mit WC-E75</model>
+         <mount>nikon8400</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.1" a="0.0165" b="-0.057649" c="0" />
+-            <distortion model="ptlens" focal="7.5" a="0.009749" b="-0.039706" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="-0.014859" c="0" />
+-            <distortion model="ptlens" focal="11.5" a="0" b="-0.011079" c="0" />
+-            <distortion model="ptlens" focal="14.2" a="0" b="-0.007817" c="0" />
+-            <distortion model="ptlens" focal="17.5" a="0" b="-0.005923" c="0" />
+-            <distortion model="ptlens" focal="21.6" a="0" b="-0.003667" c="0" />
++            <distortion model="ptlens" focal="6.1" a="0.0165" b="-0.057649" c="0"/>
++            <distortion model="ptlens" focal="7.5" a="0.009749" b="-0.039706" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0" b="-0.014859" c="0"/>
++            <distortion model="ptlens" focal="11.5" a="0" b="-0.011079" c="0"/>
++            <distortion model="ptlens" focal="14.2" a="0" b="-0.007817" c="0"/>
++            <distortion model="ptlens" focal="17.5" a="0" b="-0.005923" c="0"/>
++            <distortion model="ptlens" focal="21.6" a="0" b="-0.003667" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E5700 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon5700</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.9" a="0.014425" b="-0.044782" c="0" />
+-            <distortion model="ptlens" focal="9" a="0.01501" b="-0.045355" c="0" />
+-            <distortion model="ptlens" focal="9.5" a="0.012659" b="-0.038385" c="0" />
+-            <distortion model="ptlens" focal="10.7" a="0.014239" b="-0.038035" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="0.007615" b="-0.020282" c="0" />
+-            <distortion model="ptlens" focal="14.7" a="0.004843" b="-0.012421" c="0" />
+-            <distortion model="ptlens" focal="15.7" a="0.008849" b="-0.018943" c="0" />
+-            <distortion model="ptlens" focal="17.8" a="0.002011" b="-0.004148" c="0" />
+-            <distortion model="ptlens" focal="19.9" a="0.002308" b="-0.003845" c="0" />
+-            <distortion model="ptlens" focal="22.3" a="0.003059" b="-0.0054" c="0" />
+-            <distortion model="ptlens" focal="23.7" a="0.006541" b="-0.012168" c="0" />
+-            <distortion model="ptlens" focal="31.9" a="0.004286" b="-0.006875" c="0" />
+-            <distortion model="ptlens" focal="37.7" a="0.004035" b="-0.005926" c="0" />
+-            <distortion model="ptlens" focal="44.7" a="0.00459" b="-0.007871" c="0" />
+-            <distortion model="ptlens" focal="52.4" a="0.000773" b="-0.00099" c="0" />
+-            <distortion model="ptlens" focal="61.5" a="0.001251" b="-0.002049" c="0" />
+-            <distortion model="ptlens" focal="71.2" a="0.004259" b="-0.007821" c="0" />
++            <distortion model="ptlens" focal="8.9" a="0.014425" b="-0.044782" c="0"/>
++            <distortion model="ptlens" focal="9" a="0.01501" b="-0.045355" c="0"/>
++            <distortion model="ptlens" focal="9.5" a="0.012659" b="-0.038385" c="0"/>
++            <distortion model="ptlens" focal="10.7" a="0.014239" b="-0.038035" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="0.007615" b="-0.020282" c="0"/>
++            <distortion model="ptlens" focal="14.7" a="0.004843" b="-0.012421" c="0"/>
++            <distortion model="ptlens" focal="15.7" a="0.008849" b="-0.018943" c="0"/>
++            <distortion model="ptlens" focal="17.8" a="0.002011" b="-0.004148" c="0"/>
++            <distortion model="ptlens" focal="19.9" a="0.002308" b="-0.003845" c="0"/>
++            <distortion model="ptlens" focal="22.3" a="0.003059" b="-0.0054" c="0"/>
++            <distortion model="ptlens" focal="23.7" a="0.006541" b="-0.012168" c="0"/>
++            <distortion model="ptlens" focal="31.9" a="0.004286" b="-0.006875" c="0"/>
++            <distortion model="ptlens" focal="37.7" a="0.004035" b="-0.005926" c="0"/>
++            <distortion model="ptlens" focal="44.7" a="0.00459" b="-0.007871" c="0"/>
++            <distortion model="ptlens" focal="52.4" a="0.000773" b="-0.00099" c="0"/>
++            <distortion model="ptlens" focal="61.5" a="0.001251" b="-0.002049" c="0"/>
++            <distortion model="ptlens" focal="71.2" a="0.004259" b="-0.007821" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>TC-E15ED (full tele)</model>
++        <model>E5700 &amp; compatibles, with TC-E15ED (full tele)</model>
++        <model lang="en">fixed lens, with TC-E15ED (full tele)</model>
++        <model lang="de">festes Objektiv, mit TC-E15ED (längste Brennw.)</model>
+         <mount>nikon5700</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="71.2" a="-0.000659" b="0.004458" c="0" />
++            <distortion model="ptlens" focal="71.2" a="-0.000659" b="0.004458" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E80 (full wide)</model>
++        <model>E5700 &amp; compatibles, with WC-E80 (full wide)</model>
++        <model lang="en">fixed lens, with WC-E80 (full wide)</model>
++        <model lang="de">festes Objektiv, mit WC-E80 (kürzeste Brennw.)</model>
+         <mount>nikon5700</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.9" a="0.016692" b="-0.060767" c="0" />
++            <distortion model="ptlens" focal="8.9" a="0.016692" b="-0.060767" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E7900 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon7900</mount>
+         <cropfactor>4.86</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.8" a="0.006962" b="-0.036546" c="0" />
+-            <distortion model="ptlens" focal="10.6" a="0" b="-0.009971" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="0" b="-0.005826" c="0" />
+-            <distortion model="ptlens" focal="14.9" a="0" b="-0.002714" c="0" />
+-            <distortion model="ptlens" focal="17" a="0" b="-0.002326" c="0" />
+-            <distortion model="ptlens" focal="21.3" a="0" b="-0.001355" c="0" />
+-            <distortion model="ptlens" focal="23.4" a="0" b="-0.000554" c="0" />
++            <distortion model="ptlens" focal="7.8" a="0.006962" b="-0.036546" c="0"/>
++            <distortion model="ptlens" focal="10.6" a="0" b="-0.009971" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="0" b="-0.005826" c="0"/>
++            <distortion model="ptlens" focal="14.9" a="0" b="-0.002714" c="0"/>
++            <distortion model="ptlens" focal="17" a="0" b="-0.002326" c="0"/>
++            <distortion model="ptlens" focal="21.3" a="0" b="-0.001355" c="0"/>
++            <distortion model="ptlens" focal="23.4" a="0" b="-0.000554" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E5400 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon5400</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0" b="0.009612" c="-0.058281" />
+-            <distortion model="ptlens" focal="6.5" a="0" b="0.017795" c="-0.060086" />
+-            <distortion model="ptlens" focal="7.2" a="0" b="0.016182" c="-0.04319" />
+-            <distortion model="ptlens" focal="8" a="0" b="0.017362" c="-0.038087" />
+-            <distortion model="ptlens" focal="9.5" a="0" b="0.027021" c="-0.054907" />
+-            <distortion model="ptlens" focal="11.1" a="0" b="0.013847" c="-0.023501" />
+-            <distortion model="ptlens" focal="12.6" a="0" b="0.009377" c="-0.009348" />
+-            <distortion model="ptlens" focal="14.5" a="0" b="0.011435" c="-0.007858" />
+-            <distortion model="ptlens" focal="16.7" a="0" b="0.014832" c="-0.017945" />
+-            <distortion model="ptlens" focal="18.8" a="0" b="0.010791" c="0" />
+-            <distortion model="ptlens" focal="21.1" a="0" b="0.010574" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="0.009755" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0" b="0.009612" c="-0.058281"/>
++            <distortion model="ptlens" focal="6.5" a="0" b="0.017795" c="-0.060086"/>
++            <distortion model="ptlens" focal="7.2" a="0" b="0.016182" c="-0.04319"/>
++            <distortion model="ptlens" focal="8" a="0" b="0.017362" c="-0.038087"/>
++            <distortion model="ptlens" focal="9.5" a="0" b="0.027021" c="-0.054907"/>
++            <distortion model="ptlens" focal="11.1" a="0" b="0.013847" c="-0.023501"/>
++            <distortion model="ptlens" focal="12.6" a="0" b="0.009377" c="-0.009348"/>
++            <distortion model="ptlens" focal="14.5" a="0" b="0.011435" c="-0.007858"/>
++            <distortion model="ptlens" focal="16.7" a="0" b="0.014832" c="-0.017945"/>
++            <distortion model="ptlens" focal="18.8" a="0" b="0.010791" c="0"/>
++            <distortion model="ptlens" focal="21.1" a="0" b="0.010574" c="0"/>
++            <distortion model="ptlens" focal="24" a="0" b="0.009755" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E80</model>
++        <model>E5400 &amp; compatibles, with WC-E80</model>
++        <model lang="en">fixed lens, with WC-E80</model>
++        <model lang="de">festes Objektiv, mit WC-E80</model>
+         <mount>nikon5400</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.02609" b="-0.086283" c="0" />
+-            <distortion model="ptlens" focal="6.5" a="0.016185" b="-0.057085" c="0" />
+-            <distortion model="ptlens" focal="7.2" a="0.012528" b="-0.043316" c="0" />
+-            <distortion model="ptlens" focal="9.5" a="0.006344" b="-0.019451" c="0" />
+-            <distortion model="ptlens" focal="11.8" a="0" b="-0.003078" c="0" />
+-            <distortion model="ptlens" focal="14.5" a="0" b="0.001104" c="0" />
+-            <distortion model="ptlens" focal="17.8" a="0" b="0.004936" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="0.00557" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.02609" b="-0.086283" c="0"/>
++            <distortion model="ptlens" focal="6.5" a="0.016185" b="-0.057085" c="0"/>
++            <distortion model="ptlens" focal="7.2" a="0.012528" b="-0.043316" c="0"/>
++            <distortion model="ptlens" focal="9.5" a="0.006344" b="-0.019451" c="0"/>
++            <distortion model="ptlens" focal="11.8" a="0" b="-0.003078" c="0"/>
++            <distortion model="ptlens" focal="14.5" a="0" b="0.001104" c="0"/>
++            <distortion model="ptlens" focal="17.8" a="0" b="0.004936" c="0"/>
++            <distortion model="ptlens" focal="24" a="0" b="0.00557" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E5000 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon5000</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="-0.009406" b="0.022592" c="-0.044771" />
+-            <distortion model="ptlens" focal="7.7" a="0.007336" b="-0.031746" c="0.010831" />
+-            <distortion model="ptlens" focal="9" a="-0.003338" b="0.004105" c="-0.020631" />
+-            <distortion model="ptlens" focal="9.7" a="0.005392" b="-0.021679" c="0.006308" />
+-            <distortion model="ptlens" focal="11.4" a="-0.001128" b="-0.001987" c="-0.005919" />
+-            <distortion model="ptlens" focal="12.4" a="-0.003078" b="0.002279" c="-0.005827" />
+-            <distortion model="ptlens" focal="14.9" a="9.5e-05" b="-0.005124" c="0.002716" />
+-            <distortion model="ptlens" focal="17.5" a="0.000795" b="-0.008614" c="0.009284" />
+-            <distortion model="ptlens" focal="18.8" a="0.000796" b="-0.008619" c="0.009289" />
+-            <distortion model="ptlens" focal="21.4" a="-0.000745" b="0.001506" c="-0.005233" />
++            <distortion model="ptlens" focal="7.1" a="-0.009406" b="0.022592" c="-0.044771"/>
++            <distortion model="ptlens" focal="7.7" a="0.007336" b="-0.031746" c="0.010831"/>
++            <distortion model="ptlens" focal="9" a="-0.003338" b="0.004105" c="-0.020631"/>
++            <distortion model="ptlens" focal="9.7" a="0.005392" b="-0.021679" c="0.006308"/>
++            <distortion model="ptlens" focal="11.4" a="-0.001128" b="-0.001987" c="-0.005919"/>
++            <distortion model="ptlens" focal="12.4" a="-0.003078" b="0.002279" c="-0.005827"/>
++            <distortion model="ptlens" focal="14.9" a="9.5e-05" b="-0.005124" c="0.002716"/>
++            <distortion model="ptlens" focal="17.5" a="0.000795" b="-0.008614" c="0.009284"/>
++            <distortion model="ptlens" focal="18.8" a="0.000796" b="-0.008619" c="0.009289"/>
++            <distortion model="ptlens" focal="21.4" a="-0.000745" b="0.001506" c="-0.005233"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E68 (full wide)</model>
++        <model>E5000 &amp; compatibles, with WC-E68 (full wide)</model>
++        <model lang="en">fixed lens, with WC-E68 (full wide)</model>
++        <model lang="de">festes Objektiv, mit WC-E68 (kürzeste Brennw.)</model>
+         <mount>nikon5000</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.026854" b="-0.077694" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.026854" b="-0.077694" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E4800 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon4800</mount>
+         <cropfactor>6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.010112" b="-0.033866" c="0" />
+-            <distortion model="ptlens" focal="9.6" a="0.009772" b="-0.009384" c="0" />
+-            <distortion model="ptlens" focal="14.2" a="0" b="0.019748" c="0" />
+-            <distortion model="ptlens" focal="20.4" a="0" b="0.021197" c="0" />
+-            <distortion model="ptlens" focal="32.4" a="0" b="0.019923" c="0" />
+-            <distortion model="ptlens" focal="38.8" a="0" b="0.013267" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.012609" c="0" />
++            <distortion model="ptlens" focal="6" a="0.010112" b="-0.033866" c="0"/>
++            <distortion model="ptlens" focal="9.6" a="0.009772" b="-0.009384" c="0"/>
++            <distortion model="ptlens" focal="14.2" a="0" b="0.019748" c="0"/>
++            <distortion model="ptlens" focal="20.4" a="0" b="0.021197" c="0"/>
++            <distortion model="ptlens" focal="32.4" a="0" b="0.019923" c="0"/>
++            <distortion model="ptlens" focal="38.8" a="0" b="0.013267" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.012609" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E995 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon995</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.2" a="0" b="-0.019966" c="0" />
+-            <distortion model="ptlens" focal="10.1" a="0" b="-0.010931" c="0" />
+-            <distortion model="ptlens" focal="13.6" a="0" b="-0.002049" c="0" />
+-            <distortion model="ptlens" focal="18.4" a="0" b="0.003845" c="0" />
+-            <distortion model="ptlens" focal="23.4" a="0" b="0.006884" c="0" />
+-            <distortion model="ptlens" focal="28.3" a="0" b="0.008666" c="0" />
+-            <distortion model="ptlens" focal="31" a="0" b="0.009298" c="0" />
++            <distortion model="poly3" focal="8.2" k1="-0.019966"/>
++            <distortion model="poly3" focal="10.1" k1="-0.010931"/>
++            <distortion model="poly3" focal="13.6" k1="-0.002049"/>
++            <distortion model="poly3" focal="18.4" k1="0.003845"/>
++            <distortion model="poly3" focal="23.4" k1="0.006884"/>
++            <distortion model="poly3" focal="28.3" k1="0.008666"/>
++            <distortion model="poly3" focal="31" k1="0.009298"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E63</model>
++        <model>E995 &amp; compatibles, with WC-E63</model>
++        <model lang="en">fixed lens, with WC-E63</model>
++        <model lang="de">festes Objektiv, mit WC-E63</model>
+         <mount>nikon995</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.2" a="0.017724" b="-0.0578" c="0" />
+-            <distortion model="ptlens" focal="8.8" a="0.012045" b="-0.044107" c="0" />
+-            <distortion model="ptlens" focal="9.1" a="0.00985" b="-0.040541" c="0" />
+-            <distortion model="ptlens" focal="9.6" a="0.006511" b="-0.030909" c="0" />
+-            <distortion model="ptlens" focal="9.8" a="0.007913" b="-0.03391" c="0" />
+-            <distortion model="ptlens" focal="10.3" a="0.003447" b="-0.023187" c="0" />
+-            <distortion model="ptlens" focal="11.2" a="0.004496" b="-0.02263" c="0" />
+-            <distortion model="ptlens" focal="11.7" a="0.002755" b="-0.017101" c="0" />
+-            <distortion model="ptlens" focal="12.9" a="0.002498" b="-0.014059" c="0" />
+-            <distortion model="ptlens" focal="13.6" a="0.000766" b="-0.009079" c="0" />
+-            <distortion model="ptlens" focal="15" a="0.000591" b="-0.005949" c="0" />
+-            <distortion model="ptlens" focal="16.9" a="-0.000905" b="0.000825" c="0" />
++            <distortion model="ptlens" focal="8.2" a="0.017724" b="-0.0578" c="0"/>
++            <distortion model="ptlens" focal="8.8" a="0.012045" b="-0.044107" c="0"/>
++            <distortion model="ptlens" focal="9.1" a="0.00985" b="-0.040541" c="0"/>
++            <distortion model="ptlens" focal="9.6" a="0.006511" b="-0.030909" c="0"/>
++            <distortion model="ptlens" focal="9.8" a="0.007913" b="-0.03391" c="0"/>
++            <distortion model="ptlens" focal="10.3" a="0.003447" b="-0.023187" c="0"/>
++            <distortion model="ptlens" focal="11.2" a="0.004496" b="-0.02263" c="0"/>
++            <distortion model="ptlens" focal="11.7" a="0.002755" b="-0.017101" c="0"/>
++            <distortion model="ptlens" focal="12.9" a="0.002498" b="-0.014059" c="0"/>
++            <distortion model="ptlens" focal="13.6" a="0.000766" b="-0.009079" c="0"/>
++            <distortion model="ptlens" focal="15" a="0.000591" b="-0.005949" c="0"/>
++            <distortion model="ptlens" focal="16.9" a="-0.000905" b="0.000825" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E24</model>
++        <model>E995 &amp; compatibles, with WC-E24</model>
++        <model lang="en">fixed lens, with WC-E24</model>
++        <model lang="de">festes Objektiv, mit WC-E24</model>
+         <mount>nikon995</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.2" a="0" b="-0.0377" c="0" />
+-            <distortion model="ptlens" focal="9" a="0" b="-0.0307" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="-0.026" c="0" />
+-            <distortion model="ptlens" focal="11" a="0" b="-0.0216" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="-0.0174" c="0" />
+-            <distortion model="ptlens" focal="13" a="0" b="-0.014" c="0" />
+-            <distortion model="ptlens" focal="14" a="0" b="-0.0105" c="0" />
+-            <distortion model="ptlens" focal="15" a="0" b="-0.0079" c="0" />
+-            <distortion model="ptlens" focal="16" a="0" b="-0.0053" c="0" />
+-            <distortion model="ptlens" focal="17" a="0" b="-0.00309" c="0" />
+-            <distortion model="ptlens" focal="18" a="0" b="-0.0012" c="0" />
+-            <distortion model="ptlens" focal="19" a="0" b="1.5e-05" c="0" />
+-            <distortion model="ptlens" focal="20" a="0" b="0.0018" c="0" />
+-            <distortion model="ptlens" focal="21" a="0" b="0.0028" c="0" />
+-            <distortion model="ptlens" focal="22" a="0" b="0.0038" c="0" />
+-            <distortion model="ptlens" focal="23" a="0" b="0.0044" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="0.0053" c="0" />
+-            <distortion model="ptlens" focal="25" a="0" b="0.00548" c="0" />
+-            <distortion model="ptlens" focal="26" a="0" b="0.006" c="0" />
+-            <distortion model="ptlens" focal="27" a="0" b="0.0064" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="0.0067" c="0" />
+-            <distortion model="ptlens" focal="29" a="0" b="0.0069" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.0073" c="0" />
+-            <distortion model="ptlens" focal="31" a="0" b="0.0078" c="0" />
+-            <distortion model="ptlens" focal="32" a="0" b="0.0081" c="0" />
++            <distortion model="poly3" focal="8.2" k1="-0.0377"/>
++            <distortion model="poly3" focal="9" k1="-0.0307"/>
++            <distortion model="poly3" focal="10" k1="-0.026"/>
++            <distortion model="poly3" focal="11" k1="-0.0216"/>
++            <distortion model="poly3" focal="12" k1="-0.0174"/>
++            <distortion model="poly3" focal="13" k1="-0.014"/>
++            <distortion model="poly3" focal="14" k1="-0.0105"/>
++            <distortion model="poly3" focal="15" k1="-0.0079"/>
++            <distortion model="poly3" focal="16" k1="-0.0053"/>
++            <distortion model="poly3" focal="17" k1="-0.00309"/>
++            <distortion model="poly3" focal="18" k1="-0.0012"/>
++            <distortion model="poly3" focal="19" k1="1.5e-05"/>
++            <distortion model="poly3" focal="20" k1="0.0018"/>
++            <distortion model="poly3" focal="21" k1="0.0028"/>
++            <distortion model="poly3" focal="22" k1="0.0038"/>
++            <distortion model="poly3" focal="23" k1="0.0044"/>
++            <distortion model="poly3" focal="24" k1="0.0053"/>
++            <distortion model="poly3" focal="25" k1="0.00548"/>
++            <distortion model="poly3" focal="26" k1="0.006"/>
++            <distortion model="poly3" focal="27" k1="0.0064"/>
++            <distortion model="poly3" focal="28" k1="0.0067"/>
++            <distortion model="poly3" focal="29" k1="0.0069"/>
++            <distortion model="poly3" focal="30" k1="0.0073"/>
++            <distortion model="poly3" focal="31" k1="0.0078"/>
++            <distortion model="poly3" focal="32" k1="0.0081"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>TC-E2</model>
++        <model>E995 &amp; compatibles, with TC-E2</model>
++        <model lang="en">fixed lens, with TC-E2</model>
++        <model lang="de">festes Objektiv, mit TC-E2</model>
+         <mount>nikon995</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0" b="0.0055" c="0" />
+-            <distortion model="ptlens" focal="15" a="0" b="0.0061" c="0" />
+-            <distortion model="ptlens" focal="16" a="0" b="0.0067" c="0" />
+-            <distortion model="ptlens" focal="17" a="0" b="0.0073" c="0" />
+-            <distortion model="ptlens" focal="18" a="0" b="0.0078" c="0" />
+-            <distortion model="ptlens" focal="19" a="0" b="0.0084" c="0" />
+-            <distortion model="ptlens" focal="20" a="0" b="0.0088" c="0" />
+-            <distortion model="ptlens" focal="21" a="0" b="0.0093" c="0" />
+-            <distortion model="ptlens" focal="22" a="0" b="0.0098" c="0" />
+-            <distortion model="ptlens" focal="23" a="0" b="0.0102" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="0.0106" c="0" />
+-            <distortion model="ptlens" focal="25" a="0" b="0.011" c="0" />
+-            <distortion model="ptlens" focal="26" a="0" b="0.0112" c="0" />
+-            <distortion model="ptlens" focal="27" a="0" b="0.0115" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="0.0116" c="0" />
+-            <distortion model="ptlens" focal="29" a="0" b="0.0118" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.0118" c="0" />
+-            <distortion model="ptlens" focal="31" a="0" b="0.0118" c="0" />
++            <distortion model="poly3" focal="14" k1="0.0055"/>
++            <distortion model="poly3" focal="15" k1="0.0061"/>
++            <distortion model="poly3" focal="16" k1="0.0067"/>
++            <distortion model="poly3" focal="17" k1="0.0073"/>
++            <distortion model="poly3" focal="18" k1="0.0078"/>
++            <distortion model="poly3" focal="19" k1="0.0084"/>
++            <distortion model="poly3" focal="20" k1="0.0088"/>
++            <distortion model="poly3" focal="21" k1="0.0093"/>
++            <distortion model="poly3" focal="22" k1="0.0098"/>
++            <distortion model="poly3" focal="23" k1="0.0102"/>
++            <distortion model="poly3" focal="24" k1="0.0106"/>
++            <distortion model="poly3" focal="25" k1="0.011"/>
++            <distortion model="poly3" focal="26" k1="0.0112"/>
++            <distortion model="poly3" focal="27" k1="0.0115"/>
++            <distortion model="poly3" focal="28" k1="0.0116"/>
++            <distortion model="poly3" focal="29" k1="0.0118"/>
++            <distortion model="poly3" focal="30" k1="0.0118"/>
++            <distortion model="poly3" focal="31" k1="0.0118"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E990 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon990</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.2" a="0.009323" b="-0.036014" c="0" />
+-            <distortion model="ptlens" focal="8.8" a="0.006981" b="-0.028396" c="0" />
+-            <distortion model="ptlens" focal="9.9" a="0.007066" b="-0.023481" c="0" />
+-            <distortion model="ptlens" focal="10.7" a="0.004841" b="-0.017212" c="0" />
+-            <distortion model="ptlens" focal="11.6" a="-0.000649" b="-0.003458" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="0.002233" b="-0.005998" c="0" />
+-            <distortion model="ptlens" focal="13.5" a="0.002265" b="-0.004391" c="0" />
+-            <distortion model="ptlens" focal="14.6" a="0.004307" b="-0.006345" c="0" />
+-            <distortion model="ptlens" focal="15.5" a="0.003109" b="-0.003799" c="0" />
+-            <distortion model="ptlens" focal="16.3" a="0.001762" b="0.001325" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0.002518" b="-0.000226" c="0" />
+-            <distortion model="ptlens" focal="18.2" a="0.001309" b="0.004015" c="0" />
+-            <distortion model="ptlens" focal="19.1" a="0.000967" b="0.005566" c="0" />
+-            <distortion model="ptlens" focal="20.2" a="0.001772" b="0.004291" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.000183" b="0.007835" c="0" />
+-            <distortion model="ptlens" focal="21.6" a="0.002632" b="0.004132" c="0" />
+-            <distortion model="ptlens" focal="22.2" a="0.000101" b="0.009482" c="0" />
+-            <distortion model="ptlens" focal="22.8" a="-0.001457" b="0.012402" c="0" />
+-            <distortion model="ptlens" focal="23.4" a="1.9e-05" b="0.009522" c="0" />
++            <distortion model="ptlens" focal="8.2" a="0.009323" b="-0.036014" c="0"/>
++            <distortion model="ptlens" focal="8.8" a="0.006981" b="-0.028396" c="0"/>
++            <distortion model="ptlens" focal="9.9" a="0.007066" b="-0.023481" c="0"/>
++            <distortion model="ptlens" focal="10.7" a="0.004841" b="-0.017212" c="0"/>
++            <distortion model="ptlens" focal="11.6" a="-0.000649" b="-0.003458" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="0.002233" b="-0.005998" c="0"/>
++            <distortion model="ptlens" focal="13.5" a="0.002265" b="-0.004391" c="0"/>
++            <distortion model="ptlens" focal="14.6" a="0.004307" b="-0.006345" c="0"/>
++            <distortion model="ptlens" focal="15.5" a="0.003109" b="-0.003799" c="0"/>
++            <distortion model="ptlens" focal="16.3" a="0.001762" b="0.001325" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0.002518" b="-0.000226" c="0"/>
++            <distortion model="ptlens" focal="18.2" a="0.001309" b="0.004015" c="0"/>
++            <distortion model="ptlens" focal="19.1" a="0.000967" b="0.005566" c="0"/>
++            <distortion model="ptlens" focal="20.2" a="0.001772" b="0.004291" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.000183" b="0.007835" c="0"/>
++            <distortion model="ptlens" focal="21.6" a="0.002632" b="0.004132" c="0"/>
++            <distortion model="ptlens" focal="22.2" a="0.000101" b="0.009482" c="0"/>
++            <distortion model="ptlens" focal="22.8" a="-0.001457" b="0.012402" c="0"/>
++            <distortion model="ptlens" focal="23.4" a="1.9e-05" b="0.009522" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>WC-E63</model>
++        <model>E990 &amp; compatibles, with WC-E63</model>
++        <model lang="en">fixed lens, with WC-E63</model>
++        <model lang="de">festes Objektiv, mit WC-E63</model>
+         <mount>nikon990</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="8.2" a="0.027148" b="-0.073181" c="0" />
++            <distortion model="ptlens" focal="8.2" a="0.027148" b="-0.073181" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>E950 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikon950</mount>
+         <cropfactor>5.408</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0" b="-0.017" c="0" />
+-            <distortion model="ptlens" focal="8" a="0" b="-0.013" c="0" />
+-            <distortion model="ptlens" focal="9" a="0" b="-0.0095" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="-0.006" c="0" />
+-            <distortion model="ptlens" focal="11" a="0" b="-0.003" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="13" a="0" b="0.002" c="0" />
+-            <distortion model="ptlens" focal="14" a="0" b="0.0045" c="0" />
+-            <distortion model="ptlens" focal="15" a="0" b="0.0065" c="0" />
+-            <distortion model="ptlens" focal="16" a="0" b="0.008" c="0" />
+-            <distortion model="ptlens" focal="17" a="0" b="0.009" c="0" />
+-            <distortion model="ptlens" focal="18" a="0" b="0.0102" c="0" />
+-            <distortion model="ptlens" focal="19" a="0" b="0.011" c="0" />
+-            <distortion model="ptlens" focal="20" a="0" b="0.0114" c="0" />
+-            <distortion model="ptlens" focal="21" a="0" b="0.0116" c="0" />
++            <distortion model="poly3" focal="7" k1="-0.017"/>
++            <distortion model="poly3" focal="8" k1="-0.013"/>
++            <distortion model="poly3" focal="9" k1="-0.0095"/>
++            <distortion model="poly3" focal="10" k1="-0.006"/>
++            <distortion model="poly3" focal="11" k1="-0.003"/>
++            <distortion model="poly3" focal="12" k1="0"/>
++            <distortion model="poly3" focal="13" k1="0.002"/>
++            <distortion model="poly3" focal="14" k1="0.0045"/>
++            <distortion model="poly3" focal="15" k1="0.0065"/>
++            <distortion model="poly3" focal="16" k1="0.008"/>
++            <distortion model="poly3" focal="17" k1="0.009"/>
++            <distortion model="poly3" focal="18" k1="0.0102"/>
++            <distortion model="poly3" focal="19" k1="0.011"/>
++            <distortion model="poly3" focal="20" k1="0.0114"/>
++            <distortion model="poly3" focal="21" k1="0.0116"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
+-        <mount>nikon60</mount>
++        <model>Coolpix P60 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>nikonP60</mount>
+         <cropfactor>5.62</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.4" a="0.01144" b="-0.05486" c="0.02864" />
+-            <distortion model="ptlens" focal="7.5" a="0.01046" b="-0.03608" c="0.01364" />
+-            <distortion model="ptlens" focal="8.8" a="0.01059" b="-0.03248" c="0.01726" />
+-            <distortion model="ptlens" focal="10.4" a="0.01115" b="-0.02963" c="0.01704" />
+-            <distortion model="ptlens" focal="12.2" a="-0.00319" b="0.01344" c="-0.01893" />
+-            <distortion model="ptlens" focal="16.8" a="-0.00414" b="0.01633" c="-0.01256" />
+-            <distortion model="ptlens" focal="23.2" a="0.00325" b="0.00014" c="-0.00351" />
+-            <distortion model="ptlens" focal="32" a="0.01901" b="-0.04013" c="0.02487" />
++            <distortion model="ptlens" focal="6.4" a="0.01144" b="-0.05486" c="0.02864"/>
++            <distortion model="ptlens" focal="7.5" a="0.01046" b="-0.03608" c="0.01364"/>
++            <distortion model="ptlens" focal="8.8" a="0.01059" b="-0.03248" c="0.01726"/>
++            <distortion model="ptlens" focal="10.4" a="0.01115" b="-0.02963" c="0.01704"/>
++            <distortion model="ptlens" focal="12.2" a="-0.00319" b="0.01344" c="-0.01893"/>
++            <distortion model="ptlens" focal="16.8" a="-0.00414" b="0.01633" c="-0.01256"/>
++            <distortion model="ptlens" focal="23.2" a="0.00325" b="0.00014" c="-0.00351"/>
++            <distortion model="ptlens" focal="32" a="0.01901" b="-0.04013" c="0.02487"/>
+             <!-- TCA and vignetting doesn't matter for this camera. -->
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Standard</model>
++        <model>Coolpix P330 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>nikonP330</mount>
+         <cropfactor>4.706</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.1" a="0.0176" b="-0.07831" c="-0.03885" />
+-            <distortion model="ptlens" focal="6" a="0.01418" b="-0.06625" c="-0.02427" />
+-            <distortion model="ptlens" focal="7.5" a="0.00127" b="-0.01984" c="-0.02692" />
+-            <distortion model="ptlens" focal="10.7" a="-0.00235" b="0.00566" c="-0.03388" />
+-            <distortion model="ptlens" focal="18.2" b="-0.00243" />
+-            <distortion model="ptlens" focal="22.4" b="-0.00077" />
+-            <distortion model="ptlens" focal="25.5" b="0.00023" />
+-            <tca model="poly3" focal="5.1" br="0.0005094" vr="0.9997604" bb="-0.0007459" vb="1.0013662" />
+-            <tca model="poly3" focal="6" br="0.0003130" vr="0.9998362" bb="-0.0006603" vb="1.0013404" />
+-            <tca model="poly3" focal="7.5" br="0.0001122" vr="0.9999132" bb="-0.0004930" vb="1.0013154" />
+-            <tca model="poly3" focal="10.7" br="0.0000194" vr="0.9999687" bb="-0.0003203" vb="1.0011665" />
+-            <tca model="poly3" focal="18.2" br="-0.0000083" vr="1.0001021" bb="-0.0000163" vb="1.0004001" />
+-            <tca model="poly3" focal="22.4" br="-0.0000270" vr="1.0001445" bb="-0.0000302" vb="1.0002259" />
+-            <tca model="poly3" focal="25.5" br="0.0000262" vr="1.0000900" bb="-0.0000026" vb="1.0001305" />
++            <distortion model="ptlens" focal="5.1" a="0.0176" b="-0.07831" c="-0.03885"/>
++            <distortion model="ptlens" focal="6" a="0.01418" b="-0.06625" c="-0.02427"/>
++            <distortion model="ptlens" focal="7.5" a="0.00127" b="-0.01984" c="-0.02692"/>
++            <distortion model="ptlens" focal="10.7" a="-0.00235" b="0.00566" c="-0.03388"/>
++            <distortion model="ptlens" focal="18.2" b="-0.00243"/>
++            <distortion model="ptlens" focal="22.4" b="-0.00077"/>
++            <distortion model="ptlens" focal="25.5" b="0.00023"/>
++            <tca model="poly3" focal="5.1" br="0.0005094" vr="0.9997604" bb="-0.0007459" vb="1.0013662"/>
++            <tca model="poly3" focal="6" br="0.0003130" vr="0.9998362" bb="-0.0006603" vb="1.0013404"/>
++            <tca model="poly3" focal="7.5" br="0.0001122" vr="0.9999132" bb="-0.0004930" vb="1.0013154"/>
++            <tca model="poly3" focal="10.7" br="0.0000194" vr="0.9999687" bb="-0.0003203" vb="1.0011665"/>
++            <tca model="poly3" focal="18.2" br="-0.0000083" vr="1.0001021" bb="-0.0000163" vb="1.0004001"/>
++            <tca model="poly3" focal="22.4" br="-0.0000270" vr="1.0001445" bb="-0.0000302" vb="1.0002259"/>
++            <tca model="poly3" focal="25.5" br="0.0000262" vr="1.0000900" bb="-0.0000026" vb="1.0001305"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Coolpix S3300 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>nikonS3300</mount>
++        <cropfactor>5.65</cropfactor>
++        <calibration>
++            <!-- Bogus calibration entries, just to document that the
++                 camera-correction does a perfect job. -->
++            <distortion model="poly3" focal="4.6"/>
++            <distortion model="poly3" focal="27.6"/>
++            <tca model="poly3" focal="4.6"/>
++            <tca model="poly3" focal="27.6"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Coolpix P7000 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>nikonP7000</mount>
++        <cropfactor>4.69</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6" a="0.01246" b="-0.02848" c="-0.02244"/>
++            <distortion model="ptlens" focal="8.8" a="0.01448" b="-0.03373" c="0.0304"/>
++            <distortion model="ptlens" focal="16.3" a="0" b="0.01025" c="0"/>
++            <distortion model="ptlens" focal="42.6" a="0" b="0.00694" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Coolpix A &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>nikonA</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="18.5" a="0.00611" b="-0.01026" c="-0.01844"/>
++            <tca model="poly3" focal="18.5" vr="1.0000922" vb="1.0000229"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Coolpix P7800 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>nikonP7800</mount>
++        <cropfactor>4.67</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon Coolpix P7800 -->
++            <distortion model="ptlens" focal="6" a="-0.00644" b="-0.01027" c="0.01753"/>
++            <distortion model="ptlens" focal="7" a="-0.00228" b="-0.01209" c="0.03087"/>
++            <distortion model="ptlens" focal="8.2" a="-0.00585" b="0.00803" c="0.01475"/>
++            <distortion model="ptlens" focal="9.9" a="-0.00442" b="0.01551" c="-0.00154"/>
++            <distortion model="ptlens" focal="12.5" a="0.01527" b="-0.06092" c="0.09903"/>
++            <distortion model="ptlens" focal="15.9" a="-0.00529" b="0.00731" c="0.02763"/>
++            <distortion model="ptlens" focal="19.7" a="0.00713" b="-0.02789" c="0.05207"/>
++            <distortion model="ptlens" focal="25" a="-0.00902" b="0.0241" c="-0.00347"/>
++            <distortion model="ptlens" focal="32.6" a="-0.00725" b="0.01842" c="-0.00119"/>
++            <distortion model="ptlens" focal="42.8" a="-0.00937" b="0.02926" c="-0.00796"/>
++            <tca model="poly3" focal="6" vr="1.0001746" vb="1.0002787"/>
++            <tca model="poly3" focal="7" vr="1.0001291" vb="1.0002796"/>
++            <tca model="poly3" focal="8.2" vr="1.0001035" vb="1.0002686"/>
++            <tca model="poly3" focal="9.9" vr="1.0001177" vb="1.0002300"/>
++            <tca model="poly3" focal="12.5" vr="1.0001136" vb="1.0001188"/>
++            <tca model="poly3" focal="15.9" vr="1.0001461" vb="1.0000067"/>
++            <tca model="poly3" focal="19.7" vr="1.0001575" vb="0.9998596"/>
++            <tca model="poly3" focal="25" vr="1.0001193" vb="0.9996409"/>
++            <tca model="poly3" focal="32.6" vr="1.0000405" vb="0.9994710"/>
++            <tca model="poly3" focal="42.8" vr="0.9997493" vb="0.9998575"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-olympus.xml b/data/db/compact-olympus.xml
+--- a/data/db/compact-olympus.xml	2013-06-23 12:17:14.000000000 +0200
++++ b/data/db/compact-olympus.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,556 +1,613 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>olympus8080</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympus2040</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusStylusV</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympus700</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympus750</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusC50</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympus4000</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusEpic</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympus5060</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusC860</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympus7000</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusSP350</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusSP500uz</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>olympusSP560uz</name>
+-        <compat>Generic</compat>
+-    </mount>
+-    
+-    <mount>
+-        <name>olympusxz1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>OLYMPUS CORPORATION</maker>
++        <maker>Olympus Corporation</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C8080WZ</model>
++        <model lang="en">C-8080 Wide Zoom</model>
+         <mount>olympus8080</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>u-miniD,Stylus V</model>
+-        <variant>Stylus Verve S</variant>
++        <model lang="en">µ-mini Digital</model>
+         <mount>olympusStylusV</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>u-miniD,Stylus V</model>
++        <model lang="en">Stylus Verve Digital</model>
++        <!-- The following line is necessary so that Lensfun regards this as an
++             enry of its own. -->
++        <variant>variant of the µ-mini Digital</variant>
++        <mount>olympusStylusV</mount>
++        <cropfactor>6.0</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C70Z,C7000Z</model>
++        <model lang="en">C-70 Zoom, C-7000 Zoom</model>
+         <mount>olympus7000</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C4100Z,C4000Z</model>
++        <model lang="en">C-4000 Zoom, C-4100 Zoom</model>
+         <mount>olympus4000</mount>
+         <cropfactor>4.92</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+-        <model>C4100Z,C4000Z</model>
+-        <mount>olympus4000</mount>
+-        <cropfactor>4.8</cropfactor>
++        <model>X-2,C-50Z</model>
++        <model lang="en">X-2</model>
++        <mount>olympusC50</mount>
++        <cropfactor>4.9</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>X-2,C-50Z</model>
++        <model lang="en">C-50 Zoom</model>
++        <!-- The following line is necessary so that Lensfun regards this as an
++             enry of its own. -->
++        <variant>variant of the X-2</variant>
+         <mount>olympusC50</mount>
+         <cropfactor>4.9</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C750UZ</model>
++        <model lang="en">C-750 Ultra Zoom</model>
+         <mount>olympus750</mount>
+         <cropfactor>6.03</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C730UZ</model>
++        <model lang="en">C-730 Ultra Zoom</model>
+         <mount>olympus700</mount>
+         <cropfactor>6.52</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C700UZ</model>
++        <model lang="en">C-700 Ultra Zoom</model>
+         <mount>olympus700</mount>
+         <cropfactor>6.52</cropfactor>
+     </camera>
+-
+-    <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
+-        <maker lang="en">Olympus</maker>
+-        <model>C7070WZ</model>
+-        <mount>olympus5060</mount>
+-        <cropfactor>4.930</cropfactor>
+-    </camera>
+-
+     <camera>
+-        <maker>OLYMPUS CORPORATION</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C7070WZ</model>
++        <model lang="en">C-7070 Wide Zoom</model>
+         <mount>olympus5060</mount>
+         <cropfactor>4.930</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS CORPORATION</maker>
++        <maker>Olympus Corporation</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C5060WZ</model>
++        <model lang="en">C-5060 Wide Zoom</model>
+         <mount>olympus5060</mount>
+         <cropfactor>4.930</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C5050Z</model>
++        <model lang="en">C-5050 Zoom</model>
+         <mount>olympus2040</mount>
+         <cropfactor>4.930</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C4040Z</model>
++        <model lang="en">C-4040 Zoom</model>
+         <mount>olympus2040</mount>
+         <cropfactor>4.930</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C3040Z</model>
++        <model lang="en">C-3040 Zoom</model>
+         <mount>olympus2040</mount>
+         <cropfactor>4.930</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C2040Z</model>
++        <model lang="en">C-2040 Zoom</model>
+         <mount>olympus2040</mount>
+         <cropfactor>4.930</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>C860L,D360L</model>
++        <model lang="en">C-860L</model>
++        <mount>olympusC860</mount>
++        <cropfactor>6.563</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Optical Co.,Ltd</maker>
++        <maker lang="en">Olympus</maker>
++        <model>C860L,D360L</model>
++        <model lang="en">D-360L</model>
++        <!-- The following line is necessary so that Lensfun regards this as an
++             enry of its own. -->
++        <variant>variant of the C-860L</variant>
+         <mount>olympusC860</mount>
+         <cropfactor>6.563</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Olympus</maker>
+         <model>mju-II</model>
++        <model lang="en">µ-II</model>
+         <mount>olympusEpic</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Olympus</maker>
+         <model>Stylus Epic</model>
+         <mount>olympusEpic</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>SP350</model>
++        <model lang="en">SP-350</model>
+         <mount>olympusSP350</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>SP500UZ</model>
++        <model lang="en">SP-500 Ultra Zoom</model>
+         <mount>olympusSP500</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>SP560UZ</model>
++        <model lang="en">SP-560 Ultra Zoom</model>
+         <mount>olympusSP560</mount>
+         <cropfactor>5.8</cropfactor>
+     </camera>
+-    
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>XZ-1</model>
+         <mount>olympusxz1</mount>
+         <cropfactor>4.68</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>XZ-2</model>
++        <mount>olympusxz1</mount>
++        <cropfactor>4.68</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>Stylus1</model>
++        <model lang="en">Stylus 1</model>
++        <mount>olympusStylus1</mount>
++        <cropfactor>4.67</cropfactor>
++    </camera>
++    <camera>
++        <!-- This is an alias of the previous entry.  The new firmware of the
++             Stylus 1 even identifies the Stylus 1 as "Stylus 1,1s". -->
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>Stylus1,1s</model>
++        <model lang="en">Stylus 1, 1s</model>
++        <mount>olympusStylus1</mount>
++        <cropfactor>4.67</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Corporation</maker>
++        <maker lang="en">Olympus</maker>
++        <model>TG-1</model>
++        <model lang="en">Stylus TG-1</model>
++        <mount>olympusStylusTG4</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Corporation</maker>
++        <maker lang="en">Olympus</maker>
++        <model>TG-2</model>
++        <model lang="en">Stylus TG-2</model>
++        <mount>olympusStylusTG4</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Corporation</maker>
++        <maker lang="en">Olympus</maker>
++        <model>TG-3</model>
++        <model lang="en">Stylus TG-3</model>
++        <mount>olympusStylusTG4</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Corporation</maker>
++        <maker lang="en">Olympus</maker>
++        <model>TG-4</model>
++        <model lang="en">Stylus TG-4</model>
++        <mount>olympusStylusTG4</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C8080WZ &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus8080</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.013182" b="-0.036019" c="0" />
+-            <distortion model="ptlens" focal="8.4" a="0.007334" b="-0.017216" c="0" />
+-            <distortion model="ptlens" focal="10.7" a="0.001287" b="0.004729" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="0.006157" b="-0.005368" c="0" />
+-            <distortion model="ptlens" focal="15.8" a="0.001207" b="0.003221" c="0" />
+-            <distortion model="ptlens" focal="20.6" a="0.003286" b="0.001466" c="0" />
+-            <distortion model="ptlens" focal="27.1" a="0.004701" b="-0.005662" c="0" />
+-            <distortion model="ptlens" focal="31.9" a="-0.00563" b="0.017601" c="0" />
+-            <distortion model="ptlens" focal="35.6" a="0.013081" b="-0.014879" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.013182" b="-0.036019" c="0"/>
++            <distortion model="ptlens" focal="8.4" a="0.007334" b="-0.017216" c="0"/>
++            <distortion model="ptlens" focal="10.7" a="0.001287" b="0.004729" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="0.006157" b="-0.005368" c="0"/>
++            <distortion model="ptlens" focal="15.8" a="0.001207" b="0.003221" c="0"/>
++            <distortion model="ptlens" focal="20.6" a="0.003286" b="0.001466" c="0"/>
++            <distortion model="ptlens" focal="27.1" a="0.004701" b="-0.005662" c="0"/>
++            <distortion model="ptlens" focal="31.9" a="-0.00563" b="0.017601" c="0"/>
++            <distortion model="ptlens" focal="35.6" a="0.013081" b="-0.014879" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>Stylus V &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympusStylusV</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.95" a="0" b="-0.015907" c="0" />
+-            <distortion model="ptlens" focal="6.76" a="0" b="-0.01018" c="0" />
+-            <distortion model="ptlens" focal="8.02" a="0" b="-0.005811" c="0" />
+-            <distortion model="ptlens" focal="9.34" a="0" b="-0.004323" c="0" />
+-            <distortion model="ptlens" focal="10.65" a="0" b="-0.002622" c="0" />
+-            <distortion model="ptlens" focal="11.52" a="0" b="-0.001258" c="0" />
++            <distortion model="poly3" focal="5.95" k1="-0.015907"/>
++            <distortion model="poly3" focal="6.76" k1="-0.01018"/>
++            <distortion model="poly3" focal="8.02" k1="-0.005811"/>
++            <distortion model="poly3" focal="9.34" k1="-0.004323"/>
++            <distortion model="poly3" focal="10.65" k1="-0.002622"/>
++            <distortion model="poly3" focal="11.52" k1="-0.001258"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C7000Z &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus7000</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.9" a="0.008728" b="-0.032692" c="0" />
+-            <distortion model="ptlens" focal="10.4" a="0.004014" b="-0.012678" c="0" />
+-            <distortion model="ptlens" focal="11.2" a="0.000366" b="-0.004663" c="0" />
+-            <distortion model="ptlens" focal="12.1" a="0" b="-0.002819" c="0" />
+-            <distortion model="ptlens" focal="14.3" a="0" b="-0.002892" c="0" />
+-            <distortion model="ptlens" focal="17.1" a="0" b="-0.002579" c="0" />
+-            <distortion model="ptlens" focal="18.7" a="0" b="-0.002406" c="0" />
+-            <distortion model="ptlens" focal="22.3" a="0" b="-0.000464" c="0" />
+-            <distortion model="ptlens" focal="31.3" a="0" b="0.005551" c="0" />
+-            <distortion model="ptlens" focal="39.5" a="0" b="0.00644" c="0" />
++            <distortion model="ptlens" focal="7.9" a="0.008728" b="-0.032692" c="0"/>
++            <distortion model="ptlens" focal="10.4" a="0.004014" b="-0.012678" c="0"/>
++            <distortion model="ptlens" focal="11.2" a="0.000366" b="-0.004663" c="0"/>
++            <distortion model="ptlens" focal="12.1" a="0" b="-0.002819" c="0"/>
++            <distortion model="ptlens" focal="14.3" a="0" b="-0.002892" c="0"/>
++            <distortion model="ptlens" focal="17.1" a="0" b="-0.002579" c="0"/>
++            <distortion model="ptlens" focal="18.7" a="0" b="-0.002406" c="0"/>
++            <distortion model="ptlens" focal="22.3" a="0" b="-0.000464" c="0"/>
++            <distortion model="ptlens" focal="31.3" a="0" b="0.005551" c="0"/>
++            <distortion model="ptlens" focal="39.5" a="0" b="0.00644" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C4000Z &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus4000</mount>
+         <cropfactor>4.92</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.8" a="0.021642" b="-0.049919" c="0" />
+-            <distortion model="ptlens" focal="7.3" a="0.019191" b="-0.041291" c="0" />
+-            <distortion model="ptlens" focal="7.7" a="0.016704" b="-0.034647" c="0" />
+-            <distortion model="ptlens" focal="8.5" a="0.007519" b="-0.013786" c="0" />
+-            <distortion model="ptlens" focal="9.6" a="0.010265" b="-0.014702" c="0" />
+-            <distortion model="ptlens" focal="11.5" a="0.008528" b="-0.008361" c="0" />
+-            <distortion model="ptlens" focal="13.9" a="0.007456" b="-0.006165" c="0" />
+-            <distortion model="ptlens" focal="14.8" a="0" b="0.006037" c="0" />
+-            <distortion model="ptlens" focal="19.1" a="0" b="0.004666" c="0" />
++            <distortion model="ptlens" focal="6.8" a="0.021642" b="-0.049919" c="0"/>
++            <distortion model="ptlens" focal="7.3" a="0.019191" b="-0.041291" c="0"/>
++            <distortion model="ptlens" focal="7.7" a="0.016704" b="-0.034647" c="0"/>
++            <distortion model="ptlens" focal="8.5" a="0.007519" b="-0.013786" c="0"/>
++            <distortion model="ptlens" focal="9.6" a="0.010265" b="-0.014702" c="0"/>
++            <distortion model="ptlens" focal="11.5" a="0.008528" b="-0.008361" c="0"/>
++            <distortion model="ptlens" focal="13.9" a="0.007456" b="-0.006165" c="0"/>
++            <distortion model="ptlens" focal="14.8" a="0" b="0.006037" c="0"/>
++            <distortion model="ptlens" focal="19.1" a="0" b="0.004666" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>A-28 iS/L Converter</model>
++        <model>C4000Z &amp; compatibles, with A-28 iS/L converter</model>
++        <model lang="en">fixed lens, with A-28 iS/L converter</model>
++        <model lang="de">festes Objektiv, mit A-28 iS/L-Konverter</model>
+         <mount>olympus4000</mount>
+         <cropfactor>4.92</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.8" a="0.033" b="-0.072996" c="0" />
+-            <distortion model="ptlens" focal="8.5" a="0.018055" b="-0.035714" c="0" />
+-            <distortion model="ptlens" focal="9.6" a="0.011346" b="-0.019011" c="0" />
+-            <distortion model="ptlens" focal="10.7" a="0" b="0.005155" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="0.005255" c="0" />
+-            <distortion model="ptlens" focal="13.1" a="0" b="0.005363" c="0" />
+-            <distortion model="ptlens" focal="14.8" a="0" b="0.004901" c="0" />
+-            <distortion model="ptlens" focal="19.9" a="0" b="0.004447" c="0" />
++            <distortion model="ptlens" focal="6.8" a="0.033" b="-0.072996" c="0"/>
++            <distortion model="ptlens" focal="8.5" a="0.018055" b="-0.035714" c="0"/>
++            <distortion model="ptlens" focal="9.6" a="0.011346" b="-0.019011" c="0"/>
++            <distortion model="ptlens" focal="10.7" a="0" b="0.005155" c="0"/>
++            <distortion model="ptlens" focal="12" a="0" b="0.005255" c="0"/>
++            <distortion model="ptlens" focal="13.1" a="0" b="0.005363" c="0"/>
++            <distortion model="ptlens" focal="14.8" a="0" b="0.004901" c="0"/>
++            <distortion model="ptlens" focal="19.9" a="0" b="0.004447" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C-50Z &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympusC50</mount>
+         <cropfactor>4.9</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.8" a="0" b="-0.013352" c="0" />
+-            <distortion model="ptlens" focal="9.04" a="0" b="-0.011264" c="0" />
+-            <distortion model="ptlens" focal="10.59" a="0" b="-0.008279" c="0" />
+-            <distortion model="ptlens" focal="12.36" a="0" b="-0.004946" c="0" />
+-            <distortion model="ptlens" focal="18.83" a="0" b="-0.002577" c="0" />
+-            <distortion model="ptlens" focal="21.64" a="0" b="-0.001835" c="0" />
+-            <distortion model="ptlens" focal="23.4" a="0" b="-0.001201" c="0" />
++            <distortion model="poly3" focal="7.8" k1="-0.013352"/>
++            <distortion model="poly3" focal="9.04" k1="-0.011264"/>
++            <distortion model="poly3" focal="10.59" k1="-0.008279"/>
++            <distortion model="poly3" focal="12.36" k1="-0.004946"/>
++            <distortion model="poly3" focal="18.83" k1="-0.002577"/>
++            <distortion model="poly3" focal="21.64" k1="-0.001835"/>
++            <distortion model="poly3" focal="23.4" k1="-0.001201"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C750UZ &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus750</mount>
+         <cropfactor>6.03</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.3" a="0.014396" b="-0.03198" c="0" />
+-            <distortion model="ptlens" focal="8.6" a="0.004455" b="-0.008915" c="0" />
+-            <distortion model="ptlens" focal="10.4" a="0.000123" b="-0.001324" c="0" />
+-            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="52.4" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="57.1" a="0" b="0.001557" c="0" />
+-            <distortion model="ptlens" focal="63" a="0" b="0.004464" c="0" />
++            <distortion model="ptlens" focal="6.3" a="0.014396" b="-0.03198" c="0"/>
++            <distortion model="ptlens" focal="8.6" a="0.004455" b="-0.008915" c="0"/>
++            <distortion model="ptlens" focal="10.4" a="0.000123" b="-0.001324" c="0"/>
++            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="52.4" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="57.1" a="0" b="0.001557" c="0"/>
++            <distortion model="ptlens" focal="63" a="0" b="0.004464" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C700UZ &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus700</mount>
+         <cropfactor>6.52</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.9" a="0.02035" b="-0.054079" c="0" />
+-            <distortion model="ptlens" focal="6.9" a="0.014877" b="-0.033764" c="0" />
+-            <distortion model="ptlens" focal="10" a="0.008152" b="-0.016493" c="0" />
+-            <distortion model="ptlens" focal="13.7" a="0" b="-0.001382" c="0" />
+-            <distortion model="ptlens" focal="17.3" a="0" b="-0.002491" c="0" />
+-            <distortion model="ptlens" focal="23.7" a="0" b="-0.002448" c="0" />
+-            <distortion model="ptlens" focal="32.4" a="0" b="-0.004102" c="0" />
+-            <distortion model="ptlens" focal="58" a="0" b="-0" c="0" />
++            <distortion model="ptlens" focal="5.9" a="0.02035" b="-0.054079" c="0"/>
++            <distortion model="ptlens" focal="6.9" a="0.014877" b="-0.033764" c="0"/>
++            <distortion model="ptlens" focal="10" a="0.008152" b="-0.016493" c="0"/>
++            <distortion model="ptlens" focal="13.7" a="0" b="-0.001382" c="0"/>
++            <distortion model="ptlens" focal="17.3" a="0" b="-0.002491" c="0"/>
++            <distortion model="ptlens" focal="23.7" a="0" b="-0.002448" c="0"/>
++            <distortion model="ptlens" focal="32.4" a="0" b="-0.004102" c="0"/>
++            <distortion model="ptlens" focal="58" a="0" b="-0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C2040Z &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus2040</mount>
+         <cropfactor>4.930</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.018282" b="-0.052125" c="0" />
+-            <distortion model="ptlens" focal="7.9" a="0.019487" b="-0.050797" c="0" />
+-            <distortion model="ptlens" focal="8.2" a="0.012667" b="-0.033455" c="0" />
+-            <distortion model="ptlens" focal="8.4" a="0.007855" b="-0.023699" c="0" />
+-            <distortion model="ptlens" focal="8.7" a="0.012867" b="-0.032007" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0.000566" b="-0.004599" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="0.007423" b="-0.014208" c="0" />
+-            <distortion model="ptlens" focal="13.2" a="-0.002075" b="0.005545" c="0" />
+-            <distortion model="ptlens" focal="15" a="-0.004884" b="0.014178" c="0" />
+-            <distortion model="ptlens" focal="17.6" a="-0.013836" b="0.033711" c="0" />
+-            <distortion model="ptlens" focal="21.3" a="0.000657" b="0.002024" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.018282" b="-0.052125" c="0"/>
++            <distortion model="ptlens" focal="7.9" a="0.019487" b="-0.050797" c="0"/>
++            <distortion model="ptlens" focal="8.2" a="0.012667" b="-0.033455" c="0"/>
++            <distortion model="ptlens" focal="8.4" a="0.007855" b="-0.023699" c="0"/>
++            <distortion model="ptlens" focal="8.7" a="0.012867" b="-0.032007" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0.000566" b="-0.004599" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="0.007423" b="-0.014208" c="0"/>
++            <distortion model="ptlens" focal="13.2" a="-0.002075" b="0.005545" c="0"/>
++            <distortion model="ptlens" focal="15" a="-0.004884" b="0.014178" c="0"/>
++            <distortion model="ptlens" focal="17.6" a="-0.013836" b="0.033711" c="0"/>
++            <distortion model="ptlens" focal="21.3" a="0.000657" b="0.002024" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>WCON-08B</model>
++        <model>C2040Z &amp; compatibles, with WCON-08B</model>
++        <model lang="en">fixed lens, with WCON-08B</model>
++        <model lang="de">festes Objektiv, mit WCON-08B</model>
+         <mount>olympus2040</mount>
+         <cropfactor>4.930</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.027465" b="-0.07362" c="0" />
+-            <distortion model="ptlens" focal="7.9" a="0.012773" b="-0.036148" c="0" />
+-            <distortion model="ptlens" focal="8.7" a="0.019964" b="-0.047659" c="0" />
+-            <distortion model="ptlens" focal="9" a="0.010697" b="-0.028343" c="0" />
+-            <distortion model="ptlens" focal="10.5" a="0.004591" b="-0.013381" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="0.01083" b="-0.021339" c="0" />
+-            <distortion model="ptlens" focal="13.2" a="0.005054" b="-0.010225" c="0" />
+-            <distortion model="ptlens" focal="14.5" a="0.001686" b="-0.001529" c="0" />
+-            <distortion model="ptlens" focal="16.9" a="-0.002782" b="0.008112" c="0" />
+-            <distortion model="ptlens" focal="17.6" a="0.000679" b="0.001663" c="0" />
+-            <distortion model="ptlens" focal="21.3" a="0.004686" b="-0.008143" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.027465" b="-0.07362" c="0"/>
++            <distortion model="ptlens" focal="7.9" a="0.012773" b="-0.036148" c="0"/>
++            <distortion model="ptlens" focal="8.7" a="0.019964" b="-0.047659" c="0"/>
++            <distortion model="ptlens" focal="9" a="0.010697" b="-0.028343" c="0"/>
++            <distortion model="ptlens" focal="10.5" a="0.004591" b="-0.013381" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="0.01083" b="-0.021339" c="0"/>
++            <distortion model="ptlens" focal="13.2" a="0.005054" b="-0.010225" c="0"/>
++            <distortion model="ptlens" focal="14.5" a="0.001686" b="-0.001529" c="0"/>
++            <distortion model="ptlens" focal="16.9" a="-0.002782" b="0.008112" c="0"/>
++            <distortion model="ptlens" focal="17.6" a="0.000679" b="0.001663" c="0"/>
++            <distortion model="ptlens" focal="21.3" a="0.004686" b="-0.008143" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C5060WZ &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympus5060</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.7" a="0" b="-0.004736" c="-0.025632" />
+-            <distortion model="ptlens" focal="7.3" a="0" b="-0.001423" c="-0.032997" />
+-            <distortion model="ptlens" focal="8.6" a="0" b="-0.043809" c="0.067939" />
+-            <distortion model="ptlens" focal="10" a="0" b="-0.010586" c="0.000919" />
+-            <distortion model="ptlens" focal="11.8" a="0" b="-0.007287" c="0.002822" />
+-            <distortion model="ptlens" focal="12.8" a="0" b="-0.007539" c="-0.014107" />
+-            <distortion model="ptlens" focal="13.4" a="0" b="-0.015426" c="0.0202" />
+-            <distortion model="ptlens" focal="14.5" a="0" b="-0.011352" c="0.021863" />
+-            <distortion model="ptlens" focal="15.8" a="0" b="-0.000188" c="-0.010549" />
+-            <distortion model="ptlens" focal="18.9" a="0" b="-0.009209" c="0.013324" />
+-            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="5.7" a="0" b="-0.004736" c="-0.025632"/>
++            <distortion model="ptlens" focal="7.3" a="0" b="-0.001423" c="-0.032997"/>
++            <distortion model="ptlens" focal="8.6" a="0" b="-0.043809" c="0.067939"/>
++            <distortion model="ptlens" focal="10" a="0" b="-0.010586" c="0.000919"/>
++            <distortion model="ptlens" focal="11.8" a="0" b="-0.007287" c="0.002822"/>
++            <distortion model="ptlens" focal="12.8" a="0" b="-0.007539" c="-0.014107"/>
++            <distortion model="ptlens" focal="13.4" a="0" b="-0.015426" c="0.0202"/>
++            <distortion model="ptlens" focal="14.5" a="0" b="-0.011352" c="0.021863"/>
++            <distortion model="ptlens" focal="15.8" a="0" b="-0.000188" c="-0.010549"/>
++            <distortion model="ptlens" focal="18.9" a="0" b="-0.009209" c="0.013324"/>
++            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>C860L &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympusC860</mount>
+         <cropfactor>6.563</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.5" a="0.01115" b="-0.029245" c="0" />
++            <distortion model="ptlens" focal="5.5" a="0.01115" b="-0.029245" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>Stylus Epic &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympusEpic</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="-0.01247" b="0.027098" c="0" />
++            <distortion model="ptlens" focal="35" a="-0.01247" b="0.027098" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>XZ-1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympusxz1</mount>
+-	    <focal min="6" max="24" />
+-	    <aperture min="1.8" max="8" />
++        <focal min="6" max="24"/>
++        <aperture min="1.8" max="8"/>
+         <cropfactor>4.68</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.01604" b="-0.05047" c="0" />
+-            <distortion model="ptlens" focal="6.5" a="0.01062" b="-0.03568" c="0" />
+-            <distortion model="ptlens" focal="6.9" a="0.01005" b="-0.032" c="0" />
+-            <distortion model="ptlens" focal="7.4" a="0.0093" b="-0.02656" c="0" />
+-            <distortion model="ptlens" focal="8.2" a="0.0054" b="-0.01759" c="0" />
+-            <distortion model="ptlens" focal="9" a="0.0039" b="-0.01169" c="0" />
+-            <distortion model="ptlens" focal="9.9" a="0.00681" b="-0.01404" c="0" />
+-            <distortion model="ptlens" focal="10.8" a="0.00403" b="-0.00779" c="0" />
+-            <distortion model="ptlens" focal="11.8" a="0.00045" b="-0.00198" c="0" />
+-            <distortion model="ptlens" focal="12.9" a="-0.00279" b="0.00569" c="0" />
+-            <distortion model="ptlens" focal="14.1" a="0.00656" b="-0.01053" c="0" />
+-            <distortion model="ptlens" focal="15.3" a="0.00245" b="-0.00075" c="0" />
+-            <distortion model="ptlens" focal="16.6" a="0.00104" b="0.00264" c="0" />
+-            <distortion model="ptlens" focal="18.2" a="0.00146" b="0.00052" c="0" />
+-            <distortion model="ptlens" focal="19.8" a="0.00166" b="0.00164" c="0" />
+-            <distortion model="ptlens" focal="21.6" a="0.00064" b="0.00348" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.00074" b="0.0032" c="0" />
+-			<vignetting model="pa" focal="6" aperture="1.8" distance="10" k1="-0.2032" k2="-0.2235" k3="-0.0230" />
+-            <vignetting model="pa" focal="6" aperture="1.8" distance="1000" k1="-0.2032" k2="-0.2235" k3="-0.0230" />
+-            <vignetting model="pa" focal="6" aperture="2.8" distance="10" k1="-0.1922" k2="-0.0942" k3="0.0504" />
+-            <vignetting model="pa" focal="6" aperture="2.8" distance="1000" k1="-0.1922" k2="-0.0942" k3="0.0504" />
+-            <vignetting model="pa" focal="6" aperture="4" distance="10" k1="-0.1690" k2="-0.1739" k3="0.1166" />
+-            <vignetting model="pa" focal="6" aperture="4" distance="1000" k1="-0.1690" k2="-0.1739" k3="0.1166" />
+-            <vignetting model="pa" focal="6" aperture="5" distance="10" k1="-0.1668" k2="-0.1787" k3="0.1202" />
+-            <vignetting model="pa" focal="6" aperture="5" distance="1000" k1="-0.1668" k2="-0.1787" k3="0.1202" />
+-            <vignetting model="pa" focal="6" aperture="8" distance="10" k1="-0.1688" k2="-0.1835" k3="0.1267" />
+-            <vignetting model="pa" focal="6" aperture="8" distance="1000" k1="-0.1688" k2="-0.1835" k3="0.1267" />
+-            <vignetting model="pa" focal="10.8" aperture="2.1" distance="10" k1="-0.1642" k2="-0.1555" k3="0.1147" />
+-            <vignetting model="pa" focal="10.8" aperture="2.1" distance="1000" k1="-0.1642" k2="-0.1555" k3="0.1147" />
+-            <vignetting model="pa" focal="10.8" aperture="3.2" distance="10" k1="-0.0990" k2="0.0311" k3="0.0035" />
+-            <vignetting model="pa" focal="10.8" aperture="3.2" distance="1000" k1="-0.0990" k2="0.0311" k3="0.0035" />
+-            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.1012" k2="0.0322" k3="0.0044" />
+-            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.1012" k2="0.0322" k3="0.0044" />
+-            <vignetting model="pa" focal="10.8" aperture="5" distance="10" k1="-0.1109" k2="0.0508" k3="-0.0055" />
+-            <vignetting model="pa" focal="10.8" aperture="5" distance="1000" k1="-0.1109" k2="0.0508" k3="-0.0055" />
+-            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.1369" k2="0.1004" k3="-0.0314" />
+-            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.1369" k2="0.1004" k3="-0.0314" />
+-            <vignetting model="pa" focal="15.3" aperture="2.3" distance="10" k1="-0.2326" k2="0.2678" k3="-0.3386" />
+-            <vignetting model="pa" focal="15.3" aperture="2.3" distance="1000" k1="-0.2326" k2="0.2678" k3="-0.3386" />
+-            <vignetting model="pa" focal="15.3" aperture="3.2" distance="10" k1="-0.0428" k2="-0.0007" k3="-0.0313" />
+-            <vignetting model="pa" focal="15.3" aperture="3.2" distance="1000" k1="-0.0428" k2="-0.0007" k3="-0.0313" />
+-            <vignetting model="pa" focal="15.3" aperture="4.5" distance="10" k1="-0.0063" k2="-0.1286" k3="0.0797" />
+-            <vignetting model="pa" focal="15.3" aperture="4.5" distance="1000" k1="-0.0063" k2="-0.1286" k3="0.0797" />
+-            <vignetting model="pa" focal="15.3" aperture="5.6" distance="10" k1="-0.0109" k2="-0.1175" k3="0.0728" />
+-            <vignetting model="pa" focal="15.3" aperture="5.6" distance="1000" k1="-0.0109" k2="-0.1175" k3="0.0728" />
+-            <vignetting model="pa" focal="15.3" aperture="8" distance="10" k1="-0.0366" k2="-0.0638" k3="0.0413" />
+-            <vignetting model="pa" focal="15.3" aperture="8" distance="1000" k1="-0.0366" k2="-0.0638" k3="0.0413" />
+-            <vignetting model="pa" focal="19.8" aperture="2.4" distance="10" k1="-0.1864" k2="0.1960" k3="-0.3680" />
+-            <vignetting model="pa" focal="19.8" aperture="2.4" distance="1000" k1="-0.1864" k2="0.1960" k3="-0.3680" />
+-            <vignetting model="pa" focal="19.8" aperture="3.5" distance="10" k1="-0.0276" k2="-0.0346" k3="-0.0155" />
+-            <vignetting model="pa" focal="19.8" aperture="3.5" distance="1000" k1="-0.0276" k2="-0.0346" k3="-0.0155" />
+-            <vignetting model="pa" focal="19.8" aperture="4.5" distance="10" k1="0.0093" k2="-0.1641" k3="0.0957" />
+-            <vignetting model="pa" focal="19.8" aperture="4.5" distance="1000" k1="0.0093" k2="-0.1641" k3="0.0957" />
+-            <vignetting model="pa" focal="19.8" aperture="5.6" distance="10" k1="0.0084" k2="-0.1652" k3="0.0975" />
+-            <vignetting model="pa" focal="19.8" aperture="5.6" distance="1000" k1="0.0084" k2="-0.1652" k3="0.0975" />
+-            <vignetting model="pa" focal="19.8" aperture="8" distance="10" k1="-0.0077" k2="-0.1306" k3="0.0764" />
+-            <vignetting model="pa" focal="19.8" aperture="8" distance="1000" k1="-0.0077" k2="-0.1306" k3="0.0764" />
+-            <vignetting model="pa" focal="24" aperture="2.5" distance="10" k1="-0.1756" k2="0.1217" k3="-0.2849" />
+-            <vignetting model="pa" focal="24" aperture="2.5" distance="1000" k1="-0.1756" k2="0.1217" k3="-0.2849" />
+-            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.0445" k2="-0.0020" k3="-0.0543" />
+-            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.0445" k2="-0.0020" k3="-0.0543" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="0.0011" k2="-0.1738" k3="0.0997" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="0.0011" k2="-0.1738" k3="0.0997" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="0.0083" k2="-0.1907" k3="0.1100" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="0.0083" k2="-0.1907" k3="0.1100" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="0.0049" k2="-0.1887" k3="0.1121" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="0.0049" k2="-0.1887" k3="0.1121" />
++            <distortion model="ptlens" focal="6" a="0.01604" b="-0.05047" c="0"/>
++            <distortion model="ptlens" focal="6.5" a="0.01062" b="-0.03568" c="0"/>
++            <distortion model="ptlens" focal="6.9" a="0.01005" b="-0.032" c="0"/>
++            <distortion model="ptlens" focal="7.4" a="0.0093" b="-0.02656" c="0"/>
++            <distortion model="ptlens" focal="8.2" a="0.0054" b="-0.01759" c="0"/>
++            <distortion model="ptlens" focal="9" a="0.0039" b="-0.01169" c="0"/>
++            <distortion model="ptlens" focal="9.9" a="0.00681" b="-0.01404" c="0"/>
++            <distortion model="ptlens" focal="10.8" a="0.00403" b="-0.00779" c="0"/>
++            <distortion model="ptlens" focal="11.8" a="0.00045" b="-0.00198" c="0"/>
++            <distortion model="ptlens" focal="12.9" a="-0.00279" b="0.00569" c="0"/>
++            <distortion model="ptlens" focal="14.1" a="0.00656" b="-0.01053" c="0"/>
++            <distortion model="ptlens" focal="15.3" a="0.00245" b="-0.00075" c="0"/>
++            <distortion model="ptlens" focal="16.6" a="0.00104" b="0.00264" c="0"/>
++            <distortion model="ptlens" focal="18.2" a="0.00146" b="0.00052" c="0"/>
++            <distortion model="ptlens" focal="19.8" a="0.00166" b="0.00164" c="0"/>
++            <distortion model="ptlens" focal="21.6" a="0.00064" b="0.00348" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.00074" b="0.0032" c="0"/>
++            <vignetting model="pa" focal="6" aperture="1.8" distance="10" k1="-0.2032" k2="-0.2235" k3="-0.0230"/>
++            <vignetting model="pa" focal="6" aperture="1.8" distance="1000" k1="-0.2032" k2="-0.2235" k3="-0.0230"/>
++            <vignetting model="pa" focal="6" aperture="2.8" distance="10" k1="-0.1922" k2="-0.0942" k3="0.0504"/>
++            <vignetting model="pa" focal="6" aperture="2.8" distance="1000" k1="-0.1922" k2="-0.0942" k3="0.0504"/>
++            <vignetting model="pa" focal="6" aperture="4" distance="10" k1="-0.1690" k2="-0.1739" k3="0.1166"/>
++            <vignetting model="pa" focal="6" aperture="4" distance="1000" k1="-0.1690" k2="-0.1739" k3="0.1166"/>
++            <vignetting model="pa" focal="6" aperture="5" distance="10" k1="-0.1668" k2="-0.1787" k3="0.1202"/>
++            <vignetting model="pa" focal="6" aperture="5" distance="1000" k1="-0.1668" k2="-0.1787" k3="0.1202"/>
++            <vignetting model="pa" focal="6" aperture="8" distance="10" k1="-0.1688" k2="-0.1835" k3="0.1267"/>
++            <vignetting model="pa" focal="6" aperture="8" distance="1000" k1="-0.1688" k2="-0.1835" k3="0.1267"/>
++            <vignetting model="pa" focal="10.8" aperture="2.1" distance="10" k1="-0.1642" k2="-0.1555" k3="0.1147"/>
++            <vignetting model="pa" focal="10.8" aperture="2.1" distance="1000" k1="-0.1642" k2="-0.1555" k3="0.1147"/>
++            <vignetting model="pa" focal="10.8" aperture="3.2" distance="10" k1="-0.0990" k2="0.0311" k3="0.0035"/>
++            <vignetting model="pa" focal="10.8" aperture="3.2" distance="1000" k1="-0.0990" k2="0.0311" k3="0.0035"/>
++            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.1012" k2="0.0322" k3="0.0044"/>
++            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.1012" k2="0.0322" k3="0.0044"/>
++            <vignetting model="pa" focal="10.8" aperture="5" distance="10" k1="-0.1109" k2="0.0508" k3="-0.0055"/>
++            <vignetting model="pa" focal="10.8" aperture="5" distance="1000" k1="-0.1109" k2="0.0508" k3="-0.0055"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.1369" k2="0.1004" k3="-0.0314"/>
++            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.1369" k2="0.1004" k3="-0.0314"/>
++            <vignetting model="pa" focal="15.3" aperture="2.3" distance="10" k1="-0.2326" k2="0.2678" k3="-0.3386"/>
++            <vignetting model="pa" focal="15.3" aperture="2.3" distance="1000" k1="-0.2326" k2="0.2678" k3="-0.3386"/>
++            <vignetting model="pa" focal="15.3" aperture="3.2" distance="10" k1="-0.0428" k2="-0.0007" k3="-0.0313"/>
++            <vignetting model="pa" focal="15.3" aperture="3.2" distance="1000" k1="-0.0428" k2="-0.0007" k3="-0.0313"/>
++            <vignetting model="pa" focal="15.3" aperture="4.5" distance="10" k1="-0.0063" k2="-0.1286" k3="0.0797"/>
++            <vignetting model="pa" focal="15.3" aperture="4.5" distance="1000" k1="-0.0063" k2="-0.1286" k3="0.0797"/>
++            <vignetting model="pa" focal="15.3" aperture="5.6" distance="10" k1="-0.0109" k2="-0.1175" k3="0.0728"/>
++            <vignetting model="pa" focal="15.3" aperture="5.6" distance="1000" k1="-0.0109" k2="-0.1175" k3="0.0728"/>
++            <vignetting model="pa" focal="15.3" aperture="8" distance="10" k1="-0.0366" k2="-0.0638" k3="0.0413"/>
++            <vignetting model="pa" focal="15.3" aperture="8" distance="1000" k1="-0.0366" k2="-0.0638" k3="0.0413"/>
++            <vignetting model="pa" focal="19.8" aperture="2.4" distance="10" k1="-0.1864" k2="0.1960" k3="-0.3680"/>
++            <vignetting model="pa" focal="19.8" aperture="2.4" distance="1000" k1="-0.1864" k2="0.1960" k3="-0.3680"/>
++            <vignetting model="pa" focal="19.8" aperture="3.5" distance="10" k1="-0.0276" k2="-0.0346" k3="-0.0155"/>
++            <vignetting model="pa" focal="19.8" aperture="3.5" distance="1000" k1="-0.0276" k2="-0.0346" k3="-0.0155"/>
++            <vignetting model="pa" focal="19.8" aperture="4.5" distance="10" k1="0.0093" k2="-0.1641" k3="0.0957"/>
++            <vignetting model="pa" focal="19.8" aperture="4.5" distance="1000" k1="0.0093" k2="-0.1641" k3="0.0957"/>
++            <vignetting model="pa" focal="19.8" aperture="5.6" distance="10" k1="0.0084" k2="-0.1652" k3="0.0975"/>
++            <vignetting model="pa" focal="19.8" aperture="5.6" distance="1000" k1="0.0084" k2="-0.1652" k3="0.0975"/>
++            <vignetting model="pa" focal="19.8" aperture="8" distance="10" k1="-0.0077" k2="-0.1306" k3="0.0764"/>
++            <vignetting model="pa" focal="19.8" aperture="8" distance="1000" k1="-0.0077" k2="-0.1306" k3="0.0764"/>
++            <vignetting model="pa" focal="24" aperture="2.5" distance="10" k1="-0.1756" k2="0.1217" k3="-0.2849"/>
++            <vignetting model="pa" focal="24" aperture="2.5" distance="1000" k1="-0.1756" k2="0.1217" k3="-0.2849"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.0445" k2="-0.0020" k3="-0.0543"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.0445" k2="-0.0020" k3="-0.0543"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="0.0011" k2="-0.1738" k3="0.0997"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="0.0011" k2="-0.1738" k3="0.0997"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="0.0083" k2="-0.1907" k3="0.1100"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="0.0083" k2="-0.1907" k3="0.1100"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="0.0049" k2="-0.1887" k3="0.1121"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="0.0049" k2="-0.1887" k3="0.1121"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Stylus 1 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>olympusStylus1</mount>
++        <cropfactor>4.67</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6" a="-0.00245" b="-0.00755" c="-0.06886"/>
++            <distortion model="ptlens" focal="7.4" a="0.02154" b="-0.07222" c="0.02781"/>
++            <distortion model="ptlens" focal="9.8" a="0" b="-0.00026" c="0"/>
++            <distortion model="ptlens" focal="12" a="0" b="0.00868" c="0"/>
++            <distortion model="ptlens" focal="17.8" a="0" b="0.01546" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.01915" c="0"/>
++            <distortion model="ptlens" focal="64.3" a="0" b="0.01865" c="0"/>
++            <tca model="poly3" focal="6" br="-0.0000115" vr="1.0005629" bb="0.0000971" vb="0.9999294"/>
++            <tca model="poly3" focal="7.4" br="-0.0000325" vr="1.0005431" bb="0.0000828" vb="0.9999069"/>
++            <tca model="poly3" focal="9.8" br="-0.0000787" vr="1.0005433" bb="0.0000792" vb="0.9999241"/>
++            <tca model="poly3" focal="12" br="-0.0001483" vr="1.0004799" bb="0.0000771" vb="0.9999224"/>
++            <tca model="poly3" focal="14.5" br="-0.0001035" vr="1.0003665" bb="0.0000667" vb="0.9999654"/>
++            <tca model="poly3" focal="17.8" br="-0.0001415" vr="1.0003736" bb="0.0000348" vb="1.0000034"/>
++            <tca model="poly3" focal="19.6" br="-0.0000649" vr="1.0002254" bb="0.0000194" vb="1.0000348"/>
++            <tca model="poly3" focal="35" br="0.0000169" vr="0.9998975" bb="-0.0000098" vb="1.0000255"/>
++            <tca model="poly3" focal="51.4" br="0.0000277" vr="0.9998371" bb="-0.0000071" vb="1.0000043"/>
++            <tca model="poly3" focal="64.3" br="0.0000729" vr="0.9996827" bb="0.0000264" vb="0.9998948"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus Stylus TG-4 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>olympusStylusTG4</mount>
++        <cropfactor>5.56</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus Stylus TG-4 -->
++            <distortion model="poly3" focal="4.5" k1="-0.04661"/>
++            <distortion model="poly3" focal="5.1" k1="-0.03028"/>
++            <distortion model="poly3" focal="6.9" k1="-0.00581"/>
++            <distortion model="poly3" focal="9" k1="0.00574"/>
++            <distortion model="poly3" focal="18" k1="0.01525"/>
++            <tca model="poly3" focal="4.5" br="-0.0000440" vr="1.0004022" bb="0.0000003" vb="1.0000025"/>
++            <tca model="poly3" focal="5.1" br="0.0000436" vr="1.0002117" bb="-0.0000141" vb="1.0000376"/>
++            <tca model="poly3" focal="6.9" br="-0.0000276" vr="1.0001322" bb="-0.0000199" vb="1.0000921"/>
++            <tca model="poly3" focal="9" br="-0.0000200" vr="1.0000631" bb="-0.0000128" vb="1.0000870"/>
++            <tca model="poly3" focal="18" br="-0.0000067" vr="0.9999876" bb="-0.0000838" vb="1.0000917"/>
+         </calibration>
+     </lens>
+-    
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-panasonic.xml b/data/db/compact-panasonic.xml
+--- a/data/db/compact-panasonic.xml	2013-10-18 21:21:00.000000000 +0200
++++ b/data/db/compact-panasonic.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,98 +1,4 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>panasonicFZ10</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicFX7</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicLX1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicLX3</name>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicLX5</name>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicLX7</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicFZ30</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicLZ2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicFZ5</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicFZ3</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicFZ28</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicFX150</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCGH1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCL10</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCLX2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCFZ18</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCFZ35</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCFZ50</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>panasonicDMCFZ8</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX1</model>
+@@ -100,39 +6,48 @@
+         <mount>panasonicLX1</mount>
+         <cropfactor>4.45</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-LX1</model>
++        <variant>3:2</variant>
++        <mount>panasonicLX1</mount>
++        <cropfactor>5.08</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-LX1</model>
++        <variant>4:3</variant>
++        <mount>panasonicLX1</mount>
++        <cropfactor>5.40</cropfactor>
++    </camera>
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX3</model>
+         <variant>4:3</variant>
+-        <mount>PanasonicLX3</mount>
++        <mount>panasonicLX3</mount>
+         <cropfactor>4.7</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX3</model>
+         <variant>16:9</variant>
+-        <mount>PanasonicLX3</mount>
++        <mount>panasonicLX3</mount>
+         <cropfactor>5.7528</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX3</model>
+         <variant>3:2</variant>
+-        <mount>PanasonicLX3</mount>
++        <mount>panasonicLX3</mount>
+         <cropfactor>5.1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX3</model>
+         <variant>1:1</variant>
+-        <mount>PanasonicLX3</mount>
+-        <cropfactor>4.7</cropfactor>
++        <mount>panasonicLX3</mount>
++        <cropfactor>5.32</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX5</model>
+@@ -140,7 +55,6 @@
+         <mount>panasonicLX5</mount>
+         <cropfactor>4.71</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX7</model>
+@@ -148,412 +62,753 @@
+         <mount>panasonicLX7</mount>
+         <cropfactor>5.1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LC1</model>
+         <mount>leicaDigilux2</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LZ2</model>
+         <mount>panasonicLZ2</mount>
+         <cropfactor>6.06</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LZ1</model>
+         <mount>panasonicLZ2</mount>
+         <cropfactor>6.06</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FX9</model>
+         <mount>panasonicFX7</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FX8</model>
+         <mount>panasonicFX7</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FX7</model>
+         <mount>panasonicFX7</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FX2</model>
+         <mount>panasonicFX7</mount>
+         <cropfactor>6.05</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ30</model>
+         <mount>panasonicFZ30</mount>
+         <cropfactor>4.73</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ20</model>
+         <mount>panasonicFZ10</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ10</model>
+         <mount>panasonicFZ10</mount>
+         <cropfactor>5.84</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ5</model>
+         <mount>panasonicFZ5</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ3</model>
+         <mount>panasonicFZ3</mount>
+         <cropfactor>7.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ28</model>
+         <mount>panasonicFZ28</mount>
+         <cropfactor>5.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FX150</model>
+         <mount>panasonicFX150</mount>
+         <cropfactor>4.7</cropfactor>
+     </camera>
+-
+-    <camera>
+-        <maker>Panasonic</maker>
+-        <model>DMC-GH1</model>
+-        <mount>panasonicDMCGH1</mount>
+-        <cropfactor>2.0</cropfactor>
+-    </camera>
+-
+-    <camera>
+-        <maker>Panasonic</maker>
+-        <model>DMC-L10</model>
+-        <mount>panasonicDMCL10</mount>
+-        <cropfactor>2.0</cropfactor>
+-    </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-LX2</model>
+         <mount>panasonicDMCLX2</mount>
+         <cropfactor>4.44</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ18</model>
+         <mount>panasonicDMCFZ18</mount>
+         <cropfactor>6.1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ35</model>
+         <mount>panasonicDMCFZ35</mount>
+         <cropfactor>5.6</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ40</model>
++        <!-- Same camera as FZ45 for non-European markets -->
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.60</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ40 (3:2)</model>
++        <!-- Same camera as FZ45 for non-European markets -->
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.81</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ45</model>
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.60</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ45 (3:2)</model>
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.81</cropfactor>
++    </camera>
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ50</model>
+         <mount>panasonicDMCFZ50</mount>
+         <cropfactor>4.84</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-FZ8</model>
+         <mount>panasonicDMCFZ8</mount>
+         <cropfactor>6.02</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ100</model>
++        <!-- Same lens as FZ45 -->
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.60</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ100 (3:2)</model>
++        <!-- Same lens as FZ45 -->
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.81</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ200</model>
++        <mount>panasonicDMCFZ200</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ300</model>
++        <!-- Uses same lens and sensor as FZ200 -->
++        <mount>panasonicDMCFZ200</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-LX100</model>
++        <mount>panasonicDMCLX100</mount>
++        <cropfactor>2.21</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ1000</model>
++        <mount>panasonicFZ1000</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-FZ150</model>
++        <mount>panasonicFZ150</mount>
++        <cropfactor>5.56</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-LF1</model>
++        <mount>panasonicLF1</mount>
++        <cropfactor>4.67</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-TZ71</model>
++        <mount>panasonicTZ71</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-TZ61</model>
++        <mount>panasonicTZ71</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-TZ100</model>
++        <mount>panasonicTZ100</mount>
++        <cropfactor>2.75</cropfactor>
++    </camera>
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-LX1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicLX1</mount>
+         <cropfactor>4.45</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.3" a="0.007252" b="-0.024439" c="0" />
+-            <distortion model="ptlens" focal="6.7" a="0.005478" b="-0.019975" c="0" />
+-            <distortion model="ptlens" focal="7.5" a="0.003453" b="-0.012092" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="-0.000134" c="0" />
+-            <distortion model="ptlens" focal="10.8" a="0" b="0.001701" c="0" />
+-            <distortion model="ptlens" focal="14.4" a="0" b="0.003043" c="0" />
+-            <distortion model="ptlens" focal="19.2" a="0" b="0.00316" c="0" />
+-            <distortion model="ptlens" focal="23.2" a="0" b="0.003386" c="0" />
+-            <distortion model="ptlens" focal="25.2" a="0" b="0.003557" c="0" />
++            <distortion model="ptlens" focal="6.3" a="0.007252" b="-0.024439" c="0"/>
++            <distortion model="ptlens" focal="6.7" a="0.005478" b="-0.019975" c="0"/>
++            <distortion model="ptlens" focal="7.5" a="0.003453" b="-0.012092" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0" b="-0.000134" c="0"/>
++            <distortion model="ptlens" focal="10.8" a="0" b="0.001701" c="0"/>
++            <distortion model="ptlens" focal="14.4" a="0" b="0.003043" c="0"/>
++            <distortion model="ptlens" focal="19.2" a="0" b="0.00316" c="0"/>
++            <distortion model="ptlens" focal="23.2" a="0" b="0.003386" c="0"/>
++            <distortion model="ptlens" focal="25.2" a="0" b="0.003557" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>LX3</model>
++        <model>DMC-LX3 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicLX3</mount>
+-        <focal min="5.1" max="12.8" />
+-        <aperture min="2.0" max="8.0" />
++        <focal min="5.1" max="12.8"/>
++        <aperture min="2" max="8"/>
+         <cropfactor>4.7</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.1" a="-0.003959" b="0.004736" c="-0.081302" />
+-            <distortion model="ptlens" focal="5.4" a="-0.005553" b="0.009049" c="-0.077906" />
+-            <distortion model="ptlens" focal="5.9" a="0.011732" b="-0.066315" c="0.029221" />
+-            <distortion model="ptlens" focal="6.3" a="-0.008619" b="0.017573" c="-0.069065" />
+-            <distortion model="ptlens" focal="6.8" a="-0.012256" b="0.036251" c="-0.088407" />
+-            <distortion model="ptlens" focal="7.4" a="0.009106" b="-0.048429" c="0.022523" />
+-            <distortion model="ptlens" focal="7.9" a="0.000603" b="-0.027831" c="0.020523" />
+-            <distortion model="ptlens" focal="8.8" a="-0.018814" b="0.059370" c="-0.092180" />
+-            <distortion model="ptlens" focal="9.3" a="-0.001016" b="-0.010300" c="-0.001994" />
+-            <distortion model="ptlens" focal="10.2" a="-0.017673" b="0.055682" c="-0.082869" />
+-            <distortion model="ptlens" focal="11.1" a="-0.011262" b="0.038785" c="-0.068040" />
+-            <distortion model="ptlens" focal="12.1" a="-0.011262" b="0.038785" c="-0.068040" />
+-            <distortion model="ptlens" focal="12.8" a="-0.011262" b="0.038785" c="-0.068040" />
++            <distortion model="ptlens" focal="5.1" a="-0.003959" b="0.004736" c="-0.081302"/>
++            <distortion model="ptlens" focal="5.4" a="-0.005553" b="0.009049" c="-0.077906"/>
++            <distortion model="ptlens" focal="5.9" a="0.011732" b="-0.066315" c="0.029221"/>
++            <distortion model="ptlens" focal="6.3" a="-0.008619" b="0.017573" c="-0.069065"/>
++            <distortion model="ptlens" focal="6.8" a="-0.012256" b="0.036251" c="-0.088407"/>
++            <distortion model="ptlens" focal="7.4" a="0.009106" b="-0.048429" c="0.022523"/>
++            <distortion model="ptlens" focal="7.9" a="0.000603" b="-0.027831" c="0.020523"/>
++            <distortion model="ptlens" focal="8.8" a="-0.018814" b="0.059370" c="-0.092180"/>
++            <distortion model="ptlens" focal="9.3" a="-0.001016" b="-0.010300" c="-0.001994"/>
++            <distortion model="ptlens" focal="10.2" a="-0.017673" b="0.055682" c="-0.082869"/>
++            <distortion model="ptlens" focal="11.1" a="-0.011262" b="0.038785" c="-0.068040"/>
++            <distortion model="ptlens" focal="12.1" a="-0.011262" b="0.038785" c="-0.068040"/>
++            <distortion model="ptlens" focal="12.8" a="-0.011262" b="0.038785" c="-0.068040"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
+-        <focal min="5.1" max="19.2" />
+-        <aperture min="2.0" max="8.0" />
++        <model>DMC-LX5 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicLX5</mount>
++        <focal min="5.1" max="19.2"/>
++        <aperture min="2" max="8"/>
+         <cropfactor>4.71</cropfactor>
+-	    <calibration>
+-		    <distortion focal="5.1" model="ptlens" a="0.03955" b="-0.16355" c="0.11864" />
+-		    <field_of_view focal="5.1" fov="71.5277" />
+-		    <distortion focal="6" model="ptlens" a="0.02451" b="-0.08952" c="0.03353" />
+-		    <field_of_view focal="6" fov="63.388" />
+-		    <distortion focal="7.5" model="ptlens" a="0.00853" b="-0.03409" c="0.00531" />
+-		    <field_of_view focal="7.5" fov="52.5764" />
+-		    <distortion focal="10.7" model="ptlens" a="0.00594" b="-0.02024" c="0.0042" />
+-		    <field_of_view focal="10.7" fov="38.1962" />
+-		    <distortion focal="14.9" model="ptlens" a="0.00141" b="-0.00799" c="0.00152" />
+-		    <field_of_view focal="14.9" fov="27.7549" />
+-		    <distortion focal="19.2" model="ptlens" a="0.00095" b="-0.00297" c="-0.00298" />
+-		    <field_of_view focal="19.2" fov="21.7521" />
+-	    </calibration>
+-	</lens>    
+-
++        <calibration>
++            <distortion focal="5.1" model="ptlens" a="0.03955" b="-0.16355" c="0.11864"/>
++            <distortion focal="6" model="ptlens" a="0.02451" b="-0.08952" c="0.03353"/>
++            <distortion focal="7.5" model="ptlens" a="0.00853" b="-0.03409" c="0.00531"/>
++            <distortion focal="10.7" model="ptlens" a="0.00594" b="-0.02024" c="0.0042"/>
++            <distortion focal="14.9" model="ptlens" a="0.00141" b="-0.00799" c="0.00152"/>
++            <distortion focal="19.2" model="ptlens" a="0.00095" b="-0.00297" c="-0.00298"/>
++        </calibration>
++    </lens>
+     <lens>
+         <maker>Leica</maker>
+-        <model>DMC-LX7</model>
++        <model>DMC-LX7 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicLX7</mount>
+         <cropfactor>5.1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="4.7" a="0.02076" b="-0.11853" c="0.05898" />
+-            <distortion model="ptlens" focal="5.5" a="0.01453" b="-0.07905" c="0.02713" />
+-            <distortion model="ptlens" focal="6.9" a="0.00063" b="-0.03486" c="0.03442" />
+-            <distortion model="ptlens" focal="9.8" a="-0.00577" b="0.00314" c="0.01006" />
+-            <distortion model="ptlens" focal="13.7" a="-0.00367" b="0.00263" c="0.01366" />
+-            <distortion model="ptlens" focal="17.7" a="-0.00223" b="-0.00193" c="0.02159" />
+-            <vignetting model="pa" focal="4.7" aperture="1.4" distance="10" k1="-0.1410" k2="0.4158" k3="-0.7446" />
+-            <vignetting model="pa" focal="4.7" aperture="1.4" distance="1000" k1="-0.1410" k2="0.4158" k3="-0.7446" />
+-            <vignetting model="pa" focal="4.7" aperture="4.5" distance="10" k1="-0.8436" k2="2.3162" k3="-2.0640" />
+-            <vignetting model="pa" focal="4.7" aperture="4.5" distance="1000" k1="-0.8436" k2="2.3162" k3="-2.0640" />
+-            <vignetting model="pa" focal="4.7" aperture="5.6" distance="10" k1="-0.8410" k2="2.4559" k3="-2.2453" />
+-            <vignetting model="pa" focal="4.7" aperture="5.6" distance="1000" k1="-0.8410" k2="2.4559" k3="-2.2453" />
+-            <vignetting model="pa" focal="4.7" aperture="7.1" distance="10" k1="-0.9368" k2="2.7497" k3="-2.5655" />
+-            <vignetting model="pa" focal="4.7" aperture="7.1" distance="1000" k1="-0.9368" k2="2.7497" k3="-2.5655" />
+-            <vignetting model="pa" focal="4.7" aperture="8" distance="10" k1="-1.0606" k2="2.8873" k3="-2.5985" />
+-            <vignetting model="pa" focal="4.7" aperture="8" distance="1000" k1="-1.0606" k2="2.8873" k3="-2.5985" />
+-            <vignetting model="pa" focal="6.9" aperture="1.6" distance="10" k1="-0.2169" k2="0.2225" k3="-0.0954" />
+-            <vignetting model="pa" focal="6.9" aperture="1.6" distance="1000" k1="-0.2169" k2="0.2225" k3="-0.0954" />
+-            <vignetting model="pa" focal="6.9" aperture="4.5" distance="10" k1="-0.3427" k2="0.4273" k3="-0.1984" />
+-            <vignetting model="pa" focal="6.9" aperture="4.5" distance="1000" k1="-0.3427" k2="0.4273" k3="-0.1984" />
+-            <vignetting model="pa" focal="6.9" aperture="5.6" distance="10" k1="-0.3136" k2="0.4624" k3="-0.2384" />
+-            <vignetting model="pa" focal="6.9" aperture="5.6" distance="1000" k1="-0.3136" k2="0.4624" k3="-0.2384" />
+-            <vignetting model="pa" focal="6.9" aperture="7.1" distance="10" k1="-0.3141" k2="0.4232" k3="-0.2166" />
+-            <vignetting model="pa" focal="6.9" aperture="7.1" distance="1000" k1="-0.3141" k2="0.4232" k3="-0.2166" />
+-            <vignetting model="pa" focal="6.9" aperture="8" distance="10" k1="-0.2774" k2="0.3500" k3="-0.1858" />
+-            <vignetting model="pa" focal="6.9" aperture="8" distance="1000" k1="-0.2774" k2="0.3500" k3="-0.1858" />
+-            <vignetting model="pa" focal="9.8" aperture="1.9" distance="10" k1="-0.1005" k2="0.1044" k3="-0.0444" />
+-            <vignetting model="pa" focal="9.8" aperture="1.9" distance="1000" k1="-0.1005" k2="0.1044" k3="-0.0444" />
+-            <vignetting model="pa" focal="9.8" aperture="4.5" distance="10" k1="-0.2848" k2="0.3649" k3="-0.1798" />
+-            <vignetting model="pa" focal="9.8" aperture="4.5" distance="1000" k1="-0.2848" k2="0.3649" k3="-0.1798" />
+-            <vignetting model="pa" focal="9.8" aperture="5.6" distance="10" k1="-0.2975" k2="0.4452" k3="-0.2304" />
+-            <vignetting model="pa" focal="9.8" aperture="5.6" distance="1000" k1="-0.2975" k2="0.4452" k3="-0.2304" />
+-            <vignetting model="pa" focal="9.8" aperture="7.1" distance="10" k1="-0.2567" k2="0.3476" k3="-0.1659" />
+-            <vignetting model="pa" focal="9.8" aperture="7.1" distance="1000" k1="-0.2567" k2="0.3476" k3="-0.1659" />
+-            <vignetting model="pa" focal="9.8" aperture="8" distance="10" k1="-0.2853" k2="0.3640" k3="-0.1642" />
+-            <vignetting model="pa" focal="9.8" aperture="8" distance="1000" k1="-0.2853" k2="0.3640" k3="-0.1642" />
+-            <vignetting model="pa" focal="13.7" aperture="2.1" distance="10" k1="-0.1202" k2="0.1498" k3="-0.0520" />
+-            <vignetting model="pa" focal="13.7" aperture="2.1" distance="1000" k1="-0.1202" k2="0.1498" k3="-0.0520" />
+-            <vignetting model="pa" focal="13.7" aperture="4.5" distance="10" k1="-0.2728" k2="0.4519" k3="-0.2301" />
+-            <vignetting model="pa" focal="13.7" aperture="4.5" distance="1000" k1="-0.2728" k2="0.4519" k3="-0.2301" />
+-            <vignetting model="pa" focal="13.7" aperture="5.6" distance="10" k1="-0.2041" k2="0.3199" k3="-0.1610" />
+-            <vignetting model="pa" focal="13.7" aperture="5.6" distance="1000" k1="-0.2041" k2="0.3199" k3="-0.1610" />
+-            <vignetting model="pa" focal="13.7" aperture="7.1" distance="10" k1="-0.2050" k2="0.3161" k3="-0.1558" />
+-            <vignetting model="pa" focal="13.7" aperture="7.1" distance="1000" k1="-0.2050" k2="0.3161" k3="-0.1558" />
+-            <vignetting model="pa" focal="13.7" aperture="8" distance="10" k1="-0.2083" k2="0.3043" k3="-0.1399" />
+-            <vignetting model="pa" focal="13.7" aperture="8" distance="1000" k1="-0.2083" k2="0.3043" k3="-0.1399" />
+-            <vignetting model="pa" focal="17.7" aperture="2.3" distance="10" k1="-0.1186" k2="0.2006" k3="-0.1067" />
+-            <vignetting model="pa" focal="17.7" aperture="2.3" distance="1000" k1="-0.1186" k2="0.2006" k3="-0.1067" />
+-            <vignetting model="pa" focal="17.7" aperture="4.5" distance="10" k1="-0.2314" k2="0.3522" k3="-0.1631" />
+-            <vignetting model="pa" focal="17.7" aperture="4.5" distance="1000" k1="-0.2314" k2="0.3522" k3="-0.1631" />
+-            <vignetting model="pa" focal="17.7" aperture="5.6" distance="10" k1="-0.2475" k2="0.3952" k3="-0.1927" />
+-            <vignetting model="pa" focal="17.7" aperture="5.6" distance="1000" k1="-0.2475" k2="0.3952" k3="-0.1927" />
+-            <vignetting model="pa" focal="17.7" aperture="7.1" distance="10" k1="-0.2621" k2="0.4297" k3="-0.2188" />
+-            <vignetting model="pa" focal="17.7" aperture="7.1" distance="1000" k1="-0.2621" k2="0.4297" k3="-0.2188" />
+-            <vignetting model="pa" focal="17.7" aperture="8" distance="10" k1="-0.2610" k2="0.4822" k3="-0.2689" />
+-            <vignetting model="pa" focal="17.7" aperture="8" distance="1000" k1="-0.2610" k2="0.4822" k3="-0.2689" />
++            <distortion model="ptlens" focal="4.7" a="0.02076" b="-0.11853" c="0.05898"/>
++            <distortion model="ptlens" focal="5.5" a="0.01453" b="-0.07905" c="0.02713"/>
++            <distortion model="ptlens" focal="6.9" a="0.00063" b="-0.03486" c="0.03442"/>
++            <distortion model="ptlens" focal="9.8" a="-0.00577" b="0.00314" c="0.01006"/>
++            <distortion model="ptlens" focal="13.7" a="-0.00367" b="0.00263" c="0.01366"/>
++            <distortion model="ptlens" focal="17.7" a="-0.00223" b="-0.00193" c="0.02159"/>
++            <vignetting model="pa" focal="4.7" aperture="1.4" distance="10" k1="-0.1410" k2="0.4158" k3="-0.7446"/>
++            <vignetting model="pa" focal="4.7" aperture="1.4" distance="1000" k1="-0.1410" k2="0.4158" k3="-0.7446"/>
++            <vignetting model="pa" focal="4.7" aperture="4.5" distance="10" k1="-0.8436" k2="2.3162" k3="-2.0640"/>
++            <vignetting model="pa" focal="4.7" aperture="4.5" distance="1000" k1="-0.8436" k2="2.3162" k3="-2.0640"/>
++            <vignetting model="pa" focal="4.7" aperture="5.6" distance="10" k1="-0.8410" k2="2.4559" k3="-2.2453"/>
++            <vignetting model="pa" focal="4.7" aperture="5.6" distance="1000" k1="-0.8410" k2="2.4559" k3="-2.2453"/>
++            <vignetting model="pa" focal="4.7" aperture="7.1" distance="10" k1="-0.9368" k2="2.7497" k3="-2.5655"/>
++            <vignetting model="pa" focal="4.7" aperture="7.1" distance="1000" k1="-0.9368" k2="2.7497" k3="-2.5655"/>
++            <vignetting model="pa" focal="4.7" aperture="8" distance="10" k1="-1.0606" k2="2.8873" k3="-2.5985"/>
++            <vignetting model="pa" focal="4.7" aperture="8" distance="1000" k1="-1.0606" k2="2.8873" k3="-2.5985"/>
++            <vignetting model="pa" focal="6.9" aperture="1.6" distance="10" k1="-0.2169" k2="0.2225" k3="-0.0954"/>
++            <vignetting model="pa" focal="6.9" aperture="1.6" distance="1000" k1="-0.2169" k2="0.2225" k3="-0.0954"/>
++            <vignetting model="pa" focal="6.9" aperture="4.5" distance="10" k1="-0.3427" k2="0.4273" k3="-0.1984"/>
++            <vignetting model="pa" focal="6.9" aperture="4.5" distance="1000" k1="-0.3427" k2="0.4273" k3="-0.1984"/>
++            <vignetting model="pa" focal="6.9" aperture="5.6" distance="10" k1="-0.3136" k2="0.4624" k3="-0.2384"/>
++            <vignetting model="pa" focal="6.9" aperture="5.6" distance="1000" k1="-0.3136" k2="0.4624" k3="-0.2384"/>
++            <vignetting model="pa" focal="6.9" aperture="7.1" distance="10" k1="-0.3141" k2="0.4232" k3="-0.2166"/>
++            <vignetting model="pa" focal="6.9" aperture="7.1" distance="1000" k1="-0.3141" k2="0.4232" k3="-0.2166"/>
++            <vignetting model="pa" focal="6.9" aperture="8" distance="10" k1="-0.2774" k2="0.3500" k3="-0.1858"/>
++            <vignetting model="pa" focal="6.9" aperture="8" distance="1000" k1="-0.2774" k2="0.3500" k3="-0.1858"/>
++            <vignetting model="pa" focal="9.8" aperture="1.9" distance="10" k1="-0.1005" k2="0.1044" k3="-0.0444"/>
++            <vignetting model="pa" focal="9.8" aperture="1.9" distance="1000" k1="-0.1005" k2="0.1044" k3="-0.0444"/>
++            <vignetting model="pa" focal="9.8" aperture="4.5" distance="10" k1="-0.2848" k2="0.3649" k3="-0.1798"/>
++            <vignetting model="pa" focal="9.8" aperture="4.5" distance="1000" k1="-0.2848" k2="0.3649" k3="-0.1798"/>
++            <vignetting model="pa" focal="9.8" aperture="5.6" distance="10" k1="-0.2975" k2="0.4452" k3="-0.2304"/>
++            <vignetting model="pa" focal="9.8" aperture="5.6" distance="1000" k1="-0.2975" k2="0.4452" k3="-0.2304"/>
++            <vignetting model="pa" focal="9.8" aperture="7.1" distance="10" k1="-0.2567" k2="0.3476" k3="-0.1659"/>
++            <vignetting model="pa" focal="9.8" aperture="7.1" distance="1000" k1="-0.2567" k2="0.3476" k3="-0.1659"/>
++            <vignetting model="pa" focal="9.8" aperture="8" distance="10" k1="-0.2853" k2="0.3640" k3="-0.1642"/>
++            <vignetting model="pa" focal="9.8" aperture="8" distance="1000" k1="-0.2853" k2="0.3640" k3="-0.1642"/>
++            <vignetting model="pa" focal="13.7" aperture="2.1" distance="10" k1="-0.1202" k2="0.1498" k3="-0.0520"/>
++            <vignetting model="pa" focal="13.7" aperture="2.1" distance="1000" k1="-0.1202" k2="0.1498" k3="-0.0520"/>
++            <vignetting model="pa" focal="13.7" aperture="4.5" distance="10" k1="-0.2728" k2="0.4519" k3="-0.2301"/>
++            <vignetting model="pa" focal="13.7" aperture="4.5" distance="1000" k1="-0.2728" k2="0.4519" k3="-0.2301"/>
++            <vignetting model="pa" focal="13.7" aperture="5.6" distance="10" k1="-0.2041" k2="0.3199" k3="-0.1610"/>
++            <vignetting model="pa" focal="13.7" aperture="5.6" distance="1000" k1="-0.2041" k2="0.3199" k3="-0.1610"/>
++            <vignetting model="pa" focal="13.7" aperture="7.1" distance="10" k1="-0.2050" k2="0.3161" k3="-0.1558"/>
++            <vignetting model="pa" focal="13.7" aperture="7.1" distance="1000" k1="-0.2050" k2="0.3161" k3="-0.1558"/>
++            <vignetting model="pa" focal="13.7" aperture="8" distance="10" k1="-0.2083" k2="0.3043" k3="-0.1399"/>
++            <vignetting model="pa" focal="13.7" aperture="8" distance="1000" k1="-0.2083" k2="0.3043" k3="-0.1399"/>
++            <vignetting model="pa" focal="17.7" aperture="2.3" distance="10" k1="-0.1186" k2="0.2006" k3="-0.1067"/>
++            <vignetting model="pa" focal="17.7" aperture="2.3" distance="1000" k1="-0.1186" k2="0.2006" k3="-0.1067"/>
++            <vignetting model="pa" focal="17.7" aperture="4.5" distance="10" k1="-0.2314" k2="0.3522" k3="-0.1631"/>
++            <vignetting model="pa" focal="17.7" aperture="4.5" distance="1000" k1="-0.2314" k2="0.3522" k3="-0.1631"/>
++            <vignetting model="pa" focal="17.7" aperture="5.6" distance="10" k1="-0.2475" k2="0.3952" k3="-0.1927"/>
++            <vignetting model="pa" focal="17.7" aperture="5.6" distance="1000" k1="-0.2475" k2="0.3952" k3="-0.1927"/>
++            <vignetting model="pa" focal="17.7" aperture="7.1" distance="10" k1="-0.2621" k2="0.4297" k3="-0.2188"/>
++            <vignetting model="pa" focal="17.7" aperture="7.1" distance="1000" k1="-0.2621" k2="0.4297" k3="-0.2188"/>
++            <vignetting model="pa" focal="17.7" aperture="8" distance="10" k1="-0.2610" k2="0.4822" k3="-0.2689"/>
++            <vignetting model="pa" focal="17.7" aperture="8" distance="1000" k1="-0.2610" k2="0.4822" k3="-0.2689"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-LZ2 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicLZ2</mount>
+         <cropfactor>6.06</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.1" a="0.018339" b="-0.048901" c="0" />
+-            <distortion model="ptlens" focal="7" a="0.011425" b="-0.029522" c="0" />
+-            <distortion model="ptlens" focal="7.9" a="0.010736" b="-0.024495" c="0" />
+-            <distortion model="ptlens" focal="8.9" a="0.007669" b="-0.016263" c="0" />
+-            <distortion model="ptlens" focal="11.4" a="0" b="0.00068" c="0" />
+-            <distortion model="ptlens" focal="16.1" a="0" b="0.00105" c="0" />
+-            <distortion model="ptlens" focal="22.7" a="0" b="0.001032" c="0" />
+-            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="36.6" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="6.1" a="0.018339" b="-0.048901" c="0"/>
++            <distortion model="ptlens" focal="7" a="0.011425" b="-0.029522" c="0"/>
++            <distortion model="ptlens" focal="7.9" a="0.010736" b="-0.024495" c="0"/>
++            <distortion model="ptlens" focal="8.9" a="0.007669" b="-0.016263" c="0"/>
++            <distortion model="ptlens" focal="11.4" a="0" b="0.00068" c="0"/>
++            <distortion model="ptlens" focal="16.1" a="0" b="0.00105" c="0"/>
++            <distortion model="ptlens" focal="22.7" a="0" b="0.001032" c="0"/>
++            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="36.6" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-FX7 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicFX7</mount>
+         <cropfactor>6.05</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.004918" b="-0.016726" c="0" />
+-            <distortion model="ptlens" focal="8.5" a="0.003428" b="-0.010885" c="0" />
+-            <distortion model="ptlens" focal="10.1" a="0" b="-0.001831" c="0" />
+-            <distortion model="ptlens" focal="12.3" a="0" b="0.000183" c="0" />
+-            <distortion model="ptlens" focal="14" a="0" b="0.000416" c="0" />
+-            <distortion model="ptlens" focal="16.1" a="0" b="0.001765" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0" b="0.001235" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.004918" b="-0.016726" c="0"/>
++            <distortion model="ptlens" focal="8.5" a="0.003428" b="-0.010885" c="0"/>
++            <distortion model="ptlens" focal="10.1" a="0" b="-0.001831" c="0"/>
++            <distortion model="ptlens" focal="12.3" a="0" b="0.000183" c="0"/>
++            <distortion model="ptlens" focal="14" a="0" b="0.000416" c="0"/>
++            <distortion model="ptlens" focal="16.1" a="0" b="0.001765" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="0.001235" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-FZ28 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicFZ28</mount>
+-	    <focal min="4.8" max="86.4"/> 
+-	    <aperture min="2.8" max="4.4"/> 
++        <focal min="4.8" max="86.4"/>
++        <aperture min="2.8" max="8"/>
+         <cropfactor>5.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="4.8" a="0.0151051047088923" b="-0.0590418104126213"  c="0.0522404604411257" />
+-            <distortion model="ptlens" focal="5.5" a="0.0097263708023807" b="-0.0404126502555069" c="0.0356794326344223" />
+-            <distortion model="ptlens" focal="6.1" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123" />
+-            <distortion model="ptlens" focal="6.9" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123" />
+-            <distortion model="ptlens" focal="8.2" a="0.00252217796060456" b="0.00406258888297525" c="-0.00902488977450724" />
+-            <distortion model="ptlens" focal="8.2" a="0.0136046055037993" b="-0.0241186263472487" c="0.0125418235034799" />
+-            <distortion model="ptlens" focal="9.0" a="0.0137599637728544" b="-0.0250948730402496" c="0.0160544859044301" />
+-            <distortion model="ptlens" focal="11.9" a="0.000337392416435729" b="0.0100459086335183" c="-0.00994856944375364" />
+-            <distortion model="ptlens" focal="14.4" a="0.000732769598129668" b="0.00515254826530127" c="-0.00686539554143091" />
+-            <distortion model="ptlens" focal="14.9" a="0.00584048075864842" b="-0.0108398840906803" c="0.0100244102797433" />
+-            <distortion model="ptlens" focal="20.8" a="0.00028294704124076" b="0.000670293694980388" c="-0.0011265790621693" />
+-            <distortion model="ptlens" focal="25.2" a="-0.00259970212897242" b="0.00799923834974951" c="-0.0091582160365622" />
+-       </calibration>
+-   </lens>
+-
++            <distortion model="ptlens" focal="4.8" a="0.0151051047088923" b="-0.0590418104126213" c="0.0522404604411257"/>
++            <distortion model="ptlens" focal="5.5" a="0.0097263708023807" b="-0.0404126502555069" c="0.0356794326344223"/>
++            <distortion model="ptlens" focal="6.1" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123"/>
++            <distortion model="ptlens" focal="6.9" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123"/>
++            <distortion model="ptlens" focal="8.2" a="0.00252217796060456" b="0.00406258888297525" c="-0.00902488977450724"/>
++            <distortion model="ptlens" focal="8.2" a="0.0136046055037993" b="-0.0241186263472487" c="0.0125418235034799"/>
++            <distortion model="ptlens" focal="9.0" a="0.0137599637728544" b="-0.0250948730402496" c="0.0160544859044301"/>
++            <distortion model="ptlens" focal="11.9" a="0.000337392416435729" b="0.0100459086335183" c="-0.00994856944375364"/>
++            <distortion model="ptlens" focal="14.4" a="0.000732769598129668" b="0.00515254826530127" c="-0.00686539554143091"/>
++            <distortion model="ptlens" focal="14.9" a="0.00584048075864842" b="-0.0108398840906803" c="0.0100244102797433"/>
++            <distortion model="ptlens" focal="20.8" a="0.00028294704124076" b="0.000670293694980388" c="-0.0011265790621693"/>
++            <distortion model="ptlens" focal="25.2" a="-0.00259970212897242" b="0.00799923834974951" c="-0.0091582160365622"/>
++        </calibration>
++    </lens>
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-FZ30 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicFZ30</mount>
+         <cropfactor>4.73</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.4" a="0.014174" b="-0.039301" c="0" />
+-            <distortion model="ptlens" focal="8.9" a="0.011806" b="-0.025518" c="0" />
+-            <distortion model="ptlens" focal="10.9" a="0.005042" b="-0.008641" c="0" />
+-            <distortion model="ptlens" focal="15.1" a="0" b="0.002124" c="0" />
+-            <distortion model="ptlens" focal="21.7" a="0" b="0.001727" c="0" />
+-            <distortion model="ptlens" focal="31.8" a="0" b="-0.00058" c="0" />
+-            <distortion model="ptlens" focal="50.7" a="0" b="-0.002237" c="0" />
+-            <distortion model="ptlens" focal="63.9" a="0" b="-0.001695" c="0" />
+-            <distortion model="ptlens" focal="77.7" a="0" b="-0.001747" c="0" />
+-            <distortion model="ptlens" focal="88.8" a="0" b="-0.001182" c="0" />
++            <distortion model="ptlens" focal="7.4" a="0.014174" b="-0.039301" c="0"/>
++            <distortion model="ptlens" focal="8.9" a="0.011806" b="-0.025518" c="0"/>
++            <distortion model="ptlens" focal="10.9" a="0.005042" b="-0.008641" c="0"/>
++            <distortion model="ptlens" focal="15.1" a="0" b="0.002124" c="0"/>
++            <distortion model="ptlens" focal="21.7" a="0" b="0.001727" c="0"/>
++            <distortion model="ptlens" focal="31.8" a="0" b="-0.00058" c="0"/>
++            <distortion model="ptlens" focal="50.7" a="0" b="-0.002237" c="0"/>
++            <distortion model="ptlens" focal="63.9" a="0" b="-0.001695" c="0"/>
++            <distortion model="ptlens" focal="77.7" a="0" b="-0.001747" c="0"/>
++            <distortion model="ptlens" focal="88.8" a="0" b="-0.001182" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This lens is made for camera with a native aspect ratio of 4:3 but
++             unfortunately we have 3:2 data.  The crop factor is not that
++             different, though. -->
++        <maker>Panasonic</maker>
++        <model>DMC-FZ45 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicDMCFZ45</mount>
++        <cropfactor>5.81</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.5" a="0.00326892" b="-0.0150012" c="-0.0488601"/>
++            <distortion model="ptlens" focal="6.7" a="0.00422536" b="-0.0118633" c="-0.00142388"/>
++            <distortion model="ptlens" focal="7.9" a="0.00249683" b="-0.00344839" c="-0.00132302"/>
++            <distortion model="ptlens" focal="12.4" a="0" b="0.00470354" c="0"/>
++            <distortion model="ptlens" focal="13.8" a="0" b="0.00443564" c="0"/>
++            <distortion model="ptlens" focal="35.3" a="0" b="0.00177934" c="0"/>
++            <distortion model="ptlens" focal="108" a="0" b="0.000258829" c="0"/>
++            <tca model="poly3" focal="4.5" vr="1.0005000" vb="1.0003000"/>
++            <tca model="poly3" focal="6.7" vr="1.0002000" vb="1.0004000"/>
++            <tca model="poly3" focal="7.9" vr="1.0002000" vb="1.0004000"/>
++            <tca model="poly3" focal="12.4" vr="1.0001000" vb="1.0004000"/>
++            <tca model="poly3" focal="13.8" vr="0.9999000" vb="1.0002000"/>
++            <tca model="poly3" focal="35.3" vr="0.9999000" vb="1.0001000"/>
++            <tca model="poly3" focal="108" vr="0.9988000" vb="0.9998000"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-FZ10 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicFZ10</mount>
+         <cropfactor>5.84</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.015495" b="-0.046197" c="0" />
+-            <distortion model="ptlens" focal="7" a="0.014175" b="-0.026853" c="0" />
+-            <distortion model="ptlens" focal="12" a="0.00511" b="0.000522" c="0" />
+-            <distortion model="ptlens" focal="21.1" a="0" b="0.003946" c="0" />
+-            <distortion model="ptlens" focal="37.6" a="0" b="0.000939" c="0" />
+-            <distortion model="ptlens" focal="47.1" a="0" b="0.00102" c="0" />
+-            <distortion model="ptlens" focal="56.1" a="0" b="0.00117" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.001308" c="0" />
++            <distortion model="ptlens" focal="6" a="0.015495" b="-0.046197" c="0"/>
++            <distortion model="ptlens" focal="7" a="0.014175" b="-0.026853" c="0"/>
++            <distortion model="ptlens" focal="12" a="0.00511" b="0.000522" c="0"/>
++            <distortion model="ptlens" focal="21.1" a="0" b="0.003946" c="0"/>
++            <distortion model="ptlens" focal="37.6" a="0" b="0.000939" c="0"/>
++            <distortion model="ptlens" focal="47.1" a="0" b="0.00102" c="0"/>
++            <distortion model="ptlens" focal="56.1" a="0" b="0.00117" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0.001308" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-FZ5 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicFZ5</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.007805" b="-0.026346" c="0" />
+-            <distortion model="ptlens" focal="7.7" a="0.008566" b="-0.017707" c="0" />
+-            <distortion model="ptlens" focal="9.5" a="0" b="0.003184" c="0" />
+-            <distortion model="ptlens" focal="13.4" a="0.000617" b="0.002603" c="0" />
+-            <distortion model="ptlens" focal="26.8" a="0" b="0.001" c="0" />
+-            <distortion model="ptlens" focal="51.8" a="0" b="0.001249" c="0" />
+-            <distortion model="ptlens" focal="63.3" a="0" b="0.003277" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.004148" c="0" />
++            <distortion model="ptlens" focal="6" a="0.007805" b="-0.026346" c="0"/>
++            <distortion model="ptlens" focal="7.7" a="0.008566" b="-0.017707" c="0"/>
++            <distortion model="ptlens" focal="9.5" a="0" b="0.003184" c="0"/>
++            <distortion model="ptlens" focal="13.4" a="0.000617" b="0.002603" c="0"/>
++            <distortion model="ptlens" focal="26.8" a="0" b="0.001" c="0"/>
++            <distortion model="ptlens" focal="51.8" a="0" b="0.001249" c="0"/>
++            <distortion model="ptlens" focal="63.3" a="0" b="0.003277" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0.004148" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Standard</model>
++        <model>DMC-FZ3 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>panasonicFZ3</mount>
+         <cropfactor>7.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="4.6" a="0.016092" b="-0.047846" c="0" />
+-            <distortion model="ptlens" focal="5" a="0.01307" b="-0.031845" c="0" />
+-            <distortion model="ptlens" focal="5.7" a="0.011157" b="-0.020427" c="0" />
+-            <distortion model="ptlens" focal="6.2" a="0.010717" b="-0.017183" c="0" />
+-            <distortion model="ptlens" focal="10.1" a="0" b="0.006851" c="0" />
+-            <distortion model="ptlens" focal="16" a="0" b="0.002924" c="0" />
+-            <distortion model="ptlens" focal="22.9" a="0" b="0.001299" c="0" />
+-            <distortion model="ptlens" focal="30.5" a="0" b="0.001482" c="0" />
+-            <distortion model="ptlens" focal="37.8" a="0" b="0.000853" c="0" />
+-            <distortion model="ptlens" focal="50.9" a="0" b="0.003134" c="0" />
+-            <distortion model="ptlens" focal="55.2" a="0" b="0.002567" c="0" />
++            <distortion model="ptlens" focal="4.6" a="0.016092" b="-0.047846" c="0"/>
++            <distortion model="ptlens" focal="5" a="0.01307" b="-0.031845" c="0"/>
++            <distortion model="ptlens" focal="5.7" a="0.011157" b="-0.020427" c="0"/>
++            <distortion model="ptlens" focal="6.2" a="0.010717" b="-0.017183" c="0"/>
++            <distortion model="ptlens" focal="10.1" a="0" b="0.006851" c="0"/>
++            <distortion model="ptlens" focal="16" a="0" b="0.002924" c="0"/>
++            <distortion model="ptlens" focal="22.9" a="0" b="0.001299" c="0"/>
++            <distortion model="ptlens" focal="30.5" a="0" b="0.001482" c="0"/>
++            <distortion model="ptlens" focal="37.8" a="0" b="0.000853" c="0"/>
++            <distortion model="ptlens" focal="50.9" a="0" b="0.003134" c="0"/>
++            <distortion model="ptlens" focal="55.2" a="0" b="0.002567" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>DMC-FZ200 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicDMCFZ200</mount>
++        <cropfactor>5.56</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.5" a="0.02263" b="-0.08126" c="-0.02068"/>
++            <distortion model="ptlens" focal="6.4" a="0.02901" b="-0.09166" c="0.02698"/>
++            <distortion model="ptlens" focal="6.6" a="0.03178" b="-0.10015" c="0.03574"/>
++            <distortion model="ptlens" focal="9.1" a="0.01355" b="-0.0436" c="0.00536"/>
++            <distortion model="ptlens" focal="11.4" a="0" b="-0.01092" c="0"/>
++            <distortion model="ptlens" focal="18.7" a="0.01289" b="-0.04634" c="0.02406"/>
++            <distortion model="ptlens" focal="21.8" a="0" b="-0.00838" c="0"/>
++            <distortion model="ptlens" focal="33" a="0" b="-0.00853" c="0"/>
++            <distortion model="ptlens" focal="39.1" a="0" b="-0.00806" c="0"/>
++            <distortion model="ptlens" focal="53.4" a="0" b="-0.00832" c="0"/>
++            <distortion model="ptlens" focal="74.3" a="0" b="-0.00968" c="0"/>
++            <distortion model="ptlens" focal="108" a="0" b="-0.00966" c="0"/>
++            <tca model="poly3" focal="4.5" br="-0.0000282" vr="1.0003174" bb="-0.0001782" vb="1.0004494"/>
++            <tca model="poly3" focal="6.4" br="0.0000071" vr="1.0004512" bb="-0.0001618" vb="1.0005839"/>
++            <tca model="poly3" focal="6.6" br="0.0000598" vr="1.0002704" bb="-0.0000028" vb="1.0003658"/>
++            <tca model="poly3" focal="9.1" br="0.0000331" vr="1.0003041" bb="-0.0001697" vb="1.0005103"/>
++            <tca model="poly3" focal="11.4" br="0.0000330" vr="1.0003122" bb="-0.0001264" vb="1.0006757"/>
++            <tca model="poly3" focal="18.7" br="-0.0000000" vr="1.0001963" bb="-0.0000756" vb="1.0005116"/>
++            <tca model="poly3" focal="21.8" br="0.0000299" vr="1.0001076" bb="-0.0001118" vb="1.0003995"/>
++            <tca model="poly3" focal="33" br="-0.0000004" vr="1.0000426" bb="-0.0000728" vb="1.0001783"/>
++            <tca model="poly3" focal="39.1" br="0.0000028" vr="0.9999825" bb="-0.0000814" vb="1.0001422"/>
++            <tca model="poly3" focal="53.4" br="0.0000565" vr="0.9998327" bb="-0.0000872" vb="1.0000933"/>
++            <tca model="poly3" focal="74.3" br="0.0000610" vr="0.9997108" bb="-0.0000895" vb="0.9999250"/>
++            <tca model="poly3" focal="108" br="0.0000213" vr="0.9997623" bb="0.0000385" vb="0.9996617"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This calibration works for 3:2 as well as for 4:3 because the crop
++             factor is almost the same -->
++        <maker>Leica</maker>
++        <model>DMC-LX100 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicDMCLX100</mount>
++        <cropfactor>2.21</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="10.9" a="0.02706" b="-0.09683" c="-0.02057"/>
++            <distortion model="ptlens" focal="12.5" a="0.02981" b="-0.10327" c="0.00595"/>
++            <distortion model="ptlens" focal="15.9" a="0.02515" b="-0.08331" c="0.02024"/>
++            <distortion model="ptlens" focal="22.7" a="0.00868" b="-0.02576" c="-0.00005"/>
++            <distortion model="ptlens" focal="31.5" a="0" b="0.00046" c="0"/>
++            <distortion model="ptlens" focal="34" a="0" b="0.00324" c="0"/>
++            <tca model="poly3" focal="10.9" vr="1.0004851" vb="1.0000676"/>
++            <tca model="poly3" focal="12.5" vr="1.0004875" vb="1.0000645"/>
++            <tca model="poly3" focal="15.9" vr="1.0002464" vb="1.0000777"/>
++            <tca model="poly3" focal="22.7" vr="1.0001506" vb="1.0000442"/>
++            <tca model="poly3" focal="31.5" vr="1.0000419" vb="1.0000978"/>
++            <tca model="poly3" focal="34" vr="0.9999857" vb="1.0000940"/>
++            <vignetting model="pa" focal="10.9" aperture="1.7" distance="10" k1="-1.2310" k2="1.0827" k3="-0.5380"/>
++            <vignetting model="pa" focal="10.9" aperture="1.7" distance="1000" k1="-1.2310" k2="1.0827" k3="-0.5380"/>
++            <vignetting model="pa" focal="10.9" aperture="2.8" distance="10" k1="-0.4913" k2="0.3664" k3="-0.4053"/>
++            <vignetting model="pa" focal="10.9" aperture="2.8" distance="1000" k1="-0.4913" k2="0.3664" k3="-0.4053"/>
++            <vignetting model="pa" focal="10.9" aperture="4" distance="10" k1="-0.2715" k2="0.2062" k3="-0.3036"/>
++            <vignetting model="pa" focal="10.9" aperture="4" distance="1000" k1="-0.2715" k2="0.2062" k3="-0.3036"/>
++            <vignetting model="pa" focal="10.9" aperture="5.6" distance="10" k1="-0.4388" k2="0.2647" k3="-0.2038"/>
++            <vignetting model="pa" focal="10.9" aperture="5.6" distance="1000" k1="-0.4388" k2="0.2647" k3="-0.2038"/>
++            <vignetting model="pa" focal="10.9" aperture="8" distance="10" k1="-0.6673" k2="0.1891" k3="-0.0222"/>
++            <vignetting model="pa" focal="10.9" aperture="8" distance="1000" k1="-0.6673" k2="0.1891" k3="-0.0222"/>
++            <vignetting model="pa" focal="10.9" aperture="11" distance="10" k1="-0.6240" k2="-0.0502" k3="0.1670"/>
++            <vignetting model="pa" focal="10.9" aperture="11" distance="1000" k1="-0.6240" k2="-0.0502" k3="0.1670"/>
++            <vignetting model="pa" focal="12.5" aperture="2.1" distance="10" k1="-0.5847" k2="-0.1691" k3="0.1864"/>
++            <vignetting model="pa" focal="12.5" aperture="2.1" distance="1000" k1="-0.5847" k2="-0.1691" k3="0.1864"/>
++            <vignetting model="pa" focal="12.5" aperture="2.8" distance="10" k1="-0.2112" k2="-0.1747" k3="0.0303"/>
++            <vignetting model="pa" focal="12.5" aperture="2.8" distance="1000" k1="-0.2112" k2="-0.1747" k3="0.0303"/>
++            <vignetting model="pa" focal="12.5" aperture="4" distance="10" k1="-0.1170" k2="-0.3072" k3="0.1872"/>
++            <vignetting model="pa" focal="12.5" aperture="4" distance="1000" k1="-0.1170" k2="-0.3072" k3="0.1872"/>
++            <vignetting model="pa" focal="12.5" aperture="5.6" distance="10" k1="-0.2452" k2="-0.0083" k3="0.0035"/>
++            <vignetting model="pa" focal="12.5" aperture="5.6" distance="1000" k1="-0.2452" k2="-0.0083" k3="0.0035"/>
++            <vignetting model="pa" focal="12.5" aperture="8" distance="10" k1="-0.3687" k2="-0.1580" k3="0.1606"/>
++            <vignetting model="pa" focal="12.5" aperture="8" distance="1000" k1="-0.3687" k2="-0.1580" k3="0.1606"/>
++            <vignetting model="pa" focal="12.5" aperture="11" distance="10" k1="-0.5135" k2="-0.0079" k3="0.0920"/>
++            <vignetting model="pa" focal="12.5" aperture="11" distance="1000" k1="-0.5135" k2="-0.0079" k3="0.0920"/>
++            <vignetting model="pa" focal="15.9" aperture="2.3" distance="10" k1="-0.1022" k2="-0.4316" k3="0.2384"/>
++            <vignetting model="pa" focal="15.9" aperture="2.3" distance="1000" k1="-0.1022" k2="-0.4316" k3="0.2384"/>
++            <vignetting model="pa" focal="15.9" aperture="2.8" distance="10" k1="-0.2136" k2="0.0407" k3="-0.0872"/>
++            <vignetting model="pa" focal="15.9" aperture="2.8" distance="1000" k1="-0.2136" k2="0.0407" k3="-0.0872"/>
++            <vignetting model="pa" focal="15.9" aperture="4" distance="10" k1="-0.1280" k2="-0.0439" k3="0.0284"/>
++            <vignetting model="pa" focal="15.9" aperture="4" distance="1000" k1="-0.1280" k2="-0.0439" k3="0.0284"/>
++            <vignetting model="pa" focal="15.9" aperture="5.6" distance="10" k1="-0.1387" k2="-0.1319" k3="0.0989"/>
++            <vignetting model="pa" focal="15.9" aperture="5.6" distance="1000" k1="-0.1387" k2="-0.1319" k3="0.0989"/>
++            <vignetting model="pa" focal="15.9" aperture="8" distance="10" k1="-0.4416" k2="0.2785" k3="-0.1030"/>
++            <vignetting model="pa" focal="15.9" aperture="8" distance="1000" k1="-0.4416" k2="0.2785" k3="-0.1030"/>
++            <vignetting model="pa" focal="15.9" aperture="11" distance="10" k1="-0.4278" k2="0.1668" k3="-0.0298"/>
++            <vignetting model="pa" focal="15.9" aperture="11" distance="1000" k1="-0.4278" k2="0.1668" k3="-0.0298"/>
++            <vignetting model="pa" focal="22.7" aperture="2.7" distance="10" k1="-0.1457" k2="0.1441" k3="-0.2262"/>
++            <vignetting model="pa" focal="22.7" aperture="2.7" distance="1000" k1="-0.1457" k2="0.1441" k3="-0.2262"/>
++            <vignetting model="pa" focal="22.7" aperture="2.8" distance="10" k1="-0.1810" k2="0.2943" k3="-0.3341"/>
++            <vignetting model="pa" focal="22.7" aperture="2.8" distance="1000" k1="-0.1810" k2="0.2943" k3="-0.3341"/>
++            <vignetting model="pa" focal="22.7" aperture="4" distance="10" k1="-0.1907" k2="0.4320" k3="-0.3729"/>
++            <vignetting model="pa" focal="22.7" aperture="4" distance="1000" k1="-0.1907" k2="0.4320" k3="-0.3729"/>
++            <vignetting model="pa" focal="22.7" aperture="5.6" distance="10" k1="-0.1573" k2="0.1798" k3="-0.1591"/>
++            <vignetting model="pa" focal="22.7" aperture="5.6" distance="1000" k1="-0.1573" k2="0.1798" k3="-0.1591"/>
++            <vignetting model="pa" focal="22.7" aperture="8" distance="10" k1="-0.2614" k2="0.1065" k3="-0.0078"/>
++            <vignetting model="pa" focal="22.7" aperture="8" distance="1000" k1="-0.2614" k2="0.1065" k3="-0.0078"/>
++            <vignetting model="pa" focal="22.7" aperture="11" distance="10" k1="-0.2455" k2="0.0699" k3="0.0161"/>
++            <vignetting model="pa" focal="22.7" aperture="11" distance="1000" k1="-0.2455" k2="0.0699" k3="0.0161"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.0695" k2="-0.1646" k3="-0.0060"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.0695" k2="-0.1646" k3="-0.0060"/>
++            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.1321" k2="0.2856" k3="-0.3193"/>
++            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.1321" k2="0.2856" k3="-0.3193"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.1204" k2="0.1275" k3="-0.1137"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.1204" k2="0.1275" k3="-0.1137"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.2169" k2="0.1911" k3="-0.1275"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.2169" k2="0.1911" k3="-0.1275"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.2275" k2="0.1124" k3="-0.0330"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.2275" k2="0.1124" k3="-0.0330"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>FZ1000 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicFZ1000</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="9.1" a="0.01858" b="-0.05809" c="-0.06581"/>
++            <distortion model="ptlens" focal="10.1" a="0.01914" b="-0.06488" c="-0.03567"/>
++            <distortion model="ptlens" focal="12.6" a="0.01159" b="-0.0477" c="-0.00043"/>
++            <distortion model="ptlens" focal="18.2" a="0" b="-0.00914" c="0"/>
++            <distortion model="ptlens" focal="26.3" a="0" b="-0.00224" c="0"/>
++            <distortion model="ptlens" focal="65.8" a="0" b="0.00035" c="0"/>
++            <distortion model="ptlens" focal="109.3" a="0" b="0.00049" c="0"/>
++            <distortion model="ptlens" focal="146" a="0" b="-0.00305" c="0"/>
++            <tca model="poly3" focal="9.1" vr="1.0004262" vb="1.0003030"/>
++            <tca model="poly3" focal="9.1" vr="1.0004371" vb="1.0003172"/>
++            <tca model="poly3" focal="10.1" vr="1.0003178" vb="1.0001682"/>
++            <tca model="poly3" focal="12.6" vr="1.0003066" vb="1.0001788"/>
++            <tca model="poly3" focal="18.2" vr="1.0002344" vb="1.0002283"/>
++            <tca model="poly3" focal="18.2" vr="1.0002353" vb="1.0002221"/>
++            <tca model="poly3" focal="18.2" vr="1.0002476" vb="1.0002138"/>
++            <tca model="poly3" focal="26.3" vr="1.0001965" vb="1.0001175"/>
++            <tca model="poly3" focal="65.8" vr="1.0000103" vb="0.9999799"/>
++            <tca model="poly3" focal="109.3" vr="0.9999002" vb="0.9999031"/>
++            <tca model="poly3" focal="146" vr="0.9997527" vb="0.9998454"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>FZ150 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicFZ150</mount>
++        <focal min="4.5" max="54.7"/>
++        <cropfactor>5.56</cropfactor>
++        <calibration>
++            <distortion focal="4.5" model="ptlens" a="0.0109406" b="-0.042017" c="-0.0287289"/>
++            <distortion focal="6.2" model="ptlens" a="0.01238" b="-0.03216" c="0.00191"/>
++            <distortion focal="7" model="ptlens" a="0.00449447" b="-0.000799359" c="-0.0270328"/>
++            <distortion focal="10" model="ptlens" a="0.00224" b="0.00206" c="-0.00143"/>
++            <distortion focal="11.8" model="ptlens" a="0.00242159" b="0.00232646" c="-0.000967443"/>
++            <distortion focal="19.7" model="ptlens" a="0.00105492" b="0.0010669" c="5.33034e-06"/>
++            <distortion focal="54.7" model="ptlens" a="-0.00067858" b="-0.00127213" c="0.000975807"/>
++            <tca focal="4.5" model="poly3" br="0.0006938" cr="-0.0008628" vr="1.0004030" bb="-0.0007262" cb="0.0008623" vb="1.0003767"/>
++            <tca focal="6.2" model="poly3" br="0.0005127" cr="-0.0007866" vr="1.0004315" bb="-0.0004348" cb="0.0006767" vb="1.0003031"/>
++            <tca focal="7.0" model="poly3" br="0.0001114" cr="-0.0000751" vr="1.0001151" bb="-0.0001269" cb="0.0003163" vb="1.0003149"/>
++            <tca focal="10.0" model="poly3" br="-0.0008996" cr="0.0018212" vr="0.9994318" bb="-0.0027042" cb="0.0043072" vb="1.0001793"/>
++            <tca focal="11.8" model="poly3" br="-0.0001123" cr="0.0002160" vr="0.9999639" bb="-0.0000447" cb="-0.0002364" vb="1.0005859"/>
++            <tca focal="19.7" model="poly3" br="0.0001264" cr="-0.0002769" vr="1.0001582" bb="-0.0002199" cb="0.0002568" vb="1.0001491"/>
++            <tca focal="54.7" model="poly3" br="0.0000262" cr="0.0000067" vr="0.9998924" bb="-0.0000739" cb="0.0001647" vb="0.9998393"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>DMC-LF1 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicLF1</mount>
++        <cropfactor>4.67</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6" a="0.0290756" b="-0.105241" c="-0.00975908"/>
++            <distortion model="ptlens" focal="7.5" a="0.0254088" b="-0.104486" c="0.0517154"/>
++            <distortion model="ptlens" focal="10.7" a="0.00649441" b="-0.0339281" c="0.00949454"/>
++            <distortion model="ptlens" focal="15" a="-0.00579877" b="0.0113171" c="-0.0224867"/>
++            <distortion model="ptlens" focal="19.2" a="-0.0114423" b="0.0258147" c="-0.0243471"/>
++            <distortion model="ptlens" focal="28.9" a="-0.00393443" b="0.00375899" c="0.00442879"/>
++            <distortion model="ptlens" focal="34.2" a="-0.00539526" b="0.00468442" c="0.0148425"/>
++            <distortion model="ptlens" focal="42.8" a="-0.00292388" b="0.00778436" c="0.00956107"/>
++            <tca model="poly3" focal="6" br="0.0000082" vr="1.0004008" bb="-0.0000233" vb="1.0001733"/>
++            <tca model="poly3" focal="7.5" br="-0.0000519" vr="1.0005797" bb="0.0000232" vb="0.9999621"/>
++            <tca model="poly3" focal="10.7" br="-0.0001425" vr="1.0007670" bb="-0.0000026" vb="0.9998783"/>
++            <tca model="poly3" focal="15" br="-0.0000097" vr="1.0005447" bb="0.0000201" vb="0.9997567"/>
++            <tca model="poly3" focal="19.2" br="-0.0000350" vr="1.0004647" bb="0.0000041" vb="0.9996599"/>
++            <tca model="poly3" focal="28.9" br="0.0000107" vr="1.0001178" bb="-0.0000115" vb="0.9996089"/>
++            <tca model="poly3" focal="34.2" br="0.0000015" vr="0.9999963" bb="0.0000183" vb="0.9995892"/>
++            <tca model="poly3" focal="42.8" br="-0.0000327" vr="0.9998752" bb="0.0000593" vb="0.9996754"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>DMC-TZ71 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicTZ71</mount>
++        <cropfactor>5.58</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.3" a="0.10898" b="-0.3138" c="0.1171"/>
++            <distortion model="ptlens" focal="5.4" a="0.04935" b="-0.16257" c="0.08998"/>
++            <distortion model="ptlens" focal="6.3" a="0.0239" b="-0.07731" c="0.03149"/>
++            <distortion model="ptlens" focal="10.3" a="-0.016" b="0.04475" c="-0.02684"/>
++            <distortion model="ptlens" focal="11.7" a="-0.01122" b="0.02923" c="-0.01147"/>
++            <distortion model="ptlens" focal="41.4" a="-0.01376" b="0.03001" c="-0.00944"/>
++            <distortion model="ptlens" focal="129" a="-0.01196" b="0.02828" c="-0.03556"/>
++            <tca model="poly3" focal="4.3" vr="1.0004219" vb="1.0002436"/>
++            <tca model="poly3" focal="5.4" vr="1.0003684" vb="1.0001668"/>
++            <tca model="poly3" focal="6.3" vr="1.0004112" vb="1.0002591"/>
++            <tca model="poly3" focal="10.3" vr="1.0003052" vb="1.0002050"/>
++            <tca model="poly3" focal="11.7" vr="1.0001494" vb="1.0001194"/>
++            <tca model="poly3" focal="20.6" vr="1.0000405" vb="1.0001280"/>
++            <tca model="poly3" focal="41.4" vr="1.0000212" vb="1.0000264"/>
++            <tca model="poly3" focal="71.7" vr="0.9999084" vb="1.0000344"/>
++            <tca model="poly3" focal="129" vr="1.0000347" vb="0.9999647"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>DMC-TZ100 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>panasonicTZ100</mount>
++        <cropfactor>2.75</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="9.1" a="0.00708902" b="-0.040959" c="-0.0636536"/>
++            <distortion model="ptlens" focal="11" a="0.0095907" b="-0.0535213" c="0.00920877"/>
++            <distortion model="ptlens" focal="14.6" a="0" b="-0.0124246" c="0"/>
++            <distortion model="ptlens" focal="18.2" a="0" b="-0.00155103" c="0"/>
++            <distortion model="ptlens" focal="23.7" a="0" b="0.00368039" c="0"/>
++            <distortion model="ptlens" focal="36.6" a="0" b="0.00140267" c="0"/>
++            <distortion model="ptlens" focal="54.8" a="0" b="0.00153697" c="0"/>
++            <distortion model="ptlens" focal="91" a="0" b="-0.000878659" c="0"/>
++            <tca model="poly3" focal="9.1" vr="1.0003000" vb="1.0002000"/>
++            <tca model="poly3" focal="11" vr="1.0005000" vb="1.0002000"/>
++            <tca model="poly3" focal="14.6" vr="1.0005000" vb="1.0000000"/>
++            <tca model="poly3" focal="18.2" vr="1.0005000" vb="0.9999000"/>
++            <tca model="poly3" focal="23.7" vr="1.0004000" vb="0.9999000"/>
++            <tca model="poly3" focal="36.6" vr="1.0000000" vb="1.0000000"/>
++            <tca model="poly3" focal="54.8" vr="0.9997000" vb="1.0000000"/>
++            <tca model="poly3" focal="91" vr="0.9996000" vb="0.9995000"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-pentax.xml b/data/db/compact-pentax.xml
+--- a/data/db/compact-pentax.xml	2008-06-02 00:24:54.000000000 +0200
++++ b/data/db/compact-pentax.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,178 +1,151 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>pentax430</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>pentax230</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>pentax43WR</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>pentax750</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 43WR</model>
++        <model>Pentax Optio 43WR</model>
+         <model lang="en">Optio 43WR</model>
+         <mount>pentax43WR</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 750Z</model>
++        <model>Pentax Optio 750Z</model>
+         <model lang="en">Optio 750Z</model>
+         <mount>pentax750</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 555</model>
++        <model>Pentax Optio 555</model>
+         <model lang="en">Optio 555</model>
+         <mount>pentax750</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 550</model>
++        <model>Pentax Optio 550</model>
+         <model lang="en">Optio 550</model>
+         <mount>pentax750</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 450</model>
++        <model>Pentax Optio 450</model>
+         <model lang="en">Optio 450</model>
+         <mount>pentax750</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 33LF</model>
++        <model>Pentax Optio 33LF</model>
+         <model lang="en">Optio 33LF</model>
+         <mount>pentax230</mount>
+         <cropfactor>6.563</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 33L</model>
++        <model>Pentax Optio 33L</model>
+         <model lang="en">Optio 33L</model>
+         <mount>pentax230</mount>
+         <cropfactor>6.563</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 230GS</model>
++        <model>Pentax Optio 230GS</model>
+         <model lang="en">Optio 230GS</model>
+         <mount>pentax230</mount>
+         <cropfactor>6.563</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 330GS</model>
++        <model>Pentax Optio 330GS</model>
+         <model lang="en">Optio 330GS</model>
+         <mount>pentax230</mount>
+         <cropfactor>6.563</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Asahi Optical Co.,Ltd</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX Optio 430</model>
++        <model>Pentax Optio 430</model>
+         <model lang="en">Optio 430</model>
+         <mount>pentax430</mount>
+         <cropfactor>4.85</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>Standard</model>
++        <model>Pentax Optio 43WR &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>pentax43WR</mount>
+         <cropfactor>6.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.7" a="0.00051" b="-0.015327" c="0" />
+-            <distortion model="ptlens" focal="6.9" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="8.2" a="-0.006746" b="0.019261" c="0" />
+-            <distortion model="ptlens" focal="9.8" a="-0.011758" b="0.03348" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="-0.015423" b="0.040788" c="0" />
+-            <distortion model="ptlens" focal="14.7" a="-0.017255" b="0.043783" c="0" />
+-            <distortion model="ptlens" focal="16" a="-0.021041" b="0.050701" c="0" />
++            <distortion model="ptlens" focal="5.7" a="0.00051" b="-0.015327" c="0"/>
++            <distortion model="ptlens" focal="6.9" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="8.2" a="-0.006746" b="0.019261" c="0"/>
++            <distortion model="ptlens" focal="9.8" a="-0.011758" b="0.03348" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="-0.015423" b="0.040788" c="0"/>
++            <distortion model="ptlens" focal="14.7" a="-0.017255" b="0.043783" c="0"/>
++            <distortion model="ptlens" focal="16" a="-0.021041" b="0.050701" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>Standard</model>
++        <model>Pentax Optio 750Z &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>pentax750</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.8" a="0.017912" b="-0.044145" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0.010471" b="-0.016609" c="0" />
+-            <distortion model="ptlens" focal="10.9" a="0.00702" b="-0.002889" c="0" />
+-            <distortion model="ptlens" focal="12.8" a="0.007121" b="0.000786" c="0" />
+-            <distortion model="ptlens" focal="14.9" a="0.004833" b="0.007372" c="0" />
+-            <distortion model="ptlens" focal="20.4" a="0" b="0.016691" c="0" />
+-            <distortion model="ptlens" focal="27.8" a="0" b="0.016102" c="0" />
+-            <distortion model="ptlens" focal="39" a="0" b="0.011569" c="0" />
++            <distortion model="ptlens" focal="7.8" a="0.017912" b="-0.044145" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0.010471" b="-0.016609" c="0"/>
++            <distortion model="ptlens" focal="10.9" a="0.00702" b="-0.002889" c="0"/>
++            <distortion model="ptlens" focal="12.8" a="0.007121" b="0.000786" c="0"/>
++            <distortion model="ptlens" focal="14.9" a="0.004833" b="0.007372" c="0"/>
++            <distortion model="ptlens" focal="20.4" a="0" b="0.016691" c="0"/>
++            <distortion model="ptlens" focal="27.8" a="0" b="0.016102" c="0"/>
++            <distortion model="ptlens" focal="39" a="0" b="0.011569" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>Standard</model>
++        <model>Pentax Optio 230GS &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>pentax230</mount>
+         <cropfactor>6.563</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.021182" b="-0.054588" c="0" />
+-            <distortion model="ptlens" focal="7.8" a="-0.000669" b="-0.00783" c="0" />
+-            <distortion model="ptlens" focal="9.6" a="-0.002098" b="-0.001871" c="0" />
+-            <distortion model="ptlens" focal="11.5" a="-0.00268" b="0.000773" c="0" />
+-            <distortion model="ptlens" focal="13.3" a="-0.003061" b="0.001865" c="0" />
+-            <distortion model="ptlens" focal="15.2" a="0.003807" b="-0.012299" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0.001466" b="-0.007908" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.021182" b="-0.054588" c="0"/>
++            <distortion model="ptlens" focal="7.8" a="-0.000669" b="-0.00783" c="0"/>
++            <distortion model="ptlens" focal="9.6" a="-0.002098" b="-0.001871" c="0"/>
++            <distortion model="ptlens" focal="11.5" a="-0.00268" b="0.000773" c="0"/>
++            <distortion model="ptlens" focal="13.3" a="-0.003061" b="0.001865" c="0"/>
++            <distortion model="ptlens" focal="15.2" a="0.003807" b="-0.012299" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0.001466" b="-0.007908" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>Standard</model>
++        <model>Pentax Optio 430 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>pentax430</mount>
+         <cropfactor>4.85</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.6" a="0.00125" b="-0.015475" c="0" />
+-            <distortion model="ptlens" focal="10.2" a="0.003051" b="-0.012489" c="0" />
+-            <distortion model="ptlens" focal="12.6" a="0" b="-0.002855" c="0" />
+-            <distortion model="ptlens" focal="15.2" a="0" b="-0.001651" c="0" />
+-            <distortion model="ptlens" focal="17.7" a="0" b="-0.001512" c="0" />
+-            <distortion model="ptlens" focal="20.2" a="0" b="-0.00227" c="0" />
+-            <distortion model="ptlens" focal="22.8" a="0" b="-0.002609" c="0" />
++            <distortion model="ptlens" focal="7.6" a="0.00125" b="-0.015475" c="0"/>
++            <distortion model="ptlens" focal="10.2" a="0.003051" b="-0.012489" c="0"/>
++            <distortion model="ptlens" focal="12.6" a="0" b="-0.002855" c="0"/>
++            <distortion model="ptlens" focal="15.2" a="0" b="-0.001651" c="0"/>
++            <distortion model="ptlens" focal="17.7" a="0" b="-0.001512" c="0"/>
++            <distortion model="ptlens" focal="20.2" a="0" b="-0.00227" c="0"/>
++            <distortion model="ptlens" focal="22.8" a="0" b="-0.002609" c="0"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-ricoh.xml b/data/db/compact-ricoh.xml
+--- a/data/db/compact-ricoh.xml	2008-06-02 00:24:54.000000000 +0200
++++ b/data/db/compact-ricoh.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,110 +1,109 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>ricohGX</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>ricohGR</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>ricohRR30</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>RICOH</maker>
+-        <maker lang="en">Ricoh</maker>
++        <maker>Ricoh</maker>
+         <model>GR Digital</model>
+-        <mount>ricohGR</mount>
++        <mount>ricohGRdigital</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>RICOH</maker>
+-        <maker lang="en">Ricoh</maker>
++        <maker>Ricoh</maker>
+         <model>Caplio GX8</model>
+         <mount>ricohGX</mount>
+         <cropfactor>4.9</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>RICOH</maker>
+-        <maker lang="en">Ricoh</maker>
++        <maker>Ricoh</maker>
+         <model>Caplio GX</model>
+         <mount>ricohGX</mount>
+         <cropfactor>4.9</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>RICOH</maker>
+-        <maker lang="en">Ricoh</maker>
++        <maker>Ricoh</maker>
+         <model>Caplio RR30</model>
+         <mount>ricohRR30</mount>
+         <cropfactor>6.4</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Ricoh Imaging Company, Ltd.</maker>
++        <maker lang="en">Ricoh</maker>
++        <model>GR</model>
++        <mount>ricohGR</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
+     <lens>
+         <maker>Ricoh</maker>
+-        <model>Standard</model>
+-        <mount>ricohGR</mount>
++        <model>GR Digital &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>ricohGRdigital</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.9" a="0.008807" b="-0.022132" c="0" />
++            <distortion model="ptlens" focal="5.9" a="0.008807" b="-0.022132" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Ricoh</maker>
+-        <model>Standard</model>
++        <model>Caplio GX &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>ricohGX</mount>
+         <cropfactor>4.9</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.010201" b="-0.035572" c="0" />
+-            <distortion model="ptlens" focal="7.2" a="0.008368" b="-0.030732" c="0" />
+-            <distortion model="ptlens" focal="8.6" a="0" b="-0.011357" c="0" />
+-            <distortion model="ptlens" focal="10.6" a="0" b="-0.008582" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="-0.006789" c="0" />
+-            <distortion model="ptlens" focal="13.5" a="0" b="-0.005898" c="0" />
+-            <distortion model="ptlens" focal="15" a="0" b="-0.005782" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0" b="-0.004653" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.010201" b="-0.035572" c="0"/>
++            <distortion model="ptlens" focal="7.2" a="0.008368" b="-0.030732" c="0"/>
++            <distortion model="ptlens" focal="8.6" a="0" b="-0.011357" c="0"/>
++            <distortion model="ptlens" focal="10.6" a="0" b="-0.008582" c="0"/>
++            <distortion model="ptlens" focal="12" a="0" b="-0.006789" c="0"/>
++            <distortion model="ptlens" focal="13.5" a="0" b="-0.005898" c="0"/>
++            <distortion model="ptlens" focal="15" a="0" b="-0.005782" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="-0.004653" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Ricoh</maker>
+-        <model>DW-4</model>
++        <model>Caplio GX &amp; compatibles, with DW-4</model>
++        <model lang="en">fixed lens, with DW-4</model>
++        <model lang="de">festes Objektiv, mit DW-4</model>
+         <mount>ricohGX</mount>
+         <cropfactor>4.9</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.8" a="0.016596" b="-0.050843" c="0" />
+-            <distortion model="ptlens" focal="7.2" a="0.011694" b="-0.04205" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="-0.016018" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="-0.012339" c="0" />
+-            <distortion model="ptlens" focal="11.3" a="0" b="-0.011732" c="0" />
+-            <distortion model="ptlens" focal="13.5" a="0" b="-0.007362" c="0" />
+-            <distortion model="ptlens" focal="15.8" a="0" b="-0.005769" c="0" />
+-            <distortion model="ptlens" focal="17.4" a="0" b="-0.005946" c="0" />
++            <distortion model="ptlens" focal="5.8" a="0.016596" b="-0.050843" c="0"/>
++            <distortion model="ptlens" focal="7.2" a="0.011694" b="-0.04205" c="0"/>
++            <distortion model="ptlens" focal="9.3" a="0" b="-0.016018" c="0"/>
++            <distortion model="ptlens" focal="10" a="0" b="-0.012339" c="0"/>
++            <distortion model="ptlens" focal="11.3" a="0" b="-0.011732" c="0"/>
++            <distortion model="ptlens" focal="13.5" a="0" b="-0.007362" c="0"/>
++            <distortion model="ptlens" focal="15.8" a="0" b="-0.005769" c="0"/>
++            <distortion model="ptlens" focal="17.4" a="0" b="-0.005946" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Ricoh</maker>
+-        <model>Standard</model>
++        <model>Caplio RR30 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>ricohRR30</mount>
+         <cropfactor>6.4</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="5.7" a="0" b="-0.015153" c="0" />
+-            <distortion model="ptlens" focal="7" a="0" b="-0.008738" c="0" />
+-            <distortion model="ptlens" focal="8" a="0" b="-0.005355" c="0" />
+-            <distortion model="ptlens" focal="9.3" a="0" b="-0.003278" c="0" />
+-            <distortion model="ptlens" focal="11.6" a="0" b="-0.002382" c="0" />
+-            <distortion model="ptlens" focal="13.2" a="0" b="-0.003511" c="0" />
+-            <distortion model="ptlens" focal="16.3" a="0" b="-0.006576" c="0" />
++            <distortion model="poly3" focal="5.7" k1="-0.015153"/>
++            <distortion model="poly3" focal="7" k1="-0.008738"/>
++            <distortion model="poly3" focal="8" k1="-0.005355"/>
++            <distortion model="poly3" focal="9.3" k1="-0.003278"/>
++            <distortion model="poly3" focal="11.6" k1="-0.002382"/>
++            <distortion model="poly3" focal="13.2" k1="-0.003511"/>
++            <distortion model="poly3" focal="16.3" k1="-0.006576"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Ricoh</maker>
++        <model>Ricoh GR &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>ricohGR</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="18.3" a="0.01134" b="-0.03066" c="0.01059"/>
++            <tca model="poly3" focal="18.3" vr="1.0001157" vb="0.9999549"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-samsung.xml b/data/db/compact-samsung.xml
+--- a/data/db/compact-samsung.xml	2013-06-23 12:16:38.000000000 +0200
++++ b/data/db/compact-samsung.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,106 +1,117 @@
+ <lensdatabase>
+-
+-    <mount>
+-	    <name>SamsungWB2000</name>
+-	    <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-	    <maker>SAMSUNG</maker>
+-	    <model>WB2000</model>
+-	    <mount>SamsungWB2000</mount>
+-	    <cropfactor>5.69</cropfactor>
++        <maker>Samsung</maker>
++        <model>WB2000</model>
++        <mount>samsungWB2000</mount>
++        <cropfactor>5.69</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>SM-G935F</model>
++        <model lang="en">Galaxy S7</model>
++        <mount>samsungS7</mount>
++        <cropfactor>6.19</cropfactor>
+     </camera>
+-
+     <lens>
+-        <maker>SAMSUNG</maker>
+-        <model>Standard</model>
+-        <mount>SamsungWB2000</mount>
++        <maker>Samsung</maker>
++        <model>WB2000 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>samsungWB2000</mount>
+         <cropfactor>5.69</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.0252892" b="-0.097418" c="0.0155762" />
+-            <distortion model="ptlens" focal="28" a="0.0208251" b="-0.0732534" c="0.018483" />
+-            <distortion model="ptlens" focal="35" a="-0.0159443" b="0.0281739" c="-0.0246404" />
+-            <distortion model="ptlens" focal="42" a="0.00787344" b="-0.0252142" c="0.014697" />
+-            <distortion model="ptlens" focal="50" a="-0.00516537" b="0.0152856" c="-0.0109653" />
+-            <distortion model="ptlens" focal="60" a="-0.010784" b="0.0370302" c="-0.0322257" />
+-            <distortion model="ptlens" focal="70" a="0.00254554" b="0.000214427" c="0.00702316" />
+-            <distortion model="ptlens" focal="80" a="0.0052106" b="-0.00535521" c="0.0108253" />
+-            <distortion model="ptlens" focal="90" a="0.00510908" b="-0.00372541" c="0.00946807" />
+-            <distortion model="ptlens" focal="105" a="0.0110426" b="-0.0219426" c="0.0299614" />
+-            <distortion model="ptlens" focal="120" a="0.00208743" b="0.00549283" c="-0.0034208" />
+-            <tca model="poly3" focal="24" br="0.0001191" vr="0.9998426" bb="-0.0001814" vb="1.0004809" />
+-            <tca model="poly3" focal="28" br="0.0000640" vr="0.9998924" bb="-0.0001995" vb="1.0004667" />
+-            <tca model="poly3" focal="35" br="-0.0000158" vr="0.9999988" bb="-0.0001793" vb="1.0003610" />
+-            <tca model="poly3" focal="42" br="-0.0000450" vr="1.0000639" bb="-0.0001242" vb="1.0002915" />
+-            <tca model="poly3" focal="50" br="0.0000000" vr="1.0000319" bb="-0.0000292" vb="1.0001563" />
+-            <tca model="poly3" focal="60" br="-0.0000632" vr="1.0001260" bb="-0.0000484" vb="1.0001077" />
+-            <tca model="poly3" focal="70" br="-0.0000461" vr="1.0001466" bb="0.0000116" vb="0.9999822" />
+-            <tca model="poly3" focal="90" br="-0.0000537" vr="1.0002304" bb="0.0000495" vb="0.9998292" />
+-            <tca model="poly3" focal="120" br="0.0000124" vr="1.0002394" bb="0.0000194" vb="0.9997186" />
+-            <vignetting model="pa" focal="24" aperture="2.4" distance="10" k1="-0.7565" k2="0.9444" k3="-0.7155" />
+-            <vignetting model="pa" focal="24" aperture="2.4" distance="1000" k1="-0.7565" k2="0.9444" k3="-0.7155" />
+-            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.7379" k2="0.9837" k3="-0.7958" />
+-            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.7379" k2="0.9837" k3="-0.7958" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3262" k2="0.1244" k3="-0.1772" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3262" k2="0.1244" k3="-0.1772" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.6314" k2="1.4131" k3="-1.2231" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6314" k2="1.4131" k3="-1.2231" />
+-            <vignetting model="pa" focal="24" aperture="7.2" distance="10" k1="-1.0110" k2="2.8118" k3="-2.4533" />
+-            <vignetting model="pa" focal="24" aperture="7.2" distance="1000" k1="-1.0110" k2="2.8118" k3="-2.4533" />
+-            <vignetting model="pa" focal="28" aperture="3" distance="10" k1="-0.6151" k2="0.3369" k3="-0.0923" />
+-            <vignetting model="pa" focal="28" aperture="3" distance="1000" k1="-0.6151" k2="0.3369" k3="-0.0923" />
+-            <vignetting model="pa" focal="28" aperture="3.9" distance="10" k1="-0.2434" k2="-0.4317" k3="0.3851" />
+-            <vignetting model="pa" focal="28" aperture="3.9" distance="1000" k1="-0.2434" k2="-0.4317" k3="0.3851" />
+-            <vignetting model="pa" focal="28" aperture="5.5" distance="10" k1="-0.3866" k2="0.1025" k3="-0.0489" />
+-            <vignetting model="pa" focal="28" aperture="5.5" distance="1000" k1="-0.3866" k2="0.1025" k3="-0.0489" />
+-            <vignetting model="pa" focal="28" aperture="7.2" distance="10" k1="-0.4699" k2="0.2417" k3="-0.1107" />
+-            <vignetting model="pa" focal="28" aperture="7.2" distance="1000" k1="-0.4699" k2="0.2417" k3="-0.1107" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5318" k2="0.2489" k3="-0.0494" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5318" k2="0.2489" k3="-0.0494" />
+-            <vignetting model="pa" focal="35" aperture="3.8" distance="10" k1="-0.3641" k2="-0.1161" k3="0.1859" />
+-            <vignetting model="pa" focal="35" aperture="3.8" distance="1000" k1="-0.3641" k2="-0.1161" k3="0.1859" />
+-            <vignetting model="pa" focal="35" aperture="5.4" distance="10" k1="-0.3734" k2="0.0363" k3="0.0152" />
+-            <vignetting model="pa" focal="35" aperture="5.4" distance="1000" k1="-0.3734" k2="0.0363" k3="0.0152" />
+-            <vignetting model="pa" focal="35" aperture="7" distance="10" k1="-0.4810" k2="0.2589" k3="-0.1108" />
+-            <vignetting model="pa" focal="35" aperture="7" distance="1000" k1="-0.4810" k2="0.2589" k3="-0.1108" />
+-            <vignetting model="pa" focal="42" aperture="3.9" distance="10" k1="-0.4003" k2="0.0172" k3="0.0731" />
+-            <vignetting model="pa" focal="42" aperture="3.9" distance="1000" k1="-0.4003" k2="0.0172" k3="0.0731" />
+-            <vignetting model="pa" focal="42" aperture="5.5" distance="10" k1="-0.3585" k2="0.0573" k3="-0.0141" />
+-            <vignetting model="pa" focal="42" aperture="5.5" distance="1000" k1="-0.3585" k2="0.0573" k3="-0.0141" />
+-            <vignetting model="pa" focal="42" aperture="7.2" distance="10" k1="-0.3898" k2="0.1562" k3="-0.0459" />
+-            <vignetting model="pa" focal="42" aperture="7.2" distance="1000" k1="-0.3898" k2="0.1562" k3="-0.0459" />
+-            <vignetting model="pa" focal="50" aperture="4.4" distance="10" k1="-0.3642" k2="-0.0057" k3="0.0681" />
+-            <vignetting model="pa" focal="50" aperture="4.4" distance="1000" k1="-0.3642" k2="-0.0057" k3="0.0681" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3362" k2="0.0711" k3="-0.0238" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3362" k2="0.0711" k3="-0.0238" />
+-            <vignetting model="pa" focal="50" aperture="7.3" distance="10" k1="-0.3603" k2="0.1471" k3="-0.0377" />
+-            <vignetting model="pa" focal="50" aperture="7.3" distance="1000" k1="-0.3603" k2="0.1471" k3="-0.0377" />
+-            <vignetting model="pa" focal="60" aperture="5" distance="10" k1="-0.2746" k2="-0.0200" k3="0.0551" />
+-            <vignetting model="pa" focal="60" aperture="5" distance="1000" k1="-0.2746" k2="-0.0200" k3="0.0551" />
+-            <vignetting model="pa" focal="60" aperture="5.4" distance="10" k1="-0.2824" k2="0.0033" k3="0.0160" />
+-            <vignetting model="pa" focal="60" aperture="5.4" distance="1000" k1="-0.2824" k2="0.0033" k3="0.0160" />
+-            <vignetting model="pa" focal="60" aperture="7" distance="10" k1="-0.3103" k2="0.1113" k3="-0.0315" />
+-            <vignetting model="pa" focal="60" aperture="7" distance="1000" k1="-0.3103" k2="0.1113" k3="-0.0315" />
+-            <vignetting model="pa" focal="70" aperture="5.1" distance="10" k1="-0.3732" k2="0.1209" k3="-0.0264" />
+-            <vignetting model="pa" focal="70" aperture="5.1" distance="1000" k1="-0.3732" k2="0.1209" k3="-0.0264" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2776" k2="-0.0274" k3="0.0468" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2776" k2="-0.0274" k3="0.0468" />
+-            <vignetting model="pa" focal="70" aperture="7.2" distance="10" k1="-0.2932" k2="0.0988" k3="-0.0299" />
+-            <vignetting model="pa" focal="70" aperture="7.2" distance="1000" k1="-0.2932" k2="0.0988" k3="-0.0299" />
+-            <vignetting model="pa" focal="80" aperture="5.7" distance="10" k1="-0.3073" k2="0.0056" k3="0.0454" />
+-            <vignetting model="pa" focal="80" aperture="5.7" distance="1000" k1="-0.3073" k2="0.0056" k3="0.0454" />
+-            <vignetting model="pa" focal="80" aperture="7.3" distance="10" k1="-0.2675" k2="0.0560" k3="0.0149" />
+-            <vignetting model="pa" focal="80" aperture="7.3" distance="1000" k1="-0.2675" k2="0.0560" k3="0.0149" />
+-            <vignetting model="pa" focal="105" aperture="5.8" distance="10" k1="-0.3313" k2="0.0655" k3="0.0274" />
+-            <vignetting model="pa" focal="105" aperture="5.8" distance="1000" k1="-0.3313" k2="0.0655" k3="0.0274" />
+-            <vignetting model="pa" focal="105" aperture="7.6" distance="10" k1="-0.2368" k2="-0.0174" k3="0.0569" />
+-            <vignetting model="pa" focal="105" aperture="7.6" distance="1000" k1="-0.2368" k2="-0.0174" k3="0.0569" />
+-            <vignetting model="pa" focal="120" aperture="5.8" distance="10" k1="-0.3271" k2="0.0771" k3="0.0172" />
+-            <vignetting model="pa" focal="120" aperture="5.8" distance="1000" k1="-0.3271" k2="0.0771" k3="0.0172" />
+-            <vignetting model="pa" focal="120" aperture="7.5" distance="10" k1="-0.2428" k2="0.0351" k3="0.0172" />
+-            <vignetting model="pa" focal="120" aperture="7.5" distance="1000" k1="-0.2428" k2="0.0351" k3="0.0172" />
++            <distortion model="ptlens" focal="24" a="0.0252892" b="-0.097418" c="0.0155762"/>
++            <distortion model="ptlens" focal="28" a="0.0208251" b="-0.0732534" c="0.018483"/>
++            <distortion model="ptlens" focal="35" a="-0.0159443" b="0.0281739" c="-0.0246404"/>
++            <distortion model="ptlens" focal="42" a="0.00787344" b="-0.0252142" c="0.014697"/>
++            <distortion model="ptlens" focal="50" a="-0.00516537" b="0.0152856" c="-0.0109653"/>
++            <distortion model="ptlens" focal="60" a="-0.010784" b="0.0370302" c="-0.0322257"/>
++            <distortion model="ptlens" focal="70" a="0.00254554" b="0.000214427" c="0.00702316"/>
++            <distortion model="ptlens" focal="80" a="0.0052106" b="-0.00535521" c="0.0108253"/>
++            <distortion model="ptlens" focal="90" a="0.00510908" b="-0.00372541" c="0.00946807"/>
++            <distortion model="ptlens" focal="105" a="0.0110426" b="-0.0219426" c="0.0299614"/>
++            <distortion model="ptlens" focal="120" a="0.00208743" b="0.00549283" c="-0.0034208"/>
++            <tca model="poly3" focal="24" br="0.0001191" vr="0.9998426" bb="-0.0001814" vb="1.0004809"/>
++            <tca model="poly3" focal="28" br="0.0000640" vr="0.9998924" bb="-0.0001995" vb="1.0004667"/>
++            <tca model="poly3" focal="35" br="-0.0000158" vr="0.9999988" bb="-0.0001793" vb="1.0003610"/>
++            <tca model="poly3" focal="42" br="-0.0000450" vr="1.0000639" bb="-0.0001242" vb="1.0002915"/>
++            <tca model="poly3" focal="50" br="0.0000000" vr="1.0000319" bb="-0.0000292" vb="1.0001563"/>
++            <tca model="poly3" focal="60" br="-0.0000632" vr="1.0001260" bb="-0.0000484" vb="1.0001077"/>
++            <tca model="poly3" focal="70" br="-0.0000461" vr="1.0001466" bb="0.0000116" vb="0.9999822"/>
++            <tca model="poly3" focal="90" br="-0.0000537" vr="1.0002304" bb="0.0000495" vb="0.9998292"/>
++            <tca model="poly3" focal="120" br="0.0000124" vr="1.0002394" bb="0.0000194" vb="0.9997186"/>
++            <vignetting model="pa" focal="24" aperture="2.4" distance="10" k1="-0.7565" k2="0.9444" k3="-0.7155"/>
++            <vignetting model="pa" focal="24" aperture="2.4" distance="1000" k1="-0.7565" k2="0.9444" k3="-0.7155"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.7379" k2="0.9837" k3="-0.7958"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.7379" k2="0.9837" k3="-0.7958"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3262" k2="0.1244" k3="-0.1772"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3262" k2="0.1244" k3="-0.1772"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.6314" k2="1.4131" k3="-1.2231"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6314" k2="1.4131" k3="-1.2231"/>
++            <vignetting model="pa" focal="24" aperture="7.2" distance="10" k1="-1.0110" k2="2.8118" k3="-2.4533"/>
++            <vignetting model="pa" focal="24" aperture="7.2" distance="1000" k1="-1.0110" k2="2.8118" k3="-2.4533"/>
++            <vignetting model="pa" focal="28" aperture="3" distance="10" k1="-0.6151" k2="0.3369" k3="-0.0923"/>
++            <vignetting model="pa" focal="28" aperture="3" distance="1000" k1="-0.6151" k2="0.3369" k3="-0.0923"/>
++            <vignetting model="pa" focal="28" aperture="3.9" distance="10" k1="-0.2434" k2="-0.4317" k3="0.3851"/>
++            <vignetting model="pa" focal="28" aperture="3.9" distance="1000" k1="-0.2434" k2="-0.4317" k3="0.3851"/>
++            <vignetting model="pa" focal="28" aperture="5.5" distance="10" k1="-0.3866" k2="0.1025" k3="-0.0489"/>
++            <vignetting model="pa" focal="28" aperture="5.5" distance="1000" k1="-0.3866" k2="0.1025" k3="-0.0489"/>
++            <vignetting model="pa" focal="28" aperture="7.2" distance="10" k1="-0.4699" k2="0.2417" k3="-0.1107"/>
++            <vignetting model="pa" focal="28" aperture="7.2" distance="1000" k1="-0.4699" k2="0.2417" k3="-0.1107"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5318" k2="0.2489" k3="-0.0494"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5318" k2="0.2489" k3="-0.0494"/>
++            <vignetting model="pa" focal="35" aperture="3.8" distance="10" k1="-0.3641" k2="-0.1161" k3="0.1859"/>
++            <vignetting model="pa" focal="35" aperture="3.8" distance="1000" k1="-0.3641" k2="-0.1161" k3="0.1859"/>
++            <vignetting model="pa" focal="35" aperture="5.4" distance="10" k1="-0.3734" k2="0.0363" k3="0.0152"/>
++            <vignetting model="pa" focal="35" aperture="5.4" distance="1000" k1="-0.3734" k2="0.0363" k3="0.0152"/>
++            <vignetting model="pa" focal="35" aperture="7" distance="10" k1="-0.4810" k2="0.2589" k3="-0.1108"/>
++            <vignetting model="pa" focal="35" aperture="7" distance="1000" k1="-0.4810" k2="0.2589" k3="-0.1108"/>
++            <vignetting model="pa" focal="42" aperture="3.9" distance="10" k1="-0.4003" k2="0.0172" k3="0.0731"/>
++            <vignetting model="pa" focal="42" aperture="3.9" distance="1000" k1="-0.4003" k2="0.0172" k3="0.0731"/>
++            <vignetting model="pa" focal="42" aperture="5.5" distance="10" k1="-0.3585" k2="0.0573" k3="-0.0141"/>
++            <vignetting model="pa" focal="42" aperture="5.5" distance="1000" k1="-0.3585" k2="0.0573" k3="-0.0141"/>
++            <vignetting model="pa" focal="42" aperture="7.2" distance="10" k1="-0.3898" k2="0.1562" k3="-0.0459"/>
++            <vignetting model="pa" focal="42" aperture="7.2" distance="1000" k1="-0.3898" k2="0.1562" k3="-0.0459"/>
++            <vignetting model="pa" focal="50" aperture="4.4" distance="10" k1="-0.3642" k2="-0.0057" k3="0.0681"/>
++            <vignetting model="pa" focal="50" aperture="4.4" distance="1000" k1="-0.3642" k2="-0.0057" k3="0.0681"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3362" k2="0.0711" k3="-0.0238"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3362" k2="0.0711" k3="-0.0238"/>
++            <vignetting model="pa" focal="50" aperture="7.3" distance="10" k1="-0.3603" k2="0.1471" k3="-0.0377"/>
++            <vignetting model="pa" focal="50" aperture="7.3" distance="1000" k1="-0.3603" k2="0.1471" k3="-0.0377"/>
++            <vignetting model="pa" focal="60" aperture="5" distance="10" k1="-0.2746" k2="-0.0200" k3="0.0551"/>
++            <vignetting model="pa" focal="60" aperture="5" distance="1000" k1="-0.2746" k2="-0.0200" k3="0.0551"/>
++            <vignetting model="pa" focal="60" aperture="5.4" distance="10" k1="-0.2824" k2="0.0033" k3="0.0160"/>
++            <vignetting model="pa" focal="60" aperture="5.4" distance="1000" k1="-0.2824" k2="0.0033" k3="0.0160"/>
++            <vignetting model="pa" focal="60" aperture="7" distance="10" k1="-0.3103" k2="0.1113" k3="-0.0315"/>
++            <vignetting model="pa" focal="60" aperture="7" distance="1000" k1="-0.3103" k2="0.1113" k3="-0.0315"/>
++            <vignetting model="pa" focal="70" aperture="5.1" distance="10" k1="-0.3732" k2="0.1209" k3="-0.0264"/>
++            <vignetting model="pa" focal="70" aperture="5.1" distance="1000" k1="-0.3732" k2="0.1209" k3="-0.0264"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2776" k2="-0.0274" k3="0.0468"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2776" k2="-0.0274" k3="0.0468"/>
++            <vignetting model="pa" focal="70" aperture="7.2" distance="10" k1="-0.2932" k2="0.0988" k3="-0.0299"/>
++            <vignetting model="pa" focal="70" aperture="7.2" distance="1000" k1="-0.2932" k2="0.0988" k3="-0.0299"/>
++            <vignetting model="pa" focal="80" aperture="5.7" distance="10" k1="-0.3073" k2="0.0056" k3="0.0454"/>
++            <vignetting model="pa" focal="80" aperture="5.7" distance="1000" k1="-0.3073" k2="0.0056" k3="0.0454"/>
++            <vignetting model="pa" focal="80" aperture="7.3" distance="10" k1="-0.2675" k2="0.0560" k3="0.0149"/>
++            <vignetting model="pa" focal="80" aperture="7.3" distance="1000" k1="-0.2675" k2="0.0560" k3="0.0149"/>
++            <vignetting model="pa" focal="105" aperture="5.8" distance="10" k1="-0.3313" k2="0.0655" k3="0.0274"/>
++            <vignetting model="pa" focal="105" aperture="5.8" distance="1000" k1="-0.3313" k2="0.0655" k3="0.0274"/>
++            <vignetting model="pa" focal="105" aperture="7.6" distance="10" k1="-0.2368" k2="-0.0174" k3="0.0569"/>
++            <vignetting model="pa" focal="105" aperture="7.6" distance="1000" k1="-0.2368" k2="-0.0174" k3="0.0569"/>
++            <vignetting model="pa" focal="120" aperture="5.8" distance="10" k1="-0.3271" k2="0.0771" k3="0.0172"/>
++            <vignetting model="pa" focal="120" aperture="5.8" distance="1000" k1="-0.3271" k2="0.0771" k3="0.0172"/>
++            <vignetting model="pa" focal="120" aperture="7.5" distance="10" k1="-0.2428" k2="0.0351" k3="0.0172"/>
++            <vignetting model="pa" focal="120" aperture="7.5" distance="1000" k1="-0.2428" k2="0.0351" k3="0.0172"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samsung</maker>
++        <model>Samsung S7 wide angle lens cover</model>
++        <mount>samsungS7</mount>
++        <cropfactor>6.19</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.2" a="0.03904" b="-0.15646" c="0.13025"/>
++            <tca model="poly3" focal="4.2" vr="1.0000287" vb="1.0001262"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-sigma.xml b/data/db/compact-sigma.xml
+--- a/data/db/compact-sigma.xml	2013-08-14 10:09:02.000000000 +0200
++++ b/data/db/compact-sigma.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,120 +1,76 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>SigmaDP1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>SigmaDP1M</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>SigmaDP2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>SigmaDP2M</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>SigmaDP3M</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP1</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP1</model>
+         <model lang="en">DP1</model>
+-        <mount>SigmaDP1</mount>
++        <mount>sigmaDP1</mount>
+         <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP1 Merrill</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP1 Merrill</model>
+         <model lang="en">DP1 Merrill</model>
+-        <mount>SigmaDP1M</mount>
+-        <cropfactor>1.531</cropfactor>
++        <mount>sigmaDP1M</mount>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP1S</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP1S</model>
+         <model lang="en">DP1S</model>
+-        <mount>SigmaDP1</mount>
++        <mount>sigmaDP1</mount>
+         <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP1X</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP1X</model>
+         <model lang="en">DP1X</model>
+-        <mount>SigmaDP1</mount>
++        <mount>sigmaDP1</mount>
+         <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP2</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP2</model>
+         <model lang="en">DP2</model>
+-        <mount>SigmaDP2</mount>
++        <mount>sigmaDP2</mount>
+         <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP2 Merrill</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP2 Merrill</model>
+         <model lang="en">DP2 Merrill</model>
+-        <mount>SigmaDP2M</mount>
+-        <cropfactor>1.531</cropfactor>
++        <mount>sigmaDP2M</mount>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP2S</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP2S</model>
+         <model lang="en">DP2S</model>
+-        <mount>SigmaDP2</mount>
++        <mount>sigmaDP2</mount>
+         <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP2X</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP2X</model>
+         <model lang="en">DP2X</model>
+-        <mount>SigmaDP2</mount>
++        <mount>sigmaDP2</mount>
+         <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA DP3 Merrill</model>
++        <maker>Sigma</maker>
++        <model>Sigma DP3 Merrill</model>
+         <model lang="en">DP3 Merrill</model>
+-        <mount>SigmaDP3M</mount>
+-        <cropfactor>1.531</cropfactor>
++        <mount>sigmaDP3M</mount>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <lens>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>Standard</model>
+-        <mount>SigmaDP2</mount>
++        <maker>Sigma</maker>
++        <model>Sigma DP2 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sigmaDP2</mount>
+         <cropfactor>1.739</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24.2" a="0.00558" b="-0.01995" c="0.00605" />
++            <distortion model="ptlens" focal="24.2" a="0.00558" b="-0.01995" c="0.00605"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/compact-sony.xml b/data/db/compact-sony.xml
+--- a/data/db/compact-sony.xml	2012-08-25 11:48:34.000000000 +0200
++++ b/data/db/compact-sony.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,735 +1,1269 @@
+ <lensdatabase>
+-
+-    <mount>
+-        <name>sony707</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sony828</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyH1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyS85</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyV1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyW1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyR1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyS60</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyT1</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>sonyRX100</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-R1</model>
+         <mount>sonyR1</mount>
+         <cropfactor>1.68</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-H1</model>
+         <mount>sonyH1</mount>
+         <cropfactor>6.0</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-F828</model>
+         <mount>sony828</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
+-        <model>CYBERSHOT</model>
+-        <model lang="en">CyberShot</model>
++        <maker>Sony</maker>
++        <model>Cybershot</model>
++        <model lang="en">Cyber-shot</model>
+         <variant>DSC-F717</variant>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
+-        <model>CYBERSHOT</model>
+-        <model lang="en">CyberShot</model>
++        <maker>Sony</maker>
++        <model>Cybershot</model>
++        <model lang="en">Cyber-shot</model>
+         <variant>DSC-F707</variant>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-P200</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-P150</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-P100</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-P93</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-W12</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-W7</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-W15</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-W5</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-W1</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-V3</model>
+         <mount>sonyV1</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-V1</model>
+         <mount>sonyV1</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-T1</model>
+         <mount>sonyT1</mount>
+         <cropfactor>5.650</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
+-        <model>CYBERSHOT</model>
+-        <model lang="en">CyberShot</model>
++        <maker>Sony</maker>
++        <model>Cybershot</model>
++        <model lang="en">Cyber-shot</model>
+         <variant>DSC-S85</variant>
+         <mount>sonyS85</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
+-        <model>CYBERSHOT</model>
+-        <model lang="en">CyberShot</model>
++        <maker>Sony</maker>
++        <model>Cybershot</model>
++        <model lang="en">Cyber-shot</model>
+         <variant>DSC-S75</variant>
+         <mount>sonyS85</mount>
+         <cropfactor>4.843</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-S90</model>
+         <mount>sonyS60</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-ST80</model>
+         <mount>sonyS60</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-S80</model>
+         <mount>sonyS60</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-S60</model>
+         <mount>sonyS60</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSC-P73</model>
+         <mount>sonyS60</mount>
+         <cropfactor>6.5</cropfactor>
+     </camera>
+-    
+     <camera>
+         <maker>Sony</maker>
+         <model>DSC-RX100</model>
++        <model lang="en">RX100</model>
+         <mount>sonyRX100</mount>
+         <cropfactor>2.73</cropfactor>
+-    </camera>      
+-
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX100M2</model>
++        <model lang="en">RX100 II</model>
++        <mount>sonyRX100II</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX100M3</model>
++        <model lang="en">RX100 III</model>
++        <mount>sonyRX100III</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX100M4</model>
++        <model lang="en">RX100 IV</model>
++        <mount>sonyRX100III</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX100M5</model>
++        <model lang="en">RX100 V</model>
++        <mount>sonyRX100III</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-HX300</model>
++        <mount>sonyHX300</mount>
++        <cropfactor>5.58</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-HX20V</model>
++        <mount>sonyHX20V</mount>
++        <cropfactor>5.62</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>Xperia Z3</model>
++        <mount>sonyXperiaZ3</mount>
++        <cropfactor>7.87</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX10</model>
++        <model lang="en">RX10</model>
++        <mount>sonyRX10</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX10M2</model>
++        <model lang="en">RX10 II</model>
++        <mount>sonyRX10II</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX10M3</model>
++        <model lang="en">RX10 III</model>
++        <mount>sonyRX10III</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <!-- Added on the assumption that this is the same lens as RX10 III -->
++        <maker>Sony</maker>
++        <model>DSC-RX10M4</model>
++        <model lang="en">RX10 IV</model>
++        <mount>sonyRX10III</mount>
++        <cropfactor>2.73</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>DSC-RX1RM2</model>
++        <model lang="en">RX1 R II</model>
++        <mount>sonyRX1</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-R1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyR1</mount>
+         <cropfactor>1.68</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14.3" a="0.016048" b="-0.04251" c="0" />
+-            <distortion model="ptlens" focal="14.8" a="0.013923" b="-0.036204" c="0" />
+-            <distortion model="ptlens" focal="16" a="0.007736" b="-0.019699" c="0" />
+-            <distortion model="ptlens" focal="17.8" a="0.006109" b="-0.012654" c="0" />
+-            <distortion model="ptlens" focal="19.7" a="0.00779" b="-0.01452" c="0" />
+-            <distortion model="ptlens" focal="22.2" a="0.006436" b="-0.009769" c="0" />
+-            <distortion model="ptlens" focal="26.2" a="0" b="0.00356" c="0" />
+-            <distortion model="ptlens" focal="28.7" a="0" b="0.003947" c="0" />
+-            <distortion model="ptlens" focal="32.3" a="0" b="0.003852" c="0" />
+-            <distortion model="ptlens" focal="35.4" a="0" b="0.003556" c="0" />
+-            <distortion model="ptlens" focal="39.5" a="0" b="0.003135" c="0" />
+-            <distortion model="ptlens" focal="49.8" a="0" b="0.002513" c="0" />
+-            <distortion model="ptlens" focal="65.7" a="0" b="0.00051" c="0" />
+-            <distortion model="ptlens" focal="71.5" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="14.3" a="0.016048" b="-0.04251" c="0"/>
++            <distortion model="ptlens" focal="14.8" a="0.013923" b="-0.036204" c="0"/>
++            <distortion model="ptlens" focal="16" a="0.007736" b="-0.019699" c="0"/>
++            <distortion model="ptlens" focal="17.8" a="0.006109" b="-0.012654" c="0"/>
++            <distortion model="ptlens" focal="19.7" a="0.00779" b="-0.01452" c="0"/>
++            <distortion model="ptlens" focal="22.2" a="0.006436" b="-0.009769" c="0"/>
++            <distortion model="ptlens" focal="26.2" a="0" b="0.00356" c="0"/>
++            <distortion model="ptlens" focal="28.7" a="0" b="0.003947" c="0"/>
++            <distortion model="ptlens" focal="32.3" a="0" b="0.003852" c="0"/>
++            <distortion model="ptlens" focal="35.4" a="0" b="0.003556" c="0"/>
++            <distortion model="ptlens" focal="39.5" a="0" b="0.003135" c="0"/>
++            <distortion model="ptlens" focal="49.8" a="0" b="0.002513" c="0"/>
++            <distortion model="ptlens" focal="65.7" a="0" b="0.00051" c="0"/>
++            <distortion model="ptlens" focal="71.5" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-H1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyH1</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.021497" b="-0.054037" c="0" />
+-            <distortion model="ptlens" focal="6.4" a="0.020384" b="-0.046414" c="0" />
+-            <distortion model="ptlens" focal="6.7" a="0.015021" b="-0.03528" c="0" />
+-            <distortion model="ptlens" focal="7.1" a="0.012633" b="-0.028516" c="0" />
+-            <distortion model="ptlens" focal="7.8" a="0.012854" b="-0.025864" c="0" />
+-            <distortion model="ptlens" focal="8.9" a="0.006579" b="-0.010167" c="0" />
+-            <distortion model="ptlens" focal="9.8" a="0.008125" b="-0.013508" c="0" />
+-            <distortion model="ptlens" focal="14.2" a="0.004555" b="-0.006496" c="0" />
+-            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="45.2" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.001577" c="0" />
++            <distortion model="ptlens" focal="6" a="0.021497" b="-0.054037" c="0"/>
++            <distortion model="ptlens" focal="6.4" a="0.020384" b="-0.046414" c="0"/>
++            <distortion model="ptlens" focal="6.7" a="0.015021" b="-0.03528" c="0"/>
++            <distortion model="ptlens" focal="7.1" a="0.012633" b="-0.028516" c="0"/>
++            <distortion model="ptlens" focal="7.8" a="0.012854" b="-0.025864" c="0"/>
++            <distortion model="ptlens" focal="8.9" a="0.006579" b="-0.010167" c="0"/>
++            <distortion model="ptlens" focal="9.8" a="0.008125" b="-0.013508" c="0"/>
++            <distortion model="ptlens" focal="14.2" a="0.004555" b="-0.006496" c="0"/>
++            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="45.2" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0.001577" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>VCL-DH0758 0.7x Converter</model>
++        <model>DSC-H1 &amp; compatibles, with VCL-DH0758 0.7x converter</model>
++        <model lang="en">fixed lens, with VCL-DH0758 0.7× converter</model>
++        <model lang="de">festes Objektiv, mit VCL-DH0758 0.7×-Konverter</model>
+         <mount>sonyH1</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.026726" b="-0.080352" c="0" />
+-            <distortion model="ptlens" focal="6.6" a="0.022257" b="-0.062663" c="0" />
+-            <distortion model="ptlens" focal="7.5" a="0.017517" b="-0.047928" c="0" />
+-            <distortion model="ptlens" focal="8.4" a="0.013993" b="-0.036261" c="0" />
+-            <distortion model="ptlens" focal="9.6" a="0.009595" b="-0.025744" c="0" />
+-            <distortion model="ptlens" focal="10.9" a="0.005448" b="-0.015924" c="0" />
+-            <distortion model="ptlens" focal="13.8" a="0" b="-0.004096" c="0" />
+-            <distortion model="ptlens" focal="19.8" a="0" b="-0.003755" c="0" />
+-            <distortion model="ptlens" focal="28.4" a="0" b="-0.004627" c="0" />
+-            <distortion model="ptlens" focal="48" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="6" a="0.026726" b="-0.080352" c="0"/>
++            <distortion model="ptlens" focal="6.6" a="0.022257" b="-0.062663" c="0"/>
++            <distortion model="ptlens" focal="7.5" a="0.017517" b="-0.047928" c="0"/>
++            <distortion model="ptlens" focal="8.4" a="0.013993" b="-0.036261" c="0"/>
++            <distortion model="ptlens" focal="9.6" a="0.009595" b="-0.025744" c="0"/>
++            <distortion model="ptlens" focal="10.9" a="0.005448" b="-0.015924" c="0"/>
++            <distortion model="ptlens" focal="13.8" a="0" b="-0.004096" c="0"/>
++            <distortion model="ptlens" focal="19.8" a="0" b="-0.003755" c="0"/>
++            <distortion model="ptlens" focal="28.4" a="0" b="-0.004627" c="0"/>
++            <distortion model="ptlens" focal="48" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>VCL-DH1758 1.7x Converter</model>
++        <model>DSC-H1 &amp; compatibles, with VCL-DH1758 1.7x converter</model>
++        <model lang="en">fixed lens, with VCL-DH1758 1.7× converter</model>
++        <model lang="de">festes Objektiv, mit VCL-DH1758 1.7×-Konverter</model>
+         <mount>sonyH1</mount>
+         <cropfactor>6.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="22.5" a="0" b="-0.00573" c="0" />
+-            <distortion model="ptlens" focal="25.7" a="0" b="-0.005648" c="0" />
+-            <distortion model="ptlens" focal="32.1" a="0" b="-0.004426" c="0" />
+-            <distortion model="ptlens" focal="47.1" a="0" b="-0.00185" c="0" />
+-            <distortion model="ptlens" focal="61.7" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="68.3" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.001196" c="0" />
++            <distortion model="poly3" focal="22.5" k1="-0.00573"/>
++            <distortion model="poly3" focal="25.7" k1="-0.005648"/>
++            <distortion model="poly3" focal="32.1" k1="-0.004426"/>
++            <distortion model="poly3" focal="47.1" k1="-0.00185"/>
++            <distortion model="poly3" focal="61.7" k1="0"/>
++            <distortion model="poly3" focal="68.3" k1="0"/>
++            <distortion model="poly3" focal="72" k1="0.001196"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-F828 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sony828</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.018095" b="-0.048162" c="0" />
+-            <distortion model="ptlens" focal="8.1" a="0.014132" b="-0.032924" c="0" />
+-            <distortion model="ptlens" focal="8.7" a="-0.00066" b="-0.002438" c="0" />
+-            <distortion model="ptlens" focal="10.6" a="-0.004167" b="0.008802" c="0" />
+-            <distortion model="ptlens" focal="12.2" a="0.001366" b="-0.001343" c="0" />
+-            <distortion model="ptlens" focal="14.3" a="0.000869" b="0.000672" c="0" />
+-            <distortion model="ptlens" focal="17.5" a="-0.01026" b="0.019351" c="0" />
+-            <distortion model="ptlens" focal="20.5" a="0.002486" b="-0.001685" c="0" />
+-            <distortion model="ptlens" focal="25.5" a="0.016746" b="-0.028622" c="0" />
+-            <distortion model="ptlens" focal="29.3" a="-0.008873" b="0.019679" c="0" />
+-            <distortion model="ptlens" focal="33.4" a="-0.00044" b="0.003954" c="0" />
+-            <distortion model="ptlens" focal="40.7" a="0.010042" b="-0.013474" c="0" />
+-            <distortion model="ptlens" focal="51" a="-0.005786" b="0.018882" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.018095" b="-0.048162" c="0"/>
++            <distortion model="ptlens" focal="8.1" a="0.014132" b="-0.032924" c="0"/>
++            <distortion model="ptlens" focal="8.7" a="-0.00066" b="-0.002438" c="0"/>
++            <distortion model="ptlens" focal="10.6" a="-0.004167" b="0.008802" c="0"/>
++            <distortion model="ptlens" focal="12.2" a="0.001366" b="-0.001343" c="0"/>
++            <distortion model="ptlens" focal="14.3" a="0.000869" b="0.000672" c="0"/>
++            <distortion model="ptlens" focal="17.5" a="-0.01026" b="0.019351" c="0"/>
++            <distortion model="ptlens" focal="20.5" a="0.002486" b="-0.001685" c="0"/>
++            <distortion model="ptlens" focal="25.5" a="0.016746" b="-0.028622" c="0"/>
++            <distortion model="ptlens" focal="29.3" a="-0.008873" b="0.019679" c="0"/>
++            <distortion model="ptlens" focal="33.4" a="-0.00044" b="0.003954" c="0"/>
++            <distortion model="ptlens" focal="40.7" a="0.010042" b="-0.013474" c="0"/>
++            <distortion model="ptlens" focal="51" a="-0.005786" b="0.018882" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard: 2 feet lens-to-subject</model>
++        <model>DSC-F828 &amp; compatibles, at 2 feet lens-to-subject</model>
++        <model lang="en">fixed lens, at 2 feet lens-to-subject</model>
++        <model lang="de">festes Objektiv, bei 60 cm Fokusabstand</model>
+         <mount>sony828</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.1" a="0.031747" b="-0.075086" c="0" />
+-            <distortion model="ptlens" focal="8" a="0.015399" b="-0.03809" c="0" />
+-            <distortion model="ptlens" focal="8.7" a="0.014101" b="-0.032049" c="0" />
+-            <distortion model="ptlens" focal="10.4" a="0.004335" b="-0.010924" c="0" />
+-            <distortion model="ptlens" focal="12.2" a="0.001721" b="-0.004613" c="0" />
+-            <distortion model="ptlens" focal="14.9" a="-0.000396" b="-0.000724" c="0" />
+-            <distortion model="ptlens" focal="17.1" a="-0.006932" b="0.009088" c="0" />
+-            <distortion model="ptlens" focal="20.5" a="-0.000158" b="-0.001579" c="0" />
+-            <distortion model="ptlens" focal="24.2" a="-0.000815" b="-0.00117" c="0" />
+-            <distortion model="ptlens" focal="28.7" a="-0.002467" b="0.0025" c="0" />
+-            <distortion model="ptlens" focal="32.8" a="-0.000607" b="-0.001426" c="0" />
+-            <distortion model="ptlens" focal="40.1" a="-0.002333" b="0.002419" c="0" />
+-            <distortion model="ptlens" focal="51" a="-0.003365" b="0.002377" c="0" />
++            <distortion model="ptlens" focal="7.1" a="0.031747" b="-0.075086" c="0"/>
++            <distortion model="ptlens" focal="8" a="0.015399" b="-0.03809" c="0"/>
++            <distortion model="ptlens" focal="8.7" a="0.014101" b="-0.032049" c="0"/>
++            <distortion model="ptlens" focal="10.4" a="0.004335" b="-0.010924" c="0"/>
++            <distortion model="ptlens" focal="12.2" a="0.001721" b="-0.004613" c="0"/>
++            <distortion model="ptlens" focal="14.9" a="-0.000396" b="-0.000724" c="0"/>
++            <distortion model="ptlens" focal="17.1" a="-0.006932" b="0.009088" c="0"/>
++            <distortion model="ptlens" focal="20.5" a="-0.000158" b="-0.001579" c="0"/>
++            <distortion model="ptlens" focal="24.2" a="-0.000815" b="-0.00117" c="0"/>
++            <distortion model="ptlens" focal="28.7" a="-0.002467" b="0.0025" c="0"/>
++            <distortion model="ptlens" focal="32.8" a="-0.000607" b="-0.001426" c="0"/>
++            <distortion model="ptlens" focal="40.1" a="-0.002333" b="0.002419" c="0"/>
++            <distortion model="ptlens" focal="51" a="-0.003365" b="0.002377" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-F707 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.013439" b="-0.038147" c="0" />
+-            <distortion model="ptlens" focal="11.7" a="0.00984" b="-0.02115" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="0.009803" b="-0.01733" c="0" />
+-            <distortion model="ptlens" focal="16" a="0.007957" b="-0.008839" c="0" />
+-            <distortion model="ptlens" focal="19.5" a="0.004565" b="-0.000807" c="0" />
+-            <distortion model="ptlens" focal="24.4" a="0" b="0.00903" c="0" />
+-            <distortion model="ptlens" focal="28.1" a="0" b="0.009803" c="0" />
+-            <distortion model="ptlens" focal="31.9" a="0" b="0.009723" c="0" />
+-            <distortion model="ptlens" focal="36.1" a="0" b="0.00974" c="0" />
+-            <distortion model="ptlens" focal="41.4" a="0" b="0.010245" c="0" />
+-            <distortion model="ptlens" focal="48.5" a="0" b="0.012038" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.013439" b="-0.038147" c="0"/>
++            <distortion model="ptlens" focal="11.7" a="0.00984" b="-0.02115" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="0.009803" b="-0.01733" c="0"/>
++            <distortion model="ptlens" focal="16" a="0.007957" b="-0.008839" c="0"/>
++            <distortion model="ptlens" focal="19.5" a="0.004565" b="-0.000807" c="0"/>
++            <distortion model="ptlens" focal="24.4" a="0" b="0.00903" c="0"/>
++            <distortion model="ptlens" focal="28.1" a="0" b="0.009803" c="0"/>
++            <distortion model="ptlens" focal="31.9" a="0" b="0.009723" c="0"/>
++            <distortion model="ptlens" focal="36.1" a="0" b="0.00974" c="0"/>
++            <distortion model="ptlens" focal="41.4" a="0" b="0.010245" c="0"/>
++            <distortion model="ptlens" focal="48.5" a="0" b="0.012038" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 1 inch lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 1 inch lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 1 inch lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 1 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.006106" b="-0.039021" c="0" />
+-            <distortion model="ptlens" focal="10.9" a="0.001231" b="-0.028795" c="0" />
+-            <distortion model="ptlens" focal="11" a="0.001246" b="-0.027783" c="0" />
+-            <distortion model="ptlens" focal="11.9" a="-0.003364" b="-0.017023" c="0" />
+-            <distortion model="ptlens" focal="12.7" a="-0.0067" b="-0.007913" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.006106" b="-0.039021" c="0"/>
++            <distortion model="ptlens" focal="10.9" a="0.001231" b="-0.028795" c="0"/>
++            <distortion model="ptlens" focal="11" a="0.001246" b="-0.027783" c="0"/>
++            <distortion model="ptlens" focal="11.9" a="-0.003364" b="-0.017023" c="0"/>
++            <distortion model="ptlens" focal="12.7" a="-0.0067" b="-0.007913" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 2 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 2 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 2 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 2 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.006526" b="-0.03487" c="0" />
+-            <distortion model="ptlens" focal="10.9" a="-0.002841" b="-0.015131" c="0" />
+-            <distortion model="ptlens" focal="12.2" a="0.00522" b="-0.028071" c="0" />
+-            <distortion model="ptlens" focal="13.4" a="0.00207" b="-0.019368" c="0" />
+-            <distortion model="ptlens" focal="14.6" a="0.000187" b="-0.014489" c="0" />
+-            <distortion model="ptlens" focal="15.5" a="-0.001112" b="-0.01061" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.006526" b="-0.03487" c="0"/>
++            <distortion model="ptlens" focal="10.9" a="-0.002841" b="-0.015131" c="0"/>
++            <distortion model="ptlens" focal="12.2" a="0.00522" b="-0.028071" c="0"/>
++            <distortion model="ptlens" focal="13.4" a="0.00207" b="-0.019368" c="0"/>
++            <distortion model="ptlens" focal="14.6" a="0.000187" b="-0.014489" c="0"/>
++            <distortion model="ptlens" focal="15.5" a="-0.001112" b="-0.01061" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 4 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 4 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 4 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 4 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.011414" b="-0.041732" c="0" />
+-            <distortion model="ptlens" focal="10.2" a="0.011525" b="-0.041182" c="0" />
+-            <distortion model="ptlens" focal="11.4" a="0.005654" b="-0.02482" c="0" />
+-            <distortion model="ptlens" focal="12" a="0.007988" b="-0.028628" c="0" />
+-            <distortion model="ptlens" focal="12.4" a="0.007251" b="-0.026438" c="0" />
+-            <distortion model="ptlens" focal="13.7" a="0.005559" b="-0.021097" c="0" />
+-            <distortion model="ptlens" focal="16.2" a="0.000227" b="-0.007708" c="0" />
+-            <distortion model="ptlens" focal="18.3" a="0.005302" b="-0.015272" c="0" />
+-            <distortion model="ptlens" focal="19.8" a="0.000277" b="-0.004201" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.011414" b="-0.041732" c="0"/>
++            <distortion model="ptlens" focal="10.2" a="0.011525" b="-0.041182" c="0"/>
++            <distortion model="ptlens" focal="11.4" a="0.005654" b="-0.02482" c="0"/>
++            <distortion model="ptlens" focal="12" a="0.007988" b="-0.028628" c="0"/>
++            <distortion model="ptlens" focal="12.4" a="0.007251" b="-0.026438" c="0"/>
++            <distortion model="ptlens" focal="13.7" a="0.005559" b="-0.021097" c="0"/>
++            <distortion model="ptlens" focal="16.2" a="0.000227" b="-0.007708" c="0"/>
++            <distortion model="ptlens" focal="18.3" a="0.005302" b="-0.015272" c="0"/>
++            <distortion model="ptlens" focal="19.8" a="0.000277" b="-0.004201" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 6 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 6 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 6 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 6 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.010005" b="-0.036568" c="0" />
+-            <distortion model="ptlens" focal="11.6" a="0.007818" b="-0.025626" c="0" />
+-            <distortion model="ptlens" focal="13.4" a="0.008336" b="-0.023635" c="0" />
+-            <distortion model="ptlens" focal="16.2" a="0.003258" b="-0.010335" c="0" />
+-            <distortion model="ptlens" focal="18.5" a="0.002886" b="-0.007316" c="0" />
+-            <distortion model="ptlens" focal="21.7" a="-0.000938" b="0.000754" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.010005" b="-0.036568" c="0"/>
++            <distortion model="ptlens" focal="11.6" a="0.007818" b="-0.025626" c="0"/>
++            <distortion model="ptlens" focal="13.4" a="0.008336" b="-0.023635" c="0"/>
++            <distortion model="ptlens" focal="16.2" a="0.003258" b="-0.010335" c="0"/>
++            <distortion model="ptlens" focal="18.5" a="0.002886" b="-0.007316" c="0"/>
++            <distortion model="ptlens" focal="21.7" a="-0.000938" b="0.000754" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 8 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 8 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 8 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 8 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.008828" b="-0.033454" c="0" />
+-            <distortion model="ptlens" focal="10" a="0.009809" b="-0.034654" c="0" />
+-            <distortion model="ptlens" focal="12.3" a="0.00792" b="-0.023487" c="0" />
+-            <distortion model="ptlens" focal="14" a="0.008493" b="-0.022144" c="0" />
+-            <distortion model="ptlens" focal="15.7" a="0.007818" b="-0.018959" c="0" />
+-            <distortion model="ptlens" focal="17.6" a="0.007518" b="-0.01686" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.007483" b="-0.01459" c="0" />
+-            <distortion model="ptlens" focal="21.7" a="0.00499" b="-0.009241" c="0" />
+-            <distortion model="ptlens" focal="23.5" a="0.008569" b="-0.01449" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.008828" b="-0.033454" c="0"/>
++            <distortion model="ptlens" focal="10" a="0.009809" b="-0.034654" c="0"/>
++            <distortion model="ptlens" focal="12.3" a="0.00792" b="-0.023487" c="0"/>
++            <distortion model="ptlens" focal="14" a="0.008493" b="-0.022144" c="0"/>
++            <distortion model="ptlens" focal="15.7" a="0.007818" b="-0.018959" c="0"/>
++            <distortion model="ptlens" focal="17.6" a="0.007518" b="-0.01686" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.007483" b="-0.01459" c="0"/>
++            <distortion model="ptlens" focal="21.7" a="0.00499" b="-0.009241" c="0"/>
++            <distortion model="ptlens" focal="23.5" a="0.008569" b="-0.01449" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 12 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 12 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 12 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 12 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.005441" b="-0.026284" c="0" />
+-            <distortion model="ptlens" focal="11.8" a="0.002698" b="-0.013035" c="0" />
+-            <distortion model="ptlens" focal="13.7" a="0.002173" b="-0.007676" c="0" />
+-            <distortion model="ptlens" focal="16" a="0.001309" b="-0.003671" c="0" />
+-            <distortion model="ptlens" focal="20.3" a="-0.00041" b="0.001674" c="0" />
+-            <distortion model="ptlens" focal="23.2" a="-0.000971" b="0.004488" c="0" />
+-            <distortion model="ptlens" focal="26.2" a="0.001346" b="0.001204" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.005441" b="-0.026284" c="0"/>
++            <distortion model="ptlens" focal="11.8" a="0.002698" b="-0.013035" c="0"/>
++            <distortion model="ptlens" focal="13.7" a="0.002173" b="-0.007676" c="0"/>
++            <distortion model="ptlens" focal="16" a="0.001309" b="-0.003671" c="0"/>
++            <distortion model="ptlens" focal="20.3" a="-0.00041" b="0.001674" c="0"/>
++            <distortion model="ptlens" focal="23.2" a="-0.000971" b="0.004488" c="0"/>
++            <distortion model="ptlens" focal="26.2" a="0.001346" b="0.001204" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 16 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 16 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 16 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 16 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.003516" b="-0.019643" c="0" />
+-            <distortion model="ptlens" focal="10" a="0.006212" b="-0.024486" c="0" />
+-            <distortion model="ptlens" focal="11.8" a="0.005146" b="-0.014241" c="0" />
+-            <distortion model="ptlens" focal="14.4" a="-0.001178" b="0.002261" c="0" />
+-            <distortion model="ptlens" focal="17.2" a="-0.004022" b="0.010283" c="0" />
+-            <distortion model="ptlens" focal="19.8" a="-0.006228" b="0.0155" c="0" />
+-            <distortion model="ptlens" focal="22.2" a="-0.006146" b="0.016116" c="0" />
+-            <distortion model="ptlens" focal="25.1" a="-0.005856" b="0.016421" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.003516" b="-0.019643" c="0"/>
++            <distortion model="ptlens" focal="10" a="0.006212" b="-0.024486" c="0"/>
++            <distortion model="ptlens" focal="11.8" a="0.005146" b="-0.014241" c="0"/>
++            <distortion model="ptlens" focal="14.4" a="-0.001178" b="0.002261" c="0"/>
++            <distortion model="ptlens" focal="17.2" a="-0.004022" b="0.010283" c="0"/>
++            <distortion model="ptlens" focal="19.8" a="-0.006228" b="0.0155" c="0"/>
++            <distortion model="ptlens" focal="22.2" a="-0.006146" b="0.016116" c="0"/>
++            <distortion model="ptlens" focal="25.1" a="-0.005856" b="0.016421" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 20 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 20 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 20 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 20 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.007797" b="-0.028559" c="0" />
+-            <distortion model="ptlens" focal="11.3" a="0.005268" b="-0.015619" c="0" />
+-            <distortion model="ptlens" focal="13.2" a="0.00529" b="-0.010754" c="0" />
+-            <distortion model="ptlens" focal="15.7" a="0.000909" b="0.000249" c="0" />
+-            <distortion model="ptlens" focal="19" a="-0.001878" b="0.007994" c="0" />
+-            <distortion model="ptlens" focal="23.8" a="-0.005316" b="0.015693" c="0" />
+-            <distortion model="ptlens" focal="27.3" a="-0.002718" b="0.011242" c="0" />
+-            <distortion model="ptlens" focal="31" a="-0.005955" b="0.017757" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.007797" b="-0.028559" c="0"/>
++            <distortion model="ptlens" focal="11.3" a="0.005268" b="-0.015619" c="0"/>
++            <distortion model="ptlens" focal="13.2" a="0.00529" b="-0.010754" c="0"/>
++            <distortion model="ptlens" focal="15.7" a="0.000909" b="0.000249" c="0"/>
++            <distortion model="ptlens" focal="19" a="-0.001878" b="0.007994" c="0"/>
++            <distortion model="ptlens" focal="23.8" a="-0.005316" b="0.015693" c="0"/>
++            <distortion model="ptlens" focal="27.3" a="-0.002718" b="0.011242" c="0"/>
++            <distortion model="ptlens" focal="31" a="-0.005955" b="0.017757" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 24 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 24 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 24 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 24 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.010658" b="-0.033833" c="0" />
+-            <distortion model="ptlens" focal="11.7" a="0.005202" b="-0.013888" c="0" />
+-            <distortion model="ptlens" focal="13.8" a="-4.8e-05" b="0.000712" c="0" />
+-            <distortion model="ptlens" focal="16.8" a="0.000439" b="0.002163" c="0" />
+-            <distortion model="ptlens" focal="20.8" a="-0.003775" b="0.012109" c="0" />
+-            <distortion model="ptlens" focal="26.9" a="-0.004368" b="0.014947" c="0" />
+-            <distortion model="ptlens" focal="30.1" a="-0.007381" b="0.021336" c="0" />
+-            <distortion model="ptlens" focal="32.3" a="0.001832" b="0.004546" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.010658" b="-0.033833" c="0"/>
++            <distortion model="ptlens" focal="11.7" a="0.005202" b="-0.013888" c="0"/>
++            <distortion model="ptlens" focal="13.8" a="-4.8e-05" b="0.000712" c="0"/>
++            <distortion model="ptlens" focal="16.8" a="0.000439" b="0.002163" c="0"/>
++            <distortion model="ptlens" focal="20.8" a="-0.003775" b="0.012109" c="0"/>
++            <distortion model="ptlens" focal="26.9" a="-0.004368" b="0.014947" c="0"/>
++            <distortion model="ptlens" focal="30.1" a="-0.007381" b="0.021336" c="0"/>
++            <distortion model="ptlens" focal="32.3" a="0.001832" b="0.004546" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>std macro: 32 inches lens-to-subject</model>
++        <model>DSC-F707 &amp; compatibles, macro at 32 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro at 32 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro bei 32 Zoll Fokusabstand</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.011238" b="-0.03276" c="0" />
+-            <distortion model="ptlens" focal="11.7" a="0.010299" b="-0.022773" c="0" />
+-            <distortion model="ptlens" focal="12.9" a="0.006434" b="-0.011551" c="0" />
+-            <distortion model="ptlens" focal="16" a="0.00257" b="-0.000701" c="0" />
+-            <distortion model="ptlens" focal="20.8" a="-0.000547" b="0.007442" c="0" />
+-            <distortion model="ptlens" focal="25.8" a="-0.002161" b="0.011043" c="0" />
+-            <distortion model="ptlens" focal="32.8" a="-0.003287" b="0.014812" c="0" />
+-            <distortion model="ptlens" focal="41.9" a="-0.004935" b="0.018777" c="0" />
+-            <distortion model="ptlens" focal="48.5" a="0.004262" b="0.000662" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.011238" b="-0.03276" c="0"/>
++            <distortion model="ptlens" focal="11.7" a="0.010299" b="-0.022773" c="0"/>
++            <distortion model="ptlens" focal="12.9" a="0.006434" b="-0.011551" c="0"/>
++            <distortion model="ptlens" focal="16" a="0.00257" b="-0.000701" c="0"/>
++            <distortion model="ptlens" focal="20.8" a="-0.000547" b="0.007442" c="0"/>
++            <distortion model="ptlens" focal="25.8" a="-0.002161" b="0.011043" c="0"/>
++            <distortion model="ptlens" focal="32.8" a="-0.003287" b="0.014812" c="0"/>
++            <distortion model="ptlens" focal="41.9" a="-0.004935" b="0.018777" c="0"/>
++            <distortion model="ptlens" focal="48.5" a="0.004262" b="0.000662" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>VCL-HGD0758 Wide Angle</model>
++        <model>DSC-F707 &amp; compatibles, with VCL-HGD0758 wide angle</model>
++        <model lang="en">fixed lens, with VCL-HGD0758 wide angle</model>
++        <model lang="de">festes Objektiv, mit VCL-HGD0758 Weitwinkel</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="0.016774" b="-0.047703" c="0" />
+-            <distortion model="ptlens" focal="11" a="0.009581" b="-0.02965" c="0" />
+-            <distortion model="ptlens" focal="12" a="0.008705" b="-0.025049" c="0" />
+-            <distortion model="ptlens" focal="13.4" a="0.004145" b="-0.011484" c="0" />
+-            <distortion model="ptlens" focal="15.5" a="0.0037" b="-0.008603" c="0" />
+-            <distortion model="ptlens" focal="17.6" a="0.003904" b="-0.007234" c="0" />
+-            <distortion model="ptlens" focal="20.8" a="-0.002051" b="0.005661" c="0" />
+-            <distortion model="ptlens" focal="24.1" a="-0.001926" b="0.007451" c="0" />
+-            <distortion model="ptlens" focal="28.5" a="0.004636" b="-0.003879" c="0" />
+-            <distortion model="ptlens" focal="33.3" a="0.002188" b="0.002064" c="0" />
+-            <distortion model="ptlens" focal="38.7" a="0.004276" b="-0.001513" c="0" />
+-            <distortion model="ptlens" focal="48.5" a="0.0019" b="0.005193" c="0" />
++            <distortion model="ptlens" focal="9.7" a="0.016774" b="-0.047703" c="0"/>
++            <distortion model="ptlens" focal="11" a="0.009581" b="-0.02965" c="0"/>
++            <distortion model="ptlens" focal="12" a="0.008705" b="-0.025049" c="0"/>
++            <distortion model="ptlens" focal="13.4" a="0.004145" b="-0.011484" c="0"/>
++            <distortion model="ptlens" focal="15.5" a="0.0037" b="-0.008603" c="0"/>
++            <distortion model="ptlens" focal="17.6" a="0.003904" b="-0.007234" c="0"/>
++            <distortion model="ptlens" focal="20.8" a="-0.002051" b="0.005661" c="0"/>
++            <distortion model="ptlens" focal="24.1" a="-0.001926" b="0.007451" c="0"/>
++            <distortion model="ptlens" focal="28.5" a="0.004636" b="-0.003879" c="0"/>
++            <distortion model="ptlens" focal="33.3" a="0.002188" b="0.002064" c="0"/>
++            <distortion model="ptlens" focal="38.7" a="0.004276" b="-0.001513" c="0"/>
++            <distortion model="ptlens" focal="48.5" a="0.0019" b="0.005193" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Sakar 1858W</model>
++        <model>DSC-F707 &amp; compatibles, with Sakar 1858W</model>
++        <model lang="en">fixed lens, with Sakar 1858W</model>
++        <model lang="de">festes Objektiv, mit Sakar 1858W</model>
+         <mount>sony707</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9.7" a="-0.002331" b="0.001991" c="-0.087683" />
+-            <distortion model="ptlens" focal="11.2" a="0.007839" b="-0.04002" c="0" />
+-            <distortion model="ptlens" focal="15.5" a="0.003505" b="-0.0146" c="0" />
+-            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="30.1" a="0" b="0.003841" c="0" />
+-            <distortion model="ptlens" focal="48.5" a="0" b="0.008175" c="0" />
++            <distortion model="ptlens" focal="9.7" a="-0.002331" b="0.001991" c="-0.087683"/>
++            <distortion model="ptlens" focal="11.2" a="0.007839" b="-0.04002" c="0"/>
++            <distortion model="ptlens" focal="15.5" a="0.003505" b="-0.0146" c="0"/>
++            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="30.1" a="0" b="0.003841" c="0"/>
++            <distortion model="ptlens" focal="48.5" a="0" b="0.008175" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-W1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyW1</mount>
+         <cropfactor>4.8</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7.9" a="-0.008279" b="0.002007" c="0" />
+-            <distortion model="ptlens" focal="9.2" a="-0.007809" b="0.005" c="0" />
+-            <distortion model="ptlens" focal="10.7" a="-0.007003" b="0.007151" c="0" />
+-            <distortion model="ptlens" focal="12.1" a="-0.009672" b="0.0148" c="0" />
+-            <distortion model="ptlens" focal="13.7" a="-0.007984" b="0.013" c="0" />
+-            <distortion model="ptlens" focal="16.7" a="-0.006571" b="0.011638" c="0" />
+-            <distortion model="ptlens" focal="18.7" a="-0.007423" b="0.014476" c="0" />
+-            <distortion model="ptlens" focal="23.7" a="-0.00342" b="0.006814" c="0" />
++            <distortion model="ptlens" focal="7.9" a="-0.008279" b="0.002007" c="0"/>
++            <distortion model="ptlens" focal="9.2" a="-0.007809" b="0.005" c="0"/>
++            <distortion model="ptlens" focal="10.7" a="-0.007003" b="0.007151" c="0"/>
++            <distortion model="ptlens" focal="12.1" a="-0.009672" b="0.0148" c="0"/>
++            <distortion model="ptlens" focal="13.7" a="-0.007984" b="0.013" c="0"/>
++            <distortion model="ptlens" focal="16.7" a="-0.006571" b="0.011638" c="0"/>
++            <distortion model="ptlens" focal="18.7" a="-0.007423" b="0.014476" c="0"/>
++            <distortion model="ptlens" focal="23.7" a="-0.00342" b="0.006814" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-V1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyV1</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.020149" b="-0.051282" c="0" />
+-            <distortion model="ptlens" focal="8.4" a="0.009589" b="-0.02989" c="0" />
+-            <distortion model="ptlens" focal="9.9" a="0.005758" b="-0.01638" c="0" />
+-            <distortion model="ptlens" focal="11.8" a="0.004149" b="-0.008145" c="0" />
+-            <distortion model="ptlens" focal="13.9" a="0.003385" b="-0.003763" c="0" />
+-            <distortion model="ptlens" focal="16.5" a="0" b="0.004756" c="0" />
+-            <distortion model="ptlens" focal="19.7" a="0" b="0.005925" c="0" />
+-            <distortion model="ptlens" focal="23.4" a="0" b="0.006385" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="0.00446" c="0" />
++            <distortion model="ptlens" focal="7" a="0.020149" b="-0.051282" c="0"/>
++            <distortion model="ptlens" focal="8.4" a="0.009589" b="-0.02989" c="0"/>
++            <distortion model="ptlens" focal="9.9" a="0.005758" b="-0.01638" c="0"/>
++            <distortion model="ptlens" focal="11.8" a="0.004149" b="-0.008145" c="0"/>
++            <distortion model="ptlens" focal="13.9" a="0.003385" b="-0.003763" c="0"/>
++            <distortion model="ptlens" focal="16.5" a="0" b="0.004756" c="0"/>
++            <distortion model="ptlens" focal="19.7" a="0" b="0.005925" c="0"/>
++            <distortion model="ptlens" focal="23.4" a="0" b="0.006385" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="0.00446" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>VCL-DEH07V Converter</model>
++        <model>DSC-V1 &amp; compatibles, with VCL-DEH07V converter</model>
++        <model lang="en">fixed lens, with VCL-DEH07V converter</model>
++        <model lang="de">festes Objektiv, mit VCL-DEH07V-Konverter</model>
+         <mount>sonyV1</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.045731" b="-0.098626" c="0" />
++            <distortion model="ptlens" focal="7" a="0.045731" b="-0.098626" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>VCL-DEH17V Converter</model>
++        <model>DSC-V1 &amp; compatibles, with VCL-DEH17V converter</model>
++        <model lang="en">fixed lens, with VCL-DEH17V converter</model>
++        <model lang="de">festes Objektiv, mit VCL-DEH17V-Konverter</model>
+         <mount>sonyV1</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="0.009101" c="0" />
++            <distortion model="poly3" focal="28" k1="0.009101"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-T1 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyT1</mount>
+         <cropfactor>5.650</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6.7" a="0" b="-0.014873" c="0" />
+-            <distortion model="ptlens" focal="7.7" a="0" b="-0.006302" c="0" />
+-            <distortion model="ptlens" focal="9.1" a="0" b="0.008439" c="-0.020907" />
+-            <distortion model="ptlens" focal="10.8" a="0" b="0.017351" c="-0.032506" />
+-            <distortion model="ptlens" focal="13" a="0" b="0.017565" c="-0.023987" />
+-            <distortion model="ptlens" focal="15.4" a="0" b="0.015416" c="-0.016469" />
+-            <distortion model="ptlens" focal="17.8" a="0" b="0.019638" c="-0.022392" />
+-            <distortion model="ptlens" focal="20.1" a="0" b="0.020712" c="-0.027228" />
++            <distortion model="ptlens" focal="6.7" a="0" b="-0.014873" c="0"/>
++            <distortion model="ptlens" focal="7.7" a="0" b="-0.006302" c="0"/>
++            <distortion model="ptlens" focal="9.1" a="0" b="0.008439" c="-0.020907"/>
++            <distortion model="ptlens" focal="10.8" a="0" b="0.017351" c="-0.032506"/>
++            <distortion model="ptlens" focal="13" a="0" b="0.017565" c="-0.023987"/>
++            <distortion model="ptlens" focal="15.4" a="0" b="0.015416" c="-0.016469"/>
++            <distortion model="ptlens" focal="17.8" a="0" b="0.019638" c="-0.022392"/>
++            <distortion model="ptlens" focal="20.1" a="0" b="0.020712" c="-0.027228"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-S85 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyS85</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.014946" b="-0.03766" c="0" />
++            <distortion model="ptlens" focal="7" a="0.014946" b="-0.03766" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>VCL-MHG07a</model>
++        <model>DSC-S85 &amp; compatibles, with VCL-MHG07a converter</model>
++        <model lang="en">fixed lens, with VCL-MHG07a converter</model>
++        <model lang="de">festes Objektiv, mit VCL-MHG07a-Konverter</model>
+         <mount>sonyS85</mount>
+         <cropfactor>4.843</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="0.03951" b="-0.094976" c="0" />
++            <distortion model="ptlens" focal="7" a="0.03951" b="-0.094976" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Carl Zeiss</maker>
+-        <model>Standard</model>
++        <model>DSC-S60 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyS60</mount>
+         <cropfactor>6.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="6" a="0.003091" b="-0.022634" c="0" />
+-            <distortion model="ptlens" focal="6.8" a="0" b="-0.011585" c="0" />
+-            <distortion model="ptlens" focal="7.8" a="0" b="-0.008459" c="0" />
+-            <distortion model="ptlens" focal="8.9" a="0" b="-0.006522" c="0" />
+-            <distortion model="ptlens" focal="10.3" a="0" b="-0.004379" c="0" />
+-            <distortion model="ptlens" focal="11.6" a="0" b="-0.005021" c="0" />
+-            <distortion model="ptlens" focal="13.6" a="0" b="-0.0056" c="0" />
+-            <distortion model="ptlens" focal="15.6" a="0" b="-0.004708" c="0" />
+-            <distortion model="ptlens" focal="18" a="0" b="-0.004799" c="0" />
++            <distortion model="ptlens" focal="6" a="0.003091" b="-0.022634" c="0"/>
++            <distortion model="ptlens" focal="6.8" a="0" b="-0.011585" c="0"/>
++            <distortion model="ptlens" focal="7.8" a="0" b="-0.008459" c="0"/>
++            <distortion model="ptlens" focal="8.9" a="0" b="-0.006522" c="0"/>
++            <distortion model="ptlens" focal="10.3" a="0" b="-0.004379" c="0"/>
++            <distortion model="ptlens" focal="11.6" a="0" b="-0.005021" c="0"/>
++            <distortion model="ptlens" focal="13.6" a="0" b="-0.0056" c="0"/>
++            <distortion model="ptlens" focal="15.6" a="0" b="-0.004708" c="0"/>
++            <distortion model="ptlens" focal="18" a="0" b="-0.004799" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>RX100</model>
+-        <focal value="10.4" />
++        <model>DSC-RX100 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>sonyRX100</mount>
++        <focal min="10.4" max="37.1"/>
+         <cropfactor>2.73</cropfactor>
+         <calibration>
+-            <distortion focal="10.4" model="ptlens" a="0.00836" b="-0.05316" c="-0.02788" />
+-            <distortion focal="12.8" model="ptlens" a="0.00891" b="-0.06095" c="0.02196" />
+-            <distortion focal="14.9" model="ptlens" a="-0.00571" b="0.00909" c="-0.06449" />
+-            <distortion focal="16.6" model="ptlens" a="-0.00428" b="-0.01113" c="0.0042" />
+-            <distortion focal="19.1" model="ptlens" a="0.00523" b="-0.03743" c="0.03369" />
+-            <distortion focal="20.4" model="ptlens" a="-0.00312" b="-0.00368" c="-0.0036" />
+-            <distortion focal="23.3" model="ptlens" a="-0.00222" b="-0.00843" c="0.01379" />
+-            <distortion focal="25" model="ptlens" a="-0.00565" b="0.0037" c="0.00318" />
+-            <distortion focal="26.9" model="ptlens" a="-0.00245" b="-0.00859" c="0.01924" />
+-            <distortion focal="28.8" model="ptlens" a="-0.00842" b="0.0158" c="-0.01114" />
+-            <distortion focal="33.2" model="ptlens" a="-0.01065" b="0.02132" c="-0.01154" />
+-            <distortion focal="37.1" model="ptlens" a="0.00226" b="-0.02401" c="0.0397" />
++            <distortion model="ptlens" focal="10.4" a="0.01545" b="-0.08481" c="0.01241"/>
++            <distortion model="ptlens" focal="10.5" a="0.01626" b="-0.08787" c="0.01927"/>
++            <distortion model="ptlens" focal="11" a="0.01399" b="-0.08007" c="0.01782"/>
++            <distortion model="ptlens" focal="11.9" a="0.00893" b="-0.06134" c="0.01024"/>
++            <distortion model="ptlens" focal="12.3" a="0.00845" b="-0.06008" c="0.01686"/>
++            <distortion model="ptlens" focal="12.6" a="0.00961" b="-0.06359" c="0.02584"/>
++            <distortion model="ptlens" focal="13.6" a="0.00609" b="-0.05032" c="0.01908"/>
++            <distortion model="ptlens" focal="14.2" a="0.00302" b="-0.03672" c="0.01188"/>
++            <distortion model="ptlens" focal="14.6" a="0.00352" b="-0.03932" c="0.01669"/>
++            <distortion model="ptlens" focal="15.3" a="0.00209" b="-0.03384" c="0.01502"/>
++            <distortion model="ptlens" focal="16.4" a="0.00077" b="-0.02669" c="0.01369"/>
++            <distortion model="ptlens" focal="17.2" a="0.00265" b="-0.03145" c="0.02022"/>
++            <distortion model="ptlens" focal="17.4" a="-0.00228" b="-0.01227" c="0.00127"/>
++            <distortion model="ptlens" focal="18.7" a="-0.00131" b="-0.01567" c="0.0091"/>
++            <distortion model="ptlens" focal="20" a="-0.00192" b="-0.00977" c="0.00312"/>
++            <distortion model="ptlens" focal="20.4" a="-0.00107" b="-0.01519" c="0.01405"/>
++            <distortion model="ptlens" focal="21.3" a="-0.00504" b="-0.00065" c="0.00061"/>
++            <distortion model="ptlens" focal="22.5" a="-0.00238" b="-0.00734" c="0.00716"/>
++            <distortion model="ptlens" focal="22.7" a="-0.00235" b="-0.00695" c="0.00775"/>
++            <distortion model="ptlens" focal="24.1" a="-0.00183" b="-0.00986" c="0.01416"/>
++            <distortion model="ptlens" focal="25.3" a="-0.0031" b="-0.00379" c="0.00842"/>
++            <distortion model="ptlens" focal="27.2" a="-0.00188" b="-0.00871" c="0.0151"/>
++            <distortion model="ptlens" focal="28.5" a="-0.00256" b="-0.00394" c="0.00904"/>
++            <distortion model="ptlens" focal="28.8" a="-0.00092" b="-0.01079" c="0.01804"/>
++            <distortion model="ptlens" focal="30.5" a="-0.00415" b="0.00132" c="0.00385"/>
++            <distortion model="ptlens" focal="31.5" a="-0.00456" b="0.00351" c="0.00105"/>
++            <distortion model="ptlens" focal="33.9" a="-0.00265" b="-0.00167" c="0.00464"/>
++            <distortion model="ptlens" focal="34.9" a="-0.00212" b="-0.00435" c="0.00905"/>
++            <distortion model="ptlens" focal="36.6" a="-0.00247" b="-0.00236" c="0.00582"/>
++            <distortion model="ptlens" focal="37" a="-0.00349" b="0.00154" c="0.00098"/>
++            <distortion model="ptlens" focal="37.1" a="-0.00271" b="-0.00118" c="0.00412"/>
++            <tca model="poly3" focal="10.4" br="0.0002342" vr="1.0001550" bb="-0.0001554" vb="1.0004942"/>
++            <tca model="poly3" focal="10.5" br="0.0002463" vr="1.0001198" bb="-0.0001306" vb="1.0004317"/>
++            <tca model="poly3" focal="11" br="0.0002368" vr="1.0001749" bb="-0.0001164" vb="1.0003703"/>
++            <tca model="poly3" focal="11.9" br="0.0002203" vr="1.0002392" bb="-0.0001186" vb="1.0003039"/>
++            <tca model="poly3" focal="12.3" br="0.0002004" vr="1.0002655" bb="-0.0001209" vb="1.0002965"/>
++            <tca model="poly3" focal="12.6" br="0.0001974" vr="1.0002404" bb="-0.0000958" vb="1.0002659"/>
++            <tca model="poly3" focal="13.6" br="0.0001659" vr="1.0002605" bb="-0.0000997" vb="1.0002604"/>
++            <tca model="poly3" focal="14.2" br="0.0001257" vr="1.0002471" bb="-0.0000798" vb="1.0002490"/>
++            <tca model="poly3" focal="14.6" br="0.0001403" vr="1.0002301" bb="-0.0000759" vb="1.0002271"/>
++            <tca model="poly3" focal="15.3" br="0.0001234" vr="1.0002022" bb="-0.0000695" vb="1.0002019"/>
++            <tca model="poly3" focal="16.4" br="0.0000620" vr="1.0002378" bb="-0.0000676" vb="1.0001978"/>
++            <tca model="poly3" focal="17.2" br="0.0000527" vr="1.0002461" bb="-0.0000601" vb="1.0001940"/>
++            <tca model="poly3" focal="17.4" br="0.0000358" vr="1.0002497" bb="-0.0000560" vb="1.0001913"/>
++            <tca model="poly3" focal="18.7" br="0.0000253" vr="1.0002263" bb="-0.0000490" vb="1.0001715"/>
++            <tca model="poly3" focal="20" br="0.0000199" vr="1.0002162" bb="-0.0000511" vb="1.0001707"/>
++            <tca model="poly3" focal="20.4" br="0.0000414" vr="1.0001780" bb="-0.0000436" vb="1.0001611"/>
++            <tca model="poly3" focal="21.3" br="0.0000417" vr="1.0001842" bb="-0.0000376" vb="1.0001561"/>
++            <tca model="poly3" focal="22.5" br="0.0000040" vr="1.0001884" bb="-0.0000404" vb="1.0001393"/>
++            <tca model="poly3" focal="22.7" br="-0.0000082" vr="1.0002098" bb="-0.0000274" vb="1.0001262"/>
++            <tca model="poly3" focal="24.1" br="0.0000091" vr="1.0002030" bb="-0.0000354" vb="1.0001363"/>
++            <tca model="poly3" focal="25.3" br="0.0000076" vr="1.0001528" bb="-0.0000459" vb="1.0001618"/>
++            <tca model="poly3" focal="27.2" br="-0.0000282" vr="1.0002109" bb="-0.0000426" vb="1.0001308"/>
++            <tca model="poly3" focal="28.5" br="-0.0000386" vr="1.0001745" bb="-0.0000564" vb="1.0001661"/>
++            <tca model="poly3" focal="28.8" br="-0.0000182" vr="1.0001582" bb="-0.0000477" vb="1.0001482"/>
++            <tca model="poly3" focal="30.5" br="-0.0000354" vr="1.0001600" bb="-0.0000419" vb="1.0001247"/>
++            <tca model="poly3" focal="31.5" br="-0.0000311" vr="1.0001766" bb="-0.0000439" vb="1.0001142"/>
++            <tca model="poly3" focal="33.9" br="-0.0000328" vr="1.0001196" bb="-0.0000508" vb="1.0001311"/>
++            <tca model="poly3" focal="34.9" br="-0.0000372" vr="1.0001175" bb="-0.0000599" vb="1.0001487"/>
++            <tca model="poly3" focal="36.6" br="-0.0000291" vr="1.0001111" bb="-0.0000474" vb="1.0001054"/>
++            <tca model="poly3" focal="37" br="-0.0000219" vr="1.0001117" bb="-0.0000363" vb="1.0000888"/>
++            <tca model="poly3" focal="37.1" br="-0.0000370" vr="1.0001328" bb="-0.0000389" vb="1.0000566"/>
++            <vignetting model="pa" focal="10.4" aperture="1.8" distance="10" k1="-0.8321" k2="1.2846" k3="-1.0229"/>
++            <vignetting model="pa" focal="10.4" aperture="1.8" distance="1000" k1="-0.8321" k2="1.2846" k3="-1.0229"/>
++            <vignetting model="pa" focal="10.4" aperture="2" distance="10" k1="-0.7935" k2="1.0734" k3="-0.8346"/>
++            <vignetting model="pa" focal="10.4" aperture="2" distance="1000" k1="-0.7935" k2="1.0734" k3="-0.8346"/>
++            <vignetting model="pa" focal="10.4" aperture="2.2" distance="10" k1="-0.6079" k2="0.5105" k3="-0.4177"/>
++            <vignetting model="pa" focal="10.4" aperture="2.2" distance="1000" k1="-0.6079" k2="0.5105" k3="-0.4177"/>
++            <vignetting model="pa" focal="10.4" aperture="2.5" distance="10" k1="-0.5136" k2="0.2018" k3="-0.1792"/>
++            <vignetting model="pa" focal="10.4" aperture="2.5" distance="1000" k1="-0.5136" k2="0.2018" k3="-0.1792"/>
++            <vignetting model="pa" focal="10.4" aperture="2.8" distance="10" k1="-0.5153" k2="0.1626" k3="-0.1250"/>
++            <vignetting model="pa" focal="10.4" aperture="2.8" distance="1000" k1="-0.5153" k2="0.1626" k3="-0.1250"/>
++            <vignetting model="pa" focal="10.4" aperture="3.2" distance="10" k1="-0.4034" k2="-0.0160" k3="-0.0352"/>
++            <vignetting model="pa" focal="10.4" aperture="3.2" distance="1000" k1="-0.4034" k2="-0.0160" k3="-0.0352"/>
++            <vignetting model="pa" focal="10.4" aperture="3.5" distance="10" k1="-0.3601" k2="-0.0278" k3="-0.0512"/>
++            <vignetting model="pa" focal="10.4" aperture="3.5" distance="1000" k1="-0.3601" k2="-0.0278" k3="-0.0512"/>
++            <vignetting model="pa" focal="10.4" aperture="4" distance="10" k1="-0.3654" k2="0.0623" k3="-0.1222"/>
++            <vignetting model="pa" focal="10.4" aperture="4" distance="1000" k1="-0.3654" k2="0.0623" k3="-0.1222"/>
++            <vignetting model="pa" focal="10.4" aperture="4.5" distance="10" k1="-0.4127" k2="0.2516" k3="-0.2743"/>
++            <vignetting model="pa" focal="10.4" aperture="4.5" distance="1000" k1="-0.4127" k2="0.2516" k3="-0.2743"/>
++            <vignetting model="pa" focal="10.4" aperture="5" distance="10" k1="-0.4689" k2="0.4299" k3="-0.4132"/>
++            <vignetting model="pa" focal="10.4" aperture="5" distance="1000" k1="-0.4689" k2="0.4299" k3="-0.4132"/>
++            <vignetting model="pa" focal="10.4" aperture="5.6" distance="10" k1="-0.5018" k2="0.4860" k3="-0.4574"/>
++            <vignetting model="pa" focal="10.4" aperture="5.6" distance="1000" k1="-0.5018" k2="0.4860" k3="-0.4574"/>
++            <vignetting model="pa" focal="10.4" aperture="6.3" distance="10" k1="-0.5447" k2="0.6030" k3="-0.5152"/>
++            <vignetting model="pa" focal="10.4" aperture="6.3" distance="1000" k1="-0.5447" k2="0.6030" k3="-0.5152"/>
++            <vignetting model="pa" focal="10.4" aperture="7.1" distance="10" k1="-0.5713" k2="0.6539" k3="-0.5207"/>
++            <vignetting model="pa" focal="10.4" aperture="7.1" distance="1000" k1="-0.5713" k2="0.6539" k3="-0.5207"/>
++            <vignetting model="pa" focal="10.4" aperture="8" distance="10" k1="-0.5756" k2="0.6362" k3="-0.4830"/>
++            <vignetting model="pa" focal="10.4" aperture="8" distance="1000" k1="-0.5756" k2="0.6362" k3="-0.4830"/>
++            <vignetting model="pa" focal="10.4" aperture="9" distance="10" k1="-0.5599" k2="0.5717" k3="-0.4048"/>
++            <vignetting model="pa" focal="10.4" aperture="9" distance="1000" k1="-0.5599" k2="0.5717" k3="-0.4048"/>
++            <vignetting model="pa" focal="10.4" aperture="10" distance="10" k1="-0.5351" k2="0.4943" k3="-0.3245"/>
++            <vignetting model="pa" focal="10.4" aperture="10" distance="1000" k1="-0.5351" k2="0.4943" k3="-0.3245"/>
++            <vignetting model="pa" focal="10.4" aperture="11" distance="10" k1="-0.5176" k2="0.4157" k3="-0.2460"/>
++            <vignetting model="pa" focal="10.4" aperture="11" distance="1000" k1="-0.5176" k2="0.4157" k3="-0.2460"/>
++            <vignetting model="pa" focal="13.2" aperture="2.8" distance="10" k1="-0.0310" k2="-0.7872" k3="0.4306"/>
++            <vignetting model="pa" focal="13.2" aperture="2.8" distance="1000" k1="-0.0310" k2="-0.7872" k3="0.4306"/>
++            <vignetting model="pa" focal="13.2" aperture="3.2" distance="10" k1="0.0310" k2="-0.7967" k3="0.3779"/>
++            <vignetting model="pa" focal="13.2" aperture="3.2" distance="1000" k1="0.0310" k2="-0.7967" k3="0.3779"/>
++            <vignetting model="pa" focal="13.2" aperture="3.5" distance="10" k1="0.0038" k2="-0.6216" k3="0.2292"/>
++            <vignetting model="pa" focal="13.2" aperture="3.5" distance="1000" k1="0.0038" k2="-0.6216" k3="0.2292"/>
++            <vignetting model="pa" focal="13.2" aperture="4" distance="10" k1="-0.0883" k2="-0.3065" k3="0.0060"/>
++            <vignetting model="pa" focal="13.2" aperture="4" distance="1000" k1="-0.0883" k2="-0.3065" k3="0.0060"/>
++            <vignetting model="pa" focal="13.2" aperture="4.5" distance="10" k1="-0.2164" k2="0.0574" k3="-0.2291"/>
++            <vignetting model="pa" focal="13.2" aperture="4.5" distance="1000" k1="-0.2164" k2="0.0574" k3="-0.2291"/>
++            <vignetting model="pa" focal="13.2" aperture="5" distance="10" k1="-0.3330" k2="0.3290" k3="-0.3773"/>
++            <vignetting model="pa" focal="13.2" aperture="5" distance="1000" k1="-0.3330" k2="0.3290" k3="-0.3773"/>
++            <vignetting model="pa" focal="13.2" aperture="5.6" distance="10" k1="-0.4549" k2="0.5749" k3="-0.4953"/>
++            <vignetting model="pa" focal="13.2" aperture="5.6" distance="1000" k1="-0.4549" k2="0.5749" k3="-0.4953"/>
++            <vignetting model="pa" focal="13.2" aperture="6.3" distance="10" k1="-0.4988" k2="0.7224" k3="-0.6053"/>
++            <vignetting model="pa" focal="13.2" aperture="6.3" distance="1000" k1="-0.4988" k2="0.7224" k3="-0.6053"/>
++            <vignetting model="pa" focal="13.2" aperture="7.1" distance="10" k1="-0.5221" k2="0.7892" k3="-0.6525"/>
++            <vignetting model="pa" focal="13.2" aperture="7.1" distance="1000" k1="-0.5221" k2="0.7892" k3="-0.6525"/>
++            <vignetting model="pa" focal="13.2" aperture="8" distance="10" k1="-0.5166" k2="0.7629" k3="-0.6316"/>
++            <vignetting model="pa" focal="13.2" aperture="8" distance="1000" k1="-0.5166" k2="0.7629" k3="-0.6316"/>
++            <vignetting model="pa" focal="13.2" aperture="9" distance="10" k1="-0.5437" k2="0.8567" k3="-0.6878"/>
++            <vignetting model="pa" focal="13.2" aperture="9" distance="1000" k1="-0.5437" k2="0.8567" k3="-0.6878"/>
++            <vignetting model="pa" focal="13.2" aperture="10" distance="10" k1="-0.5508" k2="0.8897" k3="-0.7080"/>
++            <vignetting model="pa" focal="13.2" aperture="10" distance="1000" k1="-0.5508" k2="0.8897" k3="-0.7080"/>
++            <vignetting model="pa" focal="13.2" aperture="11" distance="10" k1="-0.5499" k2="0.8958" k3="-0.7088"/>
++            <vignetting model="pa" focal="13.2" aperture="11" distance="1000" k1="-0.5499" k2="0.8958" k3="-0.7088"/>
++            <vignetting model="pa" focal="18.7" aperture="3.2" distance="10" k1="-0.1132" k2="-0.7446" k3="0.4854"/>
++            <vignetting model="pa" focal="18.7" aperture="3.2" distance="1000" k1="-0.1132" k2="-0.7446" k3="0.4854"/>
++            <vignetting model="pa" focal="18.7" aperture="3.5" distance="10" k1="0.0762" k2="-0.9229" k3="0.5035"/>
++            <vignetting model="pa" focal="18.7" aperture="3.5" distance="1000" k1="0.0762" k2="-0.9229" k3="0.5035"/>
++            <vignetting model="pa" focal="18.7" aperture="4" distance="10" k1="0.1330" k2="-0.7857" k3="0.3368"/>
++            <vignetting model="pa" focal="18.7" aperture="4" distance="1000" k1="0.1330" k2="-0.7857" k3="0.3368"/>
++            <vignetting model="pa" focal="18.7" aperture="4.5" distance="10" k1="0.0416" k2="-0.3692" k3="0.0257"/>
++            <vignetting model="pa" focal="18.7" aperture="4.5" distance="1000" k1="0.0416" k2="-0.3692" k3="0.0257"/>
++            <vignetting model="pa" focal="18.7" aperture="5" distance="10" k1="-0.1035" k2="0.0359" k3="-0.2311"/>
++            <vignetting model="pa" focal="18.7" aperture="5" distance="1000" k1="-0.1035" k2="0.0359" k3="-0.2311"/>
++            <vignetting model="pa" focal="18.7" aperture="5.6" distance="10" k1="-0.2575" k2="0.4093" k3="-0.4403"/>
++            <vignetting model="pa" focal="18.7" aperture="5.6" distance="1000" k1="-0.2575" k2="0.4093" k3="-0.4403"/>
++            <vignetting model="pa" focal="18.7" aperture="6.3" distance="10" k1="-0.3764" k2="0.6211" k3="-0.5246"/>
++            <vignetting model="pa" focal="18.7" aperture="6.3" distance="1000" k1="-0.3764" k2="0.6211" k3="-0.5246"/>
++            <vignetting model="pa" focal="18.7" aperture="7.1" distance="10" k1="-0.4680" k2="0.7105" k3="-0.5110"/>
++            <vignetting model="pa" focal="18.7" aperture="7.1" distance="1000" k1="-0.4680" k2="0.7105" k3="-0.5110"/>
++            <vignetting model="pa" focal="18.7" aperture="8" distance="10" k1="-0.4570" k2="0.6469" k3="-0.4371"/>
++            <vignetting model="pa" focal="18.7" aperture="8" distance="1000" k1="-0.4570" k2="0.6469" k3="-0.4371"/>
++            <vignetting model="pa" focal="18.7" aperture="9" distance="10" k1="-0.4226" k2="0.5152" k3="-0.3220"/>
++            <vignetting model="pa" focal="18.7" aperture="9" distance="1000" k1="-0.4226" k2="0.5152" k3="-0.3220"/>
++            <vignetting model="pa" focal="18.7" aperture="10" distance="10" k1="-0.3843" k2="0.3712" k3="-0.2056"/>
++            <vignetting model="pa" focal="18.7" aperture="10" distance="1000" k1="-0.3843" k2="0.3712" k3="-0.2056"/>
++            <vignetting model="pa" focal="18.7" aperture="11" distance="10" k1="-0.3679" k2="0.3022" k3="-0.1444"/>
++            <vignetting model="pa" focal="18.7" aperture="11" distance="1000" k1="-0.3679" k2="0.3022" k3="-0.1444"/>
++            <vignetting model="pa" focal="26.3" aperture="4" distance="10" k1="-0.2102" k2="-0.4690" k3="0.3420"/>
++            <vignetting model="pa" focal="26.3" aperture="4" distance="1000" k1="-0.2102" k2="-0.4690" k3="0.3420"/>
++            <vignetting model="pa" focal="26.3" aperture="4.5" distance="10" k1="-0.0958" k2="-0.4577" k3="0.2539"/>
++            <vignetting model="pa" focal="26.3" aperture="4.5" distance="1000" k1="-0.0958" k2="-0.4577" k3="0.2539"/>
++            <vignetting model="pa" focal="26.3" aperture="5" distance="10" k1="-0.1269" k2="-0.1655" k3="0.0260"/>
++            <vignetting model="pa" focal="26.3" aperture="5" distance="1000" k1="-0.1269" k2="-0.1655" k3="0.0260"/>
++            <vignetting model="pa" focal="26.3" aperture="5.6" distance="10" k1="-0.1967" k2="0.1392" k3="-0.1716"/>
++            <vignetting model="pa" focal="26.3" aperture="5.6" distance="1000" k1="-0.1967" k2="0.1392" k3="-0.1716"/>
++            <vignetting model="pa" focal="26.3" aperture="6.3" distance="10" k1="-0.2359" k2="0.2713" k3="-0.2241"/>
++            <vignetting model="pa" focal="26.3" aperture="6.3" distance="1000" k1="-0.2359" k2="0.2713" k3="-0.2241"/>
++            <vignetting model="pa" focal="26.3" aperture="7.1" distance="10" k1="-0.2635" k2="0.2668" k3="-0.1614"/>
++            <vignetting model="pa" focal="26.3" aperture="7.1" distance="1000" k1="-0.2635" k2="0.2668" k3="-0.1614"/>
++            <vignetting model="pa" focal="26.3" aperture="8" distance="10" k1="-0.2829" k2="0.2315" k3="-0.0937"/>
++            <vignetting model="pa" focal="26.3" aperture="8" distance="1000" k1="-0.2829" k2="0.2315" k3="-0.0937"/>
++            <vignetting model="pa" focal="26.3" aperture="9" distance="10" k1="-0.3206" k2="0.2610" k3="-0.0871"/>
++            <vignetting model="pa" focal="26.3" aperture="9" distance="1000" k1="-0.3206" k2="0.2610" k3="-0.0871"/>
++            <vignetting model="pa" focal="26.3" aperture="10" distance="10" k1="-0.3170" k2="0.2624" k3="-0.0900"/>
++            <vignetting model="pa" focal="26.3" aperture="10" distance="1000" k1="-0.3170" k2="0.2624" k3="-0.0900"/>
++            <vignetting model="pa" focal="26.3" aperture="11" distance="10" k1="-0.3158" k2="0.2663" k3="-0.0933"/>
++            <vignetting model="pa" focal="26.3" aperture="11" distance="1000" k1="-0.3158" k2="0.2663" k3="-0.0933"/>
++            <vignetting model="pa" focal="37.1" aperture="4.9" distance="10" k1="-0.2176" k2="-0.4194" k3="0.2535"/>
++            <vignetting model="pa" focal="37.1" aperture="4.9" distance="1000" k1="-0.2176" k2="-0.4194" k3="0.2535"/>
++            <vignetting model="pa" focal="37.1" aperture="5.6" distance="10" k1="-0.1964" k2="-0.2475" k3="0.0897"/>
++            <vignetting model="pa" focal="37.1" aperture="5.6" distance="1000" k1="-0.1964" k2="-0.2475" k3="0.0897"/>
++            <vignetting model="pa" focal="37.1" aperture="6.3" distance="10" k1="-0.2301" k2="-0.0700" k3="-0.0247"/>
++            <vignetting model="pa" focal="37.1" aperture="6.3" distance="1000" k1="-0.2301" k2="-0.0700" k3="-0.0247"/>
++            <vignetting model="pa" focal="37.1" aperture="7.1" distance="10" k1="-0.2246" k2="-0.0741" k3="-0.0026"/>
++            <vignetting model="pa" focal="37.1" aperture="7.1" distance="1000" k1="-0.2246" k2="-0.0741" k3="-0.0026"/>
++            <vignetting model="pa" focal="37.1" aperture="8" distance="10" k1="-0.2047" k2="-0.1257" k3="0.0412"/>
++            <vignetting model="pa" focal="37.1" aperture="8" distance="1000" k1="-0.2047" k2="-0.1257" k3="0.0412"/>
++            <vignetting model="pa" focal="37.1" aperture="9" distance="10" k1="-0.1949" k2="-0.1368" k3="0.0459"/>
++            <vignetting model="pa" focal="37.1" aperture="9" distance="1000" k1="-0.1949" k2="-0.1368" k3="0.0459"/>
++            <vignetting model="pa" focal="37.1" aperture="10" distance="10" k1="-0.1864" k2="-0.1499" k3="0.0543"/>
++            <vignetting model="pa" focal="37.1" aperture="10" distance="1000" k1="-0.1864" k2="-0.1499" k3="0.0543"/>
++            <vignetting model="pa" focal="37.1" aperture="11" distance="10" k1="-0.1810" k2="-0.1572" k3="0.0584"/>
++            <vignetting model="pa" focal="37.1" aperture="11" distance="1000" k1="-0.1810" k2="-0.1572" k3="0.0584"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>DSC-RX100 II &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyRX100II</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="10.4" a="0.011046" b="-0.066845" c="-0.010623"/>
++            <distortion model="ptlens" focal="12.5" a="0.005301" b="-0.046738" c="0.00161"/>
++            <distortion model="ptlens" focal="14.1" a="0.007319" b="-0.055833" c="0.038765"/>
++            <distortion model="ptlens" focal="16.6" a="0.005602" b="-0.042056" c="0.031479"/>
++            <distortion model="ptlens" focal="18.2" a="-0.001954" b="-0.015736" c="0.011271"/>
++            <distortion model="ptlens" focal="20.6" a="-0.002294" b="-0.017409" c="0.029357"/>
++            <distortion model="ptlens" focal="23.3" a="0.000795" b="-0.023144" c="0.033147"/>
++            <distortion model="ptlens" focal="25.3" a="-0.001021" b="-0.010802" c="0.014495"/>
++            <distortion model="ptlens" focal="26.6" a="-0.000752" b="-0.01116" c="0.015762"/>
++            <distortion model="ptlens" focal="29.5" a="0.003277" b="-0.024738" c="0.031628"/>
++            <distortion model="ptlens" focal="30.8" a="0.001826" b="-0.01782" c="0.021784"/>
++            <distortion model="ptlens" focal="33.2" a="0.003849" b="-0.028663" c="0.040715"/>
++            <distortion model="ptlens" focal="35.3" a="0.0039" b="-0.025627" c="0.03066"/>
++            <distortion model="ptlens" focal="37.1" a="0.001596" b="-0.022367" c="0.033843"/>
++            <tca model="poly3" focal="10.4" br="0.0001237" vr="1.0002385" bb="-0.0001421" vb="1.0004466"/>
++            <tca model="poly3" focal="12.5" br="0.0001230" vr="1.0002997" bb="-0.0000907" vb="1.0002562"/>
++            <tca model="poly3" focal="14.1" br="0.0001337" vr="1.0003018" bb="-0.0000653" vb="1.0002075"/>
++            <tca model="poly3" focal="16.6" br="0.0000925" vr="1.0002945" bb="-0.0000533" vb="1.0001741"/>
++            <tca model="poly3" focal="18.2" br="0.0000752" vr="1.0002626" bb="-0.0000469" vb="1.0001686"/>
++            <tca model="poly3" focal="20.6" br="0.0000398" vr="1.0002549" bb="-0.0000539" vb="1.0001774"/>
++            <tca model="poly3" focal="23.3" br="0.0000583" vr="1.0002447" bb="-0.0000446" vb="1.0001558"/>
++            <tca model="poly3" focal="25.3" br="0.0000804" vr="1.0001705" bb="-0.0000263" vb="1.0001217"/>
++            <tca model="poly3" focal="26.6" br="-0.0000023" vr="1.0002448" bb="-0.0000481" vb="1.0001799"/>
++            <tca model="poly3" focal="29.5" br="0.0000001" vr="1.0002366" bb="-0.0000120" vb="1.0000857"/>
++            <tca model="poly3" focal="30.8" br="0.0000657" vr="1.0000796" bb="-0.0000449" vb="1.0001984"/>
++            <tca model="poly3" focal="33.2" br="0.0000214" vr="1.0000994" bb="-0.0000269" vb="1.0001729"/>
++            <tca model="poly3" focal="35.3" br="-0.0000002" vr="1.0000516" bb="-0.0000812" vb="1.0002827"/>
++            <tca model="poly3" focal="37.1" br="0.0000607" vr="1.0000855" bb="-0.0000273" vb="1.0000706"/>
++            <vignetting model="pa" focal="10.4" aperture="1.8" distance="10" k1="-0.7135" k2="1.3463" k3="-1.2816"/>
++            <vignetting model="pa" focal="10.4" aperture="1.8" distance="1000" k1="-0.7135" k2="1.3463" k3="-1.2816"/>
++            <vignetting model="pa" focal="10.4" aperture="2" distance="10" k1="-0.8326" k2="1.3279" k3="-1.0356"/>
++            <vignetting model="pa" focal="10.4" aperture="2" distance="1000" k1="-0.8326" k2="1.3279" k3="-1.0356"/>
++            <vignetting model="pa" focal="10.4" aperture="2.2" distance="10" k1="-0.6656" k2="0.5921" k3="-0.5394"/>
++            <vignetting model="pa" focal="10.4" aperture="2.2" distance="1000" k1="-0.6656" k2="0.5921" k3="-0.5394"/>
++            <vignetting model="pa" focal="10.4" aperture="2.5" distance="10" k1="-0.7229" k2="0.7602" k3="-0.6923"/>
++            <vignetting model="pa" focal="10.4" aperture="2.5" distance="1000" k1="-0.7229" k2="0.7602" k3="-0.6923"/>
++            <vignetting model="pa" focal="10.4" aperture="2.8" distance="10" k1="-0.7498" k2="0.7621" k3="-0.5955"/>
++            <vignetting model="pa" focal="10.4" aperture="2.8" distance="1000" k1="-0.7498" k2="0.7621" k3="-0.5955"/>
++            <vignetting model="pa" focal="10.4" aperture="3.2" distance="10" k1="-0.6216" k2="0.5553" k3="-0.5182"/>
++            <vignetting model="pa" focal="10.4" aperture="3.2" distance="1000" k1="-0.6216" k2="0.5553" k3="-0.5182"/>
++            <vignetting model="pa" focal="10.4" aperture="3.5" distance="10" k1="-0.5630" k2="0.4498" k3="-0.4015"/>
++            <vignetting model="pa" focal="10.4" aperture="3.5" distance="1000" k1="-0.5630" k2="0.4498" k3="-0.4015"/>
++            <vignetting model="pa" focal="10.4" aperture="4" distance="10" k1="-0.5777" k2="0.5116" k3="-0.3904"/>
++            <vignetting model="pa" focal="10.4" aperture="4" distance="1000" k1="-0.5777" k2="0.5116" k3="-0.3904"/>
++            <vignetting model="pa" focal="10.4" aperture="5.6" distance="10" k1="-0.5390" k2="0.2408" k3="-0.0446"/>
++            <vignetting model="pa" focal="10.4" aperture="5.6" distance="1000" k1="-0.5390" k2="0.2408" k3="-0.0446"/>
++            <vignetting model="pa" focal="10.4" aperture="8" distance="10" k1="-0.6269" k2="0.5259" k3="-0.3552"/>
++            <vignetting model="pa" focal="10.4" aperture="8" distance="1000" k1="-0.6269" k2="0.5259" k3="-0.3552"/>
++            <vignetting model="pa" focal="10.4" aperture="11" distance="10" k1="-0.5159" k2="0.1094" k3="0.0314"/>
++            <vignetting model="pa" focal="10.4" aperture="11" distance="1000" k1="-0.5159" k2="0.1094" k3="0.0314"/>
++            <vignetting model="pa" focal="11.2" aperture="2.2" distance="10" k1="-0.7467" k2="0.3276" k3="-0.0407"/>
++            <vignetting model="pa" focal="11.2" aperture="2.2" distance="1000" k1="-0.7467" k2="0.3276" k3="-0.0407"/>
++            <vignetting model="pa" focal="13.8" aperture="2.8" distance="10" k1="-0.5590" k2="-0.0464" k3="0.2053"/>
++            <vignetting model="pa" focal="13.8" aperture="2.8" distance="1000" k1="-0.5590" k2="-0.0464" k3="0.2053"/>
++            <vignetting model="pa" focal="13.8" aperture="4" distance="10" k1="-0.2494" k2="-0.1809" k3="0.0453"/>
++            <vignetting model="pa" focal="13.8" aperture="4" distance="1000" k1="-0.2494" k2="-0.1809" k3="0.0453"/>
++            <vignetting model="pa" focal="13.8" aperture="5.6" distance="10" k1="-0.3791" k2="0.2275" k3="-0.2863"/>
++            <vignetting model="pa" focal="13.8" aperture="5.6" distance="1000" k1="-0.3791" k2="0.2275" k3="-0.2863"/>
++            <vignetting model="pa" focal="13.8" aperture="8" distance="10" k1="-0.4985" k2="0.4805" k3="-0.3736"/>
++            <vignetting model="pa" focal="13.8" aperture="8" distance="1000" k1="-0.4985" k2="0.4805" k3="-0.3736"/>
++            <vignetting model="pa" focal="13.8" aperture="11" distance="10" k1="-0.4288" k2="0.1443" k3="-0.0009"/>
++            <vignetting model="pa" focal="13.8" aperture="11" distance="1000" k1="-0.4288" k2="0.1443" k3="-0.0009"/>
++            <vignetting model="pa" focal="15.3" aperture="2.8" distance="10" k1="-0.4644" k2="-0.1983" k3="0.2649"/>
++            <vignetting model="pa" focal="15.3" aperture="2.8" distance="1000" k1="-0.4644" k2="-0.1983" k3="0.2649"/>
++            <vignetting model="pa" focal="15.3" aperture="4" distance="10" k1="-0.2199" k2="-0.1659" k3="0.0650"/>
++            <vignetting model="pa" focal="15.3" aperture="4" distance="1000" k1="-0.2199" k2="-0.1659" k3="0.0650"/>
++            <vignetting model="pa" focal="15.3" aperture="5.6" distance="10" k1="-0.3723" k2="0.2516" k3="-0.1362"/>
++            <vignetting model="pa" focal="15.3" aperture="5.6" distance="1000" k1="-0.3723" k2="0.2516" k3="-0.1362"/>
++            <vignetting model="pa" focal="15.3" aperture="8" distance="10" k1="-0.3691" k2="0.0957" k3="0.0523"/>
++            <vignetting model="pa" focal="15.3" aperture="8" distance="1000" k1="-0.3691" k2="0.0957" k3="0.0523"/>
++            <vignetting model="pa" focal="15.3" aperture="11" distance="10" k1="-0.3575" k2="0.0843" k3="0.0146"/>
++            <vignetting model="pa" focal="15.3" aperture="11" distance="1000" k1="-0.3575" k2="0.0843" k3="0.0146"/>
++            <vignetting model="pa" focal="17.2" aperture="3.2" distance="10" k1="-0.2519" k2="-0.3907" k3="0.3136"/>
++            <vignetting model="pa" focal="17.2" aperture="3.2" distance="1000" k1="-0.2519" k2="-0.3907" k3="0.3136"/>
++            <vignetting model="pa" focal="17.2" aperture="4" distance="10" k1="-0.1731" k2="-0.2987" k3="0.1314"/>
++            <vignetting model="pa" focal="17.2" aperture="4" distance="1000" k1="-0.1731" k2="-0.2987" k3="0.1314"/>
++            <vignetting model="pa" focal="17.2" aperture="5.6" distance="10" k1="-0.4100" k2="0.5769" k3="-0.4051"/>
++            <vignetting model="pa" focal="17.2" aperture="5.6" distance="1000" k1="-0.4100" k2="0.5769" k3="-0.4051"/>
++            <vignetting model="pa" focal="17.2" aperture="8" distance="10" k1="-0.4308" k2="0.4526" k3="-0.2350"/>
++            <vignetting model="pa" focal="17.2" aperture="8" distance="1000" k1="-0.4308" k2="0.4526" k3="-0.2350"/>
++            <vignetting model="pa" focal="17.2" aperture="11" distance="10" k1="-0.3237" k2="0.0824" k3="0.0077"/>
++            <vignetting model="pa" focal="17.2" aperture="11" distance="1000" k1="-0.3237" k2="0.0824" k3="0.0077"/>
++            <vignetting model="pa" focal="21.1" aperture="3.5" distance="10" k1="-0.1925" k2="-0.3745" k3="0.2358"/>
++            <vignetting model="pa" focal="21.1" aperture="3.5" distance="1000" k1="-0.1925" k2="-0.3745" k3="0.2358"/>
++            <vignetting model="pa" focal="21.1" aperture="4" distance="10" k1="-0.2053" k2="-0.0766" k3="-0.0076"/>
++            <vignetting model="pa" focal="21.1" aperture="4" distance="1000" k1="-0.2053" k2="-0.0766" k3="-0.0076"/>
++            <vignetting model="pa" focal="21.1" aperture="5.6" distance="10" k1="-0.3967" k2="0.6719" k3="-0.5349"/>
++            <vignetting model="pa" focal="21.1" aperture="5.6" distance="1000" k1="-0.3967" k2="0.6719" k3="-0.5349"/>
++            <vignetting model="pa" focal="21.1" aperture="8" distance="10" k1="-0.3037" k2="0.1550" k3="-0.0403"/>
++            <vignetting model="pa" focal="21.1" aperture="8" distance="1000" k1="-0.3037" k2="0.1550" k3="-0.0403"/>
++            <vignetting model="pa" focal="21.1" aperture="11" distance="10" k1="-0.2912" k2="0.1147" k3="-0.0086"/>
++            <vignetting model="pa" focal="21.1" aperture="11" distance="1000" k1="-0.2912" k2="0.1147" k3="-0.0086"/>
++            <vignetting model="pa" focal="27.9" aperture="4" distance="10" k1="-0.1966" k2="-0.3641" k3="0.2689"/>
++            <vignetting model="pa" focal="27.9" aperture="4" distance="1000" k1="-0.1966" k2="-0.3641" k3="0.2689"/>
++            <vignetting model="pa" focal="27.9" aperture="5.6" distance="10" k1="-0.3166" k2="0.4107" k3="-0.2405"/>
++            <vignetting model="pa" focal="27.9" aperture="5.6" distance="1000" k1="-0.3166" k2="0.4107" k3="-0.2405"/>
++            <vignetting model="pa" focal="27.9" aperture="8" distance="10" k1="-0.3054" k2="0.3035" k3="-0.1081"/>
++            <vignetting model="pa" focal="27.9" aperture="8" distance="1000" k1="-0.3054" k2="0.3035" k3="-0.1081"/>
++            <vignetting model="pa" focal="27.9" aperture="11" distance="10" k1="-0.3304" k2="0.3339" k3="-0.1145"/>
++            <vignetting model="pa" focal="27.9" aperture="11" distance="1000" k1="-0.3304" k2="0.3339" k3="-0.1145"/>
++            <vignetting model="pa" focal="37.1" aperture="4.9" distance="10" k1="-0.1605" k2="-0.1277" k3="0.1141"/>
++            <vignetting model="pa" focal="37.1" aperture="4.9" distance="1000" k1="-0.1605" k2="-0.1277" k3="0.1141"/>
++            <vignetting model="pa" focal="37.1" aperture="5.6" distance="10" k1="-0.1830" k2="0.2314" k3="-0.1886"/>
++            <vignetting model="pa" focal="37.1" aperture="5.6" distance="1000" k1="-0.1830" k2="0.2314" k3="-0.1886"/>
++            <vignetting model="pa" focal="37.1" aperture="6.3" distance="10" k1="-0.2721" k2="0.5075" k3="-0.3135"/>
++            <vignetting model="pa" focal="37.1" aperture="6.3" distance="1000" k1="-0.2721" k2="0.5075" k3="-0.3135"/>
++            <vignetting model="pa" focal="37.1" aperture="7.1" distance="10" k1="-0.2413" k2="0.3955" k3="-0.2181"/>
++            <vignetting model="pa" focal="37.1" aperture="7.1" distance="1000" k1="-0.2413" k2="0.3955" k3="-0.2181"/>
++            <vignetting model="pa" focal="37.1" aperture="8" distance="10" k1="-0.2099" k2="0.2854" k3="-0.1354"/>
++            <vignetting model="pa" focal="37.1" aperture="8" distance="1000" k1="-0.2099" k2="0.2854" k3="-0.1354"/>
++            <vignetting model="pa" focal="37.1" aperture="11" distance="10" k1="-0.2129" k2="0.2491" k3="-0.0930"/>
++            <vignetting model="pa" focal="37.1" aperture="11" distance="1000" k1="-0.2129" k2="0.2491" k3="-0.0930"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>DSC-RX100 III &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyRX100III</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="8.8" a="0.02266" b="-0.09581" c="0.0019"/>
++            <distortion model="ptlens" focal="10.9" a="0.02376" b="-0.09457" c="0.03217"/>
++            <distortion model="ptlens" focal="13" a="0.02326" b="-0.08674" c="0.04569"/>
++            <distortion model="ptlens" focal="14.7" a="0.0234" b="-0.08395" c="0.0497"/>
++            <distortion model="ptlens" focal="16.6" a="0.02045" b="-0.06253" c="0.02684"/>
++            <distortion model="ptlens" focal="20" a="0.02295" b="-0.06814" c="0.05127"/>
++            <distortion model="ptlens" focal="25.7" a="0.02377" b="-0.06078" c="0.04156"/>
++            <tca model="poly3" focal="8.8" br="0.0001786" vr="1.0000881" bb="-0.0001087" vb="1.0003934"/>
++            <tca model="poly3" focal="10.9" br="0.0000887" vr="1.0001670" bb="-0.0000723" vb="1.0003152"/>
++            <tca model="poly3" focal="13" br="0.0000518" vr="1.0002194" bb="-0.0000203" vb="1.0001770"/>
++            <tca model="poly3" focal="14.7" br="0.0000185" vr="1.0002369" bb="-0.0000000" vb="1.0001315"/>
++            <tca model="poly3" focal="16.6" br="0.0000075" vr="1.0002936" bb="-0.0000085" vb="1.0000657"/>
++            <tca model="poly3" focal="20" br="-0.0000081" vr="1.0003041" bb="0.0000035" vb="1.0000616"/>
++            <tca model="poly3" focal="25.7" br="-0.0000121" vr="1.0002604" bb="0.0000035" vb="1.0000797"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>DSC-HX300 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyHX300</mount>
++        <focal min="4.3" max="215"/>
++        <cropfactor>5.58</cropfactor>
++        <calibration>
++            <!-- The camera already corrects very well.  So this refers to the
++                 JPEGs.  The camera cannot produce RAWs.  JPEGs for calibration
++                 (if really requested) has bronger@physik.rwth-aachen.de. -->
++            <distortion focal="4.3" model="poly3" k1="0"/>
++            <distortion focal="215" model="poly3" k1="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony Xperia Z3 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyXperiaZ3</mount>
++        <cropfactor>7.87</cropfactor>
++        <calibration>
++            <!-- This stems from the advertised feature of 25mm equiv. -->
++            <distortion model="ptlens" focal="4.9" a="0.0132" b="-0.07765" c="0.14683"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony RX10 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyRX10</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="8.8" a="0.0376" b="-0.14223" c="0.1059"/>
++            <distortion model="ptlens" focal="9.9" a="0.02873" b="-0.10439" c="0.08589"/>
++            <distortion model="ptlens" focal="10.9" a="0.01917" b="-0.07335" c="0.07298"/>
++            <distortion model="ptlens" focal="13.1" a="0.00477" b="-0.02653" c="0.05952"/>
++            <distortion model="ptlens" focal="18.2" a="-0.00665" b="0.03433" c="-0.00945"/>
++            <distortion model="ptlens" focal="25.2" a="-0.00888" b="0.03994" c="0.0052"/>
++            <distortion model="ptlens" focal="73.2" a="-0.00843" b="0.03659" c="0.01609"/>
++            <tca model="poly3" focal="8.8" br="-0.0000278" vr="1.0007192" bb="0.0000913" vb="0.9999164"/>
++            <tca model="poly3" focal="10.3" br="-0.0000800" vr="1.0007387" bb="0.0000756" vb="0.9999193"/>
++            <tca model="poly3" focal="12.8" br="-0.0001529" vr="1.0007873" bb="0.0001241" vb="0.9998314"/>
++            <tca model="poly3" focal="15.4" br="-0.0001801" vr="1.0006865" bb="0.0000925" vb="0.9998612"/>
++            <tca model="poly3" focal="17.8" br="-0.0001510" vr="1.0007237" bb="0.0000961" vb="0.9998292"/>
++            <tca model="poly3" focal="25.7" br="-0.0001137" vr="1.0005035" bb="0.0000802" vb="0.9998297"/>
++            <tca model="poly3" focal="31.3" br="-0.0000974" vr="1.0004100" bb="0.0000760" vb="0.9998261"/>
++            <tca model="poly3" focal="32.8" br="-0.0000346" vr="1.0003456" bb="0.0000701" vb="0.9998303"/>
++            <tca model="poly3" focal="36.8" br="-0.0000779" vr="1.0003575" bb="0.0000644" vb="0.9998296"/>
++            <tca model="poly3" focal="49.4" br="-0.0000130" vr="1.0001023" bb="0.0000332" vb="0.9998657"/>
++            <tca model="poly3" focal="73.3" br="0.0000154" vr="0.9999244" bb="0.0000192" vb="0.9999136"/>
++            <vignetting model="pa" focal="8.8" aperture="2.8" distance="10" k1="-0.7078" k2="1.2333" k3="-1.2422"/>
++            <vignetting model="pa" focal="8.8" aperture="2.8" distance="1000" k1="-0.7078" k2="1.2333" k3="-1.2422"/>
++            <vignetting model="pa" focal="8.8" aperture="3.2" distance="10" k1="-0.6416" k2="1.3734" k3="-1.4473"/>
++            <vignetting model="pa" focal="8.8" aperture="3.2" distance="1000" k1="-0.6416" k2="1.3734" k3="-1.4473"/>
++            <vignetting model="pa" focal="8.8" aperture="3.5" distance="10" k1="-0.7743" k2="1.7536" k3="-1.7233"/>
++            <vignetting model="pa" focal="8.8" aperture="3.5" distance="1000" k1="-0.7743" k2="1.7536" k3="-1.7233"/>
++            <vignetting model="pa" focal="8.8" aperture="4" distance="10" k1="-0.6750" k2="1.5220" k3="-1.5361"/>
++            <vignetting model="pa" focal="8.8" aperture="4" distance="1000" k1="-0.6750" k2="1.5220" k3="-1.5361"/>
++            <vignetting model="pa" focal="8.8" aperture="5.6" distance="10" k1="-1.0081" k2="2.6576" k3="-2.3930"/>
++            <vignetting model="pa" focal="8.8" aperture="5.6" distance="1000" k1="-1.0081" k2="2.6576" k3="-2.3930"/>
++            <vignetting model="pa" focal="8.8" aperture="8" distance="10" k1="-1.0870" k2="2.9411" k3="-2.6221"/>
++            <vignetting model="pa" focal="8.8" aperture="8" distance="1000" k1="-1.0870" k2="2.9411" k3="-2.6221"/>
++            <vignetting model="pa" focal="8.8" aperture="16" distance="10" k1="-1.2172" k2="3.0825" k3="-2.6802"/>
++            <vignetting model="pa" focal="8.8" aperture="16" distance="1000" k1="-1.2172" k2="3.0825" k3="-2.6802"/>
++            <vignetting model="pa" focal="10.3" aperture="2.8" distance="10" k1="-0.8548" k2="1.3623" k3="-0.9644"/>
++            <vignetting model="pa" focal="10.3" aperture="2.8" distance="1000" k1="-0.8548" k2="1.3623" k3="-0.9644"/>
++            <vignetting model="pa" focal="10.3" aperture="3.2" distance="10" k1="-0.8399" k2="1.3547" k3="-0.9741"/>
++            <vignetting model="pa" focal="10.3" aperture="3.2" distance="1000" k1="-0.8399" k2="1.3547" k3="-0.9741"/>
++            <vignetting model="pa" focal="10.3" aperture="3.5" distance="10" k1="-0.7968" k2="1.1862" k3="-0.8171"/>
++            <vignetting model="pa" focal="10.3" aperture="3.5" distance="1000" k1="-0.7968" k2="1.1862" k3="-0.8171"/>
++            <vignetting model="pa" focal="10.3" aperture="4" distance="10" k1="-0.8262" k2="1.2539" k3="-0.8333"/>
++            <vignetting model="pa" focal="10.3" aperture="4" distance="1000" k1="-0.8262" k2="1.2539" k3="-0.8333"/>
++            <vignetting model="pa" focal="10.3" aperture="5.6" distance="10" k1="-0.7614" k2="0.8763" k3="-0.4500"/>
++            <vignetting model="pa" focal="10.3" aperture="5.6" distance="1000" k1="-0.7614" k2="0.8763" k3="-0.4500"/>
++            <vignetting model="pa" focal="10.3" aperture="8" distance="10" k1="-0.8382" k2="1.0781" k3="-0.6352"/>
++            <vignetting model="pa" focal="10.3" aperture="8" distance="1000" k1="-0.8382" k2="1.0781" k3="-0.6352"/>
++            <vignetting model="pa" focal="12.8" aperture="2.8" distance="10" k1="-0.9081" k2="1.0961" k3="-0.6231"/>
++            <vignetting model="pa" focal="12.8" aperture="2.8" distance="1000" k1="-0.9081" k2="1.0961" k3="-0.6231"/>
++            <vignetting model="pa" focal="12.8" aperture="3.2" distance="10" k1="-0.8844" k2="1.0024" k3="-0.5276"/>
++            <vignetting model="pa" focal="12.8" aperture="3.2" distance="1000" k1="-0.8844" k2="1.0024" k3="-0.5276"/>
++            <vignetting model="pa" focal="12.8" aperture="3.5" distance="10" k1="-0.8884" k2="1.0225" k3="-0.5497"/>
++            <vignetting model="pa" focal="12.8" aperture="3.5" distance="1000" k1="-0.8884" k2="1.0225" k3="-0.5497"/>
++            <vignetting model="pa" focal="12.8" aperture="4" distance="10" k1="-0.8910" k2="1.0217" k3="-0.5487"/>
++            <vignetting model="pa" focal="12.8" aperture="4" distance="1000" k1="-0.8910" k2="1.0217" k3="-0.5487"/>
++            <vignetting model="pa" focal="12.8" aperture="5.6" distance="10" k1="-0.8758" k2="0.9824" k3="-0.5244"/>
++            <vignetting model="pa" focal="12.8" aperture="5.6" distance="1000" k1="-0.8758" k2="0.9824" k3="-0.5244"/>
++            <vignetting model="pa" focal="12.8" aperture="8" distance="10" k1="-0.8347" k2="0.9017" k3="-0.4803"/>
++            <vignetting model="pa" focal="12.8" aperture="8" distance="1000" k1="-0.8347" k2="0.9017" k3="-0.4803"/>
++            <vignetting model="pa" focal="12.8" aperture="16" distance="10" k1="-0.8226" k2="0.8700" k3="-0.4558"/>
++            <vignetting model="pa" focal="12.8" aperture="16" distance="1000" k1="-0.8226" k2="0.8700" k3="-0.4558"/>
++            <vignetting model="pa" focal="18.2" aperture="2.8" distance="10" k1="-0.7510" k2="0.7536" k3="-0.3622"/>
++            <vignetting model="pa" focal="18.2" aperture="2.8" distance="1000" k1="-0.7510" k2="0.7536" k3="-0.3622"/>
++            <vignetting model="pa" focal="18.2" aperture="4" distance="10" k1="-0.7386" k2="0.6923" k3="-0.3163"/>
++            <vignetting model="pa" focal="18.2" aperture="4" distance="1000" k1="-0.7386" k2="0.6923" k3="-0.3163"/>
++            <vignetting model="pa" focal="18.2" aperture="5.6" distance="10" k1="-0.7696" k2="0.7669" k3="-0.3588"/>
++            <vignetting model="pa" focal="18.2" aperture="5.6" distance="1000" k1="-0.7696" k2="0.7669" k3="-0.3588"/>
++            <vignetting model="pa" focal="18.2" aperture="8" distance="10" k1="-0.7210" k2="0.6825" k3="-0.3130"/>
++            <vignetting model="pa" focal="18.2" aperture="8" distance="1000" k1="-0.7210" k2="0.6825" k3="-0.3130"/>
++            <vignetting model="pa" focal="18.2" aperture="16" distance="10" k1="-0.8083" k2="0.8415" k3="-0.3901"/>
++            <vignetting model="pa" focal="18.2" aperture="16" distance="1000" k1="-0.8083" k2="0.8415" k3="-0.3901"/>
++            <vignetting model="pa" focal="25.7" aperture="4" distance="10" k1="-0.7184" k2="0.7128" k3="-0.3154"/>
++            <vignetting model="pa" focal="25.7" aperture="4" distance="1000" k1="-0.7184" k2="0.7128" k3="-0.3154"/>
++            <vignetting model="pa" focal="25.7" aperture="8" distance="10" k1="-0.7649" k2="0.7499" k3="-0.2829"/>
++            <vignetting model="pa" focal="25.7" aperture="8" distance="1000" k1="-0.7649" k2="0.7499" k3="-0.2829"/>
++            <vignetting model="pa" focal="25.7" aperture="16" distance="10" k1="-0.6784" k2="0.6044" k3="-0.2442"/>
++            <vignetting model="pa" focal="25.7" aperture="16" distance="1000" k1="-0.6784" k2="0.6044" k3="-0.2442"/>
++            <vignetting model="pa" focal="33.4" aperture="2.8" distance="10" k1="-0.7282" k2="0.8237" k3="-0.4524"/>
++            <vignetting model="pa" focal="33.4" aperture="2.8" distance="1000" k1="-0.7282" k2="0.8237" k3="-0.4524"/>
++            <vignetting model="pa" focal="33.4" aperture="4" distance="10" k1="-0.7011" k2="0.7048" k3="-0.3177"/>
++            <vignetting model="pa" focal="33.4" aperture="4" distance="1000" k1="-0.7011" k2="0.7048" k3="-0.3177"/>
++            <vignetting model="pa" focal="33.4" aperture="5.6" distance="10" k1="-0.7036" k2="0.6900" k3="-0.2841"/>
++            <vignetting model="pa" focal="33.4" aperture="5.6" distance="1000" k1="-0.7036" k2="0.6900" k3="-0.2841"/>
++            <vignetting model="pa" focal="33.4" aperture="8" distance="10" k1="-0.6922" k2="0.6686" k3="-0.2908"/>
++            <vignetting model="pa" focal="33.4" aperture="8" distance="1000" k1="-0.6922" k2="0.6686" k3="-0.2908"/>
++            <vignetting model="pa" focal="33.4" aperture="16" distance="10" k1="-0.6914" k2="0.6706" k3="-0.2945"/>
++            <vignetting model="pa" focal="33.4" aperture="16" distance="1000" k1="-0.6914" k2="0.6706" k3="-0.2945"/>
++            <vignetting model="pa" focal="36.8" aperture="2.8" distance="10" k1="-0.7582" k2="0.9175" k3="-0.5182"/>
++            <vignetting model="pa" focal="36.8" aperture="2.8" distance="1000" k1="-0.7582" k2="0.9175" k3="-0.5182"/>
++            <vignetting model="pa" focal="36.8" aperture="4" distance="10" k1="-0.7025" k2="0.6804" k3="-0.2813"/>
++            <vignetting model="pa" focal="36.8" aperture="4" distance="1000" k1="-0.7025" k2="0.6804" k3="-0.2813"/>
++            <vignetting model="pa" focal="36.8" aperture="16" distance="10" k1="-0.7480" k2="0.7938" k3="-0.3391"/>
++            <vignetting model="pa" focal="36.8" aperture="16" distance="1000" k1="-0.7480" k2="0.7938" k3="-0.3391"/>
++            <vignetting model="pa" focal="49.4" aperture="2.8" distance="10" k1="-0.7732" k2="0.8595" k3="-0.5079"/>
++            <vignetting model="pa" focal="49.4" aperture="2.8" distance="1000" k1="-0.7732" k2="0.8595" k3="-0.5079"/>
++            <vignetting model="pa" focal="49.4" aperture="4" distance="10" k1="-0.6924" k2="0.7213" k3="-0.3283"/>
++            <vignetting model="pa" focal="49.4" aperture="4" distance="1000" k1="-0.6924" k2="0.7213" k3="-0.3283"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.7191" k2="0.7714" k3="-0.3461"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.7191" k2="0.7714" k3="-0.3461"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="-0.6656" k2="0.6307" k3="-0.2399"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="-0.6656" k2="0.6307" k3="-0.2399"/>
++            <vignetting model="pa" focal="73.3" aperture="2.8" distance="10" k1="-0.7230" k2="0.4629" k3="-0.1359"/>
++            <vignetting model="pa" focal="73.3" aperture="2.8" distance="1000" k1="-0.7230" k2="0.4629" k3="-0.1359"/>
++            <vignetting model="pa" focal="73.3" aperture="8" distance="10" k1="-0.8606" k2="1.3721" k3="-0.9345"/>
++            <vignetting model="pa" focal="73.3" aperture="8" distance="1000" k1="-0.8606" k2="1.3721" k3="-0.9345"/>
++            <vignetting model="pa" focal="73.3" aperture="16" distance="10" k1="-0.7658" k2="0.9603" k3="-0.5151"/>
++            <vignetting model="pa" focal="73.3" aperture="16" distance="1000" k1="-0.7658" k2="0.9603" k3="-0.5151"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony RX10II &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyRX10II</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="8.8" a="0.0376" b="-0.14223" c="0.1059"/>
++            <distortion model="ptlens" focal="9.9" a="0.02873" b="-0.10439" c="0.08589"/>
++            <distortion model="ptlens" focal="10.9" a="0.01917" b="-0.07335" c="0.07298"/>
++            <distortion model="ptlens" focal="13.1" a="0.00477" b="-0.02653" c="0.05952"/>
++            <distortion model="ptlens" focal="18.2" a="-0.00665" b="0.03433" c="-0.00945"/>
++            <distortion model="ptlens" focal="25.2" a="-0.00888" b="0.03994" c="0.0052"/>
++            <distortion model="ptlens" focal="73.2" a="-0.00843" b="0.03659" c="0.01609"/>
++            <tca model="poly3" focal="8.8" vr="1.0006418" vb="1.0000433"/>
++            <tca model="poly3" focal="9.9" vr="1.0001893" vb="1.0000506"/>
++            <tca model="poly3" focal="10.9" vr="1.0001793" vb="1.0000381"/>
++            <tca model="poly3" focal="13.1" vr="1.0005385" vb="1.0000273"/>
++            <tca model="poly3" focal="18.2" vr="1.0004791" vb="1.0000114"/>
++            <tca model="poly3" focal="25.2" vr="1.0003735" vb="0.9999717"/>
++            <tca model="poly3" focal="73.2" vr="0.9998839" vb="0.9999304"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony RX10III &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyRX10III</mount>
++        <cropfactor>2.73</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="8.8" a="0.0241" b="-0.0957892" c="0.036098"/>
++            <distortion model="ptlens" focal="12.63" a="0" b="-0.00336402" c="0"/>
++            <distortion model="ptlens" focal="18.21" a="0" b="0.0103329" c="0"/>
++            <distortion model="ptlens" focal="27.24" a="0" b="0.0178791" c="0"/>
++            <distortion model="ptlens" focal="36.72" a="0" b="0.0211017" c="0"/>
++            <distortion model="ptlens" focal="73.24" a="0" b="0.0188561" c="0"/>
++            <distortion model="ptlens" focal="110.13" a="0" b="0.0198315" c="0"/>
++            <distortion model="ptlens" focal="183.43" a="0" b="0.0197998" c="0"/>
++            <distortion model="ptlens" focal="220" a="0" b="0.0189641" c="0"/>
++            <tca model="poly3" focal="8.8" vr="1.0003000" vb="1.0005000"/>
++            <tca model="poly3" focal="12.6" vr="1.0004000" vb="1.0002000"/>
++            <tca model="poly3" focal="18.2" vr="1.0003000" vb="1.0002000"/>
++            <tca model="poly3" focal="27.2" vr="1.0002000" vb="1.0001000"/>
++            <tca model="poly3" focal="36.7" vr="1.0001000" vb="0.9999651"/>
++            <tca model="poly3" focal="73.2" vr="0.9999973" vb="0.9997000"/>
++            <tca model="poly3" focal="110.1" vr="0.9998000" vb="0.9996000"/>
++            <tca model="poly3" focal="183.4" vr="0.9994000" vb="0.9995500"/>
++            <tca model="poly3" focal="220" vr="0.9994000" vb="0.9996000"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Carl Zeiss</maker>
++        <model>DSC-RX1RM2 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>sonyRX1</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="35" a="0.01397" b="-0.05582" c="0.04619"/>
++            <tca model="poly3" focal="35" vr="1.0001751" vb="1.0000530"/>
+         </calibration>
+     </lens>
+ </lensdatabase>
+diff -Nurpd a/data/db/contax.xml b/data/db/contax.xml
+--- a/data/db/contax.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/contax.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,53 @@
++<lensdatabase>
++    <mount>
++        <name>Contax/Yashica</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Contax G</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Generic</compat>
++    </mount>
++    <camera>
++        <maker>Contax</maker>
++        <model>35mm film: full frame</model>
++        <mount>Contax/Yashica</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <lens>
++        <maker>Contax</maker>
++        <model>Zeiss 21mm f/2.8 Distagon</model>
++        <mount>Contax/Yashica</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="21" a="0.021925" b="-0.043445" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Contax</maker>
++        <model>Zeiss 28mm f/2.8 Distagon</model>
++        <mount>Contax/Yashica</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="28" a="0.007448" b="-0.019182" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Contax</maker>
++        <model>Contax G Planar T* 2/35</model>
++        <mount>Contax G</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="poly3" focal="35" k1="-0.0021"/>
++            <tca model="poly3" focal="35" vr="1.0002" vb="0.9997"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/db.mak b/data/db/db.mak
+--- a/data/db/db.mak	2007-11-08 02:18:36.000000000 +0100
++++ b/data/db/db.mak	1970-01-01 01:00:00.000000000 +0100
+@@ -1,5 +0,0 @@
+-DATA += lensdb
+-DESCRIPTION.lensdb = Lens database files
+-TARGETS.lensdb = $(wildcard data/db/*.xml)
+-TOOLKIT.lensdb = DATA
+-INSTALL.TARGETS += lensdb
+diff -Nurpd a/data/db/generic.xml b/data/db/generic.xml
+--- a/data/db/generic.xml	2013-10-11 23:54:00.000000000 +0200
++++ b/data/db/generic.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,111 +1,135 @@
+-<!--
+-    The meaning of this file is to provide some generic lenses that can be used
+-    to correct or simulate geometric distortions for specific types of lenses.
+-    It does not provide (obviously) any calibration data.
+--->
+ <lensdatabase>
+-
+-    <mount>
+-        <name>M42</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <mount>
+-        <name>T2</name>
+-        <compat>Generic</compat>
+-    </mount>
+-
+     <mount>
+         <name>Generic</name>
++        <!-- The following is a list of all mounts in the Lensfun database for
++             interchangeable lenses. -->
++        <compat>4/3 System</compat>
+         <compat>Canon EF</compat>
++        <compat>Canon EF-M</compat>
+         <compat>Canon EF-S</compat>
++        <compat>Canon FD</compat>
++        <compat>Canon FL</compat>
+         <compat>Contax/Yashica</compat>
++        <compat>Contax G</compat>
++        <compat>Fujifilm X</compat>
++        <compat>Hasselblad 500</compat>
++        <compat>Hasselblad H</compat>
++        <compat>Leica M</compat>
++        <compat>Leica R</compat>
++        <compat>Leica S</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>Mamiya 645</compat>
++        <compat>Micro 4/3 System</compat>
++        <compat>Minolta AF</compat>
++        <compat>Minolta MC</compat>
++        <compat>Minolta MD</compat>
++        <compat>Nikon CX</compat>
+         <compat>Nikon F</compat>
++        <compat>Nikon F AF</compat>
+         <compat>Nikon F AI</compat>
+         <compat>Nikon F AI-S</compat>
+-        <compat>Nikon F AF</compat>
+-        <compat>4/3 System</compat>
+-        <compat>olympusE10</compat>
++        <compat>Olympus OM</compat>
++        <compat>Pentax Q</compat>
+         <compat>Pentax K</compat>
+         <compat>Pentax KA</compat>
+         <compat>Pentax KAF</compat>
+         <compat>Pentax KAF2</compat>
+-        <compat>Sigma</compat>
++        <compat>Pentax KAF3</compat>
++        <compat>Pentax KAF4</compat>
++        <compat>Rollei 6x6</compat>
++        <compat>Samsung NX</compat>
++        <compat>Samsung NX mini</compat>
++        <compat>Sigma SA</compat>
+         <compat>Sony Alpha</compat>
+-        <compat>M42</compat>
++        <compat>Sony E</compat>
++        <compat>Tamron Adaptall</compat>
++        <compat>T2</compat>
++        <compat>C</compat>
++        <compat>Kiev 88</compat>
+     </mount>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 1.0 (Full Frame)</model>
++        <model lang="de">Crop-Faktor 1.0 (Kleinbildformat)</model>
+         <mount>Generic</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 1.1</model>
++        <model lang="de">Crop-Faktor 1.1</model>
+         <mount>Generic</mount>
+         <cropfactor>1.1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 1.3 (APS-H)</model>
++        <model lang="de">Crop-Faktor 1.3 (APS-H)</model>
+         <mount>Generic</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.267</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 1.5 (APS-C)</model>
++        <model lang="de">Crop-Faktor 1.5 (APS-C)</model>
+         <mount>Generic</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 1.6 (APS-C)</model>
++        <model lang="de">Crop-Faktor 1.6 (Canon APS-C)</model>
+         <mount>Generic</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 1.7</model>
++        <model lang="de">Crop-Faktor 1.7 (Sigma)</model>
+         <mount>Generic</mount>
+-        <cropfactor>1.7</cropfactor>
++        <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Crop-factor 2.0 (Four-Thirds)</model>
++        <model lang="de">Crop-Faktor 2.0 (Four-Thirds)</model>
+         <mount>Generic</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Rectilinear 10-1000mm f/1.0</model>
++        <model lang="de">Rektilinear 10-1000mm f/1.0</model>
+         <mount>Generic</mount>
+-        <cropfactor>1.0</cropfactor>
+         <type>rectilinear</type>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Fisheye 8-20mm f/1.0</model>
++        <model lang="de">Fischauge 8-20mm f/1.0</model>
+         <mount>Generic</mount>
+-        <cropfactor>1.0</cropfactor>
+         <type>fisheye</type>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>Generic</maker>
++        <maker lang="de">Generisch</maker>
+         <model>Panoramic 10-100mm f/1.0</model>
++        <model lang="de">Panoramaobjektiv 10-100mm f/1.0</model>
+         <mount>Generic</mount>
+-        <cropfactor>1.0</cropfactor>
+         <type>panoramic</type>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-canon.xml b/data/db/mil-canon.xml
+--- a/data/db/mil-canon.xml	2013-10-11 23:54:00.000000000 +0200
++++ b/data/db/mil-canon.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,14 +1,14 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Canon EF-M</name>
+         <compat>Canon EF-S</compat>
+         <compat>Canon EF</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS M</model>
+@@ -16,5 +16,367 @@
+         <mount>Canon EF-M</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS M2</model>
++        <model lang="en">EOS M2</model>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS M3</model>
++        <model lang="en">EOS M3</model>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-M 18-55mm f/3.5-5.6 IS STM</model>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="18" a="0.0208" b="-0.06707" c="0.02864"/>
++            <distortion model="ptlens" focal="24" a="0.01074" b="-0.03245" c="0.01496"/>
++            <distortion model="ptlens" focal="28" a="0.01015" b="-0.03385" c="0.03436"/>
++            <distortion model="ptlens" focal="35" a="0.00738" b="-0.0241" c="0.0299"/>
++            <distortion model="ptlens" focal="45" a="0.0079" b="-0.02394" c="0.02941"/>
++            <distortion model="ptlens" focal="55" a="0.00824" b="-0.0265" c="0.0378"/>
++            <tca model="poly3" focal="18" br="-0.0001552" vr="1.0005722" bb="0.0001298" vb="0.9997515"/>
++            <tca model="poly3" focal="24" br="-0.0001187" vr="1.0004246" bb="0.0000721" vb="0.9998423"/>
++            <tca model="poly3" focal="28" br="-0.0001068" vr="1.0003574" bb="0.0000875" vb="0.9998350"/>
++            <tca model="poly3" focal="35" br="-0.0000862" vr="1.0002480" bb="0.0000485" vb="0.9998690"/>
++            <tca model="poly3" focal="45" br="-0.0000211" vr="1.0000679" bb="-0.0000189" vb="1.0000319"/>
++            <tca model="poly3" focal="55" br="-0.0000349" vr="0.9999870" bb="0.0000058" vb="1.0000393"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.3322" k2="1.1067" k3="-0.4495"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.3322" k2="1.1067" k3="-0.4495"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.9981" k2="0.3611" k3="0.0001"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.9981" k2="0.3611" k3="0.0001"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.4874" k2="-0.6382" k3="0.5159"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.4874" k2="-0.6382" k3="0.5159"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.4020" k2="-0.4262" k3="0.2472"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.4020" k2="-0.4262" k3="0.2472"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.5060" k2="0.0099" k3="-0.0542"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.5060" k2="0.0099" k3="-0.0542"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.5454" k2="0.1158" k3="-0.0910"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.5454" k2="0.1158" k3="-0.0910"/>
++            <vignetting model="pa" focal="18" aperture="13" distance="10" k1="-0.5080" k2="-0.0298" k3="0.0520"/>
++            <vignetting model="pa" focal="18" aperture="13" distance="1000" k1="-0.5080" k2="-0.0298" k3="0.0520"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.5054" k2="-0.0546" k3="0.0766"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.5054" k2="-0.0546" k3="0.0766"/>
++            <vignetting model="pa" focal="18" aperture="20" distance="10" k1="-0.5073" k2="-0.0562" k3="0.0803"/>
++            <vignetting model="pa" focal="18" aperture="20" distance="1000" k1="-0.5073" k2="-0.0562" k3="0.0803"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.5099" k2="-0.0601" k3="0.0832"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.5099" k2="-0.0601" k3="0.0832"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.1172" k2="0.8679" k3="-0.3365"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.1172" k2="0.8679" k3="-0.3365"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.8195" k2="0.2410" k3="0.0322"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.8195" k2="0.2410" k3="0.0322"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2904" k2="-0.7164" k3="0.5065"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2904" k2="-0.7164" k3="0.5065"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.2449" k2="-0.5351" k3="0.3055"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.2449" k2="-0.5351" k3="0.3055"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.3667" k2="-0.0164" k3="-0.0471"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3667" k2="-0.0164" k3="-0.0471"/>
++            <vignetting model="pa" focal="24" aperture="10" distance="10" k1="-0.4050" k2="0.0699" k3="-0.0438"/>
++            <vignetting model="pa" focal="24" aperture="10" distance="1000" k1="-0.4050" k2="0.0699" k3="-0.0438"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.3733" k2="-0.0463" k3="0.0610"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.3733" k2="-0.0463" k3="0.0610"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.3784" k2="-0.0396" k3="0.0593"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.3784" k2="-0.0396" k3="0.0593"/>
++            <vignetting model="pa" focal="24" aperture="20" distance="10" k1="-0.3771" k2="-0.0401" k3="0.0573"/>
++            <vignetting model="pa" focal="24" aperture="20" distance="1000" k1="-0.3771" k2="-0.0401" k3="0.0573"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.3841" k2="-0.0301" k3="0.0508"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3841" k2="-0.0301" k3="0.0508"/>
++            <vignetting model="pa" focal="31" aperture="4.5" distance="10" k1="-0.9289" k2="0.6723" k3="-0.2469"/>
++            <vignetting model="pa" focal="31" aperture="4.5" distance="1000" k1="-0.9289" k2="0.6723" k3="-0.2469"/>
++            <vignetting model="pa" focal="31" aperture="5" distance="10" k1="-0.6920" k2="0.1915" k3="0.0349"/>
++            <vignetting model="pa" focal="31" aperture="5" distance="1000" k1="-0.6920" k2="0.1915" k3="0.0349"/>
++            <vignetting model="pa" focal="31" aperture="6.3" distance="10" k1="-0.1584" k2="-0.5926" k3="0.3605"/>
++            <vignetting model="pa" focal="31" aperture="6.3" distance="1000" k1="-0.1584" k2="-0.5926" k3="0.3605"/>
++            <vignetting model="pa" focal="31" aperture="8" distance="10" k1="-0.2692" k2="-0.0178" k3="-0.0490"/>
++            <vignetting model="pa" focal="31" aperture="8" distance="1000" k1="-0.2692" k2="-0.0178" k3="-0.0490"/>
++            <vignetting model="pa" focal="31" aperture="10" distance="10" k1="-0.2963" k2="0.0330" k3="-0.0091"/>
++            <vignetting model="pa" focal="31" aperture="10" distance="1000" k1="-0.2963" k2="0.0330" k3="-0.0091"/>
++            <vignetting model="pa" focal="31" aperture="13" distance="10" k1="-0.2843" k2="-0.0144" k3="0.0369"/>
++            <vignetting model="pa" focal="31" aperture="13" distance="1000" k1="-0.2843" k2="-0.0144" k3="0.0369"/>
++            <vignetting model="pa" focal="31" aperture="16" distance="10" k1="-0.2904" k2="0.0050" k3="0.0244"/>
++            <vignetting model="pa" focal="31" aperture="16" distance="1000" k1="-0.2904" k2="0.0050" k3="0.0244"/>
++            <vignetting model="pa" focal="31" aperture="20" distance="10" k1="-0.2886" k2="-0.0044" k3="0.0293"/>
++            <vignetting model="pa" focal="31" aperture="20" distance="1000" k1="-0.2886" k2="-0.0044" k3="0.0293"/>
++            <vignetting model="pa" focal="31" aperture="25" distance="10" k1="-0.2850" k2="-0.0074" k3="0.0297"/>
++            <vignetting model="pa" focal="31" aperture="25" distance="1000" k1="-0.2850" k2="-0.0074" k3="0.0297"/>
++            <vignetting model="pa" focal="31" aperture="29" distance="10" k1="-0.2879" k2="-0.0134" k3="0.0375"/>
++            <vignetting model="pa" focal="31" aperture="29" distance="1000" k1="-0.2879" k2="-0.0134" k3="0.0375"/>
++            <vignetting model="pa" focal="39" aperture="5" distance="10" k1="-0.7550" k2="0.4876" k3="-0.1637"/>
++            <vignetting model="pa" focal="39" aperture="5" distance="1000" k1="-0.7550" k2="0.4876" k3="-0.1637"/>
++            <vignetting model="pa" focal="39" aperture="5.6" distance="10" k1="-0.3883" k2="-0.2244" k3="0.2380"/>
++            <vignetting model="pa" focal="39" aperture="5.6" distance="1000" k1="-0.3883" k2="-0.2244" k3="0.2380"/>
++            <vignetting model="pa" focal="39" aperture="7.1" distance="10" k1="-0.1068" k2="-0.4347" k3="0.2373"/>
++            <vignetting model="pa" focal="39" aperture="7.1" distance="1000" k1="-0.1068" k2="-0.4347" k3="0.2373"/>
++            <vignetting model="pa" focal="39" aperture="9" distance="10" k1="-0.2316" k2="0.0691" k3="-0.0457"/>
++            <vignetting model="pa" focal="39" aperture="9" distance="1000" k1="-0.2316" k2="0.0691" k3="-0.0457"/>
++            <vignetting model="pa" focal="39" aperture="10" distance="10" k1="-0.2242" k2="0.0150" k3="0.0142"/>
++            <vignetting model="pa" focal="39" aperture="10" distance="1000" k1="-0.2242" k2="0.0150" k3="0.0142"/>
++            <vignetting model="pa" focal="39" aperture="13" distance="10" k1="-0.2222" k2="0.0131" k3="0.0182"/>
++            <vignetting model="pa" focal="39" aperture="13" distance="1000" k1="-0.2222" k2="0.0131" k3="0.0182"/>
++            <vignetting model="pa" focal="39" aperture="16" distance="10" k1="-0.2248" k2="0.0189" k3="0.0139"/>
++            <vignetting model="pa" focal="39" aperture="16" distance="1000" k1="-0.2248" k2="0.0189" k3="0.0139"/>
++            <vignetting model="pa" focal="39" aperture="20" distance="10" k1="-0.2301" k2="0.0268" k3="0.0108"/>
++            <vignetting model="pa" focal="39" aperture="20" distance="1000" k1="-0.2301" k2="0.0268" k3="0.0108"/>
++            <vignetting model="pa" focal="39" aperture="25" distance="10" k1="-0.2277" k2="0.0163" k3="0.0184"/>
++            <vignetting model="pa" focal="39" aperture="25" distance="1000" k1="-0.2277" k2="0.0163" k3="0.0184"/>
++            <vignetting model="pa" focal="39" aperture="32" distance="10" k1="-0.2321" k2="0.0255" k3="0.0120"/>
++            <vignetting model="pa" focal="39" aperture="32" distance="1000" k1="-0.2321" k2="0.0255" k3="0.0120"/>
++            <vignetting model="pa" focal="47" aperture="5.6" distance="10" k1="-0.6616" k2="0.4076" k3="-0.1308"/>
++            <vignetting model="pa" focal="47" aperture="5.6" distance="1000" k1="-0.6616" k2="0.4076" k3="-0.1308"/>
++            <vignetting model="pa" focal="47" aperture="6.3" distance="10" k1="-0.1392" k2="-0.4872" k3="0.3286"/>
++            <vignetting model="pa" focal="47" aperture="6.3" distance="1000" k1="-0.1392" k2="-0.4872" k3="0.3286"/>
++            <vignetting model="pa" focal="47" aperture="8" distance="10" k1="-0.1672" k2="-0.0069" k3="-0.0490"/>
++            <vignetting model="pa" focal="47" aperture="8" distance="1000" k1="-0.1672" k2="-0.0069" k3="-0.0490"/>
++            <vignetting model="pa" focal="47" aperture="10" distance="10" k1="-0.1980" k2="0.0536" k3="-0.0156"/>
++            <vignetting model="pa" focal="47" aperture="10" distance="1000" k1="-0.1980" k2="0.0536" k3="-0.0156"/>
++            <vignetting model="pa" focal="47" aperture="13" distance="10" k1="-0.1958" k2="0.0473" k3="-0.0079"/>
++            <vignetting model="pa" focal="47" aperture="13" distance="1000" k1="-0.1958" k2="0.0473" k3="-0.0079"/>
++            <vignetting model="pa" focal="47" aperture="16" distance="10" k1="-0.2024" k2="0.0584" k3="-0.0134"/>
++            <vignetting model="pa" focal="47" aperture="16" distance="1000" k1="-0.2024" k2="0.0584" k3="-0.0134"/>
++            <vignetting model="pa" focal="47" aperture="20" distance="10" k1="-0.2012" k2="0.0572" k3="-0.0141"/>
++            <vignetting model="pa" focal="47" aperture="20" distance="1000" k1="-0.2012" k2="0.0572" k3="-0.0141"/>
++            <vignetting model="pa" focal="47" aperture="25" distance="10" k1="-0.1971" k2="0.0470" k3="-0.0070"/>
++            <vignetting model="pa" focal="47" aperture="25" distance="1000" k1="-0.1971" k2="0.0470" k3="-0.0070"/>
++            <vignetting model="pa" focal="47" aperture="32" distance="10" k1="-0.2053" k2="0.0651" k3="-0.0188"/>
++            <vignetting model="pa" focal="47" aperture="32" distance="1000" k1="-0.2053" k2="0.0651" k3="-0.0188"/>
++            <vignetting model="pa" focal="47" aperture="36" distance="10" k1="-0.2116" k2="0.0699" k3="-0.0204"/>
++            <vignetting model="pa" focal="47" aperture="36" distance="1000" k1="-0.2116" k2="0.0699" k3="-0.0204"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6081" k2="0.3726" k3="-0.1244"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6081" k2="0.3726" k3="-0.1244"/>
++            <vignetting model="pa" focal="55" aperture="6.3" distance="10" k1="-0.2656" k2="-0.2359" k3="0.2059"/>
++            <vignetting model="pa" focal="55" aperture="6.3" distance="1000" k1="-0.2656" k2="-0.2359" k3="0.2059"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1732" k2="0.0054" k3="-0.0483"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1732" k2="0.0054" k3="-0.0483"/>
++            <vignetting model="pa" focal="55" aperture="10" distance="10" k1="-0.2177" k2="0.1287" k3="-0.0562"/>
++            <vignetting model="pa" focal="55" aperture="10" distance="1000" k1="-0.2177" k2="0.1287" k3="-0.0562"/>
++            <vignetting model="pa" focal="55" aperture="13" distance="10" k1="-0.2068" k2="0.1038" k3="-0.0402"/>
++            <vignetting model="pa" focal="55" aperture="13" distance="1000" k1="-0.2068" k2="0.1038" k3="-0.0402"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2090" k2="0.1074" k3="-0.0418"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2090" k2="0.1074" k3="-0.0418"/>
++            <vignetting model="pa" focal="55" aperture="20" distance="10" k1="-0.2145" k2="0.1189" k3="-0.0493"/>
++            <vignetting model="pa" focal="55" aperture="20" distance="1000" k1="-0.2145" k2="0.1189" k3="-0.0493"/>
++            <vignetting model="pa" focal="55" aperture="25" distance="10" k1="-0.2162" k2="0.1227" k3="-0.0521"/>
++            <vignetting model="pa" focal="55" aperture="25" distance="1000" k1="-0.2162" k2="0.1227" k3="-0.0521"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="10" k1="-0.2201" k2="0.1294" k3="-0.0577"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.2201" k2="0.1294" k3="-0.0577"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.2304" k2="0.1392" k3="-0.0595"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.2304" k2="0.1392" k3="-0.0595"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-M 55-200mm f/4.5-6.3 IS STM</model>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS M3 -->
++            <distortion model="ptlens" focal="55" a="0.00329" b="-0.01435" c="0.00377"/>
++            <distortion model="ptlens" focal="70" a="0.00015" b="-0.00242" c="0.00388"/>
++            <distortion model="ptlens" focal="100" a="-0.00155" b="0.01025" c="-0.01011"/>
++            <distortion model="ptlens" focal="135" a="0.00082" b="0.00321" c="0.00353"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.00627" c="0"/>
++            <tca model="poly3" focal="55" br="0.0001071" vr="0.9998291" bb="-0.0001337" vb="1.0003026"/>
++            <tca model="poly3" focal="70" br="0.0001116" vr="0.9997943" bb="-0.0001178" vb="1.0002674"/>
++            <tca model="poly3" focal="100" br="0.0000854" vr="0.9997423" bb="-0.0000962" vb="1.0001993"/>
++            <tca model="poly3" focal="135" br="0.0000790" vr="0.9996930" bb="-0.0000693" vb="1.0000981"/>
++            <tca model="poly3" focal="200" br="0.0000039" vr="0.9997842" bb="-0.0000210" vb="0.9998454"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.8433" k2="0.3433" k3="-0.1118"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.8433" k2="0.3433" k3="-0.1118"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0182" k2="-0.6545" k3="0.2298"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0182" k2="-0.6545" k3="0.2298"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.2507" k2="0.3525" k3="-0.4179"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.2507" k2="0.3525" k3="-0.4179"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.2337" k2="0.1947" k3="-0.1535"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.2337" k2="0.1947" k3="-0.1535"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1837" k2="0.0173" k3="-0.0031"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1837" k2="0.0173" k3="-0.0031"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.9554" k2="0.7145" k3="-0.3311"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.9554" k2="0.7145" k3="-0.3311"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0480" k2="-0.6194" k3="0.2584"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0480" k2="-0.6194" k3="0.2584"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2278" k2="0.3198" k3="-0.3787"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2278" k2="0.3198" k3="-0.3787"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2006" k2="0.1435" k3="-0.1132"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2006" k2="0.1435" k3="-0.1132"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1872" k2="0.0641" k3="-0.0331"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1872" k2="0.0641" k3="-0.0331"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.9906" k2="0.9718" k3="-0.5459"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.9906" k2="0.9718" k3="-0.5459"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.3833" k2="-0.1289" k3="0.0226"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.3833" k2="-0.1289" k3="0.0226"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1705" k2="0.1832" k3="-0.2866"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1705" k2="0.1832" k3="-0.2866"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.1799" k2="0.1162" k3="-0.0876"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1799" k2="0.1162" k3="-0.0876"/>
++            <vignetting model="pa" focal="100" aperture="25" distance="10" k1="-0.1637" k2="0.0499" k3="-0.0247"/>
++            <vignetting model="pa" focal="100" aperture="25" distance="1000" k1="-0.1637" k2="0.0499" k3="-0.0247"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.8756" k2="0.3596" k3="-0.0943"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.8756" k2="0.3596" k3="-0.0943"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0976" k2="0.0226" k3="-0.2644"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0976" k2="0.0226" k3="-0.2644"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1509" k2="0.0612" k3="-0.0359"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1509" k2="0.0612" k3="-0.0359"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1506" k2="0.0526" k3="-0.0254"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1506" k2="0.0526" k3="-0.0254"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="-0.1561" k2="0.0642" k3="-0.0328"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="-0.1561" k2="0.0642" k3="-0.0328"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-1.4623" k2="1.5775" k3="-0.7386"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-1.4623" k2="1.5775" k3="-0.7386"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1575" k2="-0.7181" k3="0.4431"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1575" k2="-0.7181" k3="0.4431"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1077" k2="0.0286" k3="-0.1211"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1077" k2="0.0286" k3="-0.1211"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.1262" k2="0.0398" k3="-0.0189"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.1262" k2="0.0398" k3="-0.0189"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.1265" k2="0.0423" k3="-0.0239"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1265" k2="0.0423" k3="-0.0239"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-M 22mm f/2 STM</model>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="22" k1="-0.00018"/>
++            <tca model="poly3" focal="22" br="-0.0000678" vr="1.0002505" bb="0.0000624" vb="1.0000225"/>
++            <vignetting model="pa" focal="22" aperture="2" distance="10" k1="-1.7852" k2="1.6007" k3="-0.6249"/>
++            <vignetting model="pa" focal="22" aperture="2" distance="1000" k1="-1.7852" k2="1.6007" k3="-0.6249"/>
++            <vignetting model="pa" focal="22" aperture="2.2" distance="10" k1="-0.7930" k2="-0.3929" k3="0.4473"/>
++            <vignetting model="pa" focal="22" aperture="2.2" distance="1000" k1="-0.7930" k2="-0.3929" k3="0.4473"/>
++            <vignetting model="pa" focal="22" aperture="2.5" distance="10" k1="-0.7636" k2="-0.2093" k3="0.2587"/>
++            <vignetting model="pa" focal="22" aperture="2.5" distance="1000" k1="-0.7636" k2="-0.2093" k3="0.2587"/>
++            <vignetting model="pa" focal="22" aperture="3.2" distance="10" k1="-0.8930" k2="0.3786" k3="-0.1146"/>
++            <vignetting model="pa" focal="22" aperture="3.2" distance="1000" k1="-0.8930" k2="0.3786" k3="-0.1146"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="10" k1="-0.8868" k2="0.3302" k3="-0.0361"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="1000" k1="-0.8868" k2="0.3302" k3="-0.0361"/>
++            <vignetting model="pa" focal="22" aperture="5" distance="10" k1="-0.8820" k2="0.3159" k3="-0.0204"/>
++            <vignetting model="pa" focal="22" aperture="5" distance="1000" k1="-0.8820" k2="0.3159" k3="-0.0204"/>
++            <vignetting model="pa" focal="22" aperture="6.3" distance="10" k1="-0.8804" k2="0.3111" k3="-0.0150"/>
++            <vignetting model="pa" focal="22" aperture="6.3" distance="1000" k1="-0.8804" k2="0.3111" k3="-0.0150"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="10" k1="-0.8788" k2="0.3072" k3="-0.0121"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="1000" k1="-0.8788" k2="0.3072" k3="-0.0121"/>
++            <vignetting model="pa" focal="22" aperture="10" distance="10" k1="-0.8842" k2="0.3173" k3="-0.0168"/>
++            <vignetting model="pa" focal="22" aperture="10" distance="1000" k1="-0.8842" k2="0.3173" k3="-0.0168"/>
++            <vignetting model="pa" focal="22" aperture="13" distance="10" k1="-0.8957" k2="0.3596" k3="-0.0484"/>
++            <vignetting model="pa" focal="22" aperture="13" distance="1000" k1="-0.8957" k2="0.3596" k3="-0.0484"/>
++            <vignetting model="pa" focal="22" aperture="16" distance="10" k1="-0.8819" k2="0.3147" k3="-0.0177"/>
++            <vignetting model="pa" focal="22" aperture="16" distance="1000" k1="-0.8819" k2="0.3147" k3="-0.0177"/>
++            <vignetting model="pa" focal="22" aperture="20" distance="10" k1="-0.8851" k2="0.3189" k3="-0.0201"/>
++            <vignetting model="pa" focal="22" aperture="20" distance="1000" k1="-0.8851" k2="0.3189" k3="-0.0201"/>
++            <vignetting model="pa" focal="22" aperture="22" distance="10" k1="-0.8954" k2="0.3316" k3="-0.0229"/>
++            <vignetting model="pa" focal="22" aperture="22" distance="1000" k1="-0.8954" k2="0.3316" k3="-0.0229"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-M 15-45mm f/3.5-6.3 IS STM</model>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="15" a="0.035139" b="-0.115139" c="0.078461"/>
++            <distortion model="ptlens" focal="18" a="0.010135" b="-0.023592" c="-0.006096"/>
++            <distortion model="ptlens" focal="24" a="0.007293" b="-0.017303" c="0.013606"/>
++            <distortion model="ptlens" focal="28" a="-0.015774" b="0.066738" c="-0.082776"/>
++            <distortion model="ptlens" focal="35" a="-0.000685" b="0.008768" c="-0.016512"/>
++            <distortion model="ptlens" focal="45" a="-0.005422" b="0.019679" c="-0.035102"/>
++            <tca model="poly3" focal="15" br="-0.0000738" vr="1.0004883" bb="0.0001164" vb="0.9997778"/>
++            <tca model="poly3" focal="18" br="-0.0000605" vr="1.0003911" bb="0.0000720" vb="0.9998563"/>
++            <tca model="poly3" focal="24" br="-0.0000288" vr="1.0001914" bb="0.0000319" vb="1.0000220"/>
++            <tca model="poly3" focal="28" br="-0.0000301" vr="1.0001152" bb="0.0000103" vb="1.0001012"/>
++            <tca model="poly3" focal="35" br="0.0000237" vr="0.9999754" bb="-0.0000166" vb="1.0001936"/>
++            <tca model="poly3" focal="45" br="0.0000547" vr="0.9999437" bb="-0.0000552" vb="1.0001741"/>
++            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-0.6962" k2="0.6492" k3="-0.2979"/>
++            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-0.6962" k2="0.6492" k3="-0.2979"/>
++            <vignetting model="pa" focal="15" aperture="4" distance="10" k1="-0.6406" k2="0.5139" k3="-0.2424"/>
++            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.6406" k2="0.5139" k3="-0.2424"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.5538" k2="0.5420" k3="-0.3470"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.5538" k2="0.5420" k3="-0.3470"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="10" k1="-0.5508" k2="0.5651" k3="-0.3496"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.5508" k2="0.5651" k3="-0.3496"/>
++            <vignetting model="pa" focal="15" aperture="11" distance="10" k1="-0.5336" k2="0.5178" k3="-0.3119"/>
++            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.5336" k2="0.5178" k3="-0.3119"/>
++            <vignetting model="pa" focal="15" aperture="16" distance="10" k1="-0.5191" k2="0.4897" k3="-0.2890"/>
++            <vignetting model="pa" focal="15" aperture="16" distance="1000" k1="-0.5191" k2="0.4897" k3="-0.2890"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.5154" k2="0.4946" k3="-0.2926"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.5154" k2="0.4946" k3="-0.2926"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.5938" k2="0.5637" k3="-0.2811"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.5938" k2="0.5637" k3="-0.2811"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.5364" k2="0.4561" k3="-0.2384"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.5364" k2="0.4561" k3="-0.2384"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.4444" k2="0.4837" k3="-0.3361"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.4444" k2="0.4837" k3="-0.3361"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.4485" k2="0.4879" k3="-0.3294"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4485" k2="0.4879" k3="-0.3294"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.4415" k2="0.4907" k3="-0.3334"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4415" k2="0.4907" k3="-0.3334"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.4440" k2="0.5081" k3="-0.3466"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.4440" k2="0.5081" k3="-0.3466"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.4400" k2="0.5094" k3="-0.3470"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4400" k2="0.5094" k3="-0.3470"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.4455" k2="0.4414" k3="-0.2711"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.4455" k2="0.4414" k3="-0.2711"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.3268" k2="0.4236" k3="-0.3525"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.3268" k2="0.4236" k3="-0.3525"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.3539" k2="0.5190" k3="-0.4117"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3539" k2="0.5190" k3="-0.4117"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.3551" k2="0.5264" k3="-0.4200"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.3551" k2="0.5264" k3="-0.4200"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.3488" k2="0.5177" k3="-0.4106"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.3488" k2="0.5177" k3="-0.4106"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.3036" k2="0.4303" k3="-0.3604"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.3036" k2="0.4303" k3="-0.3604"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="10" k1="-0.3003" k2="0.4256" k3="-0.3578"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.3003" k2="0.4256" k3="-0.3578"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.3744" k2="0.4127" k3="-0.2910"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.3744" k2="0.4127" k3="-0.2910"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2735" k2="0.4170" k3="-0.3779"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2735" k2="0.4170" k3="-0.3779"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3023" k2="0.5235" k3="-0.4414"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3023" k2="0.5235" k3="-0.4414"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.2991" k2="0.5130" k3="-0.4346"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.2991" k2="0.5130" k3="-0.4346"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.2901" k2="0.5003" k3="-0.4271"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.2901" k2="0.5003" k3="-0.4271"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3062" k2="0.5391" k3="-0.4497"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3062" k2="0.5391" k3="-0.4497"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.2960" k2="0.5319" k3="-0.4482"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.2960" k2="0.5319" k3="-0.4482"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.3066" k2="0.4340" k3="-0.3522"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3066" k2="0.4340" k3="-0.3522"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2633" k2="0.5830" k3="-0.5147"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2633" k2="0.5830" k3="-0.5147"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2651" k2="0.5868" k3="-0.5175"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2651" k2="0.5868" k3="-0.5175"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.2594" k2="0.5712" k3="-0.5054"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.2594" k2="0.5712" k3="-0.5054"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2654" k2="0.5790" k3="-0.5062"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2654" k2="0.5790" k3="-0.5062"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.2606" k2="0.5665" k3="-0.4937"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2606" k2="0.5665" k3="-0.4937"/>
++            <vignetting model="pa" focal="35" aperture="36" distance="10" k1="-0.2737" k2="0.5914" k3="-0.5090"/>
++            <vignetting model="pa" focal="35" aperture="36" distance="1000" k1="-0.2737" k2="0.5914" k3="-0.5090"/>
++            <vignetting model="pa" focal="45" aperture="6.3" distance="10" k1="-0.2744" k2="0.5719" k3="-0.5032"/>
++            <vignetting model="pa" focal="45" aperture="6.3" distance="1000" k1="-0.2744" k2="0.5719" k3="-0.5032"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="10" k1="-0.2479" k2="0.7250" k3="-0.6548"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.2479" k2="0.7250" k3="-0.6548"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.2239" k2="0.6470" k3="-0.5907"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.2239" k2="0.6470" k3="-0.5907"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="10" k1="-0.2263" k2="0.6489" k3="-0.5925"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.2263" k2="0.6489" k3="-0.5925"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.2255" k2="0.6497" k3="-0.5912"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.2255" k2="0.6497" k3="-0.5912"/>
++            <vignetting model="pa" focal="45" aperture="32" distance="10" k1="-0.2364" k2="0.6638" k3="-0.5952"/>
++            <vignetting model="pa" focal="45" aperture="32" distance="1000" k1="-0.2364" k2="0.6638" k3="-0.5952"/>
++            <vignetting model="pa" focal="45" aperture="40" distance="10" k1="-0.2436" k2="0.6728" k3="-0.5953"/>
++            <vignetting model="pa" focal="45" aperture="40" distance="1000" k1="-0.2436" k2="0.6728" k3="-0.5953"/>
++        </calibration>
++    </lens>
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-fujifilm.xml b/data/db/mil-fujifilm.xml
+--- a/data/db/mil-fujifilm.xml	2013-10-18 19:20:57.000000000 +0200
++++ b/data/db/mil-fujifilm.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,34 +1,1113 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Fujifilm X</name>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>X-Pro1</model>
+         <mount>Fujifilm X</mount>
+-        <cropfactor>1.529</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
++        <model>X-Pro2</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
+         <model>X-E1</model>
+         <mount>Fujifilm X</mount>
+-        <cropfactor>1.529</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
++        <model>X-E2</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-E2S</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-T1</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-T2</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
+         <model>X-M1</model>
+         <mount>Fujifilm X</mount>
+-        <cropfactor>1.529</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-A1</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-A2</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-T10</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>X-T20</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF18-55mmF2.8-4 R LM OIS</model>
++        <model lang="en">XF 18-55mm f/2.8-4 R LM OIS</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-E1 -->
++            <distortion model="ptlens" focal="18" a="0.02808" b="-0.10604" c="0.07041"/>
++            <distortion model="ptlens" focal="22.3" a="0.01298" b="-0.03695" c="0.01899"/>
++            <distortion model="ptlens" focal="27.7" a="0.03709" b="-0.11695" c="0.1187"/>
++            <distortion model="ptlens" focal="35.8" a="0.02942" b="-0.08799" c="0.09673"/>
++            <distortion model="ptlens" focal="44.4" a="0.00611" b="-0.00562" c="0.0159"/>
++            <distortion model="ptlens" focal="55" a="0.00491" b="-0.00114" c="0.01427"/>
++            <tca model="poly3" focal="18" br="-0.0001885" vr="1.0006600" bb="0.0001738" vb="0.9998316"/>
++            <tca model="poly3" focal="22.3" br="-0.0001934" vr="1.0004668" bb="0.0002412" vb="0.9997719"/>
++            <tca model="poly3" focal="27.7" br="-0.0001630" vr="1.0003388" bb="0.0001984" vb="0.9997897"/>
++            <tca model="poly3" focal="35.8" br="-0.0001699" vr="1.0002943" bb="0.0001666" vb="0.9997469"/>
++            <tca model="poly3" focal="44.4" br="-0.0001304" vr="1.0002094" bb="0.0001355" vb="0.9996474"/>
++            <tca model="poly3" focal="55" br="-0.0001185" vr="1.0001664" bb="0.0001695" vb="0.9993813"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="18" aperture="2.8" distance="10" k1="-0.9940" k2="0.9214" k3="-0.6090"/>
++            <vignetting model="pa" focal="18" aperture="2.8" distance="1000" k1="-0.9940" k2="0.9214" k3="-0.6090"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2929" k2="-0.2031" k3="-0.0206"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2929" k2="-0.2031" k3="-0.0206"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.4171" k2="0.2130" k3="-0.2220"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.4171" k2="0.2130" k3="-0.2220"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3676" k2="0.0019" k3="-0.0094"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3676" k2="0.0019" k3="-0.0094"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3752" k2="0.0224" k3="-0.0227"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3752" k2="0.0224" k3="-0.0227"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.3861" k2="0.0443" k3="-0.0331"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.3861" k2="0.0443" k3="-0.0331"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3907" k2="0.0521" k3="-0.0360"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3907" k2="0.0521" k3="-0.0360"/>
++            <vignetting model="pa" focal="23.3" aperture="3.2" distance="10" k1="-1.0139" k2="1.2731" k3="-0.7978"/>
++            <vignetting model="pa" focal="23.3" aperture="3.2" distance="1000" k1="-1.0139" k2="1.2731" k3="-0.7978"/>
++            <vignetting model="pa" focal="23.3" aperture="4" distance="10" k1="-0.3673" k2="-0.0866" k3="0.0234"/>
++            <vignetting model="pa" focal="23.3" aperture="4" distance="1000" k1="-0.3673" k2="-0.0866" k3="0.0234"/>
++            <vignetting model="pa" focal="23.3" aperture="5.6" distance="10" k1="-0.3168" k2="0.0613" k3="-0.0534"/>
++            <vignetting model="pa" focal="23.3" aperture="5.6" distance="1000" k1="-0.3168" k2="0.0613" k3="-0.0534"/>
++            <vignetting model="pa" focal="23.3" aperture="8" distance="10" k1="-0.3039" k2="0.0142" k3="-0.0113"/>
++            <vignetting model="pa" focal="23.3" aperture="8" distance="1000" k1="-0.3039" k2="0.0142" k3="-0.0113"/>
++            <vignetting model="pa" focal="23.3" aperture="11" distance="10" k1="-0.3033" k2="0.0151" k3="-0.0123"/>
++            <vignetting model="pa" focal="23.3" aperture="11" distance="1000" k1="-0.3033" k2="0.0151" k3="-0.0123"/>
++            <vignetting model="pa" focal="23.3" aperture="16" distance="10" k1="-0.3170" k2="0.0485" k3="-0.0348"/>
++            <vignetting model="pa" focal="23.3" aperture="16" distance="1000" k1="-0.3170" k2="0.0485" k3="-0.0348"/>
++            <vignetting model="pa" focal="23.3" aperture="22" distance="10" k1="-0.3237" k2="0.0555" k3="-0.0357"/>
++            <vignetting model="pa" focal="23.3" aperture="22" distance="1000" k1="-0.3237" k2="0.0555" k3="-0.0357"/>
++            <vignetting model="pa" focal="28.9" aperture="3.2" distance="10" k1="-0.9565" k2="1.3570" k3="-0.9694"/>
++            <vignetting model="pa" focal="28.9" aperture="3.2" distance="1000" k1="-0.9565" k2="1.3570" k3="-0.9694"/>
++            <vignetting model="pa" focal="28.9" aperture="4" distance="10" k1="-0.3912" k2="0.2104" k3="-0.2598"/>
++            <vignetting model="pa" focal="28.9" aperture="4" distance="1000" k1="-0.3912" k2="0.2104" k3="-0.2598"/>
++            <vignetting model="pa" focal="28.9" aperture="5.6" distance="10" k1="-0.2824" k2="0.0648" k3="-0.0563"/>
++            <vignetting model="pa" focal="28.9" aperture="5.6" distance="1000" k1="-0.2824" k2="0.0648" k3="-0.0563"/>
++            <vignetting model="pa" focal="28.9" aperture="8" distance="10" k1="-0.2744" k2="0.0335" k3="-0.0273"/>
++            <vignetting model="pa" focal="28.9" aperture="8" distance="1000" k1="-0.2744" k2="0.0335" k3="-0.0273"/>
++            <vignetting model="pa" focal="28.9" aperture="11" distance="10" k1="-0.2786" k2="0.0444" k3="-0.0334"/>
++            <vignetting model="pa" focal="28.9" aperture="11" distance="1000" k1="-0.2786" k2="0.0444" k3="-0.0334"/>
++            <vignetting model="pa" focal="28.9" aperture="16" distance="10" k1="-0.2878" k2="0.0649" k3="-0.0462"/>
++            <vignetting model="pa" focal="28.9" aperture="16" distance="1000" k1="-0.2878" k2="0.0649" k3="-0.0462"/>
++            <vignetting model="pa" focal="28.9" aperture="22" distance="10" k1="-0.2878" k2="0.0600" k3="-0.0421"/>
++            <vignetting model="pa" focal="28.9" aperture="22" distance="1000" k1="-0.2878" k2="0.0600" k3="-0.0421"/>
++            <vignetting model="pa" focal="35.8" aperture="3.6" distance="10" k1="-0.8448" k2="1.2051" k3="-0.9476"/>
++            <vignetting model="pa" focal="35.8" aperture="3.6" distance="1000" k1="-0.8448" k2="1.2051" k3="-0.9476"/>
++            <vignetting model="pa" focal="35.8" aperture="4" distance="10" k1="-0.6601" k2="0.8248" k3="-0.6931"/>
++            <vignetting model="pa" focal="35.8" aperture="4" distance="1000" k1="-0.6601" k2="0.8248" k3="-0.6931"/>
++            <vignetting model="pa" focal="35.8" aperture="5.6" distance="10" k1="-0.3767" k2="0.4933" k3="-0.4300"/>
++            <vignetting model="pa" focal="35.8" aperture="5.6" distance="1000" k1="-0.3767" k2="0.4933" k3="-0.4300"/>
++            <vignetting model="pa" focal="35.8" aperture="8" distance="10" k1="-0.2710" k2="0.0847" k3="-0.0614"/>
++            <vignetting model="pa" focal="35.8" aperture="8" distance="1000" k1="-0.2710" k2="0.0847" k3="-0.0614"/>
++            <vignetting model="pa" focal="35.8" aperture="11" distance="10" k1="-0.2727" k2="0.0875" k3="-0.0614"/>
++            <vignetting model="pa" focal="35.8" aperture="11" distance="1000" k1="-0.2727" k2="0.0875" k3="-0.0614"/>
++            <vignetting model="pa" focal="35.8" aperture="16" distance="10" k1="-0.2772" k2="0.1002" k3="-0.0710"/>
++            <vignetting model="pa" focal="35.8" aperture="16" distance="1000" k1="-0.2772" k2="0.1002" k3="-0.0710"/>
++            <vignetting model="pa" focal="35.8" aperture="22" distance="10" k1="-0.2818" k2="0.1161" k3="-0.0841"/>
++            <vignetting model="pa" focal="35.8" aperture="22" distance="1000" k1="-0.2818" k2="0.1161" k3="-0.0841"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.4700" k2="0.1851" k3="-0.3613"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.4700" k2="0.1851" k3="-0.3613"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.3795" k2="0.7246" k3="-0.7785"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3795" k2="0.7246" k3="-0.7785"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.3782" k2="0.6199" k3="-0.5550"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.3782" k2="0.6199" k3="-0.5550"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.2621" k2="0.1629" k3="-0.1325"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.2621" k2="0.1629" k3="-0.1325"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2565" k2="0.1369" k3="-0.1058"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2565" k2="0.1369" k3="-0.1058"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2428" k2="0.1097" k3="-0.0909"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2428" k2="0.1097" k3="-0.0909"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XC16-50mmF3.5-5.6 OIS</model>
++        <model lang="en">XC 16-50mm f/3.5-5.6 OIS</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-M1 -->
++            <distortion model="ptlens" focal="16" a="0.02487" b="-0.09617" c="0.03106"/>
++            <distortion model="ptlens" focal="22.2" a="0.00843" b="-0.03427" c="0.01288"/>
++            <distortion model="ptlens" focal="28.2" a="0.01218" b="-0.05193" c="0.0513"/>
++            <distortion model="ptlens" focal="34" a="-0.00417" b="0.01591" c="-0.02319"/>
++            <distortion model="ptlens" focal="41.8" a="0" b="-0.00159" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00416" c="0"/>
++            <tca model="poly3" focal="16" br="-0.0001013" vr="1.0003838" bb="0.0000720" vb="1.0000557"/>
++            <tca model="poly3" focal="22.2" br="-0.0000844" vr="1.0002839" bb="0.0000997" vb="0.9999382"/>
++            <tca model="poly3" focal="29.5" br="-0.0000603" vr="1.0002492" bb="0.0000545" vb="0.9999185"/>
++            <tca model="poly3" focal="37.1" br="-0.0000480" vr="1.0002372" bb="0.0000296" vb="0.9998630"/>
++            <tca model="poly3" focal="50" br="-0.0000550" vr="1.0001813" bb="0.0000121" vb="0.9997167"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-1.1839" k2="1.2688" k3="-0.6976"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.1839" k2="1.2688" k3="-0.6976"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.5706" k2="-0.1552" k3="0.2003"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.5706" k2="-0.1552" k3="0.2003"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1243" k2="-0.5545" k3="0.2593"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1243" k2="-0.5545" k3="0.2593"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.2917" k2="0.0492" k3="-0.0798"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.2917" k2="0.0492" k3="-0.0798"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.2665" k2="-0.0732" k3="0.0502"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.2665" k2="-0.0732" k3="0.0502"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.2743" k2="-0.0585" k3="0.0416"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.2743" k2="-0.0585" k3="0.0416"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.2939" k2="-0.0216" k3="0.0203"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.2939" k2="-0.0216" k3="0.0203"/>
++            <vignetting model="pa" focal="22.2" aperture="4" distance="10" k1="-0.9609" k2="0.9526" k3="-0.4347"/>
++            <vignetting model="pa" focal="22.2" aperture="4" distance="1000" k1="-0.9609" k2="0.9526" k3="-0.4347"/>
++            <vignetting model="pa" focal="22.2" aperture="5.6" distance="10" k1="-0.0607" k2="-0.5769" k3="0.3142"/>
++            <vignetting model="pa" focal="22.2" aperture="5.6" distance="1000" k1="-0.0607" k2="-0.5769" k3="0.3142"/>
++            <vignetting model="pa" focal="22.2" aperture="8" distance="10" k1="-0.2201" k2="0.0815" k3="-0.0674"/>
++            <vignetting model="pa" focal="22.2" aperture="8" distance="1000" k1="-0.2201" k2="0.0815" k3="-0.0674"/>
++            <vignetting model="pa" focal="22.2" aperture="11" distance="10" k1="-0.2106" k2="0.0205" k3="0.0001"/>
++            <vignetting model="pa" focal="22.2" aperture="11" distance="1000" k1="-0.2106" k2="0.0205" k3="0.0001"/>
++            <vignetting model="pa" focal="22.2" aperture="16" distance="10" k1="-0.2208" k2="0.0402" k3="-0.0109"/>
++            <vignetting model="pa" focal="22.2" aperture="16" distance="1000" k1="-0.2208" k2="0.0402" k3="-0.0109"/>
++            <vignetting model="pa" focal="22.2" aperture="22" distance="10" k1="-0.2409" k2="0.0809" k3="-0.0369"/>
++            <vignetting model="pa" focal="22.2" aperture="22" distance="1000" k1="-0.2409" k2="0.0809" k3="-0.0369"/>
++            <vignetting model="pa" focal="29.5" aperture="4.7" distance="10" k1="-0.8714" k2="0.9190" k3="-0.4339"/>
++            <vignetting model="pa" focal="29.5" aperture="4.7" distance="1000" k1="-0.8714" k2="0.9190" k3="-0.4339"/>
++            <vignetting model="pa" focal="29.5" aperture="5.6" distance="10" k1="-0.0995" k2="-0.5194" k3="0.3242"/>
++            <vignetting model="pa" focal="29.5" aperture="5.6" distance="1000" k1="-0.0995" k2="-0.5194" k3="0.3242"/>
++            <vignetting model="pa" focal="29.5" aperture="8" distance="10" k1="-0.1767" k2="0.0901" k3="-0.0842"/>
++            <vignetting model="pa" focal="29.5" aperture="8" distance="1000" k1="-0.1767" k2="0.0901" k3="-0.0842"/>
++            <vignetting model="pa" focal="29.5" aperture="11" distance="10" k1="-0.1791" k2="0.0441" k3="-0.0163"/>
++            <vignetting model="pa" focal="29.5" aperture="11" distance="1000" k1="-0.1791" k2="0.0441" k3="-0.0163"/>
++            <vignetting model="pa" focal="29.5" aperture="16" distance="10" k1="-0.1945" k2="0.0750" k3="-0.0336"/>
++            <vignetting model="pa" focal="29.5" aperture="16" distance="1000" k1="-0.1945" k2="0.0750" k3="-0.0336"/>
++            <vignetting model="pa" focal="29.5" aperture="22" distance="10" k1="-0.2026" k2="0.0875" k3="-0.0397"/>
++            <vignetting model="pa" focal="29.5" aperture="22" distance="1000" k1="-0.2026" k2="0.0875" k3="-0.0397"/>
++            <vignetting model="pa" focal="35.5" aperture="5.6" distance="10" k1="-0.3113" k2="-0.1482" k3="0.1584"/>
++            <vignetting model="pa" focal="35.5" aperture="5.6" distance="1000" k1="-0.3113" k2="-0.1482" k3="0.1584"/>
++            <vignetting model="pa" focal="35.5" aperture="8" distance="10" k1="-0.1623" k2="0.1135" k3="-0.1163"/>
++            <vignetting model="pa" focal="35.5" aperture="8" distance="1000" k1="-0.1623" k2="0.1135" k3="-0.1163"/>
++            <vignetting model="pa" focal="35.5" aperture="11" distance="10" k1="-0.1579" k2="0.0460" k3="-0.0163"/>
++            <vignetting model="pa" focal="35.5" aperture="11" distance="1000" k1="-0.1579" k2="0.0460" k3="-0.0163"/>
++            <vignetting model="pa" focal="35.5" aperture="16" distance="10" k1="-0.1710" k2="0.0757" k3="-0.0348"/>
++            <vignetting model="pa" focal="35.5" aperture="16" distance="1000" k1="-0.1710" k2="0.0757" k3="-0.0348"/>
++            <vignetting model="pa" focal="35.5" aperture="22" distance="10" k1="-0.1645" k2="0.0550" k3="-0.0204"/>
++            <vignetting model="pa" focal="35.5" aperture="22" distance="1000" k1="-0.1645" k2="0.0550" k3="-0.0204"/>
++            <vignetting model="pa" focal="40.2" aperture="5.3" distance="10" k1="-0.7175" k2="0.7596" k3="-0.3610"/>
++            <vignetting model="pa" focal="40.2" aperture="5.3" distance="1000" k1="-0.7175" k2="0.7596" k3="-0.3610"/>
++            <vignetting model="pa" focal="40.2" aperture="5.6" distance="10" k1="-0.2833" k2="-0.1402" k3="0.1490"/>
++            <vignetting model="pa" focal="40.2" aperture="5.6" distance="1000" k1="-0.2833" k2="-0.1402" k3="0.1490"/>
++            <vignetting model="pa" focal="40.2" aperture="8" distance="10" k1="-0.1516" k2="0.1215" k3="-0.1076"/>
++            <vignetting model="pa" focal="40.2" aperture="8" distance="1000" k1="-0.1516" k2="0.1215" k3="-0.1076"/>
++            <vignetting model="pa" focal="40.2" aperture="11" distance="10" k1="-0.1462" k2="0.0599" k3="-0.0293"/>
++            <vignetting model="pa" focal="40.2" aperture="11" distance="1000" k1="-0.1462" k2="0.0599" k3="-0.0293"/>
++            <vignetting model="pa" focal="40.2" aperture="16" distance="10" k1="-0.1531" k2="0.0708" k3="-0.0345"/>
++            <vignetting model="pa" focal="40.2" aperture="16" distance="1000" k1="-0.1531" k2="0.0708" k3="-0.0345"/>
++            <vignetting model="pa" focal="40.2" aperture="22" distance="10" k1="-0.1474" k2="0.0529" k3="-0.0227"/>
++            <vignetting model="pa" focal="40.2" aperture="22" distance="1000" k1="-0.1474" k2="0.0529" k3="-0.0227"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.7982" k2="1.2935" k3="-0.9377"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.7982" k2="1.2935" k3="-0.9377"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0891" k2="0.0030" k3="-0.0895"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0891" k2="0.0030" k3="-0.0895"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1110" k2="0.0315" k3="-0.0167"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1110" k2="0.0315" k3="-0.0167"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1146" k2="0.0370" k3="-0.0193"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1146" k2="0.0370" k3="-0.0193"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1198" k2="0.0400" k3="-0.0190"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1198" k2="0.0400" k3="-0.0190"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XC50-230mmF4.5-6.7 OIS</model>
++        <model lang="en">XC 50-230mm f/4.5-6.7 OIS</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-M1 -->
++            <distortion model="poly3" focal="50" k1="0.0017"/>
++            <distortion model="poly3" focal="67.1" k1="0.00774"/>
++            <distortion model="poly3" focal="101.2" k1="0.00967"/>
++            <distortion model="poly3" focal="135.7" k1="0.00836"/>
++            <distortion model="poly3" focal="181.9" k1="0.0089"/>
++            <distortion model="poly3" focal="230" k1="0.00772"/>
++            <tca model="poly3" focal="50" br="-0.0001000" vr="1.0003015" bb="0.0001185" vb="0.9999656"/>
++            <tca model="poly3" focal="67.1" br="-0.0000913" vr="1.0002869" bb="0.0000633" vb="0.9998660"/>
++            <tca model="poly3" focal="101.2" br="-0.0000511" vr="1.0001847" bb="0.0000461" vb="0.9996973"/>
++            <tca model="poly3" focal="107.3" br="-0.0000559" vr="1.0001940" bb="0.0000439" vb="0.9996962"/>
++            <tca model="poly3" focal="135.7" br="-0.0000520" vr="1.0001402" bb="0.0000174" vb="0.9995976"/>
++            <tca model="poly3" focal="152.6" br="-0.0000292" vr="1.0000646" bb="-0.0000088" vb="0.9995959"/>
++            <tca model="poly3" focal="181.9" br="-0.0000091" vr="0.9999066" bb="0.0000116" vb="0.9995961"/>
++            <tca model="poly3" focal="230" br="-0.0000631" vr="0.9994886" bb="0.0000510" vb="0.9998227"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.2342" k2="-1.3181" k3="0.9147"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.2342" k2="-1.3181" k3="0.9147"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="0.0704" k2="-1.0728" k3="0.4962"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="0.0704" k2="-1.0728" k3="0.4962"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2497" k2="0.2275" k3="-0.3150"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2497" k2="0.2275" k3="-0.3150"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2653" k2="0.1802" k3="-0.1343"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2653" k2="0.1802" k3="-0.1343"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2292" k2="0.0352" k3="-0.0001"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2292" k2="0.0352" k3="-0.0001"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2299" k2="0.0366" k3="-0.0004"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2299" k2="0.0366" k3="-0.0004"/>
++            <vignetting model="pa" focal="63.2" aperture="4.8" distance="10" k1="-0.2358" k2="-0.9246" k3="0.6416"/>
++            <vignetting model="pa" focal="63.2" aperture="4.8" distance="1000" k1="-0.2358" k2="-0.9246" k3="0.6416"/>
++            <vignetting model="pa" focal="63.2" aperture="5.6" distance="10" k1="-0.0466" k2="-0.4433" k3="0.1303"/>
++            <vignetting model="pa" focal="63.2" aperture="5.6" distance="1000" k1="-0.0466" k2="-0.4433" k3="0.1303"/>
++            <vignetting model="pa" focal="63.2" aperture="8" distance="10" k1="-0.1943" k2="0.0410" k3="-0.0102"/>
++            <vignetting model="pa" focal="63.2" aperture="8" distance="1000" k1="-0.1943" k2="0.0410" k3="-0.0102"/>
++            <vignetting model="pa" focal="63.2" aperture="11" distance="10" k1="-0.1952" k2="0.0373" k3="-0.0041"/>
++            <vignetting model="pa" focal="63.2" aperture="11" distance="1000" k1="-0.1952" k2="0.0373" k3="-0.0041"/>
++            <vignetting model="pa" focal="63.2" aperture="16" distance="10" k1="-0.1963" k2="0.0381" k3="-0.0037"/>
++            <vignetting model="pa" focal="63.2" aperture="16" distance="1000" k1="-0.1963" k2="0.0381" k3="-0.0037"/>
++            <vignetting model="pa" focal="63.2" aperture="22" distance="10" k1="-0.2109" k2="0.0707" k3="-0.0253"/>
++            <vignetting model="pa" focal="63.2" aperture="22" distance="1000" k1="-0.2109" k2="0.0707" k3="-0.0253"/>
++            <vignetting model="pa" focal="95.4" aperture="5.4" distance="10" k1="-0.2328" k2="-0.7301" k3="0.5121"/>
++            <vignetting model="pa" focal="95.4" aperture="5.4" distance="1000" k1="-0.2328" k2="-0.7301" k3="0.5121"/>
++            <vignetting model="pa" focal="95.4" aperture="5.6" distance="10" k1="-0.0398" k2="-0.7432" k3="0.4136"/>
++            <vignetting model="pa" focal="95.4" aperture="5.6" distance="1000" k1="-0.0398" k2="-0.7432" k3="0.4136"/>
++            <vignetting model="pa" focal="95.4" aperture="8" distance="10" k1="-0.1912" k2="0.1743" k3="-0.1720"/>
++            <vignetting model="pa" focal="95.4" aperture="8" distance="1000" k1="-0.1912" k2="0.1743" k3="-0.1720"/>
++            <vignetting model="pa" focal="95.4" aperture="11" distance="10" k1="-0.1824" k2="0.0825" k3="-0.0324"/>
++            <vignetting model="pa" focal="95.4" aperture="11" distance="1000" k1="-0.1824" k2="0.0825" k3="-0.0324"/>
++            <vignetting model="pa" focal="95.4" aperture="16" distance="10" k1="-0.1852" k2="0.0889" k3="-0.0363"/>
++            <vignetting model="pa" focal="95.4" aperture="16" distance="1000" k1="-0.1852" k2="0.0889" k3="-0.0363"/>
++            <vignetting model="pa" focal="95.4" aperture="22" distance="10" k1="-0.1732" k2="0.0609" k3="-0.0185"/>
++            <vignetting model="pa" focal="95.4" aperture="22" distance="1000" k1="-0.1732" k2="0.0609" k3="-0.0185"/>
++            <vignetting model="pa" focal="127.9" aperture="5.8" distance="10" k1="-0.0938" k2="-0.9267" k3="0.5128"/>
++            <vignetting model="pa" focal="127.9" aperture="5.8" distance="1000" k1="-0.0938" k2="-0.9267" k3="0.5128"/>
++            <vignetting model="pa" focal="127.9" aperture="8" distance="10" k1="-0.1421" k2="0.1737" k3="-0.2982"/>
++            <vignetting model="pa" focal="127.9" aperture="8" distance="1000" k1="-0.1421" k2="0.1737" k3="-0.2982"/>
++            <vignetting model="pa" focal="127.9" aperture="11" distance="10" k1="-0.1462" k2="0.0739" k3="-0.0333"/>
++            <vignetting model="pa" focal="127.9" aperture="11" distance="1000" k1="-0.1462" k2="0.0739" k3="-0.0333"/>
++            <vignetting model="pa" focal="127.9" aperture="16" distance="10" k1="-0.1475" k2="0.0729" k3="-0.0295"/>
++            <vignetting model="pa" focal="127.9" aperture="16" distance="1000" k1="-0.1475" k2="0.0729" k3="-0.0295"/>
++            <vignetting model="pa" focal="127.9" aperture="22" distance="10" k1="-0.1377" k2="0.0528" k3="-0.0179"/>
++            <vignetting model="pa" focal="127.9" aperture="22" distance="1000" k1="-0.1377" k2="0.0528" k3="-0.0179"/>
++            <vignetting model="pa" focal="171.6" aperture="6.4" distance="10" k1="0.1066" k2="-1.6998" k3="1.0146"/>
++            <vignetting model="pa" focal="171.6" aperture="6.4" distance="1000" k1="0.1066" k2="-1.6998" k3="1.0146"/>
++            <vignetting model="pa" focal="171.6" aperture="8" distance="10" k1="0.1683" k2="-0.8557" k3="0.2474"/>
++            <vignetting model="pa" focal="171.6" aperture="8" distance="1000" k1="0.1683" k2="-0.8557" k3="0.2474"/>
++            <vignetting model="pa" focal="171.6" aperture="11" distance="10" k1="-0.2061" k2="0.4193" k3="-0.3749"/>
++            <vignetting model="pa" focal="171.6" aperture="11" distance="1000" k1="-0.2061" k2="0.4193" k3="-0.3749"/>
++            <vignetting model="pa" focal="171.6" aperture="16" distance="10" k1="-0.1209" k2="0.0637" k3="-0.0283"/>
++            <vignetting model="pa" focal="171.6" aperture="16" distance="1000" k1="-0.1209" k2="0.0637" k3="-0.0283"/>
++            <vignetting model="pa" focal="171.6" aperture="22" distance="10" k1="-0.1230" k2="0.0678" k3="-0.0306"/>
++            <vignetting model="pa" focal="171.6" aperture="22" distance="1000" k1="-0.1230" k2="0.0678" k3="-0.0306"/>
++            <vignetting model="pa" focal="230" aperture="6.7" distance="10" k1="-0.4666" k2="-0.5099" k3="0.3285"/>
++            <vignetting model="pa" focal="230" aperture="6.7" distance="1000" k1="-0.4666" k2="-0.5099" k3="0.3285"/>
++            <vignetting model="pa" focal="230" aperture="8" distance="10" k1="0.0351" k2="-0.9080" k3="0.3734"/>
++            <vignetting model="pa" focal="230" aperture="8" distance="1000" k1="0.0351" k2="-0.9080" k3="0.3734"/>
++            <vignetting model="pa" focal="230" aperture="11" distance="10" k1="-0.1290" k2="0.2248" k3="-0.3407"/>
++            <vignetting model="pa" focal="230" aperture="11" distance="1000" k1="-0.1290" k2="0.2248" k3="-0.3407"/>
++            <vignetting model="pa" focal="230" aperture="16" distance="10" k1="-0.1270" k2="0.0993" k3="-0.0612"/>
++            <vignetting model="pa" focal="230" aperture="16" distance="1000" k1="-0.1270" k2="0.0993" k3="-0.0612"/>
++            <vignetting model="pa" focal="230" aperture="22" distance="10" k1="-0.1088" k2="0.0432" k3="-0.0165"/>
++            <vignetting model="pa" focal="230" aperture="22" distance="1000" k1="-0.1088" k2="0.0432" k3="-0.0165"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XC50-230mmF4.5-6.7 OIS II</model>
++        <model lang="en">XC 50-230mm f/4.5-6.7 OIS II</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-A2 -->
++            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.2704" k2="-1.2793" k3="0.9014"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.2704" k2="-1.2793" k3="0.9014"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="0.0210" k2="-0.9425" k3="0.4102"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="0.0210" k2="-0.9425" k3="0.4102"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2687" k2="0.2264" k3="-0.3177"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2687" k2="0.2264" k3="-0.3177"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3051" k2="0.2454" k3="-0.1803"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3051" k2="0.2454" k3="-0.1803"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2491" k2="0.0475" k3="-0.0056"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2491" k2="0.0475" k3="-0.0056"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2473" k2="0.0432" k3="-0.0023"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2473" k2="0.0432" k3="-0.0023"/>
++            <vignetting model="pa" focal="67.1" aperture="4.8" distance="10" k1="-0.2709" k2="-0.8927" k3="0.6304"/>
++            <vignetting model="pa" focal="67.1" aperture="4.8" distance="1000" k1="-0.2709" k2="-0.8927" k3="0.6304"/>
++            <vignetting model="pa" focal="67.1" aperture="5.6" distance="10" k1="-0.0467" k2="-0.5184" k3="0.1808"/>
++            <vignetting model="pa" focal="67.1" aperture="5.6" distance="1000" k1="-0.0467" k2="-0.5184" k3="0.1808"/>
++            <vignetting model="pa" focal="67.1" aperture="8" distance="10" k1="-0.2047" k2="0.0286" k3="0.0021"/>
++            <vignetting model="pa" focal="67.1" aperture="8" distance="1000" k1="-0.2047" k2="0.0286" k3="0.0021"/>
++            <vignetting model="pa" focal="67.1" aperture="11" distance="10" k1="-0.2061" k2="0.0339" k3="-0.0017"/>
++            <vignetting model="pa" focal="67.1" aperture="11" distance="1000" k1="-0.2061" k2="0.0339" k3="-0.0017"/>
++            <vignetting model="pa" focal="67.1" aperture="16" distance="10" k1="-0.2083" k2="0.0374" k3="-0.0029"/>
++            <vignetting model="pa" focal="67.1" aperture="16" distance="1000" k1="-0.2083" k2="0.0374" k3="-0.0029"/>
++            <vignetting model="pa" focal="67.1" aperture="22" distance="10" k1="-0.2081" k2="0.0383" k3="-0.0032"/>
++            <vignetting model="pa" focal="67.1" aperture="22" distance="1000" k1="-0.2081" k2="0.0383" k3="-0.0032"/>
++            <vignetting model="pa" focal="95.4" aperture="5.4" distance="10" k1="-0.2426" k2="-0.7319" k3="0.5151"/>
++            <vignetting model="pa" focal="95.4" aperture="5.4" distance="1000" k1="-0.2426" k2="-0.7319" k3="0.5151"/>
++            <vignetting model="pa" focal="95.4" aperture="5.6" distance="10" k1="-0.0398" k2="-0.7879" k3="0.4440"/>
++            <vignetting model="pa" focal="95.4" aperture="5.6" distance="1000" k1="-0.0398" k2="-0.7879" k3="0.4440"/>
++            <vignetting model="pa" focal="95.4" aperture="8" distance="10" k1="-0.1840" k2="0.1628" k3="-0.1674"/>
++            <vignetting model="pa" focal="95.4" aperture="8" distance="1000" k1="-0.1840" k2="0.1628" k3="-0.1674"/>
++            <vignetting model="pa" focal="95.4" aperture="11" distance="10" k1="-0.1685" k2="0.0479" k3="-0.0147"/>
++            <vignetting model="pa" focal="95.4" aperture="11" distance="1000" k1="-0.1685" k2="0.0479" k3="-0.0147"/>
++            <vignetting model="pa" focal="95.4" aperture="16" distance="10" k1="-0.1720" k2="0.0527" k3="-0.0158"/>
++            <vignetting model="pa" focal="95.4" aperture="16" distance="1000" k1="-0.1720" k2="0.0527" k3="-0.0158"/>
++            <vignetting model="pa" focal="95.4" aperture="22" distance="10" k1="-0.1667" k2="0.0388" k3="-0.0059"/>
++            <vignetting model="pa" focal="95.4" aperture="22" distance="1000" k1="-0.1667" k2="0.0388" k3="-0.0059"/>
++            <vignetting model="pa" focal="152.6" aperture="6.2" distance="10" k1="0.0579" k2="-1.4403" k3="0.8283"/>
++            <vignetting model="pa" focal="152.6" aperture="6.2" distance="1000" k1="0.0579" k2="-1.4403" k3="0.8283"/>
++            <vignetting model="pa" focal="152.6" aperture="8" distance="10" k1="-0.0975" k2="0.1577" k3="-0.3786"/>
++            <vignetting model="pa" focal="152.6" aperture="8" distance="1000" k1="-0.0975" k2="0.1577" k3="-0.3786"/>
++            <vignetting model="pa" focal="152.6" aperture="11" distance="10" k1="-0.1294" k2="0.0894" k3="-0.0608"/>
++            <vignetting model="pa" focal="152.6" aperture="11" distance="1000" k1="-0.1294" k2="0.0894" k3="-0.0608"/>
++            <vignetting model="pa" focal="152.6" aperture="16" distance="10" k1="-0.1264" k2="0.0621" k3="-0.0284"/>
++            <vignetting model="pa" focal="152.6" aperture="16" distance="1000" k1="-0.1264" k2="0.0621" k3="-0.0284"/>
++            <vignetting model="pa" focal="152.6" aperture="22" distance="10" k1="-0.1157" k2="0.0414" k3="-0.0159"/>
++            <vignetting model="pa" focal="152.6" aperture="22" distance="1000" k1="-0.1157" k2="0.0414" k3="-0.0159"/>
++            <vignetting model="pa" focal="230" aperture="6.7" distance="10" k1="-0.4766" k2="-0.4936" k3="0.3169"/>
++            <vignetting model="pa" focal="230" aperture="6.7" distance="1000" k1="-0.4766" k2="-0.4936" k3="0.3169"/>
++            <vignetting model="pa" focal="230" aperture="8" distance="10" k1="0.0398" k2="-0.9033" k3="0.3624"/>
++            <vignetting model="pa" focal="230" aperture="8" distance="1000" k1="0.0398" k2="-0.9033" k3="0.3624"/>
++            <vignetting model="pa" focal="230" aperture="11" distance="10" k1="-0.0988" k2="0.1521" k3="-0.3191"/>
++            <vignetting model="pa" focal="230" aperture="11" distance="1000" k1="-0.0988" k2="0.1521" k3="-0.3191"/>
++            <vignetting model="pa" focal="230" aperture="16" distance="10" k1="-0.1202" k2="0.0960" k3="-0.0680"/>
++            <vignetting model="pa" focal="230" aperture="16" distance="1000" k1="-0.1202" k2="0.0960" k3="-0.0680"/>
++            <vignetting model="pa" focal="230" aperture="22" distance="10" k1="-0.0982" k2="0.0290" k3="-0.0130"/>
++            <vignetting model="pa" focal="230" aperture="22" distance="1000" k1="-0.0982" k2="0.0290" k3="-0.0130"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF55-200mmF3.5-4.8 R LM OIS</model>
++        <model lang="en">XF 55-200mm f/3.5-4.8 R LM OIS</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-E2 -->
++            <distortion model="poly3" focal="55" k1="0.00464"/>
++            <distortion model="poly3" focal="67.1" k1="0.00754"/>
++            <distortion model="poly3" focal="86" k1="0.00912"/>
++            <distortion model="poly3" focal="156.1" k1="0.01009"/>
++            <distortion model="poly3" focal="200" k1="0.00926"/>
++            <tca model="poly3" focal="55" br="-0.0000979" vr="1.0002600" bb="0.0000512" vb="0.9999442"/>
++            <tca model="poly3" focal="81.9" br="-0.0000791" vr="1.0001593" bb="0.0000312" vb="0.9999369"/>
++            <tca model="poly3" focal="104.9" br="-0.0000138" vr="1.0000328" bb="0.0000383" vb="0.9998767"/>
++            <tca model="poly3" focal="134.5" br="-0.0000322" vr="1.0000360" bb="0.0000025" vb="0.9999154"/>
++            <tca model="poly3" focal="164" br="-0.0000368" vr="0.9999711" bb="-0.0000173" vb="0.9999506"/>
++            <tca model="poly3" focal="200" br="-0.0000028" vr="0.9998289" bb="-0.0000235" vb="0.9999706"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="55" aperture="3.5" distance="10" k1="-0.5492" k2="-0.1769" k3="0.1260"/>
++            <vignetting model="pa" focal="55" aperture="3.5" distance="1000" k1="-0.5492" k2="-0.1769" k3="0.1260"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.2141" k2="-0.4327" k3="0.1289"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.2141" k2="-0.4327" k3="0.1289"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.3368" k2="0.4542" k3="-0.4484"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3368" k2="0.4542" k3="-0.4484"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.2919" k2="0.1993" k3="-0.1359"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.2919" k2="0.1993" k3="-0.1359"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.2636" k2="0.0840" k3="-0.0294"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.2636" k2="0.0840" k3="-0.0294"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2582" k2="0.0685" k3="-0.0184"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2582" k2="0.0685" k3="-0.0184"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2640" k2="0.0802" k3="-0.0246"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2640" k2="0.0802" k3="-0.0246"/>
++            <vignetting model="pa" focal="70.5" aperture="3.7" distance="10" k1="-0.5783" k2="-0.0814" k3="0.0968"/>
++            <vignetting model="pa" focal="70.5" aperture="3.7" distance="1000" k1="-0.5783" k2="-0.0814" k3="0.0968"/>
++            <vignetting model="pa" focal="70.5" aperture="4" distance="10" k1="-0.2549" k2="-0.3636" k3="0.1405"/>
++            <vignetting model="pa" focal="70.5" aperture="4" distance="1000" k1="-0.2549" k2="-0.3636" k3="0.1405"/>
++            <vignetting model="pa" focal="70.5" aperture="5.6" distance="10" k1="-0.2990" k2="0.4306" k3="-0.4454"/>
++            <vignetting model="pa" focal="70.5" aperture="5.6" distance="1000" k1="-0.2990" k2="0.4306" k3="-0.4454"/>
++            <vignetting model="pa" focal="70.5" aperture="8" distance="10" k1="-0.2985" k2="0.2983" k3="-0.2079"/>
++            <vignetting model="pa" focal="70.5" aperture="8" distance="1000" k1="-0.2985" k2="0.2983" k3="-0.2079"/>
++            <vignetting model="pa" focal="70.5" aperture="11" distance="10" k1="-0.2444" k2="0.1053" k3="-0.0392"/>
++            <vignetting model="pa" focal="70.5" aperture="11" distance="1000" k1="-0.2444" k2="0.1053" k3="-0.0392"/>
++            <vignetting model="pa" focal="70.5" aperture="16" distance="10" k1="-0.2636" k2="0.1435" k3="-0.0602"/>
++            <vignetting model="pa" focal="70.5" aperture="16" distance="1000" k1="-0.2636" k2="0.1435" k3="-0.0602"/>
++            <vignetting model="pa" focal="70.5" aperture="22" distance="10" k1="-0.2503" k2="0.1065" k3="-0.0355"/>
++            <vignetting model="pa" focal="70.5" aperture="22" distance="1000" k1="-0.2503" k2="0.1065" k3="-0.0355"/>
++            <vignetting model="pa" focal="99.8" aperture="4" distance="10" k1="-0.4793" k2="-0.3109" k3="0.1994"/>
++            <vignetting model="pa" focal="99.8" aperture="4" distance="1000" k1="-0.4793" k2="-0.3109" k3="0.1994"/>
++            <vignetting model="pa" focal="99.8" aperture="5.6" distance="10" k1="-0.1900" k2="0.1171" k3="-0.2934"/>
++            <vignetting model="pa" focal="99.8" aperture="5.6" distance="1000" k1="-0.1900" k2="0.1171" k3="-0.2934"/>
++            <vignetting model="pa" focal="99.8" aperture="8" distance="10" k1="-0.3013" k2="0.4427" k3="-0.3427"/>
++            <vignetting model="pa" focal="99.8" aperture="8" distance="1000" k1="-0.3013" k2="0.4427" k3="-0.3427"/>
++            <vignetting model="pa" focal="99.8" aperture="11" distance="10" k1="-0.2354" k2="0.1593" k3="-0.0697"/>
++            <vignetting model="pa" focal="99.8" aperture="11" distance="1000" k1="-0.2354" k2="0.1593" k3="-0.0697"/>
++            <vignetting model="pa" focal="99.8" aperture="16" distance="10" k1="-0.2377" k2="0.1640" k3="-0.0729"/>
++            <vignetting model="pa" focal="99.8" aperture="16" distance="1000" k1="-0.2377" k2="0.1640" k3="-0.0729"/>
++            <vignetting model="pa" focal="99.8" aperture="22" distance="10" k1="-0.2312" k2="0.1563" k3="-0.0725"/>
++            <vignetting model="pa" focal="99.8" aperture="22" distance="1000" k1="-0.2312" k2="0.1563" k3="-0.0725"/>
++            <vignetting model="pa" focal="134.5" aperture="4.4" distance="10" k1="-0.3370" k2="-1.1017" k3="0.7855"/>
++            <vignetting model="pa" focal="134.5" aperture="4.4" distance="1000" k1="-0.3370" k2="-1.1017" k3="0.7855"/>
++            <vignetting model="pa" focal="134.5" aperture="5.6" distance="10" k1="0.1184" k2="-1.0776" k3="0.4486"/>
++            <vignetting model="pa" focal="134.5" aperture="5.6" distance="1000" k1="0.1184" k2="-1.0776" k3="0.4486"/>
++            <vignetting model="pa" focal="134.5" aperture="8" distance="10" k1="-0.3403" k2="0.7246" k3="-0.6513"/>
++            <vignetting model="pa" focal="134.5" aperture="8" distance="1000" k1="-0.3403" k2="0.7246" k3="-0.6513"/>
++            <vignetting model="pa" focal="134.5" aperture="11" distance="10" k1="-0.2257" k2="0.1999" k3="-0.1028"/>
++            <vignetting model="pa" focal="134.5" aperture="11" distance="1000" k1="-0.2257" k2="0.1999" k3="-0.1028"/>
++            <vignetting model="pa" focal="134.5" aperture="16" distance="10" k1="-0.2296" k2="0.2077" k3="-0.1079"/>
++            <vignetting model="pa" focal="134.5" aperture="16" distance="1000" k1="-0.2296" k2="0.2077" k3="-0.1079"/>
++            <vignetting model="pa" focal="134.5" aperture="22" distance="10" k1="-0.2331" k2="0.2183" k3="-0.1163"/>
++            <vignetting model="pa" focal="134.5" aperture="22" distance="1000" k1="-0.2331" k2="0.2183" k3="-0.1163"/>
++            <vignetting model="pa" focal="200" aperture="4.8" distance="10" k1="-0.8506" k2="0.0745" k3="0.0981"/>
++            <vignetting model="pa" focal="200" aperture="4.8" distance="1000" k1="-0.8506" k2="0.0745" k3="0.0981"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.2911" k2="-0.7717" k3="0.4672"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.2911" k2="-0.7717" k3="0.4672"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1963" k2="0.3035" k3="-0.4623"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1963" k2="0.3035" k3="-0.4623"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.2417" k2="0.2950" k3="-0.1829"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2417" k2="0.2950" k3="-0.1829"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.2334" k2="0.2564" k3="-0.1456"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2334" k2="0.2564" k3="-0.1456"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.2272" k2="0.2404" k3="-0.1342"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.2272" k2="0.2404" k3="-0.1342"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF27mmF2.8</model>
++        <model lang="en">XF 27mm f/2.8</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-A1 -->
++            <distortion model="poly3" focal="27" k1="-0.00621"/>
++            <tca model="poly3" focal="27" vr="0.999996" vb="1.00002"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="27" aperture="2.8" distance="10" k1="-0.9412" k2="0.1158" k3="0.1433"/>
++            <vignetting model="pa" focal="27" aperture="2.8" distance="1000" k1="-0.9412" k2="0.1158" k3="0.1433"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="10" k1="-0.3815" k2="-0.0002" k3="-0.0924"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="1000" k1="-0.3815" k2="-0.0002" k3="-0.0924"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="10" k1="-0.5174" k2="0.4132" k3="-0.2336"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="1000" k1="-0.5174" k2="0.4132" k3="-0.2336"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="10" k1="-0.4814" k2="0.2629" k3="-0.0925"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="1000" k1="-0.4814" k2="0.2629" k3="-0.0925"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="10" k1="-0.4844" k2="0.2659" k3="-0.0926"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="1000" k1="-0.4844" k2="0.2659" k3="-0.0926"/>
++            <vignetting model="pa" focal="27" aperture="16" distance="10" k1="-0.4938" k2="0.2759" k3="-0.0978"/>
++            <vignetting model="pa" focal="27" aperture="16" distance="1000" k1="-0.4938" k2="0.2759" k3="-0.0978"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF18mmF2 R</model>
++        <model lang="en">XF 18mm f/2 R</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-Pro1 -->
++            <distortion model="ptlens" focal="18" a="-0.01002" b="0.01206" c="-0.03947"/>
++            <tca model="poly3" focal="18" br="-0.0000854" vr="1.0003786" bb="0.0002872" vb="0.9999238"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF35mmF1.4 R</model>
++        <model lang="en">XF 35mm f/1.4 R</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-Pro1 -->
++            <distortion model="ptlens" focal="35" a="0.00729" b="-0.02422" c="0.02113"/>
++            <tca model="poly3" focal="35" vr="1.0001" vb="0.9999"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="35" aperture="1.4" distance="10" k1="-1.4164" k2="1.3668" k3="-0.6236"/>
++            <vignetting model="pa" focal="35" aperture="1.4" distance="1000" k1="-1.4164" k2="1.3668" k3="-0.6236"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="10" k1="-0.1860" k2="-0.4906" k3="0.1979"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="1000" k1="-0.1860" k2="-0.4906" k3="0.1979"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.3832" k2="0.3788" k3="-0.3333"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3832" k2="0.3788" k3="-0.3333"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3449" k2="0.1600" k3="-0.0807"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3449" k2="0.1600" k3="-0.0807"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.3384" k2="0.1392" k3="-0.0637"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3384" k2="0.1392" k3="-0.0637"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3506" k2="0.1689" k3="-0.0838"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3506" k2="0.1689" k3="-0.0838"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3582" k2="0.1811" k3="-0.0907"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3582" k2="0.1811" k3="-0.0907"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3614" k2="0.1864" k3="-0.0939"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3614" k2="0.1864" k3="-0.0939"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF60mmF2.4 R Macro</model>
++        <model lang="en">XF 60mm f/2.4 R Macro</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-E2 -->
++            <distortion model="poly3" focal="60" k1="0.00913"/>
++            <tca model="poly3" focal="60" br="0.0000295" vr="0.9999431" bb="-0.0000805" vb="0.9999333"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="60" aperture="2.4" distance="10" k1="-0.7658" k2="0.2728" k3="-0.0025"/>
++            <vignetting model="pa" focal="60" aperture="2.4" distance="1000" k1="-0.7658" k2="0.2728" k3="-0.0025"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="10" k1="-0.2579" k2="-0.4737" k3="0.3315"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.2579" k2="-0.4737" k3="0.3315"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="10" k1="-0.3073" k2="0.1245" k3="-0.0272"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.3073" k2="0.1245" k3="-0.0272"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="10" k1="-0.3041" k2="0.1121" k3="-0.0187"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.3041" k2="0.1121" k3="-0.0187"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.3094" k2="0.1193" k3="-0.0223"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.3094" k2="0.1193" k3="-0.0223"/>
++            <vignetting model="pa" focal="60" aperture="11" distance="10" k1="-0.3144" k2="0.1294" k3="-0.0281"/>
++            <vignetting model="pa" focal="60" aperture="11" distance="1000" k1="-0.3144" k2="0.1294" k3="-0.0281"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="-0.3159" k2="0.1292" k3="-0.0272"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="-0.3159" k2="0.1292" k3="-0.0272"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="10" k1="-0.3205" k2="0.1341" k3="-0.0290"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="-0.3205" k2="0.1341" k3="-0.0290"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF23mmF1.4 R</model>
++        <model lang="en">XF 23mm f/1.4 R</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with X-E2 -->
++            <distortion model="ptlens" focal="23" a="0.00331" b="-0.0094" c="0.00784"/>
++            <tca model="poly3" focal="23" vr="1.0002" vb="1.0001"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="23" aperture="1.4" distance="10" k1="-1.5441" k2="1.4339" k3="-0.6158"/>
++            <vignetting model="pa" focal="23" aperture="1.4" distance="1000" k1="-1.5441" k2="1.4339" k3="-0.6158"/>
++            <vignetting model="pa" focal="23" aperture="2" distance="10" k1="-0.4114" k2="-0.3383" k3="0.1718"/>
++            <vignetting model="pa" focal="23" aperture="2" distance="1000" k1="-0.4114" k2="-0.3383" k3="0.1718"/>
++            <vignetting model="pa" focal="23" aperture="2.8" distance="10" k1="-0.5922" k2="0.3908" k3="-0.2007"/>
++            <vignetting model="pa" focal="23" aperture="2.8" distance="1000" k1="-0.5922" k2="0.3908" k3="-0.2007"/>
++            <vignetting model="pa" focal="23" aperture="4" distance="10" k1="-0.5682" k2="0.2531" k3="-0.0551"/>
++            <vignetting model="pa" focal="23" aperture="4" distance="1000" k1="-0.5682" k2="0.2531" k3="-0.0551"/>
++            <vignetting model="pa" focal="23" aperture="5.6" distance="10" k1="-0.5708" k2="0.2595" k3="-0.0611"/>
++            <vignetting model="pa" focal="23" aperture="5.6" distance="1000" k1="-0.5708" k2="0.2595" k3="-0.0611"/>
++            <vignetting model="pa" focal="23" aperture="8" distance="10" k1="-0.5748" k2="0.2653" k3="-0.0647"/>
++            <vignetting model="pa" focal="23" aperture="8" distance="1000" k1="-0.5748" k2="0.2653" k3="-0.0647"/>
++            <vignetting model="pa" focal="23" aperture="11" distance="10" k1="-0.5711" k2="0.2509" k3="-0.0545"/>
++            <vignetting model="pa" focal="23" aperture="11" distance="1000" k1="-0.5711" k2="0.2509" k3="-0.0545"/>
++            <vignetting model="pa" focal="23" aperture="16" distance="10" k1="-0.5706" k2="0.2446" k3="-0.0513"/>
++            <vignetting model="pa" focal="23" aperture="16" distance="1000" k1="-0.5706" k2="0.2446" k3="-0.0513"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XC16-50mmF3.5-5.6 OIS II</model>
++        <model lang="en">XC 16-50mm f/3.5-5.6 OIS II</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-A2 -->
++            <distortion model="ptlens" focal="16" a="0.02234" b="-0.0861" c="0.01689"/>
++            <distortion model="ptlens" focal="23.2" a="0.01026" b="-0.04209" c="0.0245"/>
++            <distortion model="ptlens" focal="29.5" a="0.00387" b="-0.01658" c="0.00911"/>
++            <distortion model="ptlens" focal="35.5" a="0" b="-0.00122" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00373" c="0"/>
++            <tca model="poly3" focal="16" vr="1.0006" vb="1.0005"/>
++            <tca model="poly3" focal="23.2" vr="1.0006" vb="1.0006"/>
++            <tca model="poly3" focal="29.5" vr="1.0004" vb="1.0003"/>
++            <tca model="poly3" focal="35.5" vr="1.0003" vb="1.0000"/>
++            <tca model="poly3" focal="50" vr="1.0002" vb="0.9993"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-1.2073" k2="1.2792" k3="-0.7009"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.2073" k2="1.2792" k3="-0.7009"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.6322" k2="-0.0506" k3="0.1355"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.6322" k2="-0.0506" k3="0.1355"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1656" k2="-0.4944" k3="0.2248"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1656" k2="-0.4944" k3="0.2248"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.3436" k2="0.1263" k3="-0.1238"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.3436" k2="0.1263" k3="-0.1238"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.3174" k2="-0.0032" k3="0.0116"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.3174" k2="-0.0032" k3="0.0116"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.3141" k2="-0.0106" k3="0.0159"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.3141" k2="-0.0106" k3="0.0159"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.3256" k2="0.0116" k3="0.0011"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.3256" k2="0.0116" k3="0.0011"/>
++            <vignetting model="pa" focal="21.1" aperture="4" distance="10" k1="-1.0236" k2="1.0032" k3="-0.4551"/>
++            <vignetting model="pa" focal="21.1" aperture="4" distance="1000" k1="-1.0236" k2="1.0032" k3="-0.4551"/>
++            <vignetting model="pa" focal="21.1" aperture="5.6" distance="10" k1="-0.0884" k2="-0.6236" k3="0.3506"/>
++            <vignetting model="pa" focal="21.1" aperture="5.6" distance="1000" k1="-0.0884" k2="-0.6236" k3="0.3506"/>
++            <vignetting model="pa" focal="21.1" aperture="8" distance="10" k1="-0.2629" k2="0.1345" k3="-0.1264"/>
++            <vignetting model="pa" focal="21.1" aperture="8" distance="1000" k1="-0.2629" k2="0.1345" k3="-0.1264"/>
++            <vignetting model="pa" focal="21.1" aperture="11" distance="10" k1="-0.2490" k2="0.0471" k3="-0.0262"/>
++            <vignetting model="pa" focal="21.1" aperture="11" distance="1000" k1="-0.2490" k2="0.0471" k3="-0.0262"/>
++            <vignetting model="pa" focal="21.1" aperture="16" distance="10" k1="-0.2437" k2="0.0170" k3="0.0005"/>
++            <vignetting model="pa" focal="21.1" aperture="16" distance="1000" k1="-0.2437" k2="0.0170" k3="0.0005"/>
++            <vignetting model="pa" focal="21.1" aperture="22" distance="10" k1="-0.2583" k2="0.0507" k3="-0.0206"/>
++            <vignetting model="pa" focal="21.1" aperture="22" distance="1000" k1="-0.2583" k2="0.0507" k3="-0.0206"/>
++            <vignetting model="pa" focal="25.6" aperture="4.5" distance="10" k1="-0.9057" k2="0.9248" k3="-0.4344"/>
++            <vignetting model="pa" focal="25.6" aperture="4.5" distance="1000" k1="-0.9057" k2="0.9248" k3="-0.4344"/>
++            <vignetting model="pa" focal="25.6" aperture="5.6" distance="10" k1="-0.0975" k2="-0.5842" k3="0.3618"/>
++            <vignetting model="pa" focal="25.6" aperture="5.6" distance="1000" k1="-0.0975" k2="-0.5842" k3="0.3618"/>
++            <vignetting model="pa" focal="25.6" aperture="8" distance="10" k1="-0.2022" k2="0.1108" k3="-0.1116"/>
++            <vignetting model="pa" focal="25.6" aperture="8" distance="1000" k1="-0.2022" k2="0.1108" k3="-0.1116"/>
++            <vignetting model="pa" focal="25.6" aperture="11" distance="10" k1="-0.1875" k2="0.0102" k3="0.0053"/>
++            <vignetting model="pa" focal="25.6" aperture="11" distance="1000" k1="-0.1875" k2="0.0102" k3="0.0053"/>
++            <vignetting model="pa" focal="25.6" aperture="16" distance="10" k1="-0.1832" k2="0.0027" k3="0.0072"/>
++            <vignetting model="pa" focal="25.6" aperture="16" distance="1000" k1="-0.1832" k2="0.0027" k3="0.0072"/>
++            <vignetting model="pa" focal="25.6" aperture="22" distance="10" k1="-0.2000" k2="0.0355" k3="-0.0088"/>
++            <vignetting model="pa" focal="25.6" aperture="22" distance="1000" k1="-0.2000" k2="0.0355" k3="-0.0088"/>
++            <vignetting model="pa" focal="32.5" aperture="5" distance="10" k1="-0.8328" k2="0.8542" k3="-0.3972"/>
++            <vignetting model="pa" focal="32.5" aperture="5" distance="1000" k1="-0.8328" k2="0.8542" k3="-0.3972"/>
++            <vignetting model="pa" focal="32.5" aperture="5.6" distance="10" k1="-0.3345" k2="-0.1905" k3="0.1940"/>
++            <vignetting model="pa" focal="32.5" aperture="5.6" distance="1000" k1="-0.3345" k2="-0.1905" k3="0.1940"/>
++            <vignetting model="pa" focal="32.5" aperture="8" distance="10" k1="-0.1540" k2="0.0547" k3="-0.0939"/>
++            <vignetting model="pa" focal="32.5" aperture="8" distance="1000" k1="-0.1540" k2="0.0547" k3="-0.0939"/>
++            <vignetting model="pa" focal="32.5" aperture="11" distance="10" k1="-0.1409" k2="-0.0263" k3="0.0228"/>
++            <vignetting model="pa" focal="32.5" aperture="11" distance="1000" k1="-0.1409" k2="-0.0263" k3="0.0228"/>
++            <vignetting model="pa" focal="32.5" aperture="16" distance="10" k1="-0.1577" k2="0.0130" k3="-0.0008"/>
++            <vignetting model="pa" focal="32.5" aperture="16" distance="1000" k1="-0.1577" k2="0.0130" k3="-0.0008"/>
++            <vignetting model="pa" focal="32.5" aperture="22" distance="10" k1="-0.1699" k2="0.0351" k3="-0.0128"/>
++            <vignetting model="pa" focal="32.5" aperture="22" distance="1000" k1="-0.1699" k2="0.0351" k3="-0.0128"/>
++            <vignetting model="pa" focal="37.1" aperture="5.3" distance="10" k1="-0.7327" k2="0.7429" k3="-0.3463"/>
++            <vignetting model="pa" focal="37.1" aperture="5.3" distance="1000" k1="-0.7327" k2="0.7429" k3="-0.3463"/>
++            <vignetting model="pa" focal="37.1" aperture="5.6" distance="10" k1="-0.2963" k2="-0.1676" k3="0.1706"/>
++            <vignetting model="pa" focal="37.1" aperture="5.6" distance="1000" k1="-0.2963" k2="-0.1676" k3="0.1706"/>
++            <vignetting model="pa" focal="37.1" aperture="8" distance="10" k1="-0.1398" k2="0.0733" k3="-0.0810"/>
++            <vignetting model="pa" focal="37.1" aperture="8" distance="1000" k1="-0.1398" k2="0.0733" k3="-0.0810"/>
++            <vignetting model="pa" focal="37.1" aperture="11" distance="10" k1="-0.1208" k2="-0.0104" k3="0.0117"/>
++            <vignetting model="pa" focal="37.1" aperture="11" distance="1000" k1="-0.1208" k2="-0.0104" k3="0.0117"/>
++            <vignetting model="pa" focal="37.1" aperture="16" distance="10" k1="-0.1348" k2="0.0174" k3="-0.0038"/>
++            <vignetting model="pa" focal="37.1" aperture="16" distance="1000" k1="-0.1348" k2="0.0174" k3="-0.0038"/>
++            <vignetting model="pa" focal="37.1" aperture="22" distance="10" k1="-0.1418" k2="0.0273" k3="-0.0077"/>
++            <vignetting model="pa" focal="37.1" aperture="22" distance="1000" k1="-0.1418" k2="0.0273" k3="-0.0077"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.7648" k2="1.2137" k3="-0.8982"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.7648" k2="1.2137" k3="-0.8982"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0800" k2="0.0144" k3="-0.1169"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0800" k2="0.0144" k3="-0.1169"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.0783" k2="-0.0246" k3="0.0066"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.0783" k2="-0.0246" k3="0.0066"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.0879" k2="-0.0115" k3="0.0026"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.0879" k2="-0.0115" k3="0.0026"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.0917" k2="-0.0093" k3="0.0035"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0917" k2="-0.0093" k3="0.0035"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF35mmF2 R WR</model>
++        <model lang="en">XF 35mm f/2 WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-Pro2 -->
++            <distortion model="ptlens" focal="35" a="0.00956" b="-0.07057" c="0.07334"/>
++            <!-- Taken with Fujifilm X-E2 -->
++            <tca model="poly3" focal="35" vr="1.0000774" vb="0.9999724"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF14mmF2.8 R</model>
++        <model lang="en">XF 14mm f/2.8 R</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T1 -->
++            <distortion model="ptlens" focal="14" a="0.003995" b="-0.009534" c="0.002875"/>
++            <tca model="poly3" focal="14" br="-0.0000566" vr="1.0002277" bb="0.0000255" vb="0.9999647"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-1.5144" k2="1.2334" k3="-0.4684"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.5144" k2="1.2334" k3="-0.4684"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.8299" k2="0.1039" k3="0.0798"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.8299" k2="0.1039" k3="0.0798"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.9446" k2="0.5688" k3="-0.2059"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.9446" k2="0.5688" k3="-0.2059"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.9367" k2="0.5144" k3="-0.1402"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.9367" k2="0.5144" k3="-0.1402"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.9377" k2="0.5142" k3="-0.1405"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.9377" k2="0.5142" k3="-0.1405"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.9409" k2="0.5209" k3="-0.1460"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.9409" k2="0.5209" k3="-0.1460"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.9398" k2="0.5132" k3="-0.1416"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.9398" k2="0.5132" k3="-0.1416"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF16mmF1.4 R WR</model>
++        <model lang="en">XF 16mm f/1.4 R WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T1 -->
++            <distortion model="ptlens" focal="16" a="0.00071" b="-0.00085" c="-0.005909"/>
++            <tca model="poly3" focal="16" br="-0.0000585" vr="1.0001524" bb="0.0000149" vb="0.9999698"/>
++            <vignetting model="pa" focal="16" aperture="1.4" distance="10" k1="-1.4840" k2="1.2252" k3="-0.4670"/>
++            <vignetting model="pa" focal="16" aperture="1.4" distance="1000" k1="-1.4840" k2="1.2252" k3="-0.4670"/>
++            <vignetting model="pa" focal="16" aperture="2" distance="10" k1="-0.2881" k2="-0.5922" k3="0.3184"/>
++            <vignetting model="pa" focal="16" aperture="2" distance="1000" k1="-0.2881" k2="-0.5922" k3="0.3184"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5054" k2="0.2294" k3="-0.0910"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5054" k2="0.2294" k3="-0.0910"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.4919" k2="0.1660" k3="-0.0301"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.4919" k2="0.1660" k3="-0.0301"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.4949" k2="0.1791" k3="-0.0439"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4949" k2="0.1791" k3="-0.0439"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.5018" k2="0.1913" k3="-0.0501"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.5018" k2="0.1913" k3="-0.0501"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.5074" k2="0.2009" k3="-0.0563"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.5074" k2="0.2009" k3="-0.0563"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.5182" k2="0.2205" k3="-0.0699"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.5182" k2="0.2205" k3="-0.0699"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF23mmF2 R WR</model>
++        <model lang="en">XF 23mm f/2 R WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T10 -->
++            <!-- The target was not really trustworthy. -->
++            <distortion model="ptlens" focal="23" a="0.0289722" b="-0.0763625" c="0.0493558"/>
++            <tca model="poly3" focal="23" vr="1.0001000" vb="1.0003000"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF50mmF2 R WR</model>
++        <model lang="en">XF 50mm f/2 R WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-Pro2 -->
++            <!-- Target was not optimal (broken sections of line) but results are probably ok -->
++            <distortion model="poly3" focal="50" k1="0.00279448"/>
++            <tca model="poly3" focal="50" vr="1.0001084" vb="0.9999234"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF56mmF1.2 R APD</model>
++        <model lang="en">XF 56mm f/1.2 R APD</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T1 -->
++            <distortion model="ptlens" focal="56" a="0.000434" b="-0.006427" c="0.018063"/>
++            <tca model="poly3" focal="56" br="-0.0000190" vr="0.9999886" bb="0.0000222" vb="0.9999822"/>
++            <vignetting model="pa" focal="56" aperture="1.2" distance="10" k1="-0.8282" k2="0.0167" k3="0.1553"/>
++            <vignetting model="pa" focal="56" aperture="1.2" distance="1000" k1="-0.8282" k2="0.0167" k3="0.1553"/>
++            <vignetting model="pa" focal="56" aperture="1.4" distance="10" k1="-0.5900" k2="-0.4423" k3="0.3965"/>
++            <vignetting model="pa" focal="56" aperture="1.4" distance="1000" k1="-0.5900" k2="-0.4423" k3="0.3965"/>
++            <vignetting model="pa" focal="56" aperture="2" distance="10" k1="-0.3774" k2="-0.0284" k3="-0.0732"/>
++            <vignetting model="pa" focal="56" aperture="2" distance="1000" k1="-0.3774" k2="-0.0284" k3="-0.0732"/>
++            <vignetting model="pa" focal="56" aperture="2.8" distance="10" k1="-0.3624" k2="0.1878" k3="-0.1172"/>
++            <vignetting model="pa" focal="56" aperture="2.8" distance="1000" k1="-0.3624" k2="0.1878" k3="-0.1172"/>
++            <vignetting model="pa" focal="56" aperture="4" distance="10" k1="-0.3657" k2="0.3219" k3="-0.1805"/>
++            <vignetting model="pa" focal="56" aperture="4" distance="1000" k1="-0.3657" k2="0.3219" k3="-0.1805"/>
++            <vignetting model="pa" focal="56" aperture="5.6" distance="10" k1="-0.3896" k2="0.4244" k3="-0.2330"/>
++            <vignetting model="pa" focal="56" aperture="5.6" distance="1000" k1="-0.3896" k2="0.4244" k3="-0.2330"/>
++            <vignetting model="pa" focal="56" aperture="8" distance="10" k1="-0.4132" k2="0.4879" k3="-0.2637"/>
++            <vignetting model="pa" focal="56" aperture="8" distance="1000" k1="-0.4132" k2="0.4879" k3="-0.2637"/>
++            <vignetting model="pa" focal="56" aperture="11" distance="10" k1="-0.4211" k2="0.5182" k3="-0.2812"/>
++            <vignetting model="pa" focal="56" aperture="11" distance="1000" k1="-0.4211" k2="0.5182" k3="-0.2812"/>
++            <vignetting model="pa" focal="56" aperture="16" distance="10" k1="-0.4315" k2="0.5217" k3="-0.2718"/>
++            <vignetting model="pa" focal="56" aperture="16" distance="1000" k1="-0.4315" k2="0.5217" k3="-0.2718"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF16-55mmF2.8 R LM WR</model>
++        <model lang="en">XF 16-55mm f/2.8 R LM WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T10 -->
++            <distortion model="ptlens" focal="16" a="0.02551" b="-0.08802" c="0.02986"/>
++            <distortion model="ptlens" focal="18.7" a="0.02639" b="-0.09371" c="0.06949"/>
++            <distortion model="ptlens" focal="28.3" a="-0.00603" b="0.03552" c="-0.04632"/>
++            <distortion model="ptlens" focal="35.3" a="0.00725" b="-0.00705" c="0.00456"/>
++            <distortion model="ptlens" focal="55" a="0.02046" b="-0.05859" c="0.08192"/>
++            <tca model="poly3" focal="16" br="-0.0002950" vr="1.0013143" bb="0.0002728" vb="0.9995741"/>
++            <tca model="poly3" focal="18.7" br="-0.0002591" vr="1.0013211" bb="0.0002701" vb="0.9992707"/>
++            <tca model="poly3" focal="28.3" br="-0.0002947" vr="1.0012029" bb="0.0003146" vb="0.9988996"/>
++            <tca model="poly3" focal="35.3" br="-0.0003870" vr="1.0011116" bb="0.0003397" vb="0.9987853"/>
++            <tca model="poly3" focal="55" br="-0.0003426" vr="1.0004456" bb="0.0002934" vb="0.9987352"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF56mmF1.2 R</model>
++        <model lang="en">XF 56mm f/1.2 R</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-E2 -->
++            <distortion model="ptlens" focal="56" a="0.00239" b="-0.00767" c="0.00358"/>
++            <tca model="poly3" focal="56" vr="1.0000116" vb="0.9999456"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF10-24mmF4 R OIS</model>
++        <model lang="en">XF 10-24mm f/4 R OIS</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T10 -->
++            <distortion model="ptlens" focal="10" a="0.01619" b="-0.07655" c="0.05816"/>
++            <distortion model="ptlens" focal="12" a="-0.00089" b="-0.00928" c="0.00304"/>
++            <distortion model="ptlens" focal="14.5" a="-0.00966" b="0.02255" c="-0.00776"/>
++            <distortion model="ptlens" focal="18.2" a="-0.01658" b="0.04898" c="-0.0265"/>
++            <distortion model="ptlens" focal="20" a="-0.02138" b="0.06476" c="-0.03966"/>
++            <distortion model="ptlens" focal="24" a="-0.02363" b="0.07681" c="-0.05944"/>
++            <tca model="poly3" focal="10" vr="1.0003928" vb="0.9999066"/>
++            <tca model="poly3" focal="12" vr="1.0003642" vb="0.9999359"/>
++            <tca model="poly3" focal="14.5" vr="1.0001902" vb="1.0000327"/>
++            <tca model="poly3" focal="18.2" vr="1.0000632" vb="1.0001139"/>
++            <tca model="poly3" focal="20" vr="1.0000037" vb="1.0001642"/>
++            <tca model="poly3" focal="24" vr="0.9999651" vb="1.0001861"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-0.9106" k2="0.4474" k3="-0.2553"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-0.9106" k2="0.4474" k3="-0.2553"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="10" k1="-0.9856" k2="0.6448" k3="-0.2750"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.9856" k2="0.6448" k3="-0.2750"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.9675" k2="0.5333" k3="-0.1478"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.9675" k2="0.5333" k3="-0.1478"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.9726" k2="0.5383" k3="-0.1478"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.9726" k2="0.5383" k3="-0.1478"/>
++            <vignetting model="pa" focal="10" aperture="16" distance="10" k1="-0.9785" k2="0.5520" k3="-0.1555"/>
++            <vignetting model="pa" focal="10" aperture="16" distance="1000" k1="-0.9785" k2="0.5520" k3="-0.1555"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.9860" k2="0.5714" k3="-0.1678"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.9860" k2="0.5714" k3="-0.1678"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.7298" k2="-0.0073" k3="0.1174"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.7298" k2="-0.0073" k3="0.1174"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.8538" k2="0.4451" k3="-0.1533"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.8538" k2="0.4451" k3="-0.1533"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-0.8639" k2="0.4104" k3="-0.0776"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.8639" k2="0.4104" k3="-0.0776"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="10" k1="-0.8816" k2="0.4504" k3="-0.1009"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.8816" k2="0.4504" k3="-0.1009"/>
++            <vignetting model="pa" focal="12" aperture="16" distance="10" k1="-0.8910" k2="0.4688" k3="-0.1105"/>
++            <vignetting model="pa" focal="12" aperture="16" distance="1000" k1="-0.8910" k2="0.4688" k3="-0.1105"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.8949" k2="0.4734" k3="-0.1112"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.8949" k2="0.4734" k3="-0.1112"/>
++            <vignetting model="pa" focal="15.1" aperture="4" distance="10" k1="-0.6666" k2="-0.0865" k3="0.1899"/>
++            <vignetting model="pa" focal="15.1" aperture="4" distance="1000" k1="-0.6666" k2="-0.0865" k3="0.1899"/>
++            <vignetting model="pa" focal="15.1" aperture="5.6" distance="10" k1="-0.7945" k2="0.4359" k3="-0.1388"/>
++            <vignetting model="pa" focal="15.1" aperture="5.6" distance="1000" k1="-0.7945" k2="0.4359" k3="-0.1388"/>
++            <vignetting model="pa" focal="15.1" aperture="8" distance="10" k1="-0.7992" k2="0.3932" k3="-0.0619"/>
++            <vignetting model="pa" focal="15.1" aperture="8" distance="1000" k1="-0.7992" k2="0.3932" k3="-0.0619"/>
++            <vignetting model="pa" focal="15.1" aperture="11" distance="10" k1="-0.8237" k2="0.4454" k3="-0.0919"/>
++            <vignetting model="pa" focal="15.1" aperture="11" distance="1000" k1="-0.8237" k2="0.4454" k3="-0.0919"/>
++            <vignetting model="pa" focal="15.1" aperture="16" distance="10" k1="-0.8445" k2="0.4964" k3="-0.1230"/>
++            <vignetting model="pa" focal="15.1" aperture="16" distance="1000" k1="-0.8445" k2="0.4964" k3="-0.1230"/>
++            <vignetting model="pa" focal="15.1" aperture="22" distance="10" k1="-0.8381" k2="0.4757" k3="-0.1077"/>
++            <vignetting model="pa" focal="15.1" aperture="22" distance="1000" k1="-0.8381" k2="0.4757" k3="-0.1077"/>
++            <vignetting model="pa" focal="17.4" aperture="4" distance="10" k1="-0.6536" k2="0.0105" k3="0.1229"/>
++            <vignetting model="pa" focal="17.4" aperture="4" distance="1000" k1="-0.6536" k2="0.0105" k3="0.1229"/>
++            <vignetting model="pa" focal="17.4" aperture="5.6" distance="10" k1="-0.7661" k2="0.4285" k3="-0.1159"/>
++            <vignetting model="pa" focal="17.4" aperture="5.6" distance="1000" k1="-0.7661" k2="0.4285" k3="-0.1159"/>
++            <vignetting model="pa" focal="17.4" aperture="8" distance="10" k1="-0.7705" k2="0.3956" k3="-0.0598"/>
++            <vignetting model="pa" focal="17.4" aperture="8" distance="1000" k1="-0.7705" k2="0.3956" k3="-0.0598"/>
++            <vignetting model="pa" focal="17.4" aperture="11" distance="10" k1="-0.7932" k2="0.4454" k3="-0.0879"/>
++            <vignetting model="pa" focal="17.4" aperture="11" distance="1000" k1="-0.7932" k2="0.4454" k3="-0.0879"/>
++            <vignetting model="pa" focal="17.4" aperture="16" distance="10" k1="-0.8142" k2="0.4905" k3="-0.1130"/>
++            <vignetting model="pa" focal="17.4" aperture="16" distance="1000" k1="-0.8142" k2="0.4905" k3="-0.1130"/>
++            <vignetting model="pa" focal="17.4" aperture="22" distance="10" k1="-0.8149" k2="0.4980" k3="-0.1192"/>
++            <vignetting model="pa" focal="17.4" aperture="22" distance="1000" k1="-0.8149" k2="0.4980" k3="-0.1192"/>
++            <vignetting model="pa" focal="20.9" aperture="4" distance="10" k1="-0.5989" k2="-0.1442" k3="0.2539"/>
++            <vignetting model="pa" focal="20.9" aperture="4" distance="1000" k1="-0.5989" k2="-0.1442" k3="0.2539"/>
++            <vignetting model="pa" focal="20.9" aperture="5.6" distance="10" k1="-0.7231" k2="0.4272" k3="-0.1237"/>
++            <vignetting model="pa" focal="20.9" aperture="5.6" distance="1000" k1="-0.7231" k2="0.4272" k3="-0.1237"/>
++            <vignetting model="pa" focal="20.9" aperture="8" distance="10" k1="-0.7228" k2="0.3832" k3="-0.0601"/>
++            <vignetting model="pa" focal="20.9" aperture="8" distance="1000" k1="-0.7228" k2="0.3832" k3="-0.0601"/>
++            <vignetting model="pa" focal="20.9" aperture="11" distance="10" k1="-0.7457" k2="0.4228" k3="-0.0772"/>
++            <vignetting model="pa" focal="20.9" aperture="11" distance="1000" k1="-0.7457" k2="0.4228" k3="-0.0772"/>
++            <vignetting model="pa" focal="20.9" aperture="16" distance="10" k1="-0.7613" k2="0.4554" k3="-0.0956"/>
++            <vignetting model="pa" focal="20.9" aperture="16" distance="1000" k1="-0.7613" k2="0.4554" k3="-0.0956"/>
++            <vignetting model="pa" focal="20.9" aperture="22" distance="10" k1="-0.7684" k2="0.4648" k3="-0.0973"/>
++            <vignetting model="pa" focal="20.9" aperture="22" distance="1000" k1="-0.7684" k2="0.4648" k3="-0.0973"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.5854" k2="-0.1222" k3="0.2468"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.5854" k2="-0.1222" k3="0.2468"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.6757" k2="0.3803" k3="-0.1044"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6757" k2="0.3803" k3="-0.1044"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.6846" k2="0.3553" k3="-0.0397"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6846" k2="0.3553" k3="-0.0397"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.7040" k2="0.3961" k3="-0.0639"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7040" k2="0.3961" k3="-0.0639"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.7191" k2="0.4244" k3="-0.0786"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.7191" k2="0.4244" k3="-0.0786"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.7243" k2="0.4278" k3="-0.0766"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7243" k2="0.4278" k3="-0.0766"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF18-135mmF3.5-5.6R LM OIS WR</model>
++        <model lang="en">XF 18-135mm f/3.5-5.6R LM OIS WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T1 -->
++            <distortion model="ptlens" focal="18" a="0.01941" b="-0.06675" c="0.0182"/>
++            <distortion model="ptlens" focal="23.3" a="0.02157" b="-0.06615" c="0.0498"/>
++            <distortion model="ptlens" focal="32.6" a="0.0121" b="-0.02671" c="0.01745"/>
++            <distortion model="ptlens" focal="36.6" a="0.00095" b="0.00464" c="-0.00262"/>
++            <distortion model="ptlens" focal="49.4" a="0.01018" b="-0.0215" c="0.02094"/>
++            <distortion model="ptlens" focal="66.2" a="0.00047" b="0.00047" c="0.01288"/>
++            <distortion model="ptlens" focal="88.2" a="-0.00663" b="0.02638" c="-0.02265"/>
++            <distortion model="ptlens" focal="98.6" a="0.00243" b="-0.00754" c="0.01607"/>
++            <distortion model="ptlens" focal="135" a="0.02188" b="-0.06638" c="0.06834"/>
++            <tca model="poly3" focal="18" vr="1.0005311" vb="1.0000593"/>
++            <tca model="poly3" focal="23.3" vr="1.0001611" vb="1.0001960"/>
++            <tca model="poly3" focal="32.6" vr="1.0000350" vb="1.0003320"/>
++            <tca model="poly3" focal="36.6" vr="1.0000125" vb="1.0002991"/>
++            <tca model="poly3" focal="49.4" vr="1.0000246" vb="1.0000648"/>
++            <tca model="poly3" focal="52.4" vr="1.0000208" vb="1.0000512"/>
++            <tca model="poly3" focal="70.2" vr="1.0000080" vb="0.9998932"/>
++            <tca model="poly3" focal="88.2" vr="0.9998601" vb="0.9998080"/>
++            <tca model="poly3" focal="93.2" vr="0.9998528" vb="0.9998364"/>
++            <tca model="poly3" focal="98.6" vr="0.9998614" vb="0.9997719"/>
++            <tca model="poly3" focal="135" vr="0.9994228" vb="0.9998818"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="0.0088" k2="-1.0364" k3="0.3033"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="0.0088" k2="-1.0364" k3="0.3033"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.4149" k2="0.5907" k3="-0.7285"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.4149" k2="0.5907" k3="-0.7285"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.5591" k2="0.9937" k3="-0.9320"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.5591" k2="0.9937" k3="-0.9320"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.4701" k2="0.5359" k3="-0.4458"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.4701" k2="0.5359" k3="-0.4458"/>
++            <vignetting model="pa" focal="18" aperture="20" distance="10" k1="-0.4267" k2="0.3431" k3="-0.2523"/>
++            <vignetting model="pa" focal="18" aperture="20" distance="1000" k1="-0.4267" k2="0.3431" k3="-0.2523"/>
++            <vignetting model="pa" focal="22.4" aperture="4" distance="10" k1="-0.3607" k2="0.4741" k3="-0.5737"/>
++            <vignetting model="pa" focal="22.4" aperture="4" distance="1000" k1="-0.3607" k2="0.4741" k3="-0.5737"/>
++            <vignetting model="pa" focal="22.4" aperture="5.6" distance="10" k1="-0.3521" k2="0.5198" k3="-0.4770"/>
++            <vignetting model="pa" focal="22.4" aperture="5.6" distance="1000" k1="-0.3521" k2="0.5198" k3="-0.4770"/>
++            <vignetting model="pa" focal="22.4" aperture="8" distance="10" k1="-0.3126" k2="0.3319" k3="-0.2598"/>
++            <vignetting model="pa" focal="22.4" aperture="8" distance="1000" k1="-0.3126" k2="0.3319" k3="-0.2598"/>
++            <vignetting model="pa" focal="22.4" aperture="16" distance="10" k1="-0.3903" k2="0.4285" k3="-0.2353"/>
++            <vignetting model="pa" focal="22.4" aperture="16" distance="1000" k1="-0.3903" k2="0.4285" k3="-0.2353"/>
++            <vignetting model="pa" focal="22.4" aperture="22" distance="10" k1="-0.1827" k2="-0.1746" k3="0.1626"/>
++            <vignetting model="pa" focal="22.4" aperture="22" distance="1000" k1="-0.1827" k2="-0.1746" k3="0.1626"/>
++            <vignetting model="pa" focal="32.6" aperture="4.3" distance="10" k1="-0.4155" k2="0.9589" k3="-0.9222"/>
++            <vignetting model="pa" focal="32.6" aperture="4.3" distance="1000" k1="-0.4155" k2="0.9589" k3="-0.9222"/>
++            <vignetting model="pa" focal="32.6" aperture="5.6" distance="10" k1="-0.4612" k2="1.0807" k3="-0.8684"/>
++            <vignetting model="pa" focal="32.6" aperture="5.6" distance="1000" k1="-0.4612" k2="1.0807" k3="-0.8684"/>
++            <vignetting model="pa" focal="32.6" aperture="8" distance="10" k1="-0.3536" k2="0.6799" k3="-0.4775"/>
++            <vignetting model="pa" focal="32.6" aperture="8" distance="1000" k1="-0.3536" k2="0.6799" k3="-0.4775"/>
++            <vignetting model="pa" focal="32.6" aperture="16" distance="10" k1="-0.2545" k2="0.3042" k3="-0.1457"/>
++            <vignetting model="pa" focal="32.6" aperture="16" distance="1000" k1="-0.2545" k2="0.3042" k3="-0.1457"/>
++            <vignetting model="pa" focal="32.6" aperture="22" distance="10" k1="-0.2641" k2="0.3190" k3="-0.1557"/>
++            <vignetting model="pa" focal="32.6" aperture="22" distance="1000" k1="-0.2641" k2="0.3190" k3="-0.1557"/>
++            <vignetting model="pa" focal="52.4" aperture="5" distance="10" k1="-0.2140" k2="0.6959" k3="-0.8707"/>
++            <vignetting model="pa" focal="52.4" aperture="5" distance="1000" k1="-0.2140" k2="0.6959" k3="-0.8707"/>
++            <vignetting model="pa" focal="52.4" aperture="6.4" distance="10" k1="-0.3004" k2="0.8921" k3="-0.8794"/>
++            <vignetting model="pa" focal="52.4" aperture="6.4" distance="1000" k1="-0.3004" k2="0.8921" k3="-0.8794"/>
++            <vignetting model="pa" focal="52.4" aperture="8" distance="10" k1="-0.2886" k2="0.7815" k3="-0.7054"/>
++            <vignetting model="pa" focal="52.4" aperture="8" distance="1000" k1="-0.2886" k2="0.7815" k3="-0.7054"/>
++            <vignetting model="pa" focal="52.4" aperture="16" distance="10" k1="-0.1454" k2="0.1258" k3="-0.0758"/>
++            <vignetting model="pa" focal="52.4" aperture="16" distance="1000" k1="-0.1454" k2="0.1258" k3="-0.0758"/>
++            <vignetting model="pa" focal="52.4" aperture="22" distance="10" k1="-0.1601" k2="0.1164" k3="-0.0615"/>
++            <vignetting model="pa" focal="52.4" aperture="22" distance="1000" k1="-0.1601" k2="0.1164" k3="-0.0615"/>
++            <vignetting model="pa" focal="70.2" aperture="5.3" distance="10" k1="-0.1213" k2="0.4060" k3="-0.6625"/>
++            <vignetting model="pa" focal="70.2" aperture="5.3" distance="1000" k1="-0.1213" k2="0.4060" k3="-0.6625"/>
++            <vignetting model="pa" focal="70.2" aperture="8" distance="10" k1="-0.3224" k2="0.9035" k3="-0.7999"/>
++            <vignetting model="pa" focal="70.2" aperture="8" distance="1000" k1="-0.3224" k2="0.9035" k3="-0.7999"/>
++            <vignetting model="pa" focal="70.2" aperture="11" distance="10" k1="-0.2728" k2="0.5688" k3="-0.4179"/>
++            <vignetting model="pa" focal="70.2" aperture="11" distance="1000" k1="-0.2728" k2="0.5688" k3="-0.4179"/>
++            <vignetting model="pa" focal="70.2" aperture="16" distance="10" k1="-0.2154" k2="0.3578" k3="-0.2371"/>
++            <vignetting model="pa" focal="70.2" aperture="16" distance="1000" k1="-0.2154" k2="0.3578" k3="-0.2371"/>
++            <vignetting model="pa" focal="70.2" aperture="22" distance="10" k1="-0.2213" k2="0.3836" k3="-0.2591"/>
++            <vignetting model="pa" focal="70.2" aperture="22" distance="1000" k1="-0.2213" k2="0.3836" k3="-0.2591"/>
++            <vignetting model="pa" focal="93.2" aperture="5.6" distance="10" k1="0.0111" k2="-0.1721" k3="-0.2157"/>
++            <vignetting model="pa" focal="93.2" aperture="5.6" distance="1000" k1="0.0111" k2="-0.1721" k3="-0.2157"/>
++            <vignetting model="pa" focal="93.2" aperture="8" distance="10" k1="-0.2357" k2="0.6739" k3="-0.7121"/>
++            <vignetting model="pa" focal="93.2" aperture="8" distance="1000" k1="-0.2357" k2="0.6739" k3="-0.7121"/>
++            <vignetting model="pa" focal="93.2" aperture="11" distance="10" k1="-0.3122" k2="0.7110" k3="-0.5602"/>
++            <vignetting model="pa" focal="93.2" aperture="11" distance="1000" k1="-0.3122" k2="0.7110" k3="-0.5602"/>
++            <vignetting model="pa" focal="93.2" aperture="16" distance="10" k1="-0.2389" k2="0.3517" k3="-0.2082"/>
++            <vignetting model="pa" focal="93.2" aperture="16" distance="1000" k1="-0.2389" k2="0.3517" k3="-0.2082"/>
++            <vignetting model="pa" focal="93.2" aperture="22" distance="10" k1="-0.2260" k2="0.2950" k3="-0.1597"/>
++            <vignetting model="pa" focal="93.2" aperture="22" distance="1000" k1="-0.2260" k2="0.2950" k3="-0.1597"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.0763" k2="-0.7617" k3="0.3866"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0763" k2="-0.7617" k3="0.3866"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0713" k2="0.0839" k3="-0.3096"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0713" k2="0.0839" k3="-0.3096"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.2862" k2="0.6522" k3="-0.5513"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2862" k2="0.6522" k3="-0.5513"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1849" k2="0.2127" k3="-0.1223"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1849" k2="0.2127" k3="-0.1223"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.1240" k2="0.0245" k3="0.0001"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1240" k2="0.0245" k3="0.0001"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF100-400mmF4.5-5.6 R LM OIS WR</model>
++        <model lang="en">XF 100-400mm f/4.5-5.6 R LM OIS WR</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T20 -->
++            <distortion model="poly3" focal="100" k1="0.00912075"/>
++            <distortion model="poly3" focal="132.9" k1="0.011199"/>
++            <distortion model="poly3" focal="196.6" k1="0.0114238"/>
++            <distortion model="poly3" focal="290.6" k1="0.0116749"/>
++            <distortion model="poly3" focal="400" k1="0.0108754"/>
++            <tca model="poly3" focal="100" vr="1.00030" vb="1.00000"/>
++            <tca model="poly3" focal="132.9" vr="1.00010" vb="1.00000"/>
++            <tca model="poly3" focal="196.6" vr="0.99990" vb="0.99990"/>
++            <tca model="poly3" focal="290.6" vr="0.99970" vb="0.99990"/>
++            <tca model="poly3" focal="400" vr="0.99950" vb="0.99980"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fujifilm</maker>
++        <model>XF100-400mmF4.5-5.6 R LM OIS WR + 1.4x converter</model>
++        <model lang="en">XF 100-400mm f/4.5-5.6 R LM OIS WR + 1.4× conv.</model>
++        <model lang="de">XF 100-400mm f/4.5-5.6 R LM OIS WR + 1.4×-Konv.</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-T20 -->
++            <distortion model="ptlens" focal="140" a="-0.00910152" b="0.0158002" c="-0.00149072"/>
++            <distortion model="ptlens" focal="179.6" a="-0.00888393" b="0.0194124" c="-0.0126484"/>
++            <distortion model="ptlens" focal="265.6" a="-0.011946" b="0.0330465" c="-0.032717"/>
++            <distortion model="ptlens" focal="406.8" a="-0.0146274" b="0.039903" c="-0.0372351"/>
++            <distortion model="ptlens" focal="560" a="-0.0170416" b="0.0529422" c="-0.0613742"/>
++            <tca model="poly3" focal="140" vr="1.00000" vb="1.00000"/>
++            <tca model="poly3" focal="179.6" vr="1.00000" vb="0.99990"/>
++            <tca model="poly3" focal="265.6" vr="0.99970" vb="0.99980"/>
++            <tca model="poly3" focal="406.8" vr="0.99950" vb="0.99970"/>
++            <tca model="poly3" focal="560" vr="0.99930" vb="0.99950"/>
++        </calibration>
++    </lens>
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-nikon.xml b/data/db/mil-nikon.xml
+--- a/data/db/mil-nikon.xml	2013-10-11 23:54:00.000000000 +0200
++++ b/data/db/mil-nikon.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,112 +1,226 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Nikon CX</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+-	<compat>Nikon F</compat>
++        <compat>Nikon F</compat>
+         <compat>Nikon F AI</compat>
+         <compat>Nikon F AI-S</compat>
+         <compat>Nikon F AF</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON 1 S1</model>
++        <model>Nikon 1 S1</model>
+         <model lang="en">1 S1</model>
+         <mount>Nikon CX</mount>
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON 1 V1</model>
++        <model>Nikon 1 V1</model>
+         <model lang="en">1 V1</model>
+         <mount>Nikon CX</mount>
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON 1 J1</model>
++        <model>Nikon 1 J1</model>
+         <model lang="en">1 J1</model>
+         <mount>Nikon CX</mount>
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON 1 V2</model>
++        <model>Nikon 1 AW1</model>
++        <model lang="en">1 AW1</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon 1 S2</model>
++        <model lang="en">1 S2</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon 1 V2</model>
+         <model lang="en">1 V2</model>
+         <mount>Nikon CX</mount>
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON 1 J2</model>
++        <model>Nikon 1 J2</model>
+         <model lang="en">1 J2</model>
+         <mount>Nikon CX</mount>
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON 1 J3</model>
++        <model>Nikon 1 V3</model>
++        <model lang="en">1 V3</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon 1 J3</model>
+         <model lang="en">1 J3</model>
+         <mount>Nikon CX</mount>
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon 1 J4</model>
++        <model lang="en">1 J4</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon 1 J5</model>
++        <model lang="en">1 J5</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>1 NIKKOR VR 10-30mm f/3.5-5.6</model>
++        <model>1 Nikkor VR 10-30mm f/3.5-5.6</model>
+         <mount>Nikon CX</mount>
+-        <!-- FixMe: Actually cropfactor 2.727 -->
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon 1 J1 -->
+-            <distortion model="ptlens" focal="10" a="0.00625" b="-0.02807" c="0.01012" />
+-            <distortion model="ptlens" focal="14" a="0" b="-0.00506" c="0" />
+-            <distortion model="ptlens" focal="18.2" a="0" b="-0.00166" c="0" />
+-            <distortion model="ptlens" focal="20.3" a="0" b="-0.0012" c="0" />
+-            <distortion model="ptlens" focal="23.6" a="0" b="-0.00026" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.00046" c="0" />
+-            <tca model="poly3" focal="10" vr="1.0002498" vb="1.0002093" />
+-            <tca model="poly3" focal="14" vr="1.0001798" vb="1.0001781" />
+-            <tca model="poly3" focal="18.2" vr="1.0001406" vb="1.0001690" />
+-            <tca model="poly3" focal="20.3" vr="1.0001429" vb="1.0001581" />
+-            <tca model="poly3" focal="23.6" vr="1.0001309" vb="1.0001345" />
+-            <tca model="poly3" focal="30" vr="1.0001281" vb="1.0000955" />
++            <distortion model="ptlens" focal="10" a="0.00625" b="-0.02807" c="0.01012"/>
++            <distortion model="ptlens" focal="14" a="0" b="-0.00506" c="0"/>
++            <distortion model="ptlens" focal="18.2" a="0" b="-0.00166" c="0"/>
++            <distortion model="ptlens" focal="20.3" a="0" b="-0.0012" c="0"/>
++            <distortion model="ptlens" focal="23.6" a="0" b="-0.00026" c="0"/>
++            <distortion model="ptlens" focal="30" a="0" b="0.00046" c="0"/>
++            <tca model="poly3" focal="10" vr="1.0002498" vb="1.0002093"/>
++            <tca model="poly3" focal="14" vr="1.0001798" vb="1.0001781"/>
++            <tca model="poly3" focal="18.2" vr="1.0001406" vb="1.0001690"/>
++            <tca model="poly3" focal="20.3" vr="1.0001429" vb="1.0001581"/>
++            <tca model="poly3" focal="23.6" vr="1.0001309" vb="1.0001345"/>
++            <tca model="poly3" focal="30" vr="1.0001281" vb="1.0000955"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>1 NIKKOR VR 30-110mm f/3.8-5.6</model>
++        <model>1 Nikkor VR 30-110mm f/3.8-5.6</model>
+         <mount>Nikon CX</mount>
+-        <!-- FixMe: Actually cropfactor 2.727 -->
+-        <cropfactor>2.7</cropfactor>
++        <cropfactor>2.727</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon 1 J1 -->
+-            <distortion model="poly3" focal="30" k1="-0.01024" />
+-            <distortion model="poly3" focal="39.8" k1="0.00097" />
+-            <distortion model="poly3" focal="59.4" k1="0.00573" />
+-            <distortion model="poly3" focal="80.1" k1="0.00556" />
+-            <distortion model="poly3" focal="110" k1="0.00532" />
+-            <tca model="poly3" focal="30" vr="1.0000704" vb="1.0001468" />
+-            <tca model="poly3" focal="39.8" vr="1.0000811" vb="1.0000224" />
+-            <tca model="poly3" focal="59.4" vr="0.9999867" vb="0.9999353" />
+-            <tca model="poly3" focal="80.1" vr="0.9999499" vb="0.9998968" />
+-            <tca model="poly3" focal="110" vr="0.9998706" vb="0.9998498" />
++            <distortion model="poly3" focal="30" k1="-0.01024"/>
++            <distortion model="poly3" focal="39.8" k1="0.00097"/>
++            <distortion model="poly3" focal="59.4" k1="0.00573"/>
++            <distortion model="poly3" focal="80.1" k1="0.00556"/>
++            <distortion model="poly3" focal="110" k1="0.00532"/>
++            <tca model="poly3" focal="30" vr="1.0000704" vb="1.0001468"/>
++            <tca model="poly3" focal="39.8" vr="1.0000811" vb="1.0000224"/>
++            <tca model="poly3" focal="59.4" vr="0.9999867" vb="0.9999353"/>
++            <tca model="poly3" focal="80.1" vr="0.9999499" vb="0.9998968"/>
++            <tca model="poly3" focal="110" vr="0.9998706" vb="0.9998498"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>1 Nikkor AW 11-27.5mm f/3.5-5.6</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon 1 AW1 -->
++            <distortion model="ptlens" focal="11" a="0.0108" b="-0.04366" c="0.01672"/>
++            <distortion model="ptlens" focal="14" a="0.00707" b="-0.03017" c="0.01789"/>
++            <distortion model="ptlens" focal="16.1" a="0.00422" b="-0.01878" c="0.01041"/>
++            <distortion model="ptlens" focal="18.2" a="0.00176" b="-0.01145" c="0.00993"/>
++            <distortion model="ptlens" focal="21" a="0.00225" b="-0.01094" c="0.01183"/>
++            <distortion model="ptlens" focal="23.6" a="0.00121" b="-0.00499" c="0.00367"/>
++            <distortion model="ptlens" focal="27.5" a="0.00158" b="-0.00591" c="0.00483"/>
++            <tca model="poly3" focal="11" br="0.0000054" vr="1.0002237" bb="0.0000092" vb="1.0000626"/>
++            <tca model="poly3" focal="14" br="-0.0000744" vr="1.0002354" bb="0.0000058" vb="1.0000739"/>
++            <tca model="poly3" focal="16.1" br="-0.0000501" vr="1.0001925" bb="0.0000057" vb="1.0000790"/>
++            <tca model="poly3" focal="18.2" br="-0.0000541" vr="1.0001661" bb="-0.0000100" vb="1.0000806"/>
++            <tca model="poly3" focal="21" br="-0.0000300" vr="1.0001514" bb="0.0000051" vb="1.0000838"/>
++            <tca model="poly3" focal="23.6" br="-0.0000236" vr="1.0001017" bb="0.0000001" vb="1.0000574"/>
++            <tca model="poly3" focal="27.5" br="-0.0000339" vr="1.0001351" bb="-0.0000011" vb="1.0000496"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>1 Nikkor 18.5mm f/1.8</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon 1 J1 -->
++            <distortion model="poly3" focal="18.5" k1="-0.00974"/>
++            <tca model="poly3" focal="18.5" br="-0.0000181" vr="1.0004235" bb="0.0000843" vb="0.9999900"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>1 Nikkor 32mm f/1.2</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon 1 J1 -->
++            <distortion model="ptlens" focal="32" a="-0.002" b="0.004" c="-0.003"/>
++            <tca model="poly3" focal="32" br="-0.0000293" vr="1.0000997" bb="0.0000337" vb="0.9998935"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>1 Nikkor 10mm f/2.8</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon 1 J4 -->
++            <distortion model="ptlens" focal="10" a="0.06176" b="-0.15886" c="0.10734"/>
++            <vignetting model="pa" focal="10" aperture="2.8" distance="10" k1="-1.2282" k2="0.8855" k3="-0.3102"/>
++            <vignetting model="pa" focal="10" aperture="2.8" distance="1000" k1="-1.2282" k2="0.8855" k3="-0.3102"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-0.4906" k2="0.1215" k3="-0.0680"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-0.4906" k2="0.1215" k3="-0.0680"/>
++            <vignetting model="pa" focal="10" aperture="5" distance="10" k1="-0.5344" k2="0.1676" k3="-0.0339"/>
++            <vignetting model="pa" focal="10" aperture="5" distance="1000" k1="-0.5344" k2="0.1676" k3="-0.0339"/>
++            <vignetting model="pa" focal="10" aperture="6.3" distance="10" k1="-0.5544" k2="0.1830" k3="-0.0409"/>
++            <vignetting model="pa" focal="10" aperture="6.3" distance="1000" k1="-0.5544" k2="0.1830" k3="-0.0409"/>
++            <vignetting model="pa" focal="10" aperture="7.1" distance="10" k1="-0.5706" k2="0.1847" k3="-0.0359"/>
++            <vignetting model="pa" focal="10" aperture="7.1" distance="1000" k1="-0.5706" k2="0.1847" k3="-0.0359"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.5728" k2="0.1638" k3="-0.0093"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.5728" k2="0.1638" k3="-0.0093"/>
++            <vignetting model="pa" focal="10" aperture="9" distance="10" k1="-0.5793" k2="0.1723" k3="-0.0110"/>
++            <vignetting model="pa" focal="10" aperture="9" distance="1000" k1="-0.5793" k2="0.1723" k3="-0.0110"/>
++            <vignetting model="pa" focal="10" aperture="10" distance="10" k1="-0.5870" k2="0.1850" k3="-0.0172"/>
++            <vignetting model="pa" focal="10" aperture="10" distance="1000" k1="-0.5870" k2="0.1850" k3="-0.0172"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.5985" k2="0.1814" k3="-0.0093"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.5985" k2="0.1814" k3="-0.0093"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>1 Nikkor AW 10mm f/2.8</model>
++        <mount>Nikon CX</mount>
++        <cropfactor>2.727</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon AW1 -->
++            <distortion model="ptlens" focal="10" a="0.0120353" b="-0.035894" c="0.0124636"/>
++            <tca model="poly3" focal="10" br="-0.0001550" vr="1.0006279" bb="0.0001309" vb="0.9998205"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-olympus.xml b/data/db/mil-olympus.xml
+--- a/data/db/mil-olympus.xml	2013-10-13 11:59:02.000000000 +0200
++++ b/data/db/mil-olympus.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,239 +1,273 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Micro 4/3 System</name>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+         <compat>Generic</compat>
+-        <compat>4/3 System</compat>
+     </mount>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-P1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-P2</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-P3</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-P5</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PL1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PL1s</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PL2</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PL3</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PL5</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PL6</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>E-PL7</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PM1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-PM2</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-M1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>E-M1MarkII</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-M5</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>E-M5MarkII</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>E-M10</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Corporation</maker>
++        <maker lang="en">Olympus</maker>
++        <model>E-M10MarkII</model>
++        <model lang="en">E-M10 II</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>PEN-F</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.12mm F2.0</model>
++        <model>Olympus M.Zuiko Digital ED 12mm f/2.0</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
+-        <focal value="12" />
++        <focal value="12"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="12" a="-0.005" b="-0.016" c="-0.014" />
+-            <tca model="poly3" focal="12" br="0.0000749" vr="1.0001239" bb="0.0000350" vb="1.0000181" />
++            <distortion model="ptlens" focal="12" b="-0.028892"/>
++            <tca model="poly3" focal="12" br="0.0000301" vr="1.0003354" bb="0.0000561" vb="0.9999414"/>
++            <vignetting model="pa" focal="12" aperture="2" distance="10" k1="-0.6818" k2="-0.1021" k3="0.1981"/>
++            <vignetting model="pa" focal="12" aperture="2" distance="1000" k1="-0.6818" k2="-0.1021" k3="0.1981"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.1391" k2="-0.0336" k3="-0.1603"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.1391" k2="-0.0336" k3="-0.1603"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.2327" k2="-0.0190" k3="0.0492"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.2327" k2="-0.0190" k3="0.0492"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1964" k2="-0.0877" k3="0.0884"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1964" k2="-0.0877" k3="0.0884"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.2630" k2="0.0244" k3="0.0320"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.2630" k2="0.0244" k3="0.0320"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.12-50mm F3.5-6.3</model>
++        <model>Olympus M.Zuiko Digital ED 12-50mm f/3.5-6.3 EZ</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="12" a="0.00331" b="-0.03343" c="-0.00683" />
+-            <distortion model="ptlens" focal="15" a="0.00521" b="-0.02919" c="0.00519" />
+-            <distortion model="ptlens" focal="18" a="-0.00075" b="-0.00029" c="-0.01458" />
+-            <distortion model="ptlens" focal="22" a="0.0006" b="-0.00075" c="-0.00843" />
+-            <distortion model="ptlens" focal="26" a="-0.00059" b="0.00449" c="-0.01271" />
+-            <distortion model="ptlens" focal="30" a="0.00128" b="-0.00365" c="0.0029" />
+-            <distortion model="ptlens" focal="35" a="0.00046" b="0.00124" c="-0.0013" />
+-            <distortion model="ptlens" focal="40" a="0.01662" b="-0.0539" c="0.06353" />
+-            <distortion model="ptlens" focal="45" a="0.00827" b="-0.02519" c="0.0347" />
+-            <distortion model="ptlens" focal="50" a="-0.0063" b="0.02983" c="-0.02886" />
+-            <tca model="poly3" focal="12" br="0.0002153" vr="1.0006397" bb="-0.0001625" vb="1.0003859" />
+-            <tca model="poly3" focal="12" br="0.0002549" vr="1.0005804" bb="-0.0001694" vb="1.0004041" />
+-            <tca model="poly3" focal="12" br="0.0002567" vr="1.0005732" bb="-0.0001771" vb="1.0004148" />
+-            <tca model="poly3" focal="15" br="0.0000901" vr="1.0004739" bb="-0.0000734" vb="1.0004506" />
+-            <tca model="poly3" focal="15" br="0.0001052" vr="1.0004582" bb="-0.0000700" vb="1.0004424" />
+-            <tca model="poly3" focal="15" br="0.0001196" vr="1.0004310" bb="-0.0000908" vb="1.0004670" />
+-            <tca model="poly3" focal="18" br="0.0001710" vr="1.0002351" bb="-0.0000676" vb="1.0003208" />
+-            <tca model="poly3" focal="18" br="0.0001998" vr="1.0001989" bb="-0.0000551" vb="1.0002972" />
+-            <tca model="poly3" focal="18" br="0.0002004" vr="1.0001907" bb="-0.0000672" vb="1.0003084" />
+-            <tca model="poly3" focal="22" br="0.0002187" vr="1.0001159" bb="-0.0001002" vb="1.0002496" />
+-            <tca model="poly3" focal="22" br="0.0002200" vr="1.0001153" bb="-0.0000944" vb="1.0002600" />
+-            <tca model="poly3" focal="22" br="0.0002222" vr="1.0001016" bb="-0.0001145" vb="1.0002688" />
+-            <tca model="poly3" focal="26" br="0.0002792" vr="0.9999735" bb="-0.0001156" vb="1.0003080" />
+-            <tca model="poly3" focal="26" br="0.0002939" vr="0.9999418" bb="-0.0000956" vb="1.0002767" />
+-            <tca model="poly3" focal="26" br="0.0002973" vr="0.9999405" bb="-0.0001146" vb="1.0002992" />
+-            <tca model="poly3" focal="30" br="0.0002072" vr="0.9998717" bb="-0.0001749" vb="1.0004954" />
+-            <tca model="poly3" focal="30" br="0.0002495" vr="0.9998295" bb="-0.0001372" vb="1.0004401" />
+-            <tca model="poly3" focal="30" br="0.0002527" vr="0.9998374" bb="-0.0001661" vb="1.0004878" />
+-            <tca model="poly3" focal="35" br="0.0001735" vr="0.9997893" bb="-0.0002156" vb="1.0006502" />
+-            <tca model="poly3" focal="35" br="0.0001856" vr="0.9997740" bb="-0.0002036" vb="1.0005955" />
+-            <tca model="poly3" focal="35" br="0.0002013" vr="0.9997600" bb="-0.0002229" vb="1.0006799" />
+-            <tca model="poly3" focal="40" br="0.0001250" vr="0.9998265" bb="-0.0002366" vb="1.0006687" />
+-            <tca model="poly3" focal="40" br="0.0001359" vr="0.9998189" bb="-0.0002446" vb="1.0006998" />
+-            <tca model="poly3" focal="40" br="0.0001907" vr="0.9997482" bb="-0.0002707" vb="1.0007475" />
+-            <tca model="poly3" focal="45" br="0.0001734" vr="0.9997963" bb="-0.0002222" vb="1.0006242" />
+-            <tca model="poly3" focal="45" br="0.0001800" vr="0.9997888" bb="-0.0002076" vb="1.0005887" />
+-            <tca model="poly3" focal="45" br="0.0001942" vr="0.9997736" bb="-0.0002343" vb="1.0006603" />
+-            <tca model="poly3" focal="50" br="0.0001414" vr="0.9998089" bb="-0.0002393" vb="1.0005384" />
+-            <tca model="poly3" focal="50" br="0.0001516" vr="0.9998080" bb="-0.0002719" vb="1.0005789" />
+-            <tca model="poly3" focal="50" br="0.0001784" vr="0.9997785" bb="-0.0002152" vb="1.0004737" />
++            <distortion model="ptlens" focal="12" a="0.00331" b="-0.03343" c="-0.00683"/>
++            <distortion model="ptlens" focal="15" a="0.00521" b="-0.02919" c="0.00519"/>
++            <distortion model="ptlens" focal="18" a="-0.00075" b="-0.00029" c="-0.01458"/>
++            <distortion model="ptlens" focal="22" a="0.0006" b="-0.00075" c="-0.00843"/>
++            <distortion model="ptlens" focal="26" a="-0.00059" b="0.00449" c="-0.01271"/>
++            <distortion model="ptlens" focal="30" a="0.00128" b="-0.00365" c="0.0029"/>
++            <distortion model="ptlens" focal="35" a="0.00046" b="0.00124" c="-0.0013"/>
++            <distortion model="ptlens" focal="40" a="0.01662" b="-0.0539" c="0.06353"/>
++            <distortion model="ptlens" focal="45" a="0.00827" b="-0.02519" c="0.0347"/>
++            <distortion model="ptlens" focal="50" a="-0.0063" b="0.02983" c="-0.02886"/>
++            <tca model="poly3" focal="12" br="0.0002153" vr="1.0006397" bb="-0.0001625" vb="1.0003859"/>
++            <tca model="poly3" focal="12" br="0.0002549" vr="1.0005804" bb="-0.0001694" vb="1.0004041"/>
++            <tca model="poly3" focal="12" br="0.0002567" vr="1.0005732" bb="-0.0001771" vb="1.0004148"/>
++            <tca model="poly3" focal="15" br="0.0000901" vr="1.0004739" bb="-0.0000734" vb="1.0004506"/>
++            <tca model="poly3" focal="15" br="0.0001052" vr="1.0004582" bb="-0.0000700" vb="1.0004424"/>
++            <tca model="poly3" focal="15" br="0.0001196" vr="1.0004310" bb="-0.0000908" vb="1.0004670"/>
++            <tca model="poly3" focal="18" br="0.0001710" vr="1.0002351" bb="-0.0000676" vb="1.0003208"/>
++            <tca model="poly3" focal="18" br="0.0001998" vr="1.0001989" bb="-0.0000551" vb="1.0002972"/>
++            <tca model="poly3" focal="18" br="0.0002004" vr="1.0001907" bb="-0.0000672" vb="1.0003084"/>
++            <tca model="poly3" focal="22" br="0.0002187" vr="1.0001159" bb="-0.0001002" vb="1.0002496"/>
++            <tca model="poly3" focal="22" br="0.0002200" vr="1.0001153" bb="-0.0000944" vb="1.0002600"/>
++            <tca model="poly3" focal="22" br="0.0002222" vr="1.0001016" bb="-0.0001145" vb="1.0002688"/>
++            <tca model="poly3" focal="26" br="0.0002792" vr="0.9999735" bb="-0.0001156" vb="1.0003080"/>
++            <tca model="poly3" focal="26" br="0.0002939" vr="0.9999418" bb="-0.0000956" vb="1.0002767"/>
++            <tca model="poly3" focal="26" br="0.0002973" vr="0.9999405" bb="-0.0001146" vb="1.0002992"/>
++            <tca model="poly3" focal="30" br="0.0002072" vr="0.9998717" bb="-0.0001749" vb="1.0004954"/>
++            <tca model="poly3" focal="30" br="0.0002495" vr="0.9998295" bb="-0.0001372" vb="1.0004401"/>
++            <tca model="poly3" focal="30" br="0.0002527" vr="0.9998374" bb="-0.0001661" vb="1.0004878"/>
++            <tca model="poly3" focal="35" br="0.0001735" vr="0.9997893" bb="-0.0002156" vb="1.0006502"/>
++            <tca model="poly3" focal="35" br="0.0001856" vr="0.9997740" bb="-0.0002036" vb="1.0005955"/>
++            <tca model="poly3" focal="35" br="0.0002013" vr="0.9997600" bb="-0.0002229" vb="1.0006799"/>
++            <tca model="poly3" focal="40" br="0.0001250" vr="0.9998265" bb="-0.0002366" vb="1.0006687"/>
++            <tca model="poly3" focal="40" br="0.0001359" vr="0.9998189" bb="-0.0002446" vb="1.0006998"/>
++            <tca model="poly3" focal="40" br="0.0001907" vr="0.9997482" bb="-0.0002707" vb="1.0007475"/>
++            <tca model="poly3" focal="45" br="0.0001734" vr="0.9997963" bb="-0.0002222" vb="1.0006242"/>
++            <tca model="poly3" focal="45" br="0.0001800" vr="0.9997888" bb="-0.0002076" vb="1.0005887"/>
++            <tca model="poly3" focal="45" br="0.0001942" vr="0.9997736" bb="-0.0002343" vb="1.0006603"/>
++            <tca model="poly3" focal="50" br="0.0001414" vr="0.9998089" bb="-0.0002393" vb="1.0005384"/>
++            <tca model="poly3" focal="50" br="0.0001516" vr="0.9998080" bb="-0.0002719" vb="1.0005789"/>
++            <tca model="poly3" focal="50" br="0.0001784" vr="0.9997785" bb="-0.0002152" vb="1.0004737"/>
+         </calibration>
+     </lens>
+-
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.14-42mm F3.5-5.6</model>
++        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="14" k1="-0.079" />
+-            <distortion model="poly3" focal="18" k1="-0.036" />
+-            <distortion model="poly3" focal="25" k1="0.0004" />
+-            <distortion model="poly3" focal="30" k1="0.013" />
+-            <distortion model="poly3" focal="35" k1="0.014" />
+-            <distortion model="poly3" focal="42" k1="0.012" />
+-            <tca model="poly3" focal="14" br="0.0002632" vr="1.0002908" bb="-0.0003817" vb="1.0" />
+-            <tca model="poly3" focal="18" br="-0.0000326" vr="1.0004544" bb="-0.0003189" vb="1.0007081" />
+-            <tca model="poly3" focal="25" br="-0.0001613" vr="1.0005611" bb="-0.0001126" vb="1.0004058" />
+-            <tca model="poly3" focal="30" br="-0.0002418" vr="1.0006295" bb="-0.0000052" vb="1.0002145" />
+-            <tca model="poly3" focal="35" br="-0.0002539" vr="1.0006484" bb="0.0000470" vb="1.0000846" />
+-            <tca model="poly3" focal="42" br="-0.0002029" vr="1.0006187" bb="0.0001236" vb="0.9999271" />
++            <distortion model="poly3" focal="14" k1="-0.079"/>
++            <distortion model="poly3" focal="18" k1="-0.036"/>
++            <distortion model="poly3" focal="25" k1="0.0004"/>
++            <distortion model="poly3" focal="30" k1="0.013"/>
++            <distortion model="poly3" focal="35" k1="0.014"/>
++            <distortion model="poly3" focal="42" k1="0.012"/>
++            <tca model="poly3" focal="14" br="0.0002632" vr="1.0002908" bb="-0.0003817" vb="1.0"/>
++            <tca model="poly3" focal="18" br="-0.0000326" vr="1.0004544" bb="-0.0003189" vb="1.0007081"/>
++            <tca model="poly3" focal="25" br="-0.0001613" vr="1.0005611" bb="-0.0001126" vb="1.0004058"/>
++            <tca model="poly3" focal="30" br="-0.0002418" vr="1.0006295" bb="-0.0000052" vb="1.0002145"/>
++            <tca model="poly3" focal="35" br="-0.0002539" vr="1.0006484" bb="0.0000470" vb="1.0000846"/>
++            <tca model="poly3" focal="42" br="-0.0002029" vr="1.0006187" bb="0.0001236" vb="0.9999271"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.14-42mm F3.5-5.6 L</model>
++        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 L</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal min="14" max="42"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <tca model="poly3" focal="14" br="0.0000600" vr="1.0001242" bb="-0.0002995" vb="1.0007041" />
+-            <tca model="poly3" focal="18" br="0.0001267" vr="1.0000281" bb="-0.0001852" vb="1.0007117" />
+-            <tca model="poly3" focal="25" br="-0.0000200" vr="1.0001315" bb="0.0001459" vb="1.0002999" />
+-            <tca model="poly3" focal="35" br="-0.0001014" vr="1.0002742" bb="0.0000318" vb="1.0002395" />
+-            <tca model="poly3" focal="42" br="-0.0001526" vr="1.0004259" bb="0.0001596" vb="1.0000256" />
+-            <distortion model="ptlens" focal="13.56" a="0.10558" b="-0.3175" c="0.19816" />
+-            <distortion model="ptlens" focal="16.49" a="0.0738" b="-0.25191" c="0.21409" />
+-            <distortion model="ptlens" focal="24.40" a="-0.01895" b="0.05672" c="-0.05355" />
+-            <distortion model="ptlens" focal="34.28" a="0.00451" b="-0.00716" c="0.02727" />
+-            <distortion model="ptlens" focal="41.01" a="-0.00173" b="0.01774" c="0.00339" />
++            <tca model="poly3" focal="14" br="0.0000600" vr="1.0001242" bb="-0.0002995" vb="1.0007041"/>
++            <tca model="poly3" focal="18" br="0.0001267" vr="1.0000281" bb="-0.0001852" vb="1.0007117"/>
++            <tca model="poly3" focal="25" br="-0.0000200" vr="1.0001315" bb="0.0001459" vb="1.0002999"/>
++            <tca model="poly3" focal="35" br="-0.0001014" vr="1.0002742" bb="0.0000318" vb="1.0002395"/>
++            <tca model="poly3" focal="42" br="-0.0001526" vr="1.0004259" bb="0.0001596" vb="1.0000256"/>
++            <distortion model="ptlens" focal="13.56" a="0.10558" b="-0.3175" c="0.19816"/>
++            <distortion model="ptlens" focal="16.49" a="0.0738" b="-0.25191" c="0.21409"/>
++            <distortion model="ptlens" focal="24.40" a="-0.01895" b="0.05672" c="-0.05355"/>
++            <distortion model="ptlens" focal="34.28" a="0.00451" b="-0.00716" c="0.02727"/>
++            <distortion model="ptlens" focal="41.01" a="-0.00173" b="0.01774" c="0.00339"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-	<model>OLYMPUS M.14-42mm F3.5-5.6 II</model>
++        <model>Olympus M.Zuiko Digital 14-42mm f/3.5-5.6 II</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014" />
+-            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021" />
+-            <distortion model="ptlens" focal="25" a="0.0" b="-0.012" c="0.008" />
+-            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003" />
+-            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018" />
+-            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010" />
++            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014"/>
++            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021"/>
++            <distortion model="ptlens" focal="25" a="0" b="-0.012" c="0.008"/>
++            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003"/>
++            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018"/>
++            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010"/>
+             <tca model="poly3" focal="14" br="0.0000882" vr="1.0001828" bb="0.0002104" vb="1.0004280"/>
+             <tca model="poly3" focal="18" br="0.0000087" vr="1.0000985" bb="-0.0001260" vb="1.0002535"/>
+             <tca model="poly3" focal="25" br="-0.0000210" vr="1.0001388" bb="-0.0001294" vb="1.0005537"/>
+@@ -242,236 +276,662 @@
+             <tca model="poly3" focal="42" br="-0.0000752" vr="1.0003152" bb="-0.0000213" vb="1.0001196"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.14-42mm F3.5-5.6 II R</model>
++        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 II R</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014" />
+-            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021" />
+-            <distortion model="ptlens" focal="25" a="0.0" b="-0.012" c="0.008" />
+-            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003" />
+-            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018" />
+-            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010" />
++            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014"/>
++            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021"/>
++            <distortion model="ptlens" focal="25" a="0" b="-0.012" c="0.008"/>
++            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003"/>
++            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018"/>
++            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010"/>
+             <tca model="poly3" focal="14" br="0.0000882" vr="1.0001828" bb="0.0002104" vb="1.0004280"/>
+             <tca model="poly3" focal="18" br="0.0000087" vr="1.0000985" bb="-0.0001260" vb="1.0002535"/>
+             <tca model="poly3" focal="25" br="-0.0000210" vr="1.0001388" bb="-0.0001294" vb="1.0005537"/>
+             <tca model="poly3" focal="30" br="-0.0000429" vr="1.0002040" bb="0.0000872" vb="1.0002187"/>
+             <tca model="poly3" focal="35" br="-0.0001262" vr="1.0003653" bb="-0.0000270" vb="1.0003605"/>
+             <tca model="poly3" focal="42" br="-0.0000752" vr="1.0003152" bb="-0.0000213" vb="1.0001196"/>
++            <!-- Taken with Olympus PEN E-PL3  -->
++            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.2618" k2="-0.5226" k3="0.1669"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.2618" k2="-0.5226" k3="0.1669"/>
++            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.2661" k2="-0.1267" k3="-0.1413"/>
++            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.2661" k2="-0.1267" k3="-0.1413"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.4324" k2="0.5192" k3="-0.5239"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4324" k2="0.5192" k3="-0.5239"/>
++            <vignetting model="pa" focal="14" aperture="6.3" distance="10" k1="-0.4329" k2="0.5300" k3="-0.4875"/>
++            <vignetting model="pa" focal="14" aperture="6.3" distance="1000" k1="-0.4329" k2="0.5300" k3="-0.4875"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.3966" k2="0.2349" k3="-0.1238"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3966" k2="0.2349" k3="-0.1238"/>
++            <vignetting model="pa" focal="21" aperture="4.1" distance="10" k1="-0.0965" k2="-0.9250" k3="0.5590"/>
++            <vignetting model="pa" focal="21" aperture="4.1" distance="1000" k1="-0.0965" k2="-0.9250" k3="0.5590"/>
++            <vignetting model="pa" focal="21" aperture="5" distance="10" k1="-0.1010" k2="-0.5931" k3="0.2620"/>
++            <vignetting model="pa" focal="21" aperture="5" distance="1000" k1="-0.1010" k2="-0.5931" k3="0.2620"/>
++            <vignetting model="pa" focal="21" aperture="6.3" distance="10" k1="-0.2687" k2="0.1273" k3="-0.2234"/>
++            <vignetting model="pa" focal="21" aperture="6.3" distance="1000" k1="-0.2687" k2="0.1273" k3="-0.2234"/>
++            <vignetting model="pa" focal="21" aperture="7.1" distance="10" k1="-0.3345" k2="0.3032" k3="-0.2916"/>
++            <vignetting model="pa" focal="21" aperture="7.1" distance="1000" k1="-0.3345" k2="0.3032" k3="-0.2916"/>
++            <vignetting model="pa" focal="21" aperture="22" distance="10" k1="-0.2662" k2="0.0139" k3="0.0211"/>
++            <vignetting model="pa" focal="21" aperture="22" distance="1000" k1="-0.2662" k2="0.0139" k3="0.0211"/>
++            <vignetting model="pa" focal="28" aperture="4.6" distance="10" k1="-0.0105" k2="-0.8787" k3="0.4778"/>
++            <vignetting model="pa" focal="28" aperture="4.6" distance="1000" k1="-0.0105" k2="-0.8787" k3="0.4778"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.0826" k2="-0.4127" k3="0.1303"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.0826" k2="-0.4127" k3="0.1303"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="10" k1="-0.1589" k2="-0.1101" k3="-0.0735"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.1589" k2="-0.1101" k3="-0.0735"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2761" k2="0.2615" k3="-0.2631"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2761" k2="0.2615" k3="-0.2631"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2455" k2="0.0395" k3="0.0035"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2455" k2="0.0395" k3="0.0035"/>
++            <vignetting model="pa" focal="35" aperture="5.2" distance="10" k1="0.0071" k2="-0.8165" k3="0.4255"/>
++            <vignetting model="pa" focal="35" aperture="5.2" distance="1000" k1="0.0071" k2="-0.8165" k3="0.4255"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.0293" k2="-0.4632" k3="0.1419"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.0293" k2="-0.4632" k3="0.1419"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1390" k2="-0.0683" k3="-0.1162"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1390" k2="-0.0683" k3="-0.1162"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1955" k2="0.1649" k3="-0.2496"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1955" k2="0.1649" k3="-0.2496"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1874" k2="-0.0217" k3="0.0399"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1874" k2="-0.0217" k3="0.0399"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="10" k1="-0.1727" k2="-0.3576" k3="0.1560"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.1727" k2="-0.3576" k3="0.1560"/>
++            <vignetting model="pa" focal="42" aperture="6.3" distance="10" k1="0.0412" k2="-0.7054" k3="0.3133"/>
++            <vignetting model="pa" focal="42" aperture="6.3" distance="1000" k1="0.0412" k2="-0.7054" k3="0.3133"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="10" k1="-0.1253" k2="0.0027" k3="-0.1655"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.1253" k2="0.0027" k3="-0.1655"/>
++            <vignetting model="pa" focal="42" aperture="9" distance="10" k1="-0.1875" k2="0.1948" k3="-0.2627"/>
++            <vignetting model="pa" focal="42" aperture="9" distance="1000" k1="-0.1875" k2="0.1948" k3="-0.2627"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="10" k1="-0.1455" k2="-0.0510" k3="0.0470"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1455" k2="-0.0510" k3="0.0470"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Olympus</maker>
+-	    <model>OLYMPUS M.14-150mm F4.0-5.6</model>
+-	    <focal min="14" max="150" />
+-	    <aperture min="4" max="5.6" />
+-	    <aperture>4-22</aperture>
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="14" model="ptlens" a="0.0188691" b="-0.0734975" c="0.0114623" />
+-            <distortion focal="25" model="ptlens" a="-0.0101877" b="0.0257528" c="-0.0226344" />
+-	        <distortion focal="45" model="ptlens" a="-0.0094443" b="0.0311439" c="-0.0196775" />
+-	        <distortion focal="70" model="ptlens" a="0.00389548" b="-0.00256133" c="0.00668901" />
+-	        <distortion focal="100" model="ptlens" a="-0.00317114" b="0.0149587" c="-0.00860884" />
+-	        <distortion focal="150" model="ptlens" a="-0.00218749" b="0.0145162" c="-0.00842408" />
+-	        <tca model="poly3" focal="14" br="0.0001674" vr="1.0005298" bb="0.0000441" vb="0.9998478" />
+-            <tca model="poly3" focal="25" br="-0.0000789" vr="1.0002537" bb="-0.0000285" vb="1.0000552" />
+-            <tca model="poly3" focal="45" br="0.0000404" vr="0.9998261" bb="-0.0000489" vb="1.0002042" />
+-            <tca model="poly3" focal="70" br="0.0000554" vr="0.9992661" bb="-0.0001090" vb="1.0005723" />
+-            <tca model="poly3" focal="100" br="0.0000476" vr="0.9991092" bb="-0.0000076" vb="1.0003522" />
+-            <tca model="poly3" focal="150" br="0.0000531" vr="0.9991318" bb="-0.0000424" vb="1.0001241" />
+-	        <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.3182" k2="0.1259" k3="-0.5945" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="-0.2255" k2="-0.3591" k3="-0.1541" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="-0.2704" k2="-0.2630" k3="-0.2081" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.2705" k2="-0.2775" k3="-0.1900" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4740" k2="0.9221" k3="-1.1605" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.3744" k2="0.4030" k3="-0.6734" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4226" k2="0.4843" k3="-0.7001" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4294" k2="0.4949" k3="-0.6982" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.6059" k2="1.3512" k3="-1.3494" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.4786" k2="0.7059" k3="-0.7501" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5353" k2="0.8132" k3="-0.7970" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5226" k2="0.7598" k3="-0.7426" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.5533" k2="1.1048" k3="-1.0602" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.4018" k2="0.3474" k3="-0.3561" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.4555" k2="0.4608" k3="-0.4160" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.4670" k2="0.4808" k3="-0.4196" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.4692" k2="0.7888" k3="-0.7810" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.2996" k2="-0.0524" k3="0.0021" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.3475" k2="0.0488" k3="-0.0514" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3693" k2="0.1029" k3="-0.0821" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.2590" k2="0.4378" k3="-0.4580" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.2916" k2="0.4755" k3="-0.4598" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.3084" k2="0.4201" k3="-0.4025" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.3353" k2="0.4940" k3="-0.4523" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.2510" k2="0.3160" k3="-0.2831" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.2578" k2="0.3092" k3="-0.2596" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.2874" k2="0.3027" k3="-0.2428" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2704" k2="0.2029" k3="-0.1278" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1619" k2="-0.0233" k3="0.0236" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.1776" k2="-0.0059" k3="0.0273" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.2094" k2="0.0028" k3="0.0297" />
+-	        <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2326" k2="0.0535" k3="0.0043" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1530" k2="-0.0685" k3="0.0621" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.1689" k2="-0.0354" k3="0.0494" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1853" k2="-0.0649" k3="0.0771" />
+-	        <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.2236" k2="0.0224" k3="0.0265" />            		
+-	        <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1408" k2="-0.0969" k3="0.0747" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1598" k2="-0.0568" k3="0.0580" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1676" k2="-0.0997" k3="0.0919" />
+-	        <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2119" k2="-0.0016" k3="0.0337" />            		
+-	        <vignetting model="pa" focal="45" aperture="5.4" distance="0.5" k1="-0.1442" k2="0.0203" k3="0.0013" />
+-            <vignetting model="pa" focal="45" aperture="5.4" distance="1" k1="-0.1477" k2="0.1333" k3="-0.1100" />
+-            <vignetting model="pa" focal="45" aperture="5.4" distance="3" k1="-0.1989" k2="0.1942" k3="-0.1438" />
+-            <vignetting model="pa" focal="45" aperture="5.4" distance="1000" k1="-0.1883" k2="0.1766" k3="-0.1385" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="0.5" k1="-0.1351" k2="0.0038" k3="0.0093" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="1" k1="-0.1452" k2="0.1218" k3="-0.1011" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="3" k1="-0.2003" k2="0.1978" k3="-0.1453" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.1959" k2="0.1899" k3="-0.1452" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="0.5" k1="-0.1124" k2="-0.0659" k3="0.0628" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="1" k1="-0.1037" k2="-0.0438" k3="0.0442" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="3" k1="-0.1535" k2="0.0084" k3="0.0249" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.1279" k2="-0.0494" k3="0.0573" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="0.5" k1="-0.1115" k2="-0.0835" k3="0.0769" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="1" k1="-0.1003" k2="-0.0511" k3="0.0481" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="3" k1="-0.1472" k2="-0.0068" k3="0.0332" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.1206" k2="-0.0643" k3="0.0650" />
+-            <vignetting model="pa" focal="45" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0921" k3="0.0824" />
+-            <vignetting model="pa" focal="45" aperture="16" distance="1" k1="-0.0945" k2="-0.0671" k3="0.0556" />
+-            <vignetting model="pa" focal="45" aperture="16" distance="3" k1="-0.1402" k2="-0.0238" k3="0.0424" />
+-            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.1068" k2="-0.0931" k3="0.0804" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1114" k2="-0.0924" k3="0.0828" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.0842" k2="-0.0892" k3="0.0680" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1406" k2="-0.0179" k3="0.0358" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1003" k2="-0.1075" k3="0.0880" />
+-            <vignetting model="pa" focal="70" aperture="5.4" distance="0.5" k1="-0.3127" k2="0.9207" k3="-0.9547" />
+-            <vignetting model="pa" focal="70" aperture="5.4" distance="1" k1="-0.1916" k2="0.5619" k3="-0.7221" />
+-            <vignetting model="pa" focal="70" aperture="5.4" distance="3" k1="-0.1673" k2="0.4276" k3="-0.6145" />
+-            <vignetting model="pa" focal="70" aperture="5.4" distance="1000" k1="-0.1116" k2="0.2834" k3="-0.5272" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="0.5" k1="-0.3309" k2="0.9468" k3="-0.9535" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="1" k1="-0.2045" k2="0.5835" k3="-0.7182" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="3" k1="-0.1873" k2="0.4801" k3="-0.6323" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1286" k2="0.3422" k3="-0.5557" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.2932" k2="0.7073" k3="-0.6462" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.2362" k2="0.5712" k3="-0.5553" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.2512" k2="0.5914" k3="-0.5567" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2137" k2="0.5395" k3="-0.5471" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.1840" k2="0.2555" k3="-0.2231" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="-0.1320" k2="0.1352" k3="-0.1348" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.1599" k2="0.1927" k3="-0.1595" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1183" k2="0.1309" k3="-0.1390" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0228" k3="0.0236" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="-0.0678" k2="-0.0941" k3="0.0652" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.1071" k2="-0.0078" k3="0.0202" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0546" k2="-0.0981" k3="0.0624" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.1010" k2="-0.0595" k3="0.0536" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0601" k2="-0.1137" k3="0.0786" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.1035" k2="-0.0211" k3="0.0298" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0494" k2="-0.1136" k3="0.0727" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="0.5" k1="-0.2273" k2="0.7085" k3="-0.9193" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="0.0783" k2="-0.3650" k3="-0.1316" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="0.1008" k2="-0.5429" k3="0.0399" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="0.1655" k2="-0.8375" k3="0.2623" />
+-	        <vignetting model="pa" focal="100" aperture="8" distance="0.5" k1="-0.3503" k2="1.0560" k3="-1.0632" />            		
+-	        <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.1643" k2="0.4936" k3="-0.6717" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1918" k2="0.4916" k3="-0.6128" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1113" k2="0.2360" k3="-0.4604" />
+-	        <vignetting model="pa" focal="100" aperture="11" distance="0.5" k1="-0.3308" k2="0.9217" k3="-0.8725" />            		
+-	        <vignetting model="pa" focal="100" aperture="11" distance="1" k1="-0.2262" k2="0.5889" k3="-0.5886" />
+-	        <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.2518" k2="0.5771" k3="-0.5419" />            		
+-	        <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.2299" k2="0.5245" k3="-0.5068" />
+-	        <vignetting model="pa" focal="100" aperture="16" distance="0.5" k1="-0.2422" k2="0.5401" k3="-0.4935" />            		
+-	        <vignetting model="pa" focal="100" aperture="16" distance="1" k1="-0.1143" k2="0.1311" k3="-0.1430" />
+-	        <vignetting model="pa" focal="100" aperture="16" distance="3" k1="-0.1446" k2="0.1239" k3="-0.0974" />            		
+-	        <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1284" k2="0.0913" k3="-0.0781" />
+-	        <vignetting model="pa" focal="100" aperture="22" distance="0.5" k1="-0.1258" k2="0.0860" k3="-0.0832" />            		
+-	        <vignetting model="pa" focal="100" aperture="22" distance="1" k1="-0.0548" k2="-0.1004" k3="0.0632" />
+-	        <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1120" k2="-0.0107" k3="0.0253" />            		
+-	        <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0933" k2="-0.0404" k3="0.0389" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="0.5" k1="0.0272" k2="-0.1292" k3="-0.3733" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1" k1="0.2704" k2="-1.3992" k3="0.6819" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1042" k2="-1.3875" k3="0.8383" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0398" k2="-1.2995" k3="0.8145" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="0.5" k1="-0.2197" k2="0.7304" k3="-0.9151" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1" k1="0.0500" k2="-0.2273" k3="-0.2014" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="0.1392" k2="-0.6833" k3="0.1755" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="0.1615" k2="-0.7998" k3="0.2693" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="0.5" k1="-0.3191" k2="0.9724" k3="-0.9732" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1" k1="-0.1815" k2="0.5374" k3="-0.6391" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.1405" k2="0.3368" k3="-0.4674" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.1242" k2="0.2821" k3="-0.4309" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="0.5" k1="-0.2632" k2="0.6883" k3="-0.6477" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="1" k1="-0.1667" k2="0.3791" k3="-0.3790" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="3" k1="-0.1528" k2="0.2632" k3="-0.2588" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.1516" k2="0.2625" k3="-0.2597" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="0.5" k1="-0.1287" k2="0.1610" k3="-0.1651" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1" k1="-0.0569" k2="-0.0503" k3="0.0160" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0646" k2="-0.0816" k3="0.0582" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0543" k2="-0.0933" k3="0.0628" />
+-	    </calibration>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 14-150mm f/4.0-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <focal min="14" max="150"/>
++        <aperture min="4" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="14" model="ptlens" a="0.0188691" b="-0.0734975" c="0.0114623"/>
++            <distortion focal="25" model="ptlens" a="-0.0101877" b="0.0257528" c="-0.0226344"/>
++            <distortion focal="45" model="ptlens" a="-0.0094443" b="0.0311439" c="-0.0196775"/>
++            <distortion focal="70" model="ptlens" a="0.00389548" b="-0.00256133" c="0.00668901"/>
++            <distortion focal="100" model="ptlens" a="-0.00317114" b="0.0149587" c="-0.00860884"/>
++            <distortion focal="150" model="ptlens" a="-0.00218749" b="0.0145162" c="-0.00842408"/>
++            <tca model="poly3" focal="14" br="0.0001674" vr="1.0005298" bb="0.0000441" vb="0.9998478"/>
++            <tca model="poly3" focal="25" br="-0.0000789" vr="1.0002537" bb="-0.0000285" vb="1.0000552"/>
++            <tca model="poly3" focal="45" br="0.0000404" vr="0.9998261" bb="-0.0000489" vb="1.0002042"/>
++            <tca model="poly3" focal="70" br="0.0000554" vr="0.9992661" bb="-0.0001090" vb="1.0005723"/>
++            <tca model="poly3" focal="100" br="0.0000476" vr="0.9991092" bb="-0.0000076" vb="1.0003522"/>
++            <tca model="poly3" focal="150" br="0.0000531" vr="0.9991318" bb="-0.0000424" vb="1.0001241"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.3182" k2="0.1259" k3="-0.5945"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="-0.2255" k2="-0.3591" k3="-0.1541"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="-0.2704" k2="-0.2630" k3="-0.2081"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.2705" k2="-0.2775" k3="-0.1900"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4740" k2="0.9221" k3="-1.1605"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.3744" k2="0.4030" k3="-0.6734"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4226" k2="0.4843" k3="-0.7001"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4294" k2="0.4949" k3="-0.6982"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.6059" k2="1.3512" k3="-1.3494"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.4786" k2="0.7059" k3="-0.7501"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5353" k2="0.8132" k3="-0.7970"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5226" k2="0.7598" k3="-0.7426"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.5533" k2="1.1048" k3="-1.0602"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.4018" k2="0.3474" k3="-0.3561"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.4555" k2="0.4608" k3="-0.4160"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.4670" k2="0.4808" k3="-0.4196"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.4692" k2="0.7888" k3="-0.7810"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.2996" k2="-0.0524" k3="0.0021"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.3475" k2="0.0488" k3="-0.0514"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3693" k2="0.1029" k3="-0.0821"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.2590" k2="0.4378" k3="-0.4580"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.2916" k2="0.4755" k3="-0.4598"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.3084" k2="0.4201" k3="-0.4025"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.3353" k2="0.4940" k3="-0.4523"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.2510" k2="0.3160" k3="-0.2831"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.2578" k2="0.3092" k3="-0.2596"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.2874" k2="0.3027" k3="-0.2428"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2704" k2="0.2029" k3="-0.1278"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1619" k2="-0.0233" k3="0.0236"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.1776" k2="-0.0059" k3="0.0273"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.2094" k2="0.0028" k3="0.0297"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2326" k2="0.0535" k3="0.0043"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1530" k2="-0.0685" k3="0.0621"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.1689" k2="-0.0354" k3="0.0494"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1853" k2="-0.0649" k3="0.0771"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.2236" k2="0.0224" k3="0.0265"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1408" k2="-0.0969" k3="0.0747"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1598" k2="-0.0568" k3="0.0580"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1676" k2="-0.0997" k3="0.0919"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2119" k2="-0.0016" k3="0.0337"/>
++            <vignetting model="pa" focal="45" aperture="5.4" distance="0.5" k1="-0.1442" k2="0.0203" k3="0.0013"/>
++            <vignetting model="pa" focal="45" aperture="5.4" distance="1" k1="-0.1477" k2="0.1333" k3="-0.1100"/>
++            <vignetting model="pa" focal="45" aperture="5.4" distance="3" k1="-0.1989" k2="0.1942" k3="-0.1438"/>
++            <vignetting model="pa" focal="45" aperture="5.4" distance="1000" k1="-0.1883" k2="0.1766" k3="-0.1385"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="0.5" k1="-0.1351" k2="0.0038" k3="0.0093"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1" k1="-0.1452" k2="0.1218" k3="-0.1011"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="3" k1="-0.2003" k2="0.1978" k3="-0.1453"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.1959" k2="0.1899" k3="-0.1452"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="0.5" k1="-0.1124" k2="-0.0659" k3="0.0628"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="1" k1="-0.1037" k2="-0.0438" k3="0.0442"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="3" k1="-0.1535" k2="0.0084" k3="0.0249"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.1279" k2="-0.0494" k3="0.0573"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="0.5" k1="-0.1115" k2="-0.0835" k3="0.0769"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1" k1="-0.1003" k2="-0.0511" k3="0.0481"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="3" k1="-0.1472" k2="-0.0068" k3="0.0332"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.1206" k2="-0.0643" k3="0.0650"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0921" k3="0.0824"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="1" k1="-0.0945" k2="-0.0671" k3="0.0556"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="3" k1="-0.1402" k2="-0.0238" k3="0.0424"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.1068" k2="-0.0931" k3="0.0804"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1114" k2="-0.0924" k3="0.0828"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.0842" k2="-0.0892" k3="0.0680"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1406" k2="-0.0179" k3="0.0358"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1003" k2="-0.1075" k3="0.0880"/>
++            <vignetting model="pa" focal="70" aperture="5.4" distance="0.5" k1="-0.3127" k2="0.9207" k3="-0.9547"/>
++            <vignetting model="pa" focal="70" aperture="5.4" distance="1" k1="-0.1916" k2="0.5619" k3="-0.7221"/>
++            <vignetting model="pa" focal="70" aperture="5.4" distance="3" k1="-0.1673" k2="0.4276" k3="-0.6145"/>
++            <vignetting model="pa" focal="70" aperture="5.4" distance="1000" k1="-0.1116" k2="0.2834" k3="-0.5272"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.5" k1="-0.3309" k2="0.9468" k3="-0.9535"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1" k1="-0.2045" k2="0.5835" k3="-0.7182"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="3" k1="-0.1873" k2="0.4801" k3="-0.6323"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1286" k2="0.3422" k3="-0.5557"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.2932" k2="0.7073" k3="-0.6462"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.2362" k2="0.5712" k3="-0.5553"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.2512" k2="0.5914" k3="-0.5567"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2137" k2="0.5395" k3="-0.5471"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.1840" k2="0.2555" k3="-0.2231"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="-0.1320" k2="0.1352" k3="-0.1348"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.1599" k2="0.1927" k3="-0.1595"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1183" k2="0.1309" k3="-0.1390"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0228" k3="0.0236"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="-0.0678" k2="-0.0941" k3="0.0652"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.1071" k2="-0.0078" k3="0.0202"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0546" k2="-0.0981" k3="0.0624"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.1010" k2="-0.0595" k3="0.0536"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0601" k2="-0.1137" k3="0.0786"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.1035" k2="-0.0211" k3="0.0298"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0494" k2="-0.1136" k3="0.0727"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.5" k1="-0.2273" k2="0.7085" k3="-0.9193"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="0.0783" k2="-0.3650" k3="-0.1316"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="0.1008" k2="-0.5429" k3="0.0399"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="0.1655" k2="-0.8375" k3="0.2623"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.5" k1="-0.3503" k2="1.0560" k3="-1.0632"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.1643" k2="0.4936" k3="-0.6717"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1918" k2="0.4916" k3="-0.6128"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1113" k2="0.2360" k3="-0.4604"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.5" k1="-0.3308" k2="0.9217" k3="-0.8725"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1" k1="-0.2262" k2="0.5889" k3="-0.5886"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.2518" k2="0.5771" k3="-0.5419"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.2299" k2="0.5245" k3="-0.5068"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.5" k1="-0.2422" k2="0.5401" k3="-0.4935"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1" k1="-0.1143" k2="0.1311" k3="-0.1430"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="3" k1="-0.1446" k2="0.1239" k3="-0.0974"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1284" k2="0.0913" k3="-0.0781"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.5" k1="-0.1258" k2="0.0860" k3="-0.0832"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1" k1="-0.0548" k2="-0.1004" k3="0.0632"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1120" k2="-0.0107" k3="0.0253"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0933" k2="-0.0404" k3="0.0389"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="0.5" k1="0.0272" k2="-0.1292" k3="-0.3733"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1" k1="0.2704" k2="-1.3992" k3="0.6819"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1042" k2="-1.3875" k3="0.8383"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0398" k2="-1.2995" k3="0.8145"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="0.5" k1="-0.2197" k2="0.7304" k3="-0.9151"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1" k1="0.0500" k2="-0.2273" k3="-0.2014"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="0.1392" k2="-0.6833" k3="0.1755"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="0.1615" k2="-0.7998" k3="0.2693"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="0.5" k1="-0.3191" k2="0.9724" k3="-0.9732"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1" k1="-0.1815" k2="0.5374" k3="-0.6391"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.1405" k2="0.3368" k3="-0.4674"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.1242" k2="0.2821" k3="-0.4309"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="0.5" k1="-0.2632" k2="0.6883" k3="-0.6477"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="1" k1="-0.1667" k2="0.3791" k3="-0.3790"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="3" k1="-0.1528" k2="0.2632" k3="-0.2588"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.1516" k2="0.2625" k3="-0.2597"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="0.5" k1="-0.1287" k2="0.1610" k3="-0.1651"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1" k1="-0.0569" k2="-0.0503" k3="0.0160"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0646" k2="-0.0816" k3="0.0582"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0543" k2="-0.0933" k3="0.0628"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.17mm F2.8</model>
++        <model>Olympus M.Zuiko Digital 17mm f/2.8 Pancake</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-             <distortion model="ptlens" focal="17" a="0.00835" b="-0.04149" c="-0.0022" />
+-             <tca model="poly3" focal="17" br="-0.0004492" vr="1.0016410" bb="0.0005749" vb="0.9989794" />
++            <distortion model="ptlens" focal="17" a="0.00835" b="-0.04149" c="-0.0022"/>
++            <tca model="poly3" focal="17" br="-0.0004492" vr="1.0016410" bb="0.0005749" vb="0.9989794"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.45mm F1.8</model>
+-	    <focal value="45" />
+-	    <aperture min="1.8" max="22" />
++        <model>Olympus M.Zuiko Digital 45mm f/1.8</model>
++        <mount>Micro 4/3 System</mount>
++        <focal value="45"/>
++        <aperture min="1.8" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="45" a="0.00149954" b="-0.0023693" c="0.00382496"/>
++            <tca model="poly3" focal="45" br="-0.0000129" vr="1.0001904" bb="0.0000108" vb="0.9999203"/>
++            <tca model="poly3" focal="45" br="-0.0000440" vr="1.0002771" bb="0.0000282" vb="0.9998497"/>
++            <tca model="poly3" focal="45" br="-0.0000484" vr="1.0001937" bb="0.0000056" vb="0.9999340"/>
++            <vignetting model="pa" focal="45" aperture="1.8" distance="0.5" k1="-0.1316" k2="-0.3770" k3="0.2472"/>
++            <vignetting model="pa" focal="45" aperture="1.8" distance="1" k1="-0.2255" k2="-0.1345" k3="0.0659"/>
++            <vignetting model="pa" focal="45" aperture="1.8" distance="3" k1="-0.2785" k2="-0.0510" k3="0.0102"/>
++            <vignetting model="pa" focal="45" aperture="1.8" distance="1000" k1="-0.3385" k2="0.0596" k3="-0.0582"/>
++            <vignetting model="pa" focal="45" aperture="2" distance="0.5" k1="-0.1464" k2="-0.0489" k3="0.0091"/>
++            <vignetting model="pa" focal="45" aperture="2" distance="1" k1="-0.1200" k2="0.0168" k3="-0.1094"/>
++            <vignetting model="pa" focal="45" aperture="2" distance="3" k1="-0.0571" k2="-0.1512" k3="-0.0265"/>
++            <vignetting model="pa" focal="45" aperture="2" distance="1000" k1="-0.0080" k2="-0.3083" k3="0.0663"/>
++            <vignetting model="pa" focal="45" aperture="2.8" distance="0.5" k1="-0.1506" k2="-0.0366" k3="0.0414"/>
++            <vignetting model="pa" focal="45" aperture="2.8" distance="1" k1="-0.1214" k2="-0.0310" k3="0.0366"/>
++            <vignetting model="pa" focal="45" aperture="2.8" distance="3" k1="-0.1069" k2="-0.0244" k3="0.0285"/>
++            <vignetting model="pa" focal="45" aperture="2.8" distance="1000" k1="-0.1093" k2="0.0134" k3="-0.0044"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="0.5" k1="-0.1576" k2="-0.0189" k3="0.0303"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="1" k1="-0.1232" k2="-0.0232" k3="0.0293"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="3" k1="-0.1091" k2="-0.0196" k3="0.0259"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.1000" k2="-0.0296" k3="0.0347"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1730" k2="0.0117" k3="0.0109"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.1578" k2="0.0464" k3="-0.0149"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1341" k2="0.0328" k3="-0.0102"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1288" k2="0.0174" k3="0.0038"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital 17mm f/1.8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M5 -->
++            <distortion model="ptlens" focal="17" a="0.01989" b="-0.09761" c="0.07461"/>
++            <tca model="poly3" focal="17" br="-0.0000767" vr="1.0002674" bb="0.0001410" vb="0.9997845"/>
++            <vignetting model="pa" focal="17" aperture="1.8" distance="0.25" k1="-0.7183" k2="-0.0334" k3="0.1648"/>
++            <vignetting model="pa" focal="17" aperture="1.8" distance="1.5" k1="-0.7165" k2="-0.1724" k3="0.2618"/>
++            <vignetting model="pa" focal="17" aperture="1.8" distance="1000" k1="-0.8358" k2="-0.0614" k3="0.2354"/>
++            <vignetting model="pa" focal="17" aperture="2" distance="0.25" k1="-0.3115" k2="-0.6889" k3="0.4766"/>
++            <vignetting model="pa" focal="17" aperture="2" distance="1.5" k1="-0.2970" k2="-0.8478" k3="0.5771"/>
++            <vignetting model="pa" focal="17" aperture="2" distance="1000" k1="-0.3481" k2="-0.8816" k3="0.6316"/>
++            <vignetting model="pa" focal="17" aperture="2.2" distance="0.25" k1="-0.1491" k2="-0.7597" k3="0.4550"/>
++            <vignetting model="pa" focal="17" aperture="2.2" distance="1.5" k1="-0.1159" k2="-0.9493" k3="0.5634"/>
++            <vignetting model="pa" focal="17" aperture="2.2" distance="1000" k1="-0.2045" k2="-0.9180" k3="0.5843"/>
++            <vignetting model="pa" focal="17" aperture="2.5" distance="0.25" k1="-0.2264" k2="-0.3664" k3="0.1761"/>
++            <vignetting model="pa" focal="17" aperture="2.5" distance="1.5" k1="-0.1926" k2="-0.5268" k3="0.2468"/>
++            <vignetting model="pa" focal="17" aperture="2.5" distance="1000" k1="-0.2800" k2="-0.5238" k3="0.2880"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="0.25" k1="-0.3370" k2="-0.0253" k3="-0.0252"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1.5" k1="-0.3038" k2="-0.1389" k3="-0.0033"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.3778" k2="-0.1474" k3="0.0372"/>
++            <vignetting model="pa" focal="17" aperture="3.2" distance="0.25" k1="-0.3815" k2="0.0725" k3="-0.0496"/>
++            <vignetting model="pa" focal="17" aperture="3.2" distance="1.5" k1="-0.3886" k2="0.1099" k3="-0.1365"/>
++            <vignetting model="pa" focal="17" aperture="3.2" distance="1000" k1="-0.4707" k2="0.1251" k3="-0.1173"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="0.25" k1="-0.3773" k2="0.0195" k3="0.0247"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="1.5" k1="-0.4553" k2="0.2344" k3="-0.1723"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="1000" k1="-0.5163" k2="0.2343" k3="-0.1530"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="0.25" k1="-0.4121" k2="0.0466" k3="0.0323"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1.5" k1="-0.4343" k2="0.1261" k3="-0.0464"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.5086" k2="0.1563" k3="-0.0441"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="0.25" k1="-0.4649" k2="0.1401" k3="-0.0198"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1.5" k1="-0.4624" k2="0.1259" k3="-0.0118"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.5182" k2="0.0931" k3="0.0481"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="0.25" k1="-0.4844" k2="0.1729" k3="-0.0380"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1.5" k1="-0.4832" k2="0.1635" k3="-0.0335"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.5266" k2="0.0977" k3="0.0491"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="0.25" k1="-0.4755" k2="0.1492" k3="-0.0190"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="1.5" k1="-0.4916" k2="0.1791" k3="-0.0422"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-0.5175" k2="0.0858" k3="0.0561"/>
++            <vignetting model="pa" focal="17" aperture="16" distance="0.25" k1="-0.4908" k2="0.1684" k3="-0.0305"/>
++            <vignetting model="pa" focal="17" aperture="16" distance="1.5" k1="-0.4955" k2="0.1790" k3="-0.0402"/>
++            <vignetting model="pa" focal="17" aperture="16" distance="1000" k1="-0.5293" k2="0.0991" k3="0.0478"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="0.25" k1="-0.5019" k2="0.1737" k3="-0.0320"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1.5" k1="-0.5138" k2="0.2068" k3="-0.0567"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.5351" k2="0.0973" k3="0.0501"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 40-150mm f/4.0-5.6 R</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M5 -->
++            <distortion model="poly3" focal="40" k1="-0.01246"/>
++            <distortion model="poly3" focal="45" k1="-0.01017"/>
++            <distortion model="poly3" focal="49" k1="-0.00887"/>
++            <distortion model="poly3" focal="58" k1="-0.00466"/>
++            <distortion model="poly3" focal="70" k1="-0.0008"/>
++            <distortion model="poly3" focal="85" k1="0.00099"/>
++            <distortion model="poly3" focal="102" k1="0.00206"/>
++            <distortion model="poly3" focal="114" k1="0.00409"/>
++            <distortion model="poly3" focal="123" k1="0.00465"/>
++            <distortion model="poly3" focal="138" k1="0.00293"/>
++            <distortion model="poly3" focal="150" k1="0.00365"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 9-18mm f/4.0-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M5 -->
++            <distortion model="ptlens" focal="9" a="-0.00243" b="-0.05248" c="0.0576"/>
++            <distortion model="ptlens" focal="10" a="-0.01843" b="0.00876" c="0.00143"/>
++            <distortion model="ptlens" focal="13" a="-0.00767" b="0.0044" c="0.00695"/>
++            <distortion model="ptlens" focal="14" a="-0.00643" b="0.0062" c="0.0044"/>
++            <distortion model="ptlens" focal="16" a="-0.0036" b="0.00137" c="0.00803"/>
++            <distortion model="ptlens" focal="18" a="0.0014" b="-0.00822" c="0.01145"/>
++            <tca model="poly3" focal="9" br="0.0002967" vr="1.0001617" bb="-0.0001941" vb="1.0002941"/>
++            <tca model="poly3" focal="10" br="0.0003830" vr="1.0000787" bb="-0.0002023" vb="1.0003066"/>
++            <tca model="poly3" focal="13" br="0.0004065" vr="0.9999052" bb="-0.0002830" vb="1.0004586"/>
++            <tca model="poly3" focal="14" br="0.0003393" vr="0.9999490" bb="-0.0002826" vb="1.0004648"/>
++            <tca model="poly3" focal="16" br="0.0002626" vr="1.0000189" bb="-0.0002668" vb="1.0004628"/>
++            <tca model="poly3" focal="18" br="0.0002269" vr="1.0000589" bb="-0.0002144" vb="1.0003623"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 12-40mm f/2.8 Pro</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M1 -->
++            <distortion model="ptlens" focal="12" a="0.03659" b="-0.11322" c="0.0294"/>
++            <distortion model="ptlens" focal="19" a="0.00375" b="-0.0151" c="-0.01028"/>
++            <distortion model="ptlens" focal="26" a="0" b="-0.00273" c="0"/>
++            <distortion model="ptlens" focal="32" a="0" b="0.00212" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.00408" c="0"/>
++            <tca model="poly3" focal="12" br="-0.0001355" vr="1.0004733" bb="0.0001043" vb="0.9998876"/>
++            <tca model="poly3" focal="19" br="0.0000135" vr="1.0003633" bb="-0.0000030" vb="0.9998815"/>
++            <tca model="poly3" focal="26" br="0.0000121" vr="1.0002821" bb="-0.0000102" vb="0.9998613"/>
++            <tca model="poly3" focal="32" br="-0.0000284" vr="1.0001670" bb="-0.0000205" vb="0.9999078"/>
++            <tca model="poly3" focal="40" br="0.0000001" vr="0.9999588" bb="-0.0000046" vb="0.9999736"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="0.0756" k2="-1.5826" k3="0.7487"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="0.0756" k2="-1.5826" k3="0.7487"/>
++            <vignetting model="pa" focal="12" aperture="3.2" distance="10" k1="0.0630" k2="-1.2737" k3="0.4842"/>
++            <vignetting model="pa" focal="12" aperture="3.2" distance="1000" k1="0.0630" k2="-1.2737" k3="0.4842"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.0572" k2="-0.7780" k3="0.1454"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.0572" k2="-0.7780" k3="0.1454"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.1791" k2="-0.3857" k3="-0.0892"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.1791" k2="-0.3857" k3="-0.0892"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.2169" k2="-0.4882" k3="0.1850"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.2169" k2="-0.4882" k3="0.1850"/>
++            <vignetting model="pa" focal="19" aperture="2.8" distance="10" k1="-0.6166" k2="-0.0955" k3="0.1820"/>
++            <vignetting model="pa" focal="19" aperture="2.8" distance="1000" k1="-0.6166" k2="-0.0955" k3="0.1820"/>
++            <vignetting model="pa" focal="19" aperture="3.2" distance="10" k1="-0.4959" k2="-0.1667" k3="0.1503"/>
++            <vignetting model="pa" focal="19" aperture="3.2" distance="1000" k1="-0.4959" k2="-0.1667" k3="0.1503"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="10" k1="-0.4709" k2="0.0159" k3="-0.0366"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="1000" k1="-0.4709" k2="0.0159" k3="-0.0366"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="10" k1="-0.5480" k2="0.4012" k3="-0.3216"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-0.5480" k2="0.4012" k3="-0.3216"/>
++            <vignetting model="pa" focal="19" aperture="22" distance="10" k1="-0.5561" k2="0.4662" k3="-0.2449"/>
++            <vignetting model="pa" focal="19" aperture="22" distance="1000" k1="-0.5561" k2="0.4662" k3="-0.2449"/>
++            <vignetting model="pa" focal="26" aperture="2.8" distance="10" k1="-0.3984" k2="-0.4154" k3="0.3537"/>
++            <vignetting model="pa" focal="26" aperture="2.8" distance="1000" k1="-0.3984" k2="-0.4154" k3="0.3537"/>
++            <vignetting model="pa" focal="26" aperture="3.2" distance="10" k1="-0.2499" k2="-0.5815" k3="0.3887"/>
++            <vignetting model="pa" focal="26" aperture="3.2" distance="1000" k1="-0.2499" k2="-0.5815" k3="0.3887"/>
++            <vignetting model="pa" focal="26" aperture="3.5" distance="10" k1="-0.2141" k2="-0.4357" k3="0.2290"/>
++            <vignetting model="pa" focal="26" aperture="3.5" distance="1000" k1="-0.2141" k2="-0.4357" k3="0.2290"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="10" k1="-0.3470" k2="0.1084" k3="-0.1510"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.3470" k2="0.1084" k3="-0.1510"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.5201" k2="0.5512" k3="-0.2766"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.5201" k2="0.5512" k3="-0.2766"/>
++            <vignetting model="pa" focal="32" aperture="2.8" distance="10" k1="-0.4245" k2="-0.3942" k3="0.3744"/>
++            <vignetting model="pa" focal="32" aperture="2.8" distance="1000" k1="-0.4245" k2="-0.3942" k3="0.3744"/>
++            <vignetting model="pa" focal="32" aperture="3.2" distance="10" k1="-0.2355" k2="-0.6582" k3="0.4701"/>
++            <vignetting model="pa" focal="32" aperture="3.2" distance="1000" k1="-0.2355" k2="-0.6582" k3="0.4701"/>
++            <vignetting model="pa" focal="32" aperture="3.5" distance="10" k1="-0.1421" k2="-0.6307" k3="0.3748"/>
++            <vignetting model="pa" focal="32" aperture="3.5" distance="1000" k1="-0.1421" k2="-0.6307" k3="0.3748"/>
++            <vignetting model="pa" focal="32" aperture="4" distance="10" k1="-0.1766" k2="-0.3048" k3="0.1076"/>
++            <vignetting model="pa" focal="32" aperture="4" distance="1000" k1="-0.1766" k2="-0.3048" k3="0.1076"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="10" k1="-0.2762" k2="0.1093" k3="-0.0325"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.2762" k2="0.1093" k3="-0.0325"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="10" k1="-0.3272" k2="-0.3863" k3="0.2617"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.3272" k2="-0.3863" k3="0.2617"/>
++            <vignetting model="pa" focal="40" aperture="3.2" distance="10" k1="-0.0400" k2="-0.9194" k3="0.5609"/>
++            <vignetting model="pa" focal="40" aperture="3.2" distance="1000" k1="-0.0400" k2="-0.9194" k3="0.5609"/>
++            <vignetting model="pa" focal="40" aperture="3.5" distance="10" k1="0.0866" k2="-0.9782" k3="0.5301"/>
++            <vignetting model="pa" focal="40" aperture="3.5" distance="1000" k1="0.0866" k2="-0.9782" k3="0.5301"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="10" k1="0.0641" k2="-0.6800" k3="0.2830"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="0.0641" k2="-0.6800" k3="0.2830"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="10" k1="-0.1294" k2="-0.0992" k3="0.0737"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1294" k2="-0.0992" k3="0.0737"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital 25mm f/1.8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with E-M10 -->
++            <distortion model="ptlens" focal="25" a="0.00454" b="-0.0141" c="0.00283"/>
++            <tca model="poly3" focal="25" vr="1.0003" vb="1.0001"/>
++            <!-- Taken with Olympus E-PL6 -->
++            <vignetting model="pa" focal="25" aperture="1.8" distance="0.25" k1="-0.6903" k2="0.5378" k3="-0.2296"/>
++            <vignetting model="pa" focal="25" aperture="1.8" distance="3.675" k1="-0.9318" k2="0.5595" k3="-0.1813"/>
++            <vignetting model="pa" focal="25" aperture="1.8" distance="1000" k1="-0.9277" k2="0.5280" k3="-0.1581"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="0.25" k1="-0.2611" k2="-0.2502" k3="0.1928"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="3.675" k1="-0.4885" k2="-0.3012" k3="0.2847"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="1000" k1="-0.4815" k2="-0.3312" k3="0.3023"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="0.25" k1="-0.1095" k2="-0.2784" k3="0.1222"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="3.675" k1="-0.1527" k2="-0.8429" k3="0.5227"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="1000" k1="-0.1505" k2="-0.8676" k3="0.5399"/>
++            <vignetting model="pa" focal="25" aperture="2.5" distance="0.25" k1="-0.2047" k2="0.0987" k3="-0.1083"/>
++            <vignetting model="pa" focal="25" aperture="2.5" distance="3.675" k1="-0.0485" k2="-0.7477" k3="0.3542"/>
++            <vignetting model="pa" focal="25" aperture="2.5" distance="1000" k1="-0.0403" k2="-0.7939" k3="0.3860"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="0.25" k1="-0.1892" k2="0.0178" k3="-0.0135"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="3.675" k1="-0.1069" k2="-0.3737" k3="0.0628"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.0911" k2="-0.4310" k3="0.0954"/>
++            <vignetting model="pa" focal="25" aperture="3.2" distance="0.25" k1="-0.1837" k2="-0.0097" k3="0.0155"/>
++            <vignetting model="pa" focal="25" aperture="3.2" distance="3.675" k1="-0.2257" k2="0.0951" k3="-0.2530"/>
++            <vignetting model="pa" focal="25" aperture="3.2" distance="1000" k1="-0.2103" k2="0.0478" k3="-0.2314"/>
++            <vignetting model="pa" focal="25" aperture="3.5" distance="0.25" k1="-0.1864" k2="-0.0014" k3="0.0095"/>
++            <vignetting model="pa" focal="25" aperture="3.5" distance="3.675" k1="-0.2867" k2="0.2934" k3="-0.3649"/>
++            <vignetting model="pa" focal="25" aperture="3.5" distance="1000" k1="-0.2704" k2="0.2533" k3="-0.3480"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="0.25" k1="-0.1883" k2="0.0064" k3="0.0040"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="3.675" k1="-0.3230" k2="0.3698" k3="-0.3610"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.3178" k2="0.3722" k3="-0.3780"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="0.25" k1="-0.1903" k2="0.0091" k3="0.0031"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="3.675" k1="-0.3143" k2="0.2979" k3="-0.2642"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="1000" k1="-0.3147" k2="0.3219" k3="-0.2971"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="0.25" k1="-0.1999" k2="0.0316" k3="-0.0100"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="3.675" k1="-0.2860" k2="0.1647" k3="-0.1305"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="1000" k1="-0.2837" k2="0.1839" k3="-0.1577"/>
++            <vignetting model="pa" focal="25" aperture="7.1" distance="0.25" k1="-0.2146" k2="0.0616" k3="-0.0284"/>
++            <vignetting model="pa" focal="25" aperture="7.1" distance="3.675" k1="-0.2628" k2="0.0491" k3="-0.0215"/>
++            <vignetting model="pa" focal="25" aperture="7.1" distance="1000" k1="-0.2608" k2="0.0681" k3="-0.0419"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.25" k1="-0.2739" k2="0.1756" k3="-0.0983"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="3.675" k1="-0.2533" k2="0.0122" k3="-0.0029"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.3094" k2="0.1649" k3="-0.1039"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 75mm f/1.8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M1 -->
++            <distortion model="poly3" focal="75" k1="-0.00025"/>
++            <tca model="poly3" focal="75" vr="0.9999905" vb="0.9999613"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 75-300mm f/4.8-6.7 II</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with E-M1 -->
++            <distortion model="poly3" focal="75" k1="0.0019"/>
++            <distortion model="poly3" focal="132" k1="0.00532"/>
++            <distortion model="poly3" focal="187" k1="0.00479"/>
++            <distortion model="poly3" focal="246" k1="0.00441"/>
++            <distortion model="poly3" focal="300" k1="0.00583"/>
++            <tca model="poly3" focal="75" br="-0.0000135" vr="1.0001628" bb="0.0000087" vb="0.9999804"/>
++            <tca model="poly3" focal="132" br="0.0000033" vr="1.0001604" bb="-0.0000519" vb="0.9997709"/>
++            <tca model="poly3" focal="187" br="-0.0000091" vr="1.0000425" bb="-0.0000314" vb="0.9997551"/>
++            <tca model="poly3" focal="246" br="-0.0000100" vr="0.9998524" bb="-0.0000022" vb="0.9997614"/>
++            <tca model="poly3" focal="300" br="-0.0000574" vr="0.9996155" bb="0.0000031" vb="0.9999526"/>
++            <vignetting model="pa" focal="75" aperture="4.8" distance="10" k1="-0.7567" k2="0.6812" k3="-0.3645"/>
++            <vignetting model="pa" focal="75" aperture="4.8" distance="1000" k1="-0.7567" k2="0.6812" k3="-0.3645"/>
++            <vignetting model="pa" focal="75" aperture="5" distance="10" k1="-0.6463" k2="0.4587" k3="-0.2401"/>
++            <vignetting model="pa" focal="75" aperture="5" distance="1000" k1="-0.6463" k2="0.4587" k3="-0.2401"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="10" k1="-0.0894" k2="-0.2584" k3="0.0427"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.0894" k2="-0.2584" k3="0.0427"/>
++            <vignetting model="pa" focal="75" aperture="6.3" distance="10" k1="-0.1969" k2="0.1766" k3="-0.2104"/>
++            <vignetting model="pa" focal="75" aperture="6.3" distance="1000" k1="-0.1969" k2="0.1766" k3="-0.2104"/>
++            <vignetting model="pa" focal="75" aperture="7.1" distance="10" k1="-0.2354" k2="0.2760" k3="-0.2270"/>
++            <vignetting model="pa" focal="75" aperture="7.1" distance="1000" k1="-0.2354" k2="0.2760" k3="-0.2270"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="10" k1="-0.2154" k2="0.1692" k3="-0.1043"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.2154" k2="0.1692" k3="-0.1043"/>
++            <vignetting model="pa" focal="75" aperture="10" distance="10" k1="-0.2021" k2="0.1173" k3="-0.0579"/>
++            <vignetting model="pa" focal="75" aperture="10" distance="1000" k1="-0.2021" k2="0.1173" k3="-0.0579"/>
++            <vignetting model="pa" focal="132" aperture="5.5" distance="10" k1="-0.2238" k2="-0.4064" k3="0.2454"/>
++            <vignetting model="pa" focal="132" aperture="5.5" distance="1000" k1="-0.2238" k2="-0.4064" k3="0.2454"/>
++            <vignetting model="pa" focal="132" aperture="6.3" distance="10" k1="-0.1187" k2="-0.0124" k3="-0.1248"/>
++            <vignetting model="pa" focal="132" aperture="6.3" distance="1000" k1="-0.1187" k2="-0.0124" k3="-0.1248"/>
++            <vignetting model="pa" focal="132" aperture="7.1" distance="10" k1="-0.2171" k2="0.2914" k3="-0.2439"/>
++            <vignetting model="pa" focal="132" aperture="7.1" distance="1000" k1="-0.2171" k2="0.2914" k3="-0.2439"/>
++            <vignetting model="pa" focal="132" aperture="8" distance="10" k1="-0.1895" k2="0.1631" k3="-0.1007"/>
++            <vignetting model="pa" focal="132" aperture="8" distance="1000" k1="-0.1895" k2="0.1631" k3="-0.1007"/>
++            <vignetting model="pa" focal="132" aperture="22" distance="10" k1="-0.1624" k2="0.0925" k3="-0.0476"/>
++            <vignetting model="pa" focal="132" aperture="22" distance="1000" k1="-0.1624" k2="0.0925" k3="-0.0476"/>
++            <vignetting model="pa" focal="187" aperture="6" distance="10" k1="-0.3778" k2="-0.1256" k3="0.1317"/>
++            <vignetting model="pa" focal="187" aperture="6" distance="1000" k1="-0.3778" k2="-0.1256" k3="0.1317"/>
++            <vignetting model="pa" focal="187" aperture="6.3" distance="10" k1="-0.1482" k2="-0.4028" k3="0.2355"/>
++            <vignetting model="pa" focal="187" aperture="6.3" distance="1000" k1="-0.1482" k2="-0.4028" k3="0.2355"/>
++            <vignetting model="pa" focal="187" aperture="7.1" distance="10" k1="-0.1072" k2="-0.0090" k3="-0.0941"/>
++            <vignetting model="pa" focal="187" aperture="7.1" distance="1000" k1="-0.1072" k2="-0.0090" k3="-0.0941"/>
++            <vignetting model="pa" focal="187" aperture="8" distance="10" k1="-0.1842" k2="0.2172" k3="-0.1532"/>
++            <vignetting model="pa" focal="187" aperture="8" distance="1000" k1="-0.1842" k2="0.2172" k3="-0.1532"/>
++            <vignetting model="pa" focal="187" aperture="22" distance="10" k1="-0.1604" k2="0.1289" k3="-0.0742"/>
++            <vignetting model="pa" focal="187" aperture="22" distance="1000" k1="-0.1604" k2="0.1289" k3="-0.0742"/>
++            <vignetting model="pa" focal="246" aperture="6.4" distance="10" k1="-0.5009" k2="0.0466" k3="0.0450"/>
++            <vignetting model="pa" focal="246" aperture="6.4" distance="1000" k1="-0.5009" k2="0.0466" k3="0.0450"/>
++            <vignetting model="pa" focal="246" aperture="7.1" distance="10" k1="-0.0387" k2="-0.5354" k3="0.2745"/>
++            <vignetting model="pa" focal="246" aperture="7.1" distance="1000" k1="-0.0387" k2="-0.5354" k3="0.2745"/>
++            <vignetting model="pa" focal="246" aperture="8" distance="10" k1="-0.1022" k2="-0.0050" k3="-0.0948"/>
++            <vignetting model="pa" focal="246" aperture="8" distance="1000" k1="-0.1022" k2="-0.0050" k3="-0.0948"/>
++            <vignetting model="pa" focal="246" aperture="22" distance="10" k1="-0.1661" k2="0.1685" k3="-0.0980"/>
++            <vignetting model="pa" focal="246" aperture="22" distance="1000" k1="-0.1661" k2="0.1685" k3="-0.0980"/>
++            <vignetting model="pa" focal="300" aperture="6.7" distance="10" k1="-0.8425" k2="0.6532" k3="-0.2714"/>
++            <vignetting model="pa" focal="300" aperture="6.7" distance="1000" k1="-0.8425" k2="0.6532" k3="-0.2714"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.7434" k2="0.5229" k3="-0.2177"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.7434" k2="0.5229" k3="-0.2177"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.3042" k2="-0.0906" k3="0.0722"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.3042" k2="-0.0906" k3="0.0722"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0639" k2="-0.3802" k3="0.2152"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0639" k2="-0.3802" k3="0.2152"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="10" k1="-0.1583" k2="0.1636" k3="-0.0935"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.1583" k2="0.1636" k3="-0.0935"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 EZ</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with E-M10 -->
++            <distortion model="ptlens" focal="14" a="0.01468" b="-0.06545" c="-0.00437"/>
++            <distortion model="ptlens" focal="18" a="0.00892" b="-0.04043" c="0.005"/>
++            <distortion model="ptlens" focal="22" a="0.00578" b="-0.01597" c="-0.00043"/>
++            <distortion model="ptlens" focal="30" a="0.00209" b="0.01156" c="-0.02364"/>
++            <distortion model="ptlens" focal="42" a="0.01839" b="-0.05556" c="0.07121"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 60mm f/2.8 Macro</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with E-M10 -->
++            <distortion model="poly3" focal="60" k1="0.00078"/>
++            <tca model="poly3" focal="60" br="-0.0000632" vr="1.0002668" bb="0.0000602" vb="0.9998450"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 7-14mm f/2.8 Pro</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M1 -->
++            <distortion model="ptlens" focal="7" a="0.04439" b="-0.17864" c="0.13663"/>
++            <distortion model="ptlens" focal="8" a="0.03553" b="-0.15302" c="0.13031"/>
++            <distortion model="ptlens" focal="9" a="0.0244" b="-0.11622" c="0.10732"/>
++            <distortion model="ptlens" focal="10" a="0.00877" b="-0.06446" c="0.0724"/>
++            <distortion model="ptlens" focal="12" a="-0.0012" b="-0.02183" c="0.03886"/>
++            <distortion model="ptlens" focal="14" a="-0.00708" b="0.00634" c="0.01377"/>
++            <tca model="poly3" focal="7" vr="1.0002513" vb="1.0000643"/>
++            <tca model="poly3" focal="8" vr="1.0002812" vb="1.0000534"/>
++            <tca model="poly3" focal="9" vr="1.0003194" vb="1.0000333"/>
++            <tca model="poly3" focal="10" vr="1.0003171" vb="1.0000324"/>
++            <tca model="poly3" focal="11" vr="1.0003051" vb="1.0000588"/>
++            <tca model="poly3" focal="12" vr="1.0002551" vb="1.0000838"/>
++            <tca model="poly3" focal="13" vr="1.0001951" vb="1.0001380"/>
++            <tca model="poly3" focal="14" vr="1.0001628" vb="1.0001960"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro</model>
+         <mount>Micro 4/3 System</mount>
+         <cropfactor>2.0</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="45" a="0.00149954" b="-0.0023693" c="0.00382496" />
+-            <tca model="poly3" focal="45" br="-0.0000129" vr="1.0001904" bb="0.0000108" vb="0.9999203" />
+-            <tca model="poly3" focal="45" br="-0.0000440" vr="1.0002771" bb="0.0000282" vb="0.9998497" />
+-            <tca model="poly3" focal="45" br="-0.0000484" vr="1.0001937" bb="0.0000056" vb="0.9999340" />
+-            <vignetting model="pa" focal="45" aperture="1.8" distance="0.5" k1="-0.1316" k2="-0.3770" k3="0.2472" />
+-            <vignetting model="pa" focal="45" aperture="1.8" distance="1" k1="-0.2255" k2="-0.1345" k3="0.0659" />
+-            <vignetting model="pa" focal="45" aperture="1.8" distance="3" k1="-0.2785" k2="-0.0510" k3="0.0102" />
+-            <vignetting model="pa" focal="45" aperture="1.8" distance="1000" k1="-0.3385" k2="0.0596" k3="-0.0582" />
+-            <vignetting model="pa" focal="45" aperture="2" distance="0.5" k1="-0.1464" k2="-0.0489" k3="0.0091" />
+-            <vignetting model="pa" focal="45" aperture="2" distance="1" k1="-0.1200" k2="0.0168" k3="-0.1094" />
+-            <vignetting model="pa" focal="45" aperture="2" distance="3" k1="-0.0571" k2="-0.1512" k3="-0.0265" />
+-            <vignetting model="pa" focal="45" aperture="2" distance="1000" k1="-0.0080" k2="-0.3083" k3="0.0663" />
+-            <vignetting model="pa" focal="45" aperture="2.8" distance="0.5" k1="-0.1506" k2="-0.0366" k3="0.0414" />
+-            <vignetting model="pa" focal="45" aperture="2.8" distance="1" k1="-0.1214" k2="-0.0310" k3="0.0366" />
+-            <vignetting model="pa" focal="45" aperture="2.8" distance="3" k1="-0.1069" k2="-0.0244" k3="0.0285" />
+-            <vignetting model="pa" focal="45" aperture="2.8" distance="1000" k1="-0.1093" k2="0.0134" k3="-0.0044" />
+-            <vignetting model="pa" focal="45" aperture="4" distance="0.5" k1="-0.1576" k2="-0.0189" k3="0.0303" />
+-            <vignetting model="pa" focal="45" aperture="4" distance="1" k1="-0.1232" k2="-0.0232" k3="0.0293" />
+-            <vignetting model="pa" focal="45" aperture="4" distance="3" k1="-0.1091" k2="-0.0196" k3="0.0259" />
+-            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.1000" k2="-0.0296" k3="0.0347" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1730" k2="0.0117" k3="0.0109" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.1578" k2="0.0464" k3="-0.0149" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1341" k2="0.0328" k3="-0.0102" />
+-            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1288" k2="0.0174" k3="0.0038" />
++            <!-- Taken with OMD E-M10 Mk II -->
++            <distortion model="ptlens" focal="40" a="-0.000686648" b="-0.00940753" c="-0.00546391"/>
++            <distortion model="ptlens" focal="70" a="-0.00205376" b="0.00258215" c="-0.000489355"/>
++            <distortion model="ptlens" focal="150" a="0.00420926" b="-0.00754286" c="0.0130875"/>
++            <tca model="poly3" focal="40" br="-0.0000104" vr="1.0003979" bb="0.0000706" vb="0.9999588"/>
++            <tca model="poly3" focal="70" br="0.0000367" vr="1.0000212" bb="-0.0000337" vb="1.0000500"/>
++            <tca model="poly3" focal="150" br="-0.0000304" vr="0.9998731" bb="-0.0000193" vb="1.0000447"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>OLYMPUS M.17mm F1.8</model>
++        <model>Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro + 1.4x converter</model>
++        <model lang="en">Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro + 1.4× conv.</model>
++        <model lang="de">Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro + 1.4×-Konv.</model>
+         <mount>Micro 4/3 System</mount>
+         <cropfactor>2.0</cropfactor>
+         <calibration>
+-            <!-- Taken with Olympus E-M5 -->
+-            <distortion model="ptlens" focal="17" a="0.01989" b="-0.09761" c="0.07461" />
+-            <tca model="poly3" focal="17" br="-0.0000767" vr="1.0002674" bb="0.0001410" vb="0.9997845" />
++            <!-- Taken with OMD E-M10 Mk II -->
++            <distortion model="ptlens" focal="56" a="-0.00554012" b="0.00335391" c="-0.00497355"/>
++            <distortion model="ptlens" focal="120" a="-0.00860568" b="0.0192665" c="-0.0136313"/>
++            <distortion model="ptlens" focal="210" a="-0.0109997" b="0.0283301" c="-0.0224234"/>
++            <tca model="poly3" focal="56" br="0.0000289" vr="0.9999754" bb="-0.0000163" vb="1.0000247"/>
++            <tca model="poly3" focal="120" br="-0.0000026" vr="0.9998838" bb="-0.0000125" vb="1.0000670"/>
++            <tca model="poly3" focal="210" br="-0.0002411" vr="0.9999655" bb="0.0000035" vb="1.0000091"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus 9mm Body Cap Lens Fisheye</model>
++        <mount>Micro 4/3 System</mount>
++        <type>stereographic</type>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M10 -->
++            <distortion model="poly3" focal="9" k1="-0.03111"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus M.Zuiko Digital ED 8mm f/1.8 Fisheye Pro</model>
++        <mount>Micro 4/3 System</mount>
++        <type>equisolid</type>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M5 II -->
++            <distortion model="poly3" focal="8" k1="-0.00531"/>
++            <tca model="poly3" focal="8" br="-0.0000479" vr="1.0005124" bb="0.0000296" vb="1.0000150"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-panasonic.xml b/data/db/mil-panasonic.xml
+--- a/data/db/mil-panasonic.xml	2013-10-12 22:23:28.000000000 +0200
++++ b/data/db/mil-panasonic.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,796 +1,1623 @@
+ <lensdatabase>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-G1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GF1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GH1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-GM1</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GX1</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-G2</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GF2</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GH2</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-G3</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GF3</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GH3</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-GH4</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-G5</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GF5</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-G6</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GF6</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+-        <model>DMC-G10</model>
++        <model>DMC-GF7</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-GX7</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-G10</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-GM5</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-GX8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-G80</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <!-- This is an alias for the DMC-G80 -->
++        <maker>Panasonic</maker>
++        <model>DMC-G81</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <!-- This is an alias for the DMC-G80 -->
++        <maker>Panasonic</maker>
++        <model>DMC-G85</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Panasonic</maker>
++        <model>DMC-GX80</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <!-- Alias for the DMC-GX80. -->
++        <maker>Panasonic</maker>
++        <model>DMC-GX85</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G 14mm F2.5</model>
+-	    <focal value="14" />
+-	    <aperture min="2.5" max="22" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="14" model="ptlens" a="0.0115556" b="-0.0589829" c="0.000154452" />
+-	        <tca focal="14" model="poly3" br="-0.0002929" vr="1.0006360" bb="-0.0000512" vb="1.0002741" />
+-	        <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.2596" k2="1.0551" k3="-0.4356" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.5289" k2="1.4047" k3="-0.5919" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.6489" k2="1.5835" k3="-0.6797" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.8292" k2="1.8493" k3="-0.8101" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.7929" k2="0.0786" k3="0.1210" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.0357" k2="0.3193" k3="0.0410" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.1998" k2="0.5758" k3="-0.0875" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4134" k2="0.8928" k3="-0.2433" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6406" k2="0.2635" k3="-0.1317" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.5714" k2="-0.2234" k3="0.1716" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.5583" k2="-0.4441" k3="0.3348" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6066" k2="-0.6339" k3="0.5028" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6487" k2="0.2044" k3="-0.0130" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.7505" k2="0.4707" k3="-0.2878" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.7382" k2="0.4256" k3="-0.3142" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6656" k2="0.0385" k3="-0.1041" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.6876" k2="0.2499" k3="-0.0285" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.6954" k2="0.1546" k3="0.0468" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.7122" k2="0.1687" k3="0.0443" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.8248" k2="0.4676" k3="-0.1965" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G 14mm f/2.5 Asph.</model>
++        <mount>Micro 4/3 System</mount>
++        <focal value="14"/>
++        <aperture min="2.5" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="14" model="ptlens" a="0.0115556" b="-0.0589829" c="0.000154452"/>
++            <tca focal="14" model="poly3" br="-0.0002929" vr="1.0006360" bb="-0.0000512" vb="1.0002741"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.2596" k2="1.0551" k3="-0.4356"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.5289" k2="1.4047" k3="-0.5919"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.6489" k2="1.5835" k3="-0.6797"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.8292" k2="1.8493" k3="-0.8101"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.7929" k2="0.0786" k3="0.1210"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.0357" k2="0.3193" k3="0.0410"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.1998" k2="0.5758" k3="-0.0875"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4134" k2="0.8928" k3="-0.2433"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6406" k2="0.2635" k3="-0.1317"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.5714" k2="-0.2234" k3="0.1716"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.5583" k2="-0.4441" k3="0.3348"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6066" k2="-0.6339" k3="0.5028"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6487" k2="0.2044" k3="-0.0130"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.7505" k2="0.4707" k3="-0.2878"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.7382" k2="0.4256" k3="-0.3142"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6656" k2="0.0385" k3="-0.1041"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.6876" k2="0.2499" k3="-0.0285"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.6954" k2="0.1546" k3="0.0468"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.7122" k2="0.1687" k3="0.0443"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.8248" k2="0.4676" k3="-0.1965"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G 14/F2.5 + GWC1 0.79x</model>
+-	    <focal value="14" />
+-	    <aperture min="2.5" max="22"/>
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="14" model="ptlens" a="0.000389003" b="-0.0125969" c="-0.00230827" />
+-            <tca model="poly3" focal="14" br="-0.0000039" vr="1.0007997" bb="0.0000698" vb="0.9998824" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.3601" k2="1.1562" k3="-0.4828" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.7251" k2="1.7094" k3="-0.7511" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.7963" k2="1.8325" k3="-0.8182" />
+-            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.9392" k2="2.0189" k3="-0.9016" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.8537" k2="0.0851" k3="0.1294" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.2352" k2="0.6078" k3="-0.1020" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.2889" k2="0.6800" k3="-0.1365" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4614" k2="0.9088" k3="-0.2399" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6732" k2="0.1870" k3="-0.0890" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.6633" k2="-0.2575" k3="0.2275" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.6677" k2="-0.3342" k3="0.2860" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6885" k2="-0.5752" k3="0.4881" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6951" k2="0.1912" k3="-0.0103" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.8328" k2="0.5479" k3="-0.3711" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.8164" k2="0.4837" k3="-0.3577" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6978" k2="-0.0029" k3="-0.0786" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.7218" k2="0.2143" k3="-0.0127" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.8000" k2="0.2761" k3="-0.0171" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.8137" k2="0.3066" k3="-0.0363" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.9701" k2="0.8715" k3="-0.5484" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G 14mm f/2.5 Asph. + GWC1 0.79x</model>
++        <mount>Micro 4/3 System</mount>
++        <focal value="14"/>
++        <aperture min="2.5" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="14" model="ptlens" a="0.000389003" b="-0.0125969" c="-0.00230827"/>
++            <tca model="poly3" focal="14" br="-0.0000039" vr="1.0007997" bb="0.0000698" vb="0.9998824"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.3601" k2="1.1562" k3="-0.4828"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.7251" k2="1.7094" k3="-0.7511"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.7963" k2="1.8325" k3="-0.8182"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.9392" k2="2.0189" k3="-0.9016"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.8537" k2="0.0851" k3="0.1294"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.2352" k2="0.6078" k3="-0.1020"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.2889" k2="0.6800" k3="-0.1365"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4614" k2="0.9088" k3="-0.2399"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6732" k2="0.1870" k3="-0.0890"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.6633" k2="-0.2575" k3="0.2275"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.6677" k2="-0.3342" k3="0.2860"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6885" k2="-0.5752" k3="0.4881"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6951" k2="0.1912" k3="-0.0103"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.8328" k2="0.5479" k3="-0.3711"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.8164" k2="0.4837" k3="-0.3577"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6978" k2="-0.0029" k3="-0.0786"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.7218" k2="0.2143" k3="-0.0127"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.8000" k2="0.2761" k3="-0.0171"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.8137" k2="0.3066" k3="-0.0363"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.9701" k2="0.8715" k3="-0.5484"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G 20/F1.7</model>
+-	    <focal value="20" />
+-	    <aperture min="1.7" max="16" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="20" model="ptlens" a="0.00670602" b="-0.0381172" c="0.0065352" />
+-	        <tca focal="20" model="poly3" br="-0.0001326" vr="1.0003463" bb="0.00002051" vb="1.0001875" />
+-	        <vignetting model="pa" focal="20" aperture="1.7" distance="0.2" k1="-1.0774" k2="0.7422" k3="-0.2967" />
+-            <vignetting model="pa" focal="20" aperture="1.7" distance="0.4" k1="-1.1535" k2="0.7938" k3="-0.3151" />
+-            <vignetting model="pa" focal="20" aperture="1.7" distance="1.2" k1="-1.1913" k2="0.8154" k3="-0.3195" />
+-            <vignetting model="pa" focal="20" aperture="1.7" distance="1000" k1="-1.2097" k2="0.8192" k3="-0.3192" />
+-            <vignetting model="pa" focal="20" aperture="2" distance="0.2" k1="-0.5597" k2="-0.1857" k3="0.1982" />
+-            <vignetting model="pa" focal="20" aperture="2" distance="0.4" k1="-0.5705" k2="-0.2413" k3="0.2191" />
+-            <vignetting model="pa" focal="20" aperture="2" distance="1.2" k1="-0.5678" k2="-0.3012" k3="0.2550" />
+-            <vignetting model="pa" focal="20" aperture="2" distance="1000" k1="-0.5576" k2="-0.3515" k3="0.2781" />
+-            <vignetting model="pa" focal="20" aperture="2.8" distance="0.2" k1="-0.2511" k2="-0.2148" k3="0.0074" />
+-            <vignetting model="pa" focal="20" aperture="2.8" distance="0.4" k1="-0.2742" k2="-0.2219" k3="0.0005" />
+-            <vignetting model="pa" focal="20" aperture="2.8" distance="1.2" k1="-0.2774" k2="-0.2958" k3="0.0512" />
+-            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.2980" k2="-0.2266" k3="-0.0062" />
+-            <vignetting model="pa" focal="20" aperture="4" distance="0.2" k1="-0.3919" k2="0.2105" k3="-0.1757" />
+-            <vignetting model="pa" focal="20" aperture="4" distance="0.4" k1="-0.4385" k2="0.2670" k3="-0.2289" />
+-            <vignetting model="pa" focal="20" aperture="4" distance="1.2" k1="-0.4717" k2="0.3088" k3="-0.2589" />
+-            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4793" k2="0.3279" k3="-0.2908" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="0.2" k1="-0.3500" k2="-0.0395" k3="0.0612" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.3846" k2="-0.0492" k3="0.0749" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="1.2" k1="-0.4185" k2="-0.0195" k3="0.0613" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4210" k2="-0.0358" k3="0.0746" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G 20mm f/1.7 Asph.</model>
++        <mount>Micro 4/3 System</mount>
++        <focal value="20"/>
++        <aperture min="1.7" max="16"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="20" model="ptlens" a="0.00670602" b="-0.0381172" c="0.0065352"/>
++            <tca focal="20" model="poly3" br="-0.0001326" vr="1.0003463" bb="0.00002051" vb="1.0001875"/>
++            <vignetting model="pa" focal="20" aperture="1.7" distance="0.2" k1="-1.0774" k2="0.7422" k3="-0.2967"/>
++            <vignetting model="pa" focal="20" aperture="1.7" distance="0.4" k1="-1.1535" k2="0.7938" k3="-0.3151"/>
++            <vignetting model="pa" focal="20" aperture="1.7" distance="1.2" k1="-1.1913" k2="0.8154" k3="-0.3195"/>
++            <vignetting model="pa" focal="20" aperture="1.7" distance="1000" k1="-1.2097" k2="0.8192" k3="-0.3192"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="0.2" k1="-0.5597" k2="-0.1857" k3="0.1982"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="0.4" k1="-0.5705" k2="-0.2413" k3="0.2191"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="1.2" k1="-0.5678" k2="-0.3012" k3="0.2550"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="1000" k1="-0.5576" k2="-0.3515" k3="0.2781"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.2" k1="-0.2511" k2="-0.2148" k3="0.0074"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.4" k1="-0.2742" k2="-0.2219" k3="0.0005"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1.2" k1="-0.2774" k2="-0.2958" k3="0.0512"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.2980" k2="-0.2266" k3="-0.0062"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.2" k1="-0.3919" k2="0.2105" k3="-0.1757"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.4" k1="-0.4385" k2="0.2670" k3="-0.2289"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1.2" k1="-0.4717" k2="0.3088" k3="-0.2589"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4793" k2="0.3279" k3="-0.2908"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.2" k1="-0.3500" k2="-0.0395" k3="0.0612"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.3846" k2="-0.0492" k3="0.0749"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1.2" k1="-0.4185" k2="-0.0195" k3="0.0613"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4210" k2="-0.0358" k3="0.0746"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G VARIO PZ 14-42/F3.5-5.6</model>
+-	    <focal min="14" max="42" />
+-	    <aperture min="3.5" max="22" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="14" model="ptlens" a="0.0143556" b="-0.0749276" c="0.00791831" />
+-	        <distortion focal="18" model="ptlens" a="0.0178423" b="-0.0489859" c="-0.00250207" />
+-	        <distortion focal="25" model="ptlens" a="0.0304634" b="-0.0790615" c="0.0446911" />
+-	        <distortion focal="35" model="ptlens" a="0.0197351" b="-0.0412857" c="0.0264783" />
+-	        <distortion focal="42" model="ptlens" a="0.00785081" b="-0.002968" c="-0.00395351" />
+-            <tca model="poly3" focal="14" br="0.0000399" vr="0.9999729" bb="-0.0002503" vb="1.0005586" />
+-            <tca model="poly3" focal="18" br="-0.0000110" vr="1.0000205" bb="-0.0002269" vb="1.0005124" />
+-            <tca model="poly3" focal="25" br="-0.0000027" vr="1.0000210" bb="-0.0001025" vb="1.0003060" />
+-            <tca model="poly3" focal="35" br="0.0000478" vr="0.9999745" bb="-0.0000213" vb="1.0001376" />
+-            <tca model="poly3" focal="42" br="0.0000292" vr="1.0000187" bb="-0.0000197" vb="1.0000910" />
+-	        <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2279" k2="-1.0763" k3="0.5610" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.0951" k2="-1.4326" k3="0.7789" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1003" k2="-1.4651" k3="0.8091" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.1869" k2="-1.3638" k3="0.7806" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1277" k2="-1.1307" k3="0.5303" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0276" k2="-1.4155" k3="0.7092" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0139" k2="-1.4755" k3="0.7488" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0192" k2="-1.5936" k3="0.8259" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4561" k2="0.2525" k3="-0.3794" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.3727" k2="0.0534" k3="-0.2734" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.3652" k2="0.0196" k3="-0.2584" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3374" k2="-0.0445" k3="-0.2307" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5018" k2="0.3342" k3="-0.3287" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4670" k2="0.3186" k3="-0.3714" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4802" k2="0.3599" k3="-0.4137" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4707" k2="0.3739" k3="-0.4528" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.3935" k2="-0.1258" k3="0.1192" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.3528" k2="-0.1992" k3="0.1628" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3651" k2="-0.1759" k3="0.1497" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3661" k2="-0.1512" k3="0.1276" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.2710" k2="-0.5110" k3="0.3156" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.2277" k2="-0.5777" k3="0.3643" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1821" k2="-0.6504" k3="0.4028" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1901" k2="-0.6330" k3="0.3902" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.3609" k2="0.0967" k3="-0.1190" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3238" k2="0.0388" k3="-0.0589" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2791" k2="-0.0683" k3="0.0156" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2899" k2="-0.0393" k3="0.0034" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.3094" k2="-0.1260" k3="0.1036" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2916" k2="-0.1022" k3="0.0803" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2559" k2="-0.1747" k3="0.1230" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2722" k2="-0.1282" k3="0.0971" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.3059" k2="-0.1359" k3="0.1104" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2871" k2="-0.1148" k3="0.0889" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2537" k2="-0.1814" k3="0.1275" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2689" k2="-0.1383" k3="0.1038" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.3051" k2="-0.1358" k3="0.1094" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2893" k2="-0.1096" k3="0.0852" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2522" k2="-0.1853" k3="0.1297" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2729" k2="-0.1348" k3="0.1038" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.2018" k2="-0.2665" k3="0.0571" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1634" k2="-0.3260" k3="0.1101" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1295" k2="-0.3605" k3="0.1401" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.1274" k2="-0.3864" k3="0.1779" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2652" k2="0.0671" k3="-0.1896" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2339" k2="0.0302" k3="-0.1498" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2080" k2="0.0006" k3="-0.1150" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2153" k2="0.0212" k3="-0.1103" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2666" k2="-0.0122" k3="-0.0206" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2140" k2="-0.1137" k3="0.0599" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1904" k2="-0.1296" k3="0.0710" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1931" k2="-0.1198" k3="0.0741" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.2358" k2="-0.1359" k3="0.0920" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2054" k2="-0.1526" k3="0.0963" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1861" k2="-0.1549" k3="0.0960" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1965" k2="-0.1139" k3="0.0709" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.2396" k2="-0.1284" k3="0.0860" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2120" k2="-0.1410" k3="0.0905" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1954" k2="-0.1379" k3="0.0869" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2096" k2="-0.0868" k3="0.0544" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.2235" k2="-0.3007" k3="-0.0196" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.2062" k2="-0.2405" k3="-0.0356" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1712" k2="-0.2289" k3="-0.0202" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1712" k2="-0.1977" k3="-0.0219" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2818" k2="0.1776" k3="-0.4047" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2793" k2="0.2553" k3="-0.4072" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2411" k2="0.2293" k3="-0.3509" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2508" k2="0.2657" k3="-0.3438" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3641" k2="0.3814" k3="-0.4506" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2902" k2="0.2031" k3="-0.2584" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2063" k2="0.0154" k3="-0.0779" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1979" k2="-0.0102" k3="-0.0349" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.3081" k2="0.1018" k3="-0.1440" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2148" k2="-0.1207" k3="0.0548" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1585" k2="-0.1816" k3="0.1045" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1745" k2="-0.1179" k3="0.0672" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2606" k2="-0.0934" k3="0.0377" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.1987" k2="-0.1873" k3="0.1151" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1601" k2="-0.1793" k3="0.1029" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1784" k2="-0.1122" k3="0.0644" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.4664" k2="0.0127" k3="-0.1991" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.4457" k2="0.1016" k3="-0.2303" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.4050" k2="0.1096" k3="-0.2063" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3811" k2="0.1152" k3="-0.1942" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1980" k2="-0.1116" k3="-0.3206" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2305" k2="0.1212" k3="-0.4205" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2346" k2="0.2463" k3="-0.4460" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2272" k2="0.2861" k3="-0.4421" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3693" k2="0.4737" k3="-0.7079" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3520" k2="0.4838" k3="-0.6046" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2870" k2="0.3452" k3="-0.4173" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2533" k2="0.2921" k3="-0.3460" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4894" k2="0.8105" k3="-0.8723" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.3556" k2="0.4065" k3="-0.4457" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2216" k2="0.0330" k3="-0.0885" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1691" k2="-0.0698" k3="0.0102" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4963" k2="0.7611" k3="-0.7603" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2736" k2="0.0560" k3="-0.1053" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1758" k2="-0.1633" k3="0.0950" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1522" k2="-0.1439" k3="0.0785" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS</model>
++        <model lang="en">Lumix G X Vario PZ 14-42mm f/3.5-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <focal min="14" max="42"/>
++        <aperture min="3.5" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="14" a="0.02565" b="-0.08842" c="0.01461"/>
++            <distortion model="ptlens" focal="19" a="0.01209" b="-0.03965" c="0.00339"/>
++            <distortion model="ptlens" focal="26" a="0.00118" b="0.00765" c="-0.03503"/>
++            <distortion model="ptlens" focal="33" a="0.00329" b="0.01434" c="-0.03376"/>
++            <distortion model="ptlens" focal="42" a="0.01352" b="-0.01628" c="0.00739"/>
++            <tca model="poly3" focal="14" br="0.0000399" vr="0.9999729" bb="-0.0002503" vb="1.0005586"/>
++            <tca model="poly3" focal="18" br="-0.0000110" vr="1.0000205" bb="-0.0002269" vb="1.0005124"/>
++            <tca model="poly3" focal="25" br="-0.0000027" vr="1.0000210" bb="-0.0001025" vb="1.0003060"/>
++            <tca model="poly3" focal="35" br="0.0000478" vr="0.9999745" bb="-0.0000213" vb="1.0001376"/>
++            <tca model="poly3" focal="42" br="0.0000292" vr="1.0000187" bb="-0.0000197" vb="1.0000910"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2279" k2="-1.0763" k3="0.5610"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.0951" k2="-1.4326" k3="0.7789"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1003" k2="-1.4651" k3="0.8091"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.1869" k2="-1.3638" k3="0.7806"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1277" k2="-1.1307" k3="0.5303"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0276" k2="-1.4155" k3="0.7092"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0139" k2="-1.4755" k3="0.7488"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0192" k2="-1.5936" k3="0.8259"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4561" k2="0.2525" k3="-0.3794"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.3727" k2="0.0534" k3="-0.2734"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.3652" k2="0.0196" k3="-0.2584"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3374" k2="-0.0445" k3="-0.2307"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5018" k2="0.3342" k3="-0.3287"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4670" k2="0.3186" k3="-0.3714"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4802" k2="0.3599" k3="-0.4137"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4707" k2="0.3739" k3="-0.4528"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.3935" k2="-0.1258" k3="0.1192"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.3528" k2="-0.1992" k3="0.1628"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3651" k2="-0.1759" k3="0.1497"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3661" k2="-0.1512" k3="0.1276"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.2710" k2="-0.5110" k3="0.3156"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.2277" k2="-0.5777" k3="0.3643"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1821" k2="-0.6504" k3="0.4028"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1901" k2="-0.6330" k3="0.3902"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.3609" k2="0.0967" k3="-0.1190"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3238" k2="0.0388" k3="-0.0589"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2791" k2="-0.0683" k3="0.0156"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2899" k2="-0.0393" k3="0.0034"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.3094" k2="-0.1260" k3="0.1036"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2916" k2="-0.1022" k3="0.0803"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2559" k2="-0.1747" k3="0.1230"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2722" k2="-0.1282" k3="0.0971"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.3059" k2="-0.1359" k3="0.1104"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2871" k2="-0.1148" k3="0.0889"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2537" k2="-0.1814" k3="0.1275"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2689" k2="-0.1383" k3="0.1038"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.3051" k2="-0.1358" k3="0.1094"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2893" k2="-0.1096" k3="0.0852"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2522" k2="-0.1853" k3="0.1297"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2729" k2="-0.1348" k3="0.1038"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.2018" k2="-0.2665" k3="0.0571"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1634" k2="-0.3260" k3="0.1101"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1295" k2="-0.3605" k3="0.1401"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.1274" k2="-0.3864" k3="0.1779"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2652" k2="0.0671" k3="-0.1896"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2339" k2="0.0302" k3="-0.1498"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2080" k2="0.0006" k3="-0.1150"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2153" k2="0.0212" k3="-0.1103"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2666" k2="-0.0122" k3="-0.0206"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2140" k2="-0.1137" k3="0.0599"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1904" k2="-0.1296" k3="0.0710"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1931" k2="-0.1198" k3="0.0741"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.2358" k2="-0.1359" k3="0.0920"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2054" k2="-0.1526" k3="0.0963"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1861" k2="-0.1549" k3="0.0960"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1965" k2="-0.1139" k3="0.0709"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.2396" k2="-0.1284" k3="0.0860"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2120" k2="-0.1410" k3="0.0905"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1954" k2="-0.1379" k3="0.0869"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2096" k2="-0.0868" k3="0.0544"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.2235" k2="-0.3007" k3="-0.0196"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.2062" k2="-0.2405" k3="-0.0356"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1712" k2="-0.2289" k3="-0.0202"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1712" k2="-0.1977" k3="-0.0219"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2818" k2="0.1776" k3="-0.4047"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2793" k2="0.2553" k3="-0.4072"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2411" k2="0.2293" k3="-0.3509"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2508" k2="0.2657" k3="-0.3438"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3641" k2="0.3814" k3="-0.4506"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2902" k2="0.2031" k3="-0.2584"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2063" k2="0.0154" k3="-0.0779"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1979" k2="-0.0102" k3="-0.0349"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.3081" k2="0.1018" k3="-0.1440"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2148" k2="-0.1207" k3="0.0548"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1585" k2="-0.1816" k3="0.1045"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1745" k2="-0.1179" k3="0.0672"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2606" k2="-0.0934" k3="0.0377"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.1987" k2="-0.1873" k3="0.1151"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1601" k2="-0.1793" k3="0.1029"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1784" k2="-0.1122" k3="0.0644"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.4664" k2="0.0127" k3="-0.1991"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.4457" k2="0.1016" k3="-0.2303"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.4050" k2="0.1096" k3="-0.2063"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3811" k2="0.1152" k3="-0.1942"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1980" k2="-0.1116" k3="-0.3206"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2305" k2="0.1212" k3="-0.4205"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2346" k2="0.2463" k3="-0.4460"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2272" k2="0.2861" k3="-0.4421"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3693" k2="0.4737" k3="-0.7079"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3520" k2="0.4838" k3="-0.6046"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2870" k2="0.3452" k3="-0.4173"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2533" k2="0.2921" k3="-0.3460"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4894" k2="0.8105" k3="-0.8723"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.3556" k2="0.4065" k3="-0.4457"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2216" k2="0.0330" k3="-0.0885"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1691" k2="-0.0698" k3="0.0102"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4963" k2="0.7611" k3="-0.7603"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2736" k2="0.0560" k3="-0.1053"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1758" k2="-0.1633" k3="0.0950"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1522" k2="-0.1439" k3="0.0785"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G VARIO PZ 14-42/F3.5-5.6 + GWC1 0.79x</model>
+-	    <focal min="14" max="42" />
+-	    <aperture min="3.5" max="22" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="14" model="ptlens" a="0.0179152" b="-0.045476" c="-0.00473275" />
+-	        <distortion focal="18" model="ptlens" a="0.025807" b="-0.0640215" c="0.0309495" />
+-	        <distortion focal="25" model="ptlens" a="0.0116902" b="-0.0256329" c="0.0158116" />
+-	        <distortion focal="35" model="ptlens" a="0.0115103" b="-0.0149202" c="0.00888769" />
+-	        <distortion focal="42" model="ptlens" a="0.00886028" b="-0.003387" c="0.000962099" />
+-            <tca model="poly3" focal="14" br="0.0001359" vr="1.0000609" bb="-0.0000804" vb="1.0002627" />
+-            <tca model="poly3" focal="18" br="0.0000834" vr="1.0001707" bb="-0.0000528" vb="1.0001610" />
+-            <tca model="poly3" focal="25" br="0.0000700" vr="1.0003581" bb="-0.0000636" vb="1.0000337" />
+-            <tca model="poly3" focal="35" br="0.0000657" vr="1.0003876" bb="-0.0000258" vb="0.9998841" />
+-            <tca model="poly3" focal="42" br="0.0001242" vr="1.0003650" bb="-0.0000807" vb="0.9999576" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2549" k2="-0.9540" k3="0.5212" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.1498" k2="-1.2155" k3="0.6383" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1251" k2="-1.2176" k3="0.6926" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0969" k2="-1.2431" k3="0.7274" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1766" k2="-0.9398" k3="0.4530" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0996" k2="-1.1445" k3="0.5322" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0868" k2="-1.1608" k3="0.6072" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.0452" k2="-1.2580" k3="0.6997" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4805" k2="0.2388" k3="-0.2811" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.4465" k2="0.1928" k3="-0.3400" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.4028" k2="0.0605" k3="-0.2032" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3344" k2="-0.0982" k3="-0.0872" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5059" k2="0.2898" k3="-0.2420" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.5356" k2="0.4598" k3="-0.4434" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4881" k2="0.3249" k3="-0.3242" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4280" k2="0.2116" k3="-0.2645" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.4271" k2="-0.0329" k3="0.0697" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.4270" k2="-0.0133" k3="0.0429" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3947" k2="-0.0819" k3="0.0931" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3682" k2="-0.0789" k3="0.0589" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.1912" k2="-0.6479" k3="0.5580" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.1946" k2="-0.5671" k3="0.3795" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1984" k2="-0.6116" k3="0.5695" />
+-            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1654" k2="-0.6738" k3="0.7110" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.2588" k2="-0.2385" k3="0.2977" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3008" k2="-0.0338" k3="0.0211" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2724" k2="-0.1898" k3="0.2417" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2073" k2="-0.3615" k3="0.4299" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.1450" k2="-0.6284" k3="0.6146" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2679" k2="-0.1437" k3="0.1198" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2276" k2="-0.3153" k3="0.3104" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1597" k2="-0.4757" k3="0.4601" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.1394" k2="-0.6045" k3="0.5520" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2667" k2="-0.1437" k3="0.1189" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2314" k2="-0.2738" k3="0.2494" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1660" k2="-0.4073" k3="0.3592" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.1607" k2="-0.4948" k3="0.4304" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2627" k2="-0.1488" k3="0.1207" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2515" k2="-0.1796" k3="0.1552" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2011" k2="-0.2576" k3="0.2105" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.1605" k2="-0.2826" k3="0.1400" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1704" k2="-0.2367" k3="0.0927" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1647" k2="-0.2657" k3="0.2869" />
+-            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.0814" k2="-0.3983" k3="0.4973" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2195" k2="0.0285" k3="-0.0993" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2409" k2="0.0779" k3="-0.1414" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2239" k2="0.0108" k3="0.0585" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1743" k2="-0.0808" k3="0.2378" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.1772" k2="-0.1601" k3="0.1228" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2003" k2="-0.0648" k3="0.0412" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1459" k2="-0.2637" k3="0.2603" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.0717" k2="-0.4325" k3="0.4228" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.1780" k2="-0.1659" k3="0.1175" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2037" k2="-0.1147" k3="0.0837" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1607" k2="-0.2069" k3="0.1835" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.0884" k2="-0.3324" k3="0.2905" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1804" k2="-0.1504" k3="0.1015" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2014" k2="-0.1208" k3="0.0875" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1836" k2="-0.1111" k3="0.0897" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1288" k2="-0.1626" k3="0.1271" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.1712" k2="-0.2632" k3="-0.0268" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1828" k2="-0.0487" k3="-0.1482" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1482" k2="-0.0817" k3="-0.0963" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1381" k2="-0.0322" k3="-0.1095" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2529" k2="0.1687" k3="-0.3660" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2920" k2="0.3823" k3="-0.4492" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2587" k2="0.3245" k3="-0.3772" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2305" k2="0.3164" k3="-0.3577" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3261" k2="0.3561" k3="-0.4036" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2711" k2="0.2367" k3="-0.2281" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2092" k2="0.0795" k3="-0.0907" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1616" k2="0.0051" k3="-0.0271" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.2705" k2="0.0927" k3="-0.1214" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2044" k2="-0.0560" k3="0.0400" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1606" k2="-0.1177" k3="0.0848" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1306" k2="-0.1038" k3="0.0659" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2246" k2="-0.0875" k3="0.0435" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2019" k2="-0.0648" k3="0.0480" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1596" k2="-0.1190" k3="0.0846" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1316" k2="-0.1029" k3="0.0654" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.3748" k2="0.0411" k3="-0.2413" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.3684" k2="0.2509" k3="-0.3389" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.3606" k2="0.3085" k3="-0.3427" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3268" k2="0.2812" k3="-0.3033" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1963" k2="0.0032" k3="-0.3776" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2559" k2="0.3367" k3="-0.5121" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2601" k2="0.4003" k3="-0.5105" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2625" k2="0.4721" k3="-0.5322" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3470" k2="0.5343" k3="-0.7429" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3344" k2="0.5798" k3="-0.6194" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2945" k2="0.4594" k3="-0.4694" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2695" k2="0.4102" k3="-0.3925" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4661" k2="0.8819" k3="-0.9227" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.2938" k2="0.3266" k3="-0.3223" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2113" k2="0.0888" k3="-0.0971" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1746" k2="0.0250" k3="-0.0258" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4630" k2="0.7983" k3="-0.7757" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2044" k2="-0.0300" k3="0.0078" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1664" k2="-0.0868" k3="0.0613" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1599" k2="-0.0358" k3="0.0291" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 12-60mm f/3.5-5.6 Asph. Power OIS</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Panasonic DMC-G80 -->
++            <distortion model="ptlens" focal="12" a="0.0287212" b="-0.0853854" c="-0.0106763"/>
++            <distortion model="ptlens" focal="15" a="-0.00918518" b="0.053883" c="-0.127008"/>
++            <distortion model="ptlens" focal="18" a="0.00962417" b="-0.0250619" c="0.015732"/>
++            <distortion model="ptlens" focal="30" a="0.00636623" b="-0.015593" c="0.0327523"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.00784641" c="0"/>
++            <tca model="poly3" focal="12" vr="1.0001087" vb="1.0003009"/>
++            <tca model="poly3" focal="15" vr="1.0000481" vb="1.0005000"/>
++            <tca model="poly3" focal="18" vr="1.0000464" vb="1.0004000"/>
++            <tca model="poly3" focal="30" vr="1.0001128" vb="1.0000466"/>
++            <tca model="poly3" focal="60" vr="0.9999674" vb="0.9999320"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G VARIO 14-140/F4.0-5.8</model>
+-	    <focal min="14" max="140" />
+-	    <aperture min="4" max="22" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-            <distortion focal="14" model="ptlens" a="0.00966207" b="-0.0543377" c="-0.00740716" />
+-            <distortion focal="18" model="ptlens" a="0.00949869" b="-0.0385525" c="0.00465051" />
+-            <distortion focal="25" model="ptlens" a="0.00754759" b="-0.0231595" c="0.00924953" />
+-            <distortion focal="32" model="ptlens" a="-0.000903732" b="0.00151614" c="-0.00342479" />
+-            <distortion focal="48" model="ptlens" a="-0.000410749" b="-0.0000791434" c="-0.000958721" />
+-            <distortion focal="70" model="ptlens" a="-0.00120315" b="0.00145905" c="-0.00120032" />
+-            <distortion focal="99" model="ptlens" a="0.000923285" b="-0.00651435" c="0.00726719" />
+-            <distortion focal="140" model="ptlens" a="-0.00190609" b="0.000381078" c="0.00332496" />
+-            <tca model="poly3" focal="14" br="0.0000867" vr="1.0002346" bb="-0.0000697" vb="1.0001381" />
+-            <tca model="poly3" focal="18" br="0.0000355" vr="1.0001169" bb="-0.0000740" vb="1.0001872" />
+-            <tca model="poly3" focal="25" br="0.0000334" vr="1.0000834" bb="-0.0000785" vb="1.0001885" />
+-            <tca model="poly3" focal="32" br="0.0000818" vr="0.9999374" bb="-0.0000874" vb="1.0001907" />
+-            <tca model="poly3" focal="48" br="0.0001101" vr="0.9998177" bb="-0.0000759" vb="1.0001548" />
+-            <tca model="poly3" focal="70" br="0.0001590" vr="0.9994949" bb="-0.0001671" vb="1.0003511" />
+-            <tca model="poly3" focal="99" br="0.0001559" vr="0.9991839" bb="-0.0001412" vb="1.0003344" />
+-            <tca model="poly3" focal="140" br="0.0001327" vr="0.9993829" bb="-0.0000982" vb="0.9999327" />        
+-	        <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="0.1204" k2="-1.4049" k3="0.4935" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="0.0734" k2="-1.2021" k3="0.3642" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="0.0580" k2="-1.1566" k3="0.3308" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0399" k2="-1.0417" k3="0.2322" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4085" k2="0.6773" k3="-0.9550" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.4199" k2="0.8066" k3="-1.0284" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4353" k2="0.8178" k3="-1.0256" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4688" k2="0.9887" k3="-1.1732" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.5555" k2="1.1158" k3="-1.1486" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.5307" k2="1.1004" k3="-1.1047" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5503" k2="1.1103" k3="-1.0962" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5681" k2="1.2335" k3="-1.2147" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.6285" k2="1.2814" k3="-1.1805" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.5450" k2="1.0668" k3="-0.9869" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.5648" k2="1.0714" k3="-0.9762" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5752" k2="1.1827" k3="-1.0981" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.5163" k2="0.7997" k3="-0.7118" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.4465" k2="0.6425" k3="-0.5861" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.4688" k2="0.6498" k3="-0.5772" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.4439" k2="0.6177" k3="-0.5611" />
+-            <vignetting model="pa" focal="18" aperture="4.3" distance="0.5" k1="-0.0587" k2="-0.3087" k3="-0.0619" />
+-            <vignetting model="pa" focal="18" aperture="4.3" distance="1" k1="-0.0649" k2="-0.3425" k3="-0.0108" />
+-            <vignetting model="pa" focal="18" aperture="4.3" distance="3" k1="-0.0376" k2="-0.3783" k3="0.0035" />
+-            <vignetting model="pa" focal="18" aperture="4.3" distance="1000" k1="-0.1206" k2="-0.2810" k3="-0.0211" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2639" k2="0.3225" k3="-0.2749" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2540" k2="0.2511" k3="-0.2008" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="3" k1="-0.2239" k2="0.1919" k3="-0.1675" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2989" k2="0.2729" k3="-0.1935" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2039" k2="0.0649" k3="-0.0305" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.1905" k2="0.0058" k3="0.0213" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="3" k1="-0.1749" k2="-0.0319" k3="0.0443" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2510" k2="0.0727" k3="-0.0071" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2086" k2="0.0696" k3="-0.0321" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1" k1="-0.1950" k2="0.0117" k3="0.0177" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="3" k1="-0.1774" k2="-0.0451" k3="0.0564" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2499" k2="0.0656" k3="-0.0023" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2201" k2="0.0801" k3="-0.0365" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2029" k2="0.0209" k3="0.0115" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="3" k1="-0.2022" k2="-0.0032" k3="0.0329" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2515" k2="0.0643" k3="-0.0041" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.0703" k2="-0.0678" k3="-0.1154" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.0706" k2="-0.0987" k3="-0.0819" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.1087" k2="-0.1066" k3="-0.0571" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1137" k2="-0.0185" k3="-0.1223" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1367" k2="0.2270" k3="-0.2553" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.1238" k2="0.1686" k3="-0.2106" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.1719" k2="0.1770" k3="-0.1905" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1728" k2="0.2551" k3="-0.2522" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1133" k2="0.0707" k3="-0.0359" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.0909" k2="-0.0087" k3="0.0242" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.1368" k2="-0.0176" k3="0.0585" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1427" k2="0.0586" k3="0.0036" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1156" k2="0.0687" k3="-0.0341" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.0924" k2="-0.0104" k3="0.0274" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1298" k2="-0.0376" k3="0.0699" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1495" k2="0.0629" k3="0.0032" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1310" k2="0.0919" k3="-0.0482" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1049" k2="0.0115" k3="0.0129" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1356" k2="-0.0295" k3="0.0626" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1701" k2="0.1000" k3="-0.0187" />
+-            <vignetting model="pa" focal="32" aperture="5" distance="0.5" k1="-0.1804" k2="0.5238" k3="-0.6403" />
+-            <vignetting model="pa" focal="32" aperture="5" distance="1" k1="-0.1598" k2="0.4341" k3="-0.5655" />
+-            <vignetting model="pa" focal="32" aperture="5" distance="3" k1="-0.1774" k2="0.4073" k3="-0.5354" />
+-            <vignetting model="pa" focal="32" aperture="5" distance="1000" k1="-0.1748" k2="0.3315" k3="-0.4641" />
+-            <vignetting model="pa" focal="32" aperture="5.6" distance="0.5" k1="-0.2181" k2="0.7421" k3="-0.7358" />
+-            <vignetting model="pa" focal="32" aperture="5.6" distance="1" k1="-0.1993" k2="0.6651" k3="-0.6683" />
+-            <vignetting model="pa" focal="32" aperture="5.6" distance="3" k1="-0.2262" k2="0.6720" k3="-0.6610" />
+-            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.2204" k2="0.5827" k3="-0.5819" />
+-            <vignetting model="pa" focal="32" aperture="8" distance="0.5" k1="-0.1110" k2="0.2759" k3="-0.2386" />
+-            <vignetting model="pa" focal="32" aperture="8" distance="1" k1="-0.0916" k2="0.1892" k3="-0.1561" />
+-            <vignetting model="pa" focal="32" aperture="8" distance="3" k1="-0.1274" k2="0.2199" k3="-0.1664" />
+-            <vignetting model="pa" focal="32" aperture="8" distance="1000" k1="-0.1185" k2="0.1155" k3="-0.0746" />
+-            <vignetting model="pa" focal="32" aperture="11" distance="0.5" k1="-0.0577" k2="0.0604" k3="-0.0446" />
+-            <vignetting model="pa" focal="32" aperture="11" distance="1" k1="-0.0466" k2="0.0100" k3="0.0040" />
+-            <vignetting model="pa" focal="32" aperture="11" distance="3" k1="-0.0834" k2="0.0401" k3="-0.0041" />
+-            <vignetting model="pa" focal="32" aperture="11" distance="1000" k1="-0.0842" k2="-0.0332" k3="0.0624" />
+-            <vignetting model="pa" focal="32" aperture="22" distance="0.5" k1="-0.0563" k2="0.0338" k3="-0.0179" />
+-            <vignetting model="pa" focal="32" aperture="22" distance="1" k1="-0.0453" k2="-0.0003" k3="0.0132" />
+-            <vignetting model="pa" focal="32" aperture="22" distance="3" k1="-0.0912" k2="0.0448" k3="-0.0020" />
+-            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.0912" k2="-0.0265" k3="0.0605" />
+-            <vignetting model="pa" focal="48" aperture="5.5" distance="0.5" k1="-0.1135" k2="0.2612" k3="-0.3764" />
+-            <vignetting model="pa" focal="48" aperture="5.5" distance="1" k1="-0.1146" k2="0.2464" k3="-0.3838" />
+-            <vignetting model="pa" focal="48" aperture="5.5" distance="3" k1="-0.1258" k2="0.1982" k3="-0.3434" />
+-            <vignetting model="pa" focal="48" aperture="5.5" distance="1000" k1="-0.1058" k2="0.1661" k3="-0.3322" />
+-            <vignetting model="pa" focal="48" aperture="5.6" distance="0.5" k1="-0.0985" k2="0.2631" k3="-0.3835" />
+-            <vignetting model="pa" focal="48" aperture="5.6" distance="1" k1="-0.0910" k2="0.2435" k3="-0.3853" />
+-            <vignetting model="pa" focal="48" aperture="5.6" distance="3" k1="-0.1044" k2="0.2104" k3="-0.3583" />
+-            <vignetting model="pa" focal="48" aperture="5.6" distance="1000" k1="-0.0888" k2="0.1702" k3="-0.3365" />
+-            <vignetting model="pa" focal="48" aperture="8" distance="0.5" k1="-0.0533" k2="0.1502" k3="-0.1199" />
+-            <vignetting model="pa" focal="48" aperture="8" distance="1" k1="-0.0400" k2="0.1107" k3="-0.0924" />
+-            <vignetting model="pa" focal="48" aperture="8" distance="3" k1="-0.0587" k2="0.0937" k3="-0.0755" />
+-            <vignetting model="pa" focal="48" aperture="8" distance="1000" k1="-0.0424" k2="0.0531" k3="-0.0553" />
+-            <vignetting model="pa" focal="48" aperture="11" distance="0.5" k1="-0.0264" k2="0.0504" k3="-0.0316" />
+-            <vignetting model="pa" focal="48" aperture="11" distance="1" k1="-0.0076" k2="-0.0098" k3="0.0127" />
+-            <vignetting model="pa" focal="48" aperture="11" distance="3" k1="-0.0276" k2="-0.0234" k3="0.0270" />
+-            <vignetting model="pa" focal="48" aperture="11" distance="1000" k1="-0.0100" k2="-0.0670" k3="0.0501" />
+-            <vignetting model="pa" focal="48" aperture="16" distance="0.5" k1="-0.0150" k2="0.0008" k3="0.0043" />
+-            <vignetting model="pa" focal="48" aperture="16" distance="1" k1="-0.0110" k2="-0.0075" k3="0.0131" />
+-            <vignetting model="pa" focal="48" aperture="16" distance="3" k1="-0.0283" k2="-0.0270" k3="0.0299" />
+-            <vignetting model="pa" focal="48" aperture="16" distance="1000" k1="-0.0148" k2="-0.0606" k3="0.0469" />
+-            <vignetting model="pa" focal="48" aperture="22" distance="0.5" k1="-0.0254" k2="0.0275" k3="-0.0124" />
+-            <vignetting model="pa" focal="48" aperture="22" distance="1" k1="-0.0172" k2="0.0038" k3="0.0061" />
+-            <vignetting model="pa" focal="48" aperture="22" distance="3" k1="-0.0417" k2="0.0069" k3="0.0079" />
+-            <vignetting model="pa" focal="48" aperture="22" distance="1000" k1="-0.0217" k2="-0.0465" k3="0.0378" />
+-            <vignetting model="pa" focal="70" aperture="5.8" distance="0.5" k1="-0.2468" k2="0.5478" k3="-0.5848" />
+-            <vignetting model="pa" focal="70" aperture="5.8" distance="1" k1="-0.2083" k2="0.4559" k3="-0.5517" />
+-            <vignetting model="pa" focal="70" aperture="5.8" distance="3" k1="-0.2088" k2="0.3943" k3="-0.5079" />
+-            <vignetting model="pa" focal="70" aperture="5.8" distance="1000" k1="-0.2169" k2="0.3614" k3="-0.4757" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.0527" k2="0.2241" k3="-0.1981" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.0602" k2="0.2572" k3="-0.2299" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.0702" k2="0.2278" k3="-0.2037" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0705" k2="0.2088" k3="-0.1901" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.0052" k2="0.0427" k3="-0.0391" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="0.0065" k2="0.0053" k3="-0.0057" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.0025" k2="-0.0234" k3="0.0165" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0053" k2="-0.0383" k3="0.0307" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.0028" k2="0.0262" k3="-0.0236" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="0.0055" k2="-0.0001" k3="0.0008" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.0050" k2="-0.0238" k3="0.0196" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0114" k2="-0.0280" k3="0.0261" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.0114" k2="0.0408" k3="-0.0315" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0012" k2="0.0096" k3="-0.0034" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.0080" k2="-0.0222" k3="0.0181" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0183" k2="-0.0112" k3="0.0150" />
+-            <vignetting model="pa" focal="99" aperture="5.8" distance="0.5" k1="-0.3418" k2="0.8556" k3="-0.9367" />
+-            <vignetting model="pa" focal="99" aperture="5.8" distance="1" k1="-0.1814" k2="0.2439" k3="-0.4961" />
+-            <vignetting model="pa" focal="99" aperture="5.8" distance="3" k1="-0.1118" k2="-0.0229" k3="-0.3051" />
+-            <vignetting model="pa" focal="99" aperture="5.8" distance="1000" k1="-0.0967" k2="-0.1548" k3="-0.1961" />
+-            <vignetting model="pa" focal="99" aperture="8" distance="0.5" k1="-0.1868" k2="0.7844" k3="-0.7327" />
+-            <vignetting model="pa" focal="99" aperture="8" distance="1" k1="-0.1717" k2="0.6821" k3="-0.6645" />
+-            <vignetting model="pa" focal="99" aperture="8" distance="3" k1="-0.1406" k2="0.6005" k3="-0.6117" />
+-            <vignetting model="pa" focal="99" aperture="8" distance="1000" k1="-0.1527" k2="0.5551" k3="-0.5731" />
+-            <vignetting model="pa" focal="99" aperture="11" distance="0.5" k1="-0.0571" k2="0.2611" k3="-0.2392" />
+-            <vignetting model="pa" focal="99" aperture="11" distance="1" k1="-0.0651" k2="0.2200" k3="-0.1956" />
+-            <vignetting model="pa" focal="99" aperture="11" distance="3" k1="-0.0435" k2="0.1696" k3="-0.1602" />
+-            <vignetting model="pa" focal="99" aperture="11" distance="1000" k1="-0.0782" k2="0.1915" k3="-0.1710" />
+-            <vignetting model="pa" focal="99" aperture="16" distance="0.5" k1="0.0036" k2="0.0202" k3="-0.0224" />
+-            <vignetting model="pa" focal="99" aperture="16" distance="1" k1="-0.0159" k2="0.0176" k3="-0.0103" />
+-            <vignetting model="pa" focal="99" aperture="16" distance="3" k1="0.0022" k2="-0.0133" k3="0.0077" />
+-            <vignetting model="pa" focal="99" aperture="16" distance="1000" k1="-0.0221" k2="-0.0366" k3="0.0377" />
+-            <vignetting model="pa" focal="99" aperture="22" distance="0.5" k1="0.0052" k2="0.0008" k3="-0.0030" />
+-            <vignetting model="pa" focal="99" aperture="22" distance="1" k1="-0.0165" k2="0.0107" k3="-0.0031" />
+-            <vignetting model="pa" focal="99" aperture="22" distance="3" k1="-0.0055" k2="0.0049" k3="-0.0040" />
+-            <vignetting model="pa" focal="99" aperture="22" distance="1000" k1="-0.0262" k2="-0.0336" k3="0.0371" />
+-            <vignetting model="pa" focal="140" aperture="5.8" distance="0.5" k1="-0.2318" k2="0.6000" k3="-0.8918" />
+-            <vignetting model="pa" focal="140" aperture="5.8" distance="1" k1="0.0607" k2="-0.6084" k3="0.0529" />
+-            <vignetting model="pa" focal="140" aperture="5.8" distance="3" k1="0.1067" k2="-0.9530" k3="0.3587" />
+-            <vignetting model="pa" focal="140" aperture="5.8" distance="1000" k1="0.1003" k2="-1.0369" k3="0.4506" />
+-            <vignetting model="pa" focal="140" aperture="8" distance="0.5" k1="-0.2470" k2="1.1758" k3="-1.2411" />
+-            <vignetting model="pa" focal="140" aperture="8" distance="1" k1="-0.0542" k2="0.4705" k3="-0.6946" />
+-            <vignetting model="pa" focal="140" aperture="8" distance="3" k1="0.0074" k2="0.1963" k3="-0.4765" />
+-            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="0.0358" k2="0.0801" k3="-0.3855" />
+-            <vignetting model="pa" focal="140" aperture="11" distance="0.5" k1="-0.2548" k2="1.0687" k3="-1.0002" />
+-            <vignetting model="pa" focal="140" aperture="11" distance="1" k1="-0.1400" k2="0.6396" k3="-0.6297" />
+-            <vignetting model="pa" focal="140" aperture="11" distance="3" k1="-0.1257" k2="0.5400" k3="-0.5388" />
+-            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.1251" k2="0.5189" k3="-0.5126" />
+-            <vignetting model="pa" focal="140" aperture="16" distance="0.5" k1="-0.1405" k2="0.5837" k3="-0.5246" />
+-            <vignetting model="pa" focal="140" aperture="16" distance="1" k1="-0.0235" k2="0.1481" k3="-0.1453" />
+-            <vignetting model="pa" focal="140" aperture="16" distance="3" k1="-0.0169" k2="0.0659" k3="-0.0620" />
+-            <vignetting model="pa" focal="140" aperture="16" distance="1000" k1="-0.0305" k2="0.0938" k3="-0.0757" />
+-            <vignetting model="pa" focal="140" aperture="22" distance="0.5" k1="-0.0328" k2="0.1547" k3="-0.1340" />
+-            <vignetting model="pa" focal="140" aperture="22" distance="1" k1="0.0092" k2="0.0086" k3="-0.0156" />
+-            <vignetting model="pa" focal="140" aperture="22" distance="3" k1="-0.0056" k2="0.0098" k3="-0.0061" />
+-            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0267" k2="0.0536" k3="-0.0313" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 14-42mm f/3.5-5.6 II Asph. Mega OIS</model>
++        <model lang="en">Lumix G Vario 14-42mm f/3.5-5.6 II</model>
++        <mount>Micro 4/3 System</mount>
++        <focal min="14" max="42"/>
++        <aperture min="3.5" max="5.6"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="14" model="ptlens" a="0.0225278" b="-0.0802366" c="0.00964907"/>
++            <distortion focal="18" model="ptlens" a="0.0429574" b="-0.140955" c="0.102005"/>
++            <distortion focal="25" model="ptlens" a="0.0136782" b="-0.0405175" c="0.0293264"/>
++            <distortion focal="35" model="ptlens" a="0.00177402" b="0.00379145" c="-0.000383617"/>
++            <distortion focal="42" model="ptlens" a="-0.00198101" b="0.0153511" c="-0.00974301"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.1926" k2="-0.5161" k3="0.1650"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.1926" k2="-0.5161" k3="0.1650"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.1634" k2="-0.3651" k3="-0.0056"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.1634" k2="-0.3651" k3="-0.0056"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.3835" k2="0.5740" k3="-0.6269"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3835" k2="0.5740" k3="-0.6269"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.3886" k2="0.7040" k3="-0.7046"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.3886" k2="0.7040" k3="-0.7046"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.5057" k2="0.9068" k3="-0.7483"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5057" k2="0.9068" k3="-0.7483"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.4771" k2="0.7660" k3="-0.5941"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.4771" k2="0.7660" k3="-0.5941"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.4521" k2="0.6309" k3="-0.4670"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.4521" k2="0.6309" k3="-0.4670"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2778" k2="-0.0052" k3="0.0050"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2778" k2="-0.0052" k3="0.0050"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.3188" k2="0.2849" k3="-0.1858"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3188" k2="0.2849" k3="-0.1858"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3045" k2="0.1705" k3="-0.0602"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3045" k2="0.1705" k3="-0.0602"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1960" k2="-0.0043" k3="0.0167"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1960" k2="-0.0043" k3="0.0167"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2516" k2="0.0986" k3="-0.0354"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2516" k2="0.0986" k3="-0.0354"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2881" k2="0.1190" k3="-0.0304"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2881" k2="0.1190" k3="-0.0304"/>
++            <vignetting model="pa" focal="25" aperture="5.3" distance="10" k1="-0.1805" k2="-0.0073" k3="-0.0255"/>
++            <vignetting model="pa" focal="25" aperture="5.3" distance="1000" k1="-0.1805" k2="-0.0073" k3="-0.0255"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.1652" k2="-0.0049" k3="-0.0368"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1652" k2="-0.0049" k3="-0.0368"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.2012" k2="0.0253" k3="0.0170"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2012" k2="0.0253" k3="0.0170"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="10" k1="-0.1830" k2="0.0134" k3="0.0173"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1830" k2="0.0134" k3="0.0173"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.1745" k2="0.0148" k3="0.0132"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.1745" k2="0.0148" k3="0.0132"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.1907" k2="0.0381" k3="-0.0017"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1907" k2="0.0381" k3="-0.0017"/>
++            <vignetting model="pa" focal="35" aperture="5.5" distance="10" k1="-0.2088" k2="-0.0157" k3="0.0163"/>
++            <vignetting model="pa" focal="35" aperture="5.5" distance="1000" k1="-0.2088" k2="-0.0157" k3="0.0163"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2191" k2="0.0021" k3="0.0065"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2191" k2="0.0021" k3="0.0065"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1610" k2="0.0325" k3="-0.0149"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1610" k2="0.0325" k3="-0.0149"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.1274" k2="-0.0357" k3="0.0273"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1274" k2="-0.0357" k3="0.0273"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.1525" k2="0.0034" k3="0.0065"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1525" k2="0.0034" k3="0.0065"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1682" k2="0.0437" k3="-0.0230"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1682" k2="0.0437" k3="-0.0230"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="10" k1="-0.5059" k2="0.6085" k3="-0.3705"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.5059" k2="0.6085" k3="-0.3705"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="10" k1="-0.2117" k2="0.2821" k3="-0.2506"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2117" k2="0.2821" k3="-0.2506"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="10" k1="-0.1682" k2="0.1370" k3="-0.1155"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.1682" k2="0.1370" k3="-0.1155"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="10" k1="-0.1471" k2="0.0159" k3="-0.0079"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1471" k2="0.0159" k3="-0.0079"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="10" k1="-0.1486" k2="0.0136" k3="-0.0007"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1486" k2="0.0136" k3="-0.0007"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Panasonic</maker>
+-        <model>LUMIX G VARIO 45-200mm F4.0-5.6</model>
++        <model>Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS + GWC1 0.79x</model>
++        <model lang="en">Lumix G X Vario PZ 14-42mm f/3.5-5.6 + GWC1 0.79×</model>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal min="14" max="42"/>
++        <aperture min="3.5" max="22"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="45" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="61" a="0" b="0.00494" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.00645" c="0" />
+-            <distortion model="ptlens" focal="103" a="-0.001" b="0.007" c="0.002" />
+-            <distortion model="ptlens" focal="144" a="-0.005" b="0.023" c="-0.015" />
+-            <distortion model="ptlens" focal="180" a="-0.003" b="0.020" c="-0.017" />
+-            <distortion model="ptlens" focal="200" a="0.004" b="-0.007" c="0.012" />
++            <distortion focal="14" model="ptlens" a="0.0179152" b="-0.045476" c="-0.00473275"/>
++            <distortion focal="18" model="ptlens" a="0.025807" b="-0.0640215" c="0.0309495"/>
++            <distortion focal="25" model="ptlens" a="0.0116902" b="-0.0256329" c="0.0158116"/>
++            <distortion focal="35" model="ptlens" a="0.0115103" b="-0.0149202" c="0.00888769"/>
++            <distortion focal="42" model="ptlens" a="0.00886028" b="-0.003387" c="0.000962099"/>
++            <tca model="poly3" focal="14" br="0.0001359" vr="1.0000609" bb="-0.0000804" vb="1.0002627"/>
++            <tca model="poly3" focal="18" br="0.0000834" vr="1.0001707" bb="-0.0000528" vb="1.0001610"/>
++            <tca model="poly3" focal="25" br="0.0000700" vr="1.0003581" bb="-0.0000636" vb="1.0000337"/>
++            <tca model="poly3" focal="35" br="0.0000657" vr="1.0003876" bb="-0.0000258" vb="0.9998841"/>
++            <tca model="poly3" focal="42" br="0.0001242" vr="1.0003650" bb="-0.0000807" vb="0.9999576"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2549" k2="-0.9540" k3="0.5212"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.1498" k2="-1.2155" k3="0.6383"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1251" k2="-1.2176" k3="0.6926"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0969" k2="-1.2431" k3="0.7274"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1766" k2="-0.9398" k3="0.4530"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0996" k2="-1.1445" k3="0.5322"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0868" k2="-1.1608" k3="0.6072"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.0452" k2="-1.2580" k3="0.6997"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4805" k2="0.2388" k3="-0.2811"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.4465" k2="0.1928" k3="-0.3400"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.4028" k2="0.0605" k3="-0.2032"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3344" k2="-0.0982" k3="-0.0872"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5059" k2="0.2898" k3="-0.2420"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.5356" k2="0.4598" k3="-0.4434"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4881" k2="0.3249" k3="-0.3242"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4280" k2="0.2116" k3="-0.2645"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.4271" k2="-0.0329" k3="0.0697"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.4270" k2="-0.0133" k3="0.0429"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3947" k2="-0.0819" k3="0.0931"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3682" k2="-0.0789" k3="0.0589"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.1912" k2="-0.6479" k3="0.5580"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.1946" k2="-0.5671" k3="0.3795"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1984" k2="-0.6116" k3="0.5695"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1654" k2="-0.6738" k3="0.7110"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.2588" k2="-0.2385" k3="0.2977"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3008" k2="-0.0338" k3="0.0211"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2724" k2="-0.1898" k3="0.2417"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2073" k2="-0.3615" k3="0.4299"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.1450" k2="-0.6284" k3="0.6146"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2679" k2="-0.1437" k3="0.1198"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2276" k2="-0.3153" k3="0.3104"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1597" k2="-0.4757" k3="0.4601"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.1394" k2="-0.6045" k3="0.5520"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2667" k2="-0.1437" k3="0.1189"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2314" k2="-0.2738" k3="0.2494"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1660" k2="-0.4073" k3="0.3592"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.1607" k2="-0.4948" k3="0.4304"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2627" k2="-0.1488" k3="0.1207"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2515" k2="-0.1796" k3="0.1552"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2011" k2="-0.2576" k3="0.2105"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.1605" k2="-0.2826" k3="0.1400"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1704" k2="-0.2367" k3="0.0927"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1647" k2="-0.2657" k3="0.2869"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.0814" k2="-0.3983" k3="0.4973"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2195" k2="0.0285" k3="-0.0993"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2409" k2="0.0779" k3="-0.1414"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2239" k2="0.0108" k3="0.0585"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1743" k2="-0.0808" k3="0.2378"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.1772" k2="-0.1601" k3="0.1228"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2003" k2="-0.0648" k3="0.0412"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1459" k2="-0.2637" k3="0.2603"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.0717" k2="-0.4325" k3="0.4228"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.1780" k2="-0.1659" k3="0.1175"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2037" k2="-0.1147" k3="0.0837"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1607" k2="-0.2069" k3="0.1835"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.0884" k2="-0.3324" k3="0.2905"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1804" k2="-0.1504" k3="0.1015"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2014" k2="-0.1208" k3="0.0875"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1836" k2="-0.1111" k3="0.0897"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1288" k2="-0.1626" k3="0.1271"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.1712" k2="-0.2632" k3="-0.0268"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1828" k2="-0.0487" k3="-0.1482"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1482" k2="-0.0817" k3="-0.0963"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1381" k2="-0.0322" k3="-0.1095"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2529" k2="0.1687" k3="-0.3660"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2920" k2="0.3823" k3="-0.4492"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2587" k2="0.3245" k3="-0.3772"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2305" k2="0.3164" k3="-0.3577"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3261" k2="0.3561" k3="-0.4036"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2711" k2="0.2367" k3="-0.2281"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2092" k2="0.0795" k3="-0.0907"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1616" k2="0.0051" k3="-0.0271"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.2705" k2="0.0927" k3="-0.1214"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2044" k2="-0.0560" k3="0.0400"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1606" k2="-0.1177" k3="0.0848"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1306" k2="-0.1038" k3="0.0659"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2246" k2="-0.0875" k3="0.0435"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2019" k2="-0.0648" k3="0.0480"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1596" k2="-0.1190" k3="0.0846"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1316" k2="-0.1029" k3="0.0654"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.3748" k2="0.0411" k3="-0.2413"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.3684" k2="0.2509" k3="-0.3389"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.3606" k2="0.3085" k3="-0.3427"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3268" k2="0.2812" k3="-0.3033"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1963" k2="0.0032" k3="-0.3776"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2559" k2="0.3367" k3="-0.5121"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2601" k2="0.4003" k3="-0.5105"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2625" k2="0.4721" k3="-0.5322"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3470" k2="0.5343" k3="-0.7429"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3344" k2="0.5798" k3="-0.6194"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2945" k2="0.4594" k3="-0.4694"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2695" k2="0.4102" k3="-0.3925"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4661" k2="0.8819" k3="-0.9227"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.2938" k2="0.3266" k3="-0.3223"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2113" k2="0.0888" k3="-0.0971"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1746" k2="0.0250" k3="-0.0258"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4630" k2="0.7983" k3="-0.7757"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2044" k2="-0.0300" k3="0.0078"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1664" k2="-0.0868" k3="0.0613"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1599" k2="-0.0358" k3="0.0291"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Panasonic</maker>
+-	    <model>LUMIX G VARIO 100-300/F4.0-5.6</model>
+-	    <focal min="100" max="300" />
+-	    <aperture min="4" max="22" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="100" model="ptlens" a="-0.000115873" b="0.00367061" c="0.000486072" />
+-            <distortion focal="150" model="ptlens" a="-0.000100403" b="0.000815659" c="0.00253173" />
+-            <distortion focal="197" model="ptlens" a="-0.0029432" b="0.0069786" c="-0.00246844" />
+-            <distortion focal="246" model="ptlens" a="-0.00294535" b="0.0111089" c="-0.010398" /> 
+-	        <distortion focal="300" model="ptlens" a="0.00409853" b="-0.00799507" c="0.00980475" />
+-	        <tca focal="100" model="poly3" br="-0.0000288" vr="0.9999865" bb="-0.0000845" vb="1.0001016" />
+-            <tca focal="150" model="poly3" br="-0.0000893" vr="0.9999362" bb="-0.0000124" vb="0.9998824" />
+-            <tca focal="201" model="poly3" br="0.0000085" vr="0.9997969" bb="-0.0001544" vb="0.9997401" />
+-            <tca focal="252" model="poly3" br="0.0000600" vr="0.9997044" bb="0.0000330" vb="0.9993205" />
+-            <tca focal="300" model="poly3" br="0.0001282" vr="0.9995055" bb="0.0003644" vb="0.9989849" />                   
+-	        <vignetting model="pa" focal="100" aperture="4" distance="1.5" k1="-1.0955" k2="1.0732" k3="-0.5374" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="3" k1="-0.8250" k2="0.6604" k3="-0.3331" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="9" k1="-0.7323" k2="0.5977" k3="-0.3260" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.6990" k2="0.6356" k3="-0.3703" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1.5" k1="0.0014" k2="-0.2276" k3="-0.0957" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="-0.0627" k2="-0.0453" k3="-0.1597" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="9" k1="-0.0531" k2="-0.1102" k3="-0.0839" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0436" k2="-0.1352" k3="-0.0643" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1.5" k1="-0.1922" k2="0.4486" k3="-0.3736" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1932" k2="0.4408" k3="-0.3641" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="9" k1="-0.1851" k2="0.4138" k3="-0.3466" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1870" k2="0.4082" k3="-0.3438" />
+-            <vignetting model="pa" focal="100" aperture="11" distance="1.5" k1="-0.1040" k2="0.0860" k3="-0.0285" />
+-            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.1000" k2="0.0686" k3="-0.0150" />
+-            <vignetting model="pa" focal="100" aperture="11" distance="9" k1="-0.0860" k2="0.0306" k3="0.0087" />
+-            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0870" k2="0.0202" k3="0.0136" />
+-            <vignetting model="pa" focal="100" aperture="22" distance="1.5" k1="-0.1171" k2="0.1076" k3="-0.0371" />
+-            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1044" k2="0.0750" k3="-0.0163" />
+-            <vignetting model="pa" focal="100" aperture="22" distance="9" k1="-0.0819" k2="0.0231" k3="0.0146" />
+-            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0742" k2="-0.0119" k3="0.0344" />
+-            <vignetting model="pa" focal="150" aperture="4.5" distance="1.5" k1="-0.9708" k2="0.8772" k3="-0.4192" />
+-            <vignetting model="pa" focal="150" aperture="4.5" distance="3" k1="-0.7444" k2="0.4822" k3="-0.2016" />
+-            <vignetting model="pa" focal="150" aperture="4.5" distance="9" k1="-0.5112" k2="0.0811" k3="0.0150" />
+-            <vignetting model="pa" focal="150" aperture="4.5" distance="1000" k1="-0.3935" k2="-0.0608" k3="0.0662" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1.5" k1="-0.0805" k2="-0.6345" k3="0.3377" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1231" k2="-0.8161" k3="0.3880" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="9" k1="0.1168" k2="-0.6028" k3="0.2276" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0686" k2="-0.4034" k3="0.0951" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1.5" k1="-0.0917" k2="0.2725" k3="-0.2315" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="-0.0833" k2="0.1700" k3="-0.1298" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="9" k1="-0.0783" k2="0.1582" k3="-0.1221" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0703" k2="0.1368" k3="-0.1088" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1.5" k1="-0.0323" k2="0.0383" k3="-0.0038" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.0427" k2="0.0109" k3="0.0178" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="9" k1="-0.0318" k2="-0.0089" k3="0.0299" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0299" k2="-0.0215" k3="0.0378" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1.5" k1="-0.0408" k2="0.0638" k3="-0.0213" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0506" k2="0.0259" k3="0.0078" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="9" k1="-0.0307" k2="-0.0083" k3="0.0285" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0369" k2="-0.0062" k3="0.0267" />
+-            <vignetting model="pa" focal="197" aperture="4.9" distance="1.5" k1="-0.3910" k2="-0.2972" k3="0.2571" />
+-            <vignetting model="pa" focal="197" aperture="4.9" distance="3" k1="-0.4069" k2="-0.1423" k3="0.1062" />
+-            <vignetting model="pa" focal="197" aperture="4.9" distance="9" k1="-0.0545" k2="-0.9693" k3="0.5861" />
+-            <vignetting model="pa" focal="197" aperture="4.9" distance="1000" k1="0.0149" k2="-1.1890" k3="0.7299" />
+-            <vignetting model="pa" focal="197" aperture="5.6" distance="1.5" k1="-0.1439" k2="-0.3976" k3="0.2078" />
+-            <vignetting model="pa" focal="197" aperture="5.6" distance="3" k1="0.0717" k2="-0.8687" k3="0.4395" />
+-	        <vignetting model="pa" focal="197" aperture="5.6" distance="9" k1="0.2605" k2="-1.2592" k3="0.6404" />
+-            <vignetting model="pa" focal="197" aperture="5.6" distance="1000" k1="0.2564" k2="-1.3100" k3="0.6844" />
+-            <vignetting model="pa" focal="197" aperture="8" distance="1.5" k1="-0.0399" k2="0.1088" k3="-0.0745" />
+-            <vignetting model="pa" focal="197" aperture="8" distance="3" k1="-0.0839" k2="0.2336" k3="-0.1938" />
+-            <vignetting model="pa" focal="197" aperture="8" distance="9" k1="-0.0898" k2="0.2598" k3="-0.2195" />
+-            <vignetting model="pa" focal="197" aperture="8" distance="1000" k1="-0.0907" k2="0.2745" k3="-0.2411" />
+-            <vignetting model="pa" focal="197" aperture="11" distance="1.5" k1="-0.0201" k2="0.0404" k3="-0.0108" />
+-            <vignetting model="pa" focal="197" aperture="11" distance="3" k1="-0.0317" k2="0.0195" k3="0.0067" />
+-            <vignetting model="pa" focal="197" aperture="11" distance="9" k1="-0.0283" k2="0.0164" k3="0.0083" />
+-            <vignetting model="pa" focal="197" aperture="11" distance="1000" k1="-0.0277" k2="0.0125" k3="0.0105" />
+-            <vignetting model="pa" focal="197" aperture="22" distance="1.5" k1="-0.0286" k2="0.0613" k3="-0.0242" />
+-            <vignetting model="pa" focal="197" aperture="22" distance="3" k1="-0.0260" k2="0.0057" k3="0.0158" />
+-            <vignetting model="pa" focal="197" aperture="22" distance="9" k1="-0.0194" k2="-0.0003" k3="0.0170" />
+-            <vignetting model="pa" focal="197" aperture="22" distance="1000" k1="-0.0220" k2="-0.0023" k3="0.0192" />
+-            <vignetting model="pa" focal="246" aperture="5.3" distance="1.5" k1="-0.2608" k2="-0.5259" k3="0.3610" />
+-            <vignetting model="pa" focal="246" aperture="5.3" distance="3" k1="-0.3991" k2="-0.5124" k3="0.4169" />
+-            <vignetting model="pa" focal="246" aperture="5.3" distance="9" k1="-0.5003" k2="-0.3435" k3="0.3309" />
+-            <vignetting model="pa" focal="246" aperture="5.3" distance="1000" k1="-0.5323" k2="-0.2905" k3="0.3031" />
+-            <vignetting model="pa" focal="246" aperture="5.6" distance="1.5" k1="-0.3560" k2="-0.0983" k3="0.0493" />
+-            <vignetting model="pa" focal="246" aperture="5.6" distance="3" k1="-0.3121" k2="-0.6532" k3="0.4841" />
+-            <vignetting model="pa" focal="246" aperture="5.6" distance="9" k1="-0.4411" k2="-0.4386" k3="0.3764" />
+-            <vignetting model="pa" focal="246" aperture="5.6" distance="1000" k1="-0.4499" k2="-0.4224" k3="0.3656" />
+-            <vignetting model="pa" focal="246" aperture="8" distance="1.5" k1="-0.0567" k2="0.1869" k3="-0.2111" />
+-            <vignetting model="pa" focal="246" aperture="8" distance="3" k1="0.0166" k2="-0.0098" k3="-0.1545" />
+-            <vignetting model="pa" focal="246" aperture="8" distance="9" k1="0.0361" k2="-0.1152" k3="-0.0924" />
+-            <vignetting model="pa" focal="246" aperture="8" distance="1000" k1="0.0509" k2="-0.1685" k3="-0.0613" />
+-            <vignetting model="pa" focal="246" aperture="11" distance="1.5" k1="-0.0395" k2="0.0412" k3="-0.0129" />
+-            <vignetting model="pa" focal="246" aperture="11" distance="3" k1="-0.0274" k2="0.0361" k3="-0.0152" />
+-            <vignetting model="pa" focal="246" aperture="11" distance="9" k1="-0.0420" k2="0.0741" k3="-0.0470" />
+-            <vignetting model="pa" focal="246" aperture="11" distance="1000" k1="-0.0409" k2="0.0821" k3="-0.0567" />
+-            <vignetting model="pa" focal="246" aperture="22" distance="1.5" k1="-0.0764" k2="0.1101" k3="-0.0541" />
+-            <vignetting model="pa" focal="246" aperture="22" distance="3" k1="-0.0639" k2="0.0931" k3="-0.0446" />
+-            <vignetting model="pa" focal="246" aperture="22" distance="9" k1="-0.0567" k2="0.0833" k3="-0.0406" />
+-            <vignetting model="pa" focal="246" aperture="22" distance="1000" k1="-0.0654" k2="0.1020" k3="-0.0516" />
+-            <vignetting model="pa" focal="300" aperture="5.6" distance="1.5" k1="-0.2600" k2="-0.7092" k3="0.5152" />
+-	        <vignetting model="pa" focal="300" aperture="5.6" distance="3" k1="-0.9052" k2="0.4908" k3="-0.1330" />	
+-            <vignetting model="pa" focal="300" aperture="5.6" distance="9" k1="-0.9686" k2="0.6111" k3="-0.2010" />
+-            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.0075" k2="0.6822" k3="-0.2405" />
+-            <vignetting model="pa" focal="300" aperture="8" distance="1.5" k1="0.0773" k2="-0.2965" k3="0.0494" />
+-	        <vignetting model="pa" focal="300" aperture="8" distance="3" k1="0.0994" k2="-0.5948" k3="0.2509" />
+-            <vignetting model="pa" focal="300" aperture="8" distance="9" k1="0.1010" k2="-0.6763" k3="0.3144" />
+-            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0799" k2="-0.6948" k3="0.3399" />
+-            <vignetting model="pa" focal="300" aperture="11" distance="1.5" k1="-0.0350" k2="0.0621" k3="-0.0416" />
+-            <vignetting model="pa" focal="300" aperture="11" distance="3" k1="-0.0696" k2="0.2147" k3="-0.2020" />
+-	        <vignetting model="pa" focal="300" aperture="11" distance="9" k1="-0.0449" k2="0.1895" k3="-0.2176" />
+-            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0432" k2="0.1722" k3="-0.2217" />
+-            <vignetting model="pa" focal="300" aperture="16" distance="1.5" k1="-0.0255" k2="0.0285" k3="-0.0106" />
+-	        <vignetting model="pa" focal="300" aperture="16" distance="3" k1="-0.0331" k2="0.0567" k3="-0.0302" />
+-            <vignetting model="pa" focal="300" aperture="16" distance="9" k1="-0.0193" k2="0.0222" k3="-0.0096" />
+-            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0239" k2="0.0160" k3="-0.0035" />
+-            <vignetting model="pa" focal="300" aperture="22" distance="1.5" k1="-0.0217" k2="0.0226" k3="-0.0074" />
+-	        <vignetting model="pa" focal="300" aperture="22" distance="3" k1="-0.0431" k2="0.0849" k3="-0.0478" />
+-            <vignetting model="pa" focal="300" aperture="22" distance="9" k1="-0.0379" k2="0.0532" k3="-0.0267" />
+-            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.0344" k2="0.0302" k3="-0.0103" />
+-	    </calibration>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 14-45mm f/3.5-5.6 Asph. Mega OIS</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="14" k1="-0.028"/>
++            <distortion model="poly3" focal="15" k1="-0.027"/>
++            <distortion model="poly3" focal="16" k1="-0.027"/>
++            <distortion model="poly3" focal="17" k1="-0.026"/>
++            <distortion model="poly3" focal="18" k1="-0.022"/>
++            <distortion model="poly3" focal="19" k1="-0.021"/>
++            <distortion model="poly3" focal="20" k1="-0.018"/>
++            <distortion model="poly3" focal="21" k1="-0.017"/>
++            <distortion model="poly3" focal="22" k1="-0.016"/>
++            <distortion model="poly3" focal="23" k1="-0.016"/>
++            <distortion model="poly3" focal="24" k1="-0.013"/>
++            <distortion model="poly3" focal="25" k1="-0.011"/>
++            <distortion model="poly3" focal="26" k1="-0.011"/>
++            <distortion model="poly3" focal="27" k1="-0.011"/>
++            <distortion model="poly3" focal="28" k1="-0.011"/>
++            <distortion model="poly3" focal="29" k1="-0.008"/>
++            <distortion model="poly3" focal="30" k1="-0.008"/>
++            <distortion model="poly3" focal="31" k1="-0.007"/>
++            <distortion model="poly3" focal="32" k1="-0.006"/>
++            <distortion model="poly3" focal="33" k1="-0.006"/>
++            <distortion model="poly3" focal="34" k1="-0.006"/>
++            <distortion model="poly3" focal="35" k1="-0.005"/>
++            <distortion model="poly3" focal="36" k1="-0.005"/>
++            <distortion model="poly3" focal="37" k1="-0.005"/>
++            <distortion model="poly3" focal="38" k1="-0.003"/>
++            <distortion model="poly3" focal="39" k1="-0.003"/>
++            <distortion model="poly3" focal="40" k1="-0.003"/>
++            <distortion model="poly3" focal="41" k1="-0.002"/>
++            <distortion model="poly3" focal="42" k1="-0.002"/>
++            <distortion model="poly3" focal="43" k1="-0.002"/>
++            <distortion model="poly3" focal="44" k1="-0.002"/>
++            <distortion model="poly3" focal="45" k1="-0.002"/>
++            <tca model="poly3" focal="14" br="-0.0000208" cr="-0.0001450" vr="0.9999670" bb="0.0000551" cb="0.0004740" vb="0.9997706"/>
++            <tca model="poly3" focal="15" br="-0.0000208" cr="-0.0001450" vr="0.9999670" bb="0.0000551" cb="0.0004740" vb="0.9997706"/>
++            <tca model="poly3" focal="16" br="0.0000004" cr="0.0001262" vr="0.9999621" bb="0.0000448" cb="0.0003730" vb="0.9998125"/>
++            <tca model="poly3" focal="17" br="-0.0000238" cr="0.0001654" vr="0.9999548" bb="-0.0001032" cb="0.0004285" vb="0.9998252"/>
++            <tca model="poly3" focal="18" br="-0.0000278" cr="0.0001658" vr="0.9999524" bb="-0.0000671" cb="0.0002216" vb="0.9999079"/>
++            <tca model="poly3" focal="19" br="-0.0001241" cr="0.0003412" vr="0.9998798" bb="-0.0001394" cb="0.0002996" vb="0.9998814"/>
++            <tca model="poly3" focal="20" br="-0.0001187" cr="0.0003339" vr="0.9998891" bb="-0.0001665" cb="0.0002155" vb="0.9999358"/>
++            <tca model="poly3" focal="21" br="-0.0001187" cr="0.0003339" vr="0.9998891" bb="-0.0001665" cb="0.0002155" vb="0.9999358"/>
++            <tca model="poly3" focal="22" br="-0.0000673" cr="0.0002186" vr="0.9999365" bb="-0.0002032" cb="0.0002750" vb="0.9998907"/>
++            <tca model="poly3" focal="23" br="-0.0000884" cr="0.0002615" vr="0.9999049" bb="-0.0001770" cb="0.0001873" vb="0.9999257"/>
++            <tca model="poly3" focal="24" br="-0.0000884" cr="0.0002615" vr="0.9999049" bb="-0.0001770" cb="0.0001873" vb="0.9999257"/>
++            <tca model="poly3" focal="25" br="-0.0001291" cr="0.0003318" vr="0.9998718" bb="-0.0000991" cb="0.0000141" vb="0.9999903"/>
++            <tca model="poly3" focal="26" br="-0.0001086" cr="0.0002857" vr="0.9998944" bb="-0.0001846" cb="0.0001735" vb="0.9999208"/>
++            <tca model="poly3" focal="27" br="-0.0001086" cr="0.0002857" vr="0.9998944" bb="-0.0001846" cb="0.0001735" vb="0.9999208"/>
++            <tca model="poly3" focal="28" br="-0.0000860" cr="0.0002475" vr="0.9998917" bb="-0.0001547" cb="0.0001266" vb="0.9999016"/>
++            <tca model="poly3" focal="29" br="-0.0000047" cr="0.0000585" vr="0.9999748" bb="-0.0001541" cb="0.0000921" vb="0.9999271"/>
++            <tca model="poly3" focal="30" br="-0.0000276" cr="0.0001067" vr="0.9999561" bb="-0.0001001" cb="-0.0000262" vb="0.9999608"/>
++            <tca model="poly3" focal="31" br="-0.0000147" cr="0.0000757" vr="0.9999669" bb="-0.0001550" cb="0.0000799" vb="0.9999128"/>
++            <tca model="poly3" focal="32" br="-0.0000147" cr="0.0000757" vr="0.9999669" bb="-0.0001550" cb="0.0000799" vb="0.9999128"/>
++            <tca model="poly3" focal="33" br="-0.0000147" cr="0.0000757" vr="0.9999669" bb="-0.0001550" cb="0.0000799" vb="0.9999128"/>
++            <tca model="poly3" focal="34" br="0.0000020" cr="0.0000080" vr="1.0000083" bb="-0.0001221" cb="0.0000361" vb="0.9999098"/>
++            <tca model="poly3" focal="35" br="-0.0000315" cr="0.0000743" vr="0.9999683" bb="-0.0002006" cb="0.0002110" vb="0.9998378"/>
++            <tca model="poly3" focal="36" br="-0.0000315" cr="0.0000743" vr="0.9999683" bb="-0.0002006" cb="0.0002110" vb="0.9998378"/>
++            <tca model="poly3" focal="37" br="0.0000162" cr="-0.0000315" vr="1.0000125" bb="-0.0001136" cb="0.0000350" vb="0.9999376"/>
++            <tca model="poly3" focal="38" br="0.0000162" cr="-0.0000315" vr="1.0000125" bb="-0.0001136" cb="0.0000350" vb="0.9999376"/>
++            <tca model="poly3" focal="39" br="0.0000162" cr="-0.0000315" vr="1.0000125" bb="-0.0001136" cb="0.0000350" vb="0.9999376"/>
++            <tca model="poly3" focal="40" br="-0.0000113" cr="0.0000208" vr="0.9999843" bb="-0.0002226" cb="0.0002580" vb="0.9998716"/>
++            <tca model="poly3" focal="41" br="-0.0000113" cr="0.0000208" vr="0.9999843" bb="-0.0002226" cb="0.0002580" vb="0.9998716"/>
++            <tca model="poly3" focal="42" br="-0.0000113" cr="0.0000208" vr="0.9999843" bb="-0.0002226" cb="0.0002580" vb="0.9998716"/>
++            <tca model="poly3" focal="43" br="-0.0000067" cr="-0.0000019" vr="1.0000013" bb="-0.0002214" cb="0.0002490" vb="0.9999027"/>
++            <tca model="poly3" focal="44" br="-0.0000067" cr="-0.0000019" vr="1.0000013" bb="-0.0002214" cb="0.0002490" vb="0.9999027"/>
++            <tca model="poly3" focal="45" br="0.0000014" cr="-0.0000123" vr="1.0000005" bb="-0.0003283" cb="0.0004525" vb="0.9998245"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.4160" k2="-0.0535" k3="-0.2092"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.4160" k2="-0.0535" k3="-0.2092"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="0.0541" k2="-0.6281" k3="-0.0360"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0541" k2="-0.6281" k3="-0.0360"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.2505" k2="0.7187" k3="-0.9480"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2505" k2="0.7187" k3="-0.9480"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.4017" k2="1.1520" k3="-1.1655"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4017" k2="1.1520" k3="-1.1655"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.4148" k2="1.1171" k3="-1.0530"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.4148" k2="1.1171" k3="-1.0530"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.3212" k2="0.7555" k3="-0.7030"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.3212" k2="0.7555" k3="-0.7030"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.2166" k2="0.3349" k3="-0.3206"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.2166" k2="0.3349" k3="-0.3206"/>
++            <vignetting model="pa" focal="18" aperture="3.9" distance="10" k1="-0.4309" k2="0.3071" k3="-0.2317"/>
++            <vignetting model="pa" focal="18" aperture="3.9" distance="1000" k1="-0.4309" k2="0.3071" k3="-0.2317"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.4241" k2="0.2954" k3="-0.2265"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.4241" k2="0.2954" k3="-0.2265"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.1319" k2="0.1410" k3="-0.1074"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1319" k2="0.1410" k3="-0.1074"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.1238" k2="0.0888" k3="-0.0480"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1238" k2="0.0888" k3="-0.0480"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1394" k2="0.1180" k3="-0.0645"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1394" k2="0.1180" k3="-0.0645"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.1259" k2="0.0951" k3="-0.0495"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.1259" k2="0.0951" k3="-0.0495"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1373" k2="0.1134" k3="-0.0625"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1373" k2="0.1134" k3="-0.0625"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="10" k1="-0.2750" k2="0.2124" k3="-0.1047"/>
++            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.2750" k2="0.2124" k3="-0.1047"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.0334" k2="-0.0118" k3="-0.0138"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.0334" k2="-0.0118" k3="-0.0138"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.0782" k2="0.1240" k3="-0.0669"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.0782" k2="0.1240" k3="-0.0669"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="10" k1="-0.0841" k2="0.1289" k3="-0.0656"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.0841" k2="0.1289" k3="-0.0656"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.0772" k2="0.1200" k3="-0.0590"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.0772" k2="0.1200" k3="-0.0590"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.0712" k2="0.1057" k3="-0.0509"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.0712" k2="0.1057" k3="-0.0509"/>
++            <vignetting model="pa" focal="35" aperture="5.5" distance="10" k1="-0.1301" k2="0.0355" k3="-0.0074"/>
++            <vignetting model="pa" focal="35" aperture="5.5" distance="1000" k1="-0.1301" k2="0.0355" k3="-0.0074"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1888" k2="0.1667" k3="-0.0708"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1888" k2="0.1667" k3="-0.0708"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.0015" k2="0.0348" k3="-0.0264"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.0015" k2="0.0348" k3="-0.0264"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.0125" k2="0.0582" k3="-0.0401"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.0125" k2="0.0582" k3="-0.0401"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.0031" k2="0.0421" k3="-0.0282"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.0031" k2="0.0421" k3="-0.0282"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.0069" k2="0.0442" k3="-0.0295"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.0069" k2="0.0442" k3="-0.0295"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.2882" k2="0.7409" k3="-0.7107"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.2882" k2="0.7409" k3="-0.7107"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="10" k1="-0.0883" k2="0.3356" k3="-0.2890"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.0883" k2="0.3356" k3="-0.2890"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.0376" k2="0.1277" k3="-0.0958"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.0376" k2="0.1277" k3="-0.0958"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="10" k1="-0.0025" k2="0.0521" k3="-0.0423"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.0025" k2="0.0521" k3="-0.0423"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.0041" k2="0.0502" k3="-0.0419"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.0041" k2="0.0502" k3="-0.0419"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Panasonic</maker>
+-        <model>Leica DG Summilux 25/f1.4</model>
+-	<mount>Micro 4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <model>Lumix G Vario HD 14-140mm f/4.0-5.8 Asph. Mega OIS</model>
++        <model lang="en">Lumix G Vario HD 14-140mm f/4.0-5.8</model>
++        <mount>Micro 4/3 System</mount>
++        <focal min="14" max="140"/>
++        <aperture min="4" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="14" model="ptlens" a="0.00966207" b="-0.0543377" c="-0.00740716"/>
++            <distortion focal="18" model="ptlens" a="0.00949869" b="-0.0385525" c="0.00465051"/>
++            <distortion focal="25" model="ptlens" a="0.00754759" b="-0.0231595" c="0.00924953"/>
++            <distortion focal="32" model="ptlens" a="-0.000903732" b="0.00151614" c="-0.00342479"/>
++            <distortion focal="48" model="ptlens" a="-0.000410749" b="-0.0000791434" c="-0.000958721"/>
++            <distortion focal="70" model="ptlens" a="-0.00120315" b="0.00145905" c="-0.00120032"/>
++            <distortion focal="99" model="ptlens" a="0.000923285" b="-0.00651435" c="0.00726719"/>
++            <distortion focal="140" model="ptlens" a="-0.00190609" b="0.000381078" c="0.00332496"/>
++            <tca model="poly3" focal="14" br="0.0000867" vr="1.0002346" bb="-0.0000697" vb="1.0001381"/>
++            <tca model="poly3" focal="18" br="0.0000355" vr="1.0001169" bb="-0.0000740" vb="1.0001872"/>
++            <tca model="poly3" focal="25" br="0.0000334" vr="1.0000834" bb="-0.0000785" vb="1.0001885"/>
++            <tca model="poly3" focal="32" br="0.0000818" vr="0.9999374" bb="-0.0000874" vb="1.0001907"/>
++            <tca model="poly3" focal="48" br="0.0001101" vr="0.9998177" bb="-0.0000759" vb="1.0001548"/>
++            <tca model="poly3" focal="70" br="0.0001590" vr="0.9994949" bb="-0.0001671" vb="1.0003511"/>
++            <tca model="poly3" focal="99" br="0.0001559" vr="0.9991839" bb="-0.0001412" vb="1.0003344"/>
++            <tca model="poly3" focal="140" br="0.0001327" vr="0.9993829" bb="-0.0000982" vb="0.9999327"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="0.1204" k2="-1.4049" k3="0.4935"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="0.0734" k2="-1.2021" k3="0.3642"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="0.0580" k2="-1.1566" k3="0.3308"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0399" k2="-1.0417" k3="0.2322"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4085" k2="0.6773" k3="-0.9550"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.4199" k2="0.8066" k3="-1.0284"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4353" k2="0.8178" k3="-1.0256"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4688" k2="0.9887" k3="-1.1732"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.5555" k2="1.1158" k3="-1.1486"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.5307" k2="1.1004" k3="-1.1047"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5503" k2="1.1103" k3="-1.0962"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5681" k2="1.2335" k3="-1.2147"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.6285" k2="1.2814" k3="-1.1805"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.5450" k2="1.0668" k3="-0.9869"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.5648" k2="1.0714" k3="-0.9762"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5752" k2="1.1827" k3="-1.0981"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.5163" k2="0.7997" k3="-0.7118"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.4465" k2="0.6425" k3="-0.5861"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.4688" k2="0.6498" k3="-0.5772"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.4439" k2="0.6177" k3="-0.5611"/>
++            <vignetting model="pa" focal="18" aperture="4.3" distance="0.5" k1="-0.0587" k2="-0.3087" k3="-0.0619"/>
++            <vignetting model="pa" focal="18" aperture="4.3" distance="1" k1="-0.0649" k2="-0.3425" k3="-0.0108"/>
++            <vignetting model="pa" focal="18" aperture="4.3" distance="3" k1="-0.0376" k2="-0.3783" k3="0.0035"/>
++            <vignetting model="pa" focal="18" aperture="4.3" distance="1000" k1="-0.1206" k2="-0.2810" k3="-0.0211"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2639" k2="0.3225" k3="-0.2749"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2540" k2="0.2511" k3="-0.2008"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="3" k1="-0.2239" k2="0.1919" k3="-0.1675"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2989" k2="0.2729" k3="-0.1935"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2039" k2="0.0649" k3="-0.0305"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.1905" k2="0.0058" k3="0.0213"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="3" k1="-0.1749" k2="-0.0319" k3="0.0443"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2510" k2="0.0727" k3="-0.0071"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2086" k2="0.0696" k3="-0.0321"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1" k1="-0.1950" k2="0.0117" k3="0.0177"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="3" k1="-0.1774" k2="-0.0451" k3="0.0564"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2499" k2="0.0656" k3="-0.0023"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2201" k2="0.0801" k3="-0.0365"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2029" k2="0.0209" k3="0.0115"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="3" k1="-0.2022" k2="-0.0032" k3="0.0329"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2515" k2="0.0643" k3="-0.0041"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.0703" k2="-0.0678" k3="-0.1154"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.0706" k2="-0.0987" k3="-0.0819"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.1087" k2="-0.1066" k3="-0.0571"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1137" k2="-0.0185" k3="-0.1223"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1367" k2="0.2270" k3="-0.2553"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.1238" k2="0.1686" k3="-0.2106"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.1719" k2="0.1770" k3="-0.1905"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1728" k2="0.2551" k3="-0.2522"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1133" k2="0.0707" k3="-0.0359"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.0909" k2="-0.0087" k3="0.0242"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.1368" k2="-0.0176" k3="0.0585"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1427" k2="0.0586" k3="0.0036"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1156" k2="0.0687" k3="-0.0341"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.0924" k2="-0.0104" k3="0.0274"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1298" k2="-0.0376" k3="0.0699"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1495" k2="0.0629" k3="0.0032"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1310" k2="0.0919" k3="-0.0482"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1049" k2="0.0115" k3="0.0129"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1356" k2="-0.0295" k3="0.0626"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1701" k2="0.1000" k3="-0.0187"/>
++            <vignetting model="pa" focal="32" aperture="5" distance="0.5" k1="-0.1804" k2="0.5238" k3="-0.6403"/>
++            <vignetting model="pa" focal="32" aperture="5" distance="1" k1="-0.1598" k2="0.4341" k3="-0.5655"/>
++            <vignetting model="pa" focal="32" aperture="5" distance="3" k1="-0.1774" k2="0.4073" k3="-0.5354"/>
++            <vignetting model="pa" focal="32" aperture="5" distance="1000" k1="-0.1748" k2="0.3315" k3="-0.4641"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="0.5" k1="-0.2181" k2="0.7421" k3="-0.7358"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="1" k1="-0.1993" k2="0.6651" k3="-0.6683"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="3" k1="-0.2262" k2="0.6720" k3="-0.6610"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.2204" k2="0.5827" k3="-0.5819"/>
++            <vignetting model="pa" focal="32" aperture="8" distance="0.5" k1="-0.1110" k2="0.2759" k3="-0.2386"/>
++            <vignetting model="pa" focal="32" aperture="8" distance="1" k1="-0.0916" k2="0.1892" k3="-0.1561"/>
++            <vignetting model="pa" focal="32" aperture="8" distance="3" k1="-0.1274" k2="0.2199" k3="-0.1664"/>
++            <vignetting model="pa" focal="32" aperture="8" distance="1000" k1="-0.1185" k2="0.1155" k3="-0.0746"/>
++            <vignetting model="pa" focal="32" aperture="11" distance="0.5" k1="-0.0577" k2="0.0604" k3="-0.0446"/>
++            <vignetting model="pa" focal="32" aperture="11" distance="1" k1="-0.0466" k2="0.0100" k3="0.0040"/>
++            <vignetting model="pa" focal="32" aperture="11" distance="3" k1="-0.0834" k2="0.0401" k3="-0.0041"/>
++            <vignetting model="pa" focal="32" aperture="11" distance="1000" k1="-0.0842" k2="-0.0332" k3="0.0624"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="0.5" k1="-0.0563" k2="0.0338" k3="-0.0179"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="1" k1="-0.0453" k2="-0.0003" k3="0.0132"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="3" k1="-0.0912" k2="0.0448" k3="-0.0020"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.0912" k2="-0.0265" k3="0.0605"/>
++            <vignetting model="pa" focal="48" aperture="5.5" distance="0.5" k1="-0.1135" k2="0.2612" k3="-0.3764"/>
++            <vignetting model="pa" focal="48" aperture="5.5" distance="1" k1="-0.1146" k2="0.2464" k3="-0.3838"/>
++            <vignetting model="pa" focal="48" aperture="5.5" distance="3" k1="-0.1258" k2="0.1982" k3="-0.3434"/>
++            <vignetting model="pa" focal="48" aperture="5.5" distance="1000" k1="-0.1058" k2="0.1661" k3="-0.3322"/>
++            <vignetting model="pa" focal="48" aperture="5.6" distance="0.5" k1="-0.0985" k2="0.2631" k3="-0.3835"/>
++            <vignetting model="pa" focal="48" aperture="5.6" distance="1" k1="-0.0910" k2="0.2435" k3="-0.3853"/>
++            <vignetting model="pa" focal="48" aperture="5.6" distance="3" k1="-0.1044" k2="0.2104" k3="-0.3583"/>
++            <vignetting model="pa" focal="48" aperture="5.6" distance="1000" k1="-0.0888" k2="0.1702" k3="-0.3365"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="0.5" k1="-0.0533" k2="0.1502" k3="-0.1199"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="1" k1="-0.0400" k2="0.1107" k3="-0.0924"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="3" k1="-0.0587" k2="0.0937" k3="-0.0755"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="1000" k1="-0.0424" k2="0.0531" k3="-0.0553"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="0.5" k1="-0.0264" k2="0.0504" k3="-0.0316"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="1" k1="-0.0076" k2="-0.0098" k3="0.0127"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="3" k1="-0.0276" k2="-0.0234" k3="0.0270"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="1000" k1="-0.0100" k2="-0.0670" k3="0.0501"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="0.5" k1="-0.0150" k2="0.0008" k3="0.0043"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="1" k1="-0.0110" k2="-0.0075" k3="0.0131"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="3" k1="-0.0283" k2="-0.0270" k3="0.0299"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="1000" k1="-0.0148" k2="-0.0606" k3="0.0469"/>
++            <vignetting model="pa" focal="48" aperture="22" distance="0.5" k1="-0.0254" k2="0.0275" k3="-0.0124"/>
++            <vignetting model="pa" focal="48" aperture="22" distance="1" k1="-0.0172" k2="0.0038" k3="0.0061"/>
++            <vignetting model="pa" focal="48" aperture="22" distance="3" k1="-0.0417" k2="0.0069" k3="0.0079"/>
++            <vignetting model="pa" focal="48" aperture="22" distance="1000" k1="-0.0217" k2="-0.0465" k3="0.0378"/>
++            <vignetting model="pa" focal="70" aperture="5.8" distance="0.5" k1="-0.2468" k2="0.5478" k3="-0.5848"/>
++            <vignetting model="pa" focal="70" aperture="5.8" distance="1" k1="-0.2083" k2="0.4559" k3="-0.5517"/>
++            <vignetting model="pa" focal="70" aperture="5.8" distance="3" k1="-0.2088" k2="0.3943" k3="-0.5079"/>
++            <vignetting model="pa" focal="70" aperture="5.8" distance="1000" k1="-0.2169" k2="0.3614" k3="-0.4757"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.0527" k2="0.2241" k3="-0.1981"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.0602" k2="0.2572" k3="-0.2299"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.0702" k2="0.2278" k3="-0.2037"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0705" k2="0.2088" k3="-0.1901"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.0052" k2="0.0427" k3="-0.0391"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="0.0065" k2="0.0053" k3="-0.0057"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.0025" k2="-0.0234" k3="0.0165"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0053" k2="-0.0383" k3="0.0307"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.0028" k2="0.0262" k3="-0.0236"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="0.0055" k2="-0.0001" k3="0.0008"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.0050" k2="-0.0238" k3="0.0196"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0114" k2="-0.0280" k3="0.0261"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.0114" k2="0.0408" k3="-0.0315"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0012" k2="0.0096" k3="-0.0034"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.0080" k2="-0.0222" k3="0.0181"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0183" k2="-0.0112" k3="0.0150"/>
++            <vignetting model="pa" focal="99" aperture="5.8" distance="0.5" k1="-0.3418" k2="0.8556" k3="-0.9367"/>
++            <vignetting model="pa" focal="99" aperture="5.8" distance="1" k1="-0.1814" k2="0.2439" k3="-0.4961"/>
++            <vignetting model="pa" focal="99" aperture="5.8" distance="3" k1="-0.1118" k2="-0.0229" k3="-0.3051"/>
++            <vignetting model="pa" focal="99" aperture="5.8" distance="1000" k1="-0.0967" k2="-0.1548" k3="-0.1961"/>
++            <vignetting model="pa" focal="99" aperture="8" distance="0.5" k1="-0.1868" k2="0.7844" k3="-0.7327"/>
++            <vignetting model="pa" focal="99" aperture="8" distance="1" k1="-0.1717" k2="0.6821" k3="-0.6645"/>
++            <vignetting model="pa" focal="99" aperture="8" distance="3" k1="-0.1406" k2="0.6005" k3="-0.6117"/>
++            <vignetting model="pa" focal="99" aperture="8" distance="1000" k1="-0.1527" k2="0.5551" k3="-0.5731"/>
++            <vignetting model="pa" focal="99" aperture="11" distance="0.5" k1="-0.0571" k2="0.2611" k3="-0.2392"/>
++            <vignetting model="pa" focal="99" aperture="11" distance="1" k1="-0.0651" k2="0.2200" k3="-0.1956"/>
++            <vignetting model="pa" focal="99" aperture="11" distance="3" k1="-0.0435" k2="0.1696" k3="-0.1602"/>
++            <vignetting model="pa" focal="99" aperture="11" distance="1000" k1="-0.0782" k2="0.1915" k3="-0.1710"/>
++            <vignetting model="pa" focal="99" aperture="16" distance="0.5" k1="0.0036" k2="0.0202" k3="-0.0224"/>
++            <vignetting model="pa" focal="99" aperture="16" distance="1" k1="-0.0159" k2="0.0176" k3="-0.0103"/>
++            <vignetting model="pa" focal="99" aperture="16" distance="3" k1="0.0022" k2="-0.0133" k3="0.0077"/>
++            <vignetting model="pa" focal="99" aperture="16" distance="1000" k1="-0.0221" k2="-0.0366" k3="0.0377"/>
++            <vignetting model="pa" focal="99" aperture="22" distance="0.5" k1="0.0052" k2="0.0008" k3="-0.0030"/>
++            <vignetting model="pa" focal="99" aperture="22" distance="1" k1="-0.0165" k2="0.0107" k3="-0.0031"/>
++            <vignetting model="pa" focal="99" aperture="22" distance="3" k1="-0.0055" k2="0.0049" k3="-0.0040"/>
++            <vignetting model="pa" focal="99" aperture="22" distance="1000" k1="-0.0262" k2="-0.0336" k3="0.0371"/>
++            <vignetting model="pa" focal="140" aperture="5.8" distance="0.5" k1="-0.2318" k2="0.6000" k3="-0.8918"/>
++            <vignetting model="pa" focal="140" aperture="5.8" distance="1" k1="0.0607" k2="-0.6084" k3="0.0529"/>
++            <vignetting model="pa" focal="140" aperture="5.8" distance="3" k1="0.1067" k2="-0.9530" k3="0.3587"/>
++            <vignetting model="pa" focal="140" aperture="5.8" distance="1000" k1="0.1003" k2="-1.0369" k3="0.4506"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="0.5" k1="-0.2470" k2="1.1758" k3="-1.2411"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="1" k1="-0.0542" k2="0.4705" k3="-0.6946"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="3" k1="0.0074" k2="0.1963" k3="-0.4765"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="0.0358" k2="0.0801" k3="-0.3855"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="0.5" k1="-0.2548" k2="1.0687" k3="-1.0002"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="1" k1="-0.1400" k2="0.6396" k3="-0.6297"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="3" k1="-0.1257" k2="0.5400" k3="-0.5388"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.1251" k2="0.5189" k3="-0.5126"/>
++            <vignetting model="pa" focal="140" aperture="16" distance="0.5" k1="-0.1405" k2="0.5837" k3="-0.5246"/>
++            <vignetting model="pa" focal="140" aperture="16" distance="1" k1="-0.0235" k2="0.1481" k3="-0.1453"/>
++            <vignetting model="pa" focal="140" aperture="16" distance="3" k1="-0.0169" k2="0.0659" k3="-0.0620"/>
++            <vignetting model="pa" focal="140" aperture="16" distance="1000" k1="-0.0305" k2="0.0938" k3="-0.0757"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="0.5" k1="-0.0328" k2="0.1547" k3="-0.1340"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="1" k1="0.0092" k2="0.0086" k3="-0.0156"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="3" k1="-0.0056" k2="0.0098" k3="-0.0061"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0267" k2="0.0536" k3="-0.0313"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS</model>
++        <model lang="en">Lumix G Vario 45-200mm f/4.0-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="45" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="61" a="0" b="0.00494" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0.00645" c="0"/>
++            <distortion model="ptlens" focal="103" a="-0.001" b="0.007" c="0.002"/>
++            <distortion model="ptlens" focal="144" a="-0.005" b="0.023" c="-0.015"/>
++            <distortion model="ptlens" focal="180" a="-0.003" b="0.020" c="-0.017"/>
++            <distortion model="ptlens" focal="200" a="0.004" b="-0.007" c="0.012"/>
++            <tca model="poly3" focal="45" br="0.0002491" cr="-0.0003291" vr="1.0003614" bb="-0.0002521" cb="0.0003911" vb="1.0001921"/>
++            <tca model="poly3" focal="48" br="0.0002909" cr="-0.0005117" vr="1.0004838" bb="-0.0002371" cb="0.0004303" vb="1.0001433"/>
++            <tca model="poly3" focal="51" br="0.0000570" cr="-0.0000572" vr="1.0002728" bb="-0.0002094" cb="0.0003893" vb="1.0001340"/>
++            <tca model="poly3" focal="54" br="0.0001358" cr="-0.0002477" vr="1.0003771" bb="-0.0002789" cb="0.0005808" vb="1.0000762"/>
++            <tca model="poly3" focal="56" br="-0.0000164" cr="-0.0000112" vr="1.0002853" bb="-0.0002080" cb="0.0004875" vb="1.0001319"/>
++            <tca model="poly3" focal="58" br="-0.0001291" cr="0.0001690" vr="1.0002287" bb="-0.0002333" cb="0.0005439" vb="1.0000954"/>
++            <tca model="poly3" focal="60" br="-0.0000461" cr="-0.0000129" vr="1.0002900" bb="-0.0001714" cb="0.0004801" vb="1.0000342"/>
++            <tca model="poly3" focal="61" br="-0.0001310" cr="0.0001226" vr="1.0002525" bb="-0.0001563" cb="0.0004613" vb="1.0000603"/>
++            <tca model="poly3" focal="64" br="-0.0001245" cr="0.0001321" vr="1.0002061" bb="-0.0001024" cb="0.0003560" vb="1.0000513"/>
++            <tca model="poly3" focal="67" br="-0.0000861" cr="0.0000129" vr="1.0002805" bb="-0.0000366" cb="0.0002734" vb="1.0001014"/>
++            <tca model="poly3" focal="70" br="-0.0000833" cr="-0.0000246" vr="1.0002973" bb="-0.0000276" cb="0.0002149" vb="1.0001060"/>
++            <tca model="poly3" focal="72" br="-0.0001446" cr="0.0001549" vr="1.0001286" bb="-0.0000490" cb="0.0002554" vb="0.9999955"/>
++            <tca model="poly3" focal="75" br="-0.0000553" cr="-0.0000917" vr="1.0002702" bb="-0.0000377" cb="0.0002348" vb="0.9999980"/>
++            <tca model="poly3" focal="78" br="0.0000080" cr="-0.0002679" vr="1.0003734" bb="-0.0000076" cb="0.0001643" vb="1.0000291"/>
++            <tca model="poly3" focal="84" br="-0.0000692" cr="-0.0000673" vr="1.0002094" bb="-0.0000708" cb="0.0002790" vb="0.9999036"/>
++            <tca model="poly3" focal="87" br="-0.0000225" cr="-0.0001272" vr="1.0001567" bb="-0.0000733" cb="0.0003031" vb="0.9997940"/>
++            <tca model="poly3" focal="91" br="-0.0000838" cr="0.0000524" vr="1.0000039" bb="-0.0000940" cb="0.0003413" vb="0.9996942"/>
++            <tca model="poly3" focal="97" br="-0.0000760" cr="-0.0000063" vr="1.0000045" bb="-0.0000976" cb="0.0003433" vb="0.9996213"/>
++            <tca model="poly3" focal="103" br="-0.0001313" cr="0.0001422" vr="0.9998652" bb="-0.0000656" cb="0.0003064" vb="0.9995406"/>
++            <tca model="poly3" focal="109" br="-0.0002464" cr="0.0004299" vr="0.9996141" bb="-0.0001265" cb="0.0003912" vb="0.9994278"/>
++            <tca model="poly3" focal="115" br="-0.0002238" cr="-0.0004029" vr="0.9995575" bb="-0.0000389" cb="0.0002367" vb="0.9994119"/>
++            <tca model="poly3" focal="124" br="-0.0002462" cr="0.0004402" vr="0.9994769" bb="0.0000483" cb="0.0000813" vb="0.9993894"/>
++            <tca model="poly3" focal="128" br="-0.0003208" cr="0.0005956" vr="0.9993373" bb="0.0000136" cb="0.0001659" vb="0.9993007"/>
++            <tca model="poly3" focal="136" br="-0.0002478" cr="0.0004831" vr="0.9992168" bb="0.0002149" cb="-0.0002975" vb="0.9994873"/>
++            <tca model="poly3" focal="144" br="-0.0003296" cr="0.0007404" vr="0.9989345" bb="0.0002767" cb="-0.0003831" vb="0.9994482"/>
++            <tca model="poly3" focal="151" br="-0.0004167" cr="0.00084113" vr="0.9989021" bb="0.0002371" cb="-0.0002466" vb="0.9993190"/>
++            <tca model="poly3" focal="158" br="-0.0003654" cr="0.0007633" vr="0.9988054" bb="0.0002777" cb="-0.0002939" vb="0.9992661"/>
++            <tca model="poly3" focal="166" br="-0.0003434" cr="0.0007445" vr="0.9987393" bb="0.0002284" cb="-0.0001623" vb="0.9991666"/>
++            <tca model="poly3" focal="171" br="-0.0003770" cr="0.0010373" vr="0.9982450" bb="0.0002746" cb="-0.0003666" vb="0.9993719"/>
++            <tca model="poly3" focal="175" br="-0.0002354" cr="0.0007147" vr="0.9984138" bb="0.0002058" cb="-0.0001702" vb="0.9992057"/>
++            <tca model="poly3" focal="184" br="-0.0001451" cr="0.0005013" vr="0.9984561" bb="0.0002734" cb="-0.0002731" vb="0.9991873"/>
++            <tca model="poly3" focal="189" br="-0.0002848" cr="0.0007834" vr="0.9983149" bb="0.0002174" cb="-0.0001037" vb="0.9990331"/>
++            <tca model="poly3" focal="195" br="-0.0003179" cr="0.0009810" vr="0.9980567" bb="0.0003163" cb="-0.0003625" vb="0.9991786"/>
++            <tca model="poly3" focal="200" br="-0.0001336" cr="0.0006505" vr="0.9981137" bb="0.0002790" cb="-0.0003193" vb="0.9992274"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 100-300mm f/4.0-5.6 Mega OIS</model>
++        <model lang="en">Lumix G Vario 100-300mm f/4.0-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <focal min="100" max="300"/>
++        <aperture min="4" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="100" model="ptlens" a="-0.000115873" b="0.00367061" c="0.000486072"/>
++            <distortion focal="150" model="ptlens" a="-0.000100403" b="0.000815659" c="0.00253173"/>
++            <distortion focal="197" model="ptlens" a="-0.0029432" b="0.0069786" c="-0.00246844"/>
++            <distortion focal="246" model="ptlens" a="-0.00294535" b="0.0111089" c="-0.010398"/>
++            <distortion focal="300" model="ptlens" a="0.00409853" b="-0.00799507" c="0.00980475"/>
++            <tca focal="100" model="poly3" br="-0.0000288" vr="0.9999865" bb="-0.0000845" vb="1.0001016"/>
++            <tca focal="150" model="poly3" br="-0.0000893" vr="0.9999362" bb="-0.0000124" vb="0.9998824"/>
++            <tca focal="201" model="poly3" br="0.0000085" vr="0.9997969" bb="-0.0001544" vb="0.9997401"/>
++            <tca focal="252" model="poly3" br="0.0000600" vr="0.9997044" bb="0.0000330" vb="0.9993205"/>
++            <tca focal="300" model="poly3" br="0.0001282" vr="0.9995055" bb="0.0003644" vb="0.9989849"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1.5" k1="-1.0955" k2="1.0732" k3="-0.5374"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="3" k1="-0.8250" k2="0.6604" k3="-0.3331"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="9" k1="-0.7323" k2="0.5977" k3="-0.3260"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.6990" k2="0.6356" k3="-0.3703"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1.5" k1="0.0014" k2="-0.2276" k3="-0.0957"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="-0.0627" k2="-0.0453" k3="-0.1597"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="9" k1="-0.0531" k2="-0.1102" k3="-0.0839"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0436" k2="-0.1352" k3="-0.0643"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1.5" k1="-0.1922" k2="0.4486" k3="-0.3736"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1932" k2="0.4408" k3="-0.3641"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="9" k1="-0.1851" k2="0.4138" k3="-0.3466"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1870" k2="0.4082" k3="-0.3438"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1.5" k1="-0.1040" k2="0.0860" k3="-0.0285"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.1000" k2="0.0686" k3="-0.0150"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="9" k1="-0.0860" k2="0.0306" k3="0.0087"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0870" k2="0.0202" k3="0.0136"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1.5" k1="-0.1171" k2="0.1076" k3="-0.0371"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1044" k2="0.0750" k3="-0.0163"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="9" k1="-0.0819" k2="0.0231" k3="0.0146"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0742" k2="-0.0119" k3="0.0344"/>
++            <vignetting model="pa" focal="150" aperture="4.5" distance="1.5" k1="-0.9708" k2="0.8772" k3="-0.4192"/>
++            <vignetting model="pa" focal="150" aperture="4.5" distance="3" k1="-0.7444" k2="0.4822" k3="-0.2016"/>
++            <vignetting model="pa" focal="150" aperture="4.5" distance="9" k1="-0.5112" k2="0.0811" k3="0.0150"/>
++            <vignetting model="pa" focal="150" aperture="4.5" distance="1000" k1="-0.3935" k2="-0.0608" k3="0.0662"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1.5" k1="-0.0805" k2="-0.6345" k3="0.3377"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1231" k2="-0.8161" k3="0.3880"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="9" k1="0.1168" k2="-0.6028" k3="0.2276"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0686" k2="-0.4034" k3="0.0951"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1.5" k1="-0.0917" k2="0.2725" k3="-0.2315"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="-0.0833" k2="0.1700" k3="-0.1298"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="9" k1="-0.0783" k2="0.1582" k3="-0.1221"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0703" k2="0.1368" k3="-0.1088"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1.5" k1="-0.0323" k2="0.0383" k3="-0.0038"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.0427" k2="0.0109" k3="0.0178"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="9" k1="-0.0318" k2="-0.0089" k3="0.0299"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0299" k2="-0.0215" k3="0.0378"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1.5" k1="-0.0408" k2="0.0638" k3="-0.0213"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0506" k2="0.0259" k3="0.0078"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="9" k1="-0.0307" k2="-0.0083" k3="0.0285"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0369" k2="-0.0062" k3="0.0267"/>
++            <vignetting model="pa" focal="197" aperture="4.9" distance="1.5" k1="-0.3910" k2="-0.2972" k3="0.2571"/>
++            <vignetting model="pa" focal="197" aperture="4.9" distance="3" k1="-0.4069" k2="-0.1423" k3="0.1062"/>
++            <vignetting model="pa" focal="197" aperture="4.9" distance="9" k1="-0.0545" k2="-0.9693" k3="0.5861"/>
++            <vignetting model="pa" focal="197" aperture="4.9" distance="1000" k1="0.0149" k2="-1.1890" k3="0.7299"/>
++            <vignetting model="pa" focal="197" aperture="5.6" distance="1.5" k1="-0.1439" k2="-0.3976" k3="0.2078"/>
++            <vignetting model="pa" focal="197" aperture="5.6" distance="3" k1="0.0717" k2="-0.8687" k3="0.4395"/>
++            <vignetting model="pa" focal="197" aperture="5.6" distance="9" k1="0.2605" k2="-1.2592" k3="0.6404"/>
++            <vignetting model="pa" focal="197" aperture="5.6" distance="1000" k1="0.2564" k2="-1.3100" k3="0.6844"/>
++            <vignetting model="pa" focal="197" aperture="8" distance="1.5" k1="-0.0399" k2="0.1088" k3="-0.0745"/>
++            <vignetting model="pa" focal="197" aperture="8" distance="3" k1="-0.0839" k2="0.2336" k3="-0.1938"/>
++            <vignetting model="pa" focal="197" aperture="8" distance="9" k1="-0.0898" k2="0.2598" k3="-0.2195"/>
++            <vignetting model="pa" focal="197" aperture="8" distance="1000" k1="-0.0907" k2="0.2745" k3="-0.2411"/>
++            <vignetting model="pa" focal="197" aperture="11" distance="1.5" k1="-0.0201" k2="0.0404" k3="-0.0108"/>
++            <vignetting model="pa" focal="197" aperture="11" distance="3" k1="-0.0317" k2="0.0195" k3="0.0067"/>
++            <vignetting model="pa" focal="197" aperture="11" distance="9" k1="-0.0283" k2="0.0164" k3="0.0083"/>
++            <vignetting model="pa" focal="197" aperture="11" distance="1000" k1="-0.0277" k2="0.0125" k3="0.0105"/>
++            <vignetting model="pa" focal="197" aperture="22" distance="1.5" k1="-0.0286" k2="0.0613" k3="-0.0242"/>
++            <vignetting model="pa" focal="197" aperture="22" distance="3" k1="-0.0260" k2="0.0057" k3="0.0158"/>
++            <vignetting model="pa" focal="197" aperture="22" distance="9" k1="-0.0194" k2="-0.0003" k3="0.0170"/>
++            <vignetting model="pa" focal="197" aperture="22" distance="1000" k1="-0.0220" k2="-0.0023" k3="0.0192"/>
++            <vignetting model="pa" focal="246" aperture="5.3" distance="1.5" k1="-0.2608" k2="-0.5259" k3="0.3610"/>
++            <vignetting model="pa" focal="246" aperture="5.3" distance="3" k1="-0.3991" k2="-0.5124" k3="0.4169"/>
++            <vignetting model="pa" focal="246" aperture="5.3" distance="9" k1="-0.5003" k2="-0.3435" k3="0.3309"/>
++            <vignetting model="pa" focal="246" aperture="5.3" distance="1000" k1="-0.5323" k2="-0.2905" k3="0.3031"/>
++            <vignetting model="pa" focal="246" aperture="5.6" distance="1.5" k1="-0.3560" k2="-0.0983" k3="0.0493"/>
++            <vignetting model="pa" focal="246" aperture="5.6" distance="3" k1="-0.3121" k2="-0.6532" k3="0.4841"/>
++            <vignetting model="pa" focal="246" aperture="5.6" distance="9" k1="-0.4411" k2="-0.4386" k3="0.3764"/>
++            <vignetting model="pa" focal="246" aperture="5.6" distance="1000" k1="-0.4499" k2="-0.4224" k3="0.3656"/>
++            <vignetting model="pa" focal="246" aperture="8" distance="1.5" k1="-0.0567" k2="0.1869" k3="-0.2111"/>
++            <vignetting model="pa" focal="246" aperture="8" distance="3" k1="0.0166" k2="-0.0098" k3="-0.1545"/>
++            <vignetting model="pa" focal="246" aperture="8" distance="9" k1="0.0361" k2="-0.1152" k3="-0.0924"/>
++            <vignetting model="pa" focal="246" aperture="8" distance="1000" k1="0.0509" k2="-0.1685" k3="-0.0613"/>
++            <vignetting model="pa" focal="246" aperture="11" distance="1.5" k1="-0.0395" k2="0.0412" k3="-0.0129"/>
++            <vignetting model="pa" focal="246" aperture="11" distance="3" k1="-0.0274" k2="0.0361" k3="-0.0152"/>
++            <vignetting model="pa" focal="246" aperture="11" distance="9" k1="-0.0420" k2="0.0741" k3="-0.0470"/>
++            <vignetting model="pa" focal="246" aperture="11" distance="1000" k1="-0.0409" k2="0.0821" k3="-0.0567"/>
++            <vignetting model="pa" focal="246" aperture="22" distance="1.5" k1="-0.0764" k2="0.1101" k3="-0.0541"/>
++            <vignetting model="pa" focal="246" aperture="22" distance="3" k1="-0.0639" k2="0.0931" k3="-0.0446"/>
++            <vignetting model="pa" focal="246" aperture="22" distance="9" k1="-0.0567" k2="0.0833" k3="-0.0406"/>
++            <vignetting model="pa" focal="246" aperture="22" distance="1000" k1="-0.0654" k2="0.1020" k3="-0.0516"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1.5" k1="-0.2600" k2="-0.7092" k3="0.5152"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="3" k1="-0.9052" k2="0.4908" k3="-0.1330"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="9" k1="-0.9686" k2="0.6111" k3="-0.2010"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.0075" k2="0.6822" k3="-0.2405"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1.5" k1="0.0773" k2="-0.2965" k3="0.0494"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="3" k1="0.0994" k2="-0.5948" k3="0.2509"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="9" k1="0.1010" k2="-0.6763" k3="0.3144"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0799" k2="-0.6948" k3="0.3399"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1.5" k1="-0.0350" k2="0.0621" k3="-0.0416"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="3" k1="-0.0696" k2="0.2147" k3="-0.2020"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="9" k1="-0.0449" k2="0.1895" k3="-0.2176"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0432" k2="0.1722" k3="-0.2217"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1.5" k1="-0.0255" k2="0.0285" k3="-0.0106"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="3" k1="-0.0331" k2="0.0567" k3="-0.0302"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="9" k1="-0.0193" k2="0.0222" k3="-0.0096"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0239" k2="0.0160" k3="-0.0035"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="1.5" k1="-0.0217" k2="0.0226" k3="-0.0074"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="3" k1="-0.0431" k2="0.0849" k3="-0.0478"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="9" k1="-0.0379" k2="0.0532" k3="-0.0267"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.0344" k2="0.0302" k3="-0.0103"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>Leica DG Summilux 25mm f/1.4 Asph.</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
+         <calibration>
+             <!-- Taken with Olympus OMD E-M5 -->
+-            <distortion model="ptlens" focal="25" a="-0.00305" b="-0.01088" c="-0.00658" />
+-            <tca model="poly3" focal="25" br="-0.0000700" vr="1.0002675" bb="0.0001262" vb="0.9998339" />
++            <distortion model="ptlens" focal="25" a="-0.00305" b="-0.01088" c="-0.00658"/>
++            <tca model="poly3" focal="25" br="-0.0000700" vr="1.0002675" bb="0.0001262" vb="0.9998339"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G X Vario 35-100mm f/2.8 Power OIS</model>
++        <model lang="en">Lumix G X Vario 35-100mm f/2.8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus OMD E-M5 -->
++            <distortion model="poly3" focal="35" k1="-0.02122"/>
++            <distortion model="poly3" focal="42" k1="-0.01741"/>
++            <distortion model="poly3" focal="50" k1="-0.01282"/>
++            <distortion model="poly3" focal="60" k1="-0.00907"/>
++            <distortion model="poly3" focal="80" k1="-0.00599"/>
++            <distortion model="poly3" focal="100" k1="-0.00245"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G X Vario 12-35mm f/2.8 Asph. Power OIS</model>
++        <model lang="en">Lumix G X Vario 12-35mm f/2.8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus OMD E-M5 -->
++            <distortion model="ptlens" focal="12" a="0.03626" b="-0.10638" c="0.01966"/>
++            <distortion model="ptlens" focal="14" a="0.02827" b="-0.0854" c="0.03073"/>
++            <distortion model="ptlens" focal="16" a="0.01689" b="-0.05145" c="0.01488"/>
++            <distortion model="ptlens" focal="18" a="0.01148" b="-0.02851" c="-0.00308"/>
++            <distortion model="ptlens" focal="20" a="0.01696" b="-0.04944" c="0.03292"/>
++            <distortion model="ptlens" focal="22" a="0.00991" b="-0.02582" c="0.01252"/>
++            <distortion model="ptlens" focal="25" a="0.00656" b="-0.01302" c="0.00572"/>
++            <distortion model="ptlens" focal="28" a="0.00728" b="-0.01959" c="0.02348"/>
++            <distortion model="ptlens" focal="30" a="0.00348" b="-0.0034" c="0.00414"/>
++            <distortion model="ptlens" focal="32" a="0.00427" b="-0.00676" c="0.01112"/>
++            <distortion model="ptlens" focal="35" a="0.00938" b="-0.02043" c="0.02524"/>
++            <tca model="poly3" focal="12" vr="1.0003736" vb="1.0000643"/>
++            <tca model="poly3" focal="14" vr="1.0003255" vb="1.0000556"/>
++            <tca model="poly3" focal="16" vr="1.0003447" vb="1.0000236"/>
++            <tca model="poly3" focal="18" vr="1.0003571" vb="1.0000159"/>
++            <tca model="poly3" focal="20" vr="1.0002871" vb="1.0000087"/>
++            <tca model="poly3" focal="22" vr="1.0002596" vb="0.9999957"/>
++            <tca model="poly3" focal="25" vr="1.0002534" vb="1.0000103"/>
++            <tca model="poly3" focal="28" vr="1.0001711" vb="0.9999986"/>
++            <tca model="poly3" focal="30" vr="1.0001151" vb="1.0000065"/>
++            <tca model="poly3" focal="32" vr="1.0000555" vb="1.0000802"/>
++            <tca model="poly3" focal="35" vr="1" vb="1.0003"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G 20mm f/1.7 II Asph.</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with DMC-GX7 -->
++            <distortion model="ptlens" focal="20" a="0.01169" b="-0.0533" c="0.02618"/>
++            <tca model="poly3" focal="20" vr="1.0002" vb="1.0002"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 35-100mm f/4.0-5.6 Asph. Mega OIS</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-PL7 -->
++            <distortion model="ptlens" focal="35" a="0.00663258" b="-0.0185251" c="0.0134508"/>
++            <distortion model="ptlens" focal="40" a="0.00258479" b="-0.00661156" c="0.00697864"/>
++            <distortion model="ptlens" focal="45" a="0.000553098" b="0.00439218" c="-0.00355882"/>
++            <distortion model="ptlens" focal="50" a="0.000346598" b="0.00614855" c="-0.00173778"/>
++            <distortion model="ptlens" focal="62" a="-0.000115581" b="0.00511291" c="0.00988016"/>
++            <distortion model="ptlens" focal="78" a="-0.0104497" b="0.039446" c="-0.0251468"/>
++            <distortion model="ptlens" focal="100" a="-0.0131383" b="0.0562571" c="-0.0528326"/>
++            <tca model="poly3" focal="35" vr="1.0001700" vb="1.0003000"/>
++            <tca model="poly3" focal="40" vr="1.0000925" vb="1.0002249"/>
++            <tca model="poly3" focal="45" vr="1.0000558" vb="1.0001441"/>
++            <tca model="poly3" focal="50" vr="1.0000459" vb="1.0001676"/>
++            <tca model="poly3" focal="62" vr="0.9999844" vb="1.0000683"/>
++            <tca model="poly3" focal="78" vr="0.9999536" vb="0.9999292"/>
++            <tca model="poly3" focal="100" vr="0.9999000" vb="0.9996000"/>
++            <!--  Taken with Panasonic Lumix GX80  -->
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3482" k2="-0.8294" k3="0.6100"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3482" k2="-0.8294" k3="0.6100"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.0425" k2="-0.6473" k3="0.2564"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.0425" k2="-0.6473" k3="0.2564"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.3028" k2="0.3163" k3="-0.3103"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.3028" k2="0.3163" k3="-0.3103"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3346" k2="0.3611" k3="-0.2345"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3346" k2="0.3611" k3="-0.2345"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2978" k2="0.1716" k3="-0.0257"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2978" k2="0.1716" k3="-0.0257"/>
++            <vignetting model="pa" focal="43" aperture="4.5" distance="10" k1="-0.1667" k2="-0.6432" k3="0.3941"/>
++            <vignetting model="pa" focal="43" aperture="4.5" distance="1000" k1="-0.1667" k2="-0.6432" k3="0.3941"/>
++            <vignetting model="pa" focal="43" aperture="5.6" distance="10" k1="-0.2344" k2="0.1884" k3="-0.1793"/>
++            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.2344" k2="0.1884" k3="-0.1793"/>
++            <vignetting model="pa" focal="43" aperture="7.1" distance="10" k1="-0.2485" k2="0.1354" k3="-0.0364"/>
++            <vignetting model="pa" focal="43" aperture="7.1" distance="1000" k1="-0.2485" k2="0.1354" k3="-0.0364"/>
++            <vignetting model="pa" focal="43" aperture="8" distance="10" k1="-0.2573" k2="0.1447" k3="-0.0406"/>
++            <vignetting model="pa" focal="43" aperture="8" distance="1000" k1="-0.2573" k2="0.1447" k3="-0.0406"/>
++            <vignetting model="pa" focal="43" aperture="22" distance="10" k1="-0.2820" k2="0.1524" k3="-0.0121"/>
++            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.2820" k2="0.1524" k3="-0.0121"/>
++            <vignetting model="pa" focal="56" aperture="8" distance="10" k1="-0.2045" k2="0.1083" k3="-0.0298"/>
++            <vignetting model="pa" focal="56" aperture="8" distance="1000" k1="-0.2045" k2="0.1083" k3="-0.0298"/>
++            <vignetting model="pa" focal="56" aperture="9" distance="10" k1="-0.2045" k2="0.0870" k3="-0.0132"/>
++            <vignetting model="pa" focal="56" aperture="9" distance="1000" k1="-0.2045" k2="0.0870" k3="-0.0132"/>
++            <vignetting model="pa" focal="56" aperture="22" distance="10" k1="-0.1830" k2="0.0189" k3="0.0552"/>
++            <vignetting model="pa" focal="56" aperture="22" distance="1000" k1="-0.1830" k2="0.0189" k3="0.0552"/>
++            <vignetting model="pa" focal="58" aperture="5.3" distance="10" k1="-0.1399" k2="-0.0786" k3="-0.1011"/>
++            <vignetting model="pa" focal="58" aperture="5.3" distance="1000" k1="-0.1399" k2="-0.0786" k3="-0.1011"/>
++            <vignetting model="pa" focal="58" aperture="6.3" distance="10" k1="-0.2153" k2="0.1822" k3="-0.1077"/>
++            <vignetting model="pa" focal="58" aperture="6.3" distance="1000" k1="-0.2153" k2="0.1822" k3="-0.1077"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="10" k1="0.0735" k2="-0.7851" k3="0.3877"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="0.0735" k2="-0.7851" k3="0.3877"/>
++            <vignetting model="pa" focal="75" aperture="7.1" distance="10" k1="-0.2020" k2="0.2781" k3="-0.2433"/>
++            <vignetting model="pa" focal="75" aperture="7.1" distance="1000" k1="-0.2020" k2="0.2781" k3="-0.2433"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="10" k1="-0.1918" k2="0.1826" k3="-0.1230"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1918" k2="0.1826" k3="-0.1230"/>
++            <vignetting model="pa" focal="75" aperture="9" distance="10" k1="-0.1670" k2="0.0908" k3="-0.0359"/>
++            <vignetting model="pa" focal="75" aperture="9" distance="1000" k1="-0.1670" k2="0.0908" k3="-0.0359"/>
++            <vignetting model="pa" focal="75" aperture="22" distance="10" k1="-0.1749" k2="0.0503" k3="0.0324"/>
++            <vignetting model="pa" focal="75" aperture="22" distance="1000" k1="-0.1749" k2="0.0503" k3="0.0324"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="0.0551" k2="-0.8705" k3="0.4779"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="0.0551" k2="-0.8705" k3="0.4779"/>
++            <vignetting model="pa" focal="100" aperture="7.1" distance="10" k1="-0.0784" k2="-0.0674" k3="-0.0420"/>
++            <vignetting model="pa" focal="100" aperture="7.1" distance="1000" k1="-0.0784" k2="-0.0674" k3="-0.0420"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1715" k2="0.1753" k3="-0.1402"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1715" k2="0.1753" k3="-0.1402"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="10" k1="-0.1540" k2="0.1292" k3="-0.0843"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.1540" k2="0.1292" k3="-0.0843"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.1578" k2="0.0430" k3="0.0343"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.1578" k2="0.0430" k3="0.0343"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 45-150mm f/4.0-5.6 Asph. Mega OIS</model>
++        <model lang="en">Lumix G Vario 45-150mm f/4.0-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with DMC-GX7 -->
++            <distortion focal="45" model="ptlens" a="-0.01139" b="0.04017" c="-0.04716"/>
++            <distortion focal="57" model="ptlens" a="-0.00155" b="0.00515" c="0.00461"/>
++            <distortion focal="76" model="ptlens" a="0.00308" b="-0.00023" c="-0.00171"/>
++            <distortion focal="103" model="ptlens" a="0.00053" b="-0.00134" c="0.01016"/>
++            <distortion focal="121" model="ptlens" a="-0.01453" b="0.05028" c="-0.04729"/>
++            <distortion focal="150" model="ptlens" a="-0.00394" b="0.00897" c="0.00515"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="10" k1="-0.8113" k2="0.2809" k3="-0.0648"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.8113" k2="0.2809" k3="-0.0648"/>
++            <vignetting model="pa" focal="45" aperture="4.5" distance="10" k1="-0.1597" k2="-0.9743" k3="0.6101"/>
++            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.1597" k2="-0.9743" k3="0.6101"/>
++            <vignetting model="pa" focal="45" aperture="5" distance="10" k1="0.0822" k2="-1.0382" k3="0.5130"/>
++            <vignetting model="pa" focal="45" aperture="5" distance="1000" k1="0.0822" k2="-1.0382" k3="0.5130"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.0491" k2="-0.2983" k3="-0.0043"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.0491" k2="-0.2983" k3="-0.0043"/>
++            <vignetting model="pa" focal="45" aperture="7.1" distance="10" k1="-0.2177" k2="0.2715" k3="-0.2827"/>
++            <vignetting model="pa" focal="45" aperture="7.1" distance="1000" k1="-0.2177" k2="0.2715" k3="-0.2827"/>
++            <vignetting model="pa" focal="45" aperture="9" distance="10" k1="-0.1629" k2="0.0549" k3="-0.0458"/>
++            <vignetting model="pa" focal="45" aperture="9" distance="1000" k1="-0.1629" k2="0.0549" k3="-0.0458"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.1517" k2="-0.0041" k3="0.0120"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.1517" k2="-0.0041" k3="0.0120"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="10" k1="-0.1604" k2="0.0113" k3="0.0040"/>
++            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.1604" k2="0.0113" k3="0.0040"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.1957" k2="0.0829" k3="-0.0349"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1957" k2="0.0829" k3="-0.0349"/>
++            <vignetting model="pa" focal="57" aperture="16" distance="10" k1="-0.1308" k2="-0.0005" k3="0.0051"/>
++            <vignetting model="pa" focal="57" aperture="16" distance="1000" k1="-0.1308" k2="-0.0005" k3="0.0051"/>
++            <vignetting model="pa" focal="57" aperture="22" distance="10" k1="-0.1426" k2="0.0455" k3="-0.0265"/>
++            <vignetting model="pa" focal="57" aperture="22" distance="1000" k1="-0.1426" k2="0.0455" k3="-0.0265"/>
++            <vignetting model="pa" focal="61" aperture="4.7" distance="10" k1="-0.5208" k2="-0.0219" k3="0.0864"/>
++            <vignetting model="pa" focal="61" aperture="4.7" distance="1000" k1="-0.5208" k2="-0.0219" k3="0.0864"/>
++            <vignetting model="pa" focal="61" aperture="5" distance="10" k1="-0.0380" k2="-0.7691" k3="0.4329"/>
++            <vignetting model="pa" focal="61" aperture="5" distance="1000" k1="-0.0380" k2="-0.7691" k3="0.4329"/>
++            <vignetting model="pa" focal="61" aperture="5.6" distance="10" k1="-0.0208" k2="-0.3138" k3="0.0579"/>
++            <vignetting model="pa" focal="61" aperture="5.6" distance="1000" k1="-0.0208" k2="-0.3138" k3="0.0579"/>
++            <vignetting model="pa" focal="61" aperture="7.1" distance="10" k1="-0.1425" k2="0.0806" k3="-0.0721"/>
++            <vignetting model="pa" focal="61" aperture="7.1" distance="1000" k1="-0.1425" k2="0.0806" k3="-0.0721"/>
++            <vignetting model="pa" focal="61" aperture="9" distance="10" k1="-0.1265" k2="0.0042" k3="0.0037"/>
++            <vignetting model="pa" focal="61" aperture="9" distance="1000" k1="-0.1265" k2="0.0042" k3="0.0037"/>
++            <vignetting model="pa" focal="61" aperture="11" distance="10" k1="-0.1527" k2="0.0433" k3="-0.0147"/>
++            <vignetting model="pa" focal="61" aperture="11" distance="1000" k1="-0.1527" k2="0.0433" k3="-0.0147"/>
++            <vignetting model="pa" focal="76" aperture="5.1" distance="10" k1="-0.3467" k2="-0.2779" k3="0.2300"/>
++            <vignetting model="pa" focal="76" aperture="5.1" distance="1000" k1="-0.3467" k2="-0.2779" k3="0.2300"/>
++            <vignetting model="pa" focal="76" aperture="5.6" distance="10" k1="-0.0036" k2="-0.6682" k3="0.3607"/>
++            <vignetting model="pa" focal="76" aperture="5.6" distance="1000" k1="-0.0036" k2="-0.6682" k3="0.3607"/>
++            <vignetting model="pa" focal="76" aperture="7.1" distance="10" k1="-0.1297" k2="0.0970" k3="-0.0853"/>
++            <vignetting model="pa" focal="76" aperture="7.1" distance="1000" k1="-0.1297" k2="0.0970" k3="-0.0853"/>
++            <vignetting model="pa" focal="76" aperture="9" distance="10" k1="-0.1184" k2="0.0300" k3="-0.0132"/>
++            <vignetting model="pa" focal="76" aperture="9" distance="1000" k1="-0.1184" k2="0.0300" k3="-0.0132"/>
++            <vignetting model="pa" focal="76" aperture="11" distance="10" k1="-0.1096" k2="0.0157" k3="-0.0026"/>
++            <vignetting model="pa" focal="76" aperture="11" distance="1000" k1="-0.1096" k2="0.0157" k3="-0.0026"/>
++            <vignetting model="pa" focal="76" aperture="16" distance="10" k1="-0.1033" k2="0.0155" k3="-0.0057"/>
++            <vignetting model="pa" focal="76" aperture="16" distance="1000" k1="-0.1033" k2="0.0155" k3="-0.0057"/>
++            <vignetting model="pa" focal="76" aperture="22" distance="10" k1="-0.1518" k2="0.0869" k3="-0.0456"/>
++            <vignetting model="pa" focal="76" aperture="22" distance="1000" k1="-0.1518" k2="0.0869" k3="-0.0456"/>
++            <vignetting model="pa" focal="103" aperture="5.5" distance="10" k1="-0.2191" k2="-0.4425" k3="0.2961"/>
++            <vignetting model="pa" focal="103" aperture="5.5" distance="1000" k1="-0.2191" k2="-0.4425" k3="0.2961"/>
++            <vignetting model="pa" focal="103" aperture="5.6" distance="10" k1="-0.2171" k2="-0.4475" k3="0.3005"/>
++            <vignetting model="pa" focal="103" aperture="5.6" distance="1000" k1="-0.2171" k2="-0.4475" k3="0.3005"/>
++            <vignetting model="pa" focal="103" aperture="7.1" distance="10" k1="-0.1200" k2="0.2009" k3="-0.2139"/>
++            <vignetting model="pa" focal="103" aperture="7.1" distance="1000" k1="-0.1200" k2="0.2009" k3="-0.2139"/>
++            <vignetting model="pa" focal="103" aperture="9" distance="10" k1="-0.0890" k2="0.0302" k3="-0.0180"/>
++            <vignetting model="pa" focal="103" aperture="9" distance="1000" k1="-0.0890" k2="0.0302" k3="-0.0180"/>
++            <vignetting model="pa" focal="103" aperture="11" distance="10" k1="-0.0901" k2="0.0263" k3="-0.0147"/>
++            <vignetting model="pa" focal="103" aperture="11" distance="1000" k1="-0.0901" k2="0.0263" k3="-0.0147"/>
++            <vignetting model="pa" focal="103" aperture="16" distance="10" k1="-0.0803" k2="0.0093" k3="-0.0075"/>
++            <vignetting model="pa" focal="103" aperture="16" distance="1000" k1="-0.0803" k2="0.0093" k3="-0.0075"/>
++            <vignetting model="pa" focal="103" aperture="22" distance="10" k1="-0.0432" k2="-0.0635" k3="0.0342"/>
++            <vignetting model="pa" focal="103" aperture="22" distance="1000" k1="-0.0432" k2="-0.0635" k3="0.0342"/>
++            <vignetting model="pa" focal="121" aperture="5.6" distance="10" k1="-0.3476" k2="-0.4861" k3="0.3709"/>
++            <vignetting model="pa" focal="121" aperture="5.6" distance="1000" k1="-0.3476" k2="-0.4861" k3="0.3709"/>
++            <vignetting model="pa" focal="121" aperture="7.1" distance="10" k1="0.0363" k2="-0.2625" k3="-0.0035"/>
++            <vignetting model="pa" focal="121" aperture="7.1" distance="1000" k1="0.0363" k2="-0.2625" k3="-0.0035"/>
++            <vignetting model="pa" focal="121" aperture="9" distance="10" k1="-0.0966" k2="0.1877" k3="-0.2037"/>
++            <vignetting model="pa" focal="121" aperture="9" distance="1000" k1="-0.0966" k2="0.1877" k3="-0.2037"/>
++            <vignetting model="pa" focal="121" aperture="11" distance="10" k1="-0.0616" k2="0.0140" k3="-0.0071"/>
++            <vignetting model="pa" focal="121" aperture="11" distance="1000" k1="-0.0616" k2="0.0140" k3="-0.0071"/>
++            <vignetting model="pa" focal="121" aperture="16" distance="10" k1="-0.0877" k2="0.0429" k3="-0.0210"/>
++            <vignetting model="pa" focal="121" aperture="16" distance="1000" k1="-0.0877" k2="0.0429" k3="-0.0210"/>
++            <vignetting model="pa" focal="121" aperture="22" distance="10" k1="-0.0573" k2="-0.0197" k3="0.0129"/>
++            <vignetting model="pa" focal="121" aperture="22" distance="1000" k1="-0.0573" k2="-0.0197" k3="0.0129"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="-1.3678" k2="1.4314" k3="-0.6518"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-1.3678" k2="1.4314" k3="-0.6518"/>
++            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0401" k2="-0.8224" k3="0.5053"/>
++            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0401" k2="-0.8224" k3="0.5053"/>
++            <vignetting model="pa" focal="150" aperture="9" distance="10" k1="0.1582" k2="-0.7046" k3="0.2781"/>
++            <vignetting model="pa" focal="150" aperture="9" distance="1000" k1="0.1582" k2="-0.7046" k3="0.2781"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="10" k1="-0.0523" k2="0.1544" k3="-0.2909"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0523" k2="0.1544" k3="-0.2909"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="10" k1="-0.0691" k2="0.1287" k3="-0.1243"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.0691" k2="0.1287" k3="-0.1243"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.0453" k2="0.0241" k3="-0.0193"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0453" k2="0.0241" k3="-0.0193"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 7-14mm f/4.0 Asph.</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M1 -->
++            <distortion model="ptlens" focal="7" a="0.02686" b="-0.10328" c="0.05484"/>
++            <distortion model="ptlens" focal="8" a="0.02352" b="-0.08574" c="0.03957"/>
++            <distortion model="ptlens" focal="10" a="0.01415" b="-0.05043" c="0.03089"/>
++            <distortion model="ptlens" focal="12" a="0.0243" b="-0.07167" c="0.05591"/>
++            <distortion model="ptlens" focal="14" a="0.01052" b="-0.02541" c="0.02886"/>
++            <tca model="poly3" focal="7" br="0.0001073" vr="1.0002675" bb="0.0000622" vb="1.0001169"/>
++            <tca model="poly3" focal="8" br="-0.0000141" vr="1.0002604" bb="0.0000124" vb="1.0002017"/>
++            <tca model="poly3" focal="10" br="-0.0000143" vr="1.0000787" bb="0.0000794" vb="1.0001936"/>
++            <tca model="poly3" focal="12" br="-0.0000316" vr="1.0001091" bb="0.0001177" vb="1.0001823"/>
++            <tca model="poly3" focal="14" br="-0.0000962" vr="1.0002823" bb="0.0000513" vb="1.0001142"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>Leica DG Macro-Elmarit 45mm f/2.8</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M1 -->
++            <distortion model="poly3" focal="45" k1="0.0015"/>
++            <!-- No visible TCA -->
++            <tca model="poly3" focal="45" vr="1.0005" vb="0.9998"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G X Vario PZ 45-175mm f/4.0-5.6 Asph. Power OIS</model>
++        <model lang="en">Lumix G X Vario PZ 45-175mm f/4.0-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Panasonic GH2 -->
++            <distortion model="ptlens" focal="45" a="-0.00276" b="0.01275" c="-0.01961"/>
++            <distortion model="ptlens" focal="60" a="-0.01175" b="0.04733" c="-0.05481"/>
++            <distortion model="ptlens" focal="75" a="0.00272" b="-0.00709" c="0.0189"/>
++            <distortion model="ptlens" focal="100" a="0.00008" b="0.00521" c="0.00112"/>
++            <distortion model="ptlens" focal="150" a="-0.00369" b="0.02353" c="-0.02412"/>
++            <distortion model="ptlens" focal="175" a="0.00516" b="-0.00873" c="0.01805"/>
++            <tca model="poly3" focal="45" br="0.0001486" vr="0.9999469" bb="-0.0001456" vb="1.0003685"/>
++            <tca model="poly3" focal="60" br="0.0000648" vr="0.9998969" bb="-0.0001311" vb="1.0004256"/>
++            <tca model="poly3" focal="75" br="0.0000644" vr="0.9997525" bb="-0.0001435" vb="1.0004488"/>
++            <tca model="poly3" focal="100" br="0.0000622" vr="0.9996669" bb="-0.0000938" vb="1.0003098"/>
++            <tca model="poly3" focal="150" br="0.0001107" vr="0.9996701" bb="-0.0001041" vb="0.9999976"/>
++            <tca model="poly3" focal="175" br="0.0001140" vr="0.9996807" bb="-0.0001628" vb="0.9999970"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Leica</maker>
++        <model>Leica DG Summilux 15mm f/1.7 Asph.</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M10 -->
++            <distortion model="ptlens" focal="15" a="0.01153" b="-0.05273" c="-0.00197"/>
++            <tca model="poly3" focal="15" br="-0.0000789" vr="1.0002337" bb="0.0001277" vb="0.9999204"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 12-32mm f/3.5-5.6 Asph. Mega OIS</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Panasonic DMC-GM1 -->
++            <distortion model="ptlens" focal="12" a="0.02222" b="-0.06354" c="-0.05077"/>
++            <distortion model="ptlens" focal="14" a="0.02389" b="-0.07355" c="0.00922"/>
++            <distortion model="ptlens" focal="20" a="0" b="-0.0088" c="0"/>
++            <distortion model="ptlens" focal="32" a="0" b="0.00353" c="0"/>
++            <tca model="poly3" focal="12" br="-0.0000213" vr="1.0002074" bb="-0.0000183" vb="1.0002135"/>
++            <tca model="poly3" focal="14" br="0.0000115" vr="1.0001642" bb="0.0000508" vb="1.0001012"/>
++            <tca model="poly3" focal="20" br="-0.0000057" vr="1.0001348" bb="-0.0000052" vb="1.0001246"/>
++            <tca model="poly3" focal="32" br="-0.0000680" vr="1.0001404" bb="-0.0000581" vb="1.0001761"/>
++            <!--  Taken with Panasonic Lumix GX80  -->
++            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.8315" k2="0.4291" k3="-0.3420"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.8315" k2="0.4291" k3="-0.3420"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.3630" k2="0.0319" k3="-0.2708"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.3630" k2="0.0319" k3="-0.2708"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.5284" k2="0.6500" k3="-0.5847"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.5284" k2="0.6500" k3="-0.5847"/>
++            <vignetting model="pa" focal="12" aperture="7.1" distance="10" k1="-0.4779" k2="0.4199" k3="-0.3299"/>
++            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.4779" k2="0.4199" k3="-0.3299"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.4093" k2="0.1096" k3="-0.0236"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.4093" k2="0.1096" k3="-0.0236"/>
++            <vignetting model="pa" focal="15" aperture="3.7" distance="10" k1="-0.9290" k2="0.7907" k3="-0.3447"/>
++            <vignetting model="pa" focal="15" aperture="3.7" distance="1000" k1="-0.9290" k2="0.7907" k3="-0.3447"/>
++            <vignetting model="pa" focal="15" aperture="4.5" distance="10" k1="-0.3088" k2="-0.3661" k3="0.2844"/>
++            <vignetting model="pa" focal="15" aperture="4.5" distance="1000" k1="-0.3088" k2="-0.3661" k3="0.2844"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.3571" k2="0.0906" k3="-0.0549"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.3571" k2="0.0906" k3="-0.0549"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.3526" k2="0.0512" k3="0.0182"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.3526" k2="0.0512" k3="0.0182"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.3604" k2="0.0632" k3="0.0229"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.3604" k2="0.0632" k3="0.0229"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="10" k1="-0.8687" k2="0.7672" k3="-0.3187"/>
++            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.8687" k2="0.7672" k3="-0.3187"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2683" k2="-0.0907" k3="0.0562"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2683" k2="-0.0907" k3="0.0562"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3135" k2="0.0569" k3="0.0081"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3135" k2="0.0569" k3="0.0081"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3159" k2="0.0746" k3="-0.0048"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3159" k2="0.0746" k3="-0.0048"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3282" k2="0.0680" k3="0.0134"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3282" k2="0.0680" k3="0.0134"/>
++            <vignetting model="pa" focal="26" aperture="5.3" distance="10" k1="-0.6776" k2="0.5047" k3="-0.1996"/>
++            <vignetting model="pa" focal="26" aperture="5.3" distance="1000" k1="-0.6776" k2="0.5047" k3="-0.1996"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="10" k1="-0.2575" k2="-0.0982" k3="0.0729"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="1000" k1="-0.2575" k2="-0.0982" k3="0.0729"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="10" k1="-0.3336" k2="0.1781" k3="-0.0909"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.3336" k2="0.1781" k3="-0.0909"/>
++            <vignetting model="pa" focal="26" aperture="9" distance="10" k1="-0.3205" k2="0.1139" k3="-0.0288"/>
++            <vignetting model="pa" focal="26" aperture="9" distance="1000" k1="-0.3205" k2="0.1139" k3="-0.0288"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.3211" k2="0.0811" k3="0.0149"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.3211" k2="0.0811" k3="0.0149"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="10" k1="-0.6432" k2="0.5043" k3="-0.2315"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.6432" k2="0.5043" k3="-0.2315"/>
++            <vignetting model="pa" focal="32" aperture="7.1" distance="10" k1="-0.3381" k2="0.2127" k3="-0.1687"/>
++            <vignetting model="pa" focal="32" aperture="7.1" distance="1000" k1="-0.3381" k2="0.2127" k3="-0.1687"/>
++            <vignetting model="pa" focal="32" aperture="8" distance="10" k1="-0.3610" k2="0.2651" k3="-0.1630"/>
++            <vignetting model="pa" focal="32" aperture="8" distance="1000" k1="-0.3610" k2="0.2651" k3="-0.1630"/>
++            <vignetting model="pa" focal="32" aperture="9" distance="10" k1="-0.3450" k2="0.1998" k3="-0.1028"/>
++            <vignetting model="pa" focal="32" aperture="9" distance="1000" k1="-0.3450" k2="0.1998" k3="-0.1028"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="10" k1="-0.3200" k2="0.0798" k3="0.0159"/>
++            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.3200" k2="0.0798" k3="0.0159"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G 14mm f/2.5 II</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with DMC-GM5 -->
++            <distortion model="ptlens" focal="14" a="0.00401" b="-0.02455" c="-0.04437"/>
++            <tca model="poly3" focal="14" br="-0.0001217" vr="1.0003687" bb="0.0002203" vb="1.0000304"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="10" k1="-1.6148" k2="1.6181" k3="-0.7258"/>
++            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.6148" k2="1.6181" k3="-0.7258"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-0.9789" k2="0.3617" k3="-0.0350"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-0.9789" k2="0.3617" k3="-0.0350"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.6424" k2="0.1668" k3="-0.1121"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6424" k2="0.1668" k3="-0.1121"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.7559" k2="0.5699" k3="-0.3222"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.7559" k2="0.5699" k3="-0.3222"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.6100" k2="0.1885" k3="-0.0215"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.6100" k2="0.1885" k3="-0.0215"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.6190" k2="0.1878" k3="-0.0186"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.6190" k2="0.1878" k3="-0.0186"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.6953" k2="0.3159" k3="-0.0957"/>
++            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.6953" k2="0.3159" k3="-0.0957"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.6766" k2="0.2810" k3="-0.0748"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.6766" k2="0.2810" k3="-0.0748"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G 42.5mm f/1.7</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-PM2 -->
++            <distortion model="ptlens" focal="43" a="0.00306" b="-0.02178" c="0.01278"/>
++            <tca model="poly3" focal="43" vr="1.0000881" vb="0.9999515"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G Vario 14-140mm f/3.5-5.6</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Panasonic DMC-GH4 -->
++            <distortion model="ptlens" focal="14" a="0.02559" b="-0.09222" c="0.02687"/>
++            <!-- Taken with Panasonic DMC-G70 -->
++            <distortion model="ptlens" focal="19" a="0.02193" b="-0.07774" c="0.0502"/>
++            <distortion model="ptlens" focal="26" a="0.00635" b="-0.02395" c="0.02026"/>
++            <distortion model="ptlens" focal="37" a="0.00188" b="-0.00037" c="-0.00532"/>
++            <distortion model="ptlens" focal="46" a="0.00292" b="0.00204" c="-0.0141"/>
++            <distortion model="ptlens" focal="69" a="-0.00526" b="0.02418" c="-0.02834"/>
++            <distortion model="ptlens" focal="102" a="-0.00722" b="0.02631" c="-0.02095"/>
++            <distortion model="ptlens" focal="140" a="0.00108" b="-0.00403" c="0.01137"/>
++            <!-- Taken with Panasonic DMC-GH4 -->
++            <tca model="poly3" focal="14" vr="1.0000856" vb="1.0004324"/>
++            <tca model="poly3" focal="24" vr="1.0000727" vb="1.0004073"/>
++            <tca model="poly3" focal="26" vr="1.0001132" vb="1.0003724"/>
++            <tca model="poly3" focal="34" vr="1.0000340" vb="1.0002853"/>
++            <tca model="poly3" focal="34" vr="1.0000412" vb="1.0003546"/>
++            <tca model="poly3" focal="46" vr="1.0000161" vb="1.0001541"/>
++            <tca model="poly3" focal="69" vr="1.0000019" vb="1.0000310"/>
++            <tca model="poly3" focal="73" vr="0.9999638" vb="1.0000271"/>
++            <tca model="poly3" focal="97" vr="0.9999140" vb="0.9999884"/>
++            <tca model="poly3" focal="102" vr="0.9998732" vb="0.9999608"/>
++            <tca model="poly3" focal="140" vr="0.9998222" vb="0.9998812"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.1984" k2="0.0739" k3="-0.5006"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.1984" k2="0.0739" k3="-0.5006"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.3859" k2="0.7125" k3="-0.7776"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3859" k2="0.7125" k3="-0.7776"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.4086" k2="0.6611" k3="-0.6115"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4086" k2="0.6611" k3="-0.6115"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.2822" k2="0.2531" k3="-0.2514"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.2822" k2="0.2531" k3="-0.2514"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.1724" k2="-0.0627" k3="-0.0089"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.1724" k2="-0.0627" k3="-0.0089"/>
++            <vignetting model="pa" focal="26" aperture="4.2" distance="10" k1="-0.1200" k2="-0.2225" k3="0.1437"/>
++            <vignetting model="pa" focal="26" aperture="4.2" distance="1000" k1="-0.1200" k2="-0.2225" k3="0.1437"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="0.0054" k2="-0.2085" k3="0.0428"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="0.0054" k2="-0.2085" k3="0.0428"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="10" k1="-0.0635" k2="0.0651" k3="-0.0755"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.0635" k2="0.0651" k3="-0.0755"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="10" k1="-0.0966" k2="0.1025" k3="-0.0884"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.0966" k2="0.1025" k3="-0.0884"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="10" k1="-0.0940" k2="0.0672" k3="-0.0620"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.0940" k2="0.0672" k3="-0.0620"/>
++            <vignetting model="pa" focal="26" aperture="16" distance="10" k1="-0.0779" k2="0.0219" k3="-0.0347"/>
++            <vignetting model="pa" focal="26" aperture="16" distance="1000" k1="-0.0779" k2="0.0219" k3="-0.0347"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.0761" k2="0.0283" k3="-0.0485"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.0761" k2="0.0283" k3="-0.0485"/>
++            <vignetting model="pa" focal="46" aperture="4.9" distance="10" k1="-0.1879" k2="0.0396" k3="-0.0144"/>
++            <vignetting model="pa" focal="46" aperture="4.9" distance="1000" k1="-0.1879" k2="0.0396" k3="-0.0144"/>
++            <vignetting model="pa" focal="46" aperture="5.6" distance="10" k1="-0.0121" k2="-0.0294" k3="-0.0397"/>
++            <vignetting model="pa" focal="46" aperture="5.6" distance="1000" k1="-0.0121" k2="-0.0294" k3="-0.0397"/>
++            <vignetting model="pa" focal="46" aperture="8" distance="10" k1="-0.0484" k2="0.0645" k3="-0.0584"/>
++            <vignetting model="pa" focal="46" aperture="8" distance="1000" k1="-0.0484" k2="0.0645" k3="-0.0584"/>
++            <vignetting model="pa" focal="46" aperture="11" distance="10" k1="-0.0381" k2="0.0343" k3="-0.0310"/>
++            <vignetting model="pa" focal="46" aperture="11" distance="1000" k1="-0.0381" k2="0.0343" k3="-0.0310"/>
++            <vignetting model="pa" focal="46" aperture="16" distance="10" k1="-0.0218" k2="-0.0106" k3="0.0033"/>
++            <vignetting model="pa" focal="46" aperture="16" distance="1000" k1="-0.0218" k2="-0.0106" k3="0.0033"/>
++            <vignetting model="pa" focal="46" aperture="22" distance="10" k1="-0.0048" k2="-0.0430" k3="0.0238"/>
++            <vignetting model="pa" focal="46" aperture="22" distance="1000" k1="-0.0048" k2="-0.0430" k3="0.0238"/>
++            <vignetting model="pa" focal="97" aperture="5.4" distance="10" k1="0.2633" k2="-1.2100" k3="0.4991"/>
++            <vignetting model="pa" focal="97" aperture="5.4" distance="1000" k1="0.2633" k2="-1.2100" k3="0.4991"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="0.2551" k2="-1.1910" k3="0.4876"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="0.2551" k2="-1.1910" k3="0.4876"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="10" k1="-0.0578" k2="0.4165" k3="-0.6047"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.0578" k2="0.4165" k3="-0.6047"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="10" k1="-0.1491" k2="0.6111" k3="-0.5721"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.1491" k2="0.6111" k3="-0.5721"/>
++            <vignetting model="pa" focal="97" aperture="16" distance="10" k1="-0.0296" k2="0.1385" k3="-0.1224"/>
++            <vignetting model="pa" focal="97" aperture="16" distance="1000" k1="-0.0296" k2="0.1385" k3="-0.1224"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="10" k1="-0.0162" k2="0.0991" k3="-0.0848"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.0162" k2="0.0991" k3="-0.0848"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="0.2058" k2="-1.5224" k3="0.8792"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="0.2058" k2="-1.5224" k3="0.8792"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="0.1280" k2="-0.2279" k3="-0.1477"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="0.1280" k2="-0.2279" k3="-0.1477"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="10" k1="-0.1093" k2="0.5428" k3="-0.5378"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.1093" k2="0.5428" k3="-0.5378"/>
++            <vignetting model="pa" focal="140" aperture="16" distance="10" k1="-0.0357" k2="0.1994" k3="-0.1628"/>
++            <vignetting model="pa" focal="140" aperture="16" distance="1000" k1="-0.0357" k2="0.1994" k3="-0.1628"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="10" k1="-0.0095" k2="0.1134" k3="-0.0862"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0095" k2="0.1134" k3="-0.0862"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Panasonic</maker>
++        <model>Lumix G 25mm f/1.7</model>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus OMD E-M5 -->
++            <distortion model="ptlens" focal="25" a="0.006901" b="-0.043711" c="0.032678"/>
++            <tca model="poly3" focal="25" br="-0.0000310" vr="1.0000464" bb="0.0000044" vb="0.9999951"/>
++            <vignetting model="pa" focal="25" aperture="1.7" distance="0.18" k1="-1.0184" k2="0.3779" k3="0.0117"/>
++            <vignetting model="pa" focal="25" aperture="1.7" distance="1" k1="-1.5522" k2="1.8773" k3="-0.9593"/>
++            <vignetting model="pa" focal="25" aperture="1.7" distance="1000" k1="-1.4086" k2="1.7196" k3="-0.9633"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="0.18" k1="-0.5043" k2="-0.5273" k3="0.4690"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="1" k1="-0.6904" k2="0.1723" k3="-0.0371"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="1000" k1="-0.7355" k2="0.3826" k3="-0.2315"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="0.18" k1="-0.1273" k2="-0.3468" k3="0.1282"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1" k1="-0.2055" k2="0.2286" k3="-0.3541"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.2452" k2="0.4418" k3="-0.5389"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="0.18" k1="-0.3545" k2="0.1948" k3="-0.0930"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1" k1="-0.1103" k2="-0.1576" k3="0.1029"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.2806" k2="0.2643" k3="-0.1542"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.18" k1="-0.0582" k2="-0.4668" k3="0.3066"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.5022" k2="0.5815" k3="-0.2616"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2586" k2="0.1172" k3="0.0021"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.18" k1="-0.3234" k2="0.0490" k3="0.0315"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.4066" k2="0.4279" k3="-0.1961"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2680" k2="0.1473" k3="-0.0109"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-pentax.xml b/data/db/mil-pentax.xml
+--- a/data/db/mil-pentax.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/mil-pentax.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,35 @@
++<lensdatabase>
++    <mount>
++        <name>Pentax Q</name>
++        <compat>Generic</compat>
++    </mount>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax Q</model>
++        <mount>Pentax Q</mount>
++        <cropfactor>5.53</cropfactor>
++    </camera>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax Q7</model>
++        <mount>Pentax Q</mount>
++        <cropfactor>4.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax Q10</model>
++        <mount>Pentax Q</mount>
++        <cropfactor>5.53</cropfactor>
++    </camera>
++    <lens>
++        <maker>Pentax</maker>
++        <model>01 Standard Prime 8.5mm f/1.9 AL [IF]</model>
++        <mount>Pentax Q</mount>
++        <focal value="8.5"/>
++        <aperture min="1.9" max="8"/>
++        <cropfactor>5.53</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="8.5" k1="-0.01529"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/mil-samsung.xml b/data/db/mil-samsung.xml
+--- a/data/db/mil-samsung.xml	2013-10-13 11:59:02.000000000 +0200
++++ b/data/db/mil-samsung.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,132 +1,236 @@
+-<!--
+-MIL stands for Mirrorless Interchangeable Lens, see
+-http://en.wikipedia.org/wiki/Mirrorless_interchangeable-lens_camera
+--->
+ <lensdatabase>
+     <mount>
+         <name>Samsung NX</name>
+-        <name lang="en">Samsung NX</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Samsung NX mini</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
+         <compat>Generic</compat>
+-        <compat>Pentax K</compat>
+     </mount>
+-
+-    <!-- Samsung EK-GN120 = Samsung Galaxy NX -->
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>EK-GN120</model>
+-         <model lang="en">EK-GN120</model>
++        <model lang="en">Galaxy NX</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX10</model>
+-         <model lang="en">NX10</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX11</model>
+-         <model lang="en">NX11</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX100</model>
+-         <model lang="en">NX100</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX1000</model>
+-         <model lang="en">NX1000</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX20</model>
+-         <model lang="en">NX20</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX200</model>
+-         <model lang="en">NX200</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX210</model>
+-         <model lang="en">NX210</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG</maker>
+-        <maker lang="en">Samsung</maker>
++        <maker>Samsung</maker>
+         <model>NX300</model>
+-         <model lang="en">NX300</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX300M</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX500</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX1100</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX2000</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX3000</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX1</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX5</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX30</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Samsung</maker>
++        <model>NX mini</model>
++        <mount>Samsung NX mini</mount>
++        <cropfactor>2.727</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Samsung</maker>
+-        <model>Samsung NX 20-50mm F3.5-5.6 ED</model>
++        <model>Samsung NX 20-50mm f/3.5-5.6 ED</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <!-- Average crop factor for Samsung APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="20" a="0.01347" b="-0.05952" c="0.01561" />
+-            <distortion model="ptlens" focal="24" a="0.00549" b="-0.03312" c="0.00984" />
+-            <distortion model="ptlens" focal="28" a="0.01064" b="-0.04256" c="0.03338" />
+-            <distortion model="ptlens" focal="35" a="-0.001" b="-0.00843" c="0.02713" />
+-            <distortion model="ptlens" focal="45" a="0.00716" b="-0.0379" c="0.06902" />
+-            <distortion model="ptlens" focal="50" a="-0.02119" b="0.06813" c="-0.06118" />
++            <distortion model="ptlens" focal="20" a="0.01347" b="-0.05952" c="0.01561"/>
++            <distortion model="ptlens" focal="24" a="0.00549" b="-0.03312" c="0.00984"/>
++            <distortion model="ptlens" focal="28" a="0.01064" b="-0.04256" c="0.03338"/>
++            <distortion model="ptlens" focal="35" a="-0.001" b="-0.00843" c="0.02713"/>
++            <distortion model="ptlens" focal="45" a="0.00716" b="-0.0379" c="0.06902"/>
++            <distortion model="ptlens" focal="50" a="-0.02119" b="0.06813" c="-0.06118"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Samsung</maker>
+-        <model>Samsung NX 30mm F2 Pancake</model>
++        <model>Samsung NX 30mm f/2 Pancake</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <!-- Average crop factor for Samsung APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="30" k1="-0.00596" />
++            <distortion model="poly3" focal="30" k1="-0.00596"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Samsung</maker>
+-        <model>Samsung 16mm f/2.4</model>
++        <model>Samsung NX 16mm f/2.4 Pancake</model>
+         <mount>Samsung NX</mount>
+-        <cropfactor>1.54</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Samsung NX10 -->
+-            <distortion model="ptlens" focal="16" a="0.00013" b="-0.00589" c="-0.04838" />
+-            <tca model="poly3" focal="16" br="-0.0000770" vr="1.0006160" bb="0.0001654" vb="0.9997845" />
++            <distortion model="ptlens" focal="16" a="0.00013" b="-0.00589" c="-0.04838"/>
++            <tca model="poly3" focal="16" br="-0.0000770" vr="1.0006160" bb="0.0001654" vb="0.9997845"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samsung</maker>
++        <model>Samsung NX 18-55mm f/3.5-5.6 OIS</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Samsung NX300 -->
++            <distortion model="ptlens" focal="18" a="0.01917" b="-0.0495" c="-0.00128"/>
++            <distortion model="ptlens" focal="24" a="0.01457" b="-0.03302" c="0.01717"/>
++            <distortion model="ptlens" focal="29" a="0.00579" b="-0.00789" c="0.00912"/>
++            <distortion model="ptlens" focal="35" a="0.01159" b="-0.02243" c="0.02113"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.01092" c="0"/>
++            <distortion model="ptlens" focal="45" a="0" b="0.01095" c="0"/>
++            <distortion model="ptlens" focal="55" a="0" b="0.01144" c="0"/>
++            <tca model="poly3" focal="18" vr="1.0007" vb="0.9999"/>
++            <tca model="poly3" focal="24" vr="1.0006" vb="0.9996"/>
++            <tca model="poly3" focal="29" vr="1.0004" vb="0.9999"/>
++            <tca model="poly3" focal="35" vr="1.0006" vb="0.9998"/>
++            <tca model="poly3" focal="40" vr="1.0003" vb="0.9999"/>
++            <tca model="poly3" focal="45" vr="1.0003" vb="0.9997"/>
++            <tca model="poly3" focal="55" vr="1.0002" vb="0.9996"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samsung</maker>
++        <model>Samsung NX 45mm f/1.8 2D/3D</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Samsung NX11 -->
++            <distortion model="poly3" focal="45" k1="-0.00974"/>
++            <!-- Taken with Samsung NX500 -->
++            <tca model="poly3" focal="45" br="-0.0000373" vr="1.0001884" bb="0.0000950" vb="0.9997324"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samsung</maker>
++        <model>Samsung NX 20mm f/2.8 Pancake</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Samsung NX11 -->
++            <distortion model="ptlens" focal="20" a="0.0065" b="-0.03633" c="0.00495"/>
++            <tca model="poly3" focal="20" br="-0.0001595" vr="1.0006749" bb="0.0001657" vb="0.9996819"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samsung</maker>
++        <model>Samsung NX 16-50mm f/3.5-5.6 PZ ED OIS</model>
++        <mount>Samsung NX</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Samsung NX200 -->
++            <distortion model="ptlens" focal="16" a="0.01687" b="-0.04326" c="-0.03389"/>
++            <distortion model="ptlens" focal="19" a="0.00841" b="-0.01748" c="-0.03254"/>
++            <distortion model="ptlens" focal="22" a="0.0085" b="-0.02678" c="-0.00262"/>
++            <distortion model="ptlens" focal="30" a="0" b="-0.00441" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00145" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samsung</maker>
++        <model>Samsung NX 10mm f/3.5 Fisheye</model>
++        <model lang="de">Samsung NX 10mm f/3.5 Fischauge</model>
++        <mount>Samsung NX</mount>
++        <type>equisolid</type>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Samsung NX30 -->
++            <distortion model="ptlens" focal="10" a="-0.0459" b="0.13431" c="-0.10789"/>
++            <tca model="poly3" focal="10" br="0.0000529" vr="1.0002370" bb="-0.0000076" vb="1.0003018"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-samyang.xml b/data/db/mil-samyang.xml
+--- a/data/db/mil-samyang.xml	2013-10-18 19:20:57.000000000 +0200
++++ b/data/db/mil-samyang.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,67 +1,108 @@
+ <lensdatabase>
+-
+-   <lens>
+-	    <maker>Samyang</maker>
+-	    <model>Samyang 7.5mm F/3.5 UMC Fish-eye MFT</model>
+-	    <focal value="7.5" />
+-	    <aperture min="3.5" max="22" />
+-	    <mount>Micro 4/3 System</mount>
+-	    <type>fisheye</type>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="7.5" model="ptlens" a="-0.0133116" b="0.00822383" c="-0.0180619" />
+-            <tca model="poly3" focal="7.5" br="-0.0001120" vr="1.0003181" bb="0.0000315" vb="0.9999183" />
+-            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.09" k1="-0.6898" k2="0.5629" k3="-0.2798" />
+-            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.18" k1="-1.0041" k2="1.6690" k3="-0.9910" />
+-            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.54" k1="-1.0954" k2="1.8097" k3="-1.0871" />
+-            <vignetting model="pa" focal="7.5" aperture="3.5" distance="1000" k1="-1.1157" k2="1.9882" k3="-1.2723" />
+-            <vignetting model="pa" focal="7.5" aperture="4" distance="0.09" k1="-0.6381" k2="0.4763" k3="-0.2415" />
+-            <vignetting model="pa" focal="7.5" aperture="4" distance="0.18" k1="-0.8935" k2="1.3156" k3="-0.7649" />
+-            <vignetting model="pa" focal="7.5" aperture="4" distance="0.54" k1="-1.0314" k2="1.6246" k3="-0.9735" />
+-            <vignetting model="pa" focal="7.5" aperture="4" distance="1000" k1="-1.1245" k2="2.0645" k3="-1.3261" />
+-            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.09" k1="-0.7704" k2="1.0367" k3="-0.6094" />
+-            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.18" k1="-1.0225" k2="1.7532" k3="-0.9869" />
+-            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.54" k1="-1.1394" k2="2.0518" k3="-1.2608" />
+-            <vignetting model="pa" focal="7.5" aperture="5.6" distance="1000" k1="-1.2338" k2="2.5227" k3="-1.6312" />
+-            <vignetting model="pa" focal="7.5" aperture="8" distance="0.09" k1="-0.8748" k2="1.2274" k3="-0.6025" />
+-            <vignetting model="pa" focal="7.5" aperture="8" distance="0.18" k1="-0.9885" k2="1.6290" k3="-0.8701" />
+-            <vignetting model="pa" focal="7.5" aperture="8" distance="0.54" k1="-0.9302" k2="1.1116" k3="-0.4253" />
+-            <vignetting model="pa" focal="7.5" aperture="8" distance="1000" k1="-0.9312" k2="1.1169" k3="-0.4030" />
+-            <vignetting model="pa" focal="7.5" aperture="22" distance="0.09" k1="-0.8023" k2="0.9555" k3="-0.4032" />
+-            <vignetting model="pa" focal="7.5" aperture="22" distance="0.18" k1="-0.9166" k2="1.2514" k3="-0.6183" />
+-            <vignetting model="pa" focal="7.5" aperture="22" distance="0.54" k1="-0.9866" k2="1.2614" k3="-0.5698" />
+-            <vignetting model="pa" focal="7.5" aperture="22" distance="1000" k1="-1.0589" k2="1.5841" k3="-0.8397" />
+-	    </calibration>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 7.5mm f/3.5 UMC Fish-eye MFT</model>
++        <model lang="de">Samyang 7.5mm f/3.5 UMC Fischauge MFT</model>
++        <mount>Micro 4/3 System</mount>
++        <focal value="7.5"/>
++        <aperture min="3.5" max="22"/>
++        <type>fisheye</type>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="7.5" model="ptlens" a="-0.0133116" b="0.00822383" c="-0.0180619"/>
++            <tca model="poly3" focal="7.5" br="-0.0001120" vr="1.0003181" bb="0.0000315" vb="0.9999183"/>
++            <!-- Taken with Fujifilm X-T1 -->
++            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.09" k1="-0.6898" k2="0.5629" k3="-0.2798"/>
++            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.18" k1="-1.0041" k2="1.6690" k3="-0.9910"/>
++            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.54" k1="-1.0954" k2="1.8097" k3="-1.0871"/>
++            <vignetting model="pa" focal="7.5" aperture="3.5" distance="1000" k1="-1.1157" k2="1.9882" k3="-1.2723"/>
++            <vignetting model="pa" focal="7.5" aperture="4" distance="0.09" k1="-0.6381" k2="0.4763" k3="-0.2415"/>
++            <vignetting model="pa" focal="7.5" aperture="4" distance="0.18" k1="-0.8935" k2="1.3156" k3="-0.7649"/>
++            <vignetting model="pa" focal="7.5" aperture="4" distance="0.54" k1="-1.0314" k2="1.6246" k3="-0.9735"/>
++            <vignetting model="pa" focal="7.5" aperture="4" distance="1000" k1="-1.1245" k2="2.0645" k3="-1.3261"/>
++            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.09" k1="-0.7704" k2="1.0367" k3="-0.6094"/>
++            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.18" k1="-1.0225" k2="1.7532" k3="-0.9869"/>
++            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.54" k1="-1.1394" k2="2.0518" k3="-1.2608"/>
++            <vignetting model="pa" focal="7.5" aperture="5.6" distance="1000" k1="-1.2338" k2="2.5227" k3="-1.6312"/>
++            <vignetting model="pa" focal="7.5" aperture="8" distance="0.09" k1="-0.8748" k2="1.2274" k3="-0.6025"/>
++            <vignetting model="pa" focal="7.5" aperture="8" distance="0.18" k1="-0.9885" k2="1.6290" k3="-0.8701"/>
++            <vignetting model="pa" focal="7.5" aperture="8" distance="0.54" k1="-0.9302" k2="1.1116" k3="-0.4253"/>
++            <vignetting model="pa" focal="7.5" aperture="8" distance="1000" k1="-0.9312" k2="1.1169" k3="-0.4030"/>
++            <vignetting model="pa" focal="7.5" aperture="22" distance="0.09" k1="-0.8023" k2="0.9555" k3="-0.4032"/>
++            <vignetting model="pa" focal="7.5" aperture="22" distance="0.18" k1="-0.9166" k2="1.2514" k3="-0.6183"/>
++            <vignetting model="pa" focal="7.5" aperture="22" distance="0.54" k1="-0.9866" k2="1.2614" k3="-0.5698"/>
++            <vignetting model="pa" focal="7.5" aperture="22" distance="1000" k1="-1.0589" k2="1.5841" k3="-0.8397"/>
++        </calibration>
+     </lens>
+-
+-
+     <lens>
+         <maker>Samyang</maker>
+         <model>Samyang 8mm f/2.8 UMC Fish-eye</model>
++        <model lang="de">Samyang 8mm f/2.8 UMC Fischauge</model>
+         <mount>Sony E</mount>
+         <mount>Fujifilm X</mount>
+         <mount>Samsung NX</mount>
+-        <!-- FixMe: Actually cropfactor 1.534 -->
+-        <cropfactor>1.5</cropfactor>
+         <type>stereographic</type>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-7 -->
+-            <distortion model="ptlens" focal="8" a="0.01302" b="-0.06831" c="0.02013" />
+-            <vignetting model="pa" focal="8" aperture="2.8" distance="0.3" k1="-1.4924" k2="1.0081" k3="-0.3500" />
+-            <vignetting model="pa" focal="8" aperture="2.8" distance="1" k1="-1.5090" k2="0.9829" k3="-0.3162" />
+-            <vignetting model="pa" focal="8" aperture="2.8" distance="1000" k1="-1.5018" k2="0.9506" k3="-0.2946" />
+-            <vignetting model="pa" focal="8" aperture="4" distance="0.3" k1="-0.9478" k2="0.6408" k3="-0.4329" />
+-            <vignetting model="pa" focal="8" aperture="4" distance="1" k1="-1.0029" k2="0.7332" k3="-0.4824" />
+-            <vignetting model="pa" focal="8" aperture="4" distance="1000" k1="-1.0418" k2="0.7092" k3="-0.4377" />
+-            <vignetting model="pa" focal="8" aperture="5.6" distance="0.3" k1="-1.0401" k2="0.9822" k3="-0.5842" />
+-            <vignetting model="pa" focal="8" aperture="5.6" distance="1" k1="-1.0795" k2="1.0230" k3="-0.6008" />
+-            <vignetting model="pa" focal="8" aperture="5.6" distance="1000" k1="-1.1067" k2="1.0544" k3="-0.6145" />
+-            <vignetting model="pa" focal="8" aperture="8" distance="0.3" k1="-1.0299" k2="0.9615" k3="-0.5692" />
+-            <vignetting model="pa" focal="8" aperture="8" distance="1" k1="-1.0667" k2="0.9822" k3="-0.5667" />
+-            <vignetting model="pa" focal="8" aperture="8" distance="1000" k1="-1.0408" k2="0.9345" k3="-0.5484" />
+-            <vignetting model="pa" focal="8" aperture="22" distance="0.3" k1="-1.0752" k2="1.0060" k3="-0.5789" />
+-            <vignetting model="pa" focal="8" aperture="22" distance="1" k1="-1.0814" k2="1.0593" k3="-0.6292" />
+-            <vignetting model="pa" focal="8" aperture="22" distance="1000" k1="-1.0709" k2="0.9444" k3="-0.5355" />
++            <!-- Measured with a 360° panorama -->
++            <distortion model="ptlens" focal="8" a="0.02036" b="-0.08028" c="0.01446"/>
++            <tca model="poly3" focal="8" br="-0.0000138" vr="1.0000964" bb="0.0001036" vb="1.0000325"/>
++            <vignetting model="pa" focal="8" aperture="2.8" distance="0.3" k1="-1.4924" k2="1.0081" k3="-0.3500"/>
++            <vignetting model="pa" focal="8" aperture="2.8" distance="1" k1="-1.5090" k2="0.9829" k3="-0.3162"/>
++            <vignetting model="pa" focal="8" aperture="2.8" distance="1000" k1="-1.5018" k2="0.9506" k3="-0.2946"/>
++            <vignetting model="pa" focal="8" aperture="4" distance="0.3" k1="-0.9478" k2="0.6408" k3="-0.4329"/>
++            <vignetting model="pa" focal="8" aperture="4" distance="1" k1="-1.0029" k2="0.7332" k3="-0.4824"/>
++            <vignetting model="pa" focal="8" aperture="4" distance="1000" k1="-1.0418" k2="0.7092" k3="-0.4377"/>
++            <vignetting model="pa" focal="8" aperture="5.6" distance="0.3" k1="-1.0401" k2="0.9822" k3="-0.5842"/>
++            <vignetting model="pa" focal="8" aperture="5.6" distance="1" k1="-1.0795" k2="1.0230" k3="-0.6008"/>
++            <vignetting model="pa" focal="8" aperture="5.6" distance="1000" k1="-1.1067" k2="1.0544" k3="-0.6145"/>
++            <vignetting model="pa" focal="8" aperture="8" distance="0.3" k1="-1.0299" k2="0.9615" k3="-0.5692"/>
++            <vignetting model="pa" focal="8" aperture="8" distance="1" k1="-1.0667" k2="0.9822" k3="-0.5667"/>
++            <vignetting model="pa" focal="8" aperture="8" distance="1000" k1="-1.0408" k2="0.9345" k3="-0.5484"/>
++            <vignetting model="pa" focal="8" aperture="22" distance="0.3" k1="-1.0752" k2="1.0060" k3="-0.5789"/>
++            <vignetting model="pa" focal="8" aperture="22" distance="1" k1="-1.0814" k2="1.0593" k3="-0.6292"/>
++            <vignetting model="pa" focal="8" aperture="22" distance="1000" k1="-1.0709" k2="0.9444" k3="-0.5355"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 50mm f/1.4 AS UMC</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="poly3" focal="50" k1="-0.00445"/>
++            <tca model="poly3" focal="50" vr="1.0001" vb="1.0001"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 12mm f/2.0 NCS CS</model>
++        <mount>Sony E</mount>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="ptlens" focal="12" a="0.0097" b="-0.04108" c="0.03623"/>
++            <tca model="poly3" focal="12" br="0.0000203" vr="1.0001380" bb="0.0002099" vb="1.0001907"/>
++            <!-- Taken with Fujifilm X camera (cropfactor 1.529) -->
++            <vignetting model="pa" focal="12" aperture="2" distance="10" k1="-1.6043" k2="1.4148" k3="-0.5957"/>
++            <vignetting model="pa" focal="12" aperture="2" distance="1000" k1="-1.6043" k2="1.4148" k3="-0.5957"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-1.0849" k2="0.8287" k3="-0.4311"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-1.0849" k2="0.8287" k3="-0.4311"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-1.1396" k2="0.9654" k3="-0.4291"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-1.1396" k2="0.9654" k3="-0.4291"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-1.0997" k2="0.7894" k3="-0.2590"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-1.0997" k2="0.7894" k3="-0.2590"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-1.1070" k2="0.8060" k3="-0.2703"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-1.1070" k2="0.8060" k3="-0.2703"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="10" k1="-1.1113" k2="0.8092" k3="-0.2697"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-1.1113" k2="0.8092" k3="-0.2697"/>
++            <vignetting model="pa" focal="12" aperture="16" distance="10" k1="-1.1239" k2="0.8343" k3="-0.2845"/>
++            <vignetting model="pa" focal="12" aperture="16" distance="1000" k1="-1.1239" k2="0.8343" k3="-0.2845"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-1.1410" k2="0.8662" k3="-0.3026"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-1.1410" k2="0.8662" k3="-0.3026"/>
+         </calibration>
+     </lens>
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-sigma.xml b/data/db/mil-sigma.xml
+--- a/data/db/mil-sigma.xml	2013-08-25 14:49:43.000000000 +0200
++++ b/data/db/mil-sigma.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,23 +1,156 @@
+ <lensdatabase>
+-
++    <camera>
++        <maker>Sigma</maker>
++        <model>sd Quattro</model>
++        <mount>Sigma SA</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
+     <lens>
+         <maker>Sigma</maker>
+-        <!-- The actual name is "Sigma 30mm F2.8 EX DN".  The following is the exiv2 name on the NEX-C3. -->
+-        <model>E 30mm F2.8</model>
++        <model>E 30mm f/2.8</model>
++        <model lang="en">Sigma 30mm f/2.8 EX DN</model>
+         <mount>Sony E</mount>
+         <mount>Micro 4/3 System</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with NEX-C3 -->
+-            <distortion model="poly3" focal="30" k1="-0.00329" />
+-            <tca model="poly3" focal="30" br="-0.0000696" vr="1.0003379" bb="0.0001188" vb="0.9998102" />
+-            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.7946" k2="0.5729" k3="-0.1713" />
+-            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.7946" k2="0.5729" k3="-0.1713" />
+-            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.3097" k2="-0.3089" k3="0.2307" />
+-            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.3097" k2="-0.3089" k3="0.2307" />
+-            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.6172" k2="0.5891" k3="-0.2868" />
+-            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.6172" k2="0.5891" k3="-0.2868" />
++            <distortion model="poly3" focal="30" k1="-0.00329"/>
++            <tca model="poly3" focal="30" br="-0.0000696" vr="1.0003379" bb="0.0001188" vb="0.9998102"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.7946" k2="0.5729" k3="-0.1713"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.7946" k2="0.5729" k3="-0.1713"/>
++            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.3097" k2="-0.3089" k3="0.2307"/>
++            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.3097" k2="-0.3089" k3="0.2307"/>
++            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.6172" k2="0.5891" k3="-0.2868"/>
++            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.6172" k2="0.5891" k3="-0.2868"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 30mm f/2.8 EX DN</model>
++        <mount>Sony E</mount>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M5 -->
++            <distortion model="poly3" focal="30" k1="-0.00454"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 19mm f/2.8 EX DN</model>
++        <mount>Sony E</mount>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M5 -->
++            <distortion model="ptlens" focal="19" a="0.00475" b="-0.01706" c="0.00298"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 19mm f/2.8 EX DN</model>
++        <mount>Sony E</mount>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="ptlens" focal="19" a="0.02766" b="-0.0877" c="0.06882"/>
++            <tca model="poly3" focal="19" br="-0.0000466" vr="1.0003817" bb="0.0000346" vb="1.0000194"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 60mm f/2.8 DN</model>
++        <mount>Sony E</mount>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-M5 -->
++            <distortion model="poly3" focal="60" k1="0.00275"/>
++            <!-- No measurable TCA -->
++            <tca model="poly3" focal="60"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- Identifies itself at Sony cameras as “E 19mm F2.8”. -->
++        <maker>Sigma</maker>
++        <model>Sigma 19mm f/2.8 DN</model>
++        <mount>Sony E</mount>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="ptlens" focal="19" a="0.015" b="-0.046" c="0.024"/>
++            <tca model="poly3" focal="19" br="-0.0000429" vr="1.0002002" bb="0.0000600" vb="0.9999543"/>
++            <vignetting model="pa" focal="19" aperture="2.8" distance="10" k1="-0.9506" k2="0.8975" k3="-0.3905"/>
++            <vignetting model="pa" focal="19" aperture="2.8" distance="1000" k1="-0.9506" k2="0.8975" k3="-0.3905"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="10" k1="-0.4777" k2="-0.1800" k3="0.2351"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-0.4777" k2="-0.1800" k3="0.2351"/>
++            <vignetting model="pa" focal="19" aperture="8" distance="10" k1="-0.4955" k2="0.3092" k3="-0.1559"/>
++            <vignetting model="pa" focal="19" aperture="8" distance="1000" k1="-0.4955" k2="0.3092" k3="-0.1559"/>
++            <vignetting model="pa" focal="19" aperture="13" distance="10" k1="-0.4758" k2="0.2070" k3="-0.0488"/>
++            <vignetting model="pa" focal="19" aperture="13" distance="1000" k1="-0.4758" k2="0.2070" k3="-0.0488"/>
++            <vignetting model="pa" focal="19" aperture="18" distance="10" k1="-0.4840" k2="0.2244" k3="-0.0602"/>
++            <vignetting model="pa" focal="19" aperture="18" distance="1000" k1="-0.4840" k2="0.2244" k3="-0.0602"/>
++            <vignetting model="pa" focal="19" aperture="22" distance="10" k1="-0.4849" k2="0.2236" k3="-0.0597"/>
++            <vignetting model="pa" focal="19" aperture="22" distance="1000" k1="-0.4849" k2="0.2236" k3="-0.0597"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 19mm f/2.8 DN</model>
++        <mount>Micro 4/3 System</mount>
++        <mount>Sony E</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with OMD E-PL3 -->
++            <distortion model="poly3" focal="19" k1="-0.00656"/>
++            <tca model="poly3" focal="19" br="0.0000179" vr="1.0004833" bb="0.0000497" vb="0.9999659"/>
++            <vignetting model="pa" focal="19" aperture="2.8" distance="10" k1="-0.8505" k2="0.7338" k3="-0.3257"/>
++            <vignetting model="pa" focal="19" aperture="2.8" distance="1000" k1="-0.8505" k2="0.7338" k3="-0.3257"/>
++            <vignetting model="pa" focal="19" aperture="3.2" distance="10" k1="-0.8111" k2="0.5574" k3="-0.2042"/>
++            <vignetting model="pa" focal="19" aperture="3.2" distance="1000" k1="-0.8111" k2="0.5574" k3="-0.2042"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="10" k1="-0.4141" k2="-0.2053" k3="0.2060"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="1000" k1="-0.4141" k2="-0.2053" k3="0.2060"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="10" k1="-0.2906" k2="-0.2445" k3="0.1612"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-0.2906" k2="-0.2445" k3="0.1612"/>
++            <vignetting model="pa" focal="19" aperture="4.5" distance="10" k1="-0.3708" k2="0.0713" k3="-0.0506"/>
++            <vignetting model="pa" focal="19" aperture="4.5" distance="1000" k1="-0.3708" k2="0.0713" k3="-0.0506"/>
++            <vignetting model="pa" focal="19" aperture="5" distance="10" k1="-0.4144" k2="0.1900" k3="-0.0941"/>
++            <vignetting model="pa" focal="19" aperture="5" distance="1000" k1="-0.4144" k2="0.1900" k3="-0.0941"/>
++            <vignetting model="pa" focal="19" aperture="5.6" distance="10" k1="-0.3772" k2="0.0907" k3="-0.0155"/>
++            <vignetting model="pa" focal="19" aperture="5.6" distance="1000" k1="-0.3772" k2="0.0907" k3="-0.0155"/>
++            <vignetting model="pa" focal="19" aperture="6.3" distance="10" k1="-0.3456" k2="0.0248" k3="0.0258"/>
++            <vignetting model="pa" focal="19" aperture="6.3" distance="1000" k1="-0.3456" k2="0.0248" k3="0.0258"/>
++            <vignetting model="pa" focal="19" aperture="22" distance="10" k1="-0.4123" k2="0.1070" k3="-0.0016"/>
++            <vignetting model="pa" focal="19" aperture="22" distance="1000" k1="-0.4123" k2="0.1070" k3="-0.0016"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>30mm f/1.4 DC DN | Contemporary 016</model>
++        <model lang="en">30mm f/1.4 DC DN</model>
++        <mount>Sony E</mount>
++        <mount>Micro 4/3 System</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony 6000 (ILCE-6000) -->
++            <distortion model="ptlens" focal="30" a="-0.00399" b="-0.00701" c="-0.00069"/>
++            <tca model="poly3" focal="30" br="-0.0000662" vr="1.0002242" bb="0.0001122" vb="0.9999295"/>
++            <vignetting model="pa" focal="30" aperture="1.4" distance="10" k1="-0.7397" k2="0.2898" k3="-0.0725"/>
++            <vignetting model="pa" focal="30" aperture="1.4" distance="1000" k1="-0.7397" k2="0.2898" k3="-0.0725"/>
++            <vignetting model="pa" focal="30" aperture="2" distance="10" k1="-0.0294" k2="-0.7454" k3="0.3732"/>
++            <vignetting model="pa" focal="30" aperture="2" distance="1000" k1="-0.0294" k2="-0.7454" k3="0.3732"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.2530" k2="0.3830" k3="-0.3861"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.2530" k2="0.3830" k3="-0.3861"/>
++            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.2194" k2="0.1395" k3="-0.0720"/>
++            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.2194" k2="0.1395" k3="-0.0720"/>
++            <vignetting model="pa" focal="30" aperture="8" distance="10" k1="-0.2137" k2="0.1051" k3="-0.0333"/>
++            <vignetting model="pa" focal="30" aperture="8" distance="1000" k1="-0.2137" k2="0.1051" k3="-0.0333"/>
++            <vignetting model="pa" focal="30" aperture="13" distance="10" k1="-0.2189" k2="0.1170" k3="-0.0418"/>
++            <vignetting model="pa" focal="30" aperture="13" distance="1000" k1="-0.2189" k2="0.1170" k3="-0.0418"/>
++            <vignetting model="pa" focal="30" aperture="16" distance="10" k1="-0.2179" k2="0.1129" k3="-0.0401"/>
++            <vignetting model="pa" focal="30" aperture="16" distance="1000" k1="-0.2179" k2="0.1129" k3="-0.0401"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-sony.xml b/data/db/mil-sony.xml
+--- a/data/db/mil-sony.xml	2013-10-18 18:41:38.000000000 +0200
++++ b/data/db/mil-sony.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,636 +1,1336 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Sony E</name>
+-        <compat>Sony Alpha</compat>
+-        <compat>Minolta AF</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-3</model>
+-        <model lang="en">NEX 3</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-C3</model>
+-        <model lang="en">NEX C3</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-F3</model>
+-        <model lang="en">NEX F3</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-3N</model>
+-        <model lang="en">NEX 3N</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-5</model>
+-        <model lang="en">NEX 5</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-5N</model>
+-        <model lang="en">NEX 5N</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-5R</model>
+-        <model lang="en">NEX 5R</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
++        <model>NEX-5T</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
+         <model>NEX-6</model>
+-        <model lang="en">NEX 6</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>NEX-7</model>
+-        <model lang="en">NEX 7</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-6000</model>
++        <model lang="en">Alpha 6000</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-3000</model>
++        <model lang="en">Alpha 3000</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-5000</model>
++        <model lang="en">Alpha 5000</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-5100</model>
++        <model lang="en">Alpha 5100</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-7</model>
++        <model lang="en">Alpha 7</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-7R</model>
++        <model lang="en">Alpha 7R</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-7RM2</model>
++        <model lang="en">Alpha 7R II</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-7S</model>
++        <model lang="en">Alpha 7S</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-7M2</model>
++        <model lang="en">Alpha 7 II</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-6300</model>
++        <model lang="en">Alpha 6300</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-6500</model>
++        <model lang="en">Alpha 6500</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
++        <model>ILCE-9</model>
++        <model lang="en">Alpha 9</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 16mm F2.8</model>
++        <model>E 16mm f/2.8</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-7 -->
+-            <distortion model="ptlens" focal="16" a="0.01701" b="-0.02563" c="-0.0052" />
+-            <tca model="poly3" focal="16" br="-0.0003027" vr="1.0010272" bb="0.0003454" vb="0.9993952" />
+-            <vignetting model="pa" focal="16" aperture="2.8" distance="0.25" k1="-1.8891" k2="1.7993" k3="-0.7326" />
+-            <vignetting model="pa" focal="16" aperture="2.8" distance="0.4" k1="-1.9392" k2="1.8889" k3="-0.7764" />
+-            <vignetting model="pa" focal="16" aperture="2.8" distance="1.2" k1="-1.9628" k2="1.9339" k3="-0.8000" />
+-            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-1.9875" k2="1.9757" k3="-0.8192" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="0.25" k1="-1.3071" k2="0.7763" k3="-0.2272" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="0.4" k1="-1.3412" k2="0.8279" k3="-0.2484" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="1.2" k1="-1.3572" k2="0.8513" k3="-0.2586" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.3774" k2="0.8764" k3="-0.2668" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="0.25" k1="-1.3080" k2="0.7762" k3="-0.2205" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="0.4" k1="-1.3371" k2="0.8175" k3="-0.2374" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="1.2" k1="-1.3507" k2="0.8405" k3="-0.2477" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-1.3740" k2="0.8727" k3="-0.2605" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="0.25" k1="-1.3479" k2="0.8292" k3="-0.2375" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="0.4" k1="-1.3770" k2="0.8692" k3="-0.2535" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="1.2" k1="-1.3950" k2="0.9019" k3="-0.2696" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.4107" k2="0.9175" k3="-0.2726" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="0.25" k1="-1.3377" k2="0.7923" k3="-0.2096" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="0.4" k1="-1.3677" k2="0.8355" k3="-0.2270" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="1.2" k1="-1.3818" k2="0.8585" k3="-0.2378" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.3964" k2="0.8838" k3="-0.2504" />
++            <distortion model="ptlens" focal="16" a="0.01701" b="-0.02563" c="-0.0052"/>
++            <tca model="poly3" focal="16" br="-0.0003027" vr="1.0010272" bb="0.0003454" vb="0.9993952"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="0.25" k1="-1.8891" k2="1.7993" k3="-0.7326"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="0.4" k1="-1.9392" k2="1.8889" k3="-0.7764"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1.2" k1="-1.9628" k2="1.9339" k3="-0.8000"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-1.9875" k2="1.9757" k3="-0.8192"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="0.25" k1="-1.3071" k2="0.7763" k3="-0.2272"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="0.4" k1="-1.3412" k2="0.8279" k3="-0.2484"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1.2" k1="-1.3572" k2="0.8513" k3="-0.2586"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.3774" k2="0.8764" k3="-0.2668"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="0.25" k1="-1.3080" k2="0.7762" k3="-0.2205"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="0.4" k1="-1.3371" k2="0.8175" k3="-0.2374"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="1.2" k1="-1.3507" k2="0.8405" k3="-0.2477"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-1.3740" k2="0.8727" k3="-0.2605"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="0.25" k1="-1.3479" k2="0.8292" k3="-0.2375"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="0.4" k1="-1.3770" k2="0.8692" k3="-0.2535"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1.2" k1="-1.3950" k2="0.9019" k3="-0.2696"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.4107" k2="0.9175" k3="-0.2726"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="0.25" k1="-1.3377" k2="0.7923" k3="-0.2096"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="0.4" k1="-1.3677" k2="0.8355" k3="-0.2270"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1.2" k1="-1.3818" k2="0.8585" k3="-0.2378"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.3964" k2="0.8838" k3="-0.2504"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 18-55mm F3.5-5.6 OSS</model>
++        <model>E 18-55mm f/3.5-5.6 OSS</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-7 -->
+-            <distortion model="ptlens" focal="18" a="0.02897" b="-0.08920" c="0.03513" />
+-            <distortion model="ptlens" focal="19" a="0.02895" b="-0.08472" c="0.03749" />
+-            <distortion model="ptlens" focal="20" a="0.02164" b="-0.05738" c="0.01945" />
+-            <distortion model="ptlens" focal="24" a="0.01405" b="-0.02629" c="0.00229" />
+-            <distortion model="ptlens" focal="30" a="0.01175" b="-0.02135" c="0.02549" />
+-            <distortion model="ptlens" focal="35" a="0.00822" b="-0.00590" c="0.00973" />
+-            <distortion model="ptlens" focal="55" a="0.00220" b="-0.00232" c="0.01446" />
+-            <tca model="poly3" focal="18" br="-0.0001298" vr="1.0009363" bb="0.0001843" vb="0.9994347" />
+-            <tca model="poly3" focal="24" br="-0.0001599" vr="1.0005502" bb="0.0001423" vb="0.9997553" />
+-            <tca model="poly3" focal="35" br="-0.0001739" vr="1.0001127" bb="0.0002639" vb="0.9999761" />
+-            <tca model="poly3" focal="43" br="-0.0001015" vr="1.0000697" bb="0.0001228" vb="0.9999887" />
+-            <tca model="poly3" focal="55" br="-0.0000541" vr="1.0001594" bb="0.0000646" vb="0.9997465" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.2" k1="-0.9828" k2="0.7103" k3="-0.4308" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.35" k1="-0.9326" k2="0.5885" k3="-0.3601" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.95" k1="-0.9071" k2="0.5217" k3="-0.3194" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.8870" k2="0.4585" k3="-0.2777" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="0.2" k1="-0.5346" k2="0.2388" k3="-0.3160" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="0.35" k1="-0.4978" k2="0.1524" k3="-0.2720" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="0.95" k1="-0.4605" k2="0.0654" k3="-0.2237" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.4544" k2="0.0291" k3="-0.1979" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.5766" k2="0.3435" k3="-0.3199" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.35" k1="-0.5471" k2="0.3266" k3="-0.3399" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.95" k1="-0.5307" k2="0.3027" k3="-0.3380" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.5353" k2="0.3239" k3="-0.3623" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="0.2" k1="-0.5506" k2="0.2228" k3="-0.1823" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="0.35" k1="-0.5250" k2="0.2260" k3="-0.2169" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="0.95" k1="-0.5249" k2="0.2599" k3="-0.2558" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.5402" k2="0.3058" k3="-0.2960" />
+-            <vignetting model="pa" focal="18" aperture="9" distance="0.2" k1="-0.4829" k2="0.0229" k3="-0.0188" />
+-            <vignetting model="pa" focal="18" aperture="9" distance="0.95" k1="-0.5017" k2="0.1155" k3="-0.1024" />
+-            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.4886" k2="0.1325" k3="-0.1352" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.4639" k2="-0.0257" k3="0.0186" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.35" k1="-0.4671" k2="-0.0099" k3="0.0096" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.95" k1="-0.4588" k2="-0.0179" k3="0.0102" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4486" k2="-0.0211" k3="0.0053" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.2" k1="-0.8695" k2="0.5829" k3="-0.2435" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.35" k1="-0.8684" k2="0.6061" k3="-0.2633" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.95" k1="-0.8526" k2="0.6279" k3="-0.3075" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.8595" k2="0.6867" k3="-0.3685" />
+-            <vignetting model="pa" focal="24" aperture="5" distance="0.2" k1="-0.4208" k2="0.0550" k3="-0.0234" />
+-            <vignetting model="pa" focal="24" aperture="5" distance="0.35" k1="-0.4317" k2="0.1071" k3="-0.0592" />
+-            <vignetting model="pa" focal="24" aperture="5" distance="0.95" k1="-0.4497" k2="0.1952" k3="-0.1415" />
+-            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4474" k2="0.2763" k3="-0.2323" />
+-            <vignetting model="pa" focal="24" aperture="6.3" distance="0.2" k1="-0.4162" k2="0.0424" k3="-0.0094" />
+-            <vignetting model="pa" focal="24" aperture="6.3" distance="0.35" k1="-0.4138" k2="0.0673" k3="-0.0268" />
+-            <vignetting model="pa" focal="24" aperture="6.3" distance="0.95" k1="-0.4179" k2="0.0799" k3="-0.0342" />
+-            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.4001" k2="0.0907" k3="-0.0602" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.2" k1="-0.4163" k2="0.0536" k3="-0.0187" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.35" k1="-0.3942" k2="0.0325" k3="-0.0072" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.95" k1="-0.4129" k2="0.0809" k3="-0.0350" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3920" k2="0.0540" k3="-0.0243" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="0.2" k1="-0.4245" k2="0.0756" k3="-0.0298" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="0.35" k1="-0.3874" k2="0.0265" k3="-0.0042" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="0.95" k1="-0.3890" k2="0.0358" k3="-0.0086" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3694" k2="0.0182" k3="-0.0039" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="0.2" k1="-0.8107" k2="0.5490" k3="-0.2270" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="0.35" k1="-0.7804" k2="0.5556" k3="-0.2613" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="0.95" k1="-0.7955" k2="0.6487" k3="-0.3540" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.7976" k2="0.7166" k3="-0.4340" />
+-            <vignetting model="pa" focal="28" aperture="5" distance="0.2" k1="-0.3909" k2="0.0762" k3="-0.0386" />
+-            <vignetting model="pa" focal="28" aperture="5" distance="0.35" k1="-0.3810" k2="0.1467" k3="-0.1191" />
+-            <vignetting model="pa" focal="28" aperture="5" distance="0.95" k1="-0.4084" k2="0.2954" k3="-0.2575" />
+-            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.4173" k2="0.3960" k3="-0.3671" />
+-            <vignetting model="pa" focal="28" aperture="6.3" distance="0.2" k1="-0.3689" k2="0.0347" k3="-0.0086" />
+-            <vignetting model="pa" focal="28" aperture="6.3" distance="0.35" k1="-0.3373" k2="0.0182" k3="-0.0095" />
+-            <vignetting model="pa" focal="28" aperture="6.3" distance="0.95" k1="-0.3388" k2="0.0492" k3="-0.0361" />
+-            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.3558" k2="0.1598" k3="-0.1415" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="0.2" k1="-0.3728" k2="0.0537" k3="-0.0207" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="0.35" k1="-0.3347" k2="0.0096" k3="-0.0001" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="0.95" k1="-0.3233" k2="-0.0049" k3="0.0120" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3109" k2="0.0142" k3="-0.0124" />
+-            <vignetting model="pa" focal="28" aperture="25" distance="0.2" k1="-0.3475" k2="0.0133" k3="0.0029" />
+-            <vignetting model="pa" focal="28" aperture="25" distance="0.35" k1="-0.3310" k2="0.0096" k3="0.0021" />
+-            <vignetting model="pa" focal="28" aperture="25" distance="0.95" k1="-0.3105" k2="-0.0269" k3="0.0278" />
+-            <vignetting model="pa" focal="28" aperture="25" distance="1000" k1="-0.3038" k2="-0.0060" k3="0.0072" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="0.2" k1="-0.6846" k2="0.5881" k3="-0.3529" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="0.35" k1="-0.6976" k2="0.7191" k3="-0.5084" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="0.95" k1="-0.6937" k2="0.7580" k3="-0.5900" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.6551" k2="0.7173" k3="-0.6114" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.3057" k2="0.1566" k3="-0.1516" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.35" k1="-0.3452" k2="0.4078" k3="-0.4017" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.95" k1="-0.3740" k2="0.5785" k3="-0.5931" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3719" k2="0.6504" k3="-0.7036" />
+-            <vignetting model="pa" focal="35" aperture="7.1" distance="0.2" k1="-0.2601" k2="-0.0014" k3="-0.0094" />
+-            <vignetting model="pa" focal="35" aperture="7.1" distance="0.35" k1="-0.2708" k2="0.1265" k3="-0.1376" />
+-            <vignetting model="pa" focal="35" aperture="7.1" distance="0.95" k1="-0.3508" k2="0.4446" k3="-0.4189" />
+-            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.3731" k2="0.6169" k3="-0.6069" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="0.2" k1="-0.2717" k2="0.0172" k3="-0.0151" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="0.35" k1="-0.2283" k2="-0.0334" k3="0.0089" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="0.95" k1="-0.2831" k2="0.1646" k3="-0.1530" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.3142" k2="0.3875" k3="-0.3746" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="0.2" k1="-0.2699" k2="0.0152" k3="-0.0108" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="0.35" k1="-0.2337" k2="0.0002" k3="-0.0152" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="0.95" k1="-0.2327" k2="-0.0122" k3="0.0049" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.2079" k2="-0.0163" k3="-0.0071" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="0.2" k1="-0.3669" k2="0.2307" k3="-0.1015" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="0.35" k1="-0.3364" k2="0.1973" k3="-0.0845" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="0.95" k1="-0.3295" k2="0.1848" k3="-0.0797" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3211" k2="0.2441" k3="-0.1550" />
+-            <vignetting model="pa" focal="55" aperture="7.1" distance="0.2" k1="-0.1295" k2="0.0612" k3="-0.0495" />
+-            <vignetting model="pa" focal="55" aperture="7.1" distance="0.35" k1="-0.0928" k2="0.0319" k3="-0.0331" />
+-            <vignetting model="pa" focal="55" aperture="7.1" distance="0.95" k1="-0.0923" k2="0.0441" k3="-0.0381" />
+-            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.0642" k2="0.0155" k3="-0.0263" />
+-            <vignetting model="pa" focal="55" aperture="9" distance="0.2" k1="-0.1262" k2="0.0613" k3="-0.0513" />
+-            <vignetting model="pa" focal="55" aperture="9" distance="0.35" k1="-0.0949" k2="0.0406" k3="-0.0395" />
+-            <vignetting model="pa" focal="55" aperture="9" distance="0.95" k1="-0.0923" k2="0.0508" k3="-0.0427" />
+-            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.0735" k2="0.0317" k3="-0.0324" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="0.2" k1="-0.1296" k2="0.0697" k3="-0.0561" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="0.35" k1="-0.1009" k2="0.0496" k3="-0.0439" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="0.95" k1="-0.0948" k2="0.0526" k3="-0.0434" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0637" k2="0.0307" k3="-0.0371" />
+-            <vignetting model="pa" focal="55" aperture="32" distance="0.2" k1="-0.1308" k2="0.0796" k3="-0.0637" />
+-            <vignetting model="pa" focal="55" aperture="32" distance="0.35" k1="-0.1208" k2="0.1068" k3="-0.0822" />
+-            <vignetting model="pa" focal="55" aperture="32" distance="0.95" k1="-0.1098" k2="0.1027" k3="-0.0778" />
+-            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.0719" k2="0.0761" k3="-0.0703" />
++            <distortion model="ptlens" focal="18" a="0.02897" b="-0.08920" c="0.03513"/>
++            <distortion model="ptlens" focal="19" a="0.02895" b="-0.08472" c="0.03749"/>
++            <distortion model="ptlens" focal="20" a="0.02164" b="-0.05738" c="0.01945"/>
++            <distortion model="ptlens" focal="24" a="0.01405" b="-0.02629" c="0.00229"/>
++            <distortion model="ptlens" focal="30" a="0.01175" b="-0.02135" c="0.02549"/>
++            <distortion model="ptlens" focal="35" a="0.00822" b="-0.00590" c="0.00973"/>
++            <distortion model="ptlens" focal="55" a="0.00220" b="-0.00232" c="0.01446"/>
++            <tca model="poly3" focal="18" br="-0.0001298" vr="1.0009363" bb="0.0001843" vb="0.9994347"/>
++            <tca model="poly3" focal="24" br="-0.0001599" vr="1.0005502" bb="0.0001423" vb="0.9997553"/>
++            <tca model="poly3" focal="35" br="-0.0001739" vr="1.0001127" bb="0.0002639" vb="0.9999761"/>
++            <tca model="poly3" focal="43" br="-0.0001015" vr="1.0000697" bb="0.0001228" vb="0.9999887"/>
++            <tca model="poly3" focal="55" br="-0.0000541" vr="1.0001594" bb="0.0000646" vb="0.9997465"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.2" k1="-0.9828" k2="0.7103" k3="-0.4308"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.35" k1="-0.9326" k2="0.5885" k3="-0.3601"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.95" k1="-0.9071" k2="0.5217" k3="-0.3194"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.8870" k2="0.4585" k3="-0.2777"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="0.2" k1="-0.5346" k2="0.2388" k3="-0.3160"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="0.35" k1="-0.4978" k2="0.1524" k3="-0.2720"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="0.95" k1="-0.4605" k2="0.0654" k3="-0.2237"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.4544" k2="0.0291" k3="-0.1979"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.5766" k2="0.3435" k3="-0.3199"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.35" k1="-0.5471" k2="0.3266" k3="-0.3399"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.95" k1="-0.5307" k2="0.3027" k3="-0.3380"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.5353" k2="0.3239" k3="-0.3623"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="0.2" k1="-0.5506" k2="0.2228" k3="-0.1823"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="0.35" k1="-0.5250" k2="0.2260" k3="-0.2169"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="0.95" k1="-0.5249" k2="0.2599" k3="-0.2558"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.5402" k2="0.3058" k3="-0.2960"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="0.2" k1="-0.4829" k2="0.0229" k3="-0.0188"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="0.95" k1="-0.5017" k2="0.1155" k3="-0.1024"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.4886" k2="0.1325" k3="-0.1352"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.4639" k2="-0.0257" k3="0.0186"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.35" k1="-0.4671" k2="-0.0099" k3="0.0096"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.95" k1="-0.4588" k2="-0.0179" k3="0.0102"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4486" k2="-0.0211" k3="0.0053"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.2" k1="-0.8695" k2="0.5829" k3="-0.2435"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.35" k1="-0.8684" k2="0.6061" k3="-0.2633"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.95" k1="-0.8526" k2="0.6279" k3="-0.3075"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.8595" k2="0.6867" k3="-0.3685"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="0.2" k1="-0.4208" k2="0.0550" k3="-0.0234"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="0.35" k1="-0.4317" k2="0.1071" k3="-0.0592"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="0.95" k1="-0.4497" k2="0.1952" k3="-0.1415"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4474" k2="0.2763" k3="-0.2323"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="0.2" k1="-0.4162" k2="0.0424" k3="-0.0094"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="0.35" k1="-0.4138" k2="0.0673" k3="-0.0268"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="0.95" k1="-0.4179" k2="0.0799" k3="-0.0342"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.4001" k2="0.0907" k3="-0.0602"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.2" k1="-0.4163" k2="0.0536" k3="-0.0187"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.35" k1="-0.3942" k2="0.0325" k3="-0.0072"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.95" k1="-0.4129" k2="0.0809" k3="-0.0350"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3920" k2="0.0540" k3="-0.0243"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="0.2" k1="-0.4245" k2="0.0756" k3="-0.0298"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="0.35" k1="-0.3874" k2="0.0265" k3="-0.0042"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="0.95" k1="-0.3890" k2="0.0358" k3="-0.0086"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3694" k2="0.0182" k3="-0.0039"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.2" k1="-0.8107" k2="0.5490" k3="-0.2270"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.35" k1="-0.7804" k2="0.5556" k3="-0.2613"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.95" k1="-0.7955" k2="0.6487" k3="-0.3540"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.7976" k2="0.7166" k3="-0.4340"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="0.2" k1="-0.3909" k2="0.0762" k3="-0.0386"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="0.35" k1="-0.3810" k2="0.1467" k3="-0.1191"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="0.95" k1="-0.4084" k2="0.2954" k3="-0.2575"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.4173" k2="0.3960" k3="-0.3671"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="0.2" k1="-0.3689" k2="0.0347" k3="-0.0086"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="0.35" k1="-0.3373" k2="0.0182" k3="-0.0095"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="0.95" k1="-0.3388" k2="0.0492" k3="-0.0361"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.3558" k2="0.1598" k3="-0.1415"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.2" k1="-0.3728" k2="0.0537" k3="-0.0207"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.35" k1="-0.3347" k2="0.0096" k3="-0.0001"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.95" k1="-0.3233" k2="-0.0049" k3="0.0120"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3109" k2="0.0142" k3="-0.0124"/>
++            <vignetting model="pa" focal="28" aperture="25" distance="0.2" k1="-0.3475" k2="0.0133" k3="0.0029"/>
++            <vignetting model="pa" focal="28" aperture="25" distance="0.35" k1="-0.3310" k2="0.0096" k3="0.0021"/>
++            <vignetting model="pa" focal="28" aperture="25" distance="0.95" k1="-0.3105" k2="-0.0269" k3="0.0278"/>
++            <vignetting model="pa" focal="28" aperture="25" distance="1000" k1="-0.3038" k2="-0.0060" k3="0.0072"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="0.2" k1="-0.6846" k2="0.5881" k3="-0.3529"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="0.35" k1="-0.6976" k2="0.7191" k3="-0.5084"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="0.95" k1="-0.6937" k2="0.7580" k3="-0.5900"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.6551" k2="0.7173" k3="-0.6114"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.3057" k2="0.1566" k3="-0.1516"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.35" k1="-0.3452" k2="0.4078" k3="-0.4017"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.95" k1="-0.3740" k2="0.5785" k3="-0.5931"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3719" k2="0.6504" k3="-0.7036"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="0.2" k1="-0.2601" k2="-0.0014" k3="-0.0094"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="0.35" k1="-0.2708" k2="0.1265" k3="-0.1376"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="0.95" k1="-0.3508" k2="0.4446" k3="-0.4189"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.3731" k2="0.6169" k3="-0.6069"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="0.2" k1="-0.2717" k2="0.0172" k3="-0.0151"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="0.35" k1="-0.2283" k2="-0.0334" k3="0.0089"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="0.95" k1="-0.2831" k2="0.1646" k3="-0.1530"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.3142" k2="0.3875" k3="-0.3746"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="0.2" k1="-0.2699" k2="0.0152" k3="-0.0108"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="0.35" k1="-0.2337" k2="0.0002" k3="-0.0152"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="0.95" k1="-0.2327" k2="-0.0122" k3="0.0049"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.2079" k2="-0.0163" k3="-0.0071"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="0.2" k1="-0.3669" k2="0.2307" k3="-0.1015"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="0.35" k1="-0.3364" k2="0.1973" k3="-0.0845"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="0.95" k1="-0.3295" k2="0.1848" k3="-0.0797"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3211" k2="0.2441" k3="-0.1550"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="0.2" k1="-0.1295" k2="0.0612" k3="-0.0495"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="0.35" k1="-0.0928" k2="0.0319" k3="-0.0331"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="0.95" k1="-0.0923" k2="0.0441" k3="-0.0381"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.0642" k2="0.0155" k3="-0.0263"/>
++            <vignetting model="pa" focal="55" aperture="9" distance="0.2" k1="-0.1262" k2="0.0613" k3="-0.0513"/>
++            <vignetting model="pa" focal="55" aperture="9" distance="0.35" k1="-0.0949" k2="0.0406" k3="-0.0395"/>
++            <vignetting model="pa" focal="55" aperture="9" distance="0.95" k1="-0.0923" k2="0.0508" k3="-0.0427"/>
++            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.0735" k2="0.0317" k3="-0.0324"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="0.2" k1="-0.1296" k2="0.0697" k3="-0.0561"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="0.35" k1="-0.1009" k2="0.0496" k3="-0.0439"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="0.95" k1="-0.0948" k2="0.0526" k3="-0.0434"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0637" k2="0.0307" k3="-0.0371"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="0.2" k1="-0.1308" k2="0.0796" k3="-0.0637"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="0.35" k1="-0.1208" k2="0.1068" k3="-0.0822"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="0.95" k1="-0.1098" k2="0.1027" k3="-0.0778"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.0719" k2="0.0761" k3="-0.0703"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 50mm F1.8 OSS</model>
++        <model>E 50mm f/1.8 OSS</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-7 -->
+-            <distortion model="poly3" focal="50" k1="0.00032" />
+-            <tca model="poly3" focal="50" br="0.0000064" vr="1.0000819" bb="-0.0000082" vb="0.9998975" />
+-            <vignetting model="pa" focal="50" aperture="1.8" distance="0.4" k1="-0.5494" k2="-0.1621" k3="0.2075" />
+-            <vignetting model="pa" focal="50" aperture="1.8" distance="0.75" k1="-0.7039" k2="0.2640" k3="-0.1234" />
+-            <vignetting model="pa" focal="50" aperture="1.8" distance="2.1" k1="-0.7837" k2="0.3922" k3="-0.2255" />
+-            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.8304" k2="0.4363" k3="-0.2541" />
+-            <vignetting model="pa" focal="50" aperture="2.2" distance="0.4" k1="-0.2865" k2="-0.0531" k3="-0.0294" />
+-            <vignetting model="pa" focal="50" aperture="2.2" distance="0.75" k1="-0.1613" k2="-0.1351" k3="-0.1333" />
+-            <vignetting model="pa" focal="50" aperture="2.2" distance="2.1" k1="0.0019" k2="-0.6141" k3="0.1264" />
+-            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="0.1019" k2="-0.9668" k3="0.3451" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.3500" k2="0.1472" k3="-0.0622" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="0.75" k1="-0.3427" k2="0.4871" k3="-0.4224" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="2.1" k1="-0.2921" k2="0.5198" k3="-0.5526" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2286" k2="0.4372" k3="-0.5716" />
+-            <vignetting model="pa" focal="50" aperture="3.5" distance="0.4" k1="-0.3341" k2="0.1086" k3="-0.0350" />
+-            <vignetting model="pa" focal="50" aperture="3.5" distance="0.75" k1="-0.2820" k2="0.2153" k3="-0.1311" />
+-            <vignetting model="pa" focal="50" aperture="3.5" distance="2.1" k1="-0.3183" k2="0.5129" k3="-0.4189" />
+-            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3188" k2="0.6582" k3="-0.5882" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.3185" k2="0.0802" k3="-0.0190" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.75" k1="-0.2406" k2="0.0804" k3="-0.0181" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="2.1" k1="-0.2038" k2="0.0800" k3="-0.0150" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1871" k2="0.1040" k3="-0.0310" />
+-            <vignetting model="pa" focal="50" aperture="9" distance="0.4" k1="-0.3239" k2="0.0932" k3="-0.0261" />
+-            <vignetting model="pa" focal="50" aperture="9" distance="0.75" k1="-0.2508" k2="0.1047" k3="-0.0348" />
+-            <vignetting model="pa" focal="50" aperture="9" distance="2.1" k1="-0.2173" k2="0.1025" k3="-0.0285" />
+-            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2000" k2="0.1232" k3="-0.0415" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.3250" k2="0.0986" k3="-0.0315" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="0.75" k1="-0.2434" k2="0.0732" k3="-0.0140" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="2.1" k1="-0.2169" k2="0.1029" k3="-0.0324" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1829" k2="0.0877" k3="-0.0220" />
++            <distortion model="poly3" focal="50" k1="0.00032"/>
++            <tca model="poly3" focal="50" br="0.0000064" vr="1.0000819" bb="-0.0000082" vb="0.9998975"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="0.4" k1="-0.5494" k2="-0.1621" k3="0.2075"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="0.75" k1="-0.7039" k2="0.2640" k3="-0.1234"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="2.1" k1="-0.7837" k2="0.3922" k3="-0.2255"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.8304" k2="0.4363" k3="-0.2541"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="0.4" k1="-0.2865" k2="-0.0531" k3="-0.0294"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="0.75" k1="-0.1613" k2="-0.1351" k3="-0.1333"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="2.1" k1="0.0019" k2="-0.6141" k3="0.1264"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="0.1019" k2="-0.9668" k3="0.3451"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.3500" k2="0.1472" k3="-0.0622"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.75" k1="-0.3427" k2="0.4871" k3="-0.4224"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="2.1" k1="-0.2921" k2="0.5198" k3="-0.5526"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2286" k2="0.4372" k3="-0.5716"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="0.4" k1="-0.3341" k2="0.1086" k3="-0.0350"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="0.75" k1="-0.2820" k2="0.2153" k3="-0.1311"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="2.1" k1="-0.3183" k2="0.5129" k3="-0.4189"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3188" k2="0.6582" k3="-0.5882"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.3185" k2="0.0802" k3="-0.0190"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.75" k1="-0.2406" k2="0.0804" k3="-0.0181"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="2.1" k1="-0.2038" k2="0.0800" k3="-0.0150"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1871" k2="0.1040" k3="-0.0310"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="0.4" k1="-0.3239" k2="0.0932" k3="-0.0261"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="0.75" k1="-0.2508" k2="0.1047" k3="-0.0348"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="2.1" k1="-0.2173" k2="0.1025" k3="-0.0285"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2000" k2="0.1232" k3="-0.0415"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.3250" k2="0.0986" k3="-0.0315"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.75" k1="-0.2434" k2="0.0732" k3="-0.0140"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="2.1" k1="-0.2169" k2="0.1029" k3="-0.0324"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1829" k2="0.0877" k3="-0.0220"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 55-210mm F4.5-6.3 OSS</model>
++        <model>E 55-210mm f/4.5-6.3 OSS</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-7 -->
+-            <distortion model="ptlens" focal="55" a="0.00219" b="0.00538" c="-0.01084" />
+-            <distortion model="ptlens" focal="71" a="-0.01297" b="0.06432" c="-0.07626" />
+-            <distortion model="ptlens" focal="100" a="0.00774" b="-0.0129" c="0.01953" />
+-            <distortion model="ptlens" focal="135" a="0.0001" b="0.01316" c="-0.01183" />
+-            <distortion model="ptlens" focal="210" a="-0.01011" b="0.0489" c="-0.05962" />
+-            <tca model="poly3" focal="55" br="0.0000875" vr="1.0000793" bb="-0.0001308" vb="1.0002963" />
+-            <tca model="poly3" focal="70" br="0.0000662" vr="0.9999743" bb="-0.0001173" vb="1.0002967" />
+-            <tca model="poly3" focal="100" br="0.0000391" vr="0.9998840" bb="-0.0000824" vb="1.0002506" />
+-            <tca model="poly3" focal="135" br="-0.0000205" vr="0.9999141" bb="0.0000026" vb="1.0000650" />
+-            <tca model="poly3" focal="210" br="0.0000572" vr="0.9998591" bb="-0.0001599" vb="1.0000490" />
+-            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.2773" k2="-0.5412" k3="0.2434" />
+-            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.2773" k2="-0.5412" k3="0.2434" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0738" k2="-0.3379" k3="-0.0444" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0738" k2="-0.3379" k3="-0.0444" />
+-            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="-0.2352" k2="0.2738" k3="-0.3541" />
+-            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.2352" k2="0.2738" k3="-0.3541" />
+-            <vignetting model="pa" focal="55" aperture="9" distance="10" k1="-0.2663" k2="0.3115" k3="-0.2690" />
+-            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.2663" k2="0.3115" k3="-0.2690" />
+-            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2309" k2="0.1010" k3="-0.0452" />
+-            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2309" k2="0.1010" k3="-0.0452" />
+-            <vignetting model="pa" focal="68" aperture="5" distance="10" k1="-0.3697" k2="0.0319" k3="-0.2082" />
+-            <vignetting model="pa" focal="68" aperture="5" distance="1000" k1="-0.3697" k2="0.0319" k3="-0.2082" />
+-            <vignetting model="pa" focal="68" aperture="6.3" distance="10" k1="-0.1719" k2="0.2087" k3="-0.4150" />
+-            <vignetting model="pa" focal="68" aperture="6.3" distance="1000" k1="-0.1719" k2="0.2087" k3="-0.4150" />
+-            <vignetting model="pa" focal="68" aperture="8" distance="10" k1="-0.2525" k2="0.3845" k3="-0.3619" />
+-            <vignetting model="pa" focal="68" aperture="8" distance="1000" k1="-0.2525" k2="0.3845" k3="-0.3619" />
+-            <vignetting model="pa" focal="68" aperture="10" distance="10" k1="-0.1824" k2="0.0986" k3="-0.0618" />
+-            <vignetting model="pa" focal="68" aperture="10" distance="1000" k1="-0.1824" k2="0.0986" k3="-0.0618" />
+-            <vignetting model="pa" focal="68" aperture="22" distance="10" k1="-0.1871" k2="0.0736" k3="-0.0273" />
+-            <vignetting model="pa" focal="68" aperture="22" distance="1000" k1="-0.1871" k2="0.0736" k3="-0.0273" />
+-            <vignetting model="pa" focal="96" aperture="5.6" distance="10" k1="-0.2952" k2="-0.2940" k3="0.0603" />
+-            <vignetting model="pa" focal="96" aperture="5.6" distance="1000" k1="-0.2952" k2="-0.2940" k3="0.0603" />
+-            <vignetting model="pa" focal="96" aperture="7.1" distance="10" k1="-0.1378" k2="0.2585" k3="-0.4492" />
+-            <vignetting model="pa" focal="96" aperture="7.1" distance="1000" k1="-0.1378" k2="0.2585" k3="-0.4492" />
+-            <vignetting model="pa" focal="96" aperture="9" distance="10" k1="-0.2008" k2="0.3524" k3="-0.3120" />
+-            <vignetting model="pa" focal="96" aperture="9" distance="1000" k1="-0.2008" k2="0.3524" k3="-0.3120" />
+-            <vignetting model="pa" focal="96" aperture="11" distance="10" k1="-0.1247" k2="0.0369" k3="-0.0122" />
+-            <vignetting model="pa" focal="96" aperture="11" distance="1000" k1="-0.1247" k2="0.0369" k3="-0.0122" />
+-            <vignetting model="pa" focal="96" aperture="25" distance="10" k1="-0.1293" k2="0.0545" k3="-0.0249" />
+-            <vignetting model="pa" focal="96" aperture="25" distance="1000" k1="-0.1293" k2="0.0545" k3="-0.0249" />
+-            <vignetting model="pa" focal="133" aperture="5.6" distance="10" k1="-0.3756" k2="-0.4023" k3="0.2632" />
+-            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="-0.3756" k2="-0.4023" k3="0.2632" />
+-            <vignetting model="pa" focal="133" aperture="7.1" distance="10" k1="0.0871" k2="-0.6301" k3="0.1788" />
+-            <vignetting model="pa" focal="133" aperture="7.1" distance="1000" k1="0.0871" k2="-0.6301" k3="0.1788" />
+-            <vignetting model="pa" focal="133" aperture="9" distance="10" k1="-0.1736" k2="0.3913" k3="-0.4003" />
+-            <vignetting model="pa" focal="133" aperture="9" distance="1000" k1="-0.1736" k2="0.3913" k3="-0.4003" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="10" k1="-0.0951" k2="0.0476" k3="-0.0274" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.0951" k2="0.0476" k3="-0.0274" />
+-            <vignetting model="pa" focal="133" aperture="29" distance="10" k1="-0.0944" k2="0.0442" k3="-0.0234" />
+-            <vignetting model="pa" focal="133" aperture="29" distance="1000" k1="-0.0944" k2="0.0442" k3="-0.0234" />
+-            <vignetting model="pa" focal="210" aperture="6.3" distance="10" k1="-1.0480" k2="0.8887" k3="-0.3709" />
+-            <vignetting model="pa" focal="210" aperture="6.3" distance="1000" k1="-1.0480" k2="0.8887" k3="-0.3709" />
+-            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="0.1238" k2="-0.9151" k3="0.4687" />
+-            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="0.1238" k2="-0.9151" k3="0.4687" />
+-            <vignetting model="pa" focal="210" aperture="10" distance="10" k1="-0.0851" k2="0.1772" k3="-0.2198" />
+-            <vignetting model="pa" focal="210" aperture="10" distance="1000" k1="-0.0851" k2="0.1772" k3="-0.2198" />
+-            <vignetting model="pa" focal="210" aperture="13" distance="10" k1="-0.0532" k2="0.0147" k3="-0.0080" />
+-            <vignetting model="pa" focal="210" aperture="13" distance="1000" k1="-0.0532" k2="0.0147" k3="-0.0080" />
+-            <vignetting model="pa" focal="210" aperture="32" distance="10" k1="-0.0657" k2="0.0293" k3="-0.0148" />
+-            <vignetting model="pa" focal="210" aperture="32" distance="1000" k1="-0.0657" k2="0.0293" k3="-0.0148" />
++            <distortion model="ptlens" focal="55" a="0.00219" b="0.00538" c="-0.01084"/>
++            <distortion model="ptlens" focal="71" a="-0.01297" b="0.06432" c="-0.07626"/>
++            <distortion model="ptlens" focal="100" a="0.00774" b="-0.0129" c="0.01953"/>
++            <distortion model="ptlens" focal="135" a="0.0001" b="0.01316" c="-0.01183"/>
++            <distortion model="ptlens" focal="210" a="-0.01011" b="0.0489" c="-0.05962"/>
++            <tca model="poly3" focal="55" br="0.0000875" vr="1.0000793" bb="-0.0001308" vb="1.0002963"/>
++            <tca model="poly3" focal="70" br="0.0000662" vr="0.9999743" bb="-0.0001173" vb="1.0002967"/>
++            <tca model="poly3" focal="100" br="0.0000391" vr="0.9998840" bb="-0.0000824" vb="1.0002506"/>
++            <tca model="poly3" focal="135" br="-0.0000205" vr="0.9999141" bb="0.0000026" vb="1.0000650"/>
++            <tca model="poly3" focal="210" br="0.0000572" vr="0.9998591" bb="-0.0001599" vb="1.0000490"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.2773" k2="-0.5412" k3="0.2434"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.2773" k2="-0.5412" k3="0.2434"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0738" k2="-0.3379" k3="-0.0444"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0738" k2="-0.3379" k3="-0.0444"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="-0.2352" k2="0.2738" k3="-0.3541"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.2352" k2="0.2738" k3="-0.3541"/>
++            <vignetting model="pa" focal="55" aperture="9" distance="10" k1="-0.2663" k2="0.3115" k3="-0.2690"/>
++            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.2663" k2="0.3115" k3="-0.2690"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2309" k2="0.1010" k3="-0.0452"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2309" k2="0.1010" k3="-0.0452"/>
++            <vignetting model="pa" focal="68" aperture="5" distance="10" k1="-0.3697" k2="0.0319" k3="-0.2082"/>
++            <vignetting model="pa" focal="68" aperture="5" distance="1000" k1="-0.3697" k2="0.0319" k3="-0.2082"/>
++            <vignetting model="pa" focal="68" aperture="6.3" distance="10" k1="-0.1719" k2="0.2087" k3="-0.4150"/>
++            <vignetting model="pa" focal="68" aperture="6.3" distance="1000" k1="-0.1719" k2="0.2087" k3="-0.4150"/>
++            <vignetting model="pa" focal="68" aperture="8" distance="10" k1="-0.2525" k2="0.3845" k3="-0.3619"/>
++            <vignetting model="pa" focal="68" aperture="8" distance="1000" k1="-0.2525" k2="0.3845" k3="-0.3619"/>
++            <vignetting model="pa" focal="68" aperture="10" distance="10" k1="-0.1824" k2="0.0986" k3="-0.0618"/>
++            <vignetting model="pa" focal="68" aperture="10" distance="1000" k1="-0.1824" k2="0.0986" k3="-0.0618"/>
++            <vignetting model="pa" focal="68" aperture="22" distance="10" k1="-0.1871" k2="0.0736" k3="-0.0273"/>
++            <vignetting model="pa" focal="68" aperture="22" distance="1000" k1="-0.1871" k2="0.0736" k3="-0.0273"/>
++            <vignetting model="pa" focal="96" aperture="5.6" distance="10" k1="-0.2952" k2="-0.2940" k3="0.0603"/>
++            <vignetting model="pa" focal="96" aperture="5.6" distance="1000" k1="-0.2952" k2="-0.2940" k3="0.0603"/>
++            <vignetting model="pa" focal="96" aperture="7.1" distance="10" k1="-0.1378" k2="0.2585" k3="-0.4492"/>
++            <vignetting model="pa" focal="96" aperture="7.1" distance="1000" k1="-0.1378" k2="0.2585" k3="-0.4492"/>
++            <vignetting model="pa" focal="96" aperture="9" distance="10" k1="-0.2008" k2="0.3524" k3="-0.3120"/>
++            <vignetting model="pa" focal="96" aperture="9" distance="1000" k1="-0.2008" k2="0.3524" k3="-0.3120"/>
++            <vignetting model="pa" focal="96" aperture="11" distance="10" k1="-0.1247" k2="0.0369" k3="-0.0122"/>
++            <vignetting model="pa" focal="96" aperture="11" distance="1000" k1="-0.1247" k2="0.0369" k3="-0.0122"/>
++            <vignetting model="pa" focal="96" aperture="25" distance="10" k1="-0.1293" k2="0.0545" k3="-0.0249"/>
++            <vignetting model="pa" focal="96" aperture="25" distance="1000" k1="-0.1293" k2="0.0545" k3="-0.0249"/>
++            <vignetting model="pa" focal="133" aperture="5.6" distance="10" k1="-0.3756" k2="-0.4023" k3="0.2632"/>
++            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="-0.3756" k2="-0.4023" k3="0.2632"/>
++            <vignetting model="pa" focal="133" aperture="7.1" distance="10" k1="0.0871" k2="-0.6301" k3="0.1788"/>
++            <vignetting model="pa" focal="133" aperture="7.1" distance="1000" k1="0.0871" k2="-0.6301" k3="0.1788"/>
++            <vignetting model="pa" focal="133" aperture="9" distance="10" k1="-0.1736" k2="0.3913" k3="-0.4003"/>
++            <vignetting model="pa" focal="133" aperture="9" distance="1000" k1="-0.1736" k2="0.3913" k3="-0.4003"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="10" k1="-0.0951" k2="0.0476" k3="-0.0274"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.0951" k2="0.0476" k3="-0.0274"/>
++            <vignetting model="pa" focal="133" aperture="29" distance="10" k1="-0.0944" k2="0.0442" k3="-0.0234"/>
++            <vignetting model="pa" focal="133" aperture="29" distance="1000" k1="-0.0944" k2="0.0442" k3="-0.0234"/>
++            <vignetting model="pa" focal="210" aperture="6.3" distance="10" k1="-1.0480" k2="0.8887" k3="-0.3709"/>
++            <vignetting model="pa" focal="210" aperture="6.3" distance="1000" k1="-1.0480" k2="0.8887" k3="-0.3709"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="0.1238" k2="-0.9151" k3="0.4687"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="0.1238" k2="-0.9151" k3="0.4687"/>
++            <vignetting model="pa" focal="210" aperture="10" distance="10" k1="-0.0851" k2="0.1772" k3="-0.2198"/>
++            <vignetting model="pa" focal="210" aperture="10" distance="1000" k1="-0.0851" k2="0.1772" k3="-0.2198"/>
++            <vignetting model="pa" focal="210" aperture="13" distance="10" k1="-0.0532" k2="0.0147" k3="-0.0080"/>
++            <vignetting model="pa" focal="210" aperture="13" distance="1000" k1="-0.0532" k2="0.0147" k3="-0.0080"/>
++            <vignetting model="pa" focal="210" aperture="32" distance="10" k1="-0.0657" k2="0.0293" k3="-0.0148"/>
++            <vignetting model="pa" focal="210" aperture="32" distance="1000" k1="-0.0657" k2="0.0293" k3="-0.0148"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+         <model>VCL-ECF1 fisheye converter</model>
++        <model lang="de">VCL-ECF1 Fischauge-Vorsatz</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
+         <type>fisheye</type>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-7 -->
+-            <field_of_view focal="10" fov="135.12" />
+-            <distortion model="ptlens" focal="10" a="-0.03545" b="0.08332" c="-0.03802" />
+-            <tca model="poly3" focal="10" br="-0.0003212" vr="1.0013837" bb="0.0004205" vb="0.9993395" />
+-            <vignetting model="pa" focal="10" aperture="2.8" distance="0.1" k1="-1.9395" k2="1.9128" k3="-0.8406" />
+-            <vignetting model="pa" focal="10" aperture="2.8" distance="1000" k1="-2.0049" k2="1.9673" k3="-0.8164" />
+-            <vignetting model="pa" focal="10" aperture="3.5" distance="0.1" k1="-1.3378" k2="0.8422" k3="-0.3161" />
+-            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-1.3797" k2="0.8536" k3="-0.2682" />
+-            <vignetting model="pa" focal="10" aperture="4.5" distance="0.1" k1="-1.3330" k2="0.8392" k3="-0.3129" />
+-            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-1.3650" k2="0.8146" k3="-0.2391" />
+-            <vignetting model="pa" focal="10" aperture="5.6" distance="0.1" k1="-1.3226" k2="0.8036" k3="-0.2865" />
+-            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-1.3561" k2="0.7952" k3="-0.2269" />
+-            <vignetting model="pa" focal="10" aperture="22" distance="0.1" k1="-1.3680" k2="0.8384" k3="-0.2824" />
+-            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-1.4021" k2="0.8099" k3="-0.2069" />
++            <!-- Measured with 360° panorama -->
++            <distortion model="ptlens" focal="10" a="-0.03545" b="0.08332" c="-0.03802"/>
++            <tca model="poly3" focal="10" br="-0.0003212" vr="1.0013837" bb="0.0004205" vb="0.9993395"/>
++            <vignetting model="pa" focal="10" aperture="2.8" distance="0.1" k1="-1.9395" k2="1.9128" k3="-0.8406"/>
++            <vignetting model="pa" focal="10" aperture="2.8" distance="1000" k1="-2.0049" k2="1.9673" k3="-0.8164"/>
++            <vignetting model="pa" focal="10" aperture="3.5" distance="0.1" k1="-1.3378" k2="0.8422" k3="-0.3161"/>
++            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-1.3797" k2="0.8536" k3="-0.2682"/>
++            <vignetting model="pa" focal="10" aperture="4.5" distance="0.1" k1="-1.3330" k2="0.8392" k3="-0.3129"/>
++            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-1.3650" k2="0.8146" k3="-0.2391"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="0.1" k1="-1.3226" k2="0.8036" k3="-0.2865"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-1.3561" k2="0.7952" k3="-0.2269"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="0.1" k1="-1.3680" k2="0.8384" k3="-0.2824"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-1.4021" k2="0.8099" k3="-0.2069"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+         <model>VCL-ECU1 ultra wide converter</model>
++        <model lang="de">VCL-ECU1 Ultraweitwinkel-Vorsatz</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-C3 -->
+-            <distortion model="ptlens" focal="12" a="0.04359" b="-0.10483" c="0.04408" />
+-            <tca model="poly3" focal="12" br="-0.0004381" vr="1.0013270" bb="0.0003951" vb="0.9993238" />
++            <distortion model="ptlens" focal="12" a="0.04359" b="-0.10483" c="0.04408"/>
++            <tca model="poly3" focal="12" br="-0.0004381" vr="1.0013270" bb="0.0003951" vb="0.9993238"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 10-18mm F4 OSS</model>
++        <model>E 10-18mm f/4 OSS</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-C3 -->
+-            <distortion model="ptlens" focal="10" a="0.03262" b="-0.08127" c="0.0223" />
+-            <distortion model="ptlens" focal="12" a="0.02319" b="-0.05695" c="0.02094" />
+-            <distortion model="ptlens" focal="14" a="0.01584" b="-0.03852" c="0.02566" />
+-            <distortion model="ptlens" focal="16" a="0.00771" b="-0.01094" c="0.0027" />
+-            <distortion model="ptlens" focal="18" a="0.01105" b="-0.02442" c="0.03158" />
+-            <tca model="poly3" focal="10" br="0.0001931" vr="1.0000158" bb="-0.0000887" vb="1.0002784" />
+-            <tca model="poly3" focal="12" br="0.0000920" vr="1.0000354" bb="-0.0000836" vb="1.0003099" />
+-            <tca model="poly3" focal="14" br="0.0000545" vr="0.9999957" bb="-0.0000990" vb="1.0003900" />
+-            <tca model="poly3" focal="16" br="0.0000580" vr="0.9999839" bb="-0.0000883" vb="1.0003771" />
+-            <tca model="poly3" focal="18" br="0.0000332" vr="0.9999152" bb="-0.0000803" vb="1.0003392" />
++            <distortion model="ptlens" focal="10" a="0.03262" b="-0.08127" c="0.0223"/>
++            <distortion model="ptlens" focal="12" a="0.02319" b="-0.05695" c="0.02094"/>
++            <distortion model="ptlens" focal="14" a="0.01584" b="-0.03852" c="0.02566"/>
++            <distortion model="ptlens" focal="16" a="0.00771" b="-0.01094" c="0.0027"/>
++            <distortion model="ptlens" focal="18" a="0.01105" b="-0.02442" c="0.03158"/>
++            <tca model="poly3" focal="10" br="0.0001931" vr="1.0000158" bb="-0.0000887" vb="1.0002784"/>
++            <tca model="poly3" focal="12" br="0.0000920" vr="1.0000354" bb="-0.0000836" vb="1.0003099"/>
++            <tca model="poly3" focal="14" br="0.0000545" vr="0.9999957" bb="-0.0000990" vb="1.0003900"/>
++            <tca model="poly3" focal="16" br="0.0000580" vr="0.9999839" bb="-0.0000883" vb="1.0003771"/>
++            <tca model="poly3" focal="18" br="0.0000332" vr="0.9999152" bb="-0.0000803" vb="1.0003392"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 18-200mm F3.5-6.3 OSS</model>
++        <model>E 10-18mm f/4 OSS</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Alpha 7S -->
++            <distortion model="ptlens" focal="10" a="0.196017" b="-0.375554" c="0.167273"/>
++            <distortion model="ptlens" focal="12" a="0.131602" b="-0.258384" c="0.136303"/>
++            <distortion model="ptlens" focal="14" a="0.116361" b="-0.255284" c="0.189679"/>
++            <distortion model="ptlens" focal="16" a="0.1015" b="-0.223082" c="0.169764"/>
++            <distortion model="ptlens" focal="18" a="0.0633556" b="-0.132668" c="0.123128"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>E 18-200mm f/3.5-6.3 OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-C3 -->
+-            <distortion model="ptlens" focal="18" a="0.03037" b="-0.09891" c="0.05057" />
+-            <distortion model="ptlens" focal="20" a="0.0203" b="-0.05723" c="0.0216" />
+-            <distortion model="ptlens" focal="23" a="0.01761" b="-0.05034" c="0.03542" />
+-            <distortion model="ptlens" focal="28" a="0.01267" b="-0.03161" c="0.0263" />
+-            <distortion model="ptlens" focal="33" a="0.00573" b="-0.00253" c="-0.00483" />
+-            <distortion model="ptlens" focal="46" a="0.0051" b="-0.0036" c="0.00641" />
+-            <distortion model="ptlens" focal="50" a="0.00533" b="-0.00597" c="0.01274" />
+-            <distortion model="ptlens" focal="72" a="-0.00055" b="0.01327" c="-0.00383" />
+-            <distortion model="ptlens" focal="105" a="0.00331" b="-0.00212" c="0.013" />
+-            <distortion model="ptlens" focal="152" a="0.00169" b="-0.00091" c="0.01404" />
+-            <distortion model="ptlens" focal="200" a="0.00073" b="0.00129" c="0.00737" />
+-            <tca model="poly3" focal="18" br="-0.0000552" vr="1.0006269" bb="0.0000583" vb="0.9999573" />
+-            <tca model="poly3" focal="20" br="-0.0000904" vr="1.0005624" bb="0.0000510" vb="0.9999635" />
+-            <tca model="poly3" focal="23" br="-0.0000709" vr="1.0004950" bb="0.0000359" vb="0.9999966" />
+-            <tca model="poly3" focal="28" br="-0.0000729" vr="1.0004139" bb="0.0000430" vb="0.9999977" />
+-            <tca model="poly3" focal="33" br="-0.0000797" vr="1.0003518" bb="0.0000224" vb="1.0000245" />
+-            <tca model="poly3" focal="46" br="-0.0000887" vr="1.0002652" bb="0.0000090" vb="1.0000035" />
+-            <tca model="poly3" focal="50" br="-0.0000474" vr="1.0001803" bb="0.0000212" vb="0.9999889" />
+-            <tca model="poly3" focal="72" br="-0.0000251" vr="1.0000899" bb="0.0000172" vb="0.9999091" />
+-            <tca model="poly3" focal="105" br="-0.0000014" vr="0.9999706" bb="-0.0000672" vb="0.9999431" />
+-            <tca model="poly3" focal="152" br="0.0000126" vr="0.9997273" bb="-0.0000672" vb="0.9998688" />
+-            <tca model="poly3" focal="200" br="-0.0001378" vr="0.9996377" bb="-0.0000300" vb="0.9998507" />
++            <distortion model="ptlens" focal="18" a="0.03037" b="-0.09891" c="0.05057"/>
++            <distortion model="ptlens" focal="20" a="0.0203" b="-0.05723" c="0.0216"/>
++            <distortion model="ptlens" focal="23" a="0.01761" b="-0.05034" c="0.03542"/>
++            <distortion model="ptlens" focal="28" a="0.01267" b="-0.03161" c="0.0263"/>
++            <distortion model="ptlens" focal="33" a="0.00573" b="-0.00253" c="-0.00483"/>
++            <distortion model="ptlens" focal="46" a="0.0051" b="-0.0036" c="0.00641"/>
++            <distortion model="ptlens" focal="50" a="0.00533" b="-0.00597" c="0.01274"/>
++            <distortion model="ptlens" focal="72" a="-0.00055" b="0.01327" c="-0.00383"/>
++            <distortion model="ptlens" focal="105" a="0.00331" b="-0.00212" c="0.013"/>
++            <distortion model="ptlens" focal="152" a="0.00169" b="-0.00091" c="0.01404"/>
++            <distortion model="ptlens" focal="200" a="0.00073" b="0.00129" c="0.00737"/>
++            <tca model="poly3" focal="18" br="-0.0000552" vr="1.0006269" bb="0.0000583" vb="0.9999573"/>
++            <tca model="poly3" focal="20" br="-0.0000904" vr="1.0005624" bb="0.0000510" vb="0.9999635"/>
++            <tca model="poly3" focal="23" br="-0.0000709" vr="1.0004950" bb="0.0000359" vb="0.9999966"/>
++            <tca model="poly3" focal="28" br="-0.0000729" vr="1.0004139" bb="0.0000430" vb="0.9999977"/>
++            <tca model="poly3" focal="33" br="-0.0000797" vr="1.0003518" bb="0.0000224" vb="1.0000245"/>
++            <tca model="poly3" focal="46" br="-0.0000887" vr="1.0002652" bb="0.0000090" vb="1.0000035"/>
++            <tca model="poly3" focal="50" br="-0.0000474" vr="1.0001803" bb="0.0000212" vb="0.9999889"/>
++            <tca model="poly3" focal="72" br="-0.0000251" vr="1.0000899" bb="0.0000172" vb="0.9999091"/>
++            <tca model="poly3" focal="105" br="-0.0000014" vr="0.9999706" bb="-0.0000672" vb="0.9999431"/>
++            <tca model="poly3" focal="152" br="0.0000126" vr="0.9997273" bb="-0.0000672" vb="0.9998688"/>
++            <tca model="poly3" focal="200" br="-0.0001378" vr="0.9996377" bb="-0.0000300" vb="0.9998507"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 24mm F1.8 ZA</model>
++        <model>E 24mm f/1.8 ZA</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-C3 -->
+-            <distortion model="ptlens" focal="24" a="0.00641" b="-0.0083" c="0.00228" />
+-            <tca model="linear" focal="24" kr="1.0004" kb="1.0002" />
++            <distortion model="ptlens" focal="24" a="0.00641" b="-0.0083" c="0.00228"/>
++            <tca model="linear" focal="24" kr="1.0004" kb="1.0002"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 30mm F3.5 Macro</model>
++        <model>E 30mm f/3.5 Macro</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="30" a="0.00105" b="-0.00352" c="0.00057" />
+-            <tca model="poly3" focal="30" br="-0.0000797" vr="1.0005827" bb="0.0000655" vb="0.9997635" />
++            <distortion model="ptlens" focal="30" a="0.00105" b="-0.00352" c="0.00057"/>
++            <tca model="poly3" focal="30" br="-0.0000797" vr="1.0005827" bb="0.0000655" vb="0.9997635"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E PZ 16-50mm F3.5-5.6 OSS</model>
++        <model>E PZ 16-50mm f/3.5-5.6 OSS</model>
++        <model lang="en">E 16-50mm f/3.5-5.6 OSS PZ</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <!-- Taken with Sony NEX-6 -->
+-            <distortion model="ptlens" focal="16" a="0.00449" b="-0.0338" c="-0.0382" />
+-            <distortion model="ptlens" focal="20" a="0.0033" b="-0.01638" c="-0.03795" />
+-            <distortion model="ptlens" focal="24" a="0.01301" b="-0.05186" c="0.03349" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.00221" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.00438" c="0" />
+-            <tca model="poly3" focal="16" vr="1.0009" vb="0.99976" />
+-            <tca model="poly3" focal="20" vr="1.0004" vb="1.00000" />
+-            <tca model="poly3" focal="24" vr="1.0002" vb="1.0002" />
+-            <tca model="poly3" focal="35" vr="1.0002" vb="1.0002" />
+-            <tca model="poly3" focal="50" vr="1.00000" vb="1.00000" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-1.2228" k2="2.2531" k3="-1.9667" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.2228" k2="2.2531" k3="-1.9667" />
+-            <vignetting model="pa" focal="16" aperture="5" distance="10" k1="-1.2706" k2="2.4221" k3="-2.0234" />
+-            <vignetting model="pa" focal="16" aperture="5" distance="1000" k1="-1.2706" k2="2.4221" k3="-2.0234" />
+-            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-1.2621" k2="2.3553" k3="-1.9482" />
+-            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-1.2621" k2="2.3553" k3="-1.9482" />
+-            <vignetting model="pa" focal="16" aperture="10" distance="10" k1="-1.3319" k2="2.5969" k3="-2.0708" />
+-            <vignetting model="pa" focal="16" aperture="10" distance="1000" k1="-1.3319" k2="2.5969" k3="-2.0708" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-1.1806" k2="1.9654" k3="-1.4656" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.1806" k2="1.9654" k3="-1.4656" />
+-            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.6142" k2="0.1813" k3="0.0009" />
+-            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.6142" k2="0.1813" k3="0.0009" />
+-            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.5194" k2="0.1625" k3="-0.1327" />
+-            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5194" k2="0.1625" k3="-0.1327" />
+-            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.6200" k2="0.5517" k3="-0.4030" />
+-            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.6200" k2="0.5517" k3="-0.4030" />
+-            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.6582" k2="0.6120" k3="-0.3720" />
+-            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.6582" k2="0.6120" k3="-0.3720" />
+-            <vignetting model="pa" focal="20" aperture="25" distance="10" k1="-0.5896" k2="0.3281" k3="-0.1177" />
+-            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.5896" k2="0.3281" k3="-0.1177" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.5118" k2="-0.0354" k3="0.0987" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.5118" k2="-0.0354" k3="0.0987" />
+-            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.5517" k2="0.4145" k3="-0.2989" />
+-            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.5517" k2="0.4145" k3="-0.2989" />
+-            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.6446" k2="0.6958" k3="-0.4714" />
+-            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6446" k2="0.6958" k3="-0.4714" />
+-            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.5645" k2="0.3682" k3="-0.1868" />
+-            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.5645" k2="0.3682" k3="-0.1868" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.5432" k2="0.2685" k3="-0.0921" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.5432" k2="0.2685" k3="-0.0921" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.0893" k2="-0.3404" k3="0.0531" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.0893" k2="-0.3404" k3="0.0531" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.4195" k2="0.6185" k3="-0.5395" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.4195" k2="0.6185" k3="-0.5395" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3794" k2="0.3497" k3="-0.2831" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3794" k2="0.3497" k3="-0.2831" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3088" k2="0.0636" k3="-0.0186" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3088" k2="0.0636" k3="-0.0186" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.3030" k2="0.0367" k3="0.0077" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.3030" k2="0.0367" k3="0.0077" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2835" k2="0.1219" k3="-0.2200" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2835" k2="0.1219" k3="-0.2200" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2745" k2="0.3636" k3="-0.4559" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2745" k2="0.3636" k3="-0.4559" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3725" k2="0.6319" k3="-0.5981" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3725" k2="0.6319" k3="-0.5981" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2896" k2="0.2645" k3="-0.2308" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2896" k2="0.2645" k3="-0.2308" />
+-            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2146" k2="-0.0181" k3="0.0219" />
+-            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2146" k2="-0.0181" k3="0.0219" />
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="ptlens" focal="16" a="0.0219" b="-0.10642" c="0.06233"/>
++            <distortion model="ptlens" focal="17" a="0.02079" b="-0.1021" c="0.07393"/>
++            <distortion model="ptlens" focal="18" a="0.01695" b="-0.08141" c="0.04383"/>
++            <distortion model="ptlens" focal="20" a="0.01611" b="-0.07309" c="0.04369"/>
++            <distortion model="ptlens" focal="25" a="0.00742" b="-0.03546" c="0.02961"/>
++            <distortion model="ptlens" focal="40" a="0.00918" b="-0.02995" c="0.03028"/>
++            <distortion model="ptlens" focal="50" a="0.00423" b="-0.00129" c="-0.00963"/>
++            <tca model="poly3" focal="16" br="0.0002723" vr="1.0000060" bb="-0.0002083" vb="1.0003686"/>
++            <tca model="poly3" focal="18" br="0.0001711" vr="1.0000288" bb="-0.0001363" vb="1.0003509"/>
++            <tca model="poly3" focal="20" br="0.0001477" vr="0.9999914" bb="-0.0001091" vb="1.0003535"/>
++            <tca model="poly3" focal="25" br="0.0000462" vr="1.0000334" bb="-0.0000764" vb="1.0003227"/>
++            <tca model="poly3" focal="30" br="0.0000545" vr="1.0000258" bb="-0.0000653" vb="1.0002631"/>
++            <tca model="poly3" focal="40" br="0.0000423" vr="1.0000033" bb="-0.0000459" vb="1.0002035"/>
++            <tca model="poly3" focal="50" br="0.0000231" vr="0.9999534" bb="-0.0000443" vb="1.0002348"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.6128" k2="-0.6331" k3="0.2769"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.6128" k2="-0.6331" k3="0.2769"/>
++            <vignetting model="pa" focal="16" aperture="5" distance="10" k1="-0.7949" k2="0.6849" k3="-0.8439"/>
++            <vignetting model="pa" focal="16" aperture="5" distance="1000" k1="-0.7949" k2="0.6849" k3="-0.8439"/>
++            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-1.1244" k2="1.7817" k3="-1.5484"/>
++            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-1.1244" k2="1.7817" k3="-1.5484"/>
++            <vignetting model="pa" focal="16" aperture="10" distance="10" k1="-1.2252" k2="2.0719" k3="-1.6702"/>
++            <vignetting model="pa" focal="16" aperture="10" distance="1000" k1="-1.2252" k2="2.0719" k3="-1.6702"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-1.0274" k2="1.2673" k3="-0.9134"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.0274" k2="1.2673" k3="-0.9134"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.4173" k2="-0.8329" k3="0.5763"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4173" k2="-0.8329" k3="0.5763"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.5132" k2="0.0347" k3="-0.1394"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5132" k2="0.0347" k3="-0.1394"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.7177" k2="0.5996" k3="-0.4357"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.7177" k2="0.5996" k3="-0.4357"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.6634" k2="0.3624" k3="-0.1891"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.6634" k2="0.3624" k3="-0.1891"/>
++            <vignetting model="pa" focal="20" aperture="25" distance="10" k1="-0.6382" k2="0.2480" k3="-0.0779"/>
++            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.6382" k2="0.2480" k3="-0.0779"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.3130" k2="-0.8329" k3="0.5224"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.3130" k2="-0.8329" k3="0.5224"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.5410" k2="0.2546" k3="-0.2728"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.5410" k2="0.2546" k3="-0.2728"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.6115" k2="0.4585" k3="-0.3221"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6115" k2="0.4585" k3="-0.3221"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.5473" k2="0.1905" k3="-0.0633"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.5473" k2="0.1905" k3="-0.0633"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.5646" k2="0.2271" k3="-0.0850"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.5646" k2="0.2271" k3="-0.0850"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1887" k2="-0.4109" k3="0.1132"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1887" k2="-0.4109" k3="0.1132"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.4290" k2="0.6189" k3="-0.5852"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.4290" k2="0.6189" k3="-0.5852"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3768" k2="0.3490" k3="-0.2847"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3768" k2="0.3490" k3="-0.2847"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3181" k2="0.0894" k3="-0.0372"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3181" k2="0.0894" k3="-0.0372"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.3378" k2="0.1216" k3="-0.0527"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.3378" k2="0.1216" k3="-0.0527"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.4443" k2="0.1443" k3="-0.1834"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.4443" k2="0.1443" k3="-0.1834"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2751" k2="0.3455" k3="-0.4759"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2751" k2="0.3455" k3="-0.4759"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3741" k2="0.5982" k3="-0.5399"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3741" k2="0.5982" k3="-0.5399"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2793" k2="0.1907" k3="-0.1556"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2793" k2="0.1907" k3="-0.1556"/>
++            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2523" k2="0.0609" k3="-0.0342"/>
++            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2523" k2="0.0609" k3="-0.0342"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 18-200mm F3.5-6.3 OSS LE</model>
++        <model>E 18-200mm f/3.5-6.3 OSS LE</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-6 -->
+-            <distortion model="ptlens" focal="18" a="0.03823" b="-0.12894" c="0.09134" />
+-            <distortion model="ptlens" focal="20" a="0.03476" b="-0.09859" c="0.05582" />
+-            <distortion model="ptlens" focal="24" a="0.02008" b="-0.05406" c="0.04073" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.00353" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0.00373" c="0" />
+-            <distortion model="ptlens" focal="52" a="0" b="0.00515" c="0" />
+-            <distortion model="ptlens" focal="96" a="0" b="0.00618" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.00892" c="0" />
+-            <tca model="poly3" focal="18" vr="1.00045" vb="1.0004" />
+-            <tca model="poly3" focal="36" vr="1.00048" vb="1.00024" />
+-            <tca model="poly3" focal="51" vr="1.00026" vb="1.00028" />
+-            <tca model="poly3" focal="95" vr="1.00000" vb="0.9999" />
+-            <tca model="poly3" focal="200" vr="0.99935" vb="0.99927" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.6841" k2="0.5147" k3="-0.1985" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.6841" k2="0.5147" k3="-0.1985" />
+-            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.6509" k2="0.2068" k3="0.0775" />
+-            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.6509" k2="0.2068" k3="0.0775" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.6427" k2="0.2723" k3="-0.0283" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.6427" k2="0.2723" k3="-0.0283" />
+-            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.6536" k2="0.3190" k3="-0.1109" />
+-            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.6536" k2="0.3190" k3="-0.1109" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.6448" k2="0.2973" k3="-0.0981" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.6448" k2="0.2973" k3="-0.0981" />
+-            <vignetting model="pa" focal="36" aperture="4.5" distance="10" k1="-0.2447" k2="-0.3812" k3="0.2806" />
+-            <vignetting model="pa" focal="36" aperture="4.5" distance="1000" k1="-0.2447" k2="-0.3812" k3="0.2806" />
+-            <vignetting model="pa" focal="36" aperture="6.3" distance="10" k1="-0.3018" k2="0.0846" k3="-0.0283" />
+-            <vignetting model="pa" focal="36" aperture="6.3" distance="1000" k1="-0.3018" k2="0.0846" k3="-0.0283" />
+-            <vignetting model="pa" focal="36" aperture="9" distance="10" k1="-0.2855" k2="0.0315" k3="0.0195" />
+-            <vignetting model="pa" focal="36" aperture="9" distance="1000" k1="-0.2855" k2="0.0315" k3="0.0195" />
+-            <vignetting model="pa" focal="36" aperture="13" distance="10" k1="-0.2780" k2="0.0185" k3="0.0259" />
+-            <vignetting model="pa" focal="36" aperture="13" distance="1000" k1="-0.2780" k2="0.0185" k3="0.0259" />
+-            <vignetting model="pa" focal="36" aperture="29" distance="10" k1="-0.2683" k2="0.0054" k3="0.0287" />
+-            <vignetting model="pa" focal="36" aperture="29" distance="1000" k1="-0.2683" k2="0.0054" k3="0.0287" />
+-            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="0.0108" k2="-0.6327" k3="0.3858" />
+-            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="0.0108" k2="-0.6327" k3="0.3858" />
+-            <vignetting model="pa" focal="51" aperture="8" distance="10" k1="-0.1746" k2="-0.0299" k3="0.0441" />
+-            <vignetting model="pa" focal="51" aperture="8" distance="1000" k1="-0.1746" k2="-0.0299" k3="0.0441" />
+-            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.1690" k2="-0.0406" k3="0.0509" />
+-            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.1690" k2="-0.0406" k3="0.0509" />
+-            <vignetting model="pa" focal="51" aperture="16" distance="10" k1="-0.1608" k2="-0.0542" k3="0.0581" />
+-            <vignetting model="pa" focal="51" aperture="16" distance="1000" k1="-0.1608" k2="-0.0542" k3="0.0581" />
+-            <vignetting model="pa" focal="51" aperture="36" distance="10" k1="-0.1530" k2="-0.0656" k3="0.0630" />
+-            <vignetting model="pa" focal="51" aperture="36" distance="1000" k1="-0.1530" k2="-0.0656" k3="0.0630" />
+-            <vignetting model="pa" focal="98" aperture="6.3" distance="10" k1="0.0020" k2="-0.6019" k3="0.4007" />
+-            <vignetting model="pa" focal="98" aperture="6.3" distance="1000" k1="0.0020" k2="-0.6019" k3="0.4007" />
+-            <vignetting model="pa" focal="98" aperture="9" distance="10" k1="-0.1176" k2="-0.1346" k3="0.1048" />
+-            <vignetting model="pa" focal="98" aperture="9" distance="1000" k1="-0.1176" k2="-0.1346" k3="0.1048" />
+-            <vignetting model="pa" focal="98" aperture="13" distance="10" k1="-0.1075" k2="-0.1531" k3="0.1152" />
+-            <vignetting model="pa" focal="98" aperture="13" distance="1000" k1="-0.1075" k2="-0.1531" k3="0.1152" />
+-            <vignetting model="pa" focal="98" aperture="18" distance="10" k1="-0.0975" k2="-0.1691" k3="0.1238" />
+-            <vignetting model="pa" focal="98" aperture="18" distance="1000" k1="-0.0975" k2="-0.1691" k3="0.1238" />
+-            <vignetting model="pa" focal="98" aperture="40" distance="10" k1="-0.0896" k2="-0.1781" k3="0.1266" />
+-            <vignetting model="pa" focal="98" aperture="40" distance="1000" k1="-0.0896" k2="-0.1781" k3="0.1266" />
+-            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.1662" k2="0.0413" k3="-0.0911" />
+-            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.1662" k2="0.0413" k3="-0.0911" />
+-            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.2004" k2="0.1802" k3="-0.1796" />
+-            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.2004" k2="0.1802" k3="-0.1796" />
+-            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1368" k2="-0.0748" k3="0.0575" />
+-            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1368" k2="-0.0748" k3="0.0575" />
+-            <vignetting model="pa" focal="200" aperture="18" distance="10" k1="-0.1063" k2="-0.1552" k3="0.1188" />
+-            <vignetting model="pa" focal="200" aperture="18" distance="1000" k1="-0.1063" k2="-0.1552" k3="0.1188" />
+-            <vignetting model="pa" focal="200" aperture="40" distance="10" k1="-0.0937" k2="-0.1726" k3="0.1275" />
+-            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0937" k2="-0.1726" k3="0.1275" />
++            <distortion model="ptlens" focal="18" a="0.03823" b="-0.12894" c="0.09134"/>
++            <distortion model="ptlens" focal="20" a="0.03476" b="-0.09859" c="0.05582"/>
++            <distortion model="ptlens" focal="24" a="0.02008" b="-0.05406" c="0.04073"/>
++            <distortion model="ptlens" focal="30" a="0" b="0.00353" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.00373" c="0"/>
++            <distortion model="ptlens" focal="52" a="0" b="0.00515" c="0"/>
++            <distortion model="ptlens" focal="96" a="0" b="0.00618" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.00892" c="0"/>
++            <tca model="poly3" focal="18" vr="1.00045" vb="1.0004"/>
++            <tca model="poly3" focal="36" vr="1.00048" vb="1.00024"/>
++            <tca model="poly3" focal="51" vr="1.00026" vb="1.00028"/>
++            <tca model="poly3" focal="95" vr="1.00000" vb="0.9999"/>
++            <tca model="poly3" focal="200" vr="0.99935" vb="0.99927"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.6841" k2="0.5147" k3="-0.1985"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.6841" k2="0.5147" k3="-0.1985"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.6509" k2="0.2068" k3="0.0775"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.6509" k2="0.2068" k3="0.0775"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.6427" k2="0.2723" k3="-0.0283"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.6427" k2="0.2723" k3="-0.0283"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.6536" k2="0.3190" k3="-0.1109"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.6536" k2="0.3190" k3="-0.1109"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.6448" k2="0.2973" k3="-0.0981"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.6448" k2="0.2973" k3="-0.0981"/>
++            <vignetting model="pa" focal="36" aperture="4.5" distance="10" k1="-0.2447" k2="-0.3812" k3="0.2806"/>
++            <vignetting model="pa" focal="36" aperture="4.5" distance="1000" k1="-0.2447" k2="-0.3812" k3="0.2806"/>
++            <vignetting model="pa" focal="36" aperture="6.3" distance="10" k1="-0.3018" k2="0.0846" k3="-0.0283"/>
++            <vignetting model="pa" focal="36" aperture="6.3" distance="1000" k1="-0.3018" k2="0.0846" k3="-0.0283"/>
++            <vignetting model="pa" focal="36" aperture="9" distance="10" k1="-0.2855" k2="0.0315" k3="0.0195"/>
++            <vignetting model="pa" focal="36" aperture="9" distance="1000" k1="-0.2855" k2="0.0315" k3="0.0195"/>
++            <vignetting model="pa" focal="36" aperture="13" distance="10" k1="-0.2780" k2="0.0185" k3="0.0259"/>
++            <vignetting model="pa" focal="36" aperture="13" distance="1000" k1="-0.2780" k2="0.0185" k3="0.0259"/>
++            <vignetting model="pa" focal="36" aperture="29" distance="10" k1="-0.2683" k2="0.0054" k3="0.0287"/>
++            <vignetting model="pa" focal="36" aperture="29" distance="1000" k1="-0.2683" k2="0.0054" k3="0.0287"/>
++            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="0.0108" k2="-0.6327" k3="0.3858"/>
++            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="0.0108" k2="-0.6327" k3="0.3858"/>
++            <vignetting model="pa" focal="51" aperture="8" distance="10" k1="-0.1746" k2="-0.0299" k3="0.0441"/>
++            <vignetting model="pa" focal="51" aperture="8" distance="1000" k1="-0.1746" k2="-0.0299" k3="0.0441"/>
++            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.1690" k2="-0.0406" k3="0.0509"/>
++            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.1690" k2="-0.0406" k3="0.0509"/>
++            <vignetting model="pa" focal="51" aperture="16" distance="10" k1="-0.1608" k2="-0.0542" k3="0.0581"/>
++            <vignetting model="pa" focal="51" aperture="16" distance="1000" k1="-0.1608" k2="-0.0542" k3="0.0581"/>
++            <vignetting model="pa" focal="51" aperture="36" distance="10" k1="-0.1530" k2="-0.0656" k3="0.0630"/>
++            <vignetting model="pa" focal="51" aperture="36" distance="1000" k1="-0.1530" k2="-0.0656" k3="0.0630"/>
++            <vignetting model="pa" focal="98" aperture="6.3" distance="10" k1="0.0020" k2="-0.6019" k3="0.4007"/>
++            <vignetting model="pa" focal="98" aperture="6.3" distance="1000" k1="0.0020" k2="-0.6019" k3="0.4007"/>
++            <vignetting model="pa" focal="98" aperture="9" distance="10" k1="-0.1176" k2="-0.1346" k3="0.1048"/>
++            <vignetting model="pa" focal="98" aperture="9" distance="1000" k1="-0.1176" k2="-0.1346" k3="0.1048"/>
++            <vignetting model="pa" focal="98" aperture="13" distance="10" k1="-0.1075" k2="-0.1531" k3="0.1152"/>
++            <vignetting model="pa" focal="98" aperture="13" distance="1000" k1="-0.1075" k2="-0.1531" k3="0.1152"/>
++            <vignetting model="pa" focal="98" aperture="18" distance="10" k1="-0.0975" k2="-0.1691" k3="0.1238"/>
++            <vignetting model="pa" focal="98" aperture="18" distance="1000" k1="-0.0975" k2="-0.1691" k3="0.1238"/>
++            <vignetting model="pa" focal="98" aperture="40" distance="10" k1="-0.0896" k2="-0.1781" k3="0.1266"/>
++            <vignetting model="pa" focal="98" aperture="40" distance="1000" k1="-0.0896" k2="-0.1781" k3="0.1266"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.1662" k2="0.0413" k3="-0.0911"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.1662" k2="0.0413" k3="-0.0911"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.2004" k2="0.1802" k3="-0.1796"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.2004" k2="0.1802" k3="-0.1796"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1368" k2="-0.0748" k3="0.0575"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1368" k2="-0.0748" k3="0.0575"/>
++            <vignetting model="pa" focal="200" aperture="18" distance="10" k1="-0.1063" k2="-0.1552" k3="0.1188"/>
++            <vignetting model="pa" focal="200" aperture="18" distance="1000" k1="-0.1063" k2="-0.1552" k3="0.1188"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="10" k1="-0.0937" k2="-0.1726" k3="0.1275"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0937" k2="-0.1726" k3="0.1275"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>E 35mm F1.8 OSS</model>
++        <model>E 35mm f/1.8 OSS</model>
+         <mount>Sony E</mount>
+-        <cropfactor>1.534</cropfactor>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Sony NEX-6 -->
+-            <distortion model="ptlens" focal="35" a="-0.01085" b="0.03631" c="-0.04468" />
+-            <tca model="poly3" focal="35" vr="1.0002" vb="1.0002" />
+-            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-0.6592" k2="0.2110" k3="0.0209" />
+-            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-0.6592" k2="0.2110" k3="0.0209" />
+-            <vignetting model="pa" focal="35" aperture="2.5" distance="10" k1="-0.3254" k2="-0.0868" k3="0.0015" />
+-            <vignetting model="pa" focal="35" aperture="2.5" distance="1000" k1="-0.3254" k2="-0.0868" k3="0.0015" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.4488" k2="0.2554" k3="-0.1538" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.4488" k2="0.2554" k3="-0.1538" />
+-            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.4778" k2="0.2424" k3="-0.0824" />
+-            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.4778" k2="0.2424" k3="-0.0824" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.4891" k2="0.2020" k3="-0.0234" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.4891" k2="0.2020" k3="-0.0234" />
++            <distortion model="ptlens" focal="35" a="-0.01085" b="0.03631" c="-0.04468"/>
++            <tca model="poly3" focal="35" vr="1.0002" vb="1.0002"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-0.6592" k2="0.2110" k3="0.0209"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-0.6592" k2="0.2110" k3="0.0209"/>
++            <vignetting model="pa" focal="35" aperture="2.5" distance="10" k1="-0.3254" k2="-0.0868" k3="0.0015"/>
++            <vignetting model="pa" focal="35" aperture="2.5" distance="1000" k1="-0.3254" k2="-0.0868" k3="0.0015"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.4488" k2="0.2554" k3="-0.1538"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.4488" k2="0.2554" k3="-0.1538"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.4778" k2="0.2424" k3="-0.0824"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.4778" k2="0.2424" k3="-0.0824"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.4891" k2="0.2020" k3="-0.0234"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.4891" k2="0.2020" k3="-0.0234"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>E 20mm f/2.8</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony NEX-7 -->
++            <!-- Measured with 360° panorama -->
++            <distortion model="ptlens" focal="20" a="0.01609" b="-0.05179" c="0.01925"/>
++            <tca model="poly3" focal="20" br="-0.0001183" vr="1.0003488" bb="0.0002181" vb="0.9998147"/>
++            <!-- Measured with overlapping pictures -->
++            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-1.95337" k2="1.92292" k3="-0.82277"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-1.95337" k2="1.92292" k3="-0.82277"/>
++            <vignetting model="pa" focal="20" aperture="3.5" distance="10" k1="-1.04466" k2="0.2586" k3="0.03996"/>
++            <vignetting model="pa" focal="20" aperture="3.5" distance="1000" k1="-1.04466" k2="0.2586" k3="0.03996"/>
++            <vignetting model="pa" focal="20" aperture="4.5" distance="10" k1="-1.0792" k2="0.62563" k3="-0.25916"/>
++            <vignetting model="pa" focal="20" aperture="4.5" distance="1000" k1="-1.0792" k2="0.62563" k3="-0.25916"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-1.05526" k2="0.5907" k3="-0.2125"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.05526" k2="0.5907" k3="-0.2125"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-1.0367" k2="0.57998" k3="-0.20893"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-1.0367" k2="0.57998" k3="-0.20893"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="10" k1="-1.04725" k2="0.62966" k3="-0.24257"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-1.04725" k2="0.62966" k3="-0.24257"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>E 16-70mm f/4 ZA OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="ptlens" focal="16" a="0.02953" b="-0.08038" c="0.02902"/>
++            <distortion model="ptlens" focal="19" a="0.03146" b="-0.09959" c="0.09201"/>
++            <distortion model="ptlens" focal="24" a="0.01795" b="-0.05418" c="0.05884"/>
++            <distortion model="ptlens" focal="53" a="0" b="0.00531" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.0044" c="0"/>
++            <tca model="poly3" focal="16" br="-0.0000060" vr="1.0004895" bb="-0.0000034" vb="1.0000426"/>
++            <tca model="poly3" focal="19" br="-0.0000261" vr="1.0002958" bb="0.0000171" vb="1.0000564"/>
++            <tca model="poly3" focal="24" br="-0.0000594" vr="1.0002412" bb="0.0000076" vb="1.0001034"/>
++            <tca model="poly3" focal="53" br="-0.0000170" vr="1.0000417" bb="0.0000067" vb="0.9999435"/>
++            <tca model="poly3" focal="70" br="-0.0000055" vr="0.9999084" bb="0.0000026" vb="0.9999142"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>E PZ 18-105mm f/4 G OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="ptlens" focal="18" a="0.058" b="-0.14747" c="0.10212"/>
++            <distortion model="ptlens" focal="21" a="0.0819" b="-0.19694" c="0.16895"/>
++            <distortion model="ptlens" focal="26" a="0.05257" b="-0.0963" c="0.08288"/>
++            <distortion model="ptlens" focal="28" a="0.03948" b="-0.05729" c="0.04944"/>
++            <distortion model="ptlens" focal="105" a="0.01385" b="0.02022" c="-0.01695"/>
++            <tca model="poly3" focal="18" br="-0.0000802" vr="1.0007953" bb="0.0001123" vb="0.9997721"/>
++            <tca model="poly3" focal="21" br="-0.0001951" vr="1.0007857" bb="0.0001194" vb="0.9997885"/>
++            <tca model="poly3" focal="26" br="-0.0001807" vr="1.0006159" bb="0.0001234" vb="0.9997867"/>
++            <tca model="poly3" focal="28" br="-0.0001413" vr="1.0005127" bb="0.0000942" vb="0.9997947"/>
++            <tca model="poly3" focal="105" br="0.0000407" vr="0.9996731" bb="0.0000675" vb="0.9997709"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 28-70mm f/3.5-5.6 OSS</model>
++        <mount>Sony E</mount>
++        <aperture min="3.5" max="5.6"/>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7 -->
++            <distortion focal="28" model="ptlens" a="0.00900771" b="-0.0310341" c="0.00110802"/>
++            <distortion focal="34" model="ptlens" a="0.0110131" b="-0.0342976" c="0.0325604"/>
++            <distortion focal="49" model="ptlens" a="0.00652285" b="0.000355028" c="0.00747157"/>
++            <distortion focal="58" model="ptlens" a="0.0106412" b="-0.0116139" c="0.0218262"/>
++            <distortion focal="70" model="ptlens" a="0.00952653" b="-0.0142895" c="0.0363005"/>
++            <!-- Taken with Sony A7 II -->
++            <tca model="poly3" focal="28" br="-0.0001882" vr="1.0005795" bb="0.0001886" vb="0.9997320"/>
++            <tca model="poly3" focal="30" br="-0.0001834" vr="1.0006067" bb="0.0001663" vb="0.9997188"/>
++            <tca model="poly3" focal="35" br="-0.0001167" vr="1.0004457" bb="0.0001192" vb="0.9997740"/>
++            <tca model="poly3" focal="42" br="-0.0001095" vr="1.0003811" bb="0.0000864" vb="0.9998108"/>
++            <tca model="poly3" focal="50" br="-0.0000632" vr="1.0003667" bb="0.0000586" vb="0.9998070"/>
++            <tca model="poly3" focal="60" br="-0.0000295" vr="1.0003004" bb="0.0000423" vb="0.9997824"/>
++            <tca model="poly3" focal="70" br="-0.0000446" vr="1.0002475" bb="0.0000515" vb="0.9998071"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-1.2040" k2="0.7047" k3="-0.2263"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-1.2040" k2="0.7047" k3="-0.2263"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.6285" k2="-0.2594" k3="0.2262"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.6285" k2="-0.2594" k3="0.2262"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.4980" k2="-0.3476" k3="0.2322"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.4980" k2="-0.3476" k3="0.2322"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.4633" k2="-0.2486" k3="0.1501"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.4633" k2="-0.2486" k3="0.1501"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.5125" k2="-0.0137" k3="0.0056"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.5125" k2="-0.0137" k3="0.0056"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.6026" k2="0.2287" k3="-0.0677"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6026" k2="0.2287" k3="-0.0677"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.5856" k2="0.1429" k3="0.0134"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.5856" k2="0.1429" k3="0.0134"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.6349" k2="0.2384" k3="-0.0403"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.6349" k2="0.2384" k3="-0.0403"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.5911" k2="0.1506" k3="0.0138"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.5911" k2="0.1506" k3="0.0138"/>
++            <vignetting model="pa" focal="33" aperture="4" distance="10" k1="-0.7101" k2="-0.3088" k3="0.3942"/>
++            <vignetting model="pa" focal="33" aperture="4" distance="1000" k1="-0.7101" k2="-0.3088" k3="0.3942"/>
++            <vignetting model="pa" focal="33" aperture="4.5" distance="10" k1="-0.4120" k2="-0.6673" k3="0.5188"/>
++            <vignetting model="pa" focal="33" aperture="4.5" distance="1000" k1="-0.4120" k2="-0.6673" k3="0.5188"/>
++            <vignetting model="pa" focal="33" aperture="5" distance="10" k1="-0.3687" k2="-0.5405" k3="0.3704"/>
++            <vignetting model="pa" focal="33" aperture="5" distance="1000" k1="-0.3687" k2="-0.5405" k3="0.3704"/>
++            <vignetting model="pa" focal="33" aperture="5.6" distance="10" k1="-0.4116" k2="-0.2658" k3="0.1587"/>
++            <vignetting model="pa" focal="33" aperture="5.6" distance="1000" k1="-0.4116" k2="-0.2658" k3="0.1587"/>
++            <vignetting model="pa" focal="33" aperture="6.3" distance="10" k1="-0.4848" k2="0.0339" k3="-0.0425"/>
++            <vignetting model="pa" focal="33" aperture="6.3" distance="1000" k1="-0.4848" k2="0.0339" k3="-0.0425"/>
++            <vignetting model="pa" focal="33" aperture="7.1" distance="10" k1="-0.5449" k2="0.2203" k3="-0.1436"/>
++            <vignetting model="pa" focal="33" aperture="7.1" distance="1000" k1="-0.5449" k2="0.2203" k3="-0.1436"/>
++            <vignetting model="pa" focal="33" aperture="8" distance="10" k1="-0.5616" k2="0.2365" k3="-0.1116"/>
++            <vignetting model="pa" focal="33" aperture="8" distance="1000" k1="-0.5616" k2="0.2365" k3="-0.1116"/>
++            <vignetting model="pa" focal="33" aperture="11" distance="10" k1="-0.5240" k2="0.0826" k3="0.0352"/>
++            <vignetting model="pa" focal="33" aperture="11" distance="1000" k1="-0.5240" k2="0.0826" k3="0.0352"/>
++            <vignetting model="pa" focal="33" aperture="16" distance="10" k1="-0.5459" k2="0.1207" k3="0.0161"/>
++            <vignetting model="pa" focal="33" aperture="16" distance="1000" k1="-0.5459" k2="0.1207" k3="0.0161"/>
++            <vignetting model="pa" focal="33" aperture="22" distance="10" k1="-0.5583" k2="0.1451" k3="0.0014"/>
++            <vignetting model="pa" focal="33" aperture="22" distance="1000" k1="-0.5583" k2="0.1451" k3="0.0014"/>
++            <vignetting model="pa" focal="33" aperture="25" distance="10" k1="-0.5638" k2="0.1568" k3="-0.0058"/>
++            <vignetting model="pa" focal="33" aperture="25" distance="1000" k1="-0.5638" k2="0.1568" k3="-0.0058"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.6196" k2="-0.3001" k3="0.3240"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.6196" k2="-0.3001" k3="0.3240"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.4522" k2="-0.5970" k3="0.4794"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.4522" k2="-0.5970" k3="0.4794"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2762" k2="-0.8020" k3="0.5354"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2762" k2="-0.8020" k3="0.5354"/>
++            <vignetting model="pa" focal="50" aperture="6.3" distance="10" k1="-0.2920" k2="-0.5531" k3="0.3211"/>
++            <vignetting model="pa" focal="50" aperture="6.3" distance="1000" k1="-0.2920" k2="-0.5531" k3="0.3211"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.3606" k2="-0.2187" k3="0.0762"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.3606" k2="-0.2187" k3="0.0762"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.4506" k2="0.1175" k3="-0.1429"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4506" k2="0.1175" k3="-0.1429"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.5004" k2="0.2186" k3="-0.1088"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.5004" k2="0.2186" k3="-0.1088"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.4597" k2="0.0602" k3="0.0335"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.4597" k2="0.0602" k3="0.0335"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.4545" k2="0.0424" k3="0.0466"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.4545" k2="0.0424" k3="0.0466"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.4673" k2="0.0739" k3="0.0272"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.4673" k2="0.0739" k3="0.0272"/>
++            <vignetting model="pa" focal="56" aperture="5" distance="10" k1="-0.6399" k2="-0.1617" k3="0.2205"/>
++            <vignetting model="pa" focal="56" aperture="5" distance="1000" k1="-0.6399" k2="-0.1617" k3="0.2205"/>
++            <vignetting model="pa" focal="56" aperture="5.6" distance="10" k1="-0.2641" k2="-0.8424" k3="0.5716"/>
++            <vignetting model="pa" focal="56" aperture="5.6" distance="1000" k1="-0.2641" k2="-0.8424" k3="0.5716"/>
++            <vignetting model="pa" focal="56" aperture="6.3" distance="10" k1="-0.2242" k2="-0.7338" k3="0.4420"/>
++            <vignetting model="pa" focal="56" aperture="6.3" distance="1000" k1="-0.2242" k2="-0.7338" k3="0.4420"/>
++            <vignetting model="pa" focal="56" aperture="7.1" distance="10" k1="-0.2874" k2="-0.3743" k3="0.1669"/>
++            <vignetting model="pa" focal="56" aperture="7.1" distance="1000" k1="-0.2874" k2="-0.3743" k3="0.1669"/>
++            <vignetting model="pa" focal="56" aperture="8" distance="10" k1="-0.3831" k2="0.0014" k3="-0.0863"/>
++            <vignetting model="pa" focal="56" aperture="8" distance="1000" k1="-0.3831" k2="0.0014" k3="-0.0863"/>
++            <vignetting model="pa" focal="56" aperture="9" distance="10" k1="-0.4535" k2="0.2327" k3="-0.2203"/>
++            <vignetting model="pa" focal="56" aperture="9" distance="1000" k1="-0.4535" k2="0.2327" k3="-0.2203"/>
++            <vignetting model="pa" focal="56" aperture="11" distance="10" k1="-0.4956" k2="0.3037" k3="-0.1913"/>
++            <vignetting model="pa" focal="56" aperture="11" distance="1000" k1="-0.4956" k2="0.3037" k3="-0.1913"/>
++            <vignetting model="pa" focal="56" aperture="16" distance="10" k1="-0.4425" k2="0.0859" k3="0.0110"/>
++            <vignetting model="pa" focal="56" aperture="16" distance="1000" k1="-0.4425" k2="0.0859" k3="0.0110"/>
++            <vignetting model="pa" focal="56" aperture="22" distance="10" k1="-0.4563" k2="0.1202" k3="-0.0115"/>
++            <vignetting model="pa" focal="56" aperture="22" distance="1000" k1="-0.4563" k2="0.1202" k3="-0.0115"/>
++            <vignetting model="pa" focal="56" aperture="32" distance="10" k1="-0.4627" k2="0.1356" k3="-0.0216"/>
++            <vignetting model="pa" focal="56" aperture="32" distance="1000" k1="-0.4627" k2="0.1356" k3="-0.0216"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.6069" k2="-0.1103" k3="0.1505"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.6069" k2="-0.1103" k3="0.1505"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2376" k2="-0.8342" k3="0.5414"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2376" k2="-0.8342" k3="0.5414"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.1424" k2="-0.8532" k3="0.4849"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.1424" k2="-0.8532" k3="0.4849"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2108" k2="-0.4717" k3="0.1932"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2108" k2="-0.4717" k3="0.1932"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.3057" k2="-0.0952" k3="-0.0649"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.3057" k2="-0.0952" k3="-0.0649"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.3949" k2="0.2028" k3="-0.2450"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.3949" k2="0.2028" k3="-0.2450"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.4420" k2="0.3333" k3="-0.2965"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.4420" k2="0.3333" k3="-0.2965"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.4200" k2="0.1521" k3="-0.0582"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.4200" k2="0.1521" k3="-0.0582"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.4378" k2="0.1603" k3="-0.0423"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.4378" k2="0.1603" k3="-0.0423"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.4615" k2="0.2083" k3="-0.0690"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.4615" k2="0.2083" k3="-0.0690"/>
++            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.3423" k2="-0.0465" k3="0.0757"/>
++            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.3423" k2="-0.0465" k3="0.0757"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 70-300mm f/4.5-5.6 G OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 7S -->
++            <distortion model="poly3" focal="70" k1="0.00893573"/>
++            <distortion model="poly3" focal="82" k1="0.00852839"/>
++            <distortion model="poly3" focal="98" k1="0.00826276"/>
++            <distortion model="poly3" focal="168" k1="0.00630631"/>
++            <distortion model="poly3" focal="300" k1="0.00320709"/>
++            <tca model="poly3" focal="70" br="-0.0000069" vr="1.0001619" bb="0.0000001" vb="1.0000208"/>
++            <tca model="poly3" focal="82" br="-0.0000223" vr="1.0001261" bb="-0.0000394" vb="1.0001048"/>
++            <tca model="poly3" focal="98" br="0.0000178" vr="1.0000291" bb="-0.0000346" vb="1.0001251"/>
++            <tca model="poly3" focal="168" br="0.0000108" vr="0.9999182" bb="-0.0000878" vb="1.0001374"/>
++            <tca model="poly3" focal="300" br="0.0000676" vr="0.9997305" bb="-0.0000371" vb="1.0000310"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 35mm f/1.4 ZA</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Alpha 7S -->
++            <distortion model="poly3" focal="35" k1="-0.00399"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 55mm f/1.8 ZA</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7 II -->
++            <distortion model="ptlens" focal="55" a="-0.01142" b="0.02682" c="-0.01628"/>
++            <tca model="poly3" focal="55" vr="1.00005" vb="0.99975"/>
++            <vignetting model="pa" focal="55" aperture="1.8" distance="10" k1="-1.8584" k2="1.7422" k3="-0.6920"/>
++            <vignetting model="pa" focal="55" aperture="1.8" distance="1000" k1="-1.8584" k2="1.7422" k3="-0.6920"/>
++            <vignetting model="pa" focal="55" aperture="2" distance="10" k1="-1.2143" k2="0.3692" k3="0.0795"/>
++            <vignetting model="pa" focal="55" aperture="2" distance="1000" k1="-1.2143" k2="0.3692" k3="0.0795"/>
++            <vignetting model="pa" focal="55" aperture="2.2" distance="10" k1="-0.6831" k2="-0.5506" k3="0.5258"/>
++            <vignetting model="pa" focal="55" aperture="2.2" distance="1000" k1="-0.6831" k2="-0.5506" k3="0.5258"/>
++            <vignetting model="pa" focal="55" aperture="2.5" distance="10" k1="-0.4113" k2="-0.8526" k3="0.6106"/>
++            <vignetting model="pa" focal="55" aperture="2.5" distance="1000" k1="-0.4113" k2="-0.8526" k3="0.6106"/>
++            <vignetting model="pa" focal="55" aperture="2.8" distance="10" k1="-0.2661" k2="-1.0262" k3="0.6722"/>
++            <vignetting model="pa" focal="55" aperture="2.8" distance="1000" k1="-0.2661" k2="-1.0262" k3="0.6722"/>
++            <vignetting model="pa" focal="55" aperture="3.2" distance="10" k1="-0.2010" k2="-0.8620" k3="0.4680"/>
++            <vignetting model="pa" focal="55" aperture="3.2" distance="1000" k1="-0.2010" k2="-0.8620" k3="0.4680"/>
++            <vignetting model="pa" focal="55" aperture="3.5" distance="10" k1="-0.2438" k2="-0.5705" k3="0.2327"/>
++            <vignetting model="pa" focal="55" aperture="3.5" distance="1000" k1="-0.2438" k2="-0.5705" k3="0.2327"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.3348" k2="-0.1370" k3="-0.0929"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.3348" k2="-0.1370" k3="-0.0929"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.4232" k2="0.2365" k3="-0.3562"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.4232" k2="0.2365" k3="-0.3562"/>
++            <vignetting model="pa" focal="55" aperture="5" distance="10" k1="-0.5008" k2="0.5218" k3="-0.5416"/>
++            <vignetting model="pa" focal="55" aperture="5" distance="1000" k1="-0.5008" k2="0.5218" k3="-0.5416"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.5578" k2="0.7188" k3="-0.6501"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.5578" k2="0.7188" k3="-0.6501"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.6475" k2="0.9412" k3="-0.6980"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.6475" k2="0.9412" k3="-0.6980"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.6621" k2="0.7965" k3="-0.4469"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.6621" k2="0.7965" k3="-0.4469"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.6680" k2="0.6426" k3="-0.2307"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.6680" k2="0.6426" k3="-0.2307"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.6921" k2="0.6663" k3="-0.2238"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.6921" k2="0.6663" k3="-0.2238"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 24-70mm f/4 ZA OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="ptlens" focal="24" a="0.01086" b="-0.05129" c="0.0454"/>
++            <distortion model="ptlens" focal="29" a="0" b="-0.00342" c="0"/>
++            <distortion model="ptlens" focal="34" a="0" b="0.00284" c="0"/>
++            <distortion model="ptlens" focal="64" a="0" b="0.01063" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.0104" c="0"/>
++            <tca model="poly3" focal="24" br="0.0001084" vr="1.0001830" bb="-0.0000322" vb="1.0000766"/>
++            <tca model="poly3" focal="28" br="0.0000684" vr="1.0001879" bb="0.0000126" vb="0.9999843"/>
++            <tca model="poly3" focal="34" br="-0.0000011" vr="1.0001999" bb="0.0000162" vb="0.9999974"/>
++            <tca model="poly3" focal="41" br="-0.0000036" vr="1.0001795" bb="0.0000174" vb="0.9999616"/>
++            <tca model="poly3" focal="50" br="-0.0000109" vr="1.0001446" bb="0.0000218" vb="0.9999371"/>
++            <tca model="poly3" focal="61" br="-0.0000211" vr="1.0000951" bb="0.0000230" vb="0.9999419"/>
++            <tca model="poly3" focal="70" br="-0.0000291" vr="1.0001021" bb="0.0000411" vb="0.9998636"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 24-70mm f/4 ZA OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7II -->
++            <distortion model="ptlens" focal="24" a="0.02797" b="-0.09138" c="0.04487"/>
++            <distortion model="ptlens" focal="33" a="0.01741" b="-0.03649" c="0.02297"/>
++            <distortion model="ptlens" focal="50" a="0.01325" b="-0.0102" c="0.0103"/>
++            <distortion model="ptlens" focal="70" a="0.01335" b="-0.01629" c="0.02605"/>
++            <tca model="poly3" focal="24" br="0.0001620" vr="1.0002925" bb="-0.0000592" vb="1.0000445"/>
++            <tca model="poly3" focal="29" br="0.0000520" vr="1.0002717" bb="0.0000002" vb="1.0000786"/>
++            <tca model="poly3" focal="33" br="-0.0000376" vr="1.0003144" bb="0.0000309" vb="1.0000261"/>
++            <tca model="poly3" focal="41" br="-0.0000745" vr="1.0002363" bb="0.0000300" vb="1.0000301"/>
++            <tca model="poly3" focal="50" br="-0.0000721" vr="1.0001897" bb="0.0000368" vb="1.0000075"/>
++            <tca model="poly3" focal="56" br="-0.0000572" vr="1.0000988" bb="0.0000658" vb="0.9999804"/>
++            <tca model="poly3" focal="62" br="-0.0000671" vr="1.0001204" bb="0.0000728" vb="0.9999172"/>
++            <tca model="poly3" focal="70" br="-0.0000563" vr="1.0001062" bb="0.0000583" vb="0.9998954"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 28mm f/2</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7s -->
++            <distortion model="poly3" focal="28" k1="-0.02561"/>
++            <tca model="poly3" focal="28" vr="1.0001366" vb="0.9999474"/>
++            <!-- Taken with Sony A7 II with a different specimen of the lens -->
++            <vignetting model="pa" focal="28" aperture="2" distance="10" k1="-2.0849" k2="2.1046" k3="-0.8592"/>
++            <vignetting model="pa" focal="28" aperture="2" distance="1000" k1="-2.0849" k2="2.1046" k3="-0.8592"/>
++            <vignetting model="pa" focal="28" aperture="2.2" distance="10" k1="-1.3699" k2="0.5399" k3="0.0339"/>
++            <vignetting model="pa" focal="28" aperture="2.2" distance="1000" k1="-1.3699" k2="0.5399" k3="0.0339"/>
++            <vignetting model="pa" focal="28" aperture="2.5" distance="10" k1="-0.8192" k2="-0.4757" k3="0.5460"/>
++            <vignetting model="pa" focal="28" aperture="2.5" distance="1000" k1="-0.8192" k2="-0.4757" k3="0.5460"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.6117" k2="-0.5937" k3="0.4958"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.6117" k2="-0.5937" k3="0.4958"/>
++            <vignetting model="pa" focal="28" aperture="3.2" distance="10" k1="-0.6594" k2="-0.1402" k3="0.1286"/>
++            <vignetting model="pa" focal="28" aperture="3.2" distance="1000" k1="-0.6594" k2="-0.1402" k3="0.1286"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.7830" k2="0.3253" k3="-0.1709"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.7830" k2="0.3253" k3="-0.1709"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.8184" k2="0.4389" k3="-0.2140"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.8184" k2="0.4389" k3="-0.2140"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.8187" k2="0.4243" k3="-0.1752"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.8187" k2="0.4243" k3="-0.1752"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.8081" k2="0.3749" k3="-0.1219"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.8081" k2="0.3749" k3="-0.1219"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.7809" k2="0.2711" k3="-0.0280"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.7809" k2="0.2711" k3="-0.0280"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.7782" k2="0.2591" k3="-0.0166"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.7782" k2="0.2591" k3="-0.0166"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.7826" k2="0.2676" k3="-0.0232"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.7826" k2="0.2676" k3="-0.0232"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.7926" k2="0.2536" k3="-0.0047"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.7926" k2="0.2536" k3="-0.0047"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.7973" k2="0.2636" k3="-0.0126"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.7973" k2="0.2636" k3="-0.0126"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 21mm f/2.8</model>
++        <model lang="en">FE 28mm f/2 + Sony SEL075 UWC</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7s -->
++            <distortion model="ptlens" focal="21" a="0.01519" b="-0.07683" c="0.00078"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 90mm f/2.8 Macro G OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7s -->
++            <distortion model="poly3" focal="90" k1="-0.00136"/>
++            <!-- Taken with Sony A7 -->
++            <tca model="poly3" focal="90" br="0.0000041" vr="0.9999383" bb="-0.0000058" vb="1.0000569"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="0.28" k1="-0.0913" k2="-0.2538" k3="0.0786"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="0.35" k1="0.0306" k2="-0.6907" k3="0.3317"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="0.5" k1="-0.0459" k2="-0.7475" k3="0.4258"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="1" k1="-0.3861" k2="-0.1757" k3="0.1971"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.5570" k2="0.2280" k3="-0.0735"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="0.28" k1="-0.2303" k2="0.1201" k3="-0.1023"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="0.35" k1="-0.0846" k2="0.0546" k3="-0.2603"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="0.5" k1="0.0480" k2="-0.3073" k3="-0.0310"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="1" k1="0.0179" k2="-0.4970" k3="0.1500"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.0275" k2="-0.6320" k3="0.2776"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="0.28" k1="-0.2072" k2="-0.0157" k3="0.0373"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="0.35" k1="-0.2451" k2="0.2970" k3="-0.2519"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="0.5" k1="-0.2392" k2="0.4316" k3="-0.4271"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="1" k1="-0.2141" k2="0.3502" k3="-0.3672"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="-0.1287" k2="0.2299" k3="-0.3638"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="0.28" k1="-0.2113" k2="-0.0080" k3="0.0316"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="0.35" k1="-0.1723" k2="0.0147" k3="0.0103"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="0.5" k1="-0.1657" k2="0.0706" k3="-0.0415"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1" k1="-0.1877" k2="0.1847" k3="-0.1439"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.1703" k2="0.1418" k3="-0.1098"/>
++            <vignetting model="pa" focal="90" aperture="11" distance="0.28" k1="-0.2060" k2="-0.0235" k3="0.0439"/>
++            <vignetting model="pa" focal="90" aperture="11" distance="0.35" k1="-0.1771" k2="0.0231" k3="0.0072"/>
++            <vignetting model="pa" focal="90" aperture="11" distance="0.5" k1="-0.1543" k2="0.0249" k3="0.0025"/>
++            <vignetting model="pa" focal="90" aperture="11" distance="1" k1="-0.1449" k2="0.0315" k3="-0.0059"/>
++            <vignetting model="pa" focal="90" aperture="11" distance="1000" k1="-0.1409" k2="0.0214" k3="0.0044"/>
++            <vignetting model="pa" focal="90" aperture="16" distance="0.28" k1="-0.2034" k2="-0.0312" k3="0.0506"/>
++            <vignetting model="pa" focal="90" aperture="16" distance="0.35" k1="-0.1714" k2="0.0095" k3="0.0181"/>
++            <vignetting model="pa" focal="90" aperture="16" distance="0.5" k1="-0.1602" k2="0.0422" k3="-0.0100"/>
++            <vignetting model="pa" focal="90" aperture="16" distance="1" k1="-0.1534" k2="0.0510" k3="-0.0176"/>
++            <vignetting model="pa" focal="90" aperture="16" distance="1000" k1="-0.1525" k2="0.0557" k3="-0.0205"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="0.28" k1="-0.2024" k2="-0.0335" k3="0.0514"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="0.35" k1="-0.1686" k2="0.0033" k3="0.0218"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="0.5" k1="-0.1602" k2="0.0429" k3="-0.0100"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="1" k1="-0.1557" k2="0.0554" k3="-0.0193"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="1000" k1="-0.1558" k2="0.0642" k3="-0.0253"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 24-240mm f/3.5-6.3 OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony ILCE-7R (A7R) -->
++            <distortion model="ptlens" focal="24" a="0.03845" b="-0.13772" c="0.07834"/>
++            <distortion model="ptlens" focal="49" a="0.00446" b="0.00426" c="0.00916"/>
++            <distortion model="ptlens" focal="100" a="-0.00732" b="0.0354" c="-0.01164"/>
++            <distortion model="ptlens" focal="152" a="0.00205" b="0.02088" c="-0.0275"/>
++            <distortion model="ptlens" focal="240" a="0.03214" b="-0.08025" c="0.08436"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 70-200mm f/4 G OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony ILCE-7R (A7R) -->
++            <distortion model="ptlens" focal="70" a="-0.00998" b="0.04602" c="-0.08171"/>
++            <distortion model="ptlens" focal="89" a="-0.0113" b="0.05113" c="-0.0724"/>
++            <distortion model="ptlens" focal="120" a="0.00345" b="-0.00364" c="0.0002"/>
++            <distortion model="ptlens" focal="164" a="0.01123" b="-0.03131" c="0.04108"/>
++            <distortion model="ptlens" focal="197" a="0.01254" b="-0.0357" c="0.05244"/>
++            <distortion model="ptlens" focal="200" a="-0.00419" b="0.03834" c="-0.0547"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-1.0432" k2="0.9344" k3="-0.4147"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-1.0432" k2="0.9344" k3="-0.4147"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2059" k2="0.2456" k3="-0.3135"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2059" k2="0.2456" k3="-0.3135"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2220" k2="0.1865" k3="-0.1538"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2220" k2="0.1865" k3="-0.1538"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1805" k2="0.0176" k3="0.0024"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1805" k2="0.0176" k3="0.0024"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1848" k2="0.0289" k3="-0.0061"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1848" k2="0.0289" k3="-0.0061"/>
++            <vignetting model="pa" focal="104" aperture="4" distance="10" k1="-0.6344" k2="0.2813" k3="-0.0490"/>
++            <vignetting model="pa" focal="104" aperture="4" distance="1000" k1="-0.6344" k2="0.2813" k3="-0.0490"/>
++            <vignetting model="pa" focal="104" aperture="5.6" distance="10" k1="-0.2303" k2="0.3769" k3="-0.3908"/>
++            <vignetting model="pa" focal="104" aperture="5.6" distance="1000" k1="-0.2303" k2="0.3769" k3="-0.3908"/>
++            <vignetting model="pa" focal="104" aperture="8" distance="10" k1="-0.1630" k2="0.0401" k3="-0.0153"/>
++            <vignetting model="pa" focal="104" aperture="8" distance="1000" k1="-0.1630" k2="0.0401" k3="-0.0153"/>
++            <vignetting model="pa" focal="104" aperture="11" distance="10" k1="-0.1771" k2="0.0753" k3="-0.0373"/>
++            <vignetting model="pa" focal="104" aperture="11" distance="1000" k1="-0.1771" k2="0.0753" k3="-0.0373"/>
++            <vignetting model="pa" focal="104" aperture="22" distance="10" k1="-0.1875" k2="0.1006" k3="-0.0541"/>
++            <vignetting model="pa" focal="104" aperture="22" distance="1000" k1="-0.1875" k2="0.1006" k3="-0.0541"/>
++            <vignetting model="pa" focal="138" aperture="4" distance="10" k1="-0.6677" k2="0.3474" k3="-0.0691"/>
++            <vignetting model="pa" focal="138" aperture="4" distance="1000" k1="-0.6677" k2="0.3474" k3="-0.0691"/>
++            <vignetting model="pa" focal="138" aperture="5.6" distance="10" k1="0.0059" k2="-0.0090" k3="-0.2396"/>
++            <vignetting model="pa" focal="138" aperture="5.6" distance="1000" k1="0.0059" k2="-0.0090" k3="-0.2396"/>
++            <vignetting model="pa" focal="138" aperture="8" distance="10" k1="-0.2082" k2="0.2664" k3="-0.2316"/>
++            <vignetting model="pa" focal="138" aperture="8" distance="1000" k1="-0.2082" k2="0.2664" k3="-0.2316"/>
++            <vignetting model="pa" focal="138" aperture="11" distance="10" k1="-0.1643" k2="0.0665" k3="-0.0331"/>
++            <vignetting model="pa" focal="138" aperture="11" distance="1000" k1="-0.1643" k2="0.0665" k3="-0.0331"/>
++            <vignetting model="pa" focal="138" aperture="22" distance="10" k1="-0.1808" k2="0.1075" k3="-0.0594"/>
++            <vignetting model="pa" focal="138" aperture="22" distance="1000" k1="-0.1808" k2="0.1075" k3="-0.0594"/>
++            <vignetting model="pa" focal="165" aperture="4" distance="10" k1="-0.6061" k2="0.1943" k3="0.0271"/>
++            <vignetting model="pa" focal="165" aperture="4" distance="1000" k1="-0.6061" k2="0.1943" k3="0.0271"/>
++            <vignetting model="pa" focal="165" aperture="5.6" distance="10" k1="-0.0246" k2="-0.2812" k3="-0.0063"/>
++            <vignetting model="pa" focal="165" aperture="5.6" distance="1000" k1="-0.0246" k2="-0.2812" k3="-0.0063"/>
++            <vignetting model="pa" focal="165" aperture="8" distance="10" k1="-0.2136" k2="0.3397" k3="-0.3374"/>
++            <vignetting model="pa" focal="165" aperture="8" distance="1000" k1="-0.2136" k2="0.3397" k3="-0.3374"/>
++            <vignetting model="pa" focal="165" aperture="11" distance="10" k1="-0.1609" k2="0.0685" k3="-0.0372"/>
++            <vignetting model="pa" focal="165" aperture="11" distance="1000" k1="-0.1609" k2="0.0685" k3="-0.0372"/>
++            <vignetting model="pa" focal="165" aperture="22" distance="10" k1="-0.1750" k2="0.0968" k3="-0.0511"/>
++            <vignetting model="pa" focal="165" aperture="22" distance="1000" k1="-0.1750" k2="0.0968" k3="-0.0511"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.6730" k2="0.3576" k3="-0.0828"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.6730" k2="0.3576" k3="-0.0828"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0165" k2="-0.7646" k3="0.3847"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0165" k2="-0.7646" k3="0.3847"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0572" k2="-0.0136" k3="-0.1946"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0572" k2="-0.0136" k3="-0.1946"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1871" k2="0.1571" k3="-0.1258"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1871" k2="0.1571" k3="-0.1258"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1748" k2="0.0738" k3="-0.0347"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1748" k2="0.0738" k3="-0.0347"/>
++            <!-- Taken with Sony ILCE-7M2 (a7 II) -->
++            <tca model="poly3" focal="70" br="0.0000469" vr="1.0001263" bb="-0.0000265" vb="1.0000676"/>
++            <tca model="poly3" focal="88" br="0.0000178" vr="1.0000672" bb="-0.0000157" vb="1.0000716"/>
++            <tca model="poly3" focal="100" br="0.0000241" vr="1.0000197" bb="-0.0000146" vb="1.0000653"/>
++            <tca model="poly3" focal="137" br="0.0000001" vr="0.9999543" bb="-0.0000110" vb="1.0000296"/>
++            <tca model="poly3" focal="171" br="-0.0000167" vr="0.9999257" bb="0.0000223" vb="0.9999265"/>
++            <tca model="poly3" focal="200" br="-0.0000901" vr="0.9999864" bb="0.0000610" vb="0.9998220"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 16-35mm f/4 ZA OSS</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony ILCE-7M2 (A7 II) -->
++            <distortion model="ptlens" focal="16" a="0.00561" b="-0.00446" c="-0.04348"/>
++            <distortion model="ptlens" focal="17" a="0.00759" b="-0.00806" c="-0.03342"/>
++            <distortion model="ptlens" focal="18" a="0.00592" b="0.00259" c="-0.04474"/>
++            <distortion model="ptlens" focal="20" a="0.00529" b="0.00159" c="-0.02697"/>
++            <distortion model="ptlens" focal="21" a="0.00498" b="0.00174" c="-0.02003"/>
++            <distortion model="ptlens" focal="24" a="0.01239" b="-0.03614" c="0.04265"/>
++            <distortion model="ptlens" focal="28" a="0.00646" b="-0.00652" c="0.00509"/>
++            <distortion model="ptlens" focal="35" a="0.00326" b="0.00688" c="-0.01135"/>
++            <tca model="poly3" focal="16" br="0.0001100" vr="1.0000279" bb="-0.0000788" vb="1.0001669"/>
++            <tca model="poly3" focal="16" br="0.0001173" vr="1.0000297" bb="-0.0000613" vb="1.0001197"/>
++            <tca model="poly3" focal="17" br="0.0001181" vr="0.9999968" bb="-0.0000970" vb="1.0002082"/>
++            <tca model="poly3" focal="17" br="0.0001495" vr="0.9999498" bb="-0.0001191" vb="1.0002378"/>
++            <tca model="poly3" focal="18" br="0.0000904" vr="0.9999805" bb="-0.0001049" vb="1.0002222"/>
++            <tca model="poly3" focal="18" br="0.0001656" vr="0.9999090" bb="-0.0001309" vb="1.0002742"/>
++            <tca model="poly3" focal="20" br="0.0000541" vr="0.9999948" bb="-0.0000532" vb="1.0001413"/>
++            <tca model="poly3" focal="20" br="0.0000758" vr="0.9999790" bb="-0.0000893" vb="1.0002261"/>
++            <tca model="poly3" focal="21" br="0.0000475" vr="0.9999920" bb="-0.0000718" vb="1.0001851"/>
++            <tca model="poly3" focal="21" br="0.0000804" vr="0.9999492" bb="-0.0000939" vb="1.0002246"/>
++            <tca model="poly3" focal="24" br="0.0000380" vr="0.9999854" bb="-0.0000783" vb="1.0002120"/>
++            <tca model="poly3" focal="24" br="0.0000792" vr="0.9999630" bb="-0.0001759" vb="1.0004569"/>
++            <tca model="poly3" focal="28" br="0.0000402" vr="0.9999753" bb="-0.0000799" vb="1.0002762"/>
++            <tca model="poly3" focal="28" br="0.0000446" vr="0.9999759" bb="-0.0000839" vb="1.0002697"/>
++            <tca model="poly3" focal="28" br="0.0000605" vr="0.9999748" bb="-0.0000938" vb="1.0002536"/>
++            <tca model="poly3" focal="35" br="0.0000072" vr="0.9999953" bb="-0.0000533" vb="1.0001552"/>
++            <tca model="poly3" focal="35" br="0.0000164" vr="0.9999902" bb="-0.0000586" vb="1.0001921"/>
++            <tca model="poly3" focal="35" br="0.0000244" vr="1.0000242" bb="-0.0000698" vb="1.0002031"/>
++            <tca model="poly3" focal="35" br="0.0000254" vr="0.9999852" bb="-0.0000676" vb="1.0002241"/>
++            <tca model="poly3" focal="35" br="0.0000300" vr="0.9999976" bb="-0.0000609" vb="1.0002129"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-1.1889" k2="0.5519" k3="-0.1590"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-1.1889" k2="0.5519" k3="-0.1590"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-1.2507" k2="1.0025" k3="-0.4399"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.2507" k2="1.0025" k3="-0.4399"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-1.2684" k2="0.9596" k3="-0.3160"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-1.2684" k2="0.9596" k3="-0.3160"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-1.2745" k2="0.9701" k3="-0.3166"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-1.2745" k2="0.9701" k3="-0.3166"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-1.3186" k2="1.0848" k3="-0.3947"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.3186" k2="1.0848" k3="-0.3947"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-1.1827" k2="0.5834" k3="-0.1054"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-1.1827" k2="0.5834" k3="-0.1054"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-1.2566" k2="1.0555" k3="-0.4496"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-1.2566" k2="1.0555" k3="-0.4496"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-1.2714" k2="1.0548" k3="-0.3943"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-1.2714" k2="1.0548" k3="-0.3943"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="10" k1="-1.2942" k2="0.9833" k3="-0.3317"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-1.2942" k2="0.9833" k3="-0.3317"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-1.3007" k2="0.9552" k3="-0.2951"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-1.3007" k2="0.9552" k3="-0.2951"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-1.1870" k2="0.5687" k3="-0.0676"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-1.1870" k2="0.5687" k3="-0.0676"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-1.2389" k2="0.9330" k3="-0.3648"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-1.2389" k2="0.9330" k3="-0.3648"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-1.2497" k2="0.8684" k3="-0.2481"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-1.2497" k2="0.8684" k3="-0.2481"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-1.2642" k2="0.8896" k3="-0.2542"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-1.2642" k2="0.8896" k3="-0.2542"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-1.2772" k2="0.9048" k3="-0.2596"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-1.2772" k2="0.9048" k3="-0.2596"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-1.0813" k2="0.2621" k3="0.1397"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-1.0813" k2="0.2621" k3="0.1397"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-1.1213" k2="0.7022" k3="-0.2147"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.1213" k2="0.7022" k3="-0.2147"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-1.2081" k2="0.9071" k3="-0.3062"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-1.2081" k2="0.9071" k3="-0.3062"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-1.2406" k2="0.9707" k3="-0.3412"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-1.2406" k2="0.9707" k3="-0.3412"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-1.2610" k2="1.0037" k3="-0.3601"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-1.2610" k2="1.0037" k3="-0.3601"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.0065" k2="0.2460" k3="0.1074"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.0065" k2="0.2460" k3="0.1074"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.9621" k2="0.5560" k3="-0.2093"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.9621" k2="0.5560" k3="-0.2093"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-1.0363" k2="0.7353" k3="-0.2922"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-1.0363" k2="0.7353" k3="-0.2922"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-1.1090" k2="0.9120" k3="-0.4044"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-1.1090" k2="0.9120" k3="-0.4044"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-1.1554" k2="1.0329" k3="-0.4874"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-1.1554" k2="1.0329" k3="-0.4874"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-1.0744" k2="0.5359" k3="-0.0890"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-1.0744" k2="0.5359" k3="-0.0890"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.9267" k2="0.6547" k3="-0.2994"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.9267" k2="0.6547" k3="-0.2994"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-1.0458" k2="0.9599" k3="-0.4511"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-1.0458" k2="0.9599" k3="-0.4511"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-1.1218" k2="1.1329" k3="-0.5546"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-1.1218" k2="1.1329" k3="-0.5546"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-1.2189" k2="1.3518" k3="-0.6799"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-1.2189" k2="1.3518" k3="-0.6799"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-1.1240" k2="0.8817" k3="-0.3257"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-1.1240" k2="0.8817" k3="-0.3257"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.5076" k2="-0.1364" k3="0.1579"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.5076" k2="-0.1364" k3="0.1579"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.5451" k2="0.0290" k3="0.0802"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5451" k2="0.0290" k3="0.0802"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.5610" k2="0.0833" k3="0.0404"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5610" k2="0.0833" k3="0.0404"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.3400" k2="-0.9602" k3="0.9100"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3400" k2="-0.9602" k3="0.9100"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>FE 85mm f/1.8</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="85" a="-.011" b=".029" c="-.022"/>
++            <tca model="poly3" focal="85" vr="0.9999630" vb="0.9998815"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="10" k1="-1.7181" k2="1.8217" k3="-0.8351"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-1.7181" k2="1.8217" k3="-0.8351"/>
++            <vignetting model="pa" focal="85" aperture="2" distance="10" k1="-1.1269" k2="0.5624" k3="-0.1229"/>
++            <vignetting model="pa" focal="85" aperture="2" distance="1000" k1="-1.1269" k2="0.5624" k3="-0.1229"/>
++            <vignetting model="pa" focal="85" aperture="2.2" distance="10" k1="-0.5659" k2="-0.3329" k3="0.2921"/>
++            <vignetting model="pa" focal="85" aperture="2.2" distance="1000" k1="-0.5659" k2="-0.3329" k3="0.2921"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="10" k1="-0.3342" k2="-0.6075" k3="0.4057"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.3342" k2="-0.6075" k3="0.4057"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="10" k1="-0.1091" k2="-0.9560" k3="0.5774"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="1000" k1="-0.1091" k2="-0.9560" k3="0.5774"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="10" k1="-0.0429" k2="-0.8675" k3="0.4351"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="1000" k1="-0.0429" k2="-0.8675" k3="0.4351"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="10" k1="-0.0726" k2="-0.5622" k3="0.1743"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.0726" k2="-0.5622" k3="0.1743"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="10" k1="-0.1441" k2="-0.2247" k3="-0.0805"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="1000" k1="-0.1441" k2="-0.2247" k3="-0.0805"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="10" k1="-0.2235" k2="0.1034" k3="-0.3102"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="1000" k1="-0.2235" k2="0.1034" k3="-0.3102"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="10" k1="-0.2938" k2="0.3592" k3="-0.4753"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.2938" k2="0.3592" k3="-0.4753"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="-0.3384" k2="0.5022" k3="-0.5425"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.3384" k2="0.5022" k3="-0.5425"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="10" k1="-0.3399" k2="0.4420" k3="-0.3841"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.3399" k2="0.4420" k3="-0.3841"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="10" k1="-0.2099" k2="-0.0365" k3="0.0424"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.2099" k2="-0.0365" k3="0.0424"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="10" k1="-0.2118" k2="-0.0298" k3="0.0416"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.2118" k2="-0.0298" k3="0.0416"/>
++            <vignetting model="pa" focal="85" aperture="22" distance="10" k1="-0.2161" k2="-0.0093" k3="0.0234"/>
++            <vignetting model="pa" focal="85" aperture="22" distance="1000" k1="-0.2161" k2="-0.0093" k3="0.0234"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/mil-tamron.xml b/data/db/mil-tamron.xml
+--- a/data/db/mil-tamron.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/mil-tamron.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,24 @@
++<lensdatabase>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron 18-200mm f/3.5-6.3 Di III VC</model>
++        <mount>Sony E</mount>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="ptlens" focal="18" a="0.02016" b="-0.04597" c="-0.03359"/>
++            <distortion model="ptlens" focal="20.9" a="0.03108" b="-0.08646" c="0.04744"/>
++            <distortion model="ptlens" focal="22.6" a="0.02567" b="-0.06728" c="0.03734"/>
++            <distortion model="ptlens" focal="34.1" a="0.00474" b="-0.00952" c="0.00794"/>
++            <distortion model="ptlens" focal="69.5" a="0" b="0.00596" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.00674" c="0"/>
++            <tca model="poly3" focal="18" vr="1.0004" vb="1.0002"/>
++            <tca model="poly3" focal="20.9" vr="1.0003" vb="1.0002"/>
++            <tca model="poly3" focal="22.6" vr="1.0003" vb="1.0001"/>
++            <tca model="poly3" focal="34.1" vr="1.0003" vb="1.0001"/>
++            <tca model="poly3" focal="69.5" vr="0.9999" vb="1.0004"/>
++            <tca model="poly3" focal="200" vr="0.9991" vb="0.9997"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/mil-tokina.xml b/data/db/mil-tokina.xml
+--- a/data/db/mil-tokina.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/mil-tokina.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,13 @@
++<lensdatabase>
++    <lens>
++        <maker>Tokina</maker>
++        <model>E 20mm f/2</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 7R -->
++            <distortion model="ptlens" focal="20" a="0.0236801" b="-0.0528733" c="0.0242738"/>
++            <tca model="poly3" focal="20" vr="1.0001" vb="1.00005"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/mil-zeiss.xml b/data/db/mil-zeiss.xml
+--- a/data/db/mil-zeiss.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/mil-zeiss.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,115 @@
++<lensdatabase>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>E 32mm f/1.8</model>
++        <model lang="en">Touit 32mm f/1.8</model>
++        <mount>Sony E</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="poly3" focal="32" k1="-0.00792"/>
++            <tca model="poly3" focal="32" br="-0.0000053" vr="1.0001744" bb="0.0000616" vb="0.9998421"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>E 25mm f/2</model>
++        <model lang="en">Batis 25mm f/2</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 7R -->
++            <distortion model="ptlens" focal="25" a="0.01403" b="-0.03257" c="0.00722"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="10" k1="-1.3135" k2="0.7812" k3="-0.1662"/>
++            <vignetting model="pa" focal="25" aperture="2" distance="1000" k1="-1.3135" k2="0.7812" k3="-0.1662"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="10" k1="-0.8297" k2="-0.2042" k3="0.3884"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="1000" k1="-0.8297" k2="-0.2042" k3="0.3884"/>
++            <vignetting model="pa" focal="25" aperture="2.5" distance="10" k1="-0.6639" k2="-0.1965" k3="0.2916"/>
++            <vignetting model="pa" focal="25" aperture="2.5" distance="1000" k1="-0.6639" k2="-0.1965" k3="0.2916"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="10" k1="-0.8068" k2="0.3793" k3="-0.1003"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.8068" k2="0.3793" k3="-0.1003"/>
++            <vignetting model="pa" focal="25" aperture="3.2" distance="10" k1="-0.7914" k2="0.3992" k3="-0.1236"/>
++            <vignetting model="pa" focal="25" aperture="3.2" distance="1000" k1="-0.7914" k2="0.3992" k3="-0.1236"/>
++            <vignetting model="pa" focal="25" aperture="3.5" distance="10" k1="-0.8243" k2="0.4168" k3="-0.1076"/>
++            <vignetting model="pa" focal="25" aperture="3.5" distance="1000" k1="-0.8243" k2="0.4168" k3="-0.1076"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="10" k1="-0.8256" k2="0.3920" k3="-0.0733"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.8256" k2="0.3920" k3="-0.0733"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="10" k1="-0.8200" k2="0.3486" k3="-0.0395"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="1000" k1="-0.8200" k2="0.3486" k3="-0.0395"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="10" k1="-0.7887" k2="0.2225" k3="0.0559"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="1000" k1="-0.7887" k2="0.2225" k3="0.0559"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.7793" k2="0.2049" k3="0.0600"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.7793" k2="0.2049" k3="0.0600"/>
++            <vignetting model="pa" focal="25" aperture="6.3" distance="10" k1="-0.7779" k2="0.2160" k3="0.0361"/>
++            <vignetting model="pa" focal="25" aperture="6.3" distance="1000" k1="-0.7779" k2="0.2160" k3="0.0361"/>
++            <vignetting model="pa" focal="25" aperture="7.1" distance="10" k1="-0.7759" k2="0.2166" k3="0.0253"/>
++            <vignetting model="pa" focal="25" aperture="7.1" distance="1000" k1="-0.7759" k2="0.2166" k3="0.0253"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.7698" k2="0.2065" k3="0.0287"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.7698" k2="0.2065" k3="0.0287"/>
++            <vignetting model="pa" focal="25" aperture="9" distance="10" k1="-0.7606" k2="0.1789" k3="0.0503"/>
++            <vignetting model="pa" focal="25" aperture="9" distance="1000" k1="-0.7606" k2="0.1789" k3="0.0503"/>
++            <vignetting model="pa" focal="25" aperture="10" distance="10" k1="-0.7590" k2="0.1795" k3="0.0459"/>
++            <vignetting model="pa" focal="25" aperture="10" distance="1000" k1="-0.7590" k2="0.1795" k3="0.0459"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="10" k1="-0.7566" k2="0.1734" k3="0.0498"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.7566" k2="0.1734" k3="0.0498"/>
++            <vignetting model="pa" focal="25" aperture="13" distance="10" k1="-0.7519" k2="0.1614" k3="0.0571"/>
++            <vignetting model="pa" focal="25" aperture="13" distance="1000" k1="-0.7519" k2="0.1614" k3="0.0571"/>
++            <vignetting model="pa" focal="25" aperture="14" distance="10" k1="-0.7479" k2="0.1499" k3="0.0644"/>
++            <vignetting model="pa" focal="25" aperture="14" distance="1000" k1="-0.7479" k2="0.1499" k3="0.0644"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.7426" k2="0.1364" k3="0.0728"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.7426" k2="0.1364" k3="0.0728"/>
++            <vignetting model="pa" focal="25" aperture="18" distance="10" k1="-0.7405" k2="0.1285" k3="0.0783"/>
++            <vignetting model="pa" focal="25" aperture="18" distance="1000" k1="-0.7405" k2="0.1285" k3="0.0783"/>
++            <vignetting model="pa" focal="25" aperture="20" distance="10" k1="-0.7392" k2="0.1229" k3="0.0829"/>
++            <vignetting model="pa" focal="25" aperture="20" distance="1000" k1="-0.7392" k2="0.1229" k3="0.0829"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.7379" k2="0.1186" k3="0.0860"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.7379" k2="0.1186" k3="0.0860"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>E 85mm F1.8</model>
++        <model lang="en">Batis 85mm f/1.8</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha a7 II (ILCE-7M2) -->
++            <distortion model="ptlens" focal="85" a="-0.000588" b="-0.00021" c="0.024475"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>E 50mm F2</model>
++        <model lang="en">Loxia 50mm f/2 Planar T*</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 7 II (ILCE-7M2) -->
++            <distortion model="ptlens" focal="50" a="-0.00093" b="-0.00216" c="-0.0024"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>E 21mm F2.8</model>
++        <model lang="en">Loxia 21mm f/2.8</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 7 II (ILCE-7M2) -->
++            <distortion model="ptlens" focal="21" a="0.02059" b="-0.05856" c="0.0302"/>
++            <tca model="poly3" focal="21" vr="1.0000849" vb="1.0000258"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>Zeiss Batis 2.8/18</model>
++        <model lang="en">Batis 18mm f/2.8</model>
++        <mount>Sony E</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 7S -->
++            <distortion model="ptlens" focal="18" a="0.03666" b="-0.0936845" c="0.0413531"/>
++            <tca model="poly3" focal="18" br="-0.0000385" vr="1.0001447" bb="0.0000468" vb="0.9999362"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/misc.xml b/data/db/misc.xml
+--- a/data/db/misc.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/misc.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,447 @@
++<lensdatabase>
++    <mount>
++        <name>M42</name>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>M39/1</name>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>DKL</name>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>T2</name>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>C</name>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Kiev 88</name>
++        <compat>Generic</compat>
++    </mount>
++    <camera>
++        <!-- This works for 4:3 and 16:9 because crop factor is the same in
++             both cases, no matter what Nokia's white paper says. -->
++        <maker>Nokia</maker>
++        <model>Lumia 1020</model>
++        <mount>lumia1020</mount>
++        <cropfactor>3.93</cropfactor>
++    </camera>
++    <camera>
++        <maker>Microsoft</maker>
++        <model>Lumia 950</model>
++        <mount>lumia950</mount>
++        <cropfactor>6.02</cropfactor>
++    </camera>
++    <camera>
++        <maker>SEIKO EPSON CORP.</maker>
++        <maker lang="en">Epson</maker>
++        <model>R-D1</model>
++        <mount>Leica M</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>LG Mobile</maker>
++        <maker lang="en">LG</maker>
++        <model>LG-H815</model>
++        <model lang="en">LG G4</model>
++        <mount>lgH815</mount>
++        <cropfactor>6.34</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nokia</maker>
++        <model>Lumia 1520</model>
++        <mount>lumia1520</mount>
++        <cropfactor>6.26</cropfactor>
++    </camera>
++    <!-- I think this is also known under the brand "Michael Lens" or "Movie
++         Lens", and with f/1.6.  The correction data actually was submitted as
++         "CCTV Movie Lens HD-MC 35mm/F1.6".  The distortion model is not perfect,
++         test it with
++         <https://c2.staticflickr.com/6/5530/12031215365_2fd76aa31c_z.jpg>.
++         FixMe: It should be re-checked. -->
++    <lens>
++        <maker>Fujian</maker>
++        <model>35mm f/1.7</model>
++        <mount>C</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="35" k1="-0.0055"/>
++            <tca model="poly3" focal="35" br="-0.0001764" vr="1.0005429" bb="0.0000786" vb="1.0008622"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This works for 4:3 and 16:9 because crop factor is the same in
++             both cases, no matter what Nokia's white paper says. -->
++        <maker>Zeiss</maker>
++        <model>Lumia 1020</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>lumia1020</mount>
++        <cropfactor>3.93</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="6.6" a="-0.01804" b="0.06109" c="-0.05264"/>
++            <tca model="poly3" focal="6.6" br="-0.0000439" vr="1.0001865" bb="0.0000085" vb="0.9999709"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>Lumia 950</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>lumia950</mount>
++        <cropfactor>6.02</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="4.3" a="-0.01625" b="0.04667" c="-0.03155"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentacon</maker>
++        <model>Pentacon 50mm f/1.8 auto multi coating</model>
++        <mount>M42</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="poly3" focal="50" k1="-0.00197"/>
++            <tca model="poly3" focal="50" br="-0.0000012" vr="1.0000573" bb="-0.0000011" vb="0.9999574"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Cosina</maker>
++        <model>Cosina Cosinon-S 50mm 1:2</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="poly3" focal="50" k1="-0.00146"/>
++            <tca model="poly3" focal="50" br="-0.0000159" vr="1.0000709" bb="0.0000131" vb="0.9999198"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Mitakon</maker>
++        <model>Mitakon wide MC f=24mm 1:2.8</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="ptlens" focal="24" a="0.00966" b="-0.0318" c="0.01539"/>
++            <tca model="poly3" focal="24" br="-0.0000186" vr="1.0006527" bb="0.0001034" vb="0.9995702"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zenit</maker>
++        <model>Zenitar MC 16mm f/2.8</model>
++        <mount>M42</mount>
++        <mount>Nikon F</mount>
++        <mount>Canon EF</mount>
++        <mount>Pentax K</mount>
++        <type>fisheye</type>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-E2 -->
++            <distortion model="poly3" focal="16" k1="-0.00676"/>
++            <tca model="poly3" focal="16" vr="0.9999213" vb="1.0005960"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Fotasy</maker>
++        <model>Fotasy M3517 35mm f/1.7</model>
++        <mount>M42</mount>
++        <focal value="35"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-E2 -->
++            <distortion model="ptlens" focal="35" a="0.02256" b="-0.05856" c="0.07779"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Voigtländer</maker>
++        <model>Voigtländer Skoparex 1:3,4/35</model>
++        <mount>DKL</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <distortion model="poly3" focal="35" k1="-0.0049"/>
++            <tca model="poly3" focal="35" vr="1.0003184" vb="0.9998060"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Voigtländer</maker>
++        <model>Voigtländer Color-Skopar X 1:2,8/50</model>
++        <mount>DKL</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <distortion model="poly3" focal="50" k1="-0.00238"/>
++            <tca model="poly3" focal="50" vr="1.0000342" vb="0.9999683"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- Also branded as Tokina, Soligor, Vivitar, Voigtländer -->
++        <maker>Cosina</maker>
++        <model>Cosina 19-35mm f/3.5-4.5 MC</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentak K</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark -->
++            <distortion model="ptlens" focal="19" a="0.046286" b="-0.11248" c="0.030287"/>
++            <distortion model="ptlens" focal="22" a="0.029666" b="-0.076511" c="0.01727"/>
++            <distortion model="ptlens" focal="24" a="0.017288" b="-0.045992" c="0.001481"/>
++            <distortion model="ptlens" focal="27" a="0.012509" b="-0.037002" c="0.006172"/>
++            <distortion model="ptlens" focal="35" a="0.007519" b="-0.02567" c="0.009393"/>
++            <tca model="poly3" focal="19" br="-0.0000121" vr="1.0001193" bb="0.0001970" vb="0.9998348"/>
++            <tca model="poly3" focal="21" br="-0.0000882" vr="1.0002251" bb="-0.0000484" vb="1.0001140"/>
++            <tca model="poly3" focal="24" br="0.0000025" vr="1.0000987" bb="0.0001017" vb="0.9999758"/>
++            <tca model="poly3" focal="27" br="-0.0000273" vr="1.0001400" bb="-0.0000431" vb="1.0001221"/>
++            <tca model="poly3" focal="35" br="-0.0000414" vr="1.0001805" bb="0.0000132" vb="1.0000728"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="0.5" k1="-1.7934" k2="1.7056" k3="-0.8118"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="1" k1="-1.8555" k2="1.8447" k3="-0.8589"/>
++            <vignetting model="pa" focal="19" aperture="3.5" distance="1000" k1="-1.7719" k2="1.7732" k3="-0.8368"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="0.5" k1="-1.6955" k2="1.5891" k3="-0.7749"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="1" k1="-1.6302" k2="1.3026" k3="-0.5181"/>
++            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-1.7174" k2="1.5506" k3="-0.6781"/>
++            <vignetting model="pa" focal="19" aperture="5.6" distance="0.5" k1="-0.8260" k2="-0.0160" k3="0.0899"/>
++            <vignetting model="pa" focal="19" aperture="5.6" distance="1" k1="-0.7476" k2="-0.5005" k3="0.5077"/>
++            <vignetting model="pa" focal="19" aperture="5.6" distance="1000" k1="-0.6603" k2="-0.7254" k3="0.6805"/>
++            <vignetting model="pa" focal="19" aperture="8" distance="0.5" k1="-0.8149" k2="0.3462" k3="-0.2062"/>
++            <vignetting model="pa" focal="19" aperture="8" distance="1" k1="-0.9687" k2="0.3698" k3="-0.1058"/>
++            <vignetting model="pa" focal="19" aperture="8" distance="1000" k1="-0.9199" k2="0.3089" k3="-0.0862"/>
++            <vignetting model="pa" focal="19" aperture="11" distance="0.5" k1="-0.8958" k2="0.6625" k3="-0.3866"/>
++            <vignetting model="pa" focal="19" aperture="11" distance="1" k1="-1.0589" k2="0.7245" k3="-0.3213"/>
++            <vignetting model="pa" focal="19" aperture="11" distance="1000" k1="-1.0060" k2="0.6080" k3="-0.2582"/>
++            <vignetting model="pa" focal="19" aperture="20" distance="0.5" k1="-0.8567" k2="0.4629" k3="-0.1486"/>
++            <vignetting model="pa" focal="19" aperture="20" distance="1" k1="-0.9616" k2="0.4697" k3="-0.0940"/>
++            <vignetting model="pa" focal="19" aperture="20" distance="1000" k1="-0.9667" k2="0.4235" k3="-0.0550"/>
++            <vignetting model="pa" focal="21" aperture="3.5" distance="1" k1="-1.7104" k2="1.7418" k3="-0.7696"/>
++            <vignetting model="pa" focal="21" aperture="3.5" distance="1000" k1="-1.8198" k2="1.8607" k3="-0.7851"/>
++            <vignetting model="pa" focal="21" aperture="4" distance="1" k1="-1.7163" k2="1.6488" k3="-0.6855"/>
++            <vignetting model="pa" focal="21" aperture="4" distance="1000" k1="-1.7134" k2="1.5815" k3="-0.6094"/>
++            <vignetting model="pa" focal="21" aperture="5.6" distance="1" k1="-0.6714" k2="-0.6358" k3="0.6220"/>
++            <vignetting model="pa" focal="21" aperture="5.6" distance="1000" k1="-0.7871" k2="-0.2363" k3="0.3568"/>
++            <vignetting model="pa" focal="21" aperture="8" distance="1" k1="-0.7489" k2="0.1120" k3="-0.0081"/>
++            <vignetting model="pa" focal="21" aperture="8" distance="1000" k1="-0.8327" k2="0.3211" k3="-0.1404"/>
++            <vignetting model="pa" focal="21" aperture="11" distance="1" k1="-0.7597" k2="0.1979" k3="-0.0361"/>
++            <vignetting model="pa" focal="21" aperture="11" distance="1000" k1="-0.8596" k2="0.4069" k3="-0.1494"/>
++            <vignetting model="pa" focal="21" aperture="22" distance="1" k1="-0.7769" k2="0.1356" k3="0.0915"/>
++            <vignetting model="pa" focal="21" aperture="22" distance="1000" k1="-0.8902" k2="0.4074" k3="-0.0764"/>
++            <vignetting model="pa" focal="22" aperture="3.5" distance="0.5" k1="-1.7523" k2="1.8669" k3="-0.8644"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="0.5" k1="-1.7278" k2="1.7875" k3="-0.8047"/>
++            <vignetting model="pa" focal="22" aperture="5.6" distance="0.5" k1="-0.7246" k2="-0.3682" k3="0.4055"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="0.5" k1="-0.7029" k2="0.1041" k3="-0.0484"/>
++            <vignetting model="pa" focal="22" aperture="11" distance="0.5" k1="-0.8179" k2="0.4719" k3="-0.2444"/>
++            <vignetting model="pa" focal="22" aperture="20" distance="0.5" k1="-0.8132" k2="0.3293" k3="-0.0543"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.5" k1="-1.6438" k2="1.6648" k3="-0.7305"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1" k1="-1.6238" k2="1.5047" k3="-0.5960"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.6600" k2="1.7123" k3="-0.7364"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.5" k1="-0.7203" k2="-0.2811" k3="0.3403"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1" k1="-0.7679" k2="-0.2954" k3="0.3955"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6486" k2="-0.5150" k3="0.5191"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.5" k1="-0.6953" k2="0.1981" k3="-0.1155"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1" k1="-0.6432" k2="-0.0613" k3="0.0873"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6372" k2="0.0254" k3="0.0163"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.5" k1="-0.7721" k2="0.4197" k3="-0.2040"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1" k1="-0.7989" k2="0.3444" k3="-0.1171"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7639" k2="0.3231" k3="-0.1138"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.5" k1="-0.7708" k2="0.3417" k3="-0.0937"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1" k1="-0.7474" k2="0.1428" k3="0.0732"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7602" k2="0.2101" k3="0.0240"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="0.5" k1="-1.4458" k2="1.3937" k3="-0.6045"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="1" k1="-1.4534" k2="1.3067" k3="-0.5149"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="1000" k1="-1.4388" k2="1.3979" k3="-0.5970"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="0.5" k1="-0.7767" k2="-0.0835" k3="0.2410"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="1" k1="-0.5829" k2="-0.4899" k3="0.4713"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="1000" k1="-0.6064" k2="-0.3567" k3="0.3736"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="0.5" k1="-0.5773" k2="-0.0190" k3="0.0261"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="1" k1="-0.6763" k2="0.1803" k3="-0.0642"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="1000" k1="-0.6238" k2="0.1222" k3="-0.0461"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="0.5" k1="-0.7060" k2="0.3817" k3="-0.1780"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="1" k1="-0.6722" k2="0.1940" k3="-0.0296"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="1000" k1="-0.7028" k2="0.2675" k3="-0.0600"/>
++            <vignetting model="pa" focal="27" aperture="22" distance="0.5" k1="-0.7073" k2="0.3190" k3="-0.0987"/>
++            <vignetting model="pa" focal="27" aperture="22" distance="1" k1="-0.6936" k2="0.1892" k3="0.0133"/>
++            <vignetting model="pa" focal="27" aperture="22" distance="1000" k1="-0.6751" k2="0.1907" k3="-0.0024"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="0.5" k1="-1.2135" k2="1.0776" k3="-0.4515"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1" k1="-1.1998" k2="0.9479" k3="-0.3435"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-1.1993" k2="1.0065" k3="-0.3961"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.9908" k2="0.5376" k3="-0.1267"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1" k1="-0.9580" k2="0.4148" k3="-0.0403"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.9344" k2="0.3390" k3="0.0145"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.4954" k2="-0.0732" k3="0.0630"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1" k1="-0.5102" k2="-0.1399" k3="0.1347"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5095" k2="-0.0979" k3="0.0978"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.5970" k2="0.2611" k3="-0.0975"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1" k1="-0.6185" k2="0.2213" k3="-0.0520"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5903" k2="0.1883" k3="-0.0391"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.6246" k2="0.2128" k3="-0.0282"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.6246" k2="0.2128" k3="-0.0282"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="0.5" k1="-0.6201" k2="0.2764" k3="-0.0844"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1" k1="-0.6252" k2="0.1675" k3="0.0125"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Voigtländer</maker>
++        <model>Voigtlander Ultron 40mm f/2 SLII Aspherical</model>
++        <model lang="en">Voigtländer Ultron 40mm f/2 SL-II Aspherical</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="40" a="0.00914" b="-0.03392" c="0.02683"/>
++            <tca model="poly3" focal="40" vr="1.0001130" vb="1.0000510"/>
++            <!-- Taken with Nikon D810 -->
++            <vignetting model="pa" focal="40" aperture="2" distance="10" k1="-1.4005" k2="0.9677" k3="-0.3253"/>
++            <vignetting model="pa" focal="40" aperture="2" distance="1000" k1="-1.4005" k2="0.9677" k3="-0.3253"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="10" k1="-0.2035" k2="-0.7391" k3="0.3531"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.2035" k2="-0.7391" k3="0.3531"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="10" k1="-0.5039" k2="0.4455" k3="-0.3488"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.5039" k2="0.4455" k3="-0.3488"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="10" k1="-0.4284" k2="0.1120" k3="-0.0072"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.4284" k2="0.1120" k3="-0.0072"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="10" k1="-0.4615" k2="0.1723" k3="-0.0436"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.4615" k2="0.1723" k3="-0.0436"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>LG</maker>
++        <model>LG G4 &amp; compatibles</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
++        <mount>lgH815</mount>
++        <cropfactor>6.34</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="4.42" k1="0.00306"/>
++            <tca model="poly3" focal="4.42" vr="1.0000246" vb="1.0000556"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This is *not* the mirror lens -->
++        <maker>Beroflex</maker>
++        <model>Beroflex 1:8 500mm</model>
++        <mount>T2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K10D -->
++            <distortion model="poly3" focal="500" k1="0.00108"/>
++            <tca model="poly3" focal="500" vr="0.9999464" vb="0.9997637"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Yongnuo</maker>
++        <model>Yongnuo YN 35mm f/2</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 1200D -->
++            <distortion model="ptlens" focal="35" a="-0.00119" b="0.00329" c="-0.01831"/>
++            <tca model="poly3" focal="35" vr="1.0001431" vb="1.0000424"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Irix</maker>
++        <model>Irix 15mm f/2.4</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F</mount>
++        <mount>Pentax KAF</mount>
++        <aperture min="2.4" max="22"/>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="15" a="-0.00136" b="-0.00782" c="0.00534"/>
++            <vignetting model="pa" focal="15" aperture="2.4" distance="10" k1="-1.73692" k2="1.78418" k3="-0.80744"/>
++            <vignetting model="pa" focal="15" aperture="2.4" distance="1000" k1="-1.73692" k2="1.78418" k3="-0.80744"/>
++            <vignetting model="pa" focal="15" aperture="2.8" distance="10" k1="-1.83889" k2="1.83878" k3="-0.77529"/>
++            <vignetting model="pa" focal="15" aperture="2.8" distance="1000" k1="-1.83889" k2="1.83878" k3="-0.77529"/>
++            <vignetting model="pa" focal="15" aperture="4" distance="10" k1="-0.66275" k2="-0.49148" k3="0.50918"/>
++            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.66275" k2="-0.49148" k3="0.50918"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.3307" k2="-0.80537" k3="0.53069"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.3307" k2="-0.80537" k3="0.53069"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="10" k1="-0.64454" k2="0.41276" k3="-0.38224"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.64454" k2="0.41276" k3="-0.38224"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.54125" k2="0.01735" k3="0.0838"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.54125" k2="0.01735" k3="0.0838"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Arsenal</maker>
++        <model>MC Volna-3 80mm f/2.8</model>
++        <mount>Kiev 88</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony SLT-A58 -->
++            <distortion model="ptlens" focal="80" a="0" b="0.00056" c="0"/>
++            <tca model="poly3" focal="80" br="0.0000342" vr="0.9999946" bb="-0.0000372" vb="1.0000073"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.2252" k2="0.1874" k3="-0.0974"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.2252" k2="0.1874" k3="-0.0974"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.1469" k2="0.1321" k3="-0.0693"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.1469" k2="0.1321" k3="-0.0693"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1378" k2="0.0952" k3="-0.0479"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1378" k2="0.0952" k3="-0.0479"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.1454" k2="0.1123" k3="-0.0586"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.1454" k2="0.1123" k3="-0.0586"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.0939" k2="0.0021" k3="0.0103"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.0939" k2="0.0021" k3="0.0103"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.1052" k2="0.0621" k3="-0.0394"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.1052" k2="0.0621" k3="-0.0394"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.1423" k2="0.1459" k3="-0.0848"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.1423" k2="0.1459" k3="-0.0848"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Meike</maker>
++        <model>Meike 35mm f/1.7</model>
++        <mount>Fujifilm X</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-Pro2 -->
++            <distortion model="ptlens" focal="35" a="-0.00688" b="0.00111" c="-0.00744"/>
++            <tca model="poly3" focal="35" vr="0.9999442" vb="0.9998993"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Meike</maker>
++        <model>Meike 50mm f/2.0</model>
++        <mount>Fujifilm X</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Sony E</mount>
++        <mount>Nikon CX</mount>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-Pro2 -->
++            <distortion model="poly3" focal="50" k1="0.013"/>
++            <tca model="poly3" focal="50" vr="0.9999023" vb="0.9996490"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Meike</maker>
++        <model>Meike MK-F 28mm f/2.8</model>
++        <mount>Fujifilm X</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Sony E</mount>
++        <mount>Nikon CX</mount>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-E1 -->
++            <distortion model="poly3" focal="28" k1="-0.01253"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>Standard</model>
++        <mount>lumia1520</mount>
++        <cropfactor>6.26</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="4.5" k1="0.00674"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/rf-leica.xml b/data/db/rf-leica.xml
+--- a/data/db/rf-leica.xml	2007-12-12 21:49:44.000000000 +0100
++++ b/data/db/rf-leica.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,154 +1,51 @@
+-<!--
+-    I have created this file to have a place where I can drop all information
+-    that I can find about Leica rangefinder cameras and lenses. It's far from
+-    being complete; feel free to extend this file.
+--->
+-
+ <lensdatabase>
+-
+     <mount>
+         <name>Leica M</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Elmarit-M 2.8/21 ASPH</model>
+-        <cci red="0" green="6" blue="5" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Elmarit-M 2.8/21</model>
+-        <cci red="0" green="5" blue="2" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Elmarit-M 24mm f/2.8 ASPH</model>
+-        <cci red="0" green="5" blue="5" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Elmarit-M 2.8/28</model>
+-        <cci red="0" green="5" blue="4" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Elmarit-M 2.8/28</model>
+-        <cci red="0" green="4" blue="2" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Summilux-M 1.4/35 ASPH</model>
+-        <cci red="0" green="6" blue="6" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Summilux-M 1.4/35 ASPH</model>
+-        <cci red="0" green="5" blue="5" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Summilux-M 1.4/35</model>
+-        <cci red="0" green="4" blue="1" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Summicron-M 2/35 ASPH</model>
+-        <cci red="0" green="4" blue="3" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Noctilux-M 1/50</model>
+-        <cci red="0" green="8" blue="6" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Sumilux-M 1.4/50</model>
+-        <cci red="0" green="5" blue="2" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Summicron-M 2/50</model>
+-        <cci red="0" green="5" blue="4" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Elmar-M 2.8/50</model>
+-        <cci red="0" green="6" blue="5" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Summilux-M 1.4/75</model>
+-        <cci red="0" green="6" blue="3" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>APO-Summicron-M 2/90 ASPH</model>
+-        <cci red="0" green="6" blue="4" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
+-        <maker>Leica</maker>
+-        <model>Apo-Telyt-M 3.4/135</model>
+-        <cci red="0" green="5" blue="4" />
+-        <mount>Leica M</mount>
+-    </lens>
+-
+-    <lens>
++    <camera>
+         <maker>Leica</maker>
+-        <model>Elmarit-M 2.8/135</model>
+-        <cci red="0" green="6" blue="4" />
++        <model>Leica M (Typ 240)</model>
+         <mount>Leica M</mount>
+-    </lens>
+-
++        <cropfactor>1</cropfactor>
++    </camera>
+     <lens>
+         <maker>Leica</maker>
+-        <model>Tri-Elmar 4/28</model>
+-        <cci red="0" green="5" blue="3" />
++        <model>Elmarit-M 1:2.8/28</model>
++        <model lang="en">Elmarit-M 28mm f/2.8 ASPH</model>
+         <mount>Leica M</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with LEICA M (Typ 240) -->
++            <distortion model="ptlens" focal="28" a="0.00349" b="-0.00508" c="-0.01721"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Leica</maker>
+-        <model>Tri-Elmar 4/35</model>
+-        <cci red="0" green="5" blue="3" />
++        <model>Elmarit-M 1:2.8/90</model>
++        <model lang="en">Elmarit-M 90mm f/2.8</model>
+         <mount>Leica M</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Leica M (Typ 240) -->
++            <distortion model="ptlens" focal="90" a="-0.00423" b="0.01406" c="-0.00692"/>
++        </calibration>
+     </lens>
+- 
+     <lens>
+         <maker>Leica</maker>
+-        <model>Tri-Elmar 4/50</model>
+-        <cci red="0" green="5" blue="3" />
++        <model>Summicron-M 1:2/50</model>
++        <!-- Model 11819/11825/11826/11816 -->
++        <model lang="en">Summicron-M 50mm f/2</model>
+         <mount>Leica M</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken Leica M (Typ 240) -->
++            <distortion model="poly3" focal="50" k1="-0.00072"/>
++            <tca model="poly3" focal="50" vr="0.9999915" vb="0.9998735"/>
++        </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-canon.xml b/data/db/slr-canon.xml
+--- a/data/db/slr-canon.xml	2013-10-18 18:41:38.000000000 +0200
++++ b/data/db/slr-canon.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,140 +1,139 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Canon EF-S</name>
+         <compat>Canon EF</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Canon EF</name>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Canon FD</name>
++        <compat>Canon FL</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Canon FL</name>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 6D</model>
+         <model lang="en">EOS 6D</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1.005</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 5D Mark IV</model>
++        <model lang="en">EOS 5D Mark IV</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 5D Mark III</model>
+         <model lang="en">EOS 5D Mark III</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 5D Mark II</model>
+         <model lang="en">EOS 5D Mark II</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 5D</model>
+         <model lang="en">EOS 5D</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
+-    </camera>
+-
+-    <camera>
+-        <maker>Canon</maker>
+-        <model>Canon EOS-1DS</model>
+-        <model lang="en">EOS-1DS</model>
+-        <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1Ds</model>
+         <model lang="en">EOS-1Ds</model>
+-        <variant>*</variant>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1Ds Mark II</model>
+         <model lang="en">EOS-1Ds Mark II</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1D Mark II</model>
+         <model lang="en">EOS-1D Mark II</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.255</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1D Mark II N</model>
+         <model lang="en">EOS-1D Mark II N</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.255</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1Ds Mark III</model>
+         <model lang="en">EOS-1Ds Mark III</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1D Mark III</model>
+         <model lang="en">EOS-1D Mark III</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.282</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1D Mark IV</model>
+         <model lang="en">EOS-1D Mark IV</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.290</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1D</model>
+         <model lang="en">EOS-1D</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.255</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS-1D X</model>
+         <model lang="en">EOS-1D X</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 1000D</model>
+@@ -142,7 +141,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS DIGITAL REBEL XS</model>
+@@ -150,7 +148,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss Digital F</model>
+@@ -158,7 +155,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 1100D</model>
+@@ -166,7 +162,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL T3</model>
+@@ -174,7 +169,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X50</model>
+@@ -182,31 +176,27 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 300D DIGITAL</model>
+         <model lang="en">EOS 300D</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.587</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS DIGITAL REBEL</model>
+         <model lang="en">EOS Digital REBEL</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.587</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss Digital</model>
+         <model lang="en">EOS Kiss Digital</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.587</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 350D DIGITAL</model>
+@@ -214,7 +204,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS DIGITAL REBEL XT</model>
+@@ -222,7 +211,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss Digital N</model>
+@@ -230,7 +218,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 400D DIGITAL</model>
+@@ -238,7 +225,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS DIGITAL REBEL XTi</model>
+@@ -246,7 +232,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss Digital X</model>
+@@ -254,7 +239,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 450D</model>
+@@ -262,7 +246,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS DIGITAL REBEL XSi</model>
+@@ -270,7 +253,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss Digital X2</model>
+@@ -278,7 +260,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 500D</model>
+@@ -286,7 +267,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL T1i</model>
+@@ -294,7 +274,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X3</model>
+@@ -302,7 +281,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 550D</model>
+@@ -310,7 +288,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL T2i</model>
+@@ -318,7 +295,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X4</model>
+@@ -326,7 +302,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 600D</model>
+@@ -334,7 +309,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL T3i</model>
+@@ -342,7 +316,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X5</model>
+@@ -350,7 +323,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 650D</model>
+@@ -358,7 +330,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL T4i</model>
+@@ -366,7 +337,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X6i</model>
+@@ -374,7 +344,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 700D</model>
+@@ -382,7 +351,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL T5i</model>
+@@ -390,7 +358,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X7i</model>
+@@ -398,7 +365,55 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 750D</model>
++        <model lang="en">EOS 750D</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS Rebel T6i</model>
++        <model lang="en">EOS Rebel T6i</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 760D</model>
++        <model lang="en">EOS 760D</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 1200D</model>
++        <model lang="en">EOS 1200D</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 1300D</model>
++        <model lang="en">EOS 1300D</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS REBEL T5</model>
++        <model lang="en">EOS Rebel T5</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS Kiss X70</model>
++        <model lang="en">EOS Kiss X70</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 100D</model>
+@@ -406,7 +421,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS REBEL SL1</model>
+@@ -414,7 +428,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS Kiss X7</model>
+@@ -422,7 +435,27 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 200D</model>
++        <model lang="en">EOS 200D</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS REBEL SL2</model>
++        <model lang="en">EOS Rebel SL2</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS Kiss X9</model>
++        <model lang="en">EOS Kiss X9</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 7D</model>
+@@ -430,15 +463,27 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 7D Mark II</model>
++        <model lang="en">EOS 7D Mark II</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>Canon EOS 80D</model>
++        <model lang="en">EOS 80D</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++    </camera>
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 70D</model>
+         <model lang="en">EOS 70D</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.600</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 60D</model>
+@@ -446,7 +491,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 50D</model>
+@@ -454,7 +498,6 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 40D</model>
+@@ -462,1181 +505,5195 @@
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 30D</model>
+         <model lang="en">EOS 30D</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.600</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 20D</model>
+         <model lang="en">EOS 20D</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.600</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS 10D</model>
+         <model lang="en">EOS 10D</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.587</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS D60</model>
+         <model lang="en">EOS D60</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.587</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>Canon EOS D30</model>
+         <model lang="en">EOS D30</model>
+         <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.587</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Canon</maker>
+         <model>35mm film: full frame</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Kodak</maker>
+         <model>DCS Pro SLR/c</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Kodak</maker>
+-        <model>DCS520C</model>
++        <model>DCS520</model>
++        <model lang="en">DCS 520</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.6</cropfactor>
++        <cropfactor>1.593</cropfactor>
++    </camera>
++    <camera>
++        <maker>Canon</maker>
++        <model>EOS D2000</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.593</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 10-22mm f/3.5-4.5 USM</model>
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="10" a="0.005371" b="-0.018303" c="0" />
+-            <distortion model="ptlens" focal="12" a="0.002619" b="-0.009527" c="0" />
+-            <distortion model="ptlens" focal="14" a="0.002896" b="-0.00705" c="0" />
+-            <distortion model="ptlens" focal="17" a="0.005115" b="-0.010326" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.00512" b="-0.008414" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.002769" b="-0.004058" c="0" />
++            <!-- Taken with Canon 650D -->
++            <distortion model="ptlens" focal="10" a="0.01986" b="-0.06874" c="0.05166"/>
++            <distortion model="ptlens" focal="12" a="0.0077" b="-0.03199" c="0.02557"/>
++            <distortion model="ptlens" focal="14" a="0.003" b="-0.00133" c="-0.01649"/>
++            <distortion model="ptlens" focal="22" a="0.00459" b="-0.00356" c="-0.01271"/>
++            <tca model="poly3" focal="10" br="-0.0000025" vr="1.0003211" bb="0.0000125" vb="1.0000667"/>
++            <tca model="poly3" focal="12" br="0.0001191" vr="1.0001500" bb="-0.0000116" vb="1.0001272"/>
++            <tca model="poly3" focal="14" br="0.0000423" vr="1.0001293" bb="-0.0000479" vb="1.0001940"/>
++            <tca model="poly3" focal="22" br="0.0000589" vr="0.9999979" bb="-0.0000104" vb="1.0001770"/>
++            <!-- Taken with Canon 500D -->
++            <vignetting model="pa" focal="10" aperture="3.5" distance="10" k1="-2.1271" k2="2.6641" k3="-1.2836"/>
++            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-2.1271" k2="2.6641" k3="-1.2836"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-0.6724" k2="0.0578" k3="0.0247"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-0.6724" k2="0.0578" k3="0.0247"/>
++            <vignetting model="pa" focal="10" aperture="4.5" distance="10" k1="-0.7341" k2="0.4150" k3="-0.2096"/>
++            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-0.7341" k2="0.4150" k3="-0.2096"/>
++            <vignetting model="pa" focal="10" aperture="5" distance="10" k1="-0.7227" k2="0.3498" k3="-0.1326"/>
++            <vignetting model="pa" focal="10" aperture="5" distance="1000" k1="-0.7227" k2="0.3498" k3="-0.1326"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.6733" k2="0.1679" k3="0.0273"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.6733" k2="0.1679" k3="0.0273"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.6667" k2="0.1500" k3="0.0393"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.6667" k2="0.1500" k3="0.0393"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.6700" k2="0.1558" k3="0.0355"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.6700" k2="0.1558" k3="0.0355"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-1.5029" k2="1.4843" k3="-0.6316"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-1.5029" k2="1.4843" k3="-0.6316"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.5529" k2="-0.2051" k3="0.2309"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.5529" k2="-0.2051" k3="0.2309"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.6266" k2="0.1899" k3="-0.0258"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.6266" k2="0.1899" k3="-0.0258"/>
++            <vignetting model="pa" focal="12" aperture="5" distance="10" k1="-0.6158" k2="0.1397" k3="0.0256"/>
++            <vignetting model="pa" focal="12" aperture="5" distance="1000" k1="-0.6158" k2="0.1397" k3="0.0256"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-0.6036" k2="0.1061" k3="0.0486"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.6036" k2="0.1061" k3="0.0486"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="10" k1="-0.5986" k2="0.0915" k3="0.0581"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.5986" k2="0.0915" k3="0.0581"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.6061" k2="0.1065" k3="0.0492"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.6061" k2="0.1065" k3="0.0492"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-1.4963" k2="1.4861" k3="-0.6302"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-1.4963" k2="1.4861" k3="-0.6302"/>
++            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.5026" k2="-0.1586" k3="0.1768"/>
++            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.5026" k2="-0.1586" k3="0.1768"/>
++            <vignetting model="pa" focal="14" aperture="5" distance="10" k1="-0.5464" k2="0.0704" k3="0.0331"/>
++            <vignetting model="pa" focal="14" aperture="5" distance="1000" k1="-0.5464" k2="0.0704" k3="0.0331"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.5608" k2="0.1081" k3="0.0277"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.5608" k2="0.1081" k3="0.0277"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.5529" k2="0.0810" k3="0.0501"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5529" k2="0.0810" k3="0.0501"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.5483" k2="0.0701" k3="0.0559"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5483" k2="0.0701" k3="0.0559"/>
++            <vignetting model="pa" focal="14" aperture="25" distance="10" k1="-0.5491" k2="0.0666" k3="0.0595"/>
++            <vignetting model="pa" focal="14" aperture="25" distance="1000" k1="-0.5491" k2="0.0666" k3="0.0595"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-1.4883" k2="1.5043" k3="-0.6467"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-1.4883" k2="1.5043" k3="-0.6467"/>
++            <vignetting model="pa" focal="17" aperture="4.5" distance="10" k1="-0.5478" k2="-0.2553" k3="0.2914"/>
++            <vignetting model="pa" focal="17" aperture="4.5" distance="1000" k1="-0.5478" k2="-0.2553" k3="0.2914"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="10" k1="-0.4485" k2="-0.2813" k3="0.2632"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-0.4485" k2="-0.2813" k3="0.2632"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.4494" k2="-0.0688" k3="0.0944"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.4494" k2="-0.0688" k3="0.0944"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.4867" k2="0.0475" k3="0.0552"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.4867" k2="0.0475" k3="0.0552"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="10" k1="-0.4884" k2="0.0500" k3="0.0528"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-0.4884" k2="0.0500" k3="0.0528"/>
++            <vignetting model="pa" focal="17" aperture="29" distance="10" k1="-0.4786" k2="0.0251" k3="0.0686"/>
++            <vignetting model="pa" focal="17" aperture="29" distance="1000" k1="-0.4786" k2="0.0251" k3="0.0686"/>
++            <vignetting model="pa" focal="22" aperture="4.5" distance="10" k1="-1.3450" k2="1.3739" k3="-0.6390"/>
++            <vignetting model="pa" focal="22" aperture="4.5" distance="1000" k1="-1.3450" k2="1.3739" k3="-0.6390"/>
++            <vignetting model="pa" focal="22" aperture="5" distance="10" k1="-0.7966" k2="0.2347" k3="0.0309"/>
++            <vignetting model="pa" focal="22" aperture="5" distance="1000" k1="-0.7966" k2="0.2347" k3="0.0309"/>
++            <vignetting model="pa" focal="22" aperture="5.6" distance="10" k1="-0.4158" k2="-0.3483" k3="0.3184"/>
++            <vignetting model="pa" focal="22" aperture="5.6" distance="1000" k1="-0.4158" k2="-0.3483" k3="0.3184"/>
++            <vignetting model="pa" focal="22" aperture="6.3" distance="10" k1="-0.3037" k2="-0.3564" k3="0.2530"/>
++            <vignetting model="pa" focal="22" aperture="6.3" distance="1000" k1="-0.3037" k2="-0.3564" k3="0.2530"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="10" k1="-0.4070" k2="0.0794" k3="-0.0246"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="1000" k1="-0.4070" k2="0.0794" k3="-0.0246"/>
++            <vignetting model="pa" focal="22" aperture="11" distance="10" k1="-0.4008" k2="0.0250" k3="0.0482"/>
++            <vignetting model="pa" focal="22" aperture="11" distance="1000" k1="-0.4008" k2="0.0250" k3="0.0482"/>
++            <vignetting model="pa" focal="22" aperture="29" distance="10" k1="-0.3994" k2="0.0175" k3="0.0532"/>
++            <vignetting model="pa" focal="22" aperture="29" distance="1000" k1="-0.3994" k2="0.0175" k3="0.0532"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 15mm f/2.8 Fisheye</model>
++        <model lang="de">Canon EF 15mm f/2.8 Fischauge</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
+         <type>fisheye</type>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 16-35mm f/2.8L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16" a="0.023824" b="-0.058145" c="0" />
+-            <distortion model="ptlens" focal="17" a="0.022268" b="-0.051156" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.020609" b="-0.044077" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.01767" b="-0.036082" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.016895" b="-0.032578" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.012716" b="-0.021973" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.010184" b="-0.016286" c="0" />
+-            <distortion model="ptlens" focal="33" a="0.00765" b="-0.00996" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.007164" b="-0.010358" c="0" />
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="16" a="0.01687424" b="-0.03208409" c="-0.028794159"/>
++            <distortion model="ptlens" focal="17" a="0.018424526" b="-0.03643579" c="-0.020559887"/>
++            <distortion model="ptlens" focal="18" a="0.017495247" b="-0.034459507" c="-0.015300327"/>
++            <distortion model="ptlens" focal="20" a="0.016731535" b="-0.032388456" c="-0.009986979"/>
++            <distortion model="ptlens" focal="22" a="0.014761182" b="-0.027130847" c="0.005742111"/>
++            <distortion model="ptlens" focal="24" a="0.014413616" b="-0.026361848" c="-0.00090247203"/>
++            <distortion model="ptlens" focal="26" a="0.012561258" b="-0.021763202" c="-0.00027483905"/>
++            <distortion model="ptlens" focal="28" a="0.010246756" b="-0.016053859" c="-0.000953533"/>
++            <distortion model="ptlens" focal="30" a="0.010323046" b="-0.017679968" c="0.0047651725"/>
++            <distortion model="ptlens" focal="35" a="0.0070163863" b="-0.010468312" c="0.0030782963"/>
++            <tca model="poly3" focal="16" br="-0.0002000" vr="1.0013882" bb="0.0001579" vb="0.9998360"/>
++            <tca model="poly3" focal="20" br="0.0000670" vr="1.0007432" bb="-0.0000362" vb="1.0002576"/>
++            <tca model="poly3" focal="24" br="0.0001425" vr="1.0003809" bb="-0.0001086" vb="1.0004253"/>
++            <tca model="poly3" focal="28" br="0.0001483" vr="1.0002688" bb="-0.0001237" vb="1.0003935"/>
++            <tca model="poly3" focal="35" br="0.0001437" vr="1.0002374" bb="-0.0001347" vb="1.0002667"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="0.28" k1="-0.1292" k2="-1.7458" k3="1.0127"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="0.56" k1="-0.3436" k2="-0.9369" k3="0.4790"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1.68" k1="-0.3534" k2="-0.8520" k3="0.3689"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.3176" k2="-0.9708" k3="0.4369"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="0.28" k1="-0.8654" k2="0.4684" k3="-0.3700"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="0.56" k1="-0.8566" k2="0.3689" k3="-0.2046"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1.68" k1="-0.8790" k2="0.4658" k3="-0.3126"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.8848" k2="0.5114" k3="-0.3702"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="0.28" k1="-0.9730" k2="0.7548" k3="-0.4335"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="0.56" k1="-0.9157" k2="0.5247" k3="-0.2164"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1.68" k1="-0.9279" k2="0.5681" k3="-0.2523"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.9511" k2="0.6666" k3="-0.3407"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="0.28" k1="-0.8842" k2="0.3434" k3="-0.0258"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="0.56" k1="-0.8894" k2="0.3630" k3="-0.0351"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1.68" k1="-0.8906" k2="0.3655" k3="-0.0351"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.8900" k2="0.3655" k3="-0.0344"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="0.28" k1="-0.9288" k2="0.4132" k3="-0.0576"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="0.56" k1="-0.9296" k2="0.4173" k3="-0.0549"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1.68" k1="-0.9323" k2="0.4248" k3="-0.0588"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.9324" k2="0.4267" k3="-0.0603"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.28" k1="-0.3791" k2="-0.7797" k3="0.5297"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.56" k1="-0.3525" k2="-0.9052" k3="0.6601"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1.68" k1="-0.3508" k2="-0.9154" k3="0.6709"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.3499" k2="-0.9140" k3="0.6689"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.28" k1="-0.6376" k2="0.0188" k3="0.0733"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.56" k1="-0.6399" k2="0.0282" k3="0.0655"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1.68" k1="-0.6399" k2="0.0206" k3="0.0727"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.6449" k2="0.0489" k3="0.0511"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.28" k1="-0.7012" k2="0.1935" k3="0.0090"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.56" k1="-0.7015" k2="0.1943" k3="0.0103"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1.68" k1="-0.7001" k2="0.1910" k3="0.0131"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.7006" k2="0.1939" k3="0.0106"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.28" k1="-0.6990" k2="0.1480" k3="0.0581"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.56" k1="-0.6991" k2="0.1469" k3="0.0613"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1.68" k1="-0.6981" k2="0.1435" k3="0.0646"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.6986" k2="0.1468" k3="0.0621"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="0.28" k1="-0.7468" k2="0.2238" k3="0.0209"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="0.56" k1="-0.7441" k2="0.2153" k3="0.0285"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1.68" k1="-0.7444" k2="0.2159" k3="0.0286"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.7432" k2="0.2175" k3="0.0255"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="0.28" k1="-0.4345" k2="-0.7570" k3="0.6022"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="0.56" k1="-0.4377" k2="-0.7511" k3="0.5998"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1.68" k1="-0.4386" k2="-0.7498" k3="0.5992"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.4346" k2="-0.7567" k3="0.6031"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.28" k1="-0.5404" k2="0.1701" k3="-0.0800"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.56" k1="-0.5376" k2="0.1591" k3="-0.0699"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1.68" k1="-0.5428" k2="0.1782" k3="-0.0837"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.5325" k2="0.1424" k3="-0.0599"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.28" k1="-0.5284" k2="0.0572" k3="0.0608"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.56" k1="-0.5247" k2="0.0412" k3="0.0752"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1.68" k1="-0.5228" k2="0.0354" k3="0.0796"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.5250" k2="0.0407" k3="0.0770"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.28" k1="-0.5351" k2="0.0514" k3="0.0711"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.56" k1="-0.5348" k2="0.0450" k3="0.0784"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1.68" k1="-0.5323" k2="0.0421" k3="0.0787"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.5343" k2="0.0484" k3="0.0745"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.28" k1="-0.5718" k2="0.0952" k3="0.0540"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.56" k1="-0.5757" k2="0.1141" k3="0.0369"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1.68" k1="-0.5779" k2="0.1231" k3="0.0292"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.5727" k2="0.1034" k3="0.0463"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="0.28" k1="-0.6666" k2="-0.2014" k3="0.2642"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="0.56" k1="-0.6687" k2="-0.1978" k3="0.2625"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1.68" k1="-0.6681" k2="-0.1996" k3="0.2636"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.6654" k2="-0.2059" k3="0.2680"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.28" k1="-0.4754" k2="0.3098" k3="-0.2604"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.56" k1="-0.4697" k2="0.2905" k3="-0.2479"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1.68" k1="-0.4709" k2="0.2964" k3="-0.2535"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.4774" k2="0.3140" k3="-0.2608"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.28" k1="-0.4266" k2="0.0327" k3="0.0460"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.56" k1="-0.4248" k2="0.0201" k3="0.0597"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1.68" k1="-0.4272" k2="0.0343" k3="0.0447"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.4279" k2="0.0373" k3="0.0422"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.28" k1="-0.4222" k2="-0.0137" k3="0.0921"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.56" k1="-0.4236" k2="-0.0119" k3="0.0923"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1.68" k1="-0.4238" k2="-0.0107" k3="0.0912"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.4213" k2="-0.0160" k3="0.0938"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.28" k1="-0.4633" k2="0.0563" k3="0.0516"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.56" k1="-0.4638" k2="0.0600" k3="0.0485"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1.68" k1="-0.4633" k2="0.0592" k3="0.0488"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.4656" k2="0.0652" k3="0.0445"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.28" k1="-1.1205" k2="0.9931" k3="-0.5234"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.56" k1="-1.1195" k2="0.9910" k3="-0.5224"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1.68" k1="-1.1189" k2="0.9895" k3="-0.5216"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-1.1172" k2="0.9857" k3="-0.5192"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.28" k1="-0.3650" k2="0.3230" k3="-0.3872"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.56" k1="-0.3612" k2="0.3102" k3="-0.3773"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1.68" k1="-0.3641" k2="0.3151" k3="-0.3732"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3640" k2="0.3183" k3="-0.3835"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.28" k1="-0.3418" k2="0.0932" k3="-0.0333"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.56" k1="-0.3407" k2="0.0877" k3="-0.0281"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1.68" k1="-0.3421" k2="0.0945" k3="-0.0351"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3391" k2="0.0827" k3="-0.0251"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.28" k1="-0.3144" k2="-0.0344" k3="0.0846"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.56" k1="-0.3147" k2="-0.0346" k3="0.0857"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1.68" k1="-0.3136" k2="-0.0376" k3="0.0871"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3146" k2="-0.0350" k3="0.0851"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.28" k1="-0.3450" k2="0.0074" k3="0.0643"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.56" k1="-0.3485" k2="0.0189" k3="0.0557"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1.68" k1="-0.3444" k2="0.0068" k3="0.0643"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3444" k2="0.0067" k3="0.0643"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 17-35mm f/2.8L USM</model>
++        <model>Canon EF 16-35mm f/2.8L II USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.020618" b="-0.051946" c="0" />
+-            <distortion model="ptlens" focal="18" a="0.022989" b="-0.054039" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.021786" b="-0.050249" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.01785" b="-0.039447" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.015392" b="-0.032541" c="0" />
+-            <distortion model="ptlens" focal="27" a="0.012041" b="-0.022894" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.008656" b="-0.01427" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.006328" b="-0.008464" c="0" />
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="16" a="0.0065" b="-0.01669" c="-0.01549"/>
++            <distortion model="ptlens" focal="19" a="0.01125" b="-0.02255" c="-0.00278"/>
++            <distortion model="ptlens" focal="23" a="0.01448" b="-0.02598" c="0.00708"/>
++            <distortion model="ptlens" focal="29" a="0.0151" b="-0.03003" c="0.0198"/>
++            <distortion model="ptlens" focal="35" a="0.00983" b="-0.01708" c="0.01203"/>
++            <tca model="poly3" focal="16" br="0.0000346" vr="1.0003744" bb="0.0000537" vb="0.9998434"/>
++            <tca model="poly3" focal="19" br="0.0001428" vr="1.0000967" bb="-0.0000753" vb="1.0000994"/>
++            <tca model="poly3" focal="23" br="0.0001177" vr="0.9999705" bb="-0.0001226" vb="1.0002366"/>
++            <tca model="poly3" focal="29" br="0.0000772" vr="0.9999754" bb="-0.0001150" vb="1.0002127"/>
++            <tca model="poly3" focal="35" br="0.0001107" vr="0.9999553" bb="-0.0001430" vb="1.0001705"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2764" k2="-1.2603" k3="0.7727"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2764" k2="-1.2603" k3="0.7727"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.6197" k2="0.1018" k3="-0.1071"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.6197" k2="0.1018" k3="-0.1071"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.6727" k2="0.1945" k3="-0.0389"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.6727" k2="0.1945" k3="-0.0389"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.6444" k2="0.0485" k3="0.1125"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.6444" k2="0.0485" k3="0.1125"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.6606" k2="0.0672" k3="0.1053"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.6606" k2="0.0672" k3="0.1053"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-0.4367" k2="-0.8197" k3="0.6391"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.4367" k2="-0.8197" k3="0.6391"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.4943" k2="-0.1060" k3="0.1060"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4943" k2="-0.1060" k3="0.1060"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.5401" k2="-0.0066" k3="0.1095"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5401" k2="-0.0066" k3="0.1095"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.5397" k2="-0.0258" k3="0.1319"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.5397" k2="-0.0258" k3="0.1319"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.5614" k2="0.0013" k3="0.1196"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.5614" k2="0.0013" k3="0.1196"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.6908" k2="-0.2754" k3="0.3669"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.6908" k2="-0.2754" k3="0.3669"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.4357" k2="0.0472" k3="0.0062"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.4357" k2="0.0472" k3="0.0062"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4179" k2="-0.0698" k3="0.1298"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4179" k2="-0.0698" k3="0.1298"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.4258" k2="-0.0556" k3="0.1208"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.4258" k2="-0.0556" k3="0.1208"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.4462" k2="-0.0326" k3="0.1112"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.4462" k2="-0.0326" k3="0.1112"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.9870" k2="0.4548" k3="-0.0802"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.9870" k2="0.4548" k3="-0.0802"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3918" k2="0.2125" k3="-0.2043"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3918" k2="0.2125" k3="-0.2043"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3420" k2="-0.0621" k3="0.1087"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3420" k2="-0.0621" k3="0.1087"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3474" k2="-0.0530" k3="0.1027"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3474" k2="-0.0530" k3="0.1027"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3660" k2="-0.0343" k3="0.0938"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3660" k2="-0.0343" k3="0.0938"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-1.3188" k2="1.3339" k3="-0.6657"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-1.3188" k2="1.3339" k3="-0.6657"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2677" k2="0.0320" k3="-0.1582"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2677" k2="0.0320" k3="-0.1582"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2796" k2="-0.0234" k3="0.0700"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2796" k2="-0.0234" k3="0.0700"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2781" k2="-0.0341" k3="0.0800"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2781" k2="-0.0341" k3="0.0800"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2940" k2="-0.0107" k3="0.0656"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2940" k2="-0.0107" k3="0.0656"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 17-40mm f/4L USM</model>
++        <model>Canon EF 16-35mm f/2.8L III USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.020104" b="-0.047886" c="0" />
+-            <distortion model="ptlens" focal="19" a="0.016917" b="-0.039854" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.015352" b="-0.035125" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.01352" b="-0.027379" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.012744" b="-0.024334" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.012023" b="-0.02158" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.008491" b="-0.013858" c="0" />
+-            <distortion model="ptlens" focal="32" a="0.007181" b="-0.008983" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.006829" b="-0.007622" c="0" />
+-            <distortion model="ptlens" focal="37" a="0.006676" b="-0.007544" c="0" />
+-            <distortion model="ptlens" focal="40" a="0.00464" b="-0.003826" c="0" />
++            <!-- Taken with 5D Mark IV -->
++            <distortion model="ptlens" focal="16" a="0.0104208" b="-0.0275753" c="-0.00353756"/>
++            <distortion model="ptlens" focal="18" a="0.0117295" b="-0.0346684" c="0.0108644"/>
++            <distortion model="ptlens" focal="20" a="0.0114777" b="-0.032469" c="0.018199"/>
++            <distortion model="ptlens" focal="22" a="0.0111816" b="-0.0291129" c="0.0222697"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.00728713" c="0"/>
++            <tca model="poly3" focal="16" br="0.0000773" vr="1.0001564" bb="-0.0000257" vb="1.0000016"/>
++            <tca model="poly3" focal="18" vr="1.0002000" vb="0.9999000"/>
++            <tca model="poly3" focal="20" br="0.0000502" vr="1.0001041" bb="-0.0000602" vb="1.0000264"/>
++            <tca model="poly3" focal="22" br="0.0000675" vr="0.9999704" bb="-0.0001149" vb="1.0001321"/>
++            <tca model="poly3" focal="35" br="0.0000855" vr="0.9996872" bb="-0.0001614" vb="1.0003235"/>
+         </calibration>
+     </lens>
+-    
+-     <!-- Lens is in database twice. 
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF-S 17-55mm f/2.8 IS USM</model>
+-        <mount>Canon EF-S</mount>
+-        <cropfactor>1.6</cropfactor>
++        <model>Canon EF 17-35mm f/2.8L USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="17" k1="-0.01500" />
+-            <distortion model="poly3" focal="20" k1="-0.00100" />
+-            <distortion model="poly3" focal="24" k1="+0.00000" />
+-            <distortion model="poly3" focal="28" k1="+0.01000" />
+-            <distortion model="poly3" focal="35" k1="+0.02000" />
+-            <distortion model="poly3" focal="55" k1="+0.02000" />
++            <distortion model="ptlens" focal="17" a="0.020618" b="-0.051946" c="0"/>
++            <distortion model="ptlens" focal="18" a="0.022989" b="-0.054039" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.021786" b="-0.050249" c="0"/>
++            <distortion model="ptlens" focal="22" a="0.01785" b="-0.039447" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.015392" b="-0.032541" c="0"/>
++            <distortion model="ptlens" focal="27" a="0.012041" b="-0.022894" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.008656" b="-0.01427" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.006328" b="-0.008464" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 17-40mm f/4L USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="17" a="0.020104" b="-0.047886" c="0"/>
++            <distortion model="ptlens" focal="19" a="0.016917" b="-0.039854" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.015352" b="-0.035125" c="0"/>
++            <distortion model="ptlens" focal="22" a="0.01352" b="-0.027379" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.012744" b="-0.024334" c="0"/>
++            <distortion model="ptlens" focal="26" a="0.012023" b="-0.02158" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.008491" b="-0.013858" c="0"/>
++            <distortion model="ptlens" focal="32" a="0.007181" b="-0.008983" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.006829" b="-0.007622" c="0"/>
++            <distortion model="ptlens" focal="37" a="0.006676" b="-0.007544" c="0"/>
++            <distortion model="ptlens" focal="40" a="0.00464" b="-0.003826" c="0"/>
+         </calibration>
+     </lens>
+-    -->
+-   
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 17-55mm f/2.8 IS USM</model>
+         <mount>Canon EF-S</mount>
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.0160544" b="-0.0422842" c="0.00805163" />
+-            <distortion model="ptlens" focal="20" a="0.0145107" b="-0.0318653" c="0.012966" />
+-            <distortion model="ptlens" focal="23" a="0.0132784" b="-0.0244953" c="0.0194828" />
+-            <distortion model="ptlens" focal="28" a="0.00120309" b="0.00979416" c="-0.00868762" />
+-            <distortion model="ptlens" focal="35" a="-0.000341579" b="0.0108822" c="-0.00545481" />
+-            <distortion model="ptlens" focal="55" a="0.00182321" b="0.00378863" c="0.00103256" />
++            <!-- Taken with cropfactor 1.622 (Canon 50D or 450D) -->
++            <distortion model="ptlens" focal="17" a="0.0160544" b="-0.0422842" c="0.00805163"/>
++            <distortion model="ptlens" focal="20" a="0.0145107" b="-0.0318653" c="0.012966"/>
++            <distortion model="ptlens" focal="23" a="0.0132784" b="-0.0244953" c="0.0194828"/>
++            <distortion model="ptlens" focal="28" a="0.00120309" b="0.00979416" c="-0.00868762"/>
++            <distortion model="ptlens" focal="35" a="-0.000341579" b="0.0108822" c="-0.00545481"/>
++            <distortion model="ptlens" focal="55" a="0.00182321" b="0.00378863" c="0.00103256"/>
++            <tca model="poly3" focal="17" br="0.00000027" vr="1.0003199333" bb="-0.00005237" vb="1.0000628667"/>
++            <tca model="poly3" focal="20" br="0.00005255" vr="1.00019555" bb="-0.00009695" vb="1.0001321"/>
++            <tca model="poly3" focal="23" br="0.0000401" vr="1.0001227" bb="-0.0001004" vb="1.0001355333"/>
++            <tca model="poly3" focal="28" br="0.00000895" vr="1.00008565" bb="-0.00009525" vb="1.000148"/>
++            <tca model="poly3" focal="35" br="0.00003525" vr="0.9999511" bb="-0.00006825" vb="1.00010915"/>
++            <tca model="poly3" focal="55" br="0.0000244" vr="0.9998108667" bb="-0.00006493" vb="1.0000237667"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.3742" k2="-0.5552" k3="0.2884"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.3742" k2="-0.5552" k3="0.2884"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3977" k2="0.2072" k3="-0.2849"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3977" k2="0.2072" k3="-0.2849"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.4182" k2="0.1620" k3="-0.1155"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.4182" k2="0.1620" k3="-0.1155"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.3967" k2="0.0370" k3="0.0107"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.3967" k2="0.0370" k3="0.0107"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.4056" k2="0.0409" k3="0.0119"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.4056" k2="0.0409" k3="0.0119"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-0.3195" k2="-0.6248" k3="0.3915"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.3195" k2="-0.6248" k3="0.3915"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.3313" k2="0.0514" k3="-0.1318"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.3313" k2="0.0514" k3="-0.1318"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.3761" k2="0.1084" k3="-0.0659"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.3761" k2="0.1084" k3="-0.0659"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.3652" k2="0.0261" k3="0.0185"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.3652" k2="0.0261" k3="0.0185"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.3667" k2="0.0249" k3="0.0183"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.3667" k2="0.0249" k3="0.0183"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.4385" k2="-0.1039" k3="0.0505"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.4385" k2="-0.1039" k3="0.0505"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3052" k2="0.1496" k3="-0.1592"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3052" k2="0.1496" k3="-0.1592"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2791" k2="-0.0097" k3="0.0249"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2791" k2="-0.0097" k3="0.0249"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2892" k2="-0.0006" k3="0.0229"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2892" k2="-0.0006" k3="0.0229"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2991" k2="0.0147" k3="0.0138"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2991" k2="0.0147" k3="0.0138"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.5586" k2="0.1981" k3="-0.0943"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.5586" k2="0.1981" k3="-0.0943"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2426" k2="0.0667" k3="-0.1102"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2426" k2="0.0667" k3="-0.1102"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2415" k2="-0.0123" k3="0.0217"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2415" k2="-0.0123" k3="0.0217"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2532" k2="0.0066" k3="0.0101"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2532" k2="0.0066" k3="0.0101"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2649" k2="0.0278" k3="-0.0035"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2649" k2="0.0278" k3="-0.0035"/>
++            <vignetting model="pa" focal="55" aperture="2.8" distance="10" k1="-0.8403" k2="1.0171" k3="-0.7026"/>
++            <vignetting model="pa" focal="55" aperture="2.8" distance="1000" k1="-0.8403" k2="1.0171" k3="-0.7026"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.1922" k2="0.0884" k3="-0.1961"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.1922" k2="0.0884" k3="-0.1961"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1910" k2="-0.0130" k3="0.0150"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1910" k2="-0.0130" k3="0.0150"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1985" k2="-0.0044" k3="0.0129"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1985" k2="-0.0044" k3="0.0129"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2180" k2="0.0341" k3="-0.0121"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2180" k2="0.0341" k3="-0.0121"/>
+         </calibration>
+     </lens>
+-   
+-       
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 17-85mm f/4-5.6 IS USM</model>
+         <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.021181" b="-0.055581" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.019344" b="-0.043786" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.015491" b="-0.026682" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.008084" b="-0.007472" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.005522" b="-0.001763" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.003149" b="0.002207" c="0" />
+-            <distortion model="ptlens" focal="44" a="0" b="0.008269" c="0" />
+-            <distortion model="ptlens" focal="53" a="0" b="0.008792" c="0" />
+-            <distortion model="ptlens" focal="61" a="0" b="0.00738" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.006226" c="0" />
+-            <distortion model="ptlens" focal="78" a="0" b="0.007095" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.007288" c="0" />
++            <distortion model="ptlens" focal="17" a="0.021181" b="-0.055581" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.019344" b="-0.043786" c="0"/>
++            <distortion model="ptlens" focal="22" a="0.015491" b="-0.026682" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.008084" b="-0.007472" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.005522" b="-0.001763" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.003149" b="0.002207" c="0"/>
++            <distortion model="ptlens" focal="44" a="0" b="0.008269" c="0"/>
++            <distortion model="ptlens" focal="53" a="0" b="0.008792" c="0"/>
++            <distortion model="ptlens" focal="61" a="0" b="0.00738" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0.006226" c="0"/>
++            <distortion model="ptlens" focal="78" a="0" b="0.007095" c="0"/>
++            <distortion model="ptlens" focal="85" a="0" b="0.007288" c="0"/>
++            <!-- Taken with Canon EOS 7D -->
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.9839" k2="0.7916" k3="-0.4822"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.9839" k2="0.7916" k3="-0.4822"/>
++            <vignetting model="pa" focal="17" aperture="4.5" distance="10" k1="-0.7345" k2="0.2128" k3="-0.1015"/>
++            <vignetting model="pa" focal="17" aperture="4.5" distance="1000" k1="-0.7345" k2="0.2128" k3="-0.1015"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="10" k1="-0.5452" k2="-0.0983" k3="0.0523"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-0.5452" k2="-0.0983" k3="0.0523"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.4403" k2="-0.0886" k3="-0.0269"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.4403" k2="-0.0886" k3="-0.0269"/>
++            <vignetting model="pa" focal="17" aperture="6.3" distance="10" k1="-0.4695" k2="0.0600" k3="-0.1363"/>
++            <vignetting model="pa" focal="17" aperture="6.3" distance="1000" k1="-0.4695" k2="0.0600" k3="-0.1363"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.5321" k2="0.0918" k3="-0.0032"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.5321" k2="0.0918" k3="-0.0032"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="-0.7861" k2="0.6158" k3="-0.3352"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="-0.7861" k2="0.6158" k3="-0.3352"/>
++            <vignetting model="pa" focal="26" aperture="5" distance="10" k1="-0.3821" k2="-0.2814" k3="0.2136"/>
++            <vignetting model="pa" focal="26" aperture="5" distance="1000" k1="-0.3821" k2="-0.2814" k3="0.2136"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="10" k1="-0.2601" k2="-0.3626" k3="0.2178"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.2601" k2="-0.3626" k3="0.2178"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="10" k1="-0.3475" k2="0.0315" k3="-0.0457"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="1000" k1="-0.3475" k2="0.0315" k3="-0.0457"/>
++            <vignetting model="pa" focal="26" aperture="7.1" distance="10" k1="-0.3460" k2="0.0516" k3="-0.0425"/>
++            <vignetting model="pa" focal="26" aperture="7.1" distance="1000" k1="-0.3460" k2="0.0516" k3="-0.0425"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="10" k1="-0.3237" k2="-0.0383" k3="0.0514"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.3237" k2="-0.0383" k3="0.0514"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="10" k1="-0.2917" k2="-0.1482" k3="0.1348"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="1000" k1="-0.2917" k2="-0.1482" k3="0.1348"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.2489" k2="-0.4374" k3="0.2732"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.2489" k2="-0.4374" k3="0.2732"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.1897" k2="-0.3641" k3="0.1873"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.1897" k2="-0.3641" k3="0.1873"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="10" k1="-0.3028" k2="0.0339" k3="-0.0509"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.3028" k2="0.0339" k3="-0.0509"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.3433" k2="0.1111" k3="-0.0859"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.3433" k2="0.1111" k3="-0.0859"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2702" k2="-0.0878" k3="0.0812"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2702" k2="-0.0878" k3="0.0812"/>
++            <vignetting model="pa" focal="28" aperture="25" distance="10" k1="-0.2877" k2="-0.0692" k3="0.0640"/>
++            <vignetting model="pa" focal="28" aperture="25" distance="1000" k1="-0.2877" k2="-0.0692" k3="0.0640"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.5035" k2="0.2321" k3="-0.1364"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.5035" k2="0.2321" k3="-0.1364"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1755" k2="-0.4534" k3="0.2687"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1755" k2="-0.4534" k3="0.2687"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.0985" k2="-0.3558" k3="0.1548"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.0985" k2="-0.3558" k3="0.1548"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1430" k2="-0.1712" k3="0.0376"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1430" k2="-0.1712" k3="0.0376"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1692" k2="-0.0942" k3="0.0275"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1692" k2="-0.0942" k3="0.0275"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.0922" k2="-0.3521" k3="0.2461"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.0922" k2="-0.3521" k3="0.2461"/>
++            <vignetting model="pa" focal="38" aperture="5" distance="10" k1="-0.5156" k2="0.2868" k3="-0.1743"/>
++            <vignetting model="pa" focal="38" aperture="5" distance="1000" k1="-0.5156" k2="0.2868" k3="-0.1743"/>
++            <vignetting model="pa" focal="38" aperture="5.6" distance="10" k1="-0.1714" k2="-0.4330" k3="0.2536"/>
++            <vignetting model="pa" focal="38" aperture="5.6" distance="1000" k1="-0.1714" k2="-0.4330" k3="0.2536"/>
++            <vignetting model="pa" focal="38" aperture="6.3" distance="10" k1="-0.1367" k2="-0.2364" k3="0.0784"/>
++            <vignetting model="pa" focal="38" aperture="6.3" distance="1000" k1="-0.1367" k2="-0.2364" k3="0.0784"/>
++            <vignetting model="pa" focal="38" aperture="7.1" distance="10" k1="-0.1878" k2="-0.0458" k3="-0.0404"/>
++            <vignetting model="pa" focal="38" aperture="7.1" distance="1000" k1="-0.1878" k2="-0.0458" k3="-0.0404"/>
++            <vignetting model="pa" focal="38" aperture="8" distance="10" k1="-0.2065" k2="0.0068" k3="-0.0323"/>
++            <vignetting model="pa" focal="38" aperture="8" distance="1000" k1="-0.2065" k2="0.0068" k3="-0.0323"/>
++            <vignetting model="pa" focal="38" aperture="29" distance="10" k1="-0.1656" k2="-0.1209" k3="0.0665"/>
++            <vignetting model="pa" focal="38" aperture="29" distance="1000" k1="-0.1656" k2="-0.1209" k3="0.0665"/>
++            <vignetting model="pa" focal="53" aperture="5.6" distance="10" k1="-0.4093" k2="0.2146" k3="-0.1754"/>
++            <vignetting model="pa" focal="53" aperture="5.6" distance="1000" k1="-0.4093" k2="0.2146" k3="-0.1754"/>
++            <vignetting model="pa" focal="53" aperture="6.3" distance="10" k1="-0.0500" k2="-0.3674" k3="0.1460"/>
++            <vignetting model="pa" focal="53" aperture="6.3" distance="1000" k1="-0.0500" k2="-0.3674" k3="0.1460"/>
++            <vignetting model="pa" focal="53" aperture="7.1" distance="10" k1="-0.0966" k2="-0.1491" k3="0.0173"/>
++            <vignetting model="pa" focal="53" aperture="7.1" distance="1000" k1="-0.0966" k2="-0.1491" k3="0.0173"/>
++            <vignetting model="pa" focal="53" aperture="8" distance="10" k1="-0.1148" k2="-0.0673" k3="0.0180"/>
++            <vignetting model="pa" focal="53" aperture="8" distance="1000" k1="-0.1148" k2="-0.0673" k3="0.0180"/>
++            <vignetting model="pa" focal="53" aperture="9" distance="10" k1="-0.0807" k2="-0.1719" k3="0.1151"/>
++            <vignetting model="pa" focal="53" aperture="9" distance="1000" k1="-0.0807" k2="-0.1719" k3="0.1151"/>
++            <vignetting model="pa" focal="53" aperture="10" distance="10" k1="-0.0692" k2="-0.2160" k3="0.1485"/>
++            <vignetting model="pa" focal="53" aperture="10" distance="1000" k1="-0.0692" k2="-0.2160" k3="0.1485"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="10" k1="-0.0497" k2="-0.2226" k3="0.1314"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.0497" k2="-0.2226" k3="0.1314"/>
++            <vignetting model="pa" focal="53" aperture="32" distance="10" k1="-0.0860" k2="-0.1878" k3="0.1212"/>
++            <vignetting model="pa" focal="53" aperture="32" distance="1000" k1="-0.0860" k2="-0.1878" k3="0.1212"/>
++            <vignetting model="pa" focal="72" aperture="5.6" distance="10" k1="-0.3860" k2="0.3683" k3="-0.3967"/>
++            <vignetting model="pa" focal="72" aperture="5.6" distance="1000" k1="-0.3860" k2="0.3683" k3="-0.3967"/>
++            <vignetting model="pa" focal="72" aperture="6.3" distance="10" k1="-0.0236" k2="-0.3146" k3="0.0228"/>
++            <vignetting model="pa" focal="72" aperture="6.3" distance="1000" k1="-0.0236" k2="-0.3146" k3="0.0228"/>
++            <vignetting model="pa" focal="72" aperture="7.1" distance="10" k1="-0.0635" k2="-0.1203" k3="-0.0597"/>
++            <vignetting model="pa" focal="72" aperture="7.1" distance="1000" k1="-0.0635" k2="-0.1203" k3="-0.0597"/>
++            <vignetting model="pa" focal="72" aperture="8" distance="10" k1="-0.0834" k2="-0.0302" k3="-0.0686"/>
++            <vignetting model="pa" focal="72" aperture="8" distance="1000" k1="-0.0834" k2="-0.0302" k3="-0.0686"/>
++            <vignetting model="pa" focal="72" aperture="9" distance="10" k1="-0.1124" k2="0.0418" k3="-0.0635"/>
++            <vignetting model="pa" focal="72" aperture="9" distance="1000" k1="-0.1124" k2="0.0418" k3="-0.0635"/>
++            <vignetting model="pa" focal="72" aperture="10" distance="10" k1="-0.0908" k2="-0.0947" k3="0.0638"/>
++            <vignetting model="pa" focal="72" aperture="10" distance="1000" k1="-0.0908" k2="-0.0947" k3="0.0638"/>
++            <vignetting model="pa" focal="72" aperture="32" distance="10" k1="-0.0655" k2="-0.1198" k3="0.0679"/>
++            <vignetting model="pa" focal="72" aperture="32" distance="1000" k1="-0.0655" k2="-0.1198" k3="0.0679"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="-0.3522" k2="0.3365" k3="-0.4201"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.3522" k2="0.3365" k3="-0.4201"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="10" k1="-0.0345" k2="-0.1606" k3="-0.1367"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="1000" k1="-0.0345" k2="-0.1606" k3="-0.1367"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="10" k1="-0.1223" k2="0.1673" k3="-0.3159"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="1000" k1="-0.1223" k2="0.1673" k3="-0.3159"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="10" k1="-0.0663" k2="0.0212" k3="-0.1476"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.0663" k2="0.0212" k3="-0.1476"/>
++            <vignetting model="pa" focal="85" aperture="9" distance="10" k1="-0.0582" k2="-0.0703" k3="0.0039"/>
++            <vignetting model="pa" focal="85" aperture="9" distance="1000" k1="-0.0582" k2="-0.0703" k3="0.0039"/>
++            <vignetting model="pa" focal="85" aperture="10" distance="10" k1="-0.0741" k2="-0.0821" k3="0.0460"/>
++            <vignetting model="pa" focal="85" aperture="10" distance="1000" k1="-0.0741" k2="-0.0821" k3="0.0460"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="10" k1="-0.0642" k2="-0.1014" k3="0.0585"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.0642" k2="-0.1014" k3="0.0585"/>
++            <vignetting model="pa" focal="85" aperture="32" distance="10" k1="-0.0592" k2="-0.1610" k3="0.1195"/>
++            <vignetting model="pa" focal="85" aperture="32" distance="1000" k1="-0.0592" k2="-0.1610" k3="0.1195"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 18-55mm f/3.5-5.6</model>
+         <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0" b="0.003658" c="-0.04063" />
+-            <distortion model="ptlens" focal="21" a="0" b="0.004255" c="-0.038513" />
+-            <distortion model="ptlens" focal="24" a="0" b="-0.000965" c="-0.019793" />
+-            <distortion model="ptlens" focal="27" a="0" b="0.001701" c="-0.014516" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.003199" c="-0.012047" />
+-            <distortion model="ptlens" focal="33" a="0" b="3.4e-05" c="-0.005236" />
+-            <distortion model="ptlens" focal="37" a="0" b="0.00556" c="-0.016032" />
+-            <distortion model="ptlens" focal="41" a="0" b="0.001585" c="-0.007594" />
+-            <distortion model="ptlens" focal="45" a="0" b="0.00577" c="-0.015688" />
+-            <distortion model="ptlens" focal="48" a="0" b="0.001543" c="-0.003821" />
+-            <distortion model="ptlens" focal="53" a="0" b="-0.001301" c="0.001515" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.000426" c="-0.001817" />
++            <distortion model="ptlens" focal="18" a="0" b="0.003658" c="-0.04063"/>
++            <distortion model="ptlens" focal="21" a="0" b="0.004255" c="-0.038513"/>
++            <distortion model="ptlens" focal="24" a="0" b="-0.000965" c="-0.019793"/>
++            <distortion model="ptlens" focal="27" a="0" b="0.001701" c="-0.014516"/>
++            <distortion model="ptlens" focal="30" a="0" b="0.003199" c="-0.012047"/>
++            <distortion model="ptlens" focal="33" a="0" b="3.4e-05" c="-0.005236"/>
++            <distortion model="ptlens" focal="37" a="0" b="0.00556" c="-0.016032"/>
++            <distortion model="ptlens" focal="41" a="0" b="0.001585" c="-0.007594"/>
++            <distortion model="ptlens" focal="45" a="0" b="0.00577" c="-0.015688"/>
++            <distortion model="ptlens" focal="48" a="0" b="0.001543" c="-0.003821"/>
++            <distortion model="ptlens" focal="53" a="0" b="-0.001301" c="0.001515"/>
++            <distortion model="ptlens" focal="55" a="0" b="0.000426" c="-0.001817"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 18-55mm f/3.5-5.6 IS II</model>
+         <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.02504" b="-0.06883" c="0.01502" />
+-            <distortion model="ptlens" focal="24" a="0.0203" b="-0.06514" c="0.04768" />
+-            <distortion model="ptlens" focal="29" a="0.00854" b="-0.01505" c="-0.00639" />
+-            <distortion model="ptlens" focal="35" a="-0.01582" b="0.04918" c="-0.05313" />
+-            <distortion model="ptlens" focal="41" a="-0.00694" b="0.02694" c="-0.03595" />
+-            <distortion model="ptlens" focal="46" a="-0.01908" b="0.07131" c="-0.08927" />
+-            <distortion model="ptlens" focal="55" a="-0.00098" b="0.01803" c="-0.04704" />
++            <distortion model="ptlens" focal="18" a="0.02504" b="-0.06883" c="0.01502"/>
++            <distortion model="ptlens" focal="24" a="0.0203" b="-0.06514" c="0.04768"/>
++            <distortion model="ptlens" focal="29" a="0.00854" b="-0.01505" c="-0.00639"/>
++            <distortion model="ptlens" focal="35" a="-0.01582" b="0.04918" c="-0.05313"/>
++            <distortion model="ptlens" focal="41" a="-0.00694" b="0.02694" c="-0.03595"/>
++            <distortion model="ptlens" focal="46" a="-0.01908" b="0.07131" c="-0.08927"/>
++            <distortion model="ptlens" focal="55" a="-0.00098" b="0.01803" c="-0.04704"/>
+             <tca model="poly3" focal="18" br="-0.0000920" vr="1.0002970" bb="0.0000982" vb="0.9999149"/>
+             <tca model="poly3" focal="24" br="0.0000221" vr="1.0001910" bb="0.0000350" vb="0.9999440"/>
+             <tca model="poly3" focal="35" br="-0.0000353" vr="1.0002159" bb="0.0000109" vb="1.0000923"/>
+-            <tca model="poly3" focal="55" br="-0.0000040" vr="0.9999122" bb="0.0000987" vb="1.0002719"/>            
++            <tca model="poly3" focal="55" br="-0.0000040" vr="0.9999122" bb="0.0000987" vb="1.0002719"/>
++            <!-- Taken with Canon 60D -->
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.0561" k2="1.0344" k3="-0.5153"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.0561" k2="1.0344" k3="-0.5153"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.2220" k2="-0.1411" k3="0.0360"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.2220" k2="-0.1411" k3="0.0360"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.2592" k2="-0.0288" k3="0.0454"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.2592" k2="-0.0288" k3="0.0454"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.2481" k2="-0.0590" k3="0.0718"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.2481" k2="-0.0590" k3="0.0718"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2556" k2="-0.0362" k3="0.0561"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2556" k2="-0.0362" k3="0.0561"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.0024" k2="0.9594" k3="-0.4295"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.0024" k2="0.9594" k3="-0.4295"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2052" k2="-0.0627" k3="0.0138"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2052" k2="-0.0627" k3="0.0138"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2174" k2="-0.0355" k3="0.0507"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2174" k2="-0.0355" k3="0.0507"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2221" k2="-0.0135" k3="0.0328"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2221" k2="-0.0135" k3="0.0328"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2271" k2="-0.0013" k3="0.0264"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2271" k2="-0.0013" k3="0.0264"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.8979" k2="0.8590" k3="-0.3739"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8979" k2="0.8590" k3="-0.3739"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.1705" k2="0.0095" k3="0.0034"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1705" k2="0.0095" k3="0.0034"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.1596" k2="-0.0276" k3="0.0402"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.1596" k2="-0.0276" k3="0.0402"/>
++            <vignetting model="pa" focal="35" aperture="13" distance="10" k1="-0.1628" k2="-0.0122" k3="0.0266"/>
++            <vignetting model="pa" focal="35" aperture="13" distance="1000" k1="-0.1628" k2="-0.0122" k3="0.0266"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.1697" k2="-0.0014" k3="0.0232"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1697" k2="-0.0014" k3="0.0232"/>
++            <vignetting model="pa" focal="44" aperture="5" distance="10" k1="-0.7801" k2="0.7126" k3="-0.3029"/>
++            <vignetting model="pa" focal="44" aperture="5" distance="1000" k1="-0.7801" k2="0.7126" k3="-0.3029"/>
++            <vignetting model="pa" focal="44" aperture="7.1" distance="10" k1="-0.1212" k2="-0.0367" k3="0.0421"/>
++            <vignetting model="pa" focal="44" aperture="7.1" distance="1000" k1="-0.1212" k2="-0.0367" k3="0.0421"/>
++            <vignetting model="pa" focal="44" aperture="10" distance="10" k1="-0.1182" k2="-0.0390" k3="0.0413"/>
++            <vignetting model="pa" focal="44" aperture="10" distance="1000" k1="-0.1182" k2="-0.0390" k3="0.0413"/>
++            <vignetting model="pa" focal="44" aperture="14" distance="10" k1="-0.1231" k2="-0.0185" k3="0.0234"/>
++            <vignetting model="pa" focal="44" aperture="14" distance="1000" k1="-0.1231" k2="-0.0185" k3="0.0234"/>
++            <vignetting model="pa" focal="44" aperture="32" distance="10" k1="-0.1287" k2="-0.0104" k3="0.0195"/>
++            <vignetting model="pa" focal="44" aperture="32" distance="1000" k1="-0.1287" k2="-0.0104" k3="0.0195"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6591" k2="0.5689" k3="-0.2458"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6591" k2="0.5689" k3="-0.2458"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1094" k2="0.0203" k3="-0.0134"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1094" k2="0.0203" k3="-0.0134"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0920" k2="-0.0433" k3="0.0418"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0920" k2="-0.0433" k3="0.0418"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.0963" k2="-0.0311" k3="0.0313"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.0963" k2="-0.0311" k3="0.0313"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.1112" k2="-0.0014" k3="0.0113"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.1112" k2="-0.0014" k3="0.0113"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 18-55mm f/3.5-5.6 III</model>
+         <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.00029" b="-0.00065" c="-0.04054" />
+-            <distortion model="ptlens" focal="20" a="0.00913" b="-0.024255" c="-0.02326" />
+-            <distortion model="ptlens" focal="21" a="0.0219" b="-0.05865" c="0.01747" />
+-            <distortion model="ptlens" focal="24" a="0.02945" b="-0.07112" c="0.02358" />
+-            <distortion model="ptlens" focal="27" a="-0.00225" b="0.00421" c="-0.02519" />
+-            <distortion model="ptlens" focal="28" a="0.00888" b="-0.02851" c="0.00655" />
+-            <distortion model="ptlens" focal="29" a="-0.00423" b="0.01103" c="-0.02517" />
+-            <distortion model="ptlens" focal="30" a="-0.02064" b="0.0652" c="-0.07411" />
+-            <distortion model="ptlens" focal="33" a="0.00378" b="-0.00627" c="-0.00869" />
+-            <distortion model="ptlens" focal="34" a="0.00579" b="-0.01787" c="0.00697" />
+-            <distortion model="ptlens" focal="36" a="0.00139" b="0.00016" c="-0.00891" />
+-            <distortion model="ptlens" focal="37" a="-0.01074" b="0.01955" c="0.00324" />
+-            <distortion model="ptlens" focal="40" a="-0.00209" b="-0.00426" c="-0.01103" />
+-            <distortion model="ptlens" focal="41" a="-0.00308" b="0.01968" c="-0.03451" />
+-            <distortion model="ptlens" focal="43" a="-0.00935" b="0.02372" c="-0.03174" />
+-            <distortion model="ptlens" focal="44" a="0.00283" b="0.00211" c="-0.01406" />
+-            <distortion model="ptlens" focal="47" a="-0.01247" b="0.03006" c="-0.01156" />
+-            <distortion model="ptlens" focal="49" a="0.00841" b="-0.04436" c="0.06329" />
+-            <distortion model="ptlens" focal="53" a="0.00359" b="-0.01264" c="0.01563" />
+-            <distortion model="ptlens" focal="55" a="-0.0117" b="0.03217" c="-0.02069" />
++            <distortion model="ptlens" focal="18" a="0.00029" b="-0.00065" c="-0.04054"/>
++            <distortion model="ptlens" focal="20" a="0.00913" b="-0.024255" c="-0.02326"/>
++            <distortion model="ptlens" focal="21" a="0.0219" b="-0.05865" c="0.01747"/>
++            <distortion model="ptlens" focal="24" a="0.02945" b="-0.07112" c="0.02358"/>
++            <distortion model="ptlens" focal="27" a="-0.00225" b="0.00421" c="-0.02519"/>
++            <distortion model="ptlens" focal="28" a="0.00888" b="-0.02851" c="0.00655"/>
++            <distortion model="ptlens" focal="29" a="-0.00423" b="0.01103" c="-0.02517"/>
++            <distortion model="ptlens" focal="30" a="-0.02064" b="0.0652" c="-0.07411"/>
++            <distortion model="ptlens" focal="33" a="0.00378" b="-0.00627" c="-0.00869"/>
++            <distortion model="ptlens" focal="34" a="0.00579" b="-0.01787" c="0.00697"/>
++            <distortion model="ptlens" focal="36" a="0.00139" b="0.00016" c="-0.00891"/>
++            <distortion model="ptlens" focal="37" a="-0.01074" b="0.01955" c="0.00324"/>
++            <distortion model="ptlens" focal="40" a="-0.00209" b="-0.00426" c="-0.01103"/>
++            <distortion model="ptlens" focal="41" a="-0.00308" b="0.01968" c="-0.03451"/>
++            <distortion model="ptlens" focal="43" a="-0.00935" b="0.02372" c="-0.03174"/>
++            <distortion model="ptlens" focal="44" a="0.00283" b="0.00211" c="-0.01406"/>
++            <distortion model="ptlens" focal="47" a="-0.01247" b="0.03006" c="-0.01156"/>
++            <distortion model="ptlens" focal="49" a="0.00841" b="-0.04436" c="0.06329"/>
++            <distortion model="ptlens" focal="53" a="0.00359" b="-0.01264" c="0.01563"/>
++            <distortion model="ptlens" focal="55" a="-0.0117" b="0.03217" c="-0.02069"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 18-55mm f/3.5-5.6 IS STM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 650D -->
++            <distortion model="ptlens" focal="18" a="0.01786" b="-0.05378" c="0.01216"/>
++            <distortion model="ptlens" focal="24" a="0.0064" b="-0.02273" c="0.00328"/>
++            <distortion model="ptlens" focal="35" a="0" b="-0.00137" c="0"/>
++            <distortion model="ptlens" focal="43" a="0" b="0.00011" c="0"/>
++            <distortion model="ptlens" focal="55" a="0" b="-0.00012" c="0"/>
++            <tca model="poly3" focal="18" br="-0.0003128" vr="1.0007525" bb="0.0002958" vb="0.9996711"/>
++            <tca model="poly3" focal="24" br="-0.0001237" vr="1.0005359" bb="0.0001253" vb="0.9997927"/>
++            <tca model="poly3" focal="35" br="-0.0000215" vr="1.0001845" bb="0.0000311" vb="0.9999607"/>
++            <tca model="poly3" focal="43" br="-0.0000179" vr="1.0000762" bb="-0.0000077" vb="1.0000989"/>
++            <tca model="poly3" focal="55" br="-0.0000044" vr="0.9999721" bb="0.0000116" vb="1.0001682"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.2310" k2="1.1507" k3="-0.5518"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.2310" k2="1.1507" k3="-0.5518"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.6610" k2="0.0708" k3="0.0281"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.6610" k2="0.0708" k3="0.0281"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2474" k2="-0.1020" k3="-0.0253"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2474" k2="-0.1020" k3="-0.0253"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2978" k2="0.0609" k3="-0.0342"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2978" k2="0.0609" k3="-0.0342"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2600" k2="-0.0548" k3="0.0630"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2600" k2="-0.0548" k3="0.0630"/>
++            <vignetting model="pa" focal="20" aperture="3.5" distance="10" k1="-1.2072" k2="1.1094" k3="-0.5115"/>
++            <vignetting model="pa" focal="20" aperture="3.5" distance="1000" k1="-1.2072" k2="1.1094" k3="-0.5115"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.5605" k2="-0.1036" k3="0.1414"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.5605" k2="-0.1036" k3="0.1414"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.2422" k2="-0.1012" k3="0.0124"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.2422" k2="-0.1012" k3="0.0124"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.2701" k2="-0.0657" k3="0.0976"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.2701" k2="-0.0657" k3="0.0976"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.2495" k2="-0.1178" k3="0.1350"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.2495" k2="-0.1178" k3="0.1350"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.2295" k2="-0.1696" k3="0.1705"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.2295" k2="-0.1696" k3="0.1705"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.1357" k2="1.0683" k3="-0.4894"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.1357" k2="1.0683" k3="-0.4894"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2295" k2="-0.0672" k3="-0.0057"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2295" k2="-0.0672" k3="-0.0057"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2905" k2="0.0785" k3="-0.0092"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2905" k2="0.0785" k3="-0.0092"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2863" k2="0.0372" k3="0.0264"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2863" k2="0.0372" k3="0.0264"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.3434" k2="0.2425" k3="-0.1344"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3434" k2="0.2425" k3="-0.1344"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.7374" k2="0.3860" k3="-0.0945"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.7374" k2="0.3860" k3="-0.0945"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.1209" k2="-0.0993" k3="0.0046"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.1209" k2="-0.0993" k3="0.0046"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.1718" k2="0.0249" k3="-0.0101"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1718" k2="0.0249" k3="-0.0101"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.1792" k2="0.0388" k3="-0.0182"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1792" k2="0.0388" k3="-0.0182"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="10" k1="-0.1847" k2="0.0566" k3="-0.0291"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1847" k2="0.0566" k3="-0.0291"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.5452" k2="0.3102" k3="-0.1191"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.5452" k2="0.3102" k3="-0.1191"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0469" k2="-0.1196" k3="0.0643"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0469" k2="-0.1196" k3="0.0643"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0339" k2="-0.1609" k3="0.1004"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0339" k2="-0.1609" k3="0.1004"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.1795" k2="0.1558" k3="-0.0968"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1795" k2="0.1558" k3="-0.0968"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.1913" k2="0.2738" k3="-0.2032"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.1913" k2="0.2738" k3="-0.2032"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 20mm f/2.8 USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="20" a="0.02466" b="-0.05795" c="0.0166"/>
++            <tca model="poly3" focal="20" br="-0.0000976" vr="1.0012100" bb="0.0002552" vb="0.9997696"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.25" k1="-2.3970" k2="2.8162" k3="-1.2656"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.5" k1="-2.5125" k2="3.0085" k3="-1.3604"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1.5" k1="-2.5469" k2="3.0626" k3="-1.3862"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-2.5588" k2="3.0797" k3="-1.3937"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.25" k1="-0.5545" k2="-0.8384" k3="0.6946"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.5" k1="-0.6574" k2="-0.7715" k3="0.7019"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1.5" k1="-0.6915" k2="-0.7442" k3="0.6976"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.7031" k2="-0.7323" k3="0.6934"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.25" k1="-0.7095" k2="0.2494" k3="-0.0968"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.5" k1="-0.7336" k2="0.2004" k3="-0.0623"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1.5" k1="-0.7465" k2="0.1937" k3="-0.0548"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.7506" k2="0.1885" k3="-0.0489"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.25" k1="-0.7156" k2="0.2058" k3="0.0222"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.5" k1="-0.7709" k2="0.2694" k3="-0.0130"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1.5" k1="-0.7917" k2="0.2982" k3="-0.0330"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.7966" k2="0.2971" k3="-0.0295"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="0.25" k1="-0.7254" k2="0.2327" k3="0.0058"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="0.5" k1="-0.7662" k2="0.2539" k3="0.0043"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1.5" k1="-0.7861" k2="0.2741" k3="-0.0049"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.7929" k2="0.2800" k3="-0.0074"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 24-70mm f/2.8L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.015298" b="-0.039413" c="0" />
+-            <distortion model="ptlens" focal="27" a="0.014041" b="-0.034436" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.013341" b="-0.031051" c="0" />
+-            <distortion model="ptlens" focal="34" a="0.006539" b="-0.01539" c="0" />
+-            <distortion model="ptlens" focal="38" a="0.003138" b="-0.007742" c="0" />
+-            <distortion model="ptlens" focal="43" a="0" b="0.000233" c="0" />
+-            <distortion model="ptlens" focal="48" a="0" b="0.00151" c="0" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.003988" c="0" />
+-            <distortion model="ptlens" focal="64" a="0" b="0.005787" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.006294" c="0" />
++            <distortion model="ptlens" focal="24" a="0.015298" b="-0.039413" c="0"/>
++            <distortion model="ptlens" focal="27" a="0.014041" b="-0.034436" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.013341" b="-0.031051" c="0"/>
++            <distortion model="ptlens" focal="34" a="0.006539" b="-0.01539" c="0"/>
++            <distortion model="ptlens" focal="38" a="0.003138" b="-0.007742" c="0"/>
++            <distortion model="ptlens" focal="43" a="0" b="0.000233" c="0"/>
++            <distortion model="ptlens" focal="48" a="0" b="0.00151" c="0"/>
++            <distortion model="ptlens" focal="55" a="0" b="0.003988" c="0"/>
++            <distortion model="ptlens" focal="64" a="0" b="0.005787" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.006294" c="0"/>
++            <!-- Taken with Canon 5D -->
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.9888" k2="-0.0305" k3="0.2650"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.9888" k2="-0.0305" k3="0.2650"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3697" k2="-0.2238" k3="-0.0067"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3697" k2="-0.2238" k3="-0.0067"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4863" k2="0.2192" k3="-0.2323"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4863" k2="0.2192" k3="-0.2323"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.4941" k2="0.1835" k3="-0.1135"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.4941" k2="0.1835" k3="-0.1135"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.4434" k2="-0.0021" k3="0.0534"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.4434" k2="-0.0021" k3="0.0534"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.4429" k2="-0.0034" k3="0.0551"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.4429" k2="-0.0034" k3="0.0551"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.4403" k2="-0.0062" k3="0.0569"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.4403" k2="-0.0062" k3="0.0569"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.8533" k2="-0.2821" k3="0.4327"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.8533" k2="-0.2821" k3="0.4327"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2937" k2="-0.3523" k3="0.1342"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2937" k2="-0.3523" k3="0.1342"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.4525" k2="0.2269" k3="-0.2190"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.4525" k2="0.2269" k3="-0.2190"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.4231" k2="0.0657" k3="-0.0169"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.4231" k2="0.0657" k3="-0.0169"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.4032" k2="-0.0039" k3="0.0439"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.4032" k2="-0.0039" k3="0.0439"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.4050" k2="0.0024" k3="0.0398"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.4050" k2="0.0024" k3="0.0398"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.4018" k2="-0.0035" k3="0.0433"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.4018" k2="-0.0035" k3="0.0433"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.7997" k2="-0.0741" k3="0.2267"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.7997" k2="-0.0741" k3="0.2267"/>
++            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.2868" k2="-0.0469" k3="-0.0883"/>
++            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.2868" k2="-0.0469" k3="-0.0883"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.3852" k2="0.2470" k3="-0.1909"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.3852" k2="0.2470" k3="-0.1909"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.3403" k2="0.0725" k3="-0.0229"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.3403" k2="0.0725" k3="-0.0229"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.3454" k2="0.0825" k3="-0.0281"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.3454" k2="0.0825" k3="-0.0281"/>
++            <vignetting model="pa" focal="34" aperture="16" distance="10" k1="-0.3460" k2="0.0831" k3="-0.0274"/>
++            <vignetting model="pa" focal="34" aperture="16" distance="1000" k1="-0.3460" k2="0.0831" k3="-0.0274"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.3503" k2="0.0927" k3="-0.0321"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.3503" k2="0.0927" k3="-0.0321"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.7645" k2="0.2124" k3="-0.0599"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.7645" k2="0.2124" k3="-0.0599"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2928" k2="0.3145" k3="-0.3958"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2928" k2="0.3145" k3="-0.3958"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2870" k2="0.1682" k3="-0.0911"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2870" k2="0.1682" k3="-0.0911"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2798" k2="0.1349" k3="-0.0553"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2798" k2="0.1349" k3="-0.0553"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2742" k2="0.1190" k3="-0.0422"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2742" k2="0.1190" k3="-0.0422"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2701" k2="0.1099" k3="-0.0360"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2701" k2="0.1099" k3="-0.0360"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2744" k2="0.1198" k3="-0.0419"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2744" k2="0.1198" k3="-0.0419"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-1.3498" k2="1.4523" k3="-0.7216"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-1.3498" k2="1.4523" k3="-0.7216"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.1385" k2="-0.4638" k3="0.2291"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1385" k2="-0.4638" k3="0.2291"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.3035" k2="0.2661" k3="-0.2199"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3035" k2="0.2661" k3="-0.2199"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2626" k2="0.0784" k3="-0.0101"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2626" k2="0.0784" k3="-0.0101"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2638" k2="0.0780" k3="-0.0078"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2638" k2="0.0780" k3="-0.0078"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.2627" k2="0.0739" k3="-0.0047"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2627" k2="0.0739" k3="-0.0047"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2704" k2="0.0892" k3="-0.0132"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2704" k2="0.0892" k3="-0.0132"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 24-85mm f/3.5-4.5 USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D -->
++            <distortion model="ptlens" focal="24" a="0.031698" b="-0.089701" c="0.043822"/>
++            <distortion model="ptlens" focal="28" a="0.02534" b="-0.06592" c="0.034411"/>
++            <distortion model="ptlens" focal="37" a="0.017702" b="-0.04333" c="0.038594"/>
++            <distortion model="ptlens" focal="48" a="0.006375" b="-0.006867" c="0.014446"/>
++            <distortion model="ptlens" focal="68" a="0.005346" b="-0.003421" c="0.013141"/>
++            <distortion model="ptlens" focal="85" a="0.00492" b="-0.000938" c="0.009196"/>
++            <tca model="poly3" focal="24" br="-0.0000683" vr="1.0002047" bb="-0.0000003" vb="1.0000497"/>
++            <tca model="poly3" focal="28" br="-0.0000673" vr="1.0001701" bb="0.0000428" vb="1.0000321"/>
++            <tca model="poly3" focal="35" br="-0.0000631" vr="1.0001213" bb="0.0001327" vb="0.9999744"/>
++            <tca model="poly3" focal="50" br="-0.0000764" vr="1.0000570" bb="0.0001481" vb="0.9999386"/>
++            <tca model="poly3" focal="70" br="-0.0001230" vr="1.0000388" bb="0.0001095" vb="0.9999002"/>
++            <tca model="poly3" focal="85" br="-0.0000913" vr="0.9999650" bb="0.0000556" vb="0.9999043"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="0.5" k1="-0.3676" k2="-1.2315" k3="0.7757"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="1" k1="-0.3807" k2="-1.1800" k3="0.7548"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.4347" k2="-1.0079" k3="0.6519"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1" k1="-0.6565" k2="-0.3662" k3="0.2147"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6520" k2="-0.2640" k3="0.1429"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.5" k1="-0.6912" k2="0.4393" k3="-0.4878"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1" k1="-0.6291" k2="0.3176" k3="-0.3660"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6719" k2="0.3679" k3="-0.3441"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.5" k1="-0.7323" k2="0.5714" k3="-0.4346"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1" k1="-0.6984" k2="0.4494" k3="-0.2828"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6233" k2="0.2334" k3="-0.1234"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.5" k1="-0.6427" k2="0.2005" k3="-0.0553"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1" k1="-0.6561" k2="0.1854" k3="-0.0052"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.6405" k2="0.1834" k3="-0.0003"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="0.5" k1="-0.6502" k2="0.1965" k3="-0.0050"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1" k1="-0.6343" k2="0.1515" k3="0.0215"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.6474" k2="0.2208" k3="-0.0092"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.5" k1="-0.6556" k2="0.1848" k3="-0.0036"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1" k1="-0.6677" k2="0.1970" k3="-0.0038"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.6526" k2="0.1755" k3="0.0009"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="0.5" k1="-0.4977" k2="-0.5601" k3="0.3353"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1" k1="-0.5408" k2="-0.2844" k3="0.1061"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.5704" k2="-0.1098" k3="-0.0196"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.5" k1="-0.6596" k2="0.4286" k3="-0.3200"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1" k1="-0.6301" k2="0.4046" k3="-0.3366"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.7033" k2="0.5406" k3="-0.4147"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.5" k1="-0.6746" k2="0.3317" k3="-0.1137"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1" k1="-0.5883" k2="0.1723" k3="-0.0368"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6693" k2="0.3287" k3="-0.1226"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="0.5" k1="-0.6223" k2="0.1751" k3="0.0182"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1" k1="-0.6055" k2="0.1353" k3="0.0389"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.6084" k2="0.1569" k3="0.0277"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="0.5" k1="-0.6125" k2="0.1402" k3="0.0374"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1" k1="-0.6102" k2="0.1484" k3="0.0297"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.6238" k2="0.1954" k3="0.0106"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.5" k1="-0.6229" k2="0.1634" k3="0.0085"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1" k1="-0.6231" k2="0.1622" k3="0.0218"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.6524" k2="0.2524" k3="-0.0150"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.5" k1="-0.7889" k2="0.8383" k3="-0.7185"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.8513" k2="1.1055" k3="-0.9170"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.6829" k2="0.7019" k3="-0.5476"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.6416" k2="0.6564" k3="-0.5353"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.5978" k2="0.2870" k3="-0.1029"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.6263" k2="0.3655" k3="-0.1481"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.5943" k2="0.2163" k3="-0.0046"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5720" k2="0.1643" k3="0.0177"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.5" k1="-0.5887" k2="0.1863" k3="0.0123"/>
++            <vignetting model="pa" focal="35" aperture="18" distance="1" k1="-0.5844" k2="0.1880" k3="0.0133"/>
++            <vignetting model="pa" focal="35" aperture="18" distance="1000" k1="-0.5844" k2="0.1880" k3="0.0133"/>
++            <vignetting model="pa" focal="35" aperture="25" distance="0.5" k1="-0.6088" k2="0.2184" k3="-0.0057"/>
++            <vignetting model="pa" focal="35" aperture="25" distance="1000" k1="-0.6062" k2="0.2269" k3="-0.0170"/>
++            <vignetting model="pa" focal="37" aperture="4" distance="1" k1="-0.8030" k2="0.9297" k3="-0.7978"/>
++            <vignetting model="pa" focal="37" aperture="5.6" distance="1" k1="-0.7035" k2="0.8084" k3="-0.6172"/>
++            <vignetting model="pa" focal="37" aperture="8" distance="1" k1="-0.5872" k2="0.3046" k3="-0.1158"/>
++            <vignetting model="pa" focal="37" aperture="11" distance="1" k1="-0.5660" k2="0.1758" k3="0.0103"/>
++            <vignetting model="pa" focal="37" aperture="16" distance="1" k1="-0.5561" k2="0.1464" k3="0.0309"/>
++            <vignetting model="pa" focal="37" aperture="25" distance="1" k1="-0.5610" k2="0.1636" k3="0.0127"/>
++            <vignetting model="pa" focal="48" aperture="4" distance="1" k1="-1.0590" k2="1.4519" k3="-1.0900"/>
++            <vignetting model="pa" focal="48" aperture="4" distance="1000" k1="-0.9853" k2="1.2257" k3="-0.9250"/>
++            <vignetting model="pa" focal="48" aperture="5.6" distance="1" k1="-0.6396" k2="0.7028" k3="-0.6068"/>
++            <vignetting model="pa" focal="48" aperture="5.6" distance="1000" k1="-0.5478" k2="0.4771" k3="-0.4463"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="0.5" k1="-0.6864" k2="0.8715" k3="-0.6264"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="1" k1="-0.6123" k2="0.6131" k3="-0.4082"/>
++            <vignetting model="pa" focal="48" aperture="8" distance="1000" k1="-0.5586" k2="0.4189" k3="-0.2421"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="0.5" k1="-0.6043" k2="0.5205" k3="-0.2920"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="1" k1="-0.5327" k2="0.2636" k3="-0.0800"/>
++            <vignetting model="pa" focal="48" aperture="11" distance="1000" k1="-0.4593" k2="0.0860" k3="0.0380"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="0.5" k1="-0.5318" k2="0.2445" k3="-0.0549"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="1" k1="-0.5263" k2="0.2065" k3="-0.0079"/>
++            <vignetting model="pa" focal="48" aperture="16" distance="1000" k1="-0.4823" k2="0.1165" k3="0.0433"/>
++            <vignetting model="pa" focal="48" aperture="29" distance="0.5" k1="-0.5193" k2="0.1671" k3="0.0137"/>
++            <vignetting model="pa" focal="48" aperture="29" distance="1" k1="-0.5286" k2="0.1811" k3="0.0059"/>
++            <vignetting model="pa" focal="48" aperture="29" distance="1000" k1="-0.5374" k2="0.2033" k3="-0.0106"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="0.5" k1="-1.1865" k2="1.8374" k3="-1.3677"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.5" k1="-0.7842" k2="1.0227" k3="-0.8452"/>
++            <vignetting model="pa" focal="68" aperture="4.5" distance="0.5" k1="-1.2296" k2="1.8099" k3="-1.3673"/>
++            <vignetting model="pa" focal="68" aperture="4.5" distance="1000" k1="-1.0083" k2="1.0578" k3="-0.7696"/>
++            <vignetting model="pa" focal="68" aperture="5.6" distance="0.5" k1="-0.6903" k2="0.8803" k3="-0.8540"/>
++            <vignetting model="pa" focal="68" aperture="5.6" distance="1000" k1="-0.5788" k2="0.4348" k3="-0.4409"/>
++            <vignetting model="pa" focal="68" aperture="8" distance="0.5" k1="-0.7958" k2="1.3977" k3="-1.1023"/>
++            <vignetting model="pa" focal="68" aperture="8" distance="1000" k1="-0.5959" k2="0.6501" k3="-0.4554"/>
++            <vignetting model="pa" focal="68" aperture="11" distance="0.5" k1="-0.6902" k2="1.0298" k3="-0.7790"/>
++            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.4788" k2="0.2282" k3="-0.0753"/>
++            <vignetting model="pa" focal="68" aperture="16" distance="0.5" k1="-0.5679" k2="0.5611" k3="-0.3608"/>
++            <vignetting model="pa" focal="68" aperture="16" distance="1000" k1="-0.4573" k2="0.1229" k3="0.0327"/>
++            <vignetting model="pa" focal="68" aperture="32" distance="0.5" k1="-0.5310" k2="0.3020" k3="-0.0858"/>
++            <vignetting model="pa" focal="68" aperture="32" distance="1000" k1="-0.5057" k2="0.2235" k3="-0.0251"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1" k1="-1.0184" k2="1.1626" k3="-0.8838"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1" k1="-0.5521" k2="0.4536" k3="-0.5040"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.5571" k2="0.6718" k3="-0.5304"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="-0.5378" k2="0.4305" k3="-0.2322"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="-0.4607" k2="0.1536" k3="0.0070"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1" k1="-0.4870" k2="0.1914" k3="-0.0090"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="0.5" k1="-1.0155" k2="1.1996" k3="-1.0058"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="1" k1="-0.9227" k2="0.8165" k3="-0.6653"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="1000" k1="-0.8461" k2="0.4738" k3="-0.3631"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="0.5" k1="-0.8041" k2="0.9145" k3="-0.8693"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1" k1="-0.6536" k2="0.3998" k3="-0.4548"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.6141" k2="0.1866" k3="-0.2361"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="0.5" k1="-0.7380" k2="1.4380" k3="-1.2802"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1" k1="-0.6205" k2="0.9477" k3="-0.8445"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.5929" k2="0.7496" k3="-0.6245"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="0.5" k1="-0.7237" k2="1.3069" k3="-1.0771"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1" k1="-0.5941" k2="0.7543" k3="-0.5645"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.5192" k2="0.4003" k3="-0.2189"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="0.5" k1="-0.7377" k2="1.1864" k3="-0.8915"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1" k1="-0.5054" k2="0.3828" k3="-0.2078"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.4427" k2="0.1288" k3="0.0161"/>
++            <vignetting model="pa" focal="85" aperture="32" distance="1" k1="-0.4934" k2="0.2063" k3="-0.0192"/>
++            <vignetting model="pa" focal="85" aperture="32" distance="1000" k1="-0.4840" k2="0.2044" k3="-0.0245"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 24-85mm f/3.5-4.5 USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.005763" b="-0.022311" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.002537" b="-0.01074" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="48" a="0" b="0.004254" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.005312" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.004512" c="0" />
++            <distortion model="ptlens" focal="24" a="0.005763" b="-0.022311" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.002537" b="-0.01074" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="48" a="0" b="0.004254" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.005312" c="0"/>
++            <distortion model="ptlens" focal="85" a="0" b="0.004512" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 28-70mm f/2.8L</model>
++        <model>Canon EF 28-70mm f/2.8L USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="-0.001744" b="0.000657" c="0" />
+-            <distortion model="ptlens" focal="32" a="0.003058" b="-0.013232" c="0" />
+-            <distortion model="ptlens" focal="35" a="-0.004696" b="0.007063" c="0" />
+-            <distortion model="ptlens" focal="39" a="0.00011" b="-0.002166" c="0" />
+-            <distortion model="ptlens" focal="44" a="-0.001271" b="0.001861" c="0" />
+-            <distortion model="ptlens" focal="50" a="-0.006466" b="0.014612" c="0" />
+-            <distortion model="ptlens" focal="60" a="-0.001227" b="0.003723" c="0" />
+-            <distortion model="ptlens" focal="70" a="-0.001929" b="0.005136" c="0" />
++            <distortion model="ptlens" focal="28" a="-0.001744" b="0.000657" c="0"/>
++            <distortion model="ptlens" focal="32" a="0.003058" b="-0.013232" c="0"/>
++            <distortion model="ptlens" focal="35" a="-0.004696" b="0.007063" c="0"/>
++            <distortion model="ptlens" focal="39" a="0.00011" b="-0.002166" c="0"/>
++            <distortion model="ptlens" focal="44" a="-0.001271" b="0.001861" c="0"/>
++            <distortion model="ptlens" focal="50" a="-0.006466" b="0.014612" c="0"/>
++            <distortion model="ptlens" focal="60" a="-0.001227" b="0.003723" c="0"/>
++            <distortion model="ptlens" focal="70" a="-0.001929" b="0.005136" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 24-105mm f/4L IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.017263" b="-0.049244" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.010878" b="-0.024454" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.007152" b="-0.009799" c="0" />
+-            <distortion model="ptlens" focal="50" a="0.002502" b="0.004803" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.009685" c="0" />
+-            <distortion model="ptlens" focal="88" a="0" b="0.008781" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.009598" c="0" />
++            <distortion model="ptlens" focal="24" a="0.017263" b="-0.049244" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.010878" b="-0.024454" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.007152" b="-0.009799" c="0"/>
++            <distortion model="ptlens" focal="50" a="0.002502" b="0.004803" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.009685" c="0"/>
++            <distortion model="ptlens" focal="88" a="0" b="0.008781" c="0"/>
++            <distortion model="ptlens" focal="105" a="0" b="0.009598" c="0"/>
++            <!-- Taken with Canon 5D Mark III -->
++            <tca model="poly3" focal="24" br="-0.0000336" vr="1.0011673" bb="-0.0000857" vb="1.0001820"/>
++            <tca model="poly3" focal="28" br="-0.0000198" vr="1.0009538" bb="-0.0000780" vb="1.0001947"/>
++            <tca model="poly3" focal="35" br="0.0000238" vr="1.0006733" bb="-0.0000900" vb="1.0002139"/>
++            <tca model="poly3" focal="45" br="0.0000790" vr="1.0003749" bb="-0.0000725" vb="1.0001305"/>
++            <tca model="poly3" focal="50" br="0.0000550" vr="1.0001985" bb="-0.0001125" vb="1.0000939"/>
++            <tca model="poly3" focal="60" br="0.0000537" vr="0.9999940" bb="-0.0001371" vb="1.0000645"/>
++            <tca model="poly3" focal="70" br="0.0000545" vr="0.9998413" bb="-0.0001606" vb="0.9999358"/>
++            <tca model="poly3" focal="88" br="0.0000129" vr="0.9995321" bb="-0.0002706" vb="0.9999391"/>
++            <tca model="poly3" focal="105" br="0.0000381" vr="0.9991735" bb="-0.0001974" vb="0.9998595"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.45" k1="-0.4795" k2="-0.5164" k3="0.1168"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.9" k1="-0.5099" k2="-0.3593" k3="0.0100"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="2.7" k1="-0.5210" k2="-0.3005" k3="-0.0331"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.5460" k2="-0.2245" k3="-0.0825"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.45" k1="-0.5434" k2="-0.0220" k3="-0.2734"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.9" k1="-0.5925" k2="0.1920" k3="-0.4102"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="2.7" k1="-0.6105" k2="0.2702" k3="-0.4657"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6251" k2="0.3124" k3="-0.4911"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.45" k1="-0.7341" k2="0.6702" k3="-0.7376"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.9" k1="-0.7582" k2="0.7674" k3="-0.7682"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="2.7" k1="-0.7783" k2="0.8378" k3="-0.8121"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.7823" k2="0.8454" k3="-0.8131"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.45" k1="-0.8706" k2="1.1062" k3="-1.0123"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.9" k1="-0.8371" k2="0.9860" k3="-0.8679"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="2.7" k1="-0.8344" k2="0.9810" k3="-0.8608"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.8340" k2="0.9778" k3="-0.8568"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="0.45" k1="-0.9126" k2="1.2016" k3="-1.0358"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="0.9" k1="-0.8199" k2="0.8728" k3="-0.7322"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="2.7" k1="-0.8124" k2="0.8533" k3="-0.7189"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.8099" k2="0.8471" k3="-0.7154"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.45" k1="-0.8999" k2="1.1258" k3="-0.9507"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.9" k1="-0.7940" k2="0.7596" k3="-0.6258"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="2.7" k1="-0.8030" k2="0.8024" k3="-0.6672"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.8041" k2="0.8095" k3="-0.6743"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.45" k1="-0.5671" k2="-0.1074" k3="0.0934"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.9" k1="-0.5570" k2="-0.0974" k3="0.0827"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="2.7" k1="-0.5699" k2="-0.0408" k3="0.0282"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6054" k2="0.0282" k3="-0.0163"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.45" k1="-0.6116" k2="0.3685" k3="-0.2226"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.9" k1="-0.6017" k2="0.3878" k3="-0.2407"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="2.7" k1="-0.6215" k2="0.4488" k3="-0.2954"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.6418" k2="0.5034" k3="-0.3355"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.45" k1="-0.5971" k2="0.3002" k3="-0.1550"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.9" k1="-0.5770" k2="0.2770" k3="-0.1328"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="2.7" k1="-0.5849" k2="0.2941" k3="-0.1483"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.6029" k2="0.3432" k3="-0.1836"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.45" k1="-0.5999" k2="0.2956" k3="-0.1444"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.9" k1="-0.5764" k2="0.2640" k3="-0.1160"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="2.7" k1="-0.5843" k2="0.2767" k3="-0.1257"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.6005" k2="0.3196" k3="-0.1558"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.45" k1="-0.6063" k2="0.2984" k3="-0.1399"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.9" k1="-0.5833" k2="0.2700" k3="-0.1142"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="2.7" k1="-0.5913" k2="0.2812" k3="-0.1221"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.6041" k2="0.3158" k3="-0.1462"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.45" k1="-0.6122" k2="0.3065" k3="-0.1424"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.9" k1="-0.5894" k2="0.2778" k3="-0.1160"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="2.7" k1="-0.5972" k2="0.2887" k3="-0.1240"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.6070" k2="0.3145" k3="-0.1413"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.5274" k2="-0.2110" k3="0.2123"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.9" k1="-0.5559" k2="-0.0930" k3="0.1107"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="2.7" k1="-0.5569" k2="-0.0746" k3="0.0868"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.5818" k2="-0.0162" k3="0.0425"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.45" k1="-0.3835" k2="0.0297" k3="-0.0329"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.9" k1="-0.5182" k2="0.3503" k3="-0.2346"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="2.7" k1="-0.5279" k2="0.3888" k3="-0.2717"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.5500" k2="0.4475" k3="-0.3184"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.45" k1="-0.4861" k2="0.1556" k3="-0.0270"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.9" k1="-0.4743" k2="0.1487" k3="-0.0198"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="2.7" k1="-0.4674" k2="0.1258" k3="-0.0020"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4889" k2="0.1737" k3="-0.0356"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.45" k1="-0.4856" k2="0.1481" k3="-0.0178"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.9" k1="-0.4750" k2="0.1425" k3="-0.0101"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="2.7" k1="-0.4685" k2="0.1214" k3="0.0057"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4893" k2="0.1670" k3="-0.0255"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.45" k1="-0.4905" k2="0.1537" k3="-0.0187"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.9" k1="-0.4771" k2="0.1396" k3="-0.0042"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="2.7" k1="-0.4751" k2="0.1298" k3="0.0038"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.4944" k2="0.1721" k3="-0.0253"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.5000" k2="0.1707" k3="-0.0276"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.4836" k2="0.1490" k3="-0.0077"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="2.7" k1="-0.4846" k2="0.1454" k3="-0.0035"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.5030" k2="0.1854" k3="-0.0309"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="0.45" k1="-0.7049" k2="0.2950" k3="-0.1500"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="0.9" k1="-0.7163" k2="0.3620" k3="-0.2250"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="2.7" k1="-0.6962" k2="0.3204" k3="-0.2129"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.7079" k2="0.3344" k3="-0.2278"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.45" k1="-0.4799" k2="0.3668" k3="-0.2925"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.9" k1="-0.4831" k2="0.4338" k3="-0.3717"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="2.7" k1="-0.4805" k2="0.4500" k3="-0.3919"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.5016" k2="0.4991" k3="-0.4414"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.45" k1="-0.4273" k2="0.1139" k3="0.0043"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.9" k1="-0.4138" k2="0.1045" k3="0.0093"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="2.7" k1="-0.4064" k2="0.0883" k3="0.0218"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.4297" k2="0.1397" k3="-0.0142"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.45" k1="-0.4280" k2="0.1093" k3="0.0114"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.9" k1="-0.4061" k2="0.0772" k3="0.0344"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="2.7" k1="-0.3995" k2="0.0578" k3="0.0519"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.4207" k2="0.1038" k3="0.0199"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="0.45" k1="-0.4290" k2="0.1066" k3="0.0159"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="0.9" k1="-0.4079" k2="0.0761" k3="0.0380"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="2.7" k1="-0.4021" k2="0.0578" k3="0.0551"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.4222" k2="0.1029" k3="0.0231"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="0.45" k1="-0.4335" k2="0.1101" k3="0.0166"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="0.9" k1="-0.4124" k2="0.0813" k3="0.0370"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="2.7" k1="-0.4081" k2="0.0661" k3="0.0521"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.4296" k2="0.1152" k3="0.0173"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="0.45" k1="-1.0812" k2="1.1713" k3="-0.6459"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="0.9" k1="-1.0310" k2="1.0659" k3="-0.6301"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="2.7" k1="-0.9948" k2="0.9010" k3="-0.5254"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-1.0176" k2="0.8667" k3="-0.4856"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="0.45" k1="-0.3223" k2="-0.0995" k3="0.0451"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="0.9" k1="-0.3340" k2="-0.0051" k3="-0.0805"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="2.7" k1="-0.3113" k2="-0.0072" k3="-0.1158"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.3111" k2="-0.0112" k3="-0.1305"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="0.45" k1="-0.3740" k2="0.0834" k3="0.0276"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="0.9" k1="-0.3449" k2="0.0346" k3="0.0606"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="2.7" k1="-0.3473" k2="0.0666" k3="0.0265"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.3824" k2="0.1623" k3="-0.0510"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="0.45" k1="-0.3703" k2="0.0630" k3="0.0486"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="0.9" k1="-0.3403" k2="0.0180" k3="0.0758"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="2.7" k1="-0.3352" k2="0.0101" k3="0.0818"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="1000" k1="-0.3508" k2="0.0342" k3="0.0673"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="0.45" k1="-0.3726" k2="0.0649" k3="0.0487"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="0.9" k1="-0.3408" k2="0.0156" k3="0.0789"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="2.7" k1="-0.3371" k2="0.0090" k3="0.0856"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="1000" k1="-0.3511" k2="0.0307" k3="0.0728"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="0.45" k1="-0.3752" k2="0.0669" k3="0.0488"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="0.9" k1="-0.3442" k2="0.0175" k3="0.0798"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="2.7" k1="-0.3422" k2="0.0150" k3="0.0838"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.3540" k2="0.0313" k3="0.0746"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 24-105mm f/4L IS USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.00552" b="-0.02074" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.00396" b="-0.01457" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.00091" b="-0.00171" c="0" />
+-            <distortion model="ptlens" focal="50" a="0.00077" b="0.00096" c="0" />
+-            <distortion model="ptlens" focal="70" a="0.0016" b="5e-05" c="0" />
+-            <distortion model="ptlens" focal="88" a="0.00467" b="-0.00624" c="0" />
+-            <distortion model="ptlens" focal="105" a="0.00797" b="-0.01307" c="0" />
++            <distortion model="ptlens" focal="24" a="0.00552" b="-0.02074" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.00396" b="-0.01457" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.00091" b="-0.00171" c="0"/>
++            <distortion model="ptlens" focal="50" a="0.00077" b="0.00096" c="0"/>
++            <distortion model="ptlens" focal="70" a="0.0016" b="5e-05" c="0"/>
++            <distortion model="ptlens" focal="88" a="0.00467" b="-0.00624" c="0"/>
++            <distortion model="ptlens" focal="105" a="0.00797" b="-0.01307" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 28-105mm f/3.5-4.5 II USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.013305" b="-0.03973" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.005643" b="-0.012771" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.007781" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.010884" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.011749" c="0" />
++            <distortion model="ptlens" focal="28" a="0.013305" b="-0.03973" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.005643" b="-0.012771" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.007781" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.010884" c="0"/>
++            <distortion model="ptlens" focal="105" a="0" b="0.011749" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 28-300mm f/3.5-5.6L IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.013512" b="-0.044163" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.008844" b="-0.01773" c="0" />
+-            <distortion model="ptlens" focal="40" a="0" b="0.008261" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.012093" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.012516" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.009065" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.008196" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.007773" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.008177" c="0" />
++            <distortion model="ptlens" focal="28" a="0.013512" b="-0.044163" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.008844" b="-0.01773" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.008261" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.012093" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.012516" c="0"/>
++            <distortion model="ptlens" focal="105" a="0" b="0.009065" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.008196" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.007773" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.008177" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 28-135mm f/3.5-5.6 IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.015307" b="-0.042304" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.009116" b="-0.020624" c="0" />
+-            <distortion model="ptlens" focal="41" a="0" b="0.003439" c="0" />
+-            <distortion model="ptlens" focal="53" a="0" b="0.008157" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.008848" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.009719" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.009196" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.008576" c="0" />
+-            <distortion model="ptlens" focal="117" a="0" b="0.010397" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.010546" c="0" />
++            <distortion model="ptlens" focal="28" a="0.015307" b="-0.042304" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.009116" b="-0.020624" c="0"/>
++            <distortion model="ptlens" focal="41" a="0" b="0.003439" c="0"/>
++            <distortion model="ptlens" focal="53" a="0" b="0.008157" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.008848" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.009719" c="0"/>
++            <distortion model="ptlens" focal="85" a="0" b="0.009196" c="0"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.008576" c="0"/>
++            <distortion model="ptlens" focal="117" a="0" b="0.010397" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.010546" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 35mm f/1.4L USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="35" a="0.01105" b="-0.02944" c="0.00633"/>
++            <tca model="poly3" focal="35" br="-0.0004259" vr="1.0009718" bb="0.0005876" vb="0.9992816"/>
++            <vignetting model="pa" focal="35" aperture="1.4" distance="0.3" k1="-1.2296" k2="0.7860" k3="-0.2592"/>
++            <vignetting model="pa" focal="35" aperture="1.4" distance="0.6" k1="-1.6193" k2="1.4907" k3="-0.6335"/>
++            <vignetting model="pa" focal="35" aperture="1.4" distance="1.8" k1="-1.7496" k2="1.7258" k3="-0.7587"/>
++            <vignetting model="pa" focal="35" aperture="1.4" distance="1000" k1="-1.8086" k2="1.8246" k3="-0.8096"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="0.3" k1="-0.1890" k2="-0.4885" k3="0.1801"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="0.6" k1="-0.2440" k2="-0.7779" k3="0.4414"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="1.8" k1="-0.3152" k2="-0.7584" k3="0.4643"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="1000" k1="-0.3585" k2="-0.7409" k3="0.4745"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.3" k1="-0.3359" k2="0.1421" k3="-0.1330"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.6" k1="-0.3143" k2="-0.0191" k3="-0.0963"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1.8" k1="-0.2678" k2="-0.2501" k3="0.0432"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.2516" k2="-0.3607" k3="0.1119"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.3" k1="-0.2940" k2="-0.0722" k3="0.1067"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.6" k1="-0.3873" k2="0.1488" k3="-0.0896"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1.8" k1="-0.4347" k2="0.2856" k3="-0.2331"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.4484" k2="0.3163" k3="-0.2840"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.3" k1="-0.3341" k2="-0.0090" k3="0.0707"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.6" k1="-0.3758" k2="-0.0028" k3="0.0766"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1.8" k1="-0.3984" k2="0.0071" k3="0.0760"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.4126" k2="0.0142" k3="0.0744"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 35mm f/2 IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="35" a="0.0100042" b="-0.031314" c="0.019113"/>
++            <tca model="poly3" focal="35" br="-0.0000955" vr="1.0002447" bb="0.0001070" vb="0.9998243"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 35-70mm f/3.5-4.5</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0" b="-0.005023" c="0" />
+-            <distortion model="ptlens" focal="42" a="0" b="-0.002793" c="0" />
+-            <distortion model="ptlens" focal="56" a="0" b="0.000982" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.001993" c="0" />
++            <distortion model="poly3" focal="35" k1="-0.005023"/>
++            <distortion model="poly3" focal="42" k1="-0.002793"/>
++            <distortion model="poly3" focal="56" k1="0.000982"/>
++            <distortion model="poly3" focal="70" k1="0.001993"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 35-80mm f/4-5.6 III</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.003148" b="-0.013071" c="0" />
+-            <distortion model="ptlens" focal="40" a="0" b="-0.004903" c="0" />
+-            <distortion model="ptlens" focal="44" a="0" b="-0.002625" c="0" />
+-            <distortion model="ptlens" focal="53" a="0" b="0.000335" c="0" />
+-            <distortion model="ptlens" focal="65" a="0" b="0.002145" c="0" />
+-            <distortion model="ptlens" focal="80" a="0.00704" b="0.002809" c="0" />
++            <distortion model="ptlens" focal="35" a="0.003148" b="-0.013071" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="-0.004903" c="0"/>
++            <distortion model="ptlens" focal="44" a="0" b="-0.002625" c="0"/>
++            <distortion model="ptlens" focal="53" a="0" b="0.000335" c="0"/>
++            <distortion model="ptlens" focal="65" a="0" b="0.002145" c="0"/>
++            <distortion model="ptlens" focal="80" a="0.00704" b="0.002809" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 35-105mm f/3.5-4.5</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.003118" b="-0.013401" c="0" />
+-            <distortion model="ptlens" focal="45" a="0.003039" b="-0.007423" c="0" />
+-            <distortion model="ptlens" focal="60" a="0.001309" b="0.000252" c="0" />
+-            <distortion model="ptlens" focal="82" a="0.001085" b="0.002214" c="0" />
+-            <distortion model="ptlens" focal="105" a="0.000575" b="0.003503" c="0" />
++            <distortion model="ptlens" focal="35" a="0.003118" b="-0.013401" c="0"/>
++            <distortion model="ptlens" focal="45" a="0.003039" b="-0.007423" c="0"/>
++            <distortion model="ptlens" focal="60" a="0.001309" b="0.000252" c="0"/>
++            <distortion model="ptlens" focal="82" a="0.001085" b="0.002214" c="0"/>
++            <distortion model="ptlens" focal="105" a="0.000575" b="0.003503" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 35-105mm f/4.5-5.6</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="-0.00202" b="0.00115" c="-0.00877" />
+-            <distortion model="ptlens" focal="48" a="0.00206" b="-0.00395" c="0.00411" />
+-            <distortion model="ptlens" focal="57" a="-0.00649" b="0.02493" c="-0.01898" />
+-            <distortion model="ptlens" focal="62" a="-0.01071" b="0.01858" c="0.00875" />
+-            <distortion model="ptlens" focal="68" a="-0.02787" b="0.07826" c="-0.05368" />
+-            <distortion model="ptlens" focal="72" a="-0.03351" b="0.12504" c="-0.14162" />
+-            <distortion model="ptlens" focal="76" a="0.00385" b="-0.0011" c="-0.00351" />
+-            <distortion model="ptlens" focal="80" a="0.01832" b="-0.05905" c="0.07657" />
+-            <distortion model="ptlens" focal="87" a="-0.03411" b="0.14077" c="-0.17993" />
+-            <distortion model="ptlens" focal="98" a="0.0103" b="-0.03257" c="0.02861" />
+-            <distortion model="ptlens" focal="105" a="0.03329" b="-0.012513" c="0.16021" />
++            <distortion model="ptlens" focal="35" a="-0.00202" b="0.00115" c="-0.00877"/>
++            <distortion model="ptlens" focal="48" a="0.00206" b="-0.00395" c="0.00411"/>
++            <distortion model="ptlens" focal="57" a="-0.00649" b="0.02493" c="-0.01898"/>
++            <distortion model="ptlens" focal="62" a="-0.01071" b="0.01858" c="0.00875"/>
++            <distortion model="ptlens" focal="68" a="-0.02787" b="0.07826" c="-0.05368"/>
++            <distortion model="ptlens" focal="72" a="-0.03351" b="0.12504" c="-0.14162"/>
++            <distortion model="ptlens" focal="76" a="0.00385" b="-0.0011" c="-0.00351"/>
++            <distortion model="ptlens" focal="80" a="0.01832" b="-0.05905" c="0.07657"/>
++            <distortion model="ptlens" focal="87" a="-0.03411" b="0.14077" c="-0.17993"/>
++            <distortion model="ptlens" focal="98" a="0.0103" b="-0.03257" c="0.02861"/>
++            <distortion model="ptlens" focal="105" a="0.03329" b="-0.012513" c="0.16021"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 35-135mm f/4-5.6 USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.001862" b="-0.007763" c="0" />
+-            <distortion model="ptlens" focal="45" a="0" b="0.001004" c="0" />
+-            <distortion model="ptlens" focal="65" a="0" b="0.004211" c="0" />
+-            <distortion model="ptlens" focal="80" a="0" b="0.004364" c="0" />
+-            <distortion model="ptlens" focal="91" a="0" b="0.005026" c="0" />
+-            <distortion model="ptlens" focal="110" a="0" b="0.005453" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.003708" c="0" />
++            <distortion model="ptlens" focal="35" a="0.001862" b="-0.007763" c="0"/>
++            <distortion model="ptlens" focal="45" a="0" b="0.001004" c="0"/>
++            <distortion model="ptlens" focal="65" a="0" b="0.004211" c="0"/>
++            <distortion model="ptlens" focal="80" a="0" b="0.004364" c="0"/>
++            <distortion model="ptlens" focal="91" a="0" b="0.005026" c="0"/>
++            <distortion model="ptlens" focal="110" a="0" b="0.005453" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.003708" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 50mm f/1.4 USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="50" a="0.00225" b="-0.01104" c="0.00161"/>
++            <tca model="poly3" focal="50" br="-0.0000816" vr="1.0002947" bb="0.0001675" vb="0.9998280"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-1.2133" k2="0.7385" k3="-0.2283"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="0.9" k1="-1.5471" k2="1.3080" k3="-0.5300"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="2.7" k1="-1.6546" k2="1.4781" k3="-0.6175"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.6987" k2="1.5340" k3="-0.6426"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="0.0561" k2="-0.9960" k3="0.4486"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.9" k1="0.1089" k2="-1.3840" k3="0.6970"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="2.7" k1="0.1071" k2="-1.5289" k3="0.8047"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="0.0948" k2="-1.5688" k3="0.8379"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.2081" k2="0.2073" k3="-0.2248"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.9" k1="-0.2781" k2="0.3881" k3="-0.4386"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="2.7" k1="-0.2821" k2="0.3808" k3="-0.4832"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2913" k2="0.3893" k3="-0.5136"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.1550" k2="-0.0639" k3="0.0839"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.9" k1="-0.1912" k2="-0.0557" k3="0.0760"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="2.7" k1="-0.2199" k2="-0.0120" k3="0.0383"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2456" k2="0.0370" k3="-0.0021"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.1764" k2="-0.0538" k3="0.0839"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.2106" k2="-0.0590" k3="0.0888"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="2.7" k1="-0.2330" k2="-0.0454" k3="0.0805"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2485" k2="-0.0389" k3="0.0790"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 55-200mm f/4.5-5.6</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="55" a="-0.002904" b="0.003678" c="0" />
+-            <distortion model="ptlens" focal="65" a="-0.004584" b="0.008401" c="0" />
+-            <distortion model="ptlens" focal="75" a="-0.000913" b="0.001853" c="0" />
+-            <distortion model="ptlens" focal="88" a="-0.002182" b="0.007163" c="0" />
+-            <distortion model="ptlens" focal="105" a="-0.002465" b="0.008767" c="0" />
+-            <distortion model="ptlens" focal="130" a="-0.003219" b="0.010958" c="0" />
+-            <distortion model="ptlens" focal="145" a="-0.003261" b="0.011157" c="0" />
+-            <distortion model="ptlens" focal="160" a="-0.003477" b="0.011918" c="0" />
+-            <distortion model="ptlens" focal="200" a="-0.00602" b="0.017552" c="0" />
++            <distortion model="ptlens" focal="55" a="-0.002904" b="0.003678" c="0"/>
++            <distortion model="ptlens" focal="65" a="-0.004584" b="0.008401" c="0"/>
++            <distortion model="ptlens" focal="75" a="-0.000913" b="0.001853" c="0"/>
++            <distortion model="ptlens" focal="88" a="-0.002182" b="0.007163" c="0"/>
++            <distortion model="ptlens" focal="105" a="-0.002465" b="0.008767" c="0"/>
++            <distortion model="ptlens" focal="130" a="-0.003219" b="0.010958" c="0"/>
++            <distortion model="ptlens" focal="145" a="-0.003261" b="0.011157" c="0"/>
++            <distortion model="ptlens" focal="160" a="-0.003477" b="0.011918" c="0"/>
++            <distortion model="ptlens" focal="200" a="-0.00602" b="0.017552" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 55-250mm f/4-5.6 IS</model>
+-        <mount>Canon EF</mount>
++        <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+-        <calibration> <!-- data gathered by Spoilerhead 2010 <spoilerhead@gmail.com> using hugin-->
+-            <distortion model="ptlens" focal="55" a="-0.000303056" b="-0.00581537" c="-0.00237143" /> <!-- 15 shots-->
+-            <distortion model="ptlens" focal="70" a="-0.000520255" b="2.86405e-05" c="0.00286934" />  <!-- 21 shots -->
+-            <distortion model="ptlens" focal="100" a="0.00268582" b="-0.00578304" c="0.00718748" />   <!-- 17-->
+-            <distortion model="ptlens" focal="135" a="0.00120309" b="0.00979416" c="-0.00868762" />    <!-- 15 -->
+-            <distortion model="ptlens" focal="250" a="-0.00226069" b="0.0111545" c="-0.00536676" />    <!-- 18 -->
+-            <tca model="poly3" focal="55" br="0.0001058" vr="1.0000402" bb="-0.0001107" vb="1.0002220" />
+-            <tca model="poly3" focal="70" br="0.0000486" vr="1.0000622" bb="-0.0000826" vb="1.0001793" />
+-            <tca model="poly3" focal="100" br="0.0000227" vr="0.9999711" bb="-0.0000374" vb="1.0000907" />
+-            <tca model="poly3" focal="135" br="0.0000114" vr="0.9999012" bb="-0.0000123" vb="1.0000019" />
+-            <tca model="poly3" focal="250" br="0.0000067" vr="0.9998026" bb="-0.0000349" vb="0.9999041" />
++        <calibration>
++            <!-- data gathered by Spoilerhead 2010 <spoilerhead@gmail.com> using hugin-->
++            <!-- 15 shots-->
++            <distortion model="ptlens" focal="55" a="-0.000303056" b="-0.00581537" c="-0.00237143"/>
++            <!-- 21 shots -->
++            <distortion model="ptlens" focal="70" a="-0.000520255" b="2.86405e-05" c="0.00286934"/>
++            <!-- 17-->
++            <distortion model="ptlens" focal="100" a="0.00268582" b="-0.00578304" c="0.00718748"/>
++            <!-- 15 -->
++            <distortion model="ptlens" focal="135" a="0.00120309" b="0.00979416" c="-0.00868762"/>
++            <!-- 18 -->
++            <distortion model="ptlens" focal="250" a="-0.00226069" b="0.0111545" c="-0.00536676"/>
++            <tca model="poly3" focal="55" br="0.0001058" vr="1.0000402" bb="-0.0001107" vb="1.0002220"/>
++            <tca model="poly3" focal="70" br="0.0000486" vr="1.0000622" bb="-0.0000826" vb="1.0001793"/>
++            <tca model="poly3" focal="100" br="0.0000227" vr="0.9999711" bb="-0.0000374" vb="1.0000907"/>
++            <tca model="poly3" focal="135" br="0.0000114" vr="0.9999012" bb="-0.0000123" vb="1.0000019"/>
++            <tca model="poly3" focal="250" br="0.0000067" vr="0.9998026" bb="-0.0000349" vb="0.9999041"/>
++            <!-- Taken with Canon EOS 550D -->
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.6290" k2="0.4091" k3="-0.2801"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.6290" k2="0.4091" k3="-0.2801"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0462" k2="0.0472" k3="-0.2275"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0462" k2="0.0472" k3="-0.2275"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0096" k2="-0.1638" k3="0.1113"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0096" k2="-0.1638" k3="0.1113"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="0.0034" k2="-0.1932" k3="0.1293"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="0.0034" k2="-0.1932" k3="0.1293"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="0.0109" k2="-0.2130" k3="0.1418"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="0.0109" k2="-0.2130" k3="0.1418"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="0.0156" k2="-0.2249" k3="0.1494"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="0.0156" k2="-0.2249" k3="0.1494"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.6730" k2="0.6146" k3="-0.3810"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.6730" k2="0.6146" k3="-0.3810"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0447" k2="0.0246" k3="-0.1055"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0447" k2="0.0246" k3="-0.1055"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0120" k2="-0.1427" k3="0.1033"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0120" k2="-0.1427" k3="0.1033"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="0.0056" k2="-0.1861" k3="0.1315"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="0.0056" k2="-0.1861" k3="0.1315"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="0.0131" k2="-0.2045" k3="0.1438"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="0.0131" k2="-0.2045" k3="0.1438"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="0.0279" k2="-0.2334" k3="0.1579"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="0.0279" k2="-0.2334" k3="0.1579"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.5671" k2="0.5259" k3="-0.3298"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.5671" k2="0.5259" k3="-0.3298"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1714" k2="-0.0770" k3="-0.0088"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1714" k2="-0.0770" k3="-0.0088"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.0284" k2="-0.0551" k3="0.0354"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0284" k2="-0.0551" k3="0.0354"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.0119" k2="-0.1113" k3="0.0816"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0119" k2="-0.1113" k3="0.0816"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.0009" k2="-0.1424" k3="0.1032"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.0009" k2="-0.1424" k3="0.1032"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="0.0148" k2="-0.1704" k3="0.1192"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="0.0148" k2="-0.1704" k3="0.1192"/>
++            <vignetting model="pa" focal="100" aperture="29" distance="10" k1="0.0196" k2="-0.1853" k3="0.1298"/>
++            <vignetting model="pa" focal="100" aperture="29" distance="1000" k1="0.0196" k2="-0.1853" k3="0.1298"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.3279" k2="-0.1954" k3="0.0941"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.3279" k2="-0.1954" k3="0.0941"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1084" k2="-0.3475" k3="0.1150"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1084" k2="-0.3475" k3="0.1150"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0477" k2="0.0345" k3="-0.0424"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0477" k2="0.0345" k3="-0.0424"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.0121" k2="-0.0845" k3="0.0589"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.0121" k2="-0.0845" k3="0.0589"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="0.0076" k2="-0.1332" k3="0.0907"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="0.0076" k2="-0.1332" k3="0.0907"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="0.0241" k2="-0.1711" k3="0.1140"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="0.0241" k2="-0.1711" k3="0.1140"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="0.0310" k2="-0.1849" k3="0.1219"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="0.0310" k2="-0.1849" k3="0.1219"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.8137" k2="0.3985" k3="-0.0714"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.8137" k2="0.3985" k3="-0.0714"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.0019" k2="-0.0252" k3="-0.1253"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.0019" k2="-0.0252" k3="-0.1253"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.0151" k2="-0.0661" k3="0.0452"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0151" k2="-0.0661" k3="0.0452"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.0191" k2="-0.0666" k3="0.0480"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0191" k2="-0.0666" k3="0.0480"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0161" k2="-0.0789" k3="0.0570"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0161" k2="-0.0789" k3="0.0570"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0118" k2="-0.0902" k3="0.0630"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0118" k2="-0.0902" k3="0.0630"/>
++            <vignetting model="pa" focal="250" aperture="5.6" distance="10" k1="-1.1623" k2="1.2351" k3="-0.5658"/>
++            <vignetting model="pa" focal="250" aperture="5.6" distance="1000" k1="-1.1623" k2="1.2351" k3="-0.5658"/>
++            <vignetting model="pa" focal="250" aperture="8" distance="10" k1="0.0520" k2="-0.2446" k3="0.0316"/>
++            <vignetting model="pa" focal="250" aperture="8" distance="1000" k1="0.0520" k2="-0.2446" k3="0.0316"/>
++            <vignetting model="pa" focal="250" aperture="11" distance="10" k1="-0.0198" k2="-0.0546" k3="0.0369"/>
++            <vignetting model="pa" focal="250" aperture="11" distance="1000" k1="-0.0198" k2="-0.0546" k3="0.0369"/>
++            <vignetting model="pa" focal="250" aperture="16" distance="10" k1="-0.0268" k2="-0.0486" k3="0.0355"/>
++            <vignetting model="pa" focal="250" aperture="16" distance="1000" k1="-0.0268" k2="-0.0486" k3="0.0355"/>
++            <vignetting model="pa" focal="250" aperture="22" distance="10" k1="-0.0268" k2="-0.0573" k3="0.0423"/>
++            <vignetting model="pa" focal="250" aperture="22" distance="1000" k1="-0.0268" k2="-0.0573" k3="0.0423"/>
++            <vignetting model="pa" focal="250" aperture="32" distance="10" k1="-0.0125" k2="-0.0836" k3="0.0552"/>
++            <vignetting model="pa" focal="250" aperture="32" distance="1000" k1="-0.0125" k2="-0.0836" k3="0.0552"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This is a copy of the Canon EF-S 55-250mm f/4-5.6 IS, which,
++             according to
++             <https://en.wikipedia.org/wiki/Canon_EF-S_55%E2%80%93250mm_lens>,
++             is optically equivalent. -->
+         <maker>Canon</maker>
+-        <model>EF 70-200mm f/2.8L USM</model>
++        <model>Canon EF-S 55-250mm f/4-5.6 IS II</model>
++        <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- data gathered by Spoilerhead 2010 <spoilerhead@gmail.com> using hugin-->
++            <!-- 15 shots-->
++            <distortion model="ptlens" focal="55" a="-0.000303056" b="-0.00581537" c="-0.00237143"/>
++            <!-- 21 shots -->
++            <distortion model="ptlens" focal="70" a="-0.000520255" b="2.86405e-05" c="0.00286934"/>
++            <!-- 17-->
++            <distortion model="ptlens" focal="100" a="0.00268582" b="-0.00578304" c="0.00718748"/>
++            <!-- 15 -->
++            <distortion model="ptlens" focal="135" a="0.00120309" b="0.00979416" c="-0.00868762"/>
++            <!-- 18 -->
++            <distortion model="ptlens" focal="250" a="-0.00226069" b="0.0111545" c="-0.00536676"/>
++            <tca model="poly3" focal="55" br="0.0001058" vr="1.0000402" bb="-0.0001107" vb="1.0002220"/>
++            <tca model="poly3" focal="70" br="0.0000486" vr="1.0000622" bb="-0.0000826" vb="1.0001793"/>
++            <tca model="poly3" focal="100" br="0.0000227" vr="0.9999711" bb="-0.0000374" vb="1.0000907"/>
++            <tca model="poly3" focal="135" br="0.0000114" vr="0.9999012" bb="-0.0000123" vb="1.0000019"/>
++            <tca model="poly3" focal="250" br="0.0000067" vr="0.9998026" bb="-0.0000349" vb="0.9999041"/>
++            <!-- Taken with Canon EOS 550D -->
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.6290" k2="0.4091" k3="-0.2801"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.6290" k2="0.4091" k3="-0.2801"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0462" k2="0.0472" k3="-0.2275"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0462" k2="0.0472" k3="-0.2275"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0096" k2="-0.1638" k3="0.1113"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0096" k2="-0.1638" k3="0.1113"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="0.0034" k2="-0.1932" k3="0.1293"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="0.0034" k2="-0.1932" k3="0.1293"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="0.0109" k2="-0.2130" k3="0.1418"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="0.0109" k2="-0.2130" k3="0.1418"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="0.0156" k2="-0.2249" k3="0.1494"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="0.0156" k2="-0.2249" k3="0.1494"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.6730" k2="0.6146" k3="-0.3810"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.6730" k2="0.6146" k3="-0.3810"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0447" k2="0.0246" k3="-0.1055"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0447" k2="0.0246" k3="-0.1055"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0120" k2="-0.1427" k3="0.1033"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0120" k2="-0.1427" k3="0.1033"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="0.0056" k2="-0.1861" k3="0.1315"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="0.0056" k2="-0.1861" k3="0.1315"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="0.0131" k2="-0.2045" k3="0.1438"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="0.0131" k2="-0.2045" k3="0.1438"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="0.0279" k2="-0.2334" k3="0.1579"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="0.0279" k2="-0.2334" k3="0.1579"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.5671" k2="0.5259" k3="-0.3298"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.5671" k2="0.5259" k3="-0.3298"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1714" k2="-0.0770" k3="-0.0088"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1714" k2="-0.0770" k3="-0.0088"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.0284" k2="-0.0551" k3="0.0354"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0284" k2="-0.0551" k3="0.0354"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.0119" k2="-0.1113" k3="0.0816"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0119" k2="-0.1113" k3="0.0816"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.0009" k2="-0.1424" k3="0.1032"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.0009" k2="-0.1424" k3="0.1032"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="0.0148" k2="-0.1704" k3="0.1192"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="0.0148" k2="-0.1704" k3="0.1192"/>
++            <vignetting model="pa" focal="100" aperture="29" distance="10" k1="0.0196" k2="-0.1853" k3="0.1298"/>
++            <vignetting model="pa" focal="100" aperture="29" distance="1000" k1="0.0196" k2="-0.1853" k3="0.1298"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.3279" k2="-0.1954" k3="0.0941"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.3279" k2="-0.1954" k3="0.0941"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1084" k2="-0.3475" k3="0.1150"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1084" k2="-0.3475" k3="0.1150"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0477" k2="0.0345" k3="-0.0424"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0477" k2="0.0345" k3="-0.0424"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.0121" k2="-0.0845" k3="0.0589"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.0121" k2="-0.0845" k3="0.0589"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="0.0076" k2="-0.1332" k3="0.0907"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="0.0076" k2="-0.1332" k3="0.0907"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="0.0241" k2="-0.1711" k3="0.1140"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="0.0241" k2="-0.1711" k3="0.1140"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="0.0310" k2="-0.1849" k3="0.1219"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="0.0310" k2="-0.1849" k3="0.1219"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.8137" k2="0.3985" k3="-0.0714"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.8137" k2="0.3985" k3="-0.0714"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.0019" k2="-0.0252" k3="-0.1253"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.0019" k2="-0.0252" k3="-0.1253"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.0151" k2="-0.0661" k3="0.0452"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0151" k2="-0.0661" k3="0.0452"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.0191" k2="-0.0666" k3="0.0480"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0191" k2="-0.0666" k3="0.0480"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0161" k2="-0.0789" k3="0.0570"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0161" k2="-0.0789" k3="0.0570"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0118" k2="-0.0902" k3="0.0630"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0118" k2="-0.0902" k3="0.0630"/>
++            <vignetting model="pa" focal="250" aperture="5.6" distance="10" k1="-1.1623" k2="1.2351" k3="-0.5658"/>
++            <vignetting model="pa" focal="250" aperture="5.6" distance="1000" k1="-1.1623" k2="1.2351" k3="-0.5658"/>
++            <vignetting model="pa" focal="250" aperture="8" distance="10" k1="0.0520" k2="-0.2446" k3="0.0316"/>
++            <vignetting model="pa" focal="250" aperture="8" distance="1000" k1="0.0520" k2="-0.2446" k3="0.0316"/>
++            <vignetting model="pa" focal="250" aperture="11" distance="10" k1="-0.0198" k2="-0.0546" k3="0.0369"/>
++            <vignetting model="pa" focal="250" aperture="11" distance="1000" k1="-0.0198" k2="-0.0546" k3="0.0369"/>
++            <vignetting model="pa" focal="250" aperture="16" distance="10" k1="-0.0268" k2="-0.0486" k3="0.0355"/>
++            <vignetting model="pa" focal="250" aperture="16" distance="1000" k1="-0.0268" k2="-0.0486" k3="0.0355"/>
++            <vignetting model="pa" focal="250" aperture="22" distance="10" k1="-0.0268" k2="-0.0573" k3="0.0423"/>
++            <vignetting model="pa" focal="250" aperture="22" distance="1000" k1="-0.0268" k2="-0.0573" k3="0.0423"/>
++            <vignetting model="pa" focal="250" aperture="32" distance="10" k1="-0.0125" k2="-0.0836" k3="0.0552"/>
++            <vignetting model="pa" focal="250" aperture="32" distance="1000" k1="-0.0125" k2="-0.0836" k3="0.0552"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-200mm f/2.8L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0.00685" b="-0.02857" c="0.01482" />
+-            <distortion model="ptlens" focal="80" a="0.00289" b="-0.0102" c="-0.00108" />
+-            <distortion model="ptlens" focal="98" a="0.00649" b="-0.01829" c="0.0112" />
+-            <distortion model="ptlens" focal="115" a="0.00291" b="-0.00372" c="-0.00112" />
+-            <distortion model="ptlens" focal="140" a="0.00303" b="-0.00409" c="0.00218" />
+-            <distortion model="ptlens" focal="160" a="0.00393" b="-0.00724" c="0.00959" />
+-            <distortion model="ptlens" focal="200" a="0.00188" b="0.0023" c="-0.00101" />
+-            <tca model="poly3" focal="70" br="-0.0000072" vr="1.0002433" bb="-0.0000189" vb="1.0000710" />
+-            <tca model="poly3" focal="80" br="-0.0000073" vr="1.0002115" bb="-0.0000063" vb="1.0000321" />
+-            <tca model="poly3" focal="98" br="-0.0000184" vr="1.0001630" bb="-0.0000178" vb="1.0000256" />
+-            <tca model="poly3" focal="110" br="0.0000060" vr="1.0000837" bb="-0.0000161" vb="1.0000120" />
+-            <tca model="poly3" focal="130" br="0.0000047" vr="1.0000377" bb="-0.0000165" vb="0.9999858" />
+-            <tca model="poly3" focal="155" br="0.0000177" vr="0.9999569" bb="-0.0000230" vb="1.0000025" />
+-            <tca model="poly3" focal="200" br="0.0000050" vr="0.9998535" bb="-0.0000540" vb="1.0000457" />
+-            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.4762" k2="0.2388" k3="-0.2546" />
+-            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.4762" k2="0.2388" k3="-0.2546" />
+-            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="0.0816" k2="-0.2944" k3="-0.0667" />
+-            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="0.0816" k2="-0.2944" k3="-0.0667" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1361" k2="0.4030" k3="-0.4138" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1361" k2="0.4030" k3="-0.4138" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0644" k2="0.0589" k3="-0.0313" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0644" k2="0.0589" k3="-0.0313" />
+-            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0529" k2="-0.0029" k3="0.0285" />
+-            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0529" k2="-0.0029" k3="0.0285" />
+-            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.4462" k2="0.3068" k3="-0.3205" />
+-            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.4462" k2="0.3068" k3="-0.3205" />
+-            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0263" k2="0.0948" k3="-0.3144" />
+-            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0263" k2="0.0948" k3="-0.3144" />
+-            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1531" k2="0.4373" k3="-0.3971" />
+-            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1531" k2="0.4373" k3="-0.3971" />
+-            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0497" k2="0.0163" k3="0.0033" />
+-            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0497" k2="0.0163" k3="0.0033" />
+-            <vignetting model="pa" focal="80" aperture="32" distance="10" k1="-0.0477" k2="-0.0152" k3="0.0372" />
+-            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.0477" k2="-0.0152" k3="0.0372" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.2815" k2="-0.0586" k3="-0.1953" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.2815" k2="-0.0586" k3="-0.1953" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="0.0717" k2="-0.1539" k3="-0.2702" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0717" k2="-0.1539" k3="-0.2702" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1713" k2="0.6308" k3="-0.6955" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1713" k2="0.6308" k3="-0.6955" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1775" k2="0.5332" k3="-0.4790" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1775" k2="0.5332" k3="-0.4790" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.0433" k2="-0.0219" k3="0.0405" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0433" k2="-0.0219" k3="0.0405" />
+-            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.3282" k2="-0.6099" k3="0.3775" />
+-            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.3282" k2="-0.6099" k3="0.3775" />
+-            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.2872" k2="-1.2345" k3="0.5705" />
+-            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.2872" k2="-1.2345" k3="0.5705" />
+-            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="0.0220" k2="-0.0050" k3="-0.3018" />
+-            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0220" k2="-0.0050" k3="-0.3018" />
+-            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1702" k2="0.5755" k3="-0.5787" />
+-            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1702" k2="0.5755" k3="-0.5787" />
+-            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="-0.0424" k2="-0.0142" k3="0.0352" />
+-            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.0424" k2="-0.0142" k3="0.0352" />
+-            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.4350" k2="1.7567" k3="-0.9122" />
+-            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.4350" k2="1.7567" k3="-0.9122" />
+-            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.1855" k2="-0.7593" k3="0.5488" />
+-            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.1855" k2="-0.7593" k3="0.5488" />
+-            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.2013" k2="-0.8329" k3="0.3544" />
+-            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.2013" k2="-0.8329" k3="0.3544" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0728" k2="0.2494" k3="-0.3457" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0728" k2="0.2494" k3="-0.3457" />
+-            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0412" k2="-0.0125" k3="0.0382" />
+-            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0412" k2="-0.0125" k3="0.0382" />
++            <distortion model="ptlens" focal="70" a="0.00685" b="-0.02857" c="0.01482"/>
++            <distortion model="ptlens" focal="80" a="0.00289" b="-0.0102" c="-0.00108"/>
++            <distortion model="ptlens" focal="98" a="0.00649" b="-0.01829" c="0.0112"/>
++            <distortion model="ptlens" focal="115" a="0.00291" b="-0.00372" c="-0.00112"/>
++            <distortion model="ptlens" focal="140" a="0.00303" b="-0.00409" c="0.00218"/>
++            <distortion model="ptlens" focal="160" a="0.00393" b="-0.00724" c="0.00959"/>
++            <distortion model="ptlens" focal="200" a="0.00188" b="0.0023" c="-0.00101"/>
++            <tca model="poly3" focal="70" br="-0.0000072" vr="1.0002433" bb="-0.0000189" vb="1.0000710"/>
++            <tca model="poly3" focal="80" br="-0.0000073" vr="1.0002115" bb="-0.0000063" vb="1.0000321"/>
++            <tca model="poly3" focal="98" br="-0.0000184" vr="1.0001630" bb="-0.0000178" vb="1.0000256"/>
++            <tca model="poly3" focal="110" br="0.0000060" vr="1.0000837" bb="-0.0000161" vb="1.0000120"/>
++            <tca model="poly3" focal="130" br="0.0000047" vr="1.0000377" bb="-0.0000165" vb="0.9999858"/>
++            <tca model="poly3" focal="155" br="0.0000177" vr="0.9999569" bb="-0.0000230" vb="1.0000025"/>
++            <tca model="poly3" focal="200" br="0.0000050" vr="0.9998535" bb="-0.0000540" vb="1.0000457"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.4762" k2="0.2388" k3="-0.2546"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.4762" k2="0.2388" k3="-0.2546"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="0.0816" k2="-0.2944" k3="-0.0667"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="0.0816" k2="-0.2944" k3="-0.0667"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1361" k2="0.4030" k3="-0.4138"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1361" k2="0.4030" k3="-0.4138"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0644" k2="0.0589" k3="-0.0313"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0644" k2="0.0589" k3="-0.0313"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0529" k2="-0.0029" k3="0.0285"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0529" k2="-0.0029" k3="0.0285"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.4462" k2="0.3068" k3="-0.3205"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.4462" k2="0.3068" k3="-0.3205"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0263" k2="0.0948" k3="-0.3144"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0263" k2="0.0948" k3="-0.3144"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1531" k2="0.4373" k3="-0.3971"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1531" k2="0.4373" k3="-0.3971"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0497" k2="0.0163" k3="0.0033"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0497" k2="0.0163" k3="0.0033"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="10" k1="-0.0477" k2="-0.0152" k3="0.0372"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.0477" k2="-0.0152" k3="0.0372"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.2815" k2="-0.0586" k3="-0.1953"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.2815" k2="-0.0586" k3="-0.1953"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="0.0717" k2="-0.1539" k3="-0.2702"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0717" k2="-0.1539" k3="-0.2702"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1713" k2="0.6308" k3="-0.6955"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1713" k2="0.6308" k3="-0.6955"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1775" k2="0.5332" k3="-0.4790"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1775" k2="0.5332" k3="-0.4790"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.0433" k2="-0.0219" k3="0.0405"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0433" k2="-0.0219" k3="0.0405"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.3282" k2="-0.6099" k3="0.3775"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.3282" k2="-0.6099" k3="0.3775"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.2872" k2="-1.2345" k3="0.5705"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.2872" k2="-1.2345" k3="0.5705"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="0.0220" k2="-0.0050" k3="-0.3018"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0220" k2="-0.0050" k3="-0.3018"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1702" k2="0.5755" k3="-0.5787"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1702" k2="0.5755" k3="-0.5787"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="-0.0424" k2="-0.0142" k3="0.0352"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.0424" k2="-0.0142" k3="0.0352"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.4350" k2="1.7567" k3="-0.9122"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.4350" k2="1.7567" k3="-0.9122"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.1855" k2="-0.7593" k3="0.5488"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.1855" k2="-0.7593" k3="0.5488"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.2013" k2="-0.8329" k3="0.3544"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.2013" k2="-0.8329" k3="0.3544"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0728" k2="0.2494" k3="-0.3457"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0728" k2="0.2494" k3="-0.3457"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0412" k2="-0.0125" k3="0.0382"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0412" k2="-0.0125" k3="0.0382"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 70-200mm f/2.8L IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.009135" c="0" />
+-            <distortion model="ptlens" focal="73" a="0" b="-0.008769" c="0" />
+-            <distortion model="ptlens" focal="78" a="0" b="-0.006965" c="0" />
+-            <distortion model="ptlens" focal="80" a="0" b="-0.005047" c="0" />
+-            <distortion model="ptlens" focal="90" a="0" b="-0.000959" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.00029" c="0" />
+-            <distortion model="ptlens" focal="115" a="0" b="0.002667" c="0" />
+-            <distortion model="ptlens" focal="130" a="0" b="0.004312" c="0" />
+-            <distortion model="ptlens" focal="145" a="0" b="0.004809" c="0" />
+-            <distortion model="ptlens" focal="160" a="0" b="0.005218" c="0" />
+-            <distortion model="ptlens" focal="170" a="0" b="0.006153" c="0" />
+-            <distortion model="ptlens" focal="185" a="0" b="0.006109" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.008631" c="0" />
++            <distortion model="poly3" focal="70" k1="-0.009135"/>
++            <distortion model="poly3" focal="73" k1="-0.008769"/>
++            <distortion model="poly3" focal="78" k1="-0.006965"/>
++            <distortion model="poly3" focal="80" k1="-0.005047"/>
++            <distortion model="poly3" focal="90" k1="-0.000959"/>
++            <distortion model="poly3" focal="100" k1="0.00029"/>
++            <distortion model="poly3" focal="115" k1="0.002667"/>
++            <distortion model="poly3" focal="130" k1="0.004312"/>
++            <distortion model="poly3" focal="145" k1="0.004809"/>
++            <distortion model="poly3" focal="160" k1="0.005218"/>
++            <distortion model="poly3" focal="170" k1="0.006153"/>
++            <distortion model="poly3" focal="185" k1="0.006109"/>
++            <distortion model="poly3" focal="200" k1="0.008631"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 70-200mm f/2.8L IS USM + EF 1.4x ext</model>
++        <model>Canon EF 70-200mm f/2.8L IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="98" a="0" b="-0.012279" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="-0.012117" c="0" />
+-            <distortion model="ptlens" focal="110" a="0" b="-0.011447" c="0" />
+-            <distortion model="ptlens" focal="120" a="0" b="-0.010878" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="-0.00804" c="0" />
+-            <distortion model="ptlens" focal="145" a="0" b="-0.00886" c="0" />
+-            <distortion model="ptlens" focal="160" a="0" b="-0.00706" c="0" />
+-            <distortion model="ptlens" focal="185" a="0" b="-0.006693" c="0" />
+-            <distortion model="ptlens" focal="220" a="0" b="-0.006125" c="0" />
+-            <distortion model="ptlens" focal="245" a="0" b="-0.004999" c="0" />
+-            <distortion model="ptlens" focal="280" a="0" b="-0.004683" c="0" />
++            <!-- Taken with Canon EOS 7D -->
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.2445" k2="0.1287" k3="-0.0538"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.2445" k2="0.1287" k3="-0.0538"/>
++            <vignetting model="pa" focal="70" aperture="3.2" distance="10" k1="-0.0478" k2="0.0173" k3="-0.0207"/>
++            <vignetting model="pa" focal="70" aperture="3.2" distance="1000" k1="-0.0478" k2="0.0173" k3="-0.0207"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="10" k1="-0.0324" k2="-0.0258" k3="0.0145"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="-0.0324" k2="-0.0258" k3="0.0145"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0235" k2="-0.0437" k3="0.0222"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0235" k2="-0.0437" k3="0.0222"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.0217" k2="-0.0435" k3="0.0190"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.0217" k2="-0.0435" k3="0.0190"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.0168" k2="-0.0551" k3="0.0249"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.0168" k2="-0.0551" k3="0.0249"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0067" k2="-0.0696" k3="0.0306"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0067" k2="-0.0696" k3="0.0306"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="0.0044" k2="-0.0787" k3="0.0279"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="0.0044" k2="-0.0787" k3="0.0279"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="10" k1="-0.1847" k2="0.0692" k3="-0.0336"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="1000" k1="-0.1847" k2="0.0692" k3="-0.0336"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="10" k1="-0.0306" k2="-0.0087" k3="-0.0093"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="1000" k1="-0.0306" k2="-0.0087" k3="-0.0093"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="10" k1="-0.0249" k2="-0.0410" k3="0.0194"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.0249" k2="-0.0410" k3="0.0194"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="10" k1="-0.0296" k2="-0.0401" k3="0.0222"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="1000" k1="-0.0296" k2="-0.0401" k3="0.0222"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="10" k1="-0.0019" k2="-0.0789" k3="0.0455"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="1000" k1="-0.0019" k2="-0.0789" k3="0.0455"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="10" k1="-0.0189" k2="-0.0438" k3="0.0230"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.0189" k2="-0.0438" k3="0.0230"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="0.0029" k2="-0.0918" k3="0.0506"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="0.0029" k2="-0.0918" k3="0.0506"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="10" k1="-0.0197" k2="-0.0373" k3="0.0173"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="1000" k1="-0.0197" k2="-0.0373" k3="0.0173"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="10" k1="-0.0141" k2="-0.0505" k3="0.0269"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="1000" k1="-0.0141" k2="-0.0505" k3="0.0269"/>
++            <vignetting model="pa" focal="85" aperture="32" distance="10" k1="-0.0847" k2="0.1009" k3="-0.0537"/>
++            <vignetting model="pa" focal="85" aperture="32" distance="1000" k1="-0.0847" k2="0.1009" k3="-0.0537"/>
++            <vignetting model="pa" focal="110" aperture="2.8" distance="10" k1="-0.1402" k2="0.0305" k3="-0.0246"/>
++            <vignetting model="pa" focal="110" aperture="2.8" distance="1000" k1="-0.1402" k2="0.0305" k3="-0.0246"/>
++            <vignetting model="pa" focal="110" aperture="3.2" distance="10" k1="-0.0204" k2="-0.0462" k3="0.0239"/>
++            <vignetting model="pa" focal="110" aperture="3.2" distance="1000" k1="-0.0204" k2="-0.0462" k3="0.0239"/>
++            <vignetting model="pa" focal="110" aperture="3.5" distance="10" k1="-0.0154" k2="-0.0677" k3="0.0381"/>
++            <vignetting model="pa" focal="110" aperture="3.5" distance="1000" k1="-0.0154" k2="-0.0677" k3="0.0381"/>
++            <vignetting model="pa" focal="110" aperture="4" distance="10" k1="-0.0092" k2="-0.0658" k3="0.0336"/>
++            <vignetting model="pa" focal="110" aperture="4" distance="1000" k1="-0.0092" k2="-0.0658" k3="0.0336"/>
++            <vignetting model="pa" focal="110" aperture="4.5" distance="10" k1="-0.0149" k2="-0.0489" k3="0.0240"/>
++            <vignetting model="pa" focal="110" aperture="4.5" distance="1000" k1="-0.0149" k2="-0.0489" k3="0.0240"/>
++            <vignetting model="pa" focal="110" aperture="5" distance="10" k1="-0.0198" k2="-0.0329" k3="0.0136"/>
++            <vignetting model="pa" focal="110" aperture="5" distance="1000" k1="-0.0198" k2="-0.0329" k3="0.0136"/>
++            <vignetting model="pa" focal="110" aperture="32" distance="10" k1="-0.0558" k2="0.0293" k3="-0.0073"/>
++            <vignetting model="pa" focal="110" aperture="32" distance="1000" k1="-0.0558" k2="0.0293" k3="-0.0073"/>
++            <vignetting model="pa" focal="125" aperture="2.8" distance="10" k1="-0.1253" k2="0.0642" k3="-0.1090"/>
++            <vignetting model="pa" focal="125" aperture="2.8" distance="1000" k1="-0.1253" k2="0.0642" k3="-0.1090"/>
++            <vignetting model="pa" focal="125" aperture="3.2" distance="10" k1="-0.0445" k2="0.0677" k3="-0.0963"/>
++            <vignetting model="pa" focal="125" aperture="3.2" distance="1000" k1="-0.0445" k2="0.0677" k3="-0.0963"/>
++            <vignetting model="pa" focal="125" aperture="3.5" distance="10" k1="-0.0221" k2="-0.0096" k3="-0.0222"/>
++            <vignetting model="pa" focal="125" aperture="3.5" distance="1000" k1="-0.0221" k2="-0.0096" k3="-0.0222"/>
++            <vignetting model="pa" focal="125" aperture="4" distance="10" k1="-0.0018" k2="-0.0923" k3="0.0540"/>
++            <vignetting model="pa" focal="125" aperture="4" distance="1000" k1="-0.0018" k2="-0.0923" k3="0.0540"/>
++            <vignetting model="pa" focal="125" aperture="4.5" distance="10" k1="-0.0074" k2="-0.0714" k3="0.0383"/>
++            <vignetting model="pa" focal="125" aperture="4.5" distance="1000" k1="-0.0074" k2="-0.0714" k3="0.0383"/>
++            <vignetting model="pa" focal="125" aperture="5" distance="10" k1="-0.0068" k2="-0.0698" k3="0.0385"/>
++            <vignetting model="pa" focal="125" aperture="5" distance="1000" k1="-0.0068" k2="-0.0698" k3="0.0385"/>
++            <vignetting model="pa" focal="125" aperture="5.6" distance="10" k1="-0.0031" k2="-0.0699" k3="0.0398"/>
++            <vignetting model="pa" focal="125" aperture="5.6" distance="1000" k1="-0.0031" k2="-0.0699" k3="0.0398"/>
++            <vignetting model="pa" focal="125" aperture="32" distance="10" k1="0.0117" k2="-0.1081" k3="0.0635"/>
++            <vignetting model="pa" focal="125" aperture="32" distance="1000" k1="0.0117" k2="-0.1081" k3="0.0635"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="10" k1="-0.0094" k2="-0.4307" k3="0.2087"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.0094" k2="-0.4307" k3="0.2087"/>
++            <vignetting model="pa" focal="150" aperture="3.2" distance="10" k1="0.0530" k2="-0.2295" k3="0.0398"/>
++            <vignetting model="pa" focal="150" aperture="3.2" distance="1000" k1="0.0530" k2="-0.2295" k3="0.0398"/>
++            <vignetting model="pa" focal="150" aperture="3.5" distance="10" k1="-0.0266" k2="0.0369" k3="-0.1150"/>
++            <vignetting model="pa" focal="150" aperture="3.5" distance="1000" k1="-0.0266" k2="0.0369" k3="-0.1150"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="10" k1="-0.0337" k2="0.0380" k3="-0.0655"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="-0.0337" k2="0.0380" k3="-0.0655"/>
++            <vignetting model="pa" focal="150" aperture="4.5" distance="10" k1="-0.0041" k2="-0.0799" k3="0.0457"/>
++            <vignetting model="pa" focal="150" aperture="4.5" distance="1000" k1="-0.0041" k2="-0.0799" k3="0.0457"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="10" k1="0.0138" k2="-0.0983" k3="0.0526"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="0.0138" k2="-0.0983" k3="0.0526"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="0.0207" k2="-0.1075" k3="0.0588"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0207" k2="-0.1075" k3="0.0588"/>
++            <vignetting model="pa" focal="150" aperture="32" distance="10" k1="-0.0929" k2="0.1243" k3="-0.0773"/>
++            <vignetting model="pa" focal="150" aperture="32" distance="1000" k1="-0.0929" k2="0.1243" k3="-0.0773"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.6524" k2="0.5794" k3="-0.2625"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.6524" k2="0.5794" k3="-0.2625"/>
++            <vignetting model="pa" focal="200" aperture="3.2" distance="10" k1="-0.1400" k2="-0.3498" k3="0.2594"/>
++            <vignetting model="pa" focal="200" aperture="3.2" distance="1000" k1="-0.1400" k2="-0.3498" k3="0.2594"/>
++            <vignetting model="pa" focal="200" aperture="3.5" distance="10" k1="0.0200" k2="-0.5221" k3="0.3096"/>
++            <vignetting model="pa" focal="200" aperture="3.5" distance="1000" k1="0.0200" k2="-0.5221" k3="0.3096"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="0.0579" k2="-0.2879" k3="0.0876"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="0.0579" k2="-0.2879" k3="0.0876"/>
++            <vignetting model="pa" focal="200" aperture="4.5" distance="10" k1="-0.0394" k2="0.0754" k3="-0.1206"/>
++            <vignetting model="pa" focal="200" aperture="4.5" distance="1000" k1="-0.0394" k2="0.0754" k3="-0.1206"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.0281" k2="0.0202" k3="-0.0490"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.0281" k2="0.0202" k3="-0.0490"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0011" k2="-0.0841" k3="0.0489"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0011" k2="-0.0841" k3="0.0489"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="0.0128" k2="-0.0975" k3="0.0555"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="0.0128" k2="-0.0975" k3="0.0555"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="0.0074" k2="-0.0845" k3="0.0471"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="0.0074" k2="-0.0845" k3="0.0471"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0520" k2="0.0370" k3="-0.0141"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0520" k2="0.0370" k3="-0.0141"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-200mm f/2.8L IS USM + EF 1.4x extender</model>
++        <model lang="en">Canon EF 70-200mm f/2.8L IS USM + EF 1.4× ext.</model>
++        <model lang="de">Canon EF 70-200mm f/2.8L IS USM + EF 1,4×-Konv.</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="98" k1="-0.012279"/>
++            <distortion model="poly3" focal="105" k1="-0.012117"/>
++            <distortion model="poly3" focal="110" k1="-0.011447"/>
++            <distortion model="poly3" focal="120" k1="-0.010878"/>
++            <distortion model="poly3" focal="135" k1="-0.00804"/>
++            <distortion model="poly3" focal="145" k1="-0.00886"/>
++            <distortion model="poly3" focal="160" k1="-0.00706"/>
++            <distortion model="poly3" focal="185" k1="-0.006693"/>
++            <distortion model="poly3" focal="220" k1="-0.006125"/>
++            <distortion model="poly3" focal="245" k1="-0.004999"/>
++            <distortion model="poly3" focal="280" k1="-0.004683"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 70-200mm f/2.8L IS II USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0.00109" b="-0.01393" c="0.00917" />
+-            <distortion model="ptlens" focal="88" a="0.00034" b="-0.00584" c="0.00243" />
+-            <distortion model="ptlens" focal="102" a="0.00261" b="-0.00765" c="0.00252" />
+-            <distortion model="ptlens" focal="120" a="0.00426" b="-0.0109" c="0.00708" />
+-            <distortion model="ptlens" focal="135" a="0.00091" b="0.00263" c="-0.00627" />
+-            <distortion model="ptlens" focal="160" a="-0.00014" b="0.00502" c="-0.00361" />
+-            <distortion model="ptlens" focal="200" a="0.00255" b="-0.00438" c="0.01481" />
++            <distortion model="ptlens" focal="70" a="0.00109" b="-0.01393" c="0.00917"/>
++            <distortion model="ptlens" focal="88" a="0.00034" b="-0.00584" c="0.00243"/>
++            <distortion model="ptlens" focal="102" a="0.00261" b="-0.00765" c="0.00252"/>
++            <distortion model="ptlens" focal="120" a="0.00426" b="-0.0109" c="0.00708"/>
++            <distortion model="ptlens" focal="135" a="0.00091" b="0.00263" c="-0.00627"/>
++            <distortion model="ptlens" focal="160" a="-0.00014" b="0.00502" c="-0.00361"/>
++            <distortion model="ptlens" focal="200" a="0.00255" b="-0.00438" c="0.01481"/>
++            <!--  Taken with a Canon 5D Mark IV  -->
++            <tca model="poly3" focal="70" br="0.0000171" vr="1.0000644" bb="-0.0000030" vb="1.0000288"/>
++            <tca model="poly3" focal="88" br="0.0000040" vr="1.0000583" bb="-0.0000056" vb="1.0000250"/>
++            <tca model="poly3" focal="100" br="-0.0000002" vr="1.0000446" bb="-0.0000080" vb="1.0000233"/>
++            <tca model="poly3" focal="120" br="0.0000030" vr="1.0000206" bb="-0.0000136" vb="1.0000219"/>
++            <tca model="poly3" focal="135" br="0.0000083" vr="0.9999870" bb="-0.0000138" vb="1.0000133"/>
++            <tca model="poly3" focal="200" br="0.0000041" vr="0.9998857" bb="-0.0000289" vb="1.0000341"/>
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1.1" k1="-0.6903" k2="0.4915" k3="-0.4215"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="2.2" k1="-0.7032" k2="0.5010" k3="-0.3688"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="6.6" k1="-0.7044" k2="0.5140" k3="-0.3822"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.6992" k2="0.4928" k3="-0.3584"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1.1" k1="-0.1523" k2="0.0629" k3="-0.3971"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="2.2" k1="-0.1805" k2="0.1006" k3="-0.3310"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="6.6" k1="-0.1908" k2="0.1437" k3="-0.3707"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1751" k2="0.0818" k3="-0.3094"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1.1" k1="-0.3493" k2="0.7191" k3="-0.7897"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="2.2" k1="-0.3213" k2="0.5350" k3="-0.5394"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="6.6" k1="-0.3404" k2="0.6019" k3="-0.5957"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3198" k2="0.5243" k3="-0.5184"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1.1" k1="-0.3772" k2="0.7410" k3="-0.7060"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="2.2" k1="-0.2877" k2="0.3610" k3="-0.3299"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="6.6" k1="-0.2978" k2="0.3942" k3="-0.3545"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2864" k2="0.3514" k3="-0.3141"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1.1" k1="-0.3134" k2="0.4626" k3="-0.4231"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="2.2" k1="-0.2799" k2="0.3009" k3="-0.2530"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="6.6" k1="-0.2883" k2="0.3303" k3="-0.2752"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2804" k2="0.3049" k3="-0.2529"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1.1" k1="-0.2986" k2="0.3882" k3="-0.3436"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="2.2" k1="-0.2800" k2="0.2825" k3="-0.2246"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="6.6" k1="-0.2911" k2="0.3217" k3="-0.2563"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2819" k2="0.2923" k3="-0.2304"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1.1" k1="-0.2983" k2="0.3751" k3="-0.3249"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="2.2" k1="-0.2796" k2="0.2666" k3="-0.2031"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="6.6" k1="-0.2941" k2="0.3210" k3="-0.2496"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2864" k2="0.2932" k3="-0.2235"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1.1" k1="-0.3010" k2="0.3744" k3="-0.3195"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="2.2" k1="-0.2808" k2="0.2589" k3="-0.1912"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="6.6" k1="-0.2999" k2="0.3276" k3="-0.2489"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.2917" k2="0.2960" k3="-0.2192"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1.1" k1="-0.4127" k2="-0.8186" k3="0.5474"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="2.2" k1="-0.3584" k2="-0.5409" k3="0.2464"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="6.6" k1="-0.3842" k2="-0.3887" k3="0.1295"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.3807" k2="-0.3923" k3="0.1283"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1.1" k1="0.1766" k2="-1.3863" k3="0.6308"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="2.2" k1="0.0256" k2="-0.6318" k3="0.0693"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="6.6" k1="-0.0139" k2="-0.4667" k3="-0.0410"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0140" k2="-0.4695" k3="-0.0407"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1.1" k1="-0.0564" k2="-0.2502" k3="-0.2590"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="2.2" k1="-0.2328" k2="0.3530" k3="-0.6180"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="6.6" k1="-0.2563" k2="0.4342" k3="-0.6531"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.2521" k2="0.4154" k3="-0.6411"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1.1" k1="-0.3159" k2="0.6907" k3="-0.9083"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="2.2" k1="-0.3821" k2="0.8224" k3="-0.8810"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="6.6" k1="-0.3718" k2="0.7842" k3="-0.8262"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.3669" k2="0.7595" k3="-0.8071"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1.1" k1="-0.4569" k2="1.1204" k3="-1.1430"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="2.2" k1="-0.4052" k2="0.8352" k3="-0.8031"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="6.6" k1="-0.3698" k2="0.7073" k3="-0.6829"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.3644" k2="0.6871" k3="-0.6710"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1.1" k1="-0.4712" k2="1.1108" k3="-1.0630"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="2.2" k1="-0.3781" k2="0.6930" k3="-0.6437"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="6.6" k1="-0.3465" k2="0.5848" k3="-0.5439"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.3417" k2="0.5641" k3="-0.5299"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1.1" k1="-0.4159" k2="0.8655" k3="-0.8143"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="2.2" k1="-0.3567" k2="0.5901" k3="-0.5326"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="6.6" k1="-0.3424" k2="0.5596" k3="-0.5155"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.3323" k2="0.5078" k3="-0.4635"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1.1" k1="-0.3706" k2="0.6724" k3="-0.6293"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="2.2" k1="-0.3552" k2="0.5638" k3="-0.4961"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="6.6" k1="-0.3401" k2="0.5322" k3="-0.4787"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.3321" k2="0.4860" k3="-0.4315"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1.1" k1="-0.9114" k2="0.1148" k3="0.1331"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="2.2" k1="-0.5217" k2="-0.6324" k3="0.5138"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="6.6" k1="-0.5075" k2="-0.6224" k3="0.4935"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.4616" k2="-0.7000" k3="0.5298"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1.1" k1="0.0836" k2="-1.4986" k3="0.8879"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="2.2" k1="0.1548" k2="-1.3879" k3="0.7263"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="6.6" k1="0.1360" k2="-1.2941" k3="0.6588"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.1264" k2="-1.2471" k3="0.6209"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1.1" k1="0.0393" k2="-0.6959" k3="0.1619"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="2.2" k1="-0.0399" k2="-0.3418" k3="-0.0873"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="6.6" k1="-0.0671" k2="-0.2549" k3="-0.1339"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0846" k2="-0.1894" k3="-0.1807"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1.1" k1="-0.2401" k2="0.3734" k3="-0.5770"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="2.2" k1="-0.2865" k2="0.5155" k3="-0.6318"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="6.6" k1="-0.2847" k2="0.4939" k3="-0.5961"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2942" k2="0.5236" k3="-0.6136"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1.1" k1="-0.3775" k2="0.7654" k3="-0.7480"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="2.2" k1="-0.3560" k2="0.6547" k3="-0.6132"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="6.6" k1="-0.3248" k2="0.5429" k3="-0.5166"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.3200" k2="0.5307" k3="-0.5093"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1.1" k1="-0.3505" k2="0.5924" k3="-0.5254"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="2.2" k1="-0.3037" k2="0.4038" k3="-0.3422"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="6.6" k1="-0.2771" k2="0.3288" k3="-0.2919"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.2794" k2="0.3395" k3="-0.3011"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1.1" k1="-0.2934" k2="0.3457" k3="-0.2829"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="2.2" k1="-0.2917" k2="0.3279" k3="-0.2543"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="6.6" k1="-0.2686" k2="0.2746" k3="-0.2265"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2745" k2="0.2974" k3="-0.2460"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1.1" k1="-0.2895" k2="0.3111" k3="-0.2395"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="2.2" k1="-0.2948" k2="0.3140" k3="-0.2270"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="6.6" k1="-0.2624" k2="0.2556" k3="-0.2102"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.2744" k2="0.2780" k3="-0.2174"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1.1" k1="-1.0106" k2="0.6461" k3="-0.2061"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="2.2" k1="-1.2689" k2="1.1306" k3="-0.4702"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="6.6" k1="-1.4187" k2="1.4460" k3="-0.6515"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.3763" k2="1.3539" k3="-0.5966"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1.1" k1="-0.4700" k2="-0.4018" k3="0.3900"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="2.2" k1="-0.2008" k2="-0.9436" k3="0.6831"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="6.6" k1="-0.1684" k2="-0.9831" k3="0.6955"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.1467" k2="-1.0150" k3="0.7087"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1.1" k1="0.0799" k2="-1.0113" k3="0.5261"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="2.2" k1="0.0745" k2="-0.8751" k3="0.4136"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="6.6" k1="0.0578" k2="-0.8091" k3="0.3684"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0523" k2="-0.7662" k3="0.3361"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1.1" k1="-0.1596" k2="0.0923" k3="-0.2576"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="2.2" k1="-0.1845" k2="0.1739" k3="-0.2892"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="6.6" k1="-0.1901" k2="0.1756" k3="-0.2789"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1936" k2="0.1920" k3="-0.2842"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1.1" k1="-0.2535" k2="0.3075" k3="-0.2632"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="2.2" k1="-0.2348" k2="0.2272" k3="-0.1771"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="6.6" k1="-0.2227" k2="0.1756" k3="-0.1347"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2164" k2="0.1547" k3="-0.1135"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1.1" k1="-0.1965" k2="0.0573" k3="-0.0079"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="2.2" k1="-0.2088" k2="0.0847" k3="-0.0200"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="6.6" k1="-0.2046" k2="0.0693" k3="-0.0136"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2059" k2="0.0741" k3="-0.0143"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1.1" k1="-0.2089" k2="0.0698" k3="-0.0029"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="2.2" k1="-0.2144" k2="0.0843" k3="-0.0087"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="6.6" k1="-0.2084" k2="0.0650" k3="-0.0001"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.2118" k2="0.0734" k3="-0.0019"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1.1" k1="-0.2151" k2="0.0762" k3="-0.0006"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="2.2" k1="-0.2250" k2="0.1005" k3="-0.0129"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="6.6" k1="-0.2227" k2="0.0901" k3="-0.0095"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.2221" k2="0.0892" k3="-0.0062"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-200mm f/2.8L IS II USM + EF 2x extender III</model>
++        <model lang="en">Canon EF 70-200mm f/2.8L IS II USM + EF 2× III ext.</model>
++        <model lang="de">Canon EF 70-200mm f/2.8L IS II USM + EF-2×-III-Konv.</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="140" k1="-0.00468"/>
++            <distortion model="poly3" focal="178" k1="-0.00355"/>
++            <distortion model="poly3" focal="238" k1="-0.00237"/>
++            <distortion model="poly3" focal="400" k1="-0.00093"/>
++            <tca model="poly3" focal="140" vr="1.0000739" vb="1.0000602"/>
++            <tca model="poly3" focal="178" vr="1.0000314" vb="1.0000274"/>
++            <tca model="poly3" focal="238" vr="0.9999896" vb="1.0000007"/>
++            <tca model="poly3" focal="400" vr="0.9999295" vb="1.0000002"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-200mm f/2.8L IS USM + EF 2x II extender</model>
++        <model lang="en">Canon EF 70-200mm f/2.8L IS USM + EF 2× II ext.</model>
++        <model lang="de">Canon EF 70-200mm f/2.8L IS USM + EF-2×-II-Konv.</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 7D -->
++            <distortion model="poly3" focal="140" k1="-0.0027"/>
++            <distortion model="poly3" focal="190" k1="-0.00124"/>
++            <distortion model="poly3" focal="235" k1="-0.00015"/>
++            <distortion model="poly3" focal="255" k1="-0.00047"/>
++            <distortion model="poly3" focal="400" k1="0.00062"/>
++            <tca model="poly3" focal="140" vr="0.9999518" vb="1.0000085"/>
++            <tca model="poly3" focal="180" vr="0.9999436" vb="1.0000419"/>
++            <tca model="poly3" focal="210" vr="0.9999476" vb="1.0000140"/>
++            <tca model="poly3" focal="225" vr="0.9999764" vb="0.9999922"/>
++            <tca model="poly3" focal="265" vr="0.9999783" vb="0.9999744"/>
++            <tca model="poly3" focal="280" vr="0.9999688" vb="0.9999704"/>
++            <tca model="poly3" focal="375" vr="0.9998042" vb="0.9999432"/>
++            <tca model="poly3" focal="400" vr="0.9999603" vb="0.9999963"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="-0.0783" k2="-0.0282" k3="0.0157"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="-0.0783" k2="-0.0282" k3="0.0157"/>
++            <vignetting model="pa" focal="140" aperture="6.3" distance="10" k1="0.0051" k2="-0.1103" k3="0.0752"/>
++            <vignetting model="pa" focal="140" aperture="6.3" distance="1000" k1="0.0051" k2="-0.1103" k3="0.0752"/>
++            <vignetting model="pa" focal="140" aperture="7.1" distance="10" k1="-0.0068" k2="-0.0777" k3="0.0483"/>
++            <vignetting model="pa" focal="140" aperture="7.1" distance="1000" k1="-0.0068" k2="-0.0777" k3="0.0483"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="-0.0067" k2="-0.0833" k3="0.0559"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="-0.0067" k2="-0.0833" k3="0.0559"/>
++            <vignetting model="pa" focal="140" aperture="9" distance="10" k1="-0.0062" k2="-0.0692" k3="0.0433"/>
++            <vignetting model="pa" focal="140" aperture="9" distance="1000" k1="-0.0062" k2="-0.0692" k3="0.0433"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="10" k1="-0.0006" k2="-0.1214" k3="0.0871"/>
++            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.0006" k2="-0.1214" k3="0.0871"/>
++            <vignetting model="pa" focal="140" aperture="64" distance="10" k1="-0.0497" k2="-0.0086" k3="0.0104"/>
++            <vignetting model="pa" focal="140" aperture="64" distance="1000" k1="-0.0497" k2="-0.0086" k3="0.0104"/>
++            <vignetting model="pa" focal="160" aperture="5.6" distance="10" k1="-0.0720" k2="0.0103" k3="-0.0128"/>
++            <vignetting model="pa" focal="160" aperture="5.6" distance="1000" k1="-0.0720" k2="0.0103" k3="-0.0128"/>
++            <vignetting model="pa" focal="160" aperture="6.3" distance="10" k1="-0.0034" k2="-0.0660" k3="0.0393"/>
++            <vignetting model="pa" focal="160" aperture="6.3" distance="1000" k1="-0.0034" k2="-0.0660" k3="0.0393"/>
++            <vignetting model="pa" focal="160" aperture="7.1" distance="10" k1="-0.0030" k2="-0.0680" k3="0.0411"/>
++            <vignetting model="pa" focal="160" aperture="7.1" distance="1000" k1="-0.0030" k2="-0.0680" k3="0.0411"/>
++            <vignetting model="pa" focal="160" aperture="8" distance="10" k1="-0.0047" k2="-0.0666" k3="0.0418"/>
++            <vignetting model="pa" focal="160" aperture="8" distance="1000" k1="-0.0047" k2="-0.0666" k3="0.0418"/>
++            <vignetting model="pa" focal="160" aperture="64" distance="10" k1="-0.0967" k2="0.0979" k3="-0.0503"/>
++            <vignetting model="pa" focal="160" aperture="64" distance="1000" k1="-0.0967" k2="0.0979" k3="-0.0503"/>
++            <vignetting model="pa" focal="165" aperture="5.6" distance="10" k1="-0.0382" k2="-0.0735" k3="0.0289"/>
++            <vignetting model="pa" focal="165" aperture="5.6" distance="1000" k1="-0.0382" k2="-0.0735" k3="0.0289"/>
++            <vignetting model="pa" focal="165" aperture="6.3" distance="10" k1="-0.0049" k2="-0.0794" k3="0.0425"/>
++            <vignetting model="pa" focal="165" aperture="6.3" distance="1000" k1="-0.0049" k2="-0.0794" k3="0.0425"/>
++            <vignetting model="pa" focal="165" aperture="7.1" distance="10" k1="-0.0231" k2="-0.0500" k3="0.0288"/>
++            <vignetting model="pa" focal="165" aperture="7.1" distance="1000" k1="-0.0231" k2="-0.0500" k3="0.0288"/>
++            <vignetting model="pa" focal="165" aperture="8" distance="10" k1="-0.0211" k2="-0.0529" k3="0.0301"/>
++            <vignetting model="pa" focal="165" aperture="8" distance="1000" k1="-0.0211" k2="-0.0529" k3="0.0301"/>
++            <vignetting model="pa" focal="165" aperture="11" distance="10" k1="-0.0112" k2="-0.0849" k3="0.0542"/>
++            <vignetting model="pa" focal="165" aperture="11" distance="1000" k1="-0.0112" k2="-0.0849" k3="0.0542"/>
++            <vignetting model="pa" focal="165" aperture="64" distance="10" k1="-0.0672" k2="0.0622" k3="-0.0322"/>
++            <vignetting model="pa" focal="165" aperture="64" distance="1000" k1="-0.0672" k2="0.0622" k3="-0.0322"/>
++            <vignetting model="pa" focal="190" aperture="5.6" distance="10" k1="-0.0132" k2="-0.0964" k3="0.0375"/>
++            <vignetting model="pa" focal="190" aperture="5.6" distance="1000" k1="-0.0132" k2="-0.0964" k3="0.0375"/>
++            <vignetting model="pa" focal="190" aperture="6.3" distance="10" k1="0.0160" k2="-0.1185" k3="0.0671"/>
++            <vignetting model="pa" focal="190" aperture="6.3" distance="1000" k1="0.0160" k2="-0.1185" k3="0.0671"/>
++            <vignetting model="pa" focal="190" aperture="7.1" distance="10" k1="0.0141" k2="-0.1170" k3="0.0679"/>
++            <vignetting model="pa" focal="190" aperture="7.1" distance="1000" k1="0.0141" k2="-0.1170" k3="0.0679"/>
++            <vignetting model="pa" focal="190" aperture="8" distance="10" k1="-0.0013" k2="-0.0870" k3="0.0468"/>
++            <vignetting model="pa" focal="190" aperture="8" distance="1000" k1="-0.0013" k2="-0.0870" k3="0.0468"/>
++            <vignetting model="pa" focal="190" aperture="11" distance="10" k1="-0.0183" k2="-0.0594" k3="0.0346"/>
++            <vignetting model="pa" focal="190" aperture="11" distance="1000" k1="-0.0183" k2="-0.0594" k3="0.0346"/>
++            <vignetting model="pa" focal="190" aperture="64" distance="10" k1="-0.0223" k2="-0.0383" k3="0.0239"/>
++            <vignetting model="pa" focal="190" aperture="64" distance="1000" k1="-0.0223" k2="-0.0383" k3="0.0239"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0550" k2="0.0007" k3="-0.0101"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0550" k2="0.0007" k3="-0.0101"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0001" k2="-0.0676" k3="0.0397"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0001" k2="-0.0676" k3="0.0397"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="0.0034" k2="-0.0804" k3="0.0498"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="0.0034" k2="-0.0804" k3="0.0498"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0019" k2="-0.0688" k3="0.0423"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0019" k2="-0.0688" k3="0.0423"/>
++            <vignetting model="pa" focal="200" aperture="64" distance="10" k1="-0.0844" k2="0.0909" k3="-0.0443"/>
++            <vignetting model="pa" focal="200" aperture="64" distance="1000" k1="-0.0844" k2="0.0909" k3="-0.0443"/>
++            <vignetting model="pa" focal="265" aperture="5.6" distance="10" k1="-0.0089" k2="-0.0905" k3="0.0390"/>
++            <vignetting model="pa" focal="265" aperture="5.6" distance="1000" k1="-0.0089" k2="-0.0905" k3="0.0390"/>
++            <vignetting model="pa" focal="265" aperture="6.3" distance="10" k1="0.0207" k2="-0.1311" k3="0.0823"/>
++            <vignetting model="pa" focal="265" aperture="6.3" distance="1000" k1="0.0207" k2="-0.1311" k3="0.0823"/>
++            <vignetting model="pa" focal="265" aperture="7.1" distance="10" k1="0.0152" k2="-0.1170" k3="0.0737"/>
++            <vignetting model="pa" focal="265" aperture="7.1" distance="1000" k1="0.0152" k2="-0.1170" k3="0.0737"/>
++            <vignetting model="pa" focal="265" aperture="8" distance="10" k1="0.0151" k2="-0.1242" k3="0.0816"/>
++            <vignetting model="pa" focal="265" aperture="8" distance="1000" k1="0.0151" k2="-0.1242" k3="0.0816"/>
++            <vignetting model="pa" focal="265" aperture="11" distance="10" k1="-0.0025" k2="-0.0816" k3="0.0459"/>
++            <vignetting model="pa" focal="265" aperture="11" distance="1000" k1="-0.0025" k2="-0.0816" k3="0.0459"/>
++            <vignetting model="pa" focal="265" aperture="64" distance="10" k1="-0.0220" k2="-0.0406" k3="0.0311"/>
++            <vignetting model="pa" focal="265" aperture="64" distance="1000" k1="-0.0220" k2="-0.0406" k3="0.0311"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="10" k1="-0.1755" k2="0.0050" k3="0.0208"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-0.1755" k2="0.0050" k3="0.0208"/>
++            <vignetting model="pa" focal="400" aperture="6.3" distance="10" k1="0.0355" k2="-0.1900" k3="0.0915"/>
++            <vignetting model="pa" focal="400" aperture="6.3" distance="1000" k1="0.0355" k2="-0.1900" k3="0.0915"/>
++            <vignetting model="pa" focal="400" aperture="7.1" distance="10" k1="0.0050" k2="-0.0797" k3="0.0431"/>
++            <vignetting model="pa" focal="400" aperture="7.1" distance="1000" k1="0.0050" k2="-0.0797" k3="0.0431"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="10" k1="0.0215" k2="-0.1075" k3="0.0624"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="0.0215" k2="-0.1075" k3="0.0624"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="10" k1="0.0196" k2="-0.1070" k3="0.0566"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="0.0196" k2="-0.1070" k3="0.0566"/>
++            <vignetting model="pa" focal="400" aperture="64" distance="10" k1="-0.0714" k2="0.0582" k3="-0.0268"/>
++            <vignetting model="pa" focal="400" aperture="64" distance="1000" k1="-0.0714" k2="0.0582" k3="-0.0268"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 70-200mm f/4L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.006408" c="0" />
+-            <distortion model="ptlens" focal="75" a="0" b="-0.005162" c="0" />
+-            <distortion model="ptlens" focal="81" a="0" b="-0.003271" c="0" />
+-            <distortion model="ptlens" focal="94" a="0" b="0.000642" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.002069" c="0" />
+-            <distortion model="ptlens" focal="109" a="0" b="0.003375" c="0" />
+-            <distortion model="ptlens" focal="122" a="0" b="0.004125" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.005898" c="0" />
+-            <distortion model="ptlens" focal="145" a="0" b="0.006262" c="0" />
+-            <distortion model="ptlens" focal="159" a="0" b="0.007369" c="0" />
+-            <distortion model="ptlens" focal="168" a="0" b="0.008619" c="0" />
+-            <distortion model="ptlens" focal="184" a="0" b="0.008464" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.008816" c="0" />
++            <distortion model="poly3" focal="70" k1="-0.006408"/>
++            <distortion model="poly3" focal="75" k1="-0.005162"/>
++            <distortion model="poly3" focal="81" k1="-0.003271"/>
++            <distortion model="poly3" focal="94" k1="0.000642"/>
++            <distortion model="poly3" focal="100" k1="0.002069"/>
++            <distortion model="poly3" focal="109" k1="0.003375"/>
++            <distortion model="poly3" focal="122" k1="0.004125"/>
++            <distortion model="poly3" focal="135" k1="0.005898"/>
++            <distortion model="poly3" focal="145" k1="0.006262"/>
++            <distortion model="poly3" focal="159" k1="0.007369"/>
++            <distortion model="poly3" focal="168" k1="0.008619"/>
++            <distortion model="poly3" focal="184" k1="0.008464"/>
++            <distortion model="poly3" focal="200" k1="0.008816"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 70-200mm f/4L USM + EF 1.4x ext</model>
++        <model>Canon EF 70-200mm f/4L USM + EF 1.4x extender</model>
++        <model lang="en">Canon EF 70-200mm f/4L USM + EF 1.4× ext.</model>
++        <model lang="de">Canon EF 70-200mm f/4L USM + EF 1,4×-Konv.</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="98" a="0" b="-0.011699" c="0" />
+-            <distortion model="ptlens" focal="109" a="0" b="-0.010575" c="0" />
+-            <distortion model="ptlens" focal="117" a="0" b="-0.008594" c="0" />
+-            <distortion model="ptlens" focal="127" a="0" b="-0.008167" c="0" />
+-            <distortion model="ptlens" focal="140" a="0" b="-0.007141" c="0" />
+-            <distortion model="ptlens" focal="158" a="0" b="-0.005869" c="0" />
+-            <distortion model="ptlens" focal="176" a="0" b="-0.00486" c="0" />
+-            <distortion model="ptlens" focal="189" a="0" b="-0.005166" c="0" />
+-            <distortion model="ptlens" focal="203" a="0" b="-0.004933" c="0" />
+-            <distortion model="ptlens" focal="222" a="0" b="-0.004657" c="0" />
+-            <distortion model="ptlens" focal="235" a="0" b="-0.004297" c="0" />
+-            <distortion model="ptlens" focal="280" a="0" b="-0.002653" c="0" />
++            <distortion model="poly3" focal="98" k1="-0.011699"/>
++            <distortion model="poly3" focal="109" k1="-0.010575"/>
++            <distortion model="poly3" focal="117" k1="-0.008594"/>
++            <distortion model="poly3" focal="127" k1="-0.008167"/>
++            <distortion model="poly3" focal="140" k1="-0.007141"/>
++            <distortion model="poly3" focal="158" k1="-0.005869"/>
++            <distortion model="poly3" focal="176" k1="-0.00486"/>
++            <distortion model="poly3" focal="189" k1="-0.005166"/>
++            <distortion model="poly3" focal="203" k1="-0.004933"/>
++            <distortion model="poly3" focal="222" k1="-0.004657"/>
++            <distortion model="poly3" focal="235" k1="-0.004297"/>
++            <distortion model="poly3" focal="280" k1="-0.002653"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon 70-200mm f/4L IS USM</model>
++        <model>Canon EF 70-200mm f/4L IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="-0.012" b="0.037" c="-0.046" />
+-            <distortion model="ptlens" focal="97" a="0.008" b="-0.025" c="0.028" />
+-            <distortion model="ptlens" focal="127" a="0.001" b="0.004" c="-0.001" />
+-            <distortion model="ptlens" focal="200" a="-0.005" b="0.032" c="-0.031" />
++            <distortion model="ptlens" focal="70" a="-0.012" b="0.037" c="-0.046"/>
++            <distortion model="ptlens" focal="97" a="0.008" b="-0.025" c="0.028"/>
++            <distortion model="ptlens" focal="127" a="0.001" b="0.004" c="-0.001"/>
++            <distortion model="ptlens" focal="200" a="-0.005" b="0.032" c="-0.031"/>
++            <!-- Taken with Canon 5D Mark III -->
++            <tca model="poly3" focal="70" br="0.0000002" vr="1.0001779" bb="-0.0000138" vb="1.0001003"/>
++            <tca model="poly3" focal="100" br="-0.0000004" vr="1.0000236" bb="-0.0000081" vb="1.0001239"/>
++            <tca model="poly3" focal="135" br="0.0000079" vr="0.9999147" bb="-0.0000141" vb="1.0001189"/>
++            <tca model="poly3" focal="165" br="0.0000133" vr="0.9998324" bb="-0.0000299" vb="1.0000915"/>
++            <tca model="poly3" focal="200" br="0.0000097" vr="0.9998125" bb="-0.0000270" vb="1.0000112"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1.2" k1="-0.5200" k2="0.1223" k3="-0.0882"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="2.4" k1="-0.5088" k2="0.0999" k3="-0.0725"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="7.2" k1="-0.5123" k2="0.1057" k3="-0.0755"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5228" k2="0.1280" k3="-0.0927"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1.2" k1="-0.1859" k2="0.0559" k3="-0.1686"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="2.4" k1="-0.1773" k2="0.0381" k3="-0.1561"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="7.2" k1="-0.1891" k2="0.0626" k3="-0.1714"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1839" k2="0.0595" k3="-0.1739"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1.2" k1="-0.2517" k2="0.1818" k3="-0.1150"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="2.4" k1="-0.2462" k2="0.1726" k3="-0.1067"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="7.2" k1="-0.2393" k2="0.1445" k3="-0.0808"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2390" k2="0.1525" k3="-0.0951"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1.2" k1="-0.2019" k2="-0.0232" k3="0.0783"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="2.4" k1="-0.1959" k2="-0.0342" k3="0.0885"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="7.2" k1="-0.1947" k2="-0.0403" k3="0.0939"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1873" k2="-0.0534" k3="0.0967"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1.2" k1="-0.2015" k2="-0.0272" k3="0.0820"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="2.4" k1="-0.1983" k2="-0.0311" k3="0.0873"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="7.2" k1="-0.1973" k2="-0.0362" k3="0.0919"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.1876" k2="-0.0553" k3="0.0986"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1.2" k1="-0.2052" k2="-0.0230" k3="0.0809"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="2.4" k1="-0.2016" k2="-0.0263" k3="0.0855"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="7.2" k1="-0.2019" k2="-0.0269" k3="0.0864"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1913" k2="-0.0489" k3="0.0954"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1.2" k1="-0.2129" k2="-0.0085" k3="0.0730"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="2.4" k1="-0.2077" k2="-0.0147" k3="0.0794"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="7.2" k1="-0.2110" k2="-0.0064" k3="0.0733"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.1961" k2="-0.0393" k3="0.0896"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1.2" k1="-0.2161" k2="-0.9770" k3="0.5708"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="2.4" k1="-0.2959" k2="-0.2855" k3="0.0499"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="7.2" k1="-0.3594" k2="-0.0599" k3="-0.0874"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.3967" k2="0.0764" k3="-0.1680"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1.2" k1="0.0697" k2="-0.8185" k3="0.2449"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="2.4" k1="-0.1880" k2="0.1425" k3="-0.3280"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="7.2" k1="-0.2320" k2="0.2708" k3="-0.3750"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.2572" k2="0.3403" k3="-0.3979"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1.2" k1="-0.2376" k2="0.3575" k3="-0.5703"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="2.4" k1="-0.3169" k2="0.4956" k3="-0.4426"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="7.2" k1="-0.2981" k2="0.3958" k3="-0.3251"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.2702" k2="0.2787" k3="-0.2090"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1.2" k1="-0.3996" k2="0.8377" k3="-0.8039"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="2.4" k1="-0.2305" k2="0.1100" k3="-0.0437"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="7.2" k1="-0.2041" k2="0.0018" k3="0.0561"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1907" k2="-0.0409" k3="0.0881"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1.2" k1="-0.3768" k2="0.6594" k3="-0.5536"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="2.4" k1="-0.1958" k2="-0.0341" k3="0.0890"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="7.2" k1="-0.1956" k2="-0.0369" k3="0.0920"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1880" k2="-0.0529" k3="0.0985"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1.2" k1="-0.2728" k2="0.2260" k3="-0.1400"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="2.4" k1="-0.1993" k2="-0.0315" k3="0.0897"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="7.2" k1="-0.1989" k2="-0.0327" k3="0.0909"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.1897" k2="-0.0531" k3="0.1004"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1.2" k1="-0.2296" k2="0.0458" k3="0.0264"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="2.4" k1="-0.2059" k2="-0.0190" k3="0.0830"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="7.2" k1="-0.2061" k2="-0.0198" k3="0.0842"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1960" k2="-0.0421" k3="0.0946"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1.2" k1="-0.7218" k2="-0.3407" k3="0.4060"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="2.4" k1="-0.4301" k2="-0.6250" k3="0.4812"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="7.2" k1="-0.2731" k2="-0.8010" k3="0.5210"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.2639" k2="-0.7526" k3="0.4748"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1.2" k1="0.1366" k2="-1.6201" k3="0.9500"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="2.4" k1="0.0676" k2="-0.9085" k3="0.4165"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="7.2" k1="0.0087" k2="-0.6074" k3="0.1965"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0265" k2="-0.4691" k3="0.1092"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1.2" k1="0.0379" k2="-0.6698" k3="0.1309"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="2.4" k1="-0.2227" k2="0.2627" k3="-0.3791"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="7.2" k1="-0.2602" k2="0.3627" k3="-0.4059"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2729" k2="0.3859" k3="-0.3989"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1.2" k1="-0.2595" k2="0.4383" k3="-0.6210"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="2.4" k1="-0.2937" k2="0.3982" k3="-0.3308"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="7.2" k1="-0.2662" k2="0.2701" k3="-0.1967"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2353" k2="0.1478" k3="-0.0838"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1.2" k1="-0.3953" k2="0.8210" k3="-0.7791"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="2.4" k1="-0.2066" k2="0.0250" k3="0.0354"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="7.2" k1="-0.1909" k2="-0.0354" k3="0.0890"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1841" k2="-0.0515" k3="0.0965"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1.2" k1="-0.3597" k2="0.5933" k3="-0.4867"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="2.4" k1="-0.1950" k2="-0.0297" k3="0.0872"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="7.2" k1="-0.1936" k2="-0.0349" k3="0.0914"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1836" k2="-0.0570" k3="0.1018"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1.2" k1="-0.2665" k2="0.2087" k3="-0.1236"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="2.4" k1="-0.2008" k2="-0.0207" k3="0.0835"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="7.2" k1="-0.1996" k2="-0.0257" k3="0.0874"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1869" k2="-0.0541" k3="0.1019"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1.2" k1="-1.3869" k2="1.3645" k3="-0.5975"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="2.4" k1="-1.4572" k2="1.6038" k3="-0.7493"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="7.2" k1="-1.3355" k2="1.3855" k3="-0.6326"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-1.2097" k2="1.1495" k3="-0.5099"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1.2" k1="-0.5875" k2="-0.3199" k3="0.3901"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="2.4" k1="-0.1979" k2="-0.8929" k3="0.6569"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="7.2" k1="-0.0766" k2="-0.9730" k3="0.6522"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0028" k2="-1.0499" k3="0.6600"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1.2" k1="0.0953" k2="-1.2513" k3="0.7154"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="2.4" k1="0.0023" k2="-0.5947" k3="0.2501"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="7.2" k1="-0.0974" k2="-0.1938" k3="-0.0108"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1281" k2="-0.0890" k3="-0.0716"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1.2" k1="-0.1134" k2="-0.1124" k3="-0.1389"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="2.4" k1="-0.2417" k2="0.2666" k3="-0.2525"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="7.2" k1="-0.2329" k2="0.1868" k3="-0.1324"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2273" k2="0.1592" k3="-0.1016"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1.2" k1="-0.2923" k2="0.4301" k3="-0.3911"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="2.4" k1="-0.1960" k2="0.0129" k3="0.0467"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="7.2" k1="-0.1856" k2="-0.0280" k3="0.0830"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.1819" k2="-0.0335" k3="0.0817"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1.2" k1="-0.2181" k2="0.0813" k3="-0.0163"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="2.4" k1="-0.1916" k2="-0.0145" k3="0.0747"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="7.2" k1="-0.1888" k2="-0.0245" k3="0.0824"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1803" k2="-0.0404" k3="0.0870"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1.2" k1="-0.1975" k2="-0.0084" k3="0.0673"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="2.4" k1="-0.1957" k2="-0.0061" k3="0.0694"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="7.2" k1="-0.1944" k2="-0.0139" k3="0.0757"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1823" k2="-0.0364" k3="0.0843"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-200mm f/4L IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 650D -->
++            <distortion model="poly3" focal="70" k1="-0.00476"/>
++            <distortion model="poly3" focal="85" k1="-0.00094"/>
++            <distortion model="poly3" focal="135" k1="0.00256"/>
++            <distortion model="poly3" focal="200" k1="0.00608"/>
++            <tca model="poly3" focal="70" vr="1.0001" vb="1.0003"/>
++            <tca model="poly3" focal="85" vr="1.0001" vb="1.00015"/>
++            <tca model="poly3" focal="135" vr="0.9998" vb="1.0002"/>
++            <tca model="poly3" focal="200" vr="0.99975" vb="1"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 70-300mm f/4.5-5.6 DO IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.003445" c="0" />
+-            <distortion model="ptlens" focal="75" a="0" b="-0.001549" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.004544" c="0" />
+-            <distortion model="ptlens" focal="130" a="0" b="0.009179" c="0" />
+-            <distortion model="ptlens" focal="150" a="0" b="0.010655" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.010972" c="0" />
+-            <distortion model="ptlens" focal="230" a="0" b="0.009311" c="0" />
+-            <distortion model="ptlens" focal="270" a="0" b="0.011792" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.009986" c="0" />
++            <distortion model="poly3" focal="70" k1="-0.003445"/>
++            <distortion model="poly3" focal="75" k1="-0.001549"/>
++            <distortion model="poly3" focal="100" k1="0.004544"/>
++            <distortion model="poly3" focal="130" k1="0.009179"/>
++            <distortion model="poly3" focal="150" k1="0.010655"/>
++            <distortion model="poly3" focal="200" k1="0.010972"/>
++            <distortion model="poly3" focal="230" k1="0.009311"/>
++            <distortion model="poly3" focal="270" k1="0.011792"/>
++            <distortion model="poly3" focal="300" k1="0.009986"/>
++            <!-- Taken with Canon 5D Mark III -->
++            <tca model="poly3" focal="70" br="-0.0000749" vr="1.0007175" bb="0.0002339" vb="0.9998906"/>
++            <tca model="poly3" focal="90" br="-0.0001527" vr="1.0006139" bb="0.0003057" vb="0.9999619"/>
++            <tca model="poly3" focal="100" br="-0.0001323" vr="1.0003968" bb="0.0003134" vb="1.0000848"/>
++            <tca model="poly3" focal="140" br="-0.0001266" vr="1.0001416" bb="0.0003734" vb="1.0000699"/>
++            <tca model="poly3" focal="200" br="-0.0000490" vr="0.9998971" bb="-0.0000101" vb="1.0002337"/>
++            <tca model="poly3" focal="300" br="-0.0001831" vr="0.9997621" bb="-0.0000008" vb="0.9999507"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1.4" k1="-0.2177" k2="-0.7961" k3="0.5698"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="3" k1="-0.1991" k2="-0.8476" k3="0.6006"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.2295" k2="-0.7931" k3="0.5739"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.2517" k2="-0.7521" k3="0.5526"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1.4" k1="-0.0190" k2="-0.5247" k3="0.3056"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="3" k1="-0.0008" k2="-0.5503" k3="0.3197"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.0110" k2="-0.5109" k3="0.2925"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.0098" k2="-0.4773" k3="0.2645"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1.4" k1="-0.1413" k2="-0.1615" k3="0.1463"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="3" k1="-0.1253" k2="-0.1888" k3="0.1634"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.1240" k2="-0.1887" k3="0.1608"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.1313" k2="-0.1701" k3="0.1510"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1.4" k1="-0.2219" k2="-0.0218" k3="0.0609"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="3" k1="-0.2127" k2="-0.0342" k3="0.0673"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.2125" k2="-0.0307" k3="0.0641"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.2166" k2="-0.0132" k3="0.0536"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1.4" k1="-0.6243" k2="0.0458" k3="0.1081"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="3" k1="-0.6140" k2="0.0247" k3="0.1218"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.6130" k2="0.0202" k3="0.1242"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.6212" k2="0.0198" k3="0.1311"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1.4" k1="0.0173" k2="-0.6808" k3="0.3962"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="3" k1="0.0165" k2="-0.6101" k3="0.3433"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="0.0024" k2="-0.5630" k3="0.3156"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="0.0121" k2="-0.5785" k3="0.3238"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1.4" k1="-0.1421" k2="-0.1711" k3="0.1446"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="3" k1="-0.1219" k2="-0.1901" k3="0.1558"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="10" k1="-0.1188" k2="-0.2040" k3="0.1706"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.1299" k2="-0.1797" k3="0.1554"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1.4" k1="-0.2190" k2="-0.0457" k3="0.0779"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="3" k1="-0.2122" k2="-0.0424" k3="0.0762"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.2154" k2="-0.0329" k3="0.0703"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.2162" k2="-0.0289" k3="0.0680"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1.4" k1="-0.6048" k2="0.0601" k3="0.0690"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="3" k1="-0.5375" k2="-0.0812" k3="0.1412"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.4898" k2="-0.1779" k3="0.1906"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.4773" k2="-0.2050" k3="0.2058"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="1.4" k1="-0.0692" k2="-0.3212" k3="0.1492"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="3" k1="-0.0975" k2="-0.1830" k3="0.0586"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.0981" k2="-0.1602" k3="0.0358"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1093" k2="-0.1170" k3="0.0142"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="1.4" k1="-0.1456" k2="-0.1706" k3="0.1478"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="3" k1="-0.1427" k2="-0.1589" k3="0.1409"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="10" k1="-0.1436" k2="-0.1555" k3="0.1424"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="1000" k1="-0.1423" k2="-0.1457" k3="0.1324"/>
++            <vignetting model="pa" focal="135" aperture="36" distance="1.4" k1="-0.2203" k2="-0.0327" k3="0.0693"/>
++            <vignetting model="pa" focal="135" aperture="36" distance="3" k1="-0.2127" k2="-0.0381" k3="0.0753"/>
++            <vignetting model="pa" focal="135" aperture="36" distance="10" k1="-0.2125" k2="-0.0247" k3="0.0663"/>
++            <vignetting model="pa" focal="135" aperture="36" distance="1000" k1="-0.2081" k2="-0.0284" k3="0.0685"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1.4" k1="0.0332" k2="-1.6820" k3="1.0824"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0230" k2="-1.5703" k3="1.0491"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1.4" k1="-0.0085" k2="-0.3796" k3="0.0252"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1187" k2="-0.8920" k3="0.4303"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1.4" k1="-0.1909" k2="0.0498" k3="-0.0618"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1677" k2="0.0927" k3="-0.1625"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="1.4" k1="-0.2017" k2="-0.0522" k3="0.0840"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.1908" k2="-0.0287" k3="0.0753"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="3" k1="0.0515" k2="-1.7762" k3="1.1680"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="10" k1="-0.0311" k2="-1.5784" k3="1.0581"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="3" k1="0.0728" k2="-0.7072" k3="0.2736"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="0.1146" k2="-0.8825" k3="0.4186"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="3" k1="-0.1859" k2="0.1268" k3="-0.1695"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="10" k1="-0.1742" k2="0.1141" k3="-0.1807"/>
++            <vignetting model="pa" focal="210" aperture="40" distance="3" k1="-0.1982" k2="-0.0268" k3="0.0704"/>
++            <vignetting model="pa" focal="210" aperture="40" distance="10" k1="-0.1926" k2="-0.0260" k3="0.0722"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1.4" k1="-0.3706" k2="-0.9573" k3="0.7277"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="3" k1="-0.8471" k2="0.3008" k3="-0.0316"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-1.1071" k2="0.9937" k3="-0.4506"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.1590" k2="1.1423" k3="-0.5351"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1.4" k1="0.1446" k2="-1.3957" k3="0.8227"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="3" k1="-0.0259" k2="-1.2768" k3="0.8733"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.2245" k2="-0.9258" k3="0.7015"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.3150" k2="-0.7532" k3="0.6119"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1.4" k1="-0.0160" k2="-0.3740" k3="0.0591"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="3" k1="0.0727" k2="-0.7377" k3="0.3033"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="0.1138" k2="-0.9083" k3="0.4318"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="0.1238" k2="-1.0061" k3="0.5147"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="1.4" k1="-0.1824" k2="-0.0514" k3="0.0862"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="3" k1="-0.1925" k2="-0.0004" k3="0.0608"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="10" k1="-0.1798" k2="-0.0063" k3="0.0652"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.1780" k2="-0.0063" k3="0.0679"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 70-300mm f/4-5.6 IS USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="300" a="-0.00012" b="0.00556" c="-0.00398" />
+-            <distortion model="ptlens" focal="200" a="-0.00466" b="0.01801" c="-0.01557" />
+-            <distortion model="ptlens" focal="135" a="-0.00371" b="0.01433" c="-0.01464" />
+-            <distortion model="ptlens" focal="100" a="0" b="-0.00091" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="-0.00371" c="0" />
++            <distortion model="ptlens" focal="300" a="-0.00012" b="0.00556" c="-0.00398"/>
++            <distortion model="ptlens" focal="200" a="-0.00466" b="0.01801" c="-0.01557"/>
++            <distortion model="ptlens" focal="135" a="-0.00371" b="0.01433" c="-0.01464"/>
++            <distortion model="ptlens" focal="100" a="0" b="-0.00091" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="-0.00371" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 75-300mm f/4-5.6 IS USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="75" a="0" b="-0.004815" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="-0.004914" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.000475" c="0" />
+-            <distortion model="ptlens" focal="155" a="0" b="0.001105" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.00411" c="0" />
++            <distortion model="poly3" focal="75" k1="-0.004815"/>
++            <distortion model="poly3" focal="100" k1="-0.004914"/>
++            <distortion model="poly3" focal="135" k1="0.000475"/>
++            <distortion model="poly3" focal="155" k1="0.001105"/>
++            <distortion model="poly3" focal="300" k1="0.00411"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 80-200mm f/2.8L</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="0" b="-0.007253" c="0" />
+-            <distortion model="ptlens" focal="88" a="0" b="-0.006184" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="-0.003182" c="0" />
+-            <distortion model="ptlens" focal="120" a="0" b="-0.000752" c="0" />
+-            <distortion model="ptlens" focal="140" a="0" b="0.001667" c="0" />
+-            <distortion model="ptlens" focal="175" a="0" b="0.003535" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.004386" c="0" />
++            <distortion model="poly3" focal="80" k1="-0.007253"/>
++            <distortion model="poly3" focal="88" k1="-0.006184"/>
++            <distortion model="poly3" focal="100" k1="-0.003182"/>
++            <distortion model="poly3" focal="120" k1="-0.000752"/>
++            <distortion model="poly3" focal="140" k1="0.001667"/>
++            <distortion model="poly3" focal="175" k1="0.003535"/>
++            <distortion model="poly3" focal="200" k1="0.004386"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 85mm f/1.2L II USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="85" a="0.00109" b="-0.00481" c="0.00232"/>
++            <tca model="poly3" focal="85" br="-0.0000612" vr="0.9999389" bb="0.0000679" vb="0.9999034"/>
++            <vignetting model="pa" focal="85" aperture="1.2" distance="0.95" k1="-1.0418" k2="0.7724" k3="-0.3658"/>
++            <vignetting model="pa" focal="85" aperture="1.2" distance="1.9" k1="-1.3152" k2="1.2663" k3="-0.6352"/>
++            <vignetting model="pa" focal="85" aperture="1.2" distance="5.7" k1="-1.4018" k2="1.4145" k3="-0.7202"/>
++            <vignetting model="pa" focal="85" aperture="1.2" distance="1000" k1="-1.4120" k2="1.4164" k3="-0.7204"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="0.95" k1="-0.1046" k2="-0.0002" k3="-0.2924"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1.9" k1="-0.0429" k2="-0.3179" k3="-0.1076"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="5.7" k1="-0.0298" k2="-0.4793" k3="0.0023"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-0.0357" k2="-0.5311" k3="0.0401"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="0.95" k1="-0.1781" k2="0.4106" k3="-0.3608"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1.9" k1="-0.2183" k2="0.5012" k3="-0.4499"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="5.7" k1="-0.2534" k2="0.6038" k3="-0.5544"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.2697" k2="0.6545" k3="-0.6194"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="0.95" k1="-0.0423" k2="-0.0604" k3="0.0694"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1.9" k1="-0.0606" k2="-0.0566" k3="0.0664"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="5.7" k1="-0.0709" k2="-0.0619" k3="0.0700"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.0821" k2="-0.0555" k3="0.0664"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="0.95" k1="-0.0359" k2="-0.0615" k3="0.0682"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1.9" k1="-0.0465" k2="-0.0751" k3="0.0746"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="5.7" k1="-0.0739" k2="-0.0423" k3="0.0544"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.0790" k2="-0.0526" k3="0.0615"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 100mm f/2.8 Macro USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="100" a="-0.00126" b="0.00429" c="-0.00887"/>
++            <tca model="poly3" focal="100" br="-0.0000316" vr="1.0003482" bb="0.0000299" vb="0.9998855"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.31" k1="-0.1368" k2="-0.5887" k3="0.4243"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.62" k1="-0.2002" k2="-0.7034" k3="0.4805"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1.86" k1="-0.9303" k2="0.4746" k3="-0.1172"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-1.3648" k2="1.3738" k3="-0.6384"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.31" k1="-0.1483" k2="0.0422" k3="-0.0494"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.62" k1="-0.0064" k2="-0.2739" k3="0.0484"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1.86" k1="0.0721" k2="-0.6608" k3="0.2908"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0949" k2="-0.9807" k3="0.4897"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.31" k1="-0.1278" k2="-0.0703" k3="0.0817"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.62" k1="-0.1242" k2="0.0594" k3="-0.0342"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1.86" k1="-0.1340" k2="0.1578" k3="-0.1604"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1127" k2="0.1457" k3="-0.2155"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.31" k1="-0.1177" k2="-0.0988" k3="0.1018"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.62" k1="-0.0954" k2="-0.0536" k3="0.0710"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1.86" k1="-0.0876" k2="-0.0566" k3="0.0718"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0855" k2="-0.0358" k3="0.0486"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.31" k1="-0.0685" k2="-0.2239" k3="0.1770"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.62" k1="-0.0498" k2="-0.1694" k3="0.1430"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1.86" k1="-0.0495" k2="-0.1537" k3="0.1345"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0442" k2="-0.1356" k3="0.1146"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 100-300mm f/5.6L</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="0" b="-0.001195" c="0" />
+-            <distortion model="ptlens" focal="123" a="0" b="0.001845" c="0" />
+-            <distortion model="ptlens" focal="142" a="0" b="0.00427" c="0" />
+-            <distortion model="ptlens" focal="173" a="0" b="0.006821" c="0" />
+-            <distortion model="ptlens" focal="210" a="0" b="0.008324" c="0" />
+-            <distortion model="ptlens" focal="250" a="0" b="0.008554" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.009679" c="0" />
++            <distortion model="poly3" focal="100" k1="-0.001195"/>
++            <distortion model="poly3" focal="123" k1="0.001845"/>
++            <distortion model="poly3" focal="142" k1="0.00427"/>
++            <distortion model="poly3" focal="173" k1="0.006821"/>
++            <distortion model="poly3" focal="210" k1="0.008324"/>
++            <distortion model="poly3" focal="250" k1="0.008554"/>
++            <distortion model="poly3" focal="300" k1="0.009679"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 100-400mm f/4.5-5.6L IS USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="0.001543" b="-0.003547" c="0" />
+-            <distortion model="ptlens" focal="135" a="0.000471" b="-0.000408" c="0" />
+-            <distortion model="ptlens" focal="150" a="0.00022" b="0.000681" c="0" />
+-            <distortion model="ptlens" focal="200" a="-0.00011" b="0.00192" c="0" />
+-            <distortion model="ptlens" focal="250" a="0.001326" b="-0.001117" c="0" />
+-            <distortion model="ptlens" focal="300" a="-0.001773" b="0.005878" c="0" />
+-            <distortion model="ptlens" focal="350" a="0.000721" b="0.000672" c="0" />
+-            <distortion model="ptlens" focal="400" a="-0.000338" b="0.003752" c="0" />
++            <distortion model="ptlens" focal="100" a="0.001543" b="-0.003547" c="0"/>
++            <distortion model="ptlens" focal="135" a="0.000471" b="-0.000408" c="0"/>
++            <distortion model="ptlens" focal="150" a="0.00022" b="0.000681" c="0"/>
++            <distortion model="ptlens" focal="200" a="-0.00011" b="0.00192" c="0"/>
++            <distortion model="ptlens" focal="250" a="0.001326" b="-0.001117" c="0"/>
++            <distortion model="ptlens" focal="300" a="-0.001773" b="0.005878" c="0"/>
++            <distortion model="ptlens" focal="350" a="0.000721" b="0.000672" c="0"/>
++            <distortion model="ptlens" focal="400" a="-0.000338" b="0.003752" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 20mm f/2.8 USM</model>
++        <model>Canon EF 100-400mm f/4.5-5.6L IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="20" a="0.018218" b="-0.040033" c="0" />
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="100" a="0.00025675727" b="-0.00086839235" c="0"/>
++            <distortion model="ptlens" focal="135" a="0.00025565499" b="0.0023856892" c="0"/>
++            <distortion model="ptlens" focal="150" a="-0.00025251856" b="0.0041025843" c="0"/>
++            <distortion model="ptlens" focal="200" a="-0.00026568272" b="0.005564501" c="0"/>
++            <distortion model="ptlens" focal="250" a="-0.000076806451" b="0.0056209899" c="0"/>
++            <distortion model="ptlens" focal="300" a="0.00028689712" b="0.0053289804" c="0"/>
++            <distortion model="ptlens" focal="350" a="-0.00021378004" b="0.0064708104" c="0"/>
++            <distortion model="ptlens" focal="400" a="0.00035256656" b="0.0059394729" c="0"/>
++            <tca model="poly3" focal="100" br="-0.0000088" vr="1.0006645" bb="0.0000759" vb="1.0000395"/>
++            <tca model="poly3" focal="135" br="-0.0000677" vr="1.0003291" bb="0.0000991" vb="1.0000728"/>
++            <tca model="poly3" focal="150" br="-0.0000440" vr="1.0002045" bb="0.0000863" vb="1.0001036"/>
++            <tca model="poly3" focal="200" br="-0.0000125" vr="0.9999578" bb="0.0000330" vb="1.0001366"/>
++            <tca model="poly3" focal="250" br="-0.0001232" vr="0.9998504" bb="0.0000643" vb="1.0000649"/>
++            <tca model="poly3" focal="300" br="-0.0001213" vr="0.9997686" bb="0.0000394" vb="0.9999256"/>
++            <tca model="poly3" focal="400" br="-0.0000709" vr="0.9994402" bb="-0.0000643" vb="0.9996019"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="1.8" k1="-0.5781" k2="0.1116" k3="-0.0341"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="3.6" k1="-0.5857" k2="0.0899" k3="-0.0070"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="10.8" k1="-0.5856" k2="0.0633" k3="0.0181"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-0.5863" k2="0.0760" k3="0.0079"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1.8" k1="-0.0141" k2="-0.7018" k3="0.4315"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="3.6" k1="-0.0076" k2="-0.6617" k3="0.3948"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="10.8" k1="-0.0068" k2="-0.6240" k3="0.3631"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.0097" k2="-0.5797" k3="0.3287"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1.8" k1="-0.1769" k2="0.0997" k3="-0.0806"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="3.6" k1="-0.1681" k2="0.0623" k3="-0.0406"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="10.8" k1="-0.1633" k2="0.0432" k3="-0.0214"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.1587" k2="0.0241" k3="-0.0015"/>
++            <vignetting model="pa" focal="100" aperture="13" distance="1.8" k1="-0.1443" k2="-0.0454" k3="0.0686"/>
++            <vignetting model="pa" focal="100" aperture="13" distance="3.6" k1="-0.1435" k2="-0.0467" k3="0.0690"/>
++            <vignetting model="pa" focal="100" aperture="13" distance="10.8" k1="-0.1423" k2="-0.0504" k3="0.0717"/>
++            <vignetting model="pa" focal="100" aperture="13" distance="1000" k1="-0.1403" k2="-0.0558" k3="0.0756"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1.8" k1="-0.1705" k2="0.0097" k3="0.0364"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="3.6" k1="-0.1751" k2="0.0232" k3="0.0251"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="10.8" k1="-0.1740" k2="0.0166" k3="0.0318"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1708" k2="0.0067" k3="0.0396"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1.8" k1="-0.5240" k2="0.0714" k3="0.0034"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="3.6" k1="-0.5252" k2="0.0294" k3="0.0423"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10.8" k1="-0.5071" k2="-0.0414" k3="0.0949"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.4991" k2="-0.0699" k3="0.1157"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="1.8" k1="-0.0093" k2="-0.6093" k3="0.3682"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="3.6" k1="-0.0155" k2="-0.5178" k3="0.2968"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="10.8" k1="-0.0302" k2="-0.4251" k3="0.2304"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.0319" k2="-0.4127" k3="0.2217"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="1.8" k1="-0.1416" k2="-0.0282" k3="0.0502"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="3.6" k1="-0.1368" k2="-0.0461" k3="0.0661"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="10.8" k1="-0.1313" k2="-0.0644" k3="0.0818"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1311" k2="-0.0645" k3="0.0815"/>
++            <vignetting model="pa" focal="135" aperture="13" distance="1.8" k1="-0.1390" k2="-0.0479" k3="0.0722"/>
++            <vignetting model="pa" focal="135" aperture="13" distance="3.6" k1="-0.1382" k2="-0.0501" k3="0.0732"/>
++            <vignetting model="pa" focal="135" aperture="13" distance="10.8" k1="-0.1374" k2="-0.0506" k3="0.0735"/>
++            <vignetting model="pa" focal="135" aperture="13" distance="1000" k1="-0.1364" k2="-0.0533" k3="0.0752"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1.8" k1="-0.1697" k2="0.0151" k3="0.0369"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="3.6" k1="-0.1730" k2="0.0215" k3="0.0330"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="10.8" k1="-0.1680" k2="0.0088" k3="0.0416"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1675" k2="0.0084" k3="0.0410"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="1.8" k1="-0.4905" k2="0.0191" k3="0.0400"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="3.6" k1="-0.4879" k2="-0.0365" k3="0.0884"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="10.8" k1="-0.4709" k2="-0.1064" k3="0.1400"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.4654" k2="-0.1278" k3="0.1564"/>
++            <vignetting model="pa" focal="150" aperture="6.3" distance="1.8" k1="-0.0121" k2="-0.5442" k3="0.3190"/>
++            <vignetting model="pa" focal="150" aperture="6.3" distance="3.6" k1="-0.0256" k2="-0.4364" k3="0.2401"/>
++            <vignetting model="pa" focal="150" aperture="6.3" distance="10.8" k1="-0.0431" k2="-0.3443" k3="0.1773"/>
++            <vignetting model="pa" focal="150" aperture="6.3" distance="1000" k1="-0.0525" k2="-0.2945" k3="0.1442"/>
++            <vignetting model="pa" focal="150" aperture="9" distance="1.8" k1="-0.1317" k2="-0.0538" k3="0.0713"/>
++            <vignetting model="pa" focal="150" aperture="9" distance="3.6" k1="-0.1282" k2="-0.0655" k3="0.0813"/>
++            <vignetting model="pa" focal="150" aperture="9" distance="10.8" k1="-0.1279" k2="-0.0648" k3="0.0802"/>
++            <vignetting model="pa" focal="150" aperture="9" distance="1000" k1="-0.1261" k2="-0.0696" k3="0.0839"/>
++            <vignetting model="pa" focal="150" aperture="13" distance="1.8" k1="-0.1358" k2="-0.0496" k3="0.0728"/>
++            <vignetting model="pa" focal="150" aperture="13" distance="3.6" k1="-0.1340" k2="-0.0544" k3="0.0757"/>
++            <vignetting model="pa" focal="150" aperture="13" distance="10.8" k1="-0.1336" k2="-0.0550" k3="0.0760"/>
++            <vignetting model="pa" focal="150" aperture="13" distance="1000" k1="-0.1313" k2="-0.0607" k3="0.0802"/>
++            <vignetting model="pa" focal="150" aperture="32" distance="1.8" k1="-0.1663" k2="0.0146" k3="0.0359"/>
++            <vignetting model="pa" focal="150" aperture="32" distance="3.6" k1="-0.1668" k2="0.0125" k3="0.0382"/>
++            <vignetting model="pa" focal="150" aperture="32" distance="10.8" k1="-0.1633" k2="0.0037" k3="0.0438"/>
++            <vignetting model="pa" focal="150" aperture="32" distance="1000" k1="-0.1599" k2="-0.0026" k3="0.0474"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1.8" k1="-0.3654" k2="-0.1908" k3="0.1736"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="3.6" k1="-0.3866" k2="-0.1860" k3="0.1786"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="10.8" k1="-0.3938" k2="-0.1896" k3="0.1819"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.3992" k2="-0.1844" k3="0.1807"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1.8" k1="-0.0600" k2="-0.2411" k3="0.1193"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="3.6" k1="-0.0860" k2="-0.1382" k3="0.0563"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="10.8" k1="-0.1164" k2="-0.0355" k3="0.0013"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.1231" k2="-0.0162" k3="-0.0048"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1.8" k1="-0.1204" k2="-0.0639" k3="0.0783"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="3.6" k1="-0.1200" k2="-0.0647" k3="0.0786"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="10.8" k1="-0.1209" k2="-0.0631" k3="0.0775"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1210" k2="-0.0640" k3="0.0788"/>
++            <vignetting model="pa" focal="200" aperture="14" distance="1.8" k1="-0.1239" k2="-0.0583" k3="0.0768"/>
++            <vignetting model="pa" focal="200" aperture="14" distance="3.6" k1="-0.1253" k2="-0.0540" k3="0.0729"/>
++            <vignetting model="pa" focal="200" aperture="14" distance="10.8" k1="-0.1256" k2="-0.0560" k3="0.0753"/>
++            <vignetting model="pa" focal="200" aperture="14" distance="1000" k1="-0.1264" k2="-0.0551" k3="0.0752"/>
++            <vignetting model="pa" focal="200" aperture="36" distance="1.8" k1="-0.1498" k2="-0.0082" k3="0.0501"/>
++            <vignetting model="pa" focal="200" aperture="36" distance="3.6" k1="-0.1464" k2="-0.0168" k3="0.0554"/>
++            <vignetting model="pa" focal="200" aperture="36" distance="10.8" k1="-0.1467" k2="-0.0164" k3="0.0547"/>
++            <vignetting model="pa" focal="200" aperture="36" distance="1000" k1="-0.1489" k2="-0.0118" k3="0.0522"/>
++            <vignetting model="pa" focal="250" aperture="5" distance="1.8" k1="-0.2929" k2="-0.2625" k3="0.1358"/>
++            <vignetting model="pa" focal="250" aperture="5" distance="3.6" k1="-0.3169" k2="-0.3045" k3="0.1823"/>
++            <vignetting model="pa" focal="250" aperture="5" distance="10.8" k1="-0.3364" k2="-0.3259" k3="0.2121"/>
++            <vignetting model="pa" focal="250" aperture="5" distance="1000" k1="-0.3438" k2="-0.3302" k3="0.2208"/>
++            <vignetting model="pa" focal="250" aperture="7.1" distance="1.8" k1="-0.0984" k2="-0.0736" k3="-0.0146"/>
++            <vignetting model="pa" focal="250" aperture="7.1" distance="3.6" k1="-0.1393" k2="0.0919" k3="-0.1430"/>
++            <vignetting model="pa" focal="250" aperture="7.1" distance="10.8" k1="-0.1590" k2="0.1710" k3="-0.2049"/>
++            <vignetting model="pa" focal="250" aperture="7.1" distance="1000" k1="-0.1604" k2="0.1755" k3="-0.2075"/>
++            <vignetting model="pa" focal="250" aperture="10" distance="1.8" k1="-0.1140" k2="-0.0704" k3="0.0820"/>
++            <vignetting model="pa" focal="250" aperture="10" distance="3.6" k1="-0.1130" k2="-0.0714" k3="0.0823"/>
++            <vignetting model="pa" focal="250" aperture="10" distance="10.8" k1="-0.1120" k2="-0.0724" k3="0.0825"/>
++            <vignetting model="pa" focal="250" aperture="10" distance="1000" k1="-0.1103" k2="-0.0770" k3="0.0859"/>
++            <vignetting model="pa" focal="250" aperture="14" distance="1.8" k1="-0.1194" k2="-0.0592" k3="0.0763"/>
++            <vignetting model="pa" focal="250" aperture="14" distance="3.6" k1="-0.1182" k2="-0.0602" k3="0.0761"/>
++            <vignetting model="pa" focal="250" aperture="14" distance="10.8" k1="-0.1168" k2="-0.0643" k3="0.0792"/>
++            <vignetting model="pa" focal="250" aperture="14" distance="1000" k1="-0.1173" k2="-0.0635" k3="0.0789"/>
++            <vignetting model="pa" focal="250" aperture="36" distance="1.8" k1="-0.1414" k2="-0.0208" k3="0.0579"/>
++            <vignetting model="pa" focal="250" aperture="36" distance="3.6" k1="-0.1356" k2="-0.0318" k3="0.0633"/>
++            <vignetting model="pa" focal="250" aperture="36" distance="10.8" k1="-0.1312" k2="-0.0429" k3="0.0713"/>
++            <vignetting model="pa" focal="250" aperture="36" distance="1000" k1="-0.1326" k2="-0.0383" k3="0.0676"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1.8" k1="-0.2179" k2="-0.6136" k3="0.3701"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="3.6" k1="-0.3278" k2="-0.5280" k3="0.3759"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10.8" k1="-0.3924" k2="-0.4698" k3="0.3767"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.4147" k2="-0.4409" k3="0.3702"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1.8" k1="-0.1688" k2="0.1923" k3="-0.1950"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="3.6" k1="-0.1394" k2="0.1095" k3="-0.1566"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10.8" k1="-0.0988" k2="-0.0160" k3="-0.0966"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.0808" k2="-0.0760" k3="-0.0641"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1.8" k1="-0.1120" k2="-0.0679" k3="0.0798"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="3.6" k1="-0.1092" k2="-0.0731" k3="0.0831"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10.8" k1="-0.1077" k2="-0.0742" k3="0.0832"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.1083" k2="-0.0713" k3="0.0804"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1.8" k1="-0.1179" k2="-0.0565" k3="0.0743"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="3.6" k1="-0.1144" k2="-0.0630" k3="0.0777"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="10.8" k1="-0.1125" k2="-0.0669" k3="0.0803"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.1125" k2="-0.0674" k3="0.0812"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="1.8" k1="-0.1330" k2="-0.0357" k3="0.0672"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="3.6" k1="-0.1290" k2="-0.0431" k3="0.0707"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="10.8" k1="-0.1262" k2="-0.0497" k3="0.0756"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.1278" k2="-0.0435" k3="0.0708"/>
++            <vignetting model="pa" focal="350" aperture="5.6" distance="1.8" k1="-0.3407" k2="-0.6101" k3="0.4495"/>
++            <vignetting model="pa" focal="350" aperture="5.6" distance="3.6" k1="-0.5713" k2="-0.2290" k3="0.2826"/>
++            <vignetting model="pa" focal="350" aperture="5.6" distance="10.8" k1="-0.7307" k2="0.1024" k3="0.1086"/>
++            <vignetting model="pa" focal="350" aperture="5.6" distance="1000" k1="-0.7991" k2="0.2697" k3="0.0081"/>
++            <vignetting model="pa" focal="350" aperture="8" distance="1.8" k1="-0.0745" k2="-0.0753" k3="-0.1072"/>
++            <vignetting model="pa" focal="350" aperture="8" distance="3.6" k1="0.0173" k2="-0.4622" k3="0.1768"/>
++            <vignetting model="pa" focal="350" aperture="8" distance="10.8" k1="0.0553" k2="-0.7052" k3="0.3598"/>
++            <vignetting model="pa" focal="350" aperture="8" distance="1000" k1="0.0531" k2="-0.7932" k3="0.4364"/>
++            <vignetting model="pa" focal="350" aperture="11" distance="1.8" k1="-0.1301" k2="0.0099" k3="0.0085"/>
++            <vignetting model="pa" focal="350" aperture="11" distance="3.6" k1="-0.1469" k2="0.0895" k3="-0.0725"/>
++            <vignetting model="pa" focal="350" aperture="11" distance="10.8" k1="-0.1593" k2="0.1620" k3="-0.1648"/>
++            <vignetting model="pa" focal="350" aperture="11" distance="1000" k1="-0.1563" k2="0.1621" k3="-0.1832"/>
++            <vignetting model="pa" focal="350" aperture="16" distance="1.8" k1="-0.1145" k2="-0.0606" k3="0.0764"/>
++            <vignetting model="pa" focal="350" aperture="16" distance="3.6" k1="-0.1113" k2="-0.0657" k3="0.0791"/>
++            <vignetting model="pa" focal="350" aperture="16" distance="10.8" k1="-0.1138" k2="-0.0601" k3="0.0759"/>
++            <vignetting model="pa" focal="350" aperture="16" distance="1000" k1="-0.1176" k2="-0.0529" k3="0.0721"/>
++            <vignetting model="pa" focal="350" aperture="40" distance="1.8" k1="-0.1288" k2="-0.0408" k3="0.0698"/>
++            <vignetting model="pa" focal="350" aperture="40" distance="3.6" k1="-0.1255" k2="-0.0489" k3="0.0746"/>
++            <vignetting model="pa" focal="350" aperture="40" distance="10.8" k1="-0.1295" k2="-0.0394" k3="0.0694"/>
++            <vignetting model="pa" focal="350" aperture="40" distance="1000" k1="-0.1359" k2="-0.0243" k3="0.0598"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="1.8" k1="-0.6162" k2="-0.1951" k3="0.2686"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="3.6" k1="-0.9055" k2="0.4049" k3="-0.0516"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="10.8" k1="-1.0556" k2="0.8193" k3="-0.3192"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-1.0517" k2="0.8373" k3="-0.3437"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="1.8" k1="0.0194" k2="-0.4692" k3="0.1535"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="3.6" k1="0.0644" k2="-0.8289" k3="0.4500"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="10.8" k1="-0.0141" k2="-0.8865" k3="0.5562"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="-0.0805" k2="-0.8175" k3="0.5407"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="1.8" k1="-0.1670" k2="0.1768" k3="-0.1638"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="3.6" k1="-0.1523" k2="0.1637" k3="-0.2005"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="10.8" k1="-0.1020" k2="0.0045" k3="-0.1288"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="-0.0736" k2="-0.1028" k3="-0.0676"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="1.8" k1="-0.1138" k2="-0.0600" k3="0.0754"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="3.6" k1="-0.1117" k2="-0.0637" k3="0.0776"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="10.8" k1="-0.1210" k2="-0.0428" k3="0.0639"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="1000" k1="-0.1314" k2="-0.0163" k3="0.0450"/>
++            <vignetting model="pa" focal="400" aperture="40" distance="1.8" k1="-0.1268" k2="-0.0439" k3="0.0713"/>
++            <vignetting model="pa" focal="400" aperture="40" distance="3.6" k1="-0.1273" k2="-0.0431" k3="0.0702"/>
++            <vignetting model="pa" focal="400" aperture="40" distance="10.8" k1="-0.1383" k2="-0.0201" k3="0.0575"/>
++            <vignetting model="pa" focal="400" aperture="40" distance="1000" k1="-0.1404" k2="-0.0142" k3="0.0530"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 24mm f/1.4L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.013378" b="-0.028367" c="0" />
++            <distortion model="ptlens" focal="24" a="0.013378" b="-0.028367" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 24mm f/2.8</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.017412" b="-0.039315" c="0" />
++            <distortion model="ptlens" focal="24" a="0.017412" b="-0.039315" c="0"/>
++            <!-- Taken with Canon 5D -->
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-1.9042" k2="1.8775" k3="-0.7656"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-1.9042" k2="1.8775" k3="-0.7656"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3786" k2="-0.8590" k3="0.5975"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3786" k2="-0.8590" k3="0.5975"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.5720" k2="0.1848" k3="-0.0872"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.5720" k2="0.1848" k3="-0.0872"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.5534" k2="0.0775" k3="0.0466"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.5534" k2="0.0775" k3="0.0466"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.5601" k2="0.0867" k3="0.0430"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.5601" k2="0.0867" k3="0.0430"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.5673" k2="0.0970" k3="0.0386"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.5673" k2="0.0970" k3="0.0386"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.5737" k2="0.1049" k3="0.0356"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.5737" k2="0.1049" k3="0.0356"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 28mm f/1.8</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.001175" b="-0.006534" c="0" />
++            <distortion model="ptlens" focal="28" a="0.001175" b="-0.006534" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon 28mm f/1.8 USM</model>
++        <model>Canon EF 28mm f/1.8 USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.018" b="-0.048" c="0.019" />
++            <distortion model="ptlens" focal="28" a="0.018" b="-0.048" c="0.019"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 28mm f/2.8</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.003003" b="-0.011213" c="0" />
++            <distortion model="ptlens" focal="28" a="0.003003" b="-0.011213" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 35mm f/1.4L USM</model>
++        <model>Canon EF 35mm f/2</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.007937" b="-0.021832" c="0" />
++            <distortion model="ptlens" focal="35" a="0.007768" b="-0.018685" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 35mm f/2</model>
++        <model>Canon EF 50mm f/1.2L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.007768" b="-0.018685" c="0" />
++            <distortion model="ptlens" focal="50" a="0.00476" b="-0.01688" c="0.00748"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 50mm f/1.2L USM</model>
++        <model>Canon EF 50mm f/1.4 USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <!-- Average crop factor of Canon APS-C cameras -->
++        <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0.00476" b="-0.01688" c="0.00748" />
++            <distortion model="poly3" focal="50" k1="-0.002987"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 50mm f/1.4</model>
++        <model>Canon EF 50mm f/1.8</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.6</cropfactor>
++        <!-- Average crop factor of Canon APS-H cameras -->
++        <cropfactor>1.267</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.002987" c="0" />
++            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 50mm f/1.4</model>
++        <model>Canon EF 50mm f/1.8</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0.002615" b="-0.01123" c="0" />
++            <!-- Taken with Canon 650D -->
++            <distortion model="poly3" focal="50" k1="-0.00149"/>
++            <tca model="poly3" focal="50" vr="1.0000033" vb="0.9999942"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 50mm f/1.8</model>
++        <model>Canon EF 50mm f/1.8 MkII</model>
++        <model lang="en">Canon EF 50mm f/1.8 II</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0" />
++            <distortion model="ptlens" focal="50" a="0.00163" b="-0.01449" c="0.01568"/>
++            <!-- Taken with Canon 6D -->
++            <tca model="poly3" focal="50" br="-0.0000048" vr="1.0000353" bb="-0.0000112" vb="1.0000073"/>
++            <!-- Taken with Canon 5D -->
++            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-1.4745" k2="1.1285" k3="-0.4284"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-1.4745" k2="1.1285" k3="-0.4284"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.6486" k2="-0.6256" k3="0.5536"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.6486" k2="-0.6256" k3="0.5536"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1193" k2="-0.4620" k3="0.0523"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1193" k2="-0.4620" k3="0.0523"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.3777" k2="0.3437" k3="-0.2804"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.3777" k2="0.3437" k3="-0.2804"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3032" k2="0.0141" k3="0.0427"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3032" k2="0.0141" k3="0.0427"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.3008" k2="-0.0022" k3="0.0549"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3008" k2="-0.0022" k3="0.0549"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3046" k2="-0.0055" k3="0.0597"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3046" k2="-0.0055" k3="0.0597"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.3134" k2="0.0020" k3="0.0567"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3134" k2="0.0020" k3="0.0567"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.3280" k2="0.0203" k3="0.0468"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.3280" k2="0.0203" k3="0.0468"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 50mm f/1.8 II</model>
++        <model>Canon EF 50mm f/1.8 MkII</model>
++        <model lang="en">Canon EF 50mm f/1.8 II</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.6</cropfactor>
++        <!-- Average crop factor of Canon APS-H cameras -->
++        <cropfactor>1.267</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0.00099" b="-0.00582" c="0.00498"/>
+-            <tca model="poly3" focal="50" br="-0.0000133" vr="1.0001567" bb="-0.0000082" vb="0.9999807"/>
++            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 50mm f/1.8 MkII</model>
++        <model lang="en">Canon EF 50mm f/1.8 II</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0" />
++            <!-- Taken with generic Canon APS-C (avg crop 1.611) -->
++            <distortion a="0.00099" b="-0.00582" c="0.00498" focal="50" model="ptlens"/>
++            <tca bb="-0.0000082" br="-0.0000133" focal="50" model="poly3" vb="0.9999807" vr="1.0001567"/>
++            <!-- Taken with cropfactor 1.622 (Canon 50D or 450D) -->
++            <vignetting model="pa" focal="50" aperture="1.8" distance="0.45" k1="-0.5303" k2="0.3040" k3="-0.0894"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.6075" k2="0.4041" k3="-0.1510"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="-0.1253" k2="-0.3078" k3="0.2075"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1158" k2="-0.4426" k3="0.2807"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0555" k2="-0.0933" k3="0.0895"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0709" k2="-0.0230" k3="0.0153"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.0489" k2="-0.0982" k3="0.0898"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0343" k2="-0.1369" k3="0.1000"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.45" k1="-0.0361" k2="-0.1243" k3="0.1058"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0241" k2="-0.1630" k3="0.1172"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.0257" k2="-0.1353" k3="0.1025"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0561" k2="-0.0873" k3="0.0654"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon FDn 50mm 1:1.4</model>
+-	    <focal value="50" />
+-	    <aperture min="1.4" max="22"/>
+         <mount>Canon FD</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal value="50"/>
++        <aperture min="1.4" max="22"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="-0.000919817" b="0.00112022" c="-0.00289404" />
+-            <tca model="poly3" focal="50" br="-0.0000338" vr="1.0002152" bb="0.0000216" vb="0.9998764" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-0.2747" k2="-0.1546" k3="0.1527" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5692" k2="0.3348" k3="-0.1042" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="3" k1="-0.6686" k2="0.5132" k3="-0.2054" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6918" k2="0.5512" k3="-0.2278" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="-0.0668" k2="0.0029" k3="-0.0171" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0725" k2="-0.0250" k3="0.0104" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="3" k1="-0.0748" k2="-0.0428" k3="0.0297" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0782" k2="-0.0459" k3="0.0329" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0604" k2="-0.0194" k3="0.0045" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0732" k2="-0.0241" k3="0.0120" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="3" k1="-0.0832" k2="-0.0198" k3="0.0121" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0824" k2="-0.0342" k3="0.0223" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.0694" k2="-0.0016" k3="-0.0078" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0828" k2="0.0019" k3="-0.0081" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="3" k1="-0.0919" k2="-0.0002" k3="-0.0022" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0919" k2="-0.0064" k3="0.0028" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.1151" k2="0.1018" k3="-0.0809" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="1" k1="-0.1117" k2="0.0668" k3="-0.0536" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="3" k1="-0.1539" k2="0.1340" k3="-0.0892" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1587" k2="0.1348" k3="-0.0874" />
++            <distortion model="ptlens" focal="50" a="-0.000919817" b="0.00112022" c="-0.00289404"/>
++            <tca model="poly3" focal="50" br="-0.0000338" vr="1.0002152" bb="0.0000216" vb="0.9998764"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-0.2747" k2="-0.1546" k3="0.1527"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5692" k2="0.3348" k3="-0.1042"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="3" k1="-0.6686" k2="0.5132" k3="-0.2054"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6918" k2="0.5512" k3="-0.2278"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="-0.0668" k2="0.0029" k3="-0.0171"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0725" k2="-0.0250" k3="0.0104"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="3" k1="-0.0748" k2="-0.0428" k3="0.0297"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0782" k2="-0.0459" k3="0.0329"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0604" k2="-0.0194" k3="0.0045"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0732" k2="-0.0241" k3="0.0120"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="3" k1="-0.0832" k2="-0.0198" k3="0.0121"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0824" k2="-0.0342" k3="0.0223"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.0694" k2="-0.0016" k3="-0.0078"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0828" k2="0.0019" k3="-0.0081"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="3" k1="-0.0919" k2="-0.0002" k3="-0.0022"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0919" k2="-0.0064" k3="0.0028"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.1151" k2="0.1018" k3="-0.0809"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1" k1="-0.1117" k2="0.0668" k3="-0.0536"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="3" k1="-0.1539" k2="0.1340" k3="-0.0892"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1587" k2="0.1348" k3="-0.0874"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF-S 60mm f/2.8 Macro</model>
++        <model>Canon FDn 50mm 1:1.4</model>
++        <mount>Canon FD</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="poly3" focal="50" k1="-0.00193"/>
++            <tca model="poly3" focal="50" vr="1.0000929" vb="0.9999371"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.8147" k2="0.5637" k3="-0.2255"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.8147" k2="0.5637" k3="-0.2255"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.1847" k2="-0.0526" k3="-0.0565"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1847" k2="-0.0526" k3="-0.0565"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.2140" k2="0.0826" k3="-0.0501"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2140" k2="0.0826" k3="-0.0501"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2114" k2="0.1048" k3="-0.0633"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2114" k2="0.1048" k3="-0.0633"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1889" k2="0.0438" k3="-0.0272"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1889" k2="0.0438" k3="-0.0272"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2053" k2="0.0925" k3="-0.0585"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2053" k2="0.0925" k3="-0.0585"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2168" k2="0.1430" k3="-0.0787"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2168" k2="0.1430" k3="-0.0787"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2350" k2="0.1801" k3="-0.1032"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2350" k2="0.1801" k3="-0.1032"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2501" k2="0.2036" k3="-0.1149"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2501" k2="0.2036" k3="-0.1149"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 60mm f/2.8 Macro USM</model>
+         <mount>Canon EF-S</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="60" a="0" b="0" c="0" />
++            <distortion model="poly3" focal="60" k1="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 85mm f/1.2L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="85" a="0" b="-0.00214" c="0" />
++            <distortion model="poly3" focal="85" k1="-0.00214"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 85mm f/1.8 USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="85" a="-0.000989" b="-0.002335" c="0" />
++            <distortion model="ptlens" focal="85" a="-0.000989" b="-0.002335" c="0"/>
++            <!-- Taken with Canon 5D Mark III -->
++            <tca model="poly3" focal="85" br="-0.0000287" vr="1.0001408" bb="0.0000182" vb="0.9998642"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="10" k1="-1.4465" k2="1.4135" k3="-0.6464"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-1.4465" k2="1.4135" k3="-0.6464"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="10" k1="-0.0062" k2="-0.9708" k3="0.5311"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.0062" k2="-0.9708" k3="0.5311"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="10" k1="0.0970" k2="-0.4142" k3="0.0058"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="0.0970" k2="-0.4142" k3="0.0058"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="10" k1="-0.1769" k2="0.5484" k3="-0.5646"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.1769" k2="0.5484" k3="-0.5646"/>
++            <vignetting model="pa" focal="85" aperture="22" distance="10" k1="-0.0782" k2="-0.0006" k3="0.0650"/>
++            <vignetting model="pa" focal="85" aperture="22" distance="1000" k1="-0.0782" k2="-0.0006" k3="0.0650"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 100mm f/2.8 USM Macro</model>
++        <model>Canon EF 100mm f/2.8L Macro IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="0.001889" b="-0.005706" c="0" />
++            <distortion model="ptlens" focal="100" a="0.00406" b="-0.01754" c="0.02944"/>
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <tca model="poly3" focal="100" br="-0.0000648" vr="1.0005228" bb="0.0000895" vb="0.9997536"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.3" k1="-0.0002" k2="-0.4508" k3="0.2333"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.34" k1="0.0795" k2="-0.8174" k3="0.4748"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.39" k1="0.0625" k2="-0.8874" k3="0.5263"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.48" k1="0.0225" k2="-1.1231" k3="0.6901"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.6" k1="-0.3172" k2="-0.7844" k3="0.5853"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.67" k1="-0.5205" k2="-0.4687" k3="0.4329"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1" k1="-1.0262" k2="0.4648" k3="-0.0604"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1.8" k1="-1.0413" k2="0.5233" k3="-0.1089"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="3" k1="-1.0667" k2="0.5973" k3="-0.1587"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-1.1275" k2="0.7246" k3="-0.2352"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.3" k1="-0.1452" k2="0.0476" k3="-0.0319"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.34" k1="-0.1060" k2="0.0458" k3="-0.1091"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.39" k1="-0.0834" k2="0.0032" k3="-0.1104"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.48" k1="0.0244" k2="-0.3419" k3="0.0847"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.6" k1="0.0676" k2="-0.5887" k3="0.2536"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.67" k1="0.0954" k2="-0.7417" k3="0.3603"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1" k1="0.0793" k2="-0.8583" k3="0.4247"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1.8" k1="0.1010" k2="-0.8757" k3="0.4206"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="3" k1="0.1152" k2="-0.8881" k3="0.4203"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0673" k2="-0.7994" k3="0.3554"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.3" k1="-0.1110" k2="-0.0940" k3="0.1128"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.34" k1="-0.0898" k2="-0.0923" k3="0.1076"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.39" k1="-0.0969" k2="-0.0525" k3="0.0724"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.48" k1="-0.1200" k2="0.0858" k3="-0.0692"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.6" k1="-0.1298" k2="0.1438" k3="-0.1464"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.67" k1="-0.1189" k2="0.1370" k3="-0.1654"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="-0.0890" k2="0.0591" k3="-0.1504"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1.8" k1="-0.1159" k2="0.1066" k3="-0.1696"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="-0.1064" k2="0.0935" k3="-0.1578"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1185" k2="0.1091" k3="-0.1672"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.3" k1="-0.0940" k2="-0.1372" k3="0.1407"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.34" k1="-0.0836" k2="-0.1148" k3="0.1271"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.39" k1="-0.0781" k2="-0.1110" k3="0.1222"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.48" k1="-0.0763" k2="-0.0917" k3="0.1068"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.6" k1="-0.0697" k2="-0.1049" k3="0.1099"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.67" k1="-0.0734" k2="-0.0865" k3="0.0988"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.0829" k2="-0.0550" k3="0.0671"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1.8" k1="-0.0760" k2="-0.0870" k3="0.0920"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.0716" k2="-0.0875" k3="0.0913"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0873" k2="-0.0683" k3="0.0772"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.3" k1="-0.0761" k2="-0.1815" k3="0.1691"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.34" k1="-0.0802" k2="-0.1254" k3="0.1345"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.39" k1="-0.0734" k2="-0.1237" k3="0.1320"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.48" k1="-0.0753" k2="-0.0946" k3="0.1106"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.6" k1="-0.0608" k2="-0.1280" k3="0.1278"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="0.67" k1="-0.0778" k2="-0.0796" k3="0.0988"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1" k1="-0.0699" k2="-0.0925" k3="0.1015"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1.8" k1="-0.0620" k2="-0.1220" k3="0.1203"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.0730" k2="-0.0867" k3="0.0956"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0653" k2="-0.1231" k3="0.1199"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.3" k1="-0.0634" k2="-0.2145" k3="0.1908"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.34" k1="-0.0756" k2="-0.1394" k3="0.1439"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.39" k1="-0.0723" k2="-0.1244" k3="0.1318"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.48" k1="-0.0770" k2="-0.0940" k3="0.1114"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.6" k1="-0.0569" k2="-0.1368" k3="0.1344"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="0.67" k1="-0.0792" k2="-0.0790" k3="0.1008"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1" k1="-0.0695" k2="-0.0939" k3="0.1051"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1.8" k1="-0.0583" k2="-0.1318" k3="0.1280"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="3" k1="-0.0720" k2="-0.0909" k3="0.1017"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.0616" k2="-0.1313" k3="0.1265"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.3" k1="-0.0595" k2="-0.2260" k3="0.1986"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.34" k1="-0.0769" k2="-0.1386" k3="0.1428"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.39" k1="-0.0744" k2="-0.1265" k3="0.1359"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.48" k1="-0.0777" k2="-0.0953" k3="0.1128"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.6" k1="-0.0592" k2="-0.1325" k3="0.1321"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="0.67" k1="-0.0834" k2="-0.0716" k3="0.0960"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1" k1="-0.0738" k2="-0.0843" k3="0.0994"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1.8" k1="-0.0566" k2="-0.1367" k3="0.1318"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.0764" k2="-0.0819" k3="0.0970"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0608" k2="-0.1331" k3="0.1287"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.3" k1="-0.0592" k2="-0.2309" k3="0.2022"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.34" k1="-0.0796" k2="-0.1385" k3="0.1436"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.39" k1="-0.0793" k2="-0.1215" k3="0.1346"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.48" k1="-0.0832" k2="-0.0849" k3="0.1060"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.6" k1="-0.0612" k2="-0.1322" k3="0.1327"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.67" k1="-0.0872" k2="-0.0689" k3="0.0967"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1" k1="-0.0783" k2="-0.0774" k3="0.0958"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1.8" k1="-0.0613" k2="-0.1310" k3="0.1301"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="3" k1="-0.0837" k2="-0.0681" k3="0.0892"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0687" k2="-0.1199" k3="0.1222"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 100mm f/2.8L Macro IS USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="0.00406" b="-0.01754" c="0.02944" />
++            <!-- Taken with Canon 7D Mark II -->
++            <distortion model="ptlens" focal="100" a="0.00804" b="-0.0341" c="0.04884"/>
++            <tca model="poly3" focal="100" br="-0.0000029" vr="1.0002069" bb="0.0000320" vb="0.9998728"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 100mm f/2.8 Macro</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="-0.001558" b="0.004225" c="0" />
++            <distortion model="ptlens" focal="100" a="-0.001558" b="0.004225" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon FDn 100mm 1:2.8</model>
+-	    <focal value="100" />
+-	    <aperture min="2.8" max="32"/>
+         <mount>Canon FD</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal value="100"/>
++        <aperture min="2.8" max="32"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="-0.000626176" b="0.00321735" c="-0.0016503" />
+-            <tca model="poly3" focal="100" br="0.0000529" vr="0.9997253" bb="-0.0000227" vb="1.0000114" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="1" k1="-0.1299" k2="-0.1664" k3="0.1201" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="2" k1="-0.1223" k2="-0.2683" k3="0.1926" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="7" k1="-0.1430" k2="-0.2648" k3="0.1957" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.1617" k2="-0.2393" k3="0.1820" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="1" k1="-0.0317" k2="-0.0219" k3="-0.0001" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="2" k1="-0.0438" k2="-0.0251" k3="0.0081" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="7" k1="-0.0499" k2="-0.0261" k3="0.0103" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0519" k2="-0.0265" k3="0.0098" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="-0.0442" k2="-0.0086" k3="-0.0059" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="2" k1="-0.0554" k2="-0.0071" k3="-0.0046" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="7" k1="-0.0679" k2="0.0044" k3="-0.0099" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0738" k2="0.0095" k3="-0.0104" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.0474" k2="-0.0021" k3="-0.0112" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="2" k1="-0.0629" k2="0.0050" k3="-0.0115" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="7" k1="-0.0851" k2="0.0381" k3="-0.0290" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0915" k2="0.0470" k3="-0.0350" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="1" k1="-0.0304" k2="-0.0338" k3="0.0017" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="2" k1="-0.0725" k2="0.0094" k3="-0.0129" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="7" k1="-0.1156" k2="0.0949" k3="-0.0639" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1890" k2="0.2463" k3="-0.1528" />
++            <distortion model="ptlens" focal="100" a="-0.000626176" b="0.00321735" c="-0.0016503"/>
++            <tca model="poly3" focal="100" br="0.0000529" vr="0.9997253" bb="-0.0000227" vb="1.0000114"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1" k1="-0.1299" k2="-0.1664" k3="0.1201"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="2" k1="-0.1223" k2="-0.2683" k3="0.1926"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="7" k1="-0.1430" k2="-0.2648" k3="0.1957"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.1617" k2="-0.2393" k3="0.1820"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1" k1="-0.0317" k2="-0.0219" k3="-0.0001"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="2" k1="-0.0438" k2="-0.0251" k3="0.0081"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="7" k1="-0.0499" k2="-0.0261" k3="0.0103"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0519" k2="-0.0265" k3="0.0098"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="-0.0442" k2="-0.0086" k3="-0.0059"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="2" k1="-0.0554" k2="-0.0071" k3="-0.0046"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="7" k1="-0.0679" k2="0.0044" k3="-0.0099"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0738" k2="0.0095" k3="-0.0104"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.0474" k2="-0.0021" k3="-0.0112"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="2" k1="-0.0629" k2="0.0050" k3="-0.0115"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="7" k1="-0.0851" k2="0.0381" k3="-0.0290"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0915" k2="0.0470" k3="-0.0350"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1" k1="-0.0304" k2="-0.0338" k3="0.0017"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="2" k1="-0.0725" k2="0.0094" k3="-0.0129"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="7" k1="-0.1156" k2="0.0949" k3="-0.0639"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1890" k2="0.2463" k3="-0.1528"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon 135mm f/2.0L USM</model>
++        <model>Canon EF 135mm f/2.0L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="135" a="-0.007" b="0.025" c="-0.019" />
++            <distortion model="ptlens" focal="135" a="-0.007" b="0.025" c="-0.019"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 135mm f/2.8 Soft Focus</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.3</cropfactor>
++        <!-- Average crop factor of Canon APS-H cameras -->
++        <cropfactor>1.267</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="135" a="0.001266" b="0.001782" c="0" />
++            <distortion model="ptlens" focal="135" a="0.001266" b="0.001782" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 200mm f/2.8L USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="200" a="0.00082" b="-0.00169" c="0.01111" />
++            <distortion model="ptlens" focal="200" a="0.00082" b="-0.00169" c="0.01111"/>
+         </calibration>
+     </lens>
+-
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF 200mm f/2.8L II USM</model>
+         <mount>Canon EF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="200" a="0" b="0.000502" c="0" />
++            <distortion model="poly3" focal="200" k1="0.000502"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon TS-E 24mm f/3.5L</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.006127" b="-0.018983" c="0" />
++            <distortion model="ptlens" focal="24" a="0.006127" b="-0.018983" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon TS-E 24mm f/3.5L</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 50D -->
++            <distortion model="poly3" focal="24" k1="-0.00317"/>
++            <tca model="poly3" focal="24" br="-0.0000018" vr="1.0003986" bb="-0.0000029" vb="0.9999787"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon TS-E 45mm f/2.8</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="45" a="0.00211" b="-0.007388" c="0" />
++            <distortion model="ptlens" focal="45" a="0.00211" b="-0.007388" c="0"/>
+         </calibration>
+     </lens>
+-
+-
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon TS-E 90mm f/2.8</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="90" a="0" b="0.001333" c="0" />
++            <distortion model="poly3" focal="90" k1="0.001333"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+         <model>Canon EF-S 18-135mm f/3.5-5.6 IS</model>
+         <mount>Canon EF-S</mount>
+-        <!-- FixMe: Actually cropfactor 1.613 -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+             <!-- Taken with Canon EOS 60D -->
+-            <distortion model="ptlens" focal="18" a="0.04464" b="-0.15487" c="0.13016" />
+-            <distortion model="ptlens" focal="19" a="0.02996" b="-0.08814" c="0.06037" />
+-            <distortion model="ptlens" focal="22" a="0.03415" b="-0.09989" c="0.08629" />
+-            <distortion model="ptlens" focal="24" a="0.01991" b="-0.04847" c="0.03528" />
+-            <distortion model="ptlens" focal="29" a="0.02032" b="-0.05313" c="0.05651" />
+-            <distortion model="ptlens" focal="35" a="0.00632" b="-0.00789" c="0.01784" />
+-            <distortion model="ptlens" focal="41" a="0.00424" b="-0.00522" c="0.0221" />
+-            <distortion model="ptlens" focal="48" a="-0.00698" b="0.03031" c="-0.01303" />
+-            <distortion model="ptlens" focal="50" a="0.00469" b="-0.01695" c="0.042" />
+-            <distortion model="ptlens" focal="85" a="-0.00269" b="0.01092" c="0.00887" />
+-            <distortion model="ptlens" focal="135" a="0.00367" b="-0.00835" c="0.02183" />
+-            <tca model="poly3" focal="18" br="-0.0001730" vr="1.0009746" bb="0.0001366" vb="0.9997877" />
+-            <tca model="poly3" focal="19" br="-0.0001469" vr="1.0008595" bb="0.0000849" vb="0.9998491" />
+-            <tca model="poly3" focal="21" br="-0.0000978" vr="1.0007549" bb="0.0000682" vb="0.9998856" />
+-            <tca model="poly3" focal="24" br="-0.0000912" vr="1.0006334" bb="0.0000658" vb="0.9999068" />
+-            <tca model="poly3" focal="28" br="-0.0000969" vr="1.0004872" bb="0.0000395" vb="0.9999687" />
+-            <tca model="poly3" focal="35" br="-0.0000454" vr="1.0002680" bb="0.0000255" vb="1.0000265" />
+-            <tca model="poly3" focal="50" br="0.0000013" vr="0.9999972" bb="-0.0000138" vb="1.0001329" />
+-            <tca model="poly3" focal="85" br="0.0000476" vr="0.9997585" bb="-0.0000551" vb="1.0000792" />
+-            <tca model="poly3" focal="135" br="0.0000789" vr="0.9996590" bb="-0.0000630" vb="0.9998623" />
++            <distortion model="ptlens" focal="18" a="0.04464" b="-0.15487" c="0.13016"/>
++            <distortion model="ptlens" focal="19" a="0.02996" b="-0.08814" c="0.06037"/>
++            <distortion model="ptlens" focal="22" a="0.03415" b="-0.09989" c="0.08629"/>
++            <distortion model="ptlens" focal="24" a="0.01991" b="-0.04847" c="0.03528"/>
++            <distortion model="ptlens" focal="29" a="0.02032" b="-0.05313" c="0.05651"/>
++            <distortion model="ptlens" focal="35" a="0.00632" b="-0.00789" c="0.01784"/>
++            <distortion model="ptlens" focal="41" a="0.00424" b="-0.00522" c="0.0221"/>
++            <distortion model="ptlens" focal="48" a="-0.00698" b="0.03031" c="-0.01303"/>
++            <distortion model="ptlens" focal="50" a="0.00469" b="-0.01695" c="0.042"/>
++            <distortion model="ptlens" focal="85" a="-0.00269" b="0.01092" c="0.00887"/>
++            <distortion model="ptlens" focal="135" a="0.00367" b="-0.00835" c="0.02183"/>
++            <tca model="poly3" focal="18" br="-0.0001730" vr="1.0009746" bb="0.0001366" vb="0.9997877"/>
++            <tca model="poly3" focal="19" br="-0.0001469" vr="1.0008595" bb="0.0000849" vb="0.9998491"/>
++            <tca model="poly3" focal="21" br="-0.0000978" vr="1.0007549" bb="0.0000682" vb="0.9998856"/>
++            <tca model="poly3" focal="24" br="-0.0000912" vr="1.0006334" bb="0.0000658" vb="0.9999068"/>
++            <tca model="poly3" focal="28" br="-0.0000969" vr="1.0004872" bb="0.0000395" vb="0.9999687"/>
++            <tca model="poly3" focal="35" br="-0.0000454" vr="1.0002680" bb="0.0000255" vb="1.0000265"/>
++            <tca model="poly3" focal="50" br="0.0000013" vr="0.9999972" bb="-0.0000138" vb="1.0001329"/>
++            <tca model="poly3" focal="85" br="0.0000476" vr="0.9997585" bb="-0.0000551" vb="1.0000792"/>
++            <tca model="poly3" focal="135" br="0.0000789" vr="0.9996590" bb="-0.0000630" vb="0.9998623"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Canon</maker>
+-        <model>Canon EF 85mm f/1.2L II USM</model>
++        <model>Canon EF-S 18-135mm f/3.5-5.6 IS USM</model>
++        <model lang="en">Canon EF-S 18-135mm f/3.5-5.6 IS USM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 7D Mark II -->
++            <distortion model="ptlens" focal="18" a="0.03204" b="-0.1012" c="0.05836"/>
++            <distortion model="ptlens" focal="24" a="0.01797" b="-0.03941" c="0.01144"/>
++            <distortion model="ptlens" focal="35" a="0.00739" b="-0.00442" c="-0.00773"/>
++            <distortion model="ptlens" focal="50" a="0.0073" b="-0.01862" c="0.0332"/>
++            <distortion model="ptlens" focal="85" a="0.00239" b="0.00461" c="-0.00297"/>
++            <distortion model="ptlens" focal="135" a="0.0167" b="-0.05074" c="0.0676"/>
++            <tca model="poly3" focal="18" vr="1.0010276" vb="1.0002780"/>
++            <tca model="poly3" focal="24" vr="1.0005628" vb="1.0006195"/>
++            <tca model="poly3" focal="35" vr="1.0005569" vb="1.0005824"/>
++            <tca model="poly3" focal="50" vr="1.0002666" vb="1.0001993"/>
++            <tca model="poly3" focal="85" vr="0.9998140" vb="0.9999427"/>
++            <tca model="poly3" focal="135" vr="0.9991194" vb="0.9999430"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 18-135mm f/3.5-5.6 IS STM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS-650D -->
++            <distortion model="ptlens" focal="18" a="0.01902" b="-0.05009" c="-0.0067"/>
++            <distortion model="ptlens" focal="24" a="0.02182" b="-0.05987" c="0.04459"/>
++            <distortion model="ptlens" focal="35" a="0.00521" b="-0.00299" c="0.00091"/>
++            <distortion model="ptlens" focal="50" a="-0.00078" b="0.0111" c="-0.00193"/>
++            <distortion model="ptlens" focal="85" a="-0.0114" b="0.04561" c="-0.0336"/>
++            <distortion model="ptlens" focal="135" a="-0.00247" b="0.02547" c="-0.02858"/>
++            <!-- Taken with Canon EOS-700D -->
++            <tca model="poly3" focal="18" br="-0.0000022" vr="1.0004741" bb="0.0000360" vb="0.9999922"/>
++            <tca model="poly3" focal="20" br="0.0000027" vr="1.0003061" bb="0.0000495" vb="1.0001577"/>
++            <tca model="poly3" focal="22" br="-0.0000178" vr="1.0002362" bb="0.0000445" vb="1.0001045"/>
++            <tca model="poly3" focal="24" br="-0.0000436" vr="1.0002265" bb="0.0000450" vb="1.0001340"/>
++            <tca model="poly3" focal="35" br="0.0000065" vr="1.0000848" bb="0.0000209" vb="1.0001421"/>
++            <tca model="poly3" focal="50" br="0.0000012" vr="1.0000838" bb="0.0000227" vb="1.0000531"/>
++            <tca model="poly3" focal="64" br="0.0000032" vr="1.0000358" bb="-0.0000286" vb="0.9999836"/>
++            <tca model="poly3" focal="85" br="0.0000043" vr="0.9999892" bb="-0.0000588" vb="1.0000195"/>
++            <tca model="poly3" focal="118" br="0.0000118" vr="0.9999617" bb="0.0001272" vb="0.9995419"/>
++            <tca model="poly3" focal="135" br="-0.0000001" vr="0.9999369" bb="0.0000753" vb="0.9997197"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.7431" k2="0.0817" k3="0.0463"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.7431" k2="0.0817" k3="0.0463"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2080" k2="-0.7339" k3="0.4079"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2080" k2="-0.7339" k3="0.4079"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.0665" k2="-0.5705" k3="0.1866"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.0665" k2="-0.5705" k3="0.1866"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.1327" k2="-0.1977" k3="-0.0650"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.1327" k2="-0.1977" k3="-0.0650"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.1961" k2="0.0505" k3="-0.1723"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1961" k2="0.0505" k3="-0.1723"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.1976" k2="0.0089" k3="-0.0860"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.1976" k2="0.0089" k3="-0.0860"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.1780" k2="-0.0852" k3="0.0041"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.1780" k2="-0.0852" k3="0.0041"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.1579" k2="-0.1565" k3="0.0682"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1579" k2="-0.1565" k3="0.0682"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="10" k1="-0.1588" k2="-0.1591" k3="0.0743"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.1588" k2="-0.1591" k3="0.0743"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.1617" k2="-0.1515" k3="0.0701"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.1617" k2="-0.1515" k3="0.0701"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1592" k2="-0.1595" k3="0.0777"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1592" k2="-0.1595" k3="0.0777"/>
++            <vignetting model="pa" focal="18" aperture="13" distance="10" k1="-0.1606" k2="-0.1526" k3="0.0722"/>
++            <vignetting model="pa" focal="18" aperture="13" distance="1000" k1="-0.1606" k2="-0.1526" k3="0.0722"/>
++            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.1636" k2="-0.1471" k3="0.0700"/>
++            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.1636" k2="-0.1471" k3="0.0700"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.1630" k2="-0.1469" k3="0.0697"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.1630" k2="-0.1469" k3="0.0697"/>
++            <vignetting model="pa" focal="18" aperture="18" distance="10" k1="-0.1665" k2="-0.1368" k3="0.0635"/>
++            <vignetting model="pa" focal="18" aperture="18" distance="1000" k1="-0.1665" k2="-0.1368" k3="0.0635"/>
++            <vignetting model="pa" focal="18" aperture="20" distance="10" k1="-0.1692" k2="-0.1296" k3="0.0585"/>
++            <vignetting model="pa" focal="18" aperture="20" distance="1000" k1="-0.1692" k2="-0.1296" k3="0.0585"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1698" k2="-0.1275" k3="0.0574"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1698" k2="-0.1275" k3="0.0574"/>
++            <vignetting model="pa" focal="20" aperture="3.5" distance="10" k1="-0.7252" k2="0.0798" k3="0.0769"/>
++            <vignetting model="pa" focal="20" aperture="3.5" distance="1000" k1="-0.7252" k2="0.0798" k3="0.0769"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.2011" k2="-0.7135" k3="0.4348"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.2011" k2="-0.7135" k3="0.4348"/>
++            <vignetting model="pa" focal="20" aperture="4.5" distance="10" k1="-0.0404" k2="-0.6019" k3="0.2589"/>
++            <vignetting model="pa" focal="20" aperture="4.5" distance="1000" k1="-0.0404" k2="-0.6019" k3="0.2589"/>
++            <vignetting model="pa" focal="20" aperture="5" distance="10" k1="-0.0784" k2="-0.3215" k3="0.0741"/>
++            <vignetting model="pa" focal="20" aperture="5" distance="1000" k1="-0.0784" k2="-0.3215" k3="0.0741"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.1393" k2="-0.0906" k3="-0.0238"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.1393" k2="-0.0906" k3="-0.0238"/>
++            <vignetting model="pa" focal="20" aperture="6.3" distance="10" k1="-0.1329" k2="-0.1501" k3="0.0712"/>
++            <vignetting model="pa" focal="20" aperture="6.3" distance="1000" k1="-0.1329" k2="-0.1501" k3="0.0712"/>
++            <vignetting model="pa" focal="20" aperture="7.1" distance="10" k1="-0.1337" k2="-0.1677" k3="0.0942"/>
++            <vignetting model="pa" focal="20" aperture="7.1" distance="1000" k1="-0.1337" k2="-0.1677" k3="0.0942"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.1376" k2="-0.1540" k3="0.0860"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.1376" k2="-0.1540" k3="0.0860"/>
++            <vignetting model="pa" focal="20" aperture="9" distance="10" k1="-0.1423" k2="-0.1429" k3="0.0805"/>
++            <vignetting model="pa" focal="20" aperture="9" distance="1000" k1="-0.1423" k2="-0.1429" k3="0.0805"/>
++            <vignetting model="pa" focal="20" aperture="10" distance="10" k1="-0.1359" k2="-0.1590" k3="0.0909"/>
++            <vignetting model="pa" focal="20" aperture="10" distance="1000" k1="-0.1359" k2="-0.1590" k3="0.0909"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.1442" k2="-0.1391" k3="0.0797"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.1442" k2="-0.1391" k3="0.0797"/>
++            <vignetting model="pa" focal="20" aperture="13" distance="10" k1="-0.1407" k2="-0.1429" k3="0.0825"/>
++            <vignetting model="pa" focal="20" aperture="13" distance="1000" k1="-0.1407" k2="-0.1429" k3="0.0825"/>
++            <vignetting model="pa" focal="20" aperture="14" distance="10" k1="-0.1452" k2="-0.1355" k3="0.0792"/>
++            <vignetting model="pa" focal="20" aperture="14" distance="1000" k1="-0.1452" k2="-0.1355" k3="0.0792"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="10" k1="-0.1509" k2="-0.1167" k3="0.0651"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.1509" k2="-0.1167" k3="0.0651"/>
++            <vignetting model="pa" focal="20" aperture="18" distance="10" k1="-0.1506" k2="-0.1165" k3="0.0655"/>
++            <vignetting model="pa" focal="20" aperture="18" distance="1000" k1="-0.1506" k2="-0.1165" k3="0.0655"/>
++            <vignetting model="pa" focal="20" aperture="20" distance="10" k1="-0.1523" k2="-0.1123" k3="0.0629"/>
++            <vignetting model="pa" focal="20" aperture="20" distance="1000" k1="-0.1523" k2="-0.1123" k3="0.0629"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.1510" k2="-0.1112" k3="0.0609"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.1510" k2="-0.1112" k3="0.0609"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.6771" k2="0.0468" k3="0.1067"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6771" k2="0.0468" k3="0.1067"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.0538" k2="-0.7699" k3="0.4315"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.0538" k2="-0.7699" k3="0.4315"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="10" k1="-0.0237" k2="-0.5195" k3="0.2193"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.0237" k2="-0.5195" k3="0.2193"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.0965" k2="-0.1514" k3="0.0056"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.0965" k2="-0.1514" k3="0.0056"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.1307" k2="-0.0631" k3="0.0025"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.1307" k2="-0.0631" k3="0.0025"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.1107" k2="-0.1443" k3="0.0816"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.1107" k2="-0.1443" k3="0.0816"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.1052" k2="-0.1631" k3="0.0986"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.1052" k2="-0.1631" k3="0.0986"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.1113" k2="-0.1496" k3="0.0925"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.1113" k2="-0.1496" k3="0.0925"/>
++            <vignetting model="pa" focal="24" aperture="10" distance="10" k1="-0.1225" k2="-0.1233" k3="0.0773"/>
++            <vignetting model="pa" focal="24" aperture="10" distance="1000" k1="-0.1225" k2="-0.1233" k3="0.0773"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.1255" k2="-0.1130" k3="0.0702"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.1255" k2="-0.1130" k3="0.0702"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.1248" k2="-0.1116" k3="0.0686"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.1248" k2="-0.1116" k3="0.0686"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.1306" k2="-0.0981" k3="0.0611"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.1306" k2="-0.0981" k3="0.0611"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.1341" k2="-0.0895" k3="0.0554"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.1341" k2="-0.0895" k3="0.0554"/>
++            <vignetting model="pa" focal="24" aperture="18" distance="10" k1="-0.1303" k2="-0.0986" k3="0.0623"/>
++            <vignetting model="pa" focal="24" aperture="18" distance="1000" k1="-0.1303" k2="-0.0986" k3="0.0623"/>
++            <vignetting model="pa" focal="24" aperture="20" distance="10" k1="-0.1340" k2="-0.0889" k3="0.0561"/>
++            <vignetting model="pa" focal="24" aperture="20" distance="1000" k1="-0.1340" k2="-0.0889" k3="0.0561"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.1337" k2="-0.0860" k3="0.0537"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.1337" k2="-0.0860" k3="0.0537"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.1391" k2="-0.0742" k3="0.0464"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.1391" k2="-0.0742" k3="0.0464"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="10" k1="-0.6127" k2="-0.0175" k3="0.1423"/>
++            <vignetting model="pa" focal="27" aperture="4" distance="1000" k1="-0.6127" k2="-0.0175" k3="0.1423"/>
++            <vignetting model="pa" focal="27" aperture="4.5" distance="10" k1="-0.0076" k2="-0.7595" k3="0.4154"/>
++            <vignetting model="pa" focal="27" aperture="4.5" distance="1000" k1="-0.0076" k2="-0.7595" k3="0.4154"/>
++            <vignetting model="pa" focal="27" aperture="5" distance="10" k1="-0.0280" k2="-0.3987" k3="0.1462"/>
++            <vignetting model="pa" focal="27" aperture="5" distance="1000" k1="-0.0280" k2="-0.3987" k3="0.1462"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="10" k1="-0.1080" k2="-0.0517" k3="-0.0399"/>
++            <vignetting model="pa" focal="27" aperture="5.6" distance="1000" k1="-0.1080" k2="-0.0517" k3="-0.0399"/>
++            <vignetting model="pa" focal="27" aperture="6.3" distance="10" k1="-0.1128" k2="-0.0662" k3="0.0241"/>
++            <vignetting model="pa" focal="27" aperture="6.3" distance="1000" k1="-0.1128" k2="-0.0662" k3="0.0241"/>
++            <vignetting model="pa" focal="27" aperture="7.1" distance="10" k1="-0.0942" k2="-0.1290" k3="0.0778"/>
++            <vignetting model="pa" focal="27" aperture="7.1" distance="1000" k1="-0.0942" k2="-0.1290" k3="0.0778"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="10" k1="-0.0903" k2="-0.1352" k3="0.0825"/>
++            <vignetting model="pa" focal="27" aperture="8" distance="1000" k1="-0.0903" k2="-0.1352" k3="0.0825"/>
++            <vignetting model="pa" focal="27" aperture="9" distance="10" k1="-0.0913" k2="-0.1390" k3="0.0889"/>
++            <vignetting model="pa" focal="27" aperture="9" distance="1000" k1="-0.0913" k2="-0.1390" k3="0.0889"/>
++            <vignetting model="pa" focal="27" aperture="10" distance="10" k1="-0.1020" k2="-0.1164" k3="0.0765"/>
++            <vignetting model="pa" focal="27" aperture="10" distance="1000" k1="-0.1020" k2="-0.1164" k3="0.0765"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="10" k1="-0.1101" k2="-0.0940" k3="0.0624"/>
++            <vignetting model="pa" focal="27" aperture="11" distance="1000" k1="-0.1101" k2="-0.0940" k3="0.0624"/>
++            <vignetting model="pa" focal="27" aperture="13" distance="10" k1="-0.1080" k2="-0.0983" k3="0.0665"/>
++            <vignetting model="pa" focal="27" aperture="13" distance="1000" k1="-0.1080" k2="-0.0983" k3="0.0665"/>
++            <vignetting model="pa" focal="27" aperture="14" distance="10" k1="-0.1129" k2="-0.0863" k3="0.0595"/>
++            <vignetting model="pa" focal="27" aperture="14" distance="1000" k1="-0.1129" k2="-0.0863" k3="0.0595"/>
++            <vignetting model="pa" focal="27" aperture="16" distance="10" k1="-0.1201" k2="-0.0696" k3="0.0487"/>
++            <vignetting model="pa" focal="27" aperture="16" distance="1000" k1="-0.1201" k2="-0.0696" k3="0.0487"/>
++            <vignetting model="pa" focal="27" aperture="18" distance="10" k1="-0.1200" k2="-0.0676" k3="0.0477"/>
++            <vignetting model="pa" focal="27" aperture="18" distance="1000" k1="-0.1200" k2="-0.0676" k3="0.0477"/>
++            <vignetting model="pa" focal="27" aperture="20" distance="10" k1="-0.1256" k2="-0.0550" k3="0.0396"/>
++            <vignetting model="pa" focal="27" aperture="20" distance="1000" k1="-0.1256" k2="-0.0550" k3="0.0396"/>
++            <vignetting model="pa" focal="27" aperture="22" distance="10" k1="-0.1245" k2="-0.0571" k3="0.0409"/>
++            <vignetting model="pa" focal="27" aperture="22" distance="1000" k1="-0.1245" k2="-0.0571" k3="0.0409"/>
++            <vignetting model="pa" focal="27" aperture="25" distance="10" k1="-0.1225" k2="-0.0605" k3="0.0434"/>
++            <vignetting model="pa" focal="27" aperture="25" distance="1000" k1="-0.1225" k2="-0.0605" k3="0.0434"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.5085" k2="-0.1221" k3="0.1864"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.5085" k2="-0.1221" k3="0.1864"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.0040" k2="-0.7771" k3="0.4470"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.0040" k2="-0.7771" k3="0.4470"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.0307" k2="-0.2436" k3="0.0481"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.0307" k2="-0.2436" k3="0.0481"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.1017" k2="0.0030" k3="-0.0502"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1017" k2="0.0030" k3="-0.0502"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.0972" k2="-0.0361" k3="0.0076"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.0972" k2="-0.0361" k3="0.0076"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.0795" k2="-0.0962" k3="0.0614"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.0795" k2="-0.0962" k3="0.0614"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.0652" k2="-0.1337" k3="0.0884"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.0652" k2="-0.1337" k3="0.0884"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.0654" k2="-0.1367" k3="0.0924"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.0654" k2="-0.1367" k3="0.0924"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.0772" k2="-0.1101" k3="0.0784"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.0772" k2="-0.1101" k3="0.0784"/>
++            <vignetting model="pa" focal="35" aperture="13" distance="10" k1="-0.0865" k2="-0.0914" k3="0.0694"/>
++            <vignetting model="pa" focal="35" aperture="13" distance="1000" k1="-0.0865" k2="-0.0914" k3="0.0694"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.0910" k2="-0.0802" k3="0.0626"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.0910" k2="-0.0802" k3="0.0626"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.0915" k2="-0.0799" k3="0.0639"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.0915" k2="-0.0799" k3="0.0639"/>
++            <vignetting model="pa" focal="35" aperture="18" distance="10" k1="-0.0915" k2="-0.0779" k3="0.0623"/>
++            <vignetting model="pa" focal="35" aperture="18" distance="1000" k1="-0.0915" k2="-0.0779" k3="0.0623"/>
++            <vignetting model="pa" focal="35" aperture="20" distance="10" k1="-0.0945" k2="-0.0728" k3="0.0610"/>
++            <vignetting model="pa" focal="35" aperture="20" distance="1000" k1="-0.0945" k2="-0.0728" k3="0.0610"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.0968" k2="-0.0655" k3="0.0552"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.0968" k2="-0.0655" k3="0.0552"/>
++            <vignetting model="pa" focal="35" aperture="25" distance="10" k1="-0.0955" k2="-0.0691" k3="0.0583"/>
++            <vignetting model="pa" focal="35" aperture="25" distance="1000" k1="-0.0955" k2="-0.0691" k3="0.0583"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.0957" k2="-0.0673" k3="0.0562"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.0957" k2="-0.0673" k3="0.0562"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.3907" k2="-0.1708" k3="0.1678"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.3907" k2="-0.1708" k3="0.1678"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="0.0011" k2="-0.3197" k3="0.0732"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="0.0011" k2="-0.3197" k3="0.0732"/>
++            <vignetting model="pa" focal="50" aperture="6.3" distance="10" k1="-0.1342" k2="0.1954" k3="-0.2109"/>
++            <vignetting model="pa" focal="50" aperture="6.3" distance="1000" k1="-0.1342" k2="0.1954" k3="-0.2109"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.1253" k2="0.1416" k3="-0.1323"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.1253" k2="0.1416" k3="-0.1323"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0835" k2="0.0018" k3="-0.0129"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0835" k2="0.0018" k3="-0.0129"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.0654" k2="-0.0601" k3="0.0409"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.0654" k2="-0.0601" k3="0.0409"/>
++            <vignetting model="pa" focal="50" aperture="10" distance="10" k1="-0.0571" k2="-0.0858" k3="0.0631"/>
++            <vignetting model="pa" focal="50" aperture="10" distance="1000" k1="-0.0571" k2="-0.0858" k3="0.0631"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.0487" k2="-0.1136" k3="0.0861"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.0487" k2="-0.1136" k3="0.0861"/>
++            <vignetting model="pa" focal="50" aperture="13" distance="10" k1="-0.0430" k2="-0.1279" k3="0.0974"/>
++            <vignetting model="pa" focal="50" aperture="13" distance="1000" k1="-0.0430" k2="-0.1279" k3="0.0974"/>
++            <vignetting model="pa" focal="50" aperture="14" distance="10" k1="-0.0430" k2="-0.1289" k3="0.0991"/>
++            <vignetting model="pa" focal="50" aperture="14" distance="1000" k1="-0.0430" k2="-0.1289" k3="0.0991"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.0541" k2="-0.1068" k3="0.0882"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.0541" k2="-0.1068" k3="0.0882"/>
++            <vignetting model="pa" focal="50" aperture="18" distance="10" k1="-0.0614" k2="-0.0918" k3="0.0801"/>
++            <vignetting model="pa" focal="50" aperture="18" distance="1000" k1="-0.0614" k2="-0.0918" k3="0.0801"/>
++            <vignetting model="pa" focal="50" aperture="20" distance="10" k1="-0.0620" k2="-0.0887" k3="0.0779"/>
++            <vignetting model="pa" focal="50" aperture="20" distance="1000" k1="-0.0620" k2="-0.0887" k3="0.0779"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.0702" k2="-0.0708" k3="0.0678"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0702" k2="-0.0708" k3="0.0678"/>
++            <vignetting model="pa" focal="50" aperture="25" distance="10" k1="-0.0700" k2="-0.0686" k3="0.0651"/>
++            <vignetting model="pa" focal="50" aperture="25" distance="1000" k1="-0.0700" k2="-0.0686" k3="0.0651"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="10" k1="-0.0741" k2="-0.0588" k3="0.0587"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.0741" k2="-0.0588" k3="0.0587"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.0738" k2="-0.0606" k3="0.0607"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.0738" k2="-0.0606" k3="0.0607"/>
++            <vignetting model="pa" focal="62" aperture="5" distance="10" k1="-0.3899" k2="-0.0072" k3="0.0021"/>
++            <vignetting model="pa" focal="62" aperture="5" distance="1000" k1="-0.3899" k2="-0.0072" k3="0.0021"/>
++            <vignetting model="pa" focal="62" aperture="5.6" distance="10" k1="-0.0293" k2="-0.2405" k3="-0.0157"/>
++            <vignetting model="pa" focal="62" aperture="5.6" distance="1000" k1="-0.0293" k2="-0.2405" k3="-0.0157"/>
++            <vignetting model="pa" focal="62" aperture="6.3" distance="10" k1="-0.1890" k2="0.4683" k3="-0.4706"/>
++            <vignetting model="pa" focal="62" aperture="6.3" distance="1000" k1="-0.1890" k2="0.4683" k3="-0.4706"/>
++            <vignetting model="pa" focal="62" aperture="7.1" distance="10" k1="-0.1794" k2="0.4091" k3="-0.3806"/>
++            <vignetting model="pa" focal="62" aperture="7.1" distance="1000" k1="-0.1794" k2="0.4091" k3="-0.3806"/>
++            <vignetting model="pa" focal="62" aperture="8" distance="10" k1="-0.1218" k2="0.1864" k3="-0.1749"/>
++            <vignetting model="pa" focal="62" aperture="8" distance="1000" k1="-0.1218" k2="0.1864" k3="-0.1749"/>
++            <vignetting model="pa" focal="62" aperture="9" distance="10" k1="-0.0775" k2="0.0178" k3="-0.0223"/>
++            <vignetting model="pa" focal="62" aperture="9" distance="1000" k1="-0.0775" k2="0.0178" k3="-0.0223"/>
++            <vignetting model="pa" focal="62" aperture="10" distance="10" k1="-0.0698" k2="-0.0063" k3="-0.0004"/>
++            <vignetting model="pa" focal="62" aperture="10" distance="1000" k1="-0.0698" k2="-0.0063" k3="-0.0004"/>
++            <vignetting model="pa" focal="62" aperture="11" distance="10" k1="-0.0470" k2="-0.0833" k3="0.0640"/>
++            <vignetting model="pa" focal="62" aperture="11" distance="1000" k1="-0.0470" k2="-0.0833" k3="0.0640"/>
++            <vignetting model="pa" focal="62" aperture="13" distance="10" k1="-0.0393" k2="-0.1066" k3="0.0825"/>
++            <vignetting model="pa" focal="62" aperture="13" distance="1000" k1="-0.0393" k2="-0.1066" k3="0.0825"/>
++            <vignetting model="pa" focal="62" aperture="14" distance="10" k1="-0.0342" k2="-0.1218" k3="0.0945"/>
++            <vignetting model="pa" focal="62" aperture="14" distance="1000" k1="-0.0342" k2="-0.1218" k3="0.0945"/>
++            <vignetting model="pa" focal="62" aperture="16" distance="10" k1="-0.0322" k2="-0.1260" k3="0.0979"/>
++            <vignetting model="pa" focal="62" aperture="16" distance="1000" k1="-0.0322" k2="-0.1260" k3="0.0979"/>
++            <vignetting model="pa" focal="62" aperture="18" distance="10" k1="-0.0318" k2="-0.1284" k3="0.1012"/>
++            <vignetting model="pa" focal="62" aperture="18" distance="1000" k1="-0.0318" k2="-0.1284" k3="0.1012"/>
++            <vignetting model="pa" focal="62" aperture="20" distance="10" k1="-0.0381" k2="-0.1161" k3="0.0948"/>
++            <vignetting model="pa" focal="62" aperture="20" distance="1000" k1="-0.0381" k2="-0.1161" k3="0.0948"/>
++            <vignetting model="pa" focal="62" aperture="22" distance="10" k1="-0.0462" k2="-0.1015" k3="0.0881"/>
++            <vignetting model="pa" focal="62" aperture="22" distance="1000" k1="-0.0462" k2="-0.1015" k3="0.0881"/>
++            <vignetting model="pa" focal="62" aperture="25" distance="10" k1="-0.0478" k2="-0.0978" k3="0.0869"/>
++            <vignetting model="pa" focal="62" aperture="25" distance="1000" k1="-0.0478" k2="-0.0978" k3="0.0869"/>
++            <vignetting model="pa" focal="62" aperture="29" distance="10" k1="-0.0516" k2="-0.0888" k3="0.0806"/>
++            <vignetting model="pa" focal="62" aperture="29" distance="1000" k1="-0.0516" k2="-0.0888" k3="0.0806"/>
++            <vignetting model="pa" focal="62" aperture="32" distance="10" k1="-0.0536" k2="-0.0870" k3="0.0814"/>
++            <vignetting model="pa" focal="62" aperture="32" distance="1000" k1="-0.0536" k2="-0.0870" k3="0.0814"/>
++            <vignetting model="pa" focal="74" aperture="5" distance="10" k1="-0.4182" k2="0.1220" k3="-0.1149"/>
++            <vignetting model="pa" focal="74" aperture="5" distance="1000" k1="-0.4182" k2="0.1220" k3="-0.1149"/>
++            <vignetting model="pa" focal="74" aperture="5.6" distance="10" k1="-0.0893" k2="-0.2952" k3="0.0407"/>
++            <vignetting model="pa" focal="74" aperture="5.6" distance="1000" k1="-0.0893" k2="-0.2952" k3="0.0407"/>
++            <vignetting model="pa" focal="74" aperture="6.3" distance="10" k1="-0.1611" k2="0.4412" k3="-0.5265"/>
++            <vignetting model="pa" focal="74" aperture="6.3" distance="1000" k1="-0.1611" k2="0.4412" k3="-0.5265"/>
++            <vignetting model="pa" focal="74" aperture="7.1" distance="10" k1="-0.2016" k2="0.5457" k3="-0.5348"/>
++            <vignetting model="pa" focal="74" aperture="7.1" distance="1000" k1="-0.2016" k2="0.5457" k3="-0.5348"/>
++            <vignetting model="pa" focal="74" aperture="8" distance="10" k1="-0.1725" k2="0.4010" k3="-0.3711"/>
++            <vignetting model="pa" focal="74" aperture="8" distance="1000" k1="-0.1725" k2="0.4010" k3="-0.3711"/>
++            <vignetting model="pa" focal="74" aperture="9" distance="10" k1="-0.1239" k2="0.2105" k3="-0.1916"/>
++            <vignetting model="pa" focal="74" aperture="9" distance="1000" k1="-0.1239" k2="0.2105" k3="-0.1916"/>
++            <vignetting model="pa" focal="74" aperture="10" distance="10" k1="-0.0838" k2="0.0645" k3="-0.0632"/>
++            <vignetting model="pa" focal="74" aperture="10" distance="1000" k1="-0.0838" k2="0.0645" k3="-0.0632"/>
++            <vignetting model="pa" focal="74" aperture="11" distance="10" k1="-0.0601" k2="-0.0176" k3="0.0102"/>
++            <vignetting model="pa" focal="74" aperture="11" distance="1000" k1="-0.0601" k2="-0.0176" k3="0.0102"/>
++            <vignetting model="pa" focal="74" aperture="13" distance="10" k1="-0.0513" k2="-0.0568" k3="0.0475"/>
++            <vignetting model="pa" focal="74" aperture="13" distance="1000" k1="-0.0513" k2="-0.0568" k3="0.0475"/>
++            <vignetting model="pa" focal="74" aperture="14" distance="10" k1="-0.0384" k2="-0.0936" k3="0.0747"/>
++            <vignetting model="pa" focal="74" aperture="14" distance="1000" k1="-0.0384" k2="-0.0936" k3="0.0747"/>
++            <vignetting model="pa" focal="74" aperture="16" distance="10" k1="-0.0298" k2="-0.1182" k3="0.0936"/>
++            <vignetting model="pa" focal="74" aperture="16" distance="1000" k1="-0.0298" k2="-0.1182" k3="0.0936"/>
++            <vignetting model="pa" focal="74" aperture="18" distance="10" k1="-0.0249" k2="-0.1301" k3="0.1018"/>
++            <vignetting model="pa" focal="74" aperture="18" distance="1000" k1="-0.0249" k2="-0.1301" k3="0.1018"/>
++            <vignetting model="pa" focal="74" aperture="20" distance="10" k1="-0.0234" k2="-0.1370" k3="0.1081"/>
++            <vignetting model="pa" focal="74" aperture="20" distance="1000" k1="-0.0234" k2="-0.1370" k3="0.1081"/>
++            <vignetting model="pa" focal="74" aperture="22" distance="10" k1="-0.0306" k2="-0.1196" k3="0.0974"/>
++            <vignetting model="pa" focal="74" aperture="22" distance="1000" k1="-0.0306" k2="-0.1196" k3="0.0974"/>
++            <vignetting model="pa" focal="74" aperture="25" distance="10" k1="-0.0358" k2="-0.1115" k3="0.0947"/>
++            <vignetting model="pa" focal="74" aperture="25" distance="1000" k1="-0.0358" k2="-0.1115" k3="0.0947"/>
++            <vignetting model="pa" focal="74" aperture="29" distance="10" k1="-0.0394" k2="-0.1034" k3="0.0893"/>
++            <vignetting model="pa" focal="74" aperture="29" distance="1000" k1="-0.0394" k2="-0.1034" k3="0.0893"/>
++            <vignetting model="pa" focal="74" aperture="32" distance="10" k1="-0.0450" k2="-0.0906" k3="0.0819"/>
++            <vignetting model="pa" focal="74" aperture="32" distance="1000" k1="-0.0450" k2="-0.0906" k3="0.0819"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="-0.5143" k2="0.3646" k3="-0.2930"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.5143" k2="0.3646" k3="-0.2930"/>
++            <vignetting model="pa" focal="97" aperture="6.3" distance="10" k1="-0.0659" k2="0.1080" k3="-0.3563"/>
++            <vignetting model="pa" focal="97" aperture="6.3" distance="1000" k1="-0.0659" k2="0.1080" k3="-0.3563"/>
++            <vignetting model="pa" focal="97" aperture="7.1" distance="10" k1="-0.1705" k2="0.5267" k3="-0.6107"/>
++            <vignetting model="pa" focal="97" aperture="7.1" distance="1000" k1="-0.1705" k2="0.5267" k3="-0.6107"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="10" k1="-0.1831" k2="0.5287" k3="-0.5450"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.1831" k2="0.5287" k3="-0.5450"/>
++            <vignetting model="pa" focal="97" aperture="9" distance="10" k1="-0.1681" k2="0.4288" k3="-0.4098"/>
++            <vignetting model="pa" focal="97" aperture="9" distance="1000" k1="-0.1681" k2="0.4288" k3="-0.4098"/>
++            <vignetting model="pa" focal="97" aperture="10" distance="10" k1="-0.1431" k2="0.3190" k3="-0.2945"/>
++            <vignetting model="pa" focal="97" aperture="10" distance="1000" k1="-0.1431" k2="0.3190" k3="-0.2945"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="10" k1="-0.0894" k2="0.1110" k3="-0.1020"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.0894" k2="0.1110" k3="-0.1020"/>
++            <vignetting model="pa" focal="97" aperture="13" distance="10" k1="-0.0580" k2="-0.0122" k3="0.0120"/>
++            <vignetting model="pa" focal="97" aperture="13" distance="1000" k1="-0.0580" k2="-0.0122" k3="0.0120"/>
++            <vignetting model="pa" focal="97" aperture="14" distance="10" k1="-0.0485" k2="-0.0412" k3="0.0347"/>
++            <vignetting model="pa" focal="97" aperture="14" distance="1000" k1="-0.0485" k2="-0.0412" k3="0.0347"/>
++            <vignetting model="pa" focal="97" aperture="16" distance="10" k1="-0.0314" k2="-0.0923" k3="0.0759"/>
++            <vignetting model="pa" focal="97" aperture="16" distance="1000" k1="-0.0314" k2="-0.0923" k3="0.0759"/>
++            <vignetting model="pa" focal="97" aperture="18" distance="10" k1="-0.0220" k2="-0.1190" k3="0.0956"/>
++            <vignetting model="pa" focal="97" aperture="18" distance="1000" k1="-0.0220" k2="-0.1190" k3="0.0956"/>
++            <vignetting model="pa" focal="97" aperture="20" distance="10" k1="-0.0208" k2="-0.1212" k3="0.0964"/>
++            <vignetting model="pa" focal="97" aperture="20" distance="1000" k1="-0.0208" k2="-0.1212" k3="0.0964"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="10" k1="-0.0158" k2="-0.1337" k3="0.1044"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.0158" k2="-0.1337" k3="0.1044"/>
++            <vignetting model="pa" focal="97" aperture="25" distance="10" k1="-0.0115" k2="-0.1430" k3="0.1103"/>
++            <vignetting model="pa" focal="97" aperture="25" distance="1000" k1="-0.0115" k2="-0.1430" k3="0.1103"/>
++            <vignetting model="pa" focal="97" aperture="29" distance="10" k1="-0.0227" k2="-0.1213" k3="0.0984"/>
++            <vignetting model="pa" focal="97" aperture="29" distance="1000" k1="-0.0227" k2="-0.1213" k3="0.0984"/>
++            <vignetting model="pa" focal="97" aperture="32" distance="10" k1="-0.0287" k2="-0.1058" k3="0.0880"/>
++            <vignetting model="pa" focal="97" aperture="32" distance="1000" k1="-0.0287" k2="-0.1058" k3="0.0880"/>
++            <vignetting model="pa" focal="97" aperture="36" distance="10" k1="-0.0327" k2="-0.0970" k3="0.0832"/>
++            <vignetting model="pa" focal="97" aperture="36" distance="1000" k1="-0.0327" k2="-0.0970" k3="0.0832"/>
++            <vignetting model="pa" focal="113" aperture="5.6" distance="10" k1="-0.5714" k2="0.4623" k3="-0.3447"/>
++            <vignetting model="pa" focal="113" aperture="5.6" distance="1000" k1="-0.5714" k2="0.4623" k3="-0.3447"/>
++            <vignetting model="pa" focal="113" aperture="6.3" distance="10" k1="-0.0291" k2="-0.2506" k3="-0.0723"/>
++            <vignetting model="pa" focal="113" aperture="6.3" distance="1000" k1="-0.0291" k2="-0.2506" k3="-0.0723"/>
++            <vignetting model="pa" focal="113" aperture="7.1" distance="10" k1="-0.0718" k2="0.1907" k3="-0.4139"/>
++            <vignetting model="pa" focal="113" aperture="7.1" distance="1000" k1="-0.0718" k2="0.1907" k3="-0.4139"/>
++            <vignetting model="pa" focal="113" aperture="8" distance="10" k1="-0.1465" k2="0.4453" k3="-0.5275"/>
++            <vignetting model="pa" focal="113" aperture="8" distance="1000" k1="-0.1465" k2="0.4453" k3="-0.5275"/>
++            <vignetting model="pa" focal="113" aperture="9" distance="10" k1="-0.1713" k2="0.4840" k3="-0.4934"/>
++            <vignetting model="pa" focal="113" aperture="9" distance="1000" k1="-0.1713" k2="0.4840" k3="-0.4934"/>
++            <vignetting model="pa" focal="113" aperture="10" distance="10" k1="-0.1558" k2="0.4035" k3="-0.3928"/>
++            <vignetting model="pa" focal="113" aperture="10" distance="1000" k1="-0.1558" k2="0.4035" k3="-0.3928"/>
++            <vignetting model="pa" focal="113" aperture="11" distance="10" k1="-0.1180" k2="0.2397" k3="-0.2231"/>
++            <vignetting model="pa" focal="113" aperture="11" distance="1000" k1="-0.1180" k2="0.2397" k3="-0.2231"/>
++            <vignetting model="pa" focal="113" aperture="13" distance="10" k1="-0.0632" k2="0.0256" k3="-0.0261"/>
++            <vignetting model="pa" focal="113" aperture="13" distance="1000" k1="-0.0632" k2="0.0256" k3="-0.0261"/>
++            <vignetting model="pa" focal="113" aperture="14" distance="10" k1="-0.0504" k2="-0.0310" k3="0.0282"/>
++            <vignetting model="pa" focal="113" aperture="14" distance="1000" k1="-0.0504" k2="-0.0310" k3="0.0282"/>
++            <vignetting model="pa" focal="113" aperture="16" distance="10" k1="-0.0396" k2="-0.0646" k3="0.0570"/>
++            <vignetting model="pa" focal="113" aperture="16" distance="1000" k1="-0.0396" k2="-0.0646" k3="0.0570"/>
++            <vignetting model="pa" focal="113" aperture="18" distance="10" k1="-0.0255" k2="-0.1061" k3="0.0891"/>
++            <vignetting model="pa" focal="113" aperture="18" distance="1000" k1="-0.0255" k2="-0.1061" k3="0.0891"/>
++            <vignetting model="pa" focal="113" aperture="20" distance="10" k1="-0.0215" k2="-0.1166" k3="0.0959"/>
++            <vignetting model="pa" focal="113" aperture="20" distance="1000" k1="-0.0215" k2="-0.1166" k3="0.0959"/>
++            <vignetting model="pa" focal="113" aperture="22" distance="10" k1="-0.0146" k2="-0.1292" k3="0.1017"/>
++            <vignetting model="pa" focal="113" aperture="22" distance="1000" k1="-0.0146" k2="-0.1292" k3="0.1017"/>
++            <vignetting model="pa" focal="113" aperture="25" distance="10" k1="-0.0052" k2="-0.1518" k3="0.1162"/>
++            <vignetting model="pa" focal="113" aperture="25" distance="1000" k1="-0.0052" k2="-0.1518" k3="0.1162"/>
++            <vignetting model="pa" focal="113" aperture="29" distance="10" k1="-0.0082" k2="-0.1429" k3="0.1093"/>
++            <vignetting model="pa" focal="113" aperture="29" distance="1000" k1="-0.0082" k2="-0.1429" k3="0.1093"/>
++            <vignetting model="pa" focal="113" aperture="32" distance="10" k1="-0.0154" k2="-0.1270" k3="0.0995"/>
++            <vignetting model="pa" focal="113" aperture="32" distance="1000" k1="-0.0154" k2="-0.1270" k3="0.0995"/>
++            <vignetting model="pa" focal="113" aperture="36" distance="10" k1="-0.0237" k2="-0.1084" k3="0.0889"/>
++            <vignetting model="pa" focal="113" aperture="36" distance="1000" k1="-0.0237" k2="-0.1084" k3="0.0889"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.5572" k2="0.4241" k3="-0.3221"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.5572" k2="0.4241" k3="-0.3221"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="10" k1="-0.0319" k2="-0.2993" k3="-0.0309"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.0319" k2="-0.2993" k3="-0.0309"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.0273" k2="0.0373" k3="-0.3128"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.0273" k2="0.0373" k3="-0.3128"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1069" k2="0.3186" k3="-0.4459"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1069" k2="0.3186" k3="-0.4459"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1513" k2="0.4345" k3="-0.4673"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1513" k2="0.4345" k3="-0.4673"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="10" k1="-0.1497" k2="0.3945" k3="-0.3934"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="1000" k1="-0.1497" k2="0.3945" k3="-0.3934"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1199" k2="0.2527" k3="-0.2341"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1199" k2="0.2527" k3="-0.2341"/>
++            <vignetting model="pa" focal="135" aperture="13" distance="10" k1="-0.0677" k2="0.0498" k3="-0.0466"/>
++            <vignetting model="pa" focal="135" aperture="13" distance="1000" k1="-0.0677" k2="0.0498" k3="-0.0466"/>
++            <vignetting model="pa" focal="135" aperture="14" distance="10" k1="-0.0456" k2="-0.0352" k3="0.0308"/>
++            <vignetting model="pa" focal="135" aperture="14" distance="1000" k1="-0.0456" k2="-0.0352" k3="0.0308"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.0331" k2="-0.0797" k3="0.0696"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.0331" k2="-0.0797" k3="0.0696"/>
++            <vignetting model="pa" focal="135" aperture="18" distance="10" k1="-0.0240" k2="-0.1058" k3="0.0896"/>
++            <vignetting model="pa" focal="135" aperture="18" distance="1000" k1="-0.0240" k2="-0.1058" k3="0.0896"/>
++            <vignetting model="pa" focal="135" aperture="20" distance="10" k1="-0.0204" k2="-0.1148" k3="0.0963"/>
++            <vignetting model="pa" focal="135" aperture="20" distance="1000" k1="-0.0204" k2="-0.1148" k3="0.0963"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.0119" k2="-0.1331" k3="0.1065"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.0119" k2="-0.1331" k3="0.1065"/>
++            <vignetting model="pa" focal="135" aperture="25" distance="10" k1="-0.0058" k2="-0.1465" k3="0.1135"/>
++            <vignetting model="pa" focal="135" aperture="25" distance="1000" k1="-0.0058" k2="-0.1465" k3="0.1135"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="-0.0027" k2="-0.1528" k3="0.1175"/>
++            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="-0.0027" k2="-0.1528" k3="0.1175"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="0.0026" k2="-0.1635" k3="0.1234"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="0.0026" k2="-0.1635" k3="0.1234"/>
++            <vignetting model="pa" focal="135" aperture="36" distance="10" k1="-0.0031" k2="-0.1495" k3="0.1143"/>
++            <vignetting model="pa" focal="135" aperture="36" distance="1000" k1="-0.0031" k2="-0.1495" k3="0.1143"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 18-55mm f/3.5-5.6 IS</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with cropfactor 1.622 (Canon 50D or 450D) -->
++            <distortion model="ptlens" focal="18" a="0.00644" b="-0.01245" c="-0.0348"/>
++            <distortion model="ptlens" focal="21" a="0.00345" b="-0.00918" c="-0.01759"/>
++            <distortion model="ptlens" focal="24" a="0.01705" b="-0.05405" c="0.03261"/>
++            <distortion model="ptlens" focal="28" a="-0.00353" b="0.01826" c="-0.04406"/>
++            <distortion model="ptlens" focal="35" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="44" a="0.00915" b="-0.01128" c="-0.01171"/>
++            <distortion model="ptlens" focal="55" a="-0.02782" b="0.0964" c="-0.09883"/>
++            <tca model="poly3" focal="18" br="-0.0003176" vr="1.0009927" bb="0.0002609" vb="0.9995018"/>
++            <tca model="poly3" focal="21" br="-0.00017015" vr="1.00085065" bb="0.00015435" vb="0.99956185"/>
++            <tca model="poly3" focal="24" br="-0.00005475" vr="1.0006983" bb="0.00011575" vb="0.99960995"/>
++            <tca model="poly3" focal="28" br="0.0000031" vr="1.0005299" bb="0.0000856" vb="0.99967605"/>
++            <tca model="poly3" focal="35" br="-0.0000414" vr="1.00034975" bb="0.00003195" vb="0.9998738"/>
++            <tca model="poly3" focal="44" br="-0.0000039" vr="1.0001012" bb="0.000014" vb="1.0000481"/>
++            <tca model="poly3" focal="55" br="-0.0000096" vr="0.99992965" bb="0.00000225" vb="1.0002339"/>
++            <!-- Taken with Canon EOS 550D -->
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.0505" k2="0.9425" k3="-0.4433"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.0505" k2="0.9425" k3="-0.4433"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.3271" k2="-0.3518" k3="0.2513"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.3271" k2="-0.3518" k3="0.2513"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.3159" k2="0.0175" k3="0.0074"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3159" k2="0.0175" k3="0.0074"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2855" k2="-0.0799" k3="0.0948"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2855" k2="-0.0799" k3="0.0948"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.2723" k2="-0.1029" k3="0.1071"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2723" k2="-0.1029" k3="0.1071"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2918" k2="-0.0721" k3="0.0931"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2918" k2="-0.0721" k3="0.0931"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2909" k2="-0.0728" k3="0.0940"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2909" k2="-0.0728" k3="0.0940"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.9648" k2="0.8380" k3="-0.3522"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.9648" k2="0.8380" k3="-0.3522"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2372" k2="-0.0310" k3="0.0141"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2372" k2="-0.0310" k3="0.0141"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2212" k2="-0.0943" k3="0.0906"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2212" k2="-0.0943" k3="0.0906"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2174" k2="-0.1025" k3="0.0963"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2174" k2="-0.1025" k3="0.0963"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.2134" k2="-0.1124" k3="0.1036"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.2134" k2="-0.1124" k3="0.1036"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.2090" k2="-0.1197" k3="0.1072"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2090" k2="-0.1197" k3="0.1072"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2066" k2="-0.1294" k3="0.1140"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2066" k2="-0.1294" k3="0.1140"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.8151" k2="0.6782" k3="-0.2757"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8151" k2="0.6782" k3="-0.2757"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1285" k2="-0.1113" k3="0.0388"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1285" k2="-0.1113" k3="0.0388"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1474" k2="-0.0722" k3="0.0602"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1474" k2="-0.0722" k3="0.0602"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.1412" k2="-0.0856" k3="0.0680"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1412" k2="-0.0856" k3="0.0680"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.1365" k2="-0.0935" k3="0.0715"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1365" k2="-0.0935" k3="0.0715"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1504" k2="-0.0671" k3="0.0578"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1504" k2="-0.0671" k3="0.0578"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.1610" k2="-0.0620" k3="0.0626"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1610" k2="-0.0620" k3="0.0626"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6219" k2="0.5060" k3="-0.2165"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6219" k2="0.5060" k3="-0.2165"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0769" k2="-0.0718" k3="0.0485"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0769" k2="-0.0718" k3="0.0485"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0775" k2="-0.0813" k3="0.0605"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0775" k2="-0.0813" k3="0.0605"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.0815" k2="-0.0779" k3="0.0594"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.0815" k2="-0.0779" k3="0.0594"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.0913" k2="-0.0626" k3="0.0522"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.0913" k2="-0.0626" k3="0.0522"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="10" k1="-0.1028" k2="-0.0492" k3="0.0465"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.1028" k2="-0.0492" k3="0.0465"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.0968" k2="-0.0651" k3="0.0572"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.0968" k2="-0.0651" k3="0.0572"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 24-70mm f/2.8L II USM</model>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <!-- Taken with Canon EOS-1D X -->
+-            <distortion model="poly3" focal="85" k1="-0.00412" />
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <distortion model="ptlens" focal="24" a="0.02964" b="-0.07853" c="0.02943"/>
++            <distortion model="ptlens" focal="28" a="0.02151" b="-0.05678" c="0.02905"/>
++            <distortion model="ptlens" focal="35" a="0.01668" b="-0.04154" c="0.0279"/>
++            <distortion model="ptlens" focal="50" a="-0.00223" b="0.01856" c="-0.0182"/>
++            <distortion model="ptlens" focal="70" a="0.00907" b="-0.02015" c="0.02311"/>
++            <tca model="poly3" focal="24" br="-0.0000220" vr="1.0002104" bb="-0.0000000" vb="1.0000529"/>
++            <tca model="poly3" focal="28" br="-0.0000204" vr="1.0001414" bb="-0.0000079" vb="1.0000872"/>
++            <tca model="poly3" focal="35" br="-0.0000369" vr="1.0000745" bb="-0.0000106" vb="1.0000704"/>
++            <tca model="poly3" focal="50" br="-0.0000305" vr="0.9999836" bb="0.0000023" vb="0.9999503"/>
++            <tca model="poly3" focal="70" br="-0.0000053" vr="0.9999048" bb="0.0000167" vb="0.9998521"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="0.38" k1="-0.5324" k2="-0.9169" k3="0.6118"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="0.76" k1="-0.5380" k2="-0.8584" k3="0.5817"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="2.28" k1="-0.5445" k2="-0.8127" k3="0.5488"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.5334" k2="-0.7926" k3="0.5243"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.38" k1="-0.6598" k2="0.4100" k3="-0.4916"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.76" k1="-0.6732" k2="0.4436" k3="-0.4767"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="2.28" k1="-0.6785" k2="0.4576" k3="-0.4765"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6889" k2="0.5049" k3="-0.5073"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.38" k1="-0.7625" k2="0.6284" k3="-0.4894"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.76" k1="-0.7068" k2="0.4429" k3="-0.3190"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="2.28" k1="-0.6955" k2="0.4015" k3="-0.2828"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.7003" k2="0.4412" k3="-0.3183"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.38" k1="-0.6918" k2="0.3336" k3="-0.2064"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.76" k1="-0.6577" k2="0.2275" k3="-0.1131"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="2.28" k1="-0.6665" k2="0.2617" k3="-0.1438"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6826" k2="0.3334" k3="-0.2021"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.38" k1="-0.6565" k2="0.1720" k3="-0.0526"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.76" k1="-0.6611" k2="0.2171" k3="-0.0941"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="2.28" k1="-0.6695" k2="0.2517" k3="-0.1252"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.6862" k2="0.3218" k3="-0.1805"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="0.38" k1="-0.6570" k2="0.1579" k3="-0.0344"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="0.76" k1="-0.6665" k2="0.2198" k3="-0.0898"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="2.28" k1="-0.6734" k2="0.2498" k3="-0.1171"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.6920" k2="0.3238" k3="-0.1744"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.38" k1="-0.6640" k2="0.1655" k3="-0.0356"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.76" k1="-0.6717" k2="0.2228" k3="-0.0871"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="2.28" k1="-0.6788" k2="0.2532" k3="-0.1145"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.6981" k2="0.3271" k3="-0.1710"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="0.38" k1="-0.5314" k2="-0.6102" k3="0.4052"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="0.76" k1="-0.5656" k2="-0.4577" k3="0.2963"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="2.28" k1="-0.5847" k2="-0.3989" k3="0.2529"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.5796" k2="-0.3367" k3="0.1881"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.38" k1="-0.6341" k2="0.4189" k3="-0.3761"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.76" k1="-0.6373" k2="0.4549" k3="-0.3973"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="2.28" k1="-0.6428" k2="0.4833" k3="-0.4249"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.6651" k2="0.5708" k3="-0.4970"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.38" k1="-0.5964" k2="0.2054" k3="-0.1109"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.76" k1="-0.5978" k2="0.2487" k3="-0.1525"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="2.28" k1="-0.6065" k2="0.2762" k3="-0.1756"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.6168" k2="0.3284" k3="-0.2172"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.38" k1="-0.5948" k2="0.1812" k3="-0.0814"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.76" k1="-0.5948" k2="0.2158" k3="-0.1128"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="2.28" k1="-0.5977" k2="0.2299" k3="-0.1259"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6069" k2="0.2753" k3="-0.1594"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="0.38" k1="-0.6015" k2="0.1822" k3="-0.0739"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="0.76" k1="-0.5979" k2="0.2073" k3="-0.0974"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="2.28" k1="-0.6015" k2="0.2218" k3="-0.1097"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.6116" k2="0.2675" k3="-0.1422"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="0.38" k1="-0.6060" k2="0.1834" k3="-0.0692"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="0.76" k1="-0.6041" k2="0.2106" k3="-0.0929"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="2.28" k1="-0.6044" k2="0.2171" k3="-0.0995"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.6176" k2="0.2691" k3="-0.1354"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.38" k1="-0.6089" k2="0.1793" k3="-0.0616"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.76" k1="-0.6062" k2="0.2036" k3="-0.0829"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="2.28" k1="-0.6079" k2="0.2130" k3="-0.0908"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.6214" k2="0.2649" k3="-0.1264"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.38" k1="-0.6219" k2="0.0305" k3="-0.0893"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.76" k1="-0.6559" k2="0.1407" k3="-0.1797"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="2.28" k1="-0.6505" k2="0.1384" k3="-0.1870"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.6559" k2="0.1689" k3="-0.2166"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.38" k1="-0.6016" k2="0.5514" k3="-0.4750"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.76" k1="-0.6080" k2="0.6087" k3="-0.5348"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="2.28" k1="-0.6108" k2="0.6189" k3="-0.5478"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6307" k2="0.6882" k3="-0.6013"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.38" k1="-0.5466" k2="0.3128" k3="-0.2374"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.76" k1="-0.5423" k2="0.3160" k3="-0.2391"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="2.28" k1="-0.5420" k2="0.3131" k3="-0.2357"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.5577" k2="0.3719" k3="-0.2787"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.38" k1="-0.5414" k2="0.2781" k3="-0.1982"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.76" k1="-0.5279" k2="0.2506" k3="-0.1725"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="2.28" k1="-0.5276" k2="0.2399" k3="-0.1590"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5323" k2="0.2683" k3="-0.1774"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.38" k1="-0.5453" k2="0.2737" k3="-0.1863"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.76" k1="-0.5313" k2="0.2413" k3="-0.1548"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="2.28" k1="-0.5310" k2="0.2303" k3="-0.1408"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5407" k2="0.2680" k3="-0.1643"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.38" k1="-0.5498" k2="0.2744" k3="-0.1818"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="0.76" k1="-0.5395" k2="0.2492" k3="-0.1535"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="2.28" k1="-0.5361" k2="0.2309" k3="-0.1344"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.5469" k2="0.2706" k3="-0.1586"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.38" k1="-0.5541" k2="0.2792" k3="-0.1832"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.76" k1="-0.5433" k2="0.2519" k3="-0.1532"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="2.28" k1="-0.5389" k2="0.2307" k3="-0.1312"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.5510" k2="0.2723" k3="-0.1562"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.38" k1="-0.8412" k2="0.8591" k3="-0.7751"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.76" k1="-0.7442" k2="0.5381" k3="-0.5339"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="2.28" k1="-0.7013" k2="0.3674" k3="-0.4003"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.6708" k2="0.2618" k3="-0.3191"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.38" k1="-0.6288" k2="1.0150" k3="-0.9942"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.76" k1="-0.5665" k2="0.8090" k3="-0.8244"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="2.28" k1="-0.5370" k2="0.7039" k3="-0.7391"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.5376" k2="0.6855" k3="-0.7145"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.38" k1="-0.6064" k2="0.8725" k3="-0.8081"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.76" k1="-0.5597" k2="0.7110" k3="-0.6529"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="2.28" k1="-0.5430" k2="0.6455" k3="-0.5898"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.5565" k2="0.6666" k3="-0.5880"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.38" k1="-0.5483" k2="0.6334" k3="-0.5772"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.76" k1="-0.4992" k2="0.4522" k3="-0.3960"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="2.28" k1="-0.4805" k2="0.3744" k3="-0.3178"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4891" k2="0.3846" k3="-0.3060"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.38" k1="-0.5144" k2="0.4766" k3="-0.4242"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.76" k1="-0.4688" k2="0.3098" k3="-0.2545"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="2.28" k1="-0.4509" k2="0.2381" k3="-0.1817"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4631" k2="0.2604" k3="-0.1804"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.38" k1="-0.5109" k2="0.4418" k3="-0.3831"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.76" k1="-0.4731" k2="0.3028" k3="-0.2373"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="2.28" k1="-0.4576" k2="0.2410" k3="-0.1735"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.4685" k2="0.2607" k3="-0.1704"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.38" k1="-0.5117" k2="0.4357" k3="-0.3738"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.76" k1="-0.4785" k2="0.3085" k3="-0.2364"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="2.28" k1="-0.4622" k2="0.2449" k3="-0.1714"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.4742" k2="0.2654" k3="-0.1679"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="0.38" k1="-0.7965" k2="0.7982" k3="-0.6515"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="0.76" k1="-0.8490" k2="0.7522" k3="-0.5625"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="2.28" k1="-0.9092" k2="0.7947" k3="-0.5491"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.9113" k2="0.7501" k3="-0.5041"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="0.38" k1="-0.5124" k2="0.7389" k3="-0.7073"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="0.76" k1="-0.4602" k2="0.5934" k3="-0.6096"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="2.28" k1="-0.4122" k2="0.4348" k3="-0.5087"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.3981" k2="0.3671" k3="-0.4525"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.38" k1="-0.4313" k2="0.3788" k3="-0.3296"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.76" k1="-0.4253" k2="0.3796" k3="-0.3240"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="2.28" k1="-0.4202" k2="0.3627" k3="-0.3077"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.4463" k2="0.4183" k3="-0.3371"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.38" k1="-0.3725" k2="0.1437" k3="-0.1122"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.76" k1="-0.3534" k2="0.0885" k3="-0.0499"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="2.28" k1="-0.3469" k2="0.0622" k3="-0.0204"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3693" k2="0.1071" k3="-0.0375"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.38" k1="-0.3763" k2="0.1389" k3="-0.0989"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.76" k1="-0.3520" k2="0.0708" k3="-0.0269"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="2.28" k1="-0.3454" k2="0.0449" k3="0.0024"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.3739" k2="0.1023" k3="-0.0228"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="0.38" k1="-0.3844" k2="0.1522" k3="-0.1022"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="0.76" k1="-0.3650" k2="0.0943" k3="-0.0365"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="2.28" k1="-0.3567" k2="0.0652" k3="-0.0051"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.3848" k2="0.1222" k3="-0.0306"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="0.38" k1="-0.3922" k2="0.1655" k3="-0.1072"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="0.76" k1="-0.3759" k2="0.1168" k3="-0.0484"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="2.28" k1="-0.3697" k2="0.0921" k3="-0.0199"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.3970" k2="0.1468" k3="-0.0434"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 15-85mm f/3.5-5.6 IS USM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 550D -->
++            <distortion model="ptlens" focal="15" a="0.0184" b="-0.03224" c="-0.03581"/>
++            <distortion model="ptlens" focal="17" a="0.02912" b="-0.08348" c="0.0641"/>
++            <distortion model="ptlens" focal="18" a="0.02432" b="-0.06148" c="0.03995"/>
++            <distortion model="ptlens" focal="19" a="0.01682" b="-0.04154" c="0.03783"/>
++            <distortion model="ptlens" focal="21" a="0.01432" b="-0.03294" c="0.03046"/>
++            <distortion model="ptlens" focal="22" a="0.00798" b="-0.01214" c="0.01256"/>
++            <distortion model="ptlens" focal="24" a="0.00993" b="-0.01948" c="0.02317"/>
++            <distortion model="ptlens" focal="35" a="0.00161" b="-0.00086" c="0.01326"/>
++            <distortion model="ptlens" focal="50" a="0.0042" b="-0.00871" c="0.01862"/>
++            <distortion model="ptlens" focal="70" a="0.00378" b="-0.0078" c="0.01051"/>
++            <distortion model="ptlens" focal="85" a="0.00118" b="-0.00081" c="0.00592"/>
++            <tca model="poly3" focal="15" vr="1.0003" vb="1.0003"/>
++            <tca model="poly3" focal="17" vr="1.0004" vb="1.0002"/>
++            <tca model="poly3" focal="18" vr="1.0004" vb="1.0002"/>
++            <tca model="poly3" focal="18" vr="1.0005" vb="1.0000"/>
++            <tca model="poly3" focal="21" vr="1.0003" vb="1.0003"/>
++            <tca model="poly3" focal="22" vr="1.0004" vb="1.0001"/>
++            <tca model="poly3" focal="24" vr="1.0002" vb="1.0001"/>
++            <tca model="poly3" focal="70" vr="0.9999" vb="0.9997"/>
++            <tca model="poly3" focal="85" vr="0.9998" vb="0.9995"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 50-200mm f/3.5-4.5L</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 50D -->
++            <distortion model="poly3" focal="50" k1="-0.0059"/>
++            <distortion model="poly3" focal="60" k1="-0.00313"/>
++            <distortion model="poly3" focal="70" k1="-0.00103"/>
++            <distortion model="poly3" focal="75" k1="0.00035"/>
++            <distortion model="poly3" focal="100" k1="0.00199"/>
++            <distortion model="poly3" focal="135" k1="0.00329"/>
++            <distortion model="poly3" focal="157" k1="0.0032"/>
++            <distortion model="poly3" focal="200" k1="0.00263"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 50-200mm f/3.5-4.5L</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5Dm3 -->
++            <distortion model="poly3" focal="50" k1="-0.00757"/>
++            <distortion model="poly3" focal="60" k1="-0.00181"/>
++            <distortion model="poly3" focal="70" k1="0.00277"/>
++            <distortion model="poly3" focal="80" k1="0.00803"/>
++            <distortion model="poly3" focal="100" k1="0.01146"/>
++            <distortion model="poly3" focal="135" k1="0.01158"/>
++            <distortion model="poly3" focal="200" k1="0.01318"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-300mm f/4-5.6L IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D -->
++            <distortion model="poly3" focal="70" k1="-0.00788"/>
++            <distortion model="poly3" focal="78" k1="-0.00489"/>
++            <distortion model="poly3" focal="84" k1="-0.00192"/>
++            <distortion model="poly3" focal="100" k1="0.00174"/>
++            <distortion model="poly3" focal="135" k1="0.00701"/>
++            <distortion model="poly3" focal="200" k1="0.00938"/>
++            <distortion model="poly3" focal="300" k1="0.00975"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5580" k2="-0.0998" k3="0.1127"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5580" k2="-0.0998" k3="0.1127"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.3398" k2="-0.2963" k3="0.1602"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.3398" k2="-0.2963" k3="0.1602"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1781" k2="-0.3772" k3="0.1499"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1781" k2="-0.3772" k3="0.1499"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2161" k2="0.0326" k3="-0.1140"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2161" k2="0.0326" k3="-0.1140"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2615" k2="0.1579" k3="-0.1124"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2615" k2="0.1579" k3="-0.1124"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.2498" k2="0.0902" k3="-0.0242"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.2498" k2="0.0902" k3="-0.0242"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2378" k2="0.0459" k3="0.0172"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2378" k2="0.0459" k3="0.0172"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.2419" k2="0.0527" k3="0.0135"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.2419" k2="0.0527" k3="0.0135"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2376" k2="0.0462" k3="0.0168"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2376" k2="0.0462" k3="0.0168"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2438" k2="0.0594" k3="0.0088"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2438" k2="0.0594" k3="0.0088"/>
++            <vignetting model="pa" focal="70" aperture="13" distance="10" k1="-0.2489" k2="0.0717" k3="0.0015"/>
++            <vignetting model="pa" focal="70" aperture="13" distance="1000" k1="-0.2489" k2="0.0717" k3="0.0015"/>
++            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.2492" k2="0.0704" k3="0.0025"/>
++            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.2492" k2="0.0704" k3="0.0025"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.2517" k2="0.0800" k3="-0.0046"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2517" k2="0.0800" k3="-0.0046"/>
++            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.2520" k2="0.0815" k3="-0.0060"/>
++            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.2520" k2="0.0815" k3="-0.0060"/>
++            <vignetting model="pa" focal="70" aperture="20" distance="10" k1="-0.2526" k2="0.0828" k3="-0.0063"/>
++            <vignetting model="pa" focal="70" aperture="20" distance="1000" k1="-0.2526" k2="0.0828" k3="-0.0063"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2591" k2="0.0958" k3="-0.0137"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2591" k2="0.0958" k3="-0.0137"/>
++            <vignetting model="pa" focal="70" aperture="25" distance="10" k1="-0.2605" k2="0.0999" k3="-0.0164"/>
++            <vignetting model="pa" focal="70" aperture="25" distance="1000" k1="-0.2605" k2="0.0999" k3="-0.0164"/>
++            <vignetting model="pa" focal="70" aperture="29" distance="10" k1="-0.2623" k2="0.1014" k3="-0.0158"/>
++            <vignetting model="pa" focal="70" aperture="29" distance="1000" k1="-0.2623" k2="0.1014" k3="-0.0158"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.2642" k2="0.1068" k3="-0.0198"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.2642" k2="0.1068" k3="-0.0198"/>
++            <vignetting model="pa" focal="81" aperture="4" distance="10" k1="-0.7181" k2="0.1841" k3="-0.0260"/>
++            <vignetting model="pa" focal="81" aperture="4" distance="1000" k1="-0.7181" k2="0.1841" k3="-0.0260"/>
++            <vignetting model="pa" focal="81" aperture="4.5" distance="10" k1="-0.5571" k2="-0.0624" k3="0.0885"/>
++            <vignetting model="pa" focal="81" aperture="4.5" distance="1000" k1="-0.5571" k2="-0.0624" k3="0.0885"/>
++            <vignetting model="pa" focal="81" aperture="5" distance="10" k1="-0.3266" k2="-0.3706" k3="0.2221"/>
++            <vignetting model="pa" focal="81" aperture="5" distance="1000" k1="-0.3266" k2="-0.3706" k3="0.2221"/>
++            <vignetting model="pa" focal="81" aperture="5.6" distance="10" k1="-0.1705" k2="-0.2611" k3="0.0768"/>
++            <vignetting model="pa" focal="81" aperture="5.6" distance="1000" k1="-0.1705" k2="-0.2611" k3="0.0768"/>
++            <vignetting model="pa" focal="81" aperture="6.3" distance="10" k1="-0.2277" k2="-0.0019" k3="-0.0549"/>
++            <vignetting model="pa" focal="81" aperture="6.3" distance="1000" k1="-0.2277" k2="-0.0019" k3="-0.0549"/>
++            <vignetting model="pa" focal="81" aperture="7.1" distance="10" k1="-0.2449" k2="0.0577" k3="-0.0494"/>
++            <vignetting model="pa" focal="81" aperture="7.1" distance="1000" k1="-0.2449" k2="0.0577" k3="-0.0494"/>
++            <vignetting model="pa" focal="81" aperture="8" distance="10" k1="-0.2278" k2="-0.0233" k3="0.0475"/>
++            <vignetting model="pa" focal="81" aperture="8" distance="1000" k1="-0.2278" k2="-0.0233" k3="0.0475"/>
++            <vignetting model="pa" focal="81" aperture="9" distance="10" k1="-0.2187" k2="-0.0464" k3="0.0650"/>
++            <vignetting model="pa" focal="81" aperture="9" distance="1000" k1="-0.2187" k2="-0.0464" k3="0.0650"/>
++            <vignetting model="pa" focal="81" aperture="32" distance="10" k1="-0.2622" k2="0.0178" k3="0.0418"/>
++            <vignetting model="pa" focal="81" aperture="32" distance="1000" k1="-0.2622" k2="0.0178" k3="0.0418"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.7772" k2="0.3343" k3="-0.0928"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.7772" k2="0.3343" k3="-0.0928"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="10" k1="-0.5079" k2="-0.1323" k3="0.1448"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-0.5079" k2="-0.1323" k3="0.1448"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.3019" k2="-0.3678" k3="0.2369"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.3019" k2="-0.3678" k3="0.2369"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1570" k2="-0.3499" k3="0.1804"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1570" k2="-0.3499" k3="0.1804"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.2086" k2="-0.0713" k3="0.0011"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.2086" k2="-0.0713" k3="0.0011"/>
++            <vignetting model="pa" focal="100" aperture="7.1" distance="10" k1="-0.2738" k2="0.1490" k3="-0.1211"/>
++            <vignetting model="pa" focal="100" aperture="7.1" distance="1000" k1="-0.2738" k2="0.1490" k3="-0.1211"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.2773" k2="0.1191" k3="-0.0476"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.2773" k2="0.1191" k3="-0.0476"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="10" k1="-0.2603" k2="0.0484" k3="0.0186"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.2603" k2="0.0484" k3="0.0186"/>
++            <vignetting model="pa" focal="100" aperture="10" distance="10" k1="-0.2589" k2="0.0480" k3="0.0178"/>
++            <vignetting model="pa" focal="100" aperture="10" distance="1000" k1="-0.2589" k2="0.0480" k3="0.0178"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.2634" k2="0.0560" k3="0.0130"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.2634" k2="0.0560" k3="0.0130"/>
++            <vignetting model="pa" focal="100" aperture="13" distance="10" k1="-0.2708" k2="0.0691" k3="0.0080"/>
++            <vignetting model="pa" focal="100" aperture="13" distance="1000" k1="-0.2708" k2="0.0691" k3="0.0080"/>
++            <vignetting model="pa" focal="100" aperture="14" distance="10" k1="-0.2662" k2="0.0600" k3="0.0133"/>
++            <vignetting model="pa" focal="100" aperture="14" distance="1000" k1="-0.2662" k2="0.0600" k3="0.0133"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.2717" k2="0.0697" k3="0.0093"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.2717" k2="0.0697" k3="0.0093"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.2842" k2="0.0850" k3="0.0072"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.2842" k2="0.0850" k3="0.0072"/>
++            <vignetting model="pa" focal="112" aperture="4.5" distance="10" k1="-0.7241" k2="0.1831" k3="0.0097"/>
++            <vignetting model="pa" focal="112" aperture="4.5" distance="1000" k1="-0.7241" k2="0.1831" k3="0.0097"/>
++            <vignetting model="pa" focal="112" aperture="5" distance="10" k1="-0.3295" k2="-0.3920" k3="0.2739"/>
++            <vignetting model="pa" focal="112" aperture="5" distance="1000" k1="-0.3295" k2="-0.3920" k3="0.2739"/>
++            <vignetting model="pa" focal="112" aperture="5.6" distance="10" k1="-0.1422" k2="-0.5599" k3="0.3353"/>
++            <vignetting model="pa" focal="112" aperture="5.6" distance="1000" k1="-0.1422" k2="-0.5599" k3="0.3353"/>
++            <vignetting model="pa" focal="112" aperture="6.3" distance="10" k1="-0.1636" k2="-0.2394" k3="0.0895"/>
++            <vignetting model="pa" focal="112" aperture="6.3" distance="1000" k1="-0.1636" k2="-0.2394" k3="0.0895"/>
++            <vignetting model="pa" focal="112" aperture="7.1" distance="10" k1="-0.2174" k2="-0.0168" k3="-0.0540"/>
++            <vignetting model="pa" focal="112" aperture="7.1" distance="1000" k1="-0.2174" k2="-0.0168" k3="-0.0540"/>
++            <vignetting model="pa" focal="112" aperture="8" distance="10" k1="-0.2710" k2="0.1458" k3="-0.1106"/>
++            <vignetting model="pa" focal="112" aperture="8" distance="1000" k1="-0.2710" k2="0.1458" k3="-0.1106"/>
++            <vignetting model="pa" focal="112" aperture="9" distance="10" k1="-0.2562" k2="0.0632" k3="-0.0098"/>
++            <vignetting model="pa" focal="112" aperture="9" distance="1000" k1="-0.2562" k2="0.0632" k3="-0.0098"/>
++            <vignetting model="pa" focal="112" aperture="10" distance="10" k1="-0.2388" k2="0.0133" k3="0.0313"/>
++            <vignetting model="pa" focal="112" aperture="10" distance="1000" k1="-0.2388" k2="0.0133" k3="0.0313"/>
++            <vignetting model="pa" focal="112" aperture="11" distance="10" k1="-0.2363" k2="0.0114" k3="0.0316"/>
++            <vignetting model="pa" focal="112" aperture="11" distance="1000" k1="-0.2363" k2="0.0114" k3="0.0316"/>
++            <vignetting model="pa" focal="112" aperture="13" distance="10" k1="-0.2509" k2="0.0490" k3="0.0078"/>
++            <vignetting model="pa" focal="112" aperture="13" distance="1000" k1="-0.2509" k2="0.0490" k3="0.0078"/>
++            <vignetting model="pa" focal="112" aperture="14" distance="10" k1="-0.2469" k2="0.0413" k3="0.0117"/>
++            <vignetting model="pa" focal="112" aperture="14" distance="1000" k1="-0.2469" k2="0.0413" k3="0.0117"/>
++            <vignetting model="pa" focal="112" aperture="16" distance="10" k1="-0.2560" k2="0.0667" k3="-0.0064"/>
++            <vignetting model="pa" focal="112" aperture="16" distance="1000" k1="-0.2560" k2="0.0667" k3="-0.0064"/>
++            <vignetting model="pa" focal="116" aperture="32" distance="10" k1="-0.2828" k2="0.1220" k3="-0.0369"/>
++            <vignetting model="pa" focal="116" aperture="32" distance="1000" k1="-0.2828" k2="0.1220" k3="-0.0369"/>
++            <vignetting model="pa" focal="124" aperture="36" distance="10" k1="-0.2832" k2="0.1093" k3="-0.0103"/>
++            <vignetting model="pa" focal="124" aperture="36" distance="1000" k1="-0.2832" k2="0.1093" k3="-0.0103"/>
++            <vignetting model="pa" focal="128" aperture="11" distance="10" k1="-0.2704" k2="0.0919" k3="-0.0034"/>
++            <vignetting model="pa" focal="128" aperture="11" distance="1000" k1="-0.2704" k2="0.0919" k3="-0.0034"/>
++            <vignetting model="pa" focal="128" aperture="13" distance="10" k1="-0.2697" k2="0.0893" k3="-0.0024"/>
++            <vignetting model="pa" focal="128" aperture="13" distance="1000" k1="-0.2697" k2="0.0893" k3="-0.0024"/>
++            <vignetting model="pa" focal="128" aperture="14" distance="10" k1="-0.2725" k2="0.0930" k3="-0.0033"/>
++            <vignetting model="pa" focal="128" aperture="14" distance="1000" k1="-0.2725" k2="0.0930" k3="-0.0033"/>
++            <vignetting model="pa" focal="128" aperture="16" distance="10" k1="-0.2772" k2="0.1000" k3="-0.0051"/>
++            <vignetting model="pa" focal="128" aperture="16" distance="1000" k1="-0.2772" k2="0.1000" k3="-0.0051"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.6297" k2="0.0283" k3="0.0736"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.6297" k2="0.0283" k3="0.0736"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.3968" k2="-0.3249" k3="0.2356"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.3968" k2="-0.3249" k3="0.2356"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1476" k2="-0.5395" k3="0.3019"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1476" k2="-0.5395" k3="0.3019"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="10" k1="-0.1245" k2="-0.3862" k3="0.1831"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.1245" k2="-0.3862" k3="0.1831"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1870" k2="-0.0997" k3="-0.0126"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1870" k2="-0.0997" k3="-0.0126"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.2824" k2="0.2183" k3="-0.1902"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2824" k2="0.2183" k3="-0.1902"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.2917" k2="0.2002" k3="-0.1155"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.2917" k2="0.2002" k3="-0.1155"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="10" k1="-0.2729" k2="0.1228" k3="-0.0398"/>
++            <vignetting model="pa" focal="135" aperture="10" distance="1000" k1="-0.2729" k2="0.1228" k3="-0.0398"/>
++            <vignetting model="pa" focal="160" aperture="5" distance="10" k1="-0.4051" k2="-0.5051" k3="0.3449"/>
++            <vignetting model="pa" focal="160" aperture="5" distance="1000" k1="-0.4051" k2="-0.5051" k3="0.3449"/>
++            <vignetting model="pa" focal="160" aperture="5.6" distance="10" k1="-0.1236" k2="-0.7039" k3="0.3494"/>
++            <vignetting model="pa" focal="160" aperture="5.6" distance="1000" k1="-0.1236" k2="-0.7039" k3="0.3494"/>
++            <vignetting model="pa" focal="160" aperture="6.3" distance="10" k1="-0.1427" k2="-0.2875" k3="0.0572"/>
++            <vignetting model="pa" focal="160" aperture="6.3" distance="1000" k1="-0.1427" k2="-0.2875" k3="0.0572"/>
++            <vignetting model="pa" focal="160" aperture="7.1" distance="10" k1="-0.1884" k2="-0.1005" k3="-0.0394"/>
++            <vignetting model="pa" focal="160" aperture="7.1" distance="1000" k1="-0.1884" k2="-0.1005" k3="-0.0394"/>
++            <vignetting model="pa" focal="160" aperture="8" distance="10" k1="-0.2482" k2="0.0997" k3="-0.1242"/>
++            <vignetting model="pa" focal="160" aperture="8" distance="1000" k1="-0.2482" k2="0.0997" k3="-0.1242"/>
++            <vignetting model="pa" focal="160" aperture="40" distance="10" k1="-0.3269" k2="0.1865" k3="-0.0496"/>
++            <vignetting model="pa" focal="160" aperture="40" distance="1000" k1="-0.3269" k2="0.1865" k3="-0.0496"/>
++            <vignetting model="pa" focal="182" aperture="40" distance="10" k1="-0.2988" k2="0.1522" k3="-0.0489"/>
++            <vignetting model="pa" focal="182" aperture="40" distance="1000" k1="-0.2988" k2="0.1522" k3="-0.0489"/>
++            <vignetting model="pa" focal="188" aperture="11" distance="10" k1="-0.2707" k2="0.0944" k3="-0.0149"/>
++            <vignetting model="pa" focal="188" aperture="11" distance="1000" k1="-0.2707" k2="0.0944" k3="-0.0149"/>
++            <vignetting model="pa" focal="188" aperture="13" distance="10" k1="-0.2706" k2="0.0943" k3="-0.0144"/>
++            <vignetting model="pa" focal="188" aperture="13" distance="1000" k1="-0.2706" k2="0.0943" k3="-0.0144"/>
++            <vignetting model="pa" focal="188" aperture="14" distance="10" k1="-0.2741" k2="0.0962" k3="-0.0131"/>
++            <vignetting model="pa" focal="188" aperture="14" distance="1000" k1="-0.2741" k2="0.0962" k3="-0.0131"/>
++            <vignetting model="pa" focal="188" aperture="16" distance="10" k1="-0.2779" k2="0.1055" k3="-0.0190"/>
++            <vignetting model="pa" focal="188" aperture="16" distance="1000" k1="-0.2779" k2="0.1055" k3="-0.0190"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.2152" k2="-1.0645" k3="0.6930"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.2152" k2="-1.0645" k3="0.6930"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.0010" k2="-1.1114" k3="0.5906"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0010" k2="-1.1114" k3="0.5906"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0949" k2="-0.4460" k3="0.0946"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0949" k2="-0.4460" k3="0.0946"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="-0.2151" k2="0.0283" k3="-0.1992"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.2151" k2="0.0283" k3="-0.1992"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.3066" k2="0.3116" k3="-0.3056"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.3066" k2="0.3116" k3="-0.3056"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.3050" k2="0.2448" k3="-0.1675"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.3050" k2="0.2448" k3="-0.1675"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.2842" k2="0.1507" k3="-0.0701"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.2842" k2="0.1507" k3="-0.0701"/>
++            <vignetting model="pa" focal="236" aperture="5.6" distance="10" k1="-0.2732" k2="-0.9665" k3="0.6682"/>
++            <vignetting model="pa" focal="236" aperture="5.6" distance="1000" k1="-0.2732" k2="-0.9665" k3="0.6682"/>
++            <vignetting model="pa" focal="236" aperture="6.3" distance="10" k1="0.0011" k2="-1.0140" k3="0.5286"/>
++            <vignetting model="pa" focal="236" aperture="6.3" distance="1000" k1="0.0011" k2="-1.0140" k3="0.5286"/>
++            <vignetting model="pa" focal="236" aperture="7.1" distance="10" k1="-0.0716" k2="-0.4892" k3="0.1356"/>
++            <vignetting model="pa" focal="236" aperture="7.1" distance="1000" k1="-0.0716" k2="-0.4892" k3="0.1356"/>
++            <vignetting model="pa" focal="236" aperture="8" distance="10" k1="-0.2674" k2="0.2467" k3="-0.2992"/>
++            <vignetting model="pa" focal="236" aperture="8" distance="1000" k1="-0.2674" k2="0.2467" k3="-0.2992"/>
++            <vignetting model="pa" focal="236" aperture="9" distance="10" k1="-0.2898" k2="0.2505" k3="-0.1963"/>
++            <vignetting model="pa" focal="236" aperture="9" distance="1000" k1="-0.2898" k2="0.2505" k3="-0.1963"/>
++            <vignetting model="pa" focal="236" aperture="45" distance="10" k1="-0.3839" k2="0.3245" k3="-0.1407"/>
++            <vignetting model="pa" focal="236" aperture="45" distance="1000" k1="-0.3839" k2="0.3245" k3="-0.1407"/>
++            <vignetting model="pa" focal="260" aperture="5.6" distance="10" k1="-0.4252" k2="-0.5946" k3="0.4567"/>
++            <vignetting model="pa" focal="260" aperture="5.6" distance="1000" k1="-0.4252" k2="-0.5946" k3="0.4567"/>
++            <vignetting model="pa" focal="277" aperture="32" distance="10" k1="-0.2833" k2="0.1303" k3="-0.0356"/>
++            <vignetting model="pa" focal="277" aperture="32" distance="1000" k1="-0.2833" k2="0.1303" k3="-0.0356"/>
++            <vignetting model="pa" focal="277" aperture="45" distance="10" k1="-0.2894" k2="0.1608" k3="-0.0603"/>
++            <vignetting model="pa" focal="277" aperture="45" distance="1000" k1="-0.2894" k2="0.1608" k3="-0.0603"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.5710" k2="-0.1995" k3="0.2138"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.5710" k2="-0.1995" k3="0.2138"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-0.2521" k2="-0.5731" k3="0.3459"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-0.2521" k2="-0.5731" k3="0.3459"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.1493" k2="-0.4790" k3="0.2215"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.1493" k2="-0.4790" k3="0.2215"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.1910" k2="-0.1128" k3="-0.0227"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.1910" k2="-0.1128" k3="-0.0227"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.2654" k2="0.1590" k3="-0.1405"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.2654" k2="0.1590" k3="-0.1405"/>
++            <vignetting model="pa" focal="300" aperture="10" distance="10" k1="-0.2769" k2="0.1569" k3="-0.0843"/>
++            <vignetting model="pa" focal="300" aperture="10" distance="1000" k1="-0.2769" k2="0.1569" k3="-0.0843"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.2535" k2="0.0619" k3="0.0069"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.2535" k2="0.0619" k3="0.0069"/>
++            <vignetting model="pa" focal="300" aperture="13" distance="10" k1="-0.2594" k2="0.0764" k3="-0.0028"/>
++            <vignetting model="pa" focal="300" aperture="13" distance="1000" k1="-0.2594" k2="0.0764" k3="-0.0028"/>
++            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.2561" k2="0.0674" k3="0.0026"/>
++            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.2561" k2="0.0674" k3="0.0026"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="10" k1="-0.2665" k2="0.0907" k3="-0.0122"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.2665" k2="0.0907" k3="-0.0122"/>
++            <vignetting model="pa" focal="300" aperture="18" distance="10" k1="-0.2694" k2="0.1055" k3="-0.0233"/>
++            <vignetting model="pa" focal="300" aperture="18" distance="1000" k1="-0.2694" k2="0.1055" k3="-0.0233"/>
++            <vignetting model="pa" focal="300" aperture="20" distance="10" k1="-0.2689" k2="0.1025" k3="-0.0202"/>
++            <vignetting model="pa" focal="300" aperture="20" distance="1000" k1="-0.2689" k2="0.1025" k3="-0.0202"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="10" k1="-0.2751" k2="0.1188" k3="-0.0303"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.2751" k2="0.1188" k3="-0.0303"/>
++            <vignetting model="pa" focal="300" aperture="25" distance="10" k1="-0.2762" k2="0.1196" k3="-0.0299"/>
++            <vignetting model="pa" focal="300" aperture="25" distance="1000" k1="-0.2762" k2="0.1196" k3="-0.0299"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="10" k1="-0.2750" k2="0.1153" k3="-0.0263"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="1000" k1="-0.2750" k2="0.1153" k3="-0.0263"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.2832" k2="0.1403" k3="-0.0443"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.2832" k2="0.1403" k3="-0.0443"/>
++            <vignetting model="pa" focal="300" aperture="45" distance="10" k1="-0.3393" k2="0.2337" k3="-0.0925"/>
++            <vignetting model="pa" focal="300" aperture="45" distance="1000" k1="-0.3393" k2="0.2337" k3="-0.0925"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 90-300mm f/4.5-5.6</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="90" a="-0.006" b="0.022" c="-0.02"/>
++            <distortion model="ptlens" focal="100" a="0.003" b="-0.012" c="0.024"/>
++            <distortion model="ptlens" focal="115" a="-0.001" b="0.016" c="-0.022"/>
++            <distortion model="ptlens" focal="135" a="0.005" b="-0.008" c="0.014"/>
++            <distortion model="ptlens" focal="160" a="0.011" b="-0.029" c="0.045"/>
++            <distortion model="ptlens" focal="200" a="-0.014" b="0.064" c="-0.069"/>
++            <distortion model="ptlens" focal="245" a="0.005" b="-0.005" c="0.017"/>
++            <distortion model="ptlens" focal="300" a="0.001" b="0.018" c="-0.017"/>
++            <tca model="poly3" focal="90" br="0.0001124" vr="0.9999506" bb="-0.0001772" vb="1.0001915"/>
++            <tca model="poly3" focal="100" br="0.0000892" vr="0.9999439" bb="-0.0002141" vb="1.0002109"/>
++            <tca model="poly3" focal="115" br="0.0000318" vr="0.9999684" bb="-0.0001839" vb="1.0000694"/>
++            <tca model="poly3" focal="135" br="0.0000023" vr="0.9999446" bb="-0.0000763" vb="0.9998603"/>
++            <tca model="poly3" focal="160" br="-0.0000001" vr="0.9999788" bb="-0.0000913" vb="0.9997460"/>
++            <tca model="poly3" focal="200" br="0.0000823" vr="0.9998566" bb="-0.0003916" vb="0.9997365"/>
++            <tca model="poly3" focal="245" br="0.0000451" vr="0.9998133" bb="-0.0004300" vb="0.9998388"/>
++            <tca model="poly3" focal="300" br="0.0002260" vr="0.9993977" bb="0.0002063" vb="0.9996073"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 18-200mm f/3.5-5.6 IS</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 60D -->
++            <distortion model="ptlens" focal="18" a="0.02543" b="-0.07968" c="0.03623"/>
++            <distortion model="ptlens" focal="20" a="0.02822" b="-0.08034" c="0.04569"/>
++            <distortion model="ptlens" focal="24" a="0.02071" b="-0.04598" c="0.02693"/>
++            <distortion model="ptlens" focal="35" a="0.0117" b="-0.0177" c="0.01611"/>
++            <distortion model="ptlens" focal="50" a="0.01104" b="-0.02248" c="0.03263"/>
++            <distortion model="ptlens" focal="90" a="0" b="0.0085" c="0"/>
++            <distortion model="ptlens" focal="130" a="0" b="0.00797" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.0066" c="0"/>
++            <tca model="poly3" focal="20" br="-0.0000932" vr="1.0005833" bb="0.0000706" vb="0.9999406"/>
++            <tca model="poly3" focal="24" br="-0.0000538" vr="1.0004676" bb="0.0000771" vb="0.9999306"/>
++            <tca model="poly3" focal="40" br="-0.0000043" vr="1.0000674" bb="-0.0000084" vb="1.0001658"/>
++            <tca model="poly3" focal="50" br="0.0000082" vr="0.9999548" bb="0.0000014" vb="1.0001986"/>
++            <tca model="poly3" focal="90" br="0.0000416" vr="0.9996703" bb="-0.0000830" vb="1.0003595"/>
++            <tca model="poly3" focal="135" br="0.0001072" vr="0.9993999" bb="-0.0001156" vb="1.0002326"/>
++            <tca model="poly3" focal="200" br="0.0000742" vr="0.9993410" bb="-0.0000765" vb="1.0000445"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 28-80mm f/3.5-5.6 USM IV</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 100D -->
++            <distortion model="ptlens" focal="28" a="0" b="-0.00843" c="0"/>
++            <distortion model="ptlens" focal="32" a="0.01228" b="-0.05159" c="0.05533"/>
++            <distortion model="ptlens" focal="37" a="0" b="-0.00316" c="0"/>
++            <distortion model="ptlens" focal="63" a="0" b="0.0017" c="0"/>
++            <distortion model="ptlens" focal="80" a="0" b="0.00491" c="0"/>
++            <tca model="poly3" focal="28" br="-0.0000057" vr="1.0007308" bb="0.0000485" vb="0.9995727"/>
++            <tca model="poly3" focal="38" br="-0.0000215" vr="1.0005363" bb="0.0000312" vb="0.9997387"/>
++            <tca model="poly3" focal="57" br="0.0000001" vr="1.0001671" bb="0.0000161" vb="0.9999092"/>
++            <tca model="poly3" focal="63" br="-0.0000167" vr="1.0001572" bb="0.0000247" vb="0.9999346"/>
++            <tca model="poly3" focal="73" br="-0.0000142" vr="1.0000838" bb="0.0000065" vb="0.9999950"/>
++            <tca model="poly3" focal="80" br="-0.0000093" vr="1.0000635" bb="0.0000036" vb="1.0000023"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.1950" k2="-0.0487" k3="0.0411"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.1950" k2="-0.0487" k3="0.0411"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.1868" k2="-0.0845" k3="0.0982"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.1868" k2="-0.0845" k3="0.0982"/>
++            <vignetting model="pa" focal="28" aperture="10" distance="10" k1="-0.1846" k2="-0.0871" k3="0.0991"/>
++            <vignetting model="pa" focal="28" aperture="10" distance="1000" k1="-0.1846" k2="-0.0871" k3="0.0991"/>
++            <vignetting model="pa" focal="28" aperture="14" distance="10" k1="-0.1875" k2="-0.0771" k3="0.0913"/>
++            <vignetting model="pa" focal="28" aperture="14" distance="1000" k1="-0.1875" k2="-0.0771" k3="0.0913"/>
++            <vignetting model="pa" focal="28" aperture="20" distance="10" k1="-0.1922" k2="-0.0613" k3="0.0782"/>
++            <vignetting model="pa" focal="28" aperture="20" distance="1000" k1="-0.1922" k2="-0.0613" k3="0.0782"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.1925" k2="-0.0597" k3="0.0766"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.1925" k2="-0.0597" k3="0.0766"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5247" k2="0.0582" k3="0.0944"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5247" k2="0.0582" k3="0.0944"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.1475" k2="-0.0933" k3="0.0207"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.1475" k2="-0.0933" k3="0.0207"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1656" k2="-0.0648" k3="0.0799"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1656" k2="-0.0648" k3="0.0799"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.1665" k2="-0.0630" k3="0.0790"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.1665" k2="-0.0630" k3="0.0790"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.1690" k2="-0.0585" k3="0.0762"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.1690" k2="-0.0585" k3="0.0762"/>
++            <vignetting model="pa" focal="35" aperture="20" distance="10" k1="-0.1724" k2="-0.0521" k3="0.0723"/>
++            <vignetting model="pa" focal="35" aperture="20" distance="1000" k1="-0.1724" k2="-0.0521" k3="0.0723"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1728" k2="-0.0519" k3="0.0723"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1728" k2="-0.0519" k3="0.0723"/>
++            <vignetting model="pa" focal="45" aperture="4.5" distance="10" k1="-0.4821" k2="0.0257" k3="0.1071"/>
++            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.4821" k2="0.0257" k3="0.1071"/>
++            <vignetting model="pa" focal="45" aperture="6.3" distance="10" k1="-0.1353" k2="-0.0430" k3="-0.0101"/>
++            <vignetting model="pa" focal="45" aperture="6.3" distance="1000" k1="-0.1353" k2="-0.0430" k3="-0.0101"/>
++            <vignetting model="pa" focal="45" aperture="9" distance="10" k1="-0.1429" k2="-0.0554" k3="0.0701"/>
++            <vignetting model="pa" focal="45" aperture="9" distance="1000" k1="-0.1429" k2="-0.0554" k3="0.0701"/>
++            <vignetting model="pa" focal="45" aperture="13" distance="10" k1="-0.1432" k2="-0.0555" k3="0.0708"/>
++            <vignetting model="pa" focal="45" aperture="13" distance="1000" k1="-0.1432" k2="-0.0555" k3="0.0708"/>
++            <vignetting model="pa" focal="45" aperture="18" distance="10" k1="-0.1447" k2="-0.0559" k3="0.0734"/>
++            <vignetting model="pa" focal="45" aperture="18" distance="1000" k1="-0.1447" k2="-0.0559" k3="0.0734"/>
++            <vignetting model="pa" focal="45" aperture="25" distance="10" k1="-0.1464" k2="-0.0551" k3="0.0744"/>
++            <vignetting model="pa" focal="45" aperture="25" distance="1000" k1="-0.1464" k2="-0.0551" k3="0.0744"/>
++            <vignetting model="pa" focal="45" aperture="29" distance="10" k1="-0.1474" k2="-0.0527" k3="0.0732"/>
++            <vignetting model="pa" focal="45" aperture="29" distance="1000" k1="-0.1474" k2="-0.0527" k3="0.0732"/>
++            <vignetting model="pa" focal="57" aperture="5" distance="10" k1="-0.5363" k2="0.2774" k3="-0.0520"/>
++            <vignetting model="pa" focal="57" aperture="5" distance="1000" k1="-0.5363" k2="0.2774" k3="-0.0520"/>
++            <vignetting model="pa" focal="57" aperture="6.3" distance="10" k1="-0.0725" k2="-0.2029" k3="0.0976"/>
++            <vignetting model="pa" focal="57" aperture="6.3" distance="1000" k1="-0.0725" k2="-0.2029" k3="0.0976"/>
++            <vignetting model="pa" focal="57" aperture="9" distance="10" k1="-0.1174" k2="-0.0650" k3="0.0737"/>
++            <vignetting model="pa" focal="57" aperture="9" distance="1000" k1="-0.1174" k2="-0.0650" k3="0.0737"/>
++            <vignetting model="pa" focal="57" aperture="13" distance="10" k1="-0.1186" k2="-0.0643" k3="0.0746"/>
++            <vignetting model="pa" focal="57" aperture="13" distance="1000" k1="-0.1186" k2="-0.0643" k3="0.0746"/>
++            <vignetting model="pa" focal="57" aperture="18" distance="10" k1="-0.1231" k2="-0.0574" k3="0.0714"/>
++            <vignetting model="pa" focal="57" aperture="18" distance="1000" k1="-0.1231" k2="-0.0574" k3="0.0714"/>
++            <vignetting model="pa" focal="57" aperture="25" distance="10" k1="-0.1294" k2="-0.0472" k3="0.0661"/>
++            <vignetting model="pa" focal="57" aperture="25" distance="1000" k1="-0.1294" k2="-0.0472" k3="0.0661"/>
++            <vignetting model="pa" focal="57" aperture="32" distance="10" k1="-0.1311" k2="-0.0464" k3="0.0670"/>
++            <vignetting model="pa" focal="57" aperture="32" distance="1000" k1="-0.1311" k2="-0.0464" k3="0.0670"/>
++            <vignetting model="pa" focal="67" aperture="5.6" distance="10" k1="-0.5623" k2="0.4129" k3="-0.1412"/>
++            <vignetting model="pa" focal="67" aperture="5.6" distance="1000" k1="-0.5623" k2="0.4129" k3="-0.1412"/>
++            <vignetting model="pa" focal="67" aperture="8" distance="10" k1="-0.1239" k2="-0.0183" k3="0.0070"/>
++            <vignetting model="pa" focal="67" aperture="8" distance="1000" k1="-0.1239" k2="-0.0183" k3="0.0070"/>
++            <vignetting model="pa" focal="67" aperture="11" distance="10" k1="-0.1333" k2="-0.0262" k3="0.0531"/>
++            <vignetting model="pa" focal="67" aperture="11" distance="1000" k1="-0.1333" k2="-0.0262" k3="0.0531"/>
++            <vignetting model="pa" focal="67" aperture="16" distance="10" k1="-0.1476" k2="-0.0017" k3="0.0407"/>
++            <vignetting model="pa" focal="67" aperture="16" distance="1000" k1="-0.1476" k2="-0.0017" k3="0.0407"/>
++            <vignetting model="pa" focal="67" aperture="22" distance="10" k1="-0.1690" k2="0.0392" k3="0.0176"/>
++            <vignetting model="pa" focal="67" aperture="22" distance="1000" k1="-0.1690" k2="0.0392" k3="0.0176"/>
++            <vignetting model="pa" focal="67" aperture="32" distance="10" k1="-0.1855" k2="0.0694" k3="0.0012"/>
++            <vignetting model="pa" focal="67" aperture="32" distance="1000" k1="-0.1855" k2="0.0694" k3="0.0012"/>
++            <vignetting model="pa" focal="67" aperture="36" distance="10" k1="-0.1878" k2="0.0737" k3="-0.0013"/>
++            <vignetting model="pa" focal="67" aperture="36" distance="1000" k1="-0.1878" k2="0.0737" k3="-0.0013"/>
++            <vignetting model="pa" focal="77" aperture="22" distance="10" k1="-0.1893" k2="0.0795" k3="-0.0020"/>
++            <vignetting model="pa" focal="77" aperture="22" distance="1000" k1="-0.1893" k2="0.0795" k3="-0.0020"/>
++            <vignetting model="pa" focal="77" aperture="32" distance="10" k1="-0.2055" k2="0.1109" k3="-0.0200"/>
++            <vignetting model="pa" focal="77" aperture="32" distance="1000" k1="-0.2055" k2="0.1109" k3="-0.0200"/>
++            <vignetting model="pa" focal="77" aperture="36" distance="10" k1="-0.2106" k2="0.1208" k3="-0.0260"/>
++            <vignetting model="pa" focal="77" aperture="36" distance="1000" k1="-0.2106" k2="0.1208" k3="-0.0260"/>
++            <vignetting model="pa" focal="79" aperture="5.6" distance="10" k1="-0.5399" k2="0.4177" k3="-0.1478"/>
++            <vignetting model="pa" focal="79" aperture="5.6" distance="1000" k1="-0.5399" k2="0.4177" k3="-0.1478"/>
++            <vignetting model="pa" focal="79" aperture="8" distance="10" k1="-0.1022" k2="-0.0964" k3="0.0526"/>
++            <vignetting model="pa" focal="79" aperture="8" distance="1000" k1="-0.1022" k2="-0.0964" k3="0.0526"/>
++            <vignetting model="pa" focal="79" aperture="11" distance="10" k1="-0.1447" k2="-0.0007" k3="0.0413"/>
++            <vignetting model="pa" focal="79" aperture="11" distance="1000" k1="-0.1447" k2="-0.0007" k3="0.0413"/>
++            <vignetting model="pa" focal="79" aperture="16" distance="10" k1="-0.1720" k2="0.0511" k3="0.0122"/>
++            <vignetting model="pa" focal="79" aperture="16" distance="1000" k1="-0.1720" k2="0.0511" k3="0.0122"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 400mm f/5.6L USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="400" a="0.00429" b="-0.00425" c="-0.00493"/>
++            <tca model="poly3" focal="400" vr="0.9999" vb="0.9998"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="10" k1="-0.6220" k2="0.7685" k3="-0.4254"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-0.6220" k2="0.7685" k3="-0.4254"/>
++            <vignetting model="pa" focal="400" aperture="6.3" distance="10" k1="-0.0503" k2="-0.1890" k3="0.1157"/>
++            <vignetting model="pa" focal="400" aperture="6.3" distance="1000" k1="-0.0503" k2="-0.1890" k3="0.1157"/>
++            <vignetting model="pa" focal="400" aperture="7.1" distance="10" k1="0.0358" k2="-0.0701" k3="0.0046"/>
++            <vignetting model="pa" focal="400" aperture="7.1" distance="1000" k1="0.0358" k2="-0.0701" k3="0.0046"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="10" k1="-0.0102" k2="0.0908" k3="-0.0503"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="-0.0102" k2="0.0908" k3="-0.0503"/>
++            <vignetting model="pa" focal="400" aperture="9" distance="10" k1="-0.0118" k2="0.0868" k3="-0.0423"/>
++            <vignetting model="pa" focal="400" aperture="9" distance="1000" k1="-0.0118" k2="0.0868" k3="-0.0423"/>
++            <vignetting model="pa" focal="400" aperture="10" distance="10" k1="-0.0206" k2="0.1019" k3="-0.0514"/>
++            <vignetting model="pa" focal="400" aperture="10" distance="1000" k1="-0.0206" k2="0.1019" k3="-0.0514"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="10" k1="-0.0145" k2="0.0822" k3="-0.0356"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="-0.0145" k2="0.0822" k3="-0.0356"/>
++            <vignetting model="pa" focal="400" aperture="13" distance="10" k1="-0.0210" k2="0.0876" k3="-0.0350"/>
++            <vignetting model="pa" focal="400" aperture="13" distance="1000" k1="-0.0210" k2="0.0876" k3="-0.0350"/>
++            <vignetting model="pa" focal="400" aperture="14" distance="10" k1="-0.0264" k2="0.0959" k3="-0.0357"/>
++            <vignetting model="pa" focal="400" aperture="14" distance="1000" k1="-0.0264" k2="0.0959" k3="-0.0357"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="10" k1="-0.0256" k2="0.0958" k3="-0.0366"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="1000" k1="-0.0256" k2="0.0958" k3="-0.0366"/>
++            <vignetting model="pa" focal="400" aperture="18" distance="10" k1="-0.0198" k2="0.0962" k3="-0.0429"/>
++            <vignetting model="pa" focal="400" aperture="18" distance="1000" k1="-0.0198" k2="0.0962" k3="-0.0429"/>
++            <vignetting model="pa" focal="400" aperture="20" distance="10" k1="-0.0211" k2="0.0946" k3="-0.0425"/>
++            <vignetting model="pa" focal="400" aperture="20" distance="1000" k1="-0.0211" k2="0.0946" k3="-0.0425"/>
++            <vignetting model="pa" focal="400" aperture="22" distance="10" k1="-0.0052" k2="0.0563" k3="-0.0191"/>
++            <vignetting model="pa" focal="400" aperture="22" distance="1000" k1="-0.0052" k2="0.0563" k3="-0.0191"/>
++            <vignetting model="pa" focal="400" aperture="25" distance="10" k1="0.0006" k2="0.0340" k3="-0.0032"/>
++            <vignetting model="pa" focal="400" aperture="25" distance="1000" k1="0.0006" k2="0.0340" k3="-0.0032"/>
++            <vignetting model="pa" focal="400" aperture="29" distance="10" k1="0.0086" k2="-0.0205" k3="0.0419"/>
++            <vignetting model="pa" focal="400" aperture="29" distance="1000" k1="0.0086" k2="-0.0205" k3="0.0419"/>
++            <vignetting model="pa" focal="400" aperture="32" distance="10" k1="0.0402" k2="-0.0754" k3="0.0712"/>
++            <vignetting model="pa" focal="400" aperture="32" distance="1000" k1="0.0402" k2="-0.0754" k3="0.0712"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 400mm f/5.6L USM + 1.4x extender</model>
++        <model lang="en">Canon EF 400mm f/5.6L USM + EF 1.4× ext.</model>
++        <model lang="de">Canon EF 400mm f/5.6L USM + EF 1,4×-Konv.</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="560" a="-0.00472" b="0.01271" c="-0.00812"/>
++            <tca model="poly3" focal="560" vr="0.9998" vb="0.9996"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/2.8L IS II USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="300" k1="0.00083"/>
++            <tca model="poly3" focal="300" vr="0.9999243" vb="0.9999730"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/2.8L IS II USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 20D -->
++            <distortion model="poly3" focal="300" k1="-0.00038"/>
++            <tca model="poly3" focal="300" vr="0.9999252" vb="0.9999595"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/2.8L IS II USM + EF 1.4x extender III</model>
++        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 1.4× ext. III</model>
++        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 1,4×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="420" k1="-0.00479"/>
++            <tca model="poly3" focal="420" vr="0.9998668" vb="0.9999806"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/2.8L IS II USM + EF 1.4x extender III</model>
++        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 1.4× ext. III</model>
++        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 1,4×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 20D -->
++            <distortion model="poly3" focal="420" k1="-0.00092"/>
++            <tca model="poly3" focal="420" vr="0.9998605" vb="0.9999578"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/2.8L IS II USM + EF 2.0x extender III</model>
++        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 2.0× ext. III</model>
++        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 2,0×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="600" k1="-0.00264"/>
++            <tca model="poly3" focal="600" vr="0.9998625" vb="0.9999894"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/2.8L IS II USM + EF 2.0x extender III</model>
++        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 2.0× ext. III</model>
++        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 2,0×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 20D -->
++            <distortion model="poly3" focal="600" k1="-0.00067"/>
++            <tca model="poly3" focal="600" vr="0.9998626" vb="1.0000065"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/4L IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 7D Mark II -->
++            <distortion model="ptlens" focal="300" a="-0.00271" b="0.00945" c="-0.00645"/>
++            <tca model="poly3" focal="300" br="0.0000114" vr="0.9999147" bb="-0.0000121" vb="0.9999900"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 300mm f/4L IS USM + 1.4x extender</model>
++        <model lang="en">Canon EF 300mm f/4L IS USM + 1.4× ext.</model>
++        <model lang="de">Canon EF 300mm f/4L IS USM + 1.4×-Konv.</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 7D Mark II -->
++            <distortion model="poly3" focal="420" k1="-0.00134"/>
++            <tca model="poly3" focal="420" vr="0.9997680" vb="1.0000126"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 500mm f/4L IS II USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="500" k1="0.00113"/>
++            <tca model="poly3" focal="500" vr="0.9999381" vb="0.9999962"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 500mm f/4L IS II USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 20D -->
++            <distortion model="poly3" focal="500" k1="-0.00127"/>
++            <tca model="poly3" focal="500" vr="0.9999196" vb="1.0000391"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 500mm f/4L IS II USM + EF 1.4x extender III</model>
++        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 1.4× ext. III</model>
++        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 1.4×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="700" k1="-0.0045"/>
++            <tca model="poly3" focal="700" vr="0.9998697" vb="1.0000174"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 500mm f/4L IS II USM + EF 1.4x extender III</model>
++        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 1.4× ext. III</model>
++        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 1.4×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 20D -->
++            <distortion model="poly3" focal="700" k1="-0.00111"/>
++            <tca model="poly3" focal="700" vr="0.9998967" vb="0.9999863"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 500mm f/4L IS II USM + EF 2.0x extender III</model>
++        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 2.0× ext. III</model>
++        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 2.0×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="1000" k1="-0.00287"/>
++            <tca model="poly3" focal="1000" vr="0.9998205" vb="1.0000916"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 500mm f/4L IS II USM + EF 2.0x extender III</model>
++        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 2.0× ext. III</model>
++        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 2.0×-Konv. III</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 20D -->
++            <distortion model="poly3" focal="1000" k1="-0.00073"/>
++            <tca model="poly3" focal="1000" vr="0.9999646" vb="0.9999321"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon Lens FL 50mm F1.4</model>
++        <mount>Canon FL</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <distortion model="poly3" focal="50" k1="-0.00306"/>
++            <tca model="poly3" focal="50" vr="1.0001860" vb="0.9999560"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.0149" k2="0.9012" k3="-0.3954"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.0149" k2="0.9012" k3="-0.3954"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.1791" k2="0.0693" k3="-0.1195"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1791" k2="0.0693" k3="-0.1195"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.2197" k2="0.1511" k3="-0.0780"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2197" k2="0.1511" k3="-0.0780"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2323" k2="0.1711" k3="-0.0859"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2323" k2="0.1711" k3="-0.0859"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2517" k2="0.2094" k3="-0.1072"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2517" k2="0.2094" k3="-0.1072"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2785" k2="0.2672" k3="-0.1431"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2785" k2="0.2672" k3="-0.1431"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2975" k2="0.3075" k3="-0.1673"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2975" k2="0.3075" k3="-0.1673"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.3122" k2="0.3372" k3="-0.1853"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3122" k2="0.3372" k3="-0.1853"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon Lens FL 135mm F3.5</model>
++        <mount>Canon FL</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <vignetting model="pa" focal="135" aperture="3.5" distance="10" k1="-0.3120" k2="0.1519" k3="-0.0955"/>
++            <vignetting model="pa" focal="135" aperture="3.5" distance="1000" k1="-0.3120" k2="0.1519" k3="-0.0955"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.1630" k2="-0.0838" k3="0.0652"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.1630" k2="-0.0838" k3="0.0652"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.2119" k2="0.1695" k3="-0.0832"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.2119" k2="0.1695" k3="-0.0832"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.2929" k2="0.2867" k3="-0.1380"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2929" k2="0.2867" k3="-0.1380"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.3969" k2="0.4685" k3="-0.2342"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.3969" k2="0.4685" k3="-0.2342"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.5191" k2="0.7016" k3="-0.3637"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.5191" k2="0.7016" k3="-0.3637"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.6249" k2="0.9125" k3="-0.4836"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.6249" k2="0.9125" k3="-0.4836"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon FDn 135mm 1:2.8</model>
++        <mount>Canon FD</mount>
++        <focal value="135"/>
++        <aperture min="2.8" max="32"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony 6000 (ILCE-6000) -->
++            <distortion model="ptlens" focal="135" a="0" b="0" c="0.002"/>
++            <tca model="poly3" focal="135" br="0.0000077" vr="0.9997611" bb="-0.0000082" vb="1.0000087"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.7505" k2="0.7072" k3="-0.3224"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.7505" k2="0.7072" k3="-0.3224"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.0929" k2="-0.0085" k3="-0.0595"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.0929" k2="-0.0085" k3="-0.0595"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1298" k2="0.1127" k3="-0.0764"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1298" k2="0.1127" k3="-0.0764"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1334" k2="0.1220" k3="-0.0760"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1334" k2="0.1220" k3="-0.0760"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1424" k2="0.1495" k3="-0.0947"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1424" k2="0.1495" k3="-0.0947"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="-0.1149" k2="0.0817" k3="-0.0542"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1149" k2="0.0817" k3="-0.0542"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 16-35mm f/4L IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="16" a="0.00938" b="-0.03862" c="0.01807"/>
++            <distortion model="ptlens" focal="20" a="0.00676" b="-0.01415" c="-0.01238"/>
++            <distortion model="ptlens" focal="24" a="0" b="0.00098" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.00444" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 70-210mm f/3.5-4.5 USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D -->
++            <distortion model="ptlens" focal="70" a="0.002876" b="-0.015288" c="0.013076"/>
++            <distortion model="ptlens" focal="85" a="0.003736" b="-0.012136" c="0.013108"/>
++            <distortion model="ptlens" focal="97" a="0.002884" b="-0.005767" c="0.008626"/>
++            <distortion model="ptlens" focal="135" a="0.000322" b="0.008325" c="-0.005967"/>
++            <distortion model="ptlens" focal="210" a="-0.006697" b="0.04309" c="-0.047894"/>
++            <tca model="poly3" focal="70" br="0.0000102" vr="1.0000497" bb="-0.0000245" vb="1.0000352"/>
++            <tca model="poly3" focal="105" br="-0.0000174" vr="1.0000096" bb="-0.0000183" vb="0.9999608"/>
++            <tca model="poly3" focal="137" br="0.0000000" vr="0.9999283" bb="-0.0000082" vb="0.9998754"/>
++            <tca model="poly3" focal="210" br="-0.0000161" vr="0.9997241" bb="-0.0000788" vb="0.9998228"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="1.5" k1="-1.0958" k2="0.7157" k3="-0.2301"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="5" k1="-1.1390" k2="0.7892" k3="-0.2682"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="-1.1538" k2="0.8152" k3="-0.2810"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1.5" k1="-0.8384" k2="0.2147" k3="0.0405"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="5" k1="-0.8865" k2="0.2957" k3="-0.0005"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.8541" k2="0.2096" k3="0.0494"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1.5" k1="-0.2122" k2="0.1127" k3="-0.2035"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.2052" k2="0.0655" k3="-0.1778"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2044" k2="0.0247" k3="-0.1485"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1.5" k1="-0.2297" k2="-0.0043" k3="0.0632"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.2364" k2="0.0361" k3="0.0337"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2313" k2="0.0126" k3="0.0543"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1.5" k1="-0.2409" k2="0.0154" k3="0.0512"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="5" k1="-0.2216" k2="-0.0135" k3="0.0679"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2387" k2="0.0169" k3="0.0504"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1.5" k1="-0.2426" k2="0.0137" k3="0.0531"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.2481" k2="0.0374" k3="0.0371"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2451" k2="0.0399" k3="0.0317"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1.5" k1="-0.2497" k2="0.0506" k3="0.0229"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.2252" k2="0.0168" k3="0.0406"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2312" k2="0.0273" k3="0.0390"/>
++            <vignetting model="pa" focal="95" aperture="16" distance="1.5" k1="-0.2359" k2="0.0789" k3="0.0026"/>
++            <vignetting model="pa" focal="95" aperture="22" distance="1.5" k1="-0.2277" k2="0.0638" k3="0.0093"/>
++            <vignetting model="pa" focal="97" aperture="4" distance="1.5" k1="-0.9336" k2="0.5980" k3="-0.1971"/>
++            <vignetting model="pa" focal="97" aperture="4" distance="1000" k1="-0.9611" k2="0.5808" k3="-0.1738"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="1.5" k1="-0.1701" k2="0.0207" k3="-0.1163"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.1463" k2="-0.0361" k3="-0.0997"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="1.5" k1="-0.1938" k2="0.0177" k3="0.0295"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.2130" k2="0.0354" k3="0.0287"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="1.5" k1="-0.2449" k2="0.0778" k3="0.0163"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.2580" k2="0.0920" k3="0.0085"/>
++            <vignetting model="pa" focal="97" aperture="16" distance="1000" k1="-0.2211" k2="0.0433" k3="0.0319"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.2422" k2="0.0912" k3="-0.0023"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="5" k1="-0.9151" k2="0.5622" k3="-0.1813"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="5" k1="-0.1644" k2="-0.0108" k3="-0.1030"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="5" k1="-0.2175" k2="0.0602" k3="0.0062"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="5" k1="-0.2287" k2="0.0684" k3="0.0136"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="5" k1="-0.2326" k2="0.0779" k3="0.0060"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="5" k1="-0.2417" k2="0.0934" k3="-0.0034"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1.5" k1="-0.6891" k2="0.3080" k3="-0.1763"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.4960" k2="-0.2198" k3="0.1216"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1.5" k1="-0.1677" k2="0.0397" k3="-0.2375"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="5" k1="-0.1066" k2="-0.1174" k3="-0.1820"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0897" k2="-0.2019" k3="-0.1351"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1.5" k1="-0.2347" k2="0.1203" k3="-0.0384"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="5" k1="-0.2544" k2="0.1707" k3="-0.0796"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2730" k2="0.2071" k3="-0.1041"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1.5" k1="-0.2654" k2="0.1258" k3="-0.0130"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="5" k1="-0.2682" k2="0.1343" k3="-0.0207"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2463" k2="0.1042" k3="-0.0064"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1.5" k1="-0.3260" k2="0.2395" k3="-0.0770"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="5" k1="-0.3021" k2="0.2058" k3="-0.0634"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.2913" k2="0.1828" k3="-0.0492"/>
++            <vignetting model="pa" focal="135" aperture="25" distance="1.5" k1="-0.3414" k2="0.2624" k3="-0.0884"/>
++            <vignetting model="pa" focal="135" aperture="25" distance="5" k1="-0.3524" k2="0.3012" k3="-0.1144"/>
++            <vignetting model="pa" focal="135" aperture="25" distance="1000" k1="-0.3181" k2="0.2146" k3="-0.0605"/>
++            <vignetting model="pa" focal="137" aperture="4" distance="5" k1="-0.5470" k2="-0.0934" k3="0.0487"/>
++            <vignetting model="pa" focal="210" aperture="4.5" distance="1.5" k1="-0.3789" k2="-1.0784" k3="0.7960"/>
++            <vignetting model="pa" focal="210" aperture="4.5" distance="5" k1="-0.6299" k2="-0.6743" k3="0.6066"/>
++            <vignetting model="pa" focal="210" aperture="4.5" distance="1000" k1="-0.7529" k2="-0.4432" k3="0.4821"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="1.5" k1="0.0802" k2="-1.3774" k3="0.7501"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="5" k1="-0.0755" k2="-1.2845" k3="0.7669"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="1000" k1="-0.1826" k2="-1.1468" k3="0.7151"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="1.5" k1="-0.2313" k2="0.2456" k3="-0.3060"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="5" k1="-0.1866" k2="0.0449" k3="-0.1992"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="-0.1599" k2="-0.0698" k3="-0.1270"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="1.5" k1="-0.2653" k2="0.2219" k3="-0.1179"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="5" k1="-0.3193" k2="0.3466" k3="-0.2256"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="1000" k1="-0.3098" k2="0.3542" k3="-0.2466"/>
++            <vignetting model="pa" focal="210" aperture="16" distance="1.5" k1="-0.2802" k2="0.1580" k3="-0.0310"/>
++            <vignetting model="pa" focal="210" aperture="16" distance="5" k1="-0.2918" k2="0.1659" k3="-0.0315"/>
++            <vignetting model="pa" focal="210" aperture="16" distance="1000" k1="-0.2769" k2="0.1380" k3="-0.0200"/>
++            <vignetting model="pa" focal="210" aperture="29" distance="1.5" k1="-0.3180" k2="0.2419" k3="-0.0864"/>
++            <vignetting model="pa" focal="210" aperture="29" distance="5" k1="-0.3350" k2="0.2654" k3="-0.0970"/>
++            <vignetting model="pa" focal="210" aperture="29" distance="1000" k1="-0.3346" k2="0.2640" k3="-0.0997"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 24-70mm f/4L IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="24" a="0.01231" b="-0.02141" c="-0.02607"/>
++            <distortion model="ptlens" focal="33" a="0.00008" b="0.00847" c="-0.02294"/>
++            <distortion model="ptlens" focal="42" a="0" b="0.00302" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.00807" c="0"/>
++            <tca model="poly3" focal="24" br="-0.0000967" vr="1.0003311" bb="0.0000579" vb="0.9999625"/>
++            <tca model="poly3" focal="35" br="-0.0000609" vr="1.0002052" bb="0.0000471" vb="0.9999760"/>
++            <tca model="poly3" focal="42" br="-0.0000549" vr="1.0000990" bb="0.0000341" vb="0.9999984"/>
++            <tca model="poly3" focal="50" br="-0.0000538" vr="1.0000124" bb="0.0000396" vb="1.0000021"/>
++            <tca model="poly3" focal="70" br="-0.0000278" vr="0.9998685" bb="0.0000294" vb="0.9999997"/>
++            <!-- Taken with Canon EOS 6D -->
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.1615" k2="-1.1713" k3="0.6378"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.1615" k2="-1.1713" k3="0.6378"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.3982" k2="-0.0498" k3="-0.1606"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.3982" k2="-0.0498" k3="-0.1606"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.5970" k2="0.6157" k3="-0.5651"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.5970" k2="0.6157" k3="-0.5651"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.6115" k2="0.5818" k3="-0.4343"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.6115" k2="0.5818" k3="-0.4343"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.4913" k2="0.0981" k3="0.0087"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.4913" k2="0.0981" k3="0.0087"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.4223" k2="-0.5202" k3="0.4288"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.4223" k2="-0.5202" k3="0.4288"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.3922" k2="0.1260" k3="-0.0575"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3922" k2="0.1260" k3="-0.0575"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3842" k2="0.0713" k3="0.0195"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3842" k2="0.0713" k3="0.0195"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3857" k2="0.0737" k3="0.0193"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3857" k2="0.0737" k3="0.0193"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.3801" k2="0.0557" k3="0.0315"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3801" k2="0.0557" k3="0.0315"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="10" k1="-0.7061" k2="-0.0355" k3="0.2001"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.7061" k2="-0.0355" k3="0.2001"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.3253" k2="0.0580" k3="-0.0546"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.3253" k2="0.0580" k3="-0.0546"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="10" k1="-0.3470" k2="0.0840" k3="0.0080"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.3470" k2="0.0840" k3="0.0080"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.3482" k2="0.0836" k3="0.0097"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.3482" k2="0.0836" k3="0.0097"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.3432" k2="0.0681" k3="0.0205"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.3432" k2="0.0681" k3="0.0205"/>
++            <vignetting model="pa" focal="57" aperture="4" distance="10" k1="-1.1430" k2="1.0845" k3="-0.5956"/>
++            <vignetting model="pa" focal="57" aperture="4" distance="1000" k1="-1.1430" k2="1.0845" k3="-0.5956"/>
++            <vignetting model="pa" focal="57" aperture="5.6" distance="10" k1="-0.4146" k2="0.5478" k3="-0.5451"/>
++            <vignetting model="pa" focal="57" aperture="5.6" distance="1000" k1="-0.4146" k2="0.5478" k3="-0.5451"/>
++            <vignetting model="pa" focal="57" aperture="8" distance="10" k1="-0.3612" k2="0.2531" k3="-0.1443"/>
++            <vignetting model="pa" focal="57" aperture="8" distance="1000" k1="-0.3612" k2="0.2531" k3="-0.1443"/>
++            <vignetting model="pa" focal="57" aperture="11" distance="10" k1="-0.3193" k2="0.0897" k3="0.0028"/>
++            <vignetting model="pa" focal="57" aperture="11" distance="1000" k1="-0.3193" k2="0.0897" k3="0.0028"/>
++            <vignetting model="pa" focal="57" aperture="22" distance="10" k1="-0.3155" k2="0.0769" k3="0.0120"/>
++            <vignetting model="pa" focal="57" aperture="22" distance="1000" k1="-0.3155" k2="0.0769" k3="0.0120"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-1.4222" k2="1.7476" k3="-0.9716"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-1.4222" k2="1.7476" k3="-0.9716"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2987" k2="0.1781" k3="-0.3001"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2987" k2="0.1781" k3="-0.3001"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.3198" k2="0.2335" k3="-0.1340"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3198" k2="0.2335" k3="-0.1340"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2890" k2="0.1029" k3="-0.0126"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2890" k2="0.1029" k3="-0.0126"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2864" k2="0.0932" k3="-0.0051"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2864" k2="0.0932" k3="-0.0051"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 24-70mm f/4L IS USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.600</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 70D -->
++            <distortion model="poly3" focal="24" k1="-0.00617"/>
++            <distortion model="poly3" focal="35" k1="-0.00017"/>
++            <distortion model="poly3" focal="70" k1="0.00069"/>
++            <tca model="poly3" focal="24" vr="1.0002234" vb="1.0000123"/>
++            <tca model="poly3" focal="35" vr="1.0001076" vb="0.9999995"/>
++            <tca model="poly3" focal="70" vr="0.9998799" vb="1.0000011"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 10-18mm f/4.5-5.6 IS STM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 60D -->
++            <distortion model="ptlens" focal="10" a="0.00949" b="-0.05893" c="0.07285"/>
++            <distortion model="ptlens" focal="11" a="-0.00564" b="0.00351" c="0.00207"/>
++            <distortion model="ptlens" focal="12" a="-0.00356" b="-0.00048" c="0.0094"/>
++            <distortion model="ptlens" focal="15" a="0" b="0.00056" c="0"/>
++            <distortion model="ptlens" focal="18" a="0" b="0.00148" c="0"/>
++            <tca model="poly3" focal="10" br="0.0001349" vr="1.0002043" bb="-0.0000252" vb="1.0001449"/>
++            <tca model="poly3" focal="11" br="0.0001467" vr="1.0000867" bb="-0.0000398" vb="1.0001593"/>
++            <tca model="poly3" focal="12" br="0.0001790" vr="1.0000317" bb="-0.0000910" vb="1.0002721"/>
++            <tca model="poly3" focal="15" br="0.0001485" vr="0.9999637" bb="-0.0000704" vb="1.0003160"/>
++            <tca model="poly3" focal="18" br="0.0000770" vr="0.9999802" bb="-0.0000703" vb="1.0003253"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF-S 24mm f/2.8 STM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 400D -->
++            <distortion model="poly3" focal="24" k1="-0.00902"/>
++            <tca model="poly3" focal="24" vr="1.0001965" vb="1.0000158"/>
++            <!-- From upload 2c5bc3 #177, probably need checking against
++                 real-world images -->
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-1.2563" k2="0.9493" k3="-0.3628"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-1.2563" k2="0.9493" k3="-0.3628"/>
++            <vignetting model="pa" focal="24" aperture="3.2" distance="10" k1="-0.3986" k2="-0.5524" k3="0.3889"/>
++            <vignetting model="pa" focal="24" aperture="3.2" distance="1000" k1="-0.3986" k2="-0.5524" k3="0.3889"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.2676" k2="-0.5336" k3="0.2938"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.2676" k2="-0.5336" k3="0.2938"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.2463" k2="-0.2555" k3="0.0645"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2463" k2="-0.2555" k3="0.0645"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.3695" k2="0.2705" k3="-0.2835"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.3695" k2="0.2705" k3="-0.2835"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="10" k1="-0.4313" k2="0.4569" k3="-0.3796"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4313" k2="0.4569" k3="-0.3796"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.4931" k2="0.4974" k3="-0.3066"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.4931" k2="0.4974" k3="-0.3066"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.5693" k2="0.7255" k3="-0.4700"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.5693" k2="0.7255" k3="-0.4700"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.5337" k2="0.5936" k3="-0.3481"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.5337" k2="0.5936" k3="-0.3481"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon FDn 24mm 1:2.8</model>
++        <mount>Canon FD</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-A2 -->
++            <distortion model="ptlens" focal="24" a="0.00827" b="-0.02833" c="0.01235"/>
++            <tca model="poly3" focal="24" vr="1.0006247" vb="0.9998035"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon FDn 50mm 1:1.8</model>
++        <mount>Canon FD</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-A2 -->
++            <distortion model="poly3" focal="50" k1="-0.00209"/>
++            <tca model="poly3" focal="50" vr="1.0000463" vb="0.9999598"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 40mm f/2.8 STM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="40" a="0.01087" b="-0.02951" c="0.0162"/>
++            <tca model="poly3" focal="40" br="-0.0001009" vr="1.0003216" bb="0.0001426" vb="0.9997719"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="0.3" k1="-1.2236" k2="0.9039" k3="-0.3077"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-1.5776" k2="1.3808" k3="-0.5311"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="0.3" k1="-0.3194" k2="-0.1724" k3="0.1008"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.3977" k2="-0.2867" k3="0.1647"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="0.3" k1="-0.3672" k2="-0.0314" k3="0.0908"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.5092" k2="0.0993" k3="0.0131"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="0.3" k1="-0.3743" k2="-0.0158" k3="0.0813"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.4955" k2="0.0370" k3="0.0743"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="0.3" k1="-0.3722" k2="-0.0237" k3="0.0875"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.4923" k2="0.0279" k3="0.0801"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 14mm f/2.8L II USM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="ptlens" focal="14" a="0.00829" b="-0.02079" c="0.00394"/>
++            <tca model="poly3" focal="14" br="0.0000417" vr="1.0000539" bb="-0.0000840" vb="1.0003493"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="0.2" k1="-1.4013" k2="1.3991" k3="-0.7269"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="0.4" k1="-1.4276" k2="1.3662" k3="-0.6931"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1.2" k1="-1.4382" k2="1.3549" k3="-0.6829"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4487" k2="1.3824" k3="-0.7077"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.5387" k2="0.5173" k3="-0.5389"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.4843" k2="0.2804" k3="-0.3967"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.4918" k2="0.2896" k3="-0.4103"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.4716" k2="0.2106" k3="-0.3673"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.7426" k2="1.1921" k3="-0.8414"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.7458" k2="1.1906" k3="-0.8730"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.7510" k2="1.1970" k3="-0.8878"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.7624" k2="1.2514" k3="-0.9452"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.6949" k2="0.9570" k3="-0.5998"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.6851" k2="0.9018" k3="-0.5734"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.6864" k2="0.8886" k3="-0.5663"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.6931" k2="0.9103" k3="-0.5837"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.7066" k2="0.9599" k3="-0.5990"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.7064" k2="0.9276" k3="-0.5847"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.7072" k2="0.9190" k3="-0.5841"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.7084" k2="0.9197" k3="-0.5869"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 8-15mm f/4L Fisheye USM</model>
++        <model lang="de">Canon EF 8-15mm f/4L Fischauge USM</model>
++        <mount>Canon EF</mount>
++        <type>equisolid</type>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <!-- Measured with three overlapping images -->
++            <distortion model="ptlens" focal="8" a="0.3872" b="-0.71595" c="0.4026"/>
++            <distortion model="ptlens" focal="10" a="-0.0544" b="0.1525" c="-0.13653"/>
++            <distortion model="ptlens" focal="12" a="-0.03221" b="0.11073" c="-0.11648"/>
++            <distortion model="ptlens" focal="14" a="-0.00184" b="0.02215" c="-0.03559"/>
++            <distortion model="ptlens" focal="15" a="-0.03003" b="0.11503" c="-0.13108"/>
++            <tca model="poly3" focal="8" br="-0.0001287" vr="1.0002094" bb="-0.0001928" vb="1.0004344"/>
++            <tca model="poly3" focal="10" br="-0.0000833" vr="1.0002316" bb="-0.0001865" vb="1.0004452"/>
++            <tca model="poly3" focal="12" br="-0.0000267" vr="1.0001820" bb="-0.0001625" vb="1.0004520"/>
++            <tca model="poly3" focal="14" br="-0.0000639" vr="1.0001923" bb="-0.0001071" vb="1.0003814"/>
++            <tca model="poly3" focal="15" br="-0.0000591" vr="1.0001947" bb="0.0000426" vb="1.0002589"/>
++            <!--  Measured with 360 deg pano in Hugin  -->
++            <vignetting model="pa" focal="8.0" aperture="4.0" distance="1000" k1="-0.74201" k2="2.47399" k3="-15.16489"/>
++            <vignetting model="pa" focal="8.0" aperture="5.7" distance="1000" k1="-0.62824" k2="6.85124" k3="-27.13913"/>
++            <vignetting model="pa" focal="8.0" aperture="8.0" distance="1000" k1="-0.62509" k2="5.64784" k3="-19.3304"/>
++            <vignetting model="pa" focal="8.0" aperture="11.3" distance="1000" k1="-0.3516564" k2="2.082995" k3="-9.039026"/>
++            <vignetting model="pa" focal="8.0" aperture="16.0" distance="1000" k1="-0.5003750" k2="3.737831" k3="-13.520068"/>
++            <vignetting model="pa" focal="8.0" aperture="22.6" distance="1000" k1="-0.07041" k2="-0.69851" k3="-1.67072"/>
++            <vignetting model="pa" focal="10.0" aperture="4.0" distance="1000" k1="-0.72746" k2="-0.09942" k3="-0.70689"/>
++            <vignetting model="pa" focal="10.0" aperture="5.7" distance="1000" k1="-0.1931628" k2="0.7642126" k3="-3.0493423"/>
++            <vignetting model="pa" focal="10.0" aperture="8.0" distance="1000" k1="-0.2318170" k2="1.0827161" k3="-2.9844546"/>
++            <vignetting model="pa" focal="10.0" aperture="11.3" distance="1000" k1="-0.317637" k2="1.2442765" k3="-3.1631336"/>
++            <vignetting model="pa" focal="10.0" aperture="16.0" distance="1000" k1="-0.3118377" k2="1.2093017" k3="-2.761616"/>
++            <vignetting model="pa" focal="10.0" aperture="22.6" distance="1000" k1="-0.2610027" k2="1.1099748" k3="-3.1144714"/>
++            <vignetting model="pa" focal="12.0" aperture="4.0" distance="1000" k1="-1.006427" k2="1.186514" k3="-1.2502069"/>
++            <vignetting model="pa" focal="12.0" aperture="5.7" distance="1000" k1="-0.139657" k2="0.5266220" k3="-1.7394283"/>
++            <vignetting model="pa" focal="12.0" aperture="8.0" distance="1000" k1="-0.2139948" k2="0.7699972" k3="-1.3814173"/>
++            <vignetting model="pa" focal="12.0" aperture="11.3" distance="1000" k1="-0.1233946" k2="0.2285142" k3="-0.5966985"/>
++            <vignetting model="pa" focal="12.0" aperture="16.0" distance="1000" k1="-0.0739687" k2="-0.00158203" k3="-0.434599"/>
++            <vignetting model="pa" focal="12.0" aperture="22.6" distance="1000" k1="-0.1074894" k2="0.14376293" k3="-0.5684505"/>
++            <vignetting model="pa" focal="14.0" aperture="4.0" distance="1000" k1="-1.004753" k2="1.0054363" k3="-0.6751333"/>
++            <vignetting model="pa" focal="14.0" aperture="5.7" distance="1000" k1="0.09228" k2="-0.55818" k3="-0.0582"/>
++            <vignetting model="pa" focal="14.0" aperture="8.0" distance="1000" k1="-0.1652601" k2="0.4214602" k3="-0.6094013"/>
++            <vignetting model="pa" focal="14.0" aperture="11.3" distance="1000" k1="-0.0877947" k2="0.07377856" k3="-0.2428055"/>
++            <vignetting model="pa" focal="14.0" aperture="16.0" distance="1000" k1="-0.0071653" k2="-0.2124960" k3="-0.0181398"/>
++            <vignetting model="pa" focal="14.0" aperture="22.6" distance="1000" k1="-0.084905" k2="-0.03558803" k3="-0.1355752"/>
++            <vignetting model="pa" focal="15.0" aperture="4.0" distance="1000" k1="-0.7661651" k2="0.4307923" k3="-0.2024326"/>
++            <vignetting model="pa" focal="15.0" aperture="5.7" distance="1000" k1="0.100181" k2="-0.7786938" k3="0.33843680"/>
++            <vignetting model="pa" focal="15.0" aperture="8.0" distance="1000" k1="-0.1866631" k2="0.4198754" k3="-0.4761803"/>
++            <vignetting model="pa" focal="15.0" aperture="11.3" distance="1000" k1="-0.00110386" k2="-0.250853" k3="0.09027765"/>
++            <vignetting model="pa" focal="15.0" aperture="16.0" distance="1000" k1="-0.0019172" k2="-0.3189716" k3="0.1790992"/>
++            <vignetting model="pa" focal="15.0" aperture="22.6" distance="1000" k1="0.00896031" k2="-0.2219167" k3="0.0575111"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 50mm f/1.8 STM</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="50" a="0.0061844" b="-0.0313122" c="0.0314815"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 50mm f/2.5 Compact Macro</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="50" a="-0.001" b="0.005" c="-0.005"/>
++            <tca model="poly3" focal="50" br="-0.0000425" vr="1.0001506" bb="0.0000359" vb="0.9999281"/>
++            <vignetting model="pa" focal="50" aperture="2.5" distance="0.23" k1="-0.6982" k2="0.0837" k3="-0.0305"/>
++            <vignetting model="pa" focal="50" aperture="2.5" distance="0.46" k1="-1.2066" k2="0.8257" k3="-0.3049"/>
++            <vignetting model="pa" focal="50" aperture="2.5" distance="1.37" k1="-1.3252" k2="0.9063" k3="-0.3164"/>
++            <vignetting model="pa" focal="50" aperture="2.5" distance="1000" k1="-1.3711" k2="0.9375" k3="-0.3296"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="0.23" k1="-0.2222" k2="-0.0524" k3="-0.2153"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="0.46" k1="-0.2437" k2="-0.4646" k3="0.1905"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1.37" k1="-0.2738" k2="-0.6700" k3="0.3646"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3168" k2="-0.6931" k3="0.3845"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="0.23" k1="-0.3879" k2="0.4443" k3="-0.4050"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="0.46" k1="-0.3559" k2="0.0898" k3="-0.0892"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="1.37" k1="-0.3718" k2="0.0574" k3="-0.1400"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.3596" k2="-0.0458" k3="-0.1103"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="0.23" k1="-0.3150" k2="0.1166" k3="-0.0594"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="0.46" k1="-0.3419" k2="0.0294" k3="-0.0141"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="1.37" k1="-0.3826" k2="0.0693" k3="-0.0904"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.4127" k2="0.1258" k3="-0.1755"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="0.23" k1="-0.2983" k2="0.0265" k3="0.0234"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="0.46" k1="-0.3484" k2="0.0165" k3="0.0069"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1.37" k1="-0.3951" k2="0.0714" k3="-0.0690"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.4207" k2="0.1087" k3="-0.1311"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon FDn 200mm 1:4</model>
++        <mount>Canon FD</mount>
++        <focal value="200"/>
++        <aperture min="4" max="32"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony 6000 (ILCE-6000) -->
++            <distortion model="ptlens" focal="200" a="-0.002" b="0.013" c="-0.015"/>
++            <tca model="poly3" focal="200" br="0.0000246" vr="0.9998495" bb="0.0000047" vb="0.9999254"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.7047" k2="0.7085" k3="-0.3430"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.7047" k2="0.7085" k3="-0.3430"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0931" k2="0.0384" k3="-0.0328"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0931" k2="0.0384" k3="-0.0328"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0981" k2="0.0434" k3="-0.0273"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0981" k2="0.0434" k3="-0.0273"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1057" k2="0.0641" k3="-0.0392"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1057" k2="0.0641" k3="-0.0392"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.1133" k2="0.0913" k3="-0.0606"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.1133" k2="0.0913" k3="-0.0606"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.1152" k2="0.0984" k3="-0.0667"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1152" k2="0.0984" k3="-0.0667"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>Canon EF 24mm f/2.8 IS USM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 100D -->
++            <distortion model="poly3" focal="24" k1="-0.00591"/>
++            <tca model="poly3" focal="24" vr="1.0004660" vb="0.9998842"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Canon</maker>
++        <model>EF-S18-55mm f/4-5.6 IS STM</model>
++        <model lang="en">Canon EF-S 18-55mm f/4-5.6 IS STM</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 200D (REBEL SL2, Kiss X9) -->
++            <distortion model="ptlens" focal="18" a="0.02902" b="-0.09036" c="0.05046"/>
++            <distortion model="ptlens" focal="21" a="0.01029" b="-0.02863" c="0.00527"/>
++            <distortion model="ptlens" focal="24" a="0.0077" b="-0.02034" c="0.01097"/>
++            <distortion model="ptlens" focal="35" a="0.00212" b="0.0022" c="0.00277"/>
++            <distortion model="ptlens" focal="43" a="0.00365" b="0.00127" c="0.00006"/>
++            <distortion model="ptlens" focal="55" a="0.00202" b="0.00333" c="0.00486"/>
++            <tca model="poly3" focal="18" vr="1.0004571" vb="1.0000234"/>
++            <tca model="poly3" focal="21" vr="1.0004275" vb="1.0000163"/>
++            <tca model="poly3" focal="24" vr="1.0004164" vb="0.9999815"/>
++            <tca model="poly3" focal="35" vr="1.0002990" vb="0.9999459"/>
++            <tca model="poly3" focal="43" vr="1.0000810" vb="0.9999898"/>
++            <tca model="poly3" focal="55" vr="0.9999927" vb="1.0000311"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-contax.xml b/data/db/slr-contax.xml
+--- a/data/db/slr-contax.xml	2013-10-11 23:54:00.000000000 +0200
++++ b/data/db/slr-contax.xml	1970-01-01 01:00:00.000000000 +0100
+@@ -1,37 +0,0 @@
+-<lensdatabase>
+-
+-    <mount>
+-        <name>Contax/Yashica</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+-        <compat>Generic</compat>
+-    </mount>
+-
+-    <camera>
+-        <maker>Contax</maker>
+-        <model>35mm film: full frame</model>
+-        <mount>Contax/Yashica</mount>
+-        <cropfactor>1.0</cropfactor>
+-    </camera>
+-
+-    <lens>
+-        <maker>Contax</maker>
+-        <model>Zeiss 21mm f/2.8 Distagon</model>
+-        <mount>Contax/Yashica</mount>
+-        <cropfactor>1.0</cropfactor>
+-        <calibration>
+-            <distortion model="ptlens" focal="21" a="0.021925" b="-0.043445" c="0" />
+-        </calibration>
+-    </lens>
+-
+-    <lens>
+-        <maker>Contax</maker>
+-        <model>Zeiss 28mm f/2.8 Distagon</model>
+-        <mount>Contax/Yashica</mount>
+-        <cropfactor>1.0</cropfactor>
+-        <calibration>
+-            <distortion model="ptlens" focal="28" a="0.007448" b="-0.019182" c="0" />
+-        </calibration>
+-    </lens>
+-
+-</lensdatabase>
+diff -Nurpd a/data/db/slr-hasselblad.xml b/data/db/slr-hasselblad.xml
+--- a/data/db/slr-hasselblad.xml	2010-02-18 20:34:13.000000000 +0100
++++ b/data/db/slr-hasselblad.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,31 +1,22 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Hasselblad 500</name>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+-        <name>HasselbladH3D</name>
+-        <compat>HasselbladHSystem</compat>
++        <name>Hasselblad H</name>
++        <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+         <maker>Hasselblad</maker>
+-        <maker lang="en">Hasselblad</maker>
+         <model>Hasselblad 500 mech.</model>
+-        <model lang="en">Hasselblad 500 mech.</model>
+         <mount>Hasselblad 500</mount>
+         <cropfactor>0.66</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Hasselblad</maker>
+-        <maker lang="en">Hasselblad</maker>
+         <model>Hasselblad H3D</model>
+-        <model lang="en">Hasselblad H3D</model>
+-        <mount>HasselbladHSystem</mount>
++        <mount>Hasselblad H</mount>
+         <cropfactor>0.72</cropfactor>
+     </camera>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-konica-minolta.xml b/data/db/slr-konica-minolta.xml
+--- a/data/db/slr-konica-minolta.xml	2013-10-11 23:54:01.000000000 +0200
++++ b/data/db/slr-konica-minolta.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,147 +1,347 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Minolta AF</name>
++        <compat>Sony Alpha</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+-        <compat>Sony Alpha</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Minolta MC</name>
++        <compat>Minolta MD</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+-	<compat>Generic</compat>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Minolta MD</name>
++        <compat>Minolta MC</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
+-        <model>MAXXUM 5D</model>
+-        <model lang="en">Maxxum 5D</model>
++        <maker>Konica Minolta</maker>
++        <model>Maxxum 5D</model>
+         <mount>Minolta AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
+-        <model>DYNAX 5D</model>
+-        <model lang="en">Dynax 5D</model>
++        <maker>Konica Minolta</maker>
++        <model>Dynax 5D</model>
+         <mount>Minolta AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
+-        <model>MAXXUM 7D</model>
+-        <model lang="en">Maxxum 7D</model>
++        <maker>Konica Minolta</maker>
++        <model>Maxxum 7D</model>
+         <mount>Minolta AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>KONICA MINOLTA</maker>
+-        <maker lang="en">Konica Minolta</maker>
+-        <model>DYNAX 7D</model>
+-        <model lang="en">Dynax 7D</model>
++        <maker>Konica Minolta</maker>
++        <model>Dynax 7D</model>
+         <mount>Minolta AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>KM 24-105mm 3.5-4.5 AF D</model>
++        <model>KM 24-105mm f/3.5-4.5 AF D</model>
+         <mount>Minolta AF</mount>
++        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.004504" b="-0.01756" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="-0.001188" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.001378" c="0" />
+-            <distortion model="ptlens" focal="40" a="0" b="0.003241" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.003895" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.005226" c="0" />
+-            <distortion model="ptlens" focal="80" a="0" b="0.005343" c="0" />
+-            <distortion model="ptlens" focal="90" a="0" b="0.005201" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.005796" c="0" />
++            <distortion model="ptlens" focal="24" a="0.004504" b="-0.01756" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="-0.001188" c="0"/>
++            <distortion model="ptlens" focal="30" a="0" b="0.001378" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.003241" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.003895" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.005226" c="0"/>
++            <distortion model="ptlens" focal="80" a="0" b="0.005343" c="0"/>
++            <distortion model="ptlens" focal="90" a="0" b="0.005201" c="0"/>
++            <distortion model="ptlens" focal="105" a="0" b="0.005796" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>KM 28-100mm 3.5-5.6 AF D</model>
++        <model>KM 28-100mm f/3.5-5.6 AF D</model>
+         <mount>Minolta AF</mount>
++        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.005155" b="-0.020044" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.005248" b="-0.012857" c="0" />
+-            <distortion model="ptlens" focal="40" a="0" b="-0.000766" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.001775" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.002973" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.002931" c="0" />
++            <distortion model="ptlens" focal="28" a="0.005155" b="-0.020044" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.005248" b="-0.012857" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="-0.000766" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.001775" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.002973" c="0"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.002931" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>KM 80-200mm 2.8</model>
++        <model>KM 80-200mm f/2.8</model>
+         <mount>Minolta AF</mount>
++        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="0" b="-0.004374" c="0" />
+-            <distortion model="ptlens" focal="90" a="0" b="-0.002544" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="-0.000886" c="0" />
+-            <distortion model="ptlens" focal="110" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.001336" c="0" />
+-            <distortion model="ptlens" focal="150" a="0" b="0.002115" c="0" />
+-            <distortion model="ptlens" focal="180" a="0" b="0.00279" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.001971" c="0" />
++            <distortion model="poly3" focal="80" k1="-0.004374"/>
++            <distortion model="poly3" focal="90" k1="-0.002544"/>
++            <distortion model="poly3" focal="100" k1="-0.000886"/>
++            <distortion model="poly3" focal="110" k1="0"/>
++            <distortion model="poly3" focal="135" k1="0.001336"/>
++            <distortion model="poly3" focal="150" k1="0.002115"/>
++            <distortion model="poly3" focal="180" k1="0.00279"/>
++            <distortion model="poly3" focal="200" k1="0.001971"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Konica Minolta</maker>
+-        <model>KM 20mm 2.8</model>
++        <model>KM 20mm f/2.8</model>
+         <mount>Minolta AF</mount>
++        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="20" a="0.005548" b="-0.022552" c="0" />
++            <distortion model="ptlens" focal="20" a="0.005548" b="-0.022552" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Minolta</maker>
+         <model>Minolta MC Rokkor-PG 50mm 1:1.4</model>
+-	    <focal value="50" />
+-	    <aperture min="1.4" max="16"/>
+         <mount>Minolta MC</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal value="50"/>
++        <aperture min="1.4" max="16"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="-0.000767655" b="-0.000599186" c="-0.00129564" />
+-            <tca model="poly3" focal="50" br="-0.0000228" vr="1.0001644" bb="0.0000253" vb="0.9999662" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="0.5" k1="-0.3237" k2="-0.0259" k3="0.0674" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5441" k2="0.3605" k3="-0.1449" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="5" k1="-0.6492" k2="0.5567" k3="-0.2587" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6618" k2="0.5776" k3="-0.2716" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="0.5" k1="-0.0745" k2="0.0154" k3="-0.0235" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0841" k2="0.0065" k3="-0.0149" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="5" k1="-0.0960" k2="0.0202" k3="-0.0271" />
+-            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0951" k2="0.0091" k3="-0.0168" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="0.5" k1="-0.0815" k2="0.0216" k3="-0.0162" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0896" k2="0.0113" k3="-0.0080" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="5" k1="-0.1024" k2="0.0179" k3="-0.0097" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1016" k2="0.0095" k3="-0.0039" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="0.5" k1="-0.0775" k2="0.0023" k3="0.0004" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0974" k2="0.0184" k3="-0.0079" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="5" k1="-0.1077" k2="0.0272" k3="-0.0133" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1162" k2="0.0261" k3="-0.0105" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="0.5" k1="-0.1133" k2="0.0437" k3="-0.0170" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="1" k1="-0.1576" k2="0.0858" k3="-0.0295" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.1854" k2="0.1322" k3="-0.0545" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2034" k2="0.1667" k3="-0.0748" />
++            <distortion model="ptlens" focal="50" a="-0.000767655" b="-0.000599186" c="-0.00129564"/>
++            <tca model="poly3" focal="50" br="-0.0000228" vr="1.0001644" bb="0.0000253" vb="0.9999662"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="0.5" k1="-0.3237" k2="-0.0259" k3="0.0674"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5441" k2="0.3605" k3="-0.1449"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="5" k1="-0.6492" k2="0.5567" k3="-0.2587"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6618" k2="0.5776" k3="-0.2716"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.5" k1="-0.0745" k2="0.0154" k3="-0.0235"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0841" k2="0.0065" k3="-0.0149"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="5" k1="-0.0960" k2="0.0202" k3="-0.0271"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0951" k2="0.0091" k3="-0.0168"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.5" k1="-0.0815" k2="0.0216" k3="-0.0162"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0896" k2="0.0113" k3="-0.0080"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="5" k1="-0.1024" k2="0.0179" k3="-0.0097"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1016" k2="0.0095" k3="-0.0039"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.5" k1="-0.0775" k2="0.0023" k3="0.0004"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0974" k2="0.0184" k3="-0.0079"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="5" k1="-0.1077" k2="0.0272" k3="-0.0133"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1162" k2="0.0261" k3="-0.0105"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.5" k1="-0.1133" k2="0.0437" k3="-0.0170"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1" k1="-0.1576" k2="0.0858" k3="-0.0295"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.1854" k2="0.1322" k3="-0.0545"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2034" k2="0.1667" k3="-0.0748"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Minolta</maker>
++        <model>Minolta AF 35-105mm f/3.5-4.5</model>
++        <mount>Minolta AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A77V -->
++            <distortion model="poly3" focal="35" k1="-0.00628"/>
++            <distortion model="poly3" focal="45" k1="0"/>
++            <distortion model="poly3" focal="70" k1="0.00544"/>
++            <distortion model="poly3" focal="105" k1="0.00594"/>
++            <tca model="poly3" focal="35" br="0.0000492" vr="1.0001029" bb="0.0000029" vb="1.0002668"/>
++            <tca model="poly3" focal="45" br="0.0000233" vr="1.0000776" bb="-0.0000306" vb="1.0003059"/>
++            <tca model="poly3" focal="50" br="0.0000111" vr="1.0000393" bb="-0.0000469" vb="1.0002413"/>
++            <tca model="poly3" focal="60" br="0.0000180" vr="0.9999697" bb="-0.0000579" vb="1.0001878"/>
++            <tca model="poly3" focal="85" br="0.0000022" vr="0.9999320" bb="-0.0000385" vb="1.0001084"/>
++            <tca model="poly3" focal="105" br="0.0000029" vr="0.9998763" bb="-0.0000435" vb="0.9999303"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5388" k2="0.1812" k3="-0.0655"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5388" k2="0.1812" k3="-0.0655"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.1688" k2="-0.0521" k3="-0.0198"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.1688" k2="-0.0521" k3="-0.0198"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.2317" k2="0.1238" k3="-0.0550"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.2317" k2="0.1238" k3="-0.0550"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2501" k2="0.1054" k3="-0.0423"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2501" k2="0.1054" k3="-0.0423"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="10" k1="-0.5501" k2="0.3120" k3="-0.1241"/>
++            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.5501" k2="0.3120" k3="-0.1241"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.1965" k2="0.1132" k3="-0.0998"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.1965" k2="0.1132" k3="-0.0998"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="10" k1="-0.2095" k2="0.1293" k3="-0.0603"/>
++            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.2095" k2="0.1293" k3="-0.0603"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.2248" k2="0.1048" k3="-0.0414"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.2248" k2="0.1048" k3="-0.0414"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.5141" k2="0.3251" k3="-0.1252"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.5141" k2="0.3251" k3="-0.1252"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1891" k2="0.1471" k3="-0.1083"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1891" k2="0.1471" k3="-0.1083"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1909" k2="0.1319" k3="-0.0626"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1909" k2="0.1319" k3="-0.0626"/>
++            <vignetting model="pa" focal="60" aperture="25" distance="10" k1="-0.1991" k2="0.1077" k3="-0.0447"/>
++            <vignetting model="pa" focal="60" aperture="25" distance="1000" k1="-0.1991" k2="0.1077" k3="-0.0447"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.4767" k2="0.3417" k3="-0.1341"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.4767" k2="0.3417" k3="-0.1341"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1669" k2="0.1381" k3="-0.0915"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1669" k2="0.1381" k3="-0.0915"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1680" k2="0.1278" k3="-0.0599"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1680" k2="0.1278" k3="-0.0599"/>
++            <vignetting model="pa" focal="70" aperture="25" distance="10" k1="-0.1810" k2="0.1106" k3="-0.0483"/>
++            <vignetting model="pa" focal="70" aperture="25" distance="1000" k1="-0.1810" k2="0.1106" k3="-0.0483"/>
++            <vignetting model="pa" focal="90" aperture="4.5" distance="10" k1="-0.4445" k2="0.3378" k3="-0.1377"/>
++            <vignetting model="pa" focal="90" aperture="4.5" distance="1000" k1="-0.4445" k2="0.3378" k3="-0.1377"/>
++            <vignetting model="pa" focal="90" aperture="6.3" distance="10" k1="-0.1519" k2="0.1158" k3="-0.0527"/>
++            <vignetting model="pa" focal="90" aperture="6.3" distance="1000" k1="-0.1519" k2="0.1158" k3="-0.0527"/>
++            <vignetting model="pa" focal="90" aperture="9" distance="10" k1="-0.1591" k2="0.1399" k3="-0.0696"/>
++            <vignetting model="pa" focal="90" aperture="9" distance="1000" k1="-0.1591" k2="0.1399" k3="-0.0696"/>
++            <vignetting model="pa" focal="90" aperture="25" distance="10" k1="-0.1754" k2="0.1299" k3="-0.0622"/>
++            <vignetting model="pa" focal="90" aperture="25" distance="1000" k1="-0.1754" k2="0.1299" k3="-0.0622"/>
++            <vignetting model="pa" focal="105" aperture="4.5" distance="10" k1="-0.4100" k2="0.3089" k3="-0.1260"/>
++            <vignetting model="pa" focal="105" aperture="4.5" distance="1000" k1="-0.4100" k2="0.3089" k3="-0.1260"/>
++            <vignetting model="pa" focal="105" aperture="6.3" distance="10" k1="-0.1432" k2="0.1226" k3="-0.0598"/>
++            <vignetting model="pa" focal="105" aperture="6.3" distance="1000" k1="-0.1432" k2="0.1226" k3="-0.0598"/>
++            <vignetting model="pa" focal="105" aperture="9" distance="10" k1="-0.1453" k2="0.1244" k3="-0.0586"/>
++            <vignetting model="pa" focal="105" aperture="9" distance="1000" k1="-0.1453" k2="0.1244" k3="-0.0586"/>
++            <vignetting model="pa" focal="105" aperture="29" distance="10" k1="-0.1609" k2="0.1155" k3="-0.0555"/>
++            <vignetting model="pa" focal="105" aperture="29" distance="1000" k1="-0.1609" k2="0.1155" k3="-0.0555"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Minolta</maker>
++        <model>Minolta MD 35mm 1/2.8</model>
++        <mount>Minolta MD</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <distortion model="ptlens" focal="35" a="0.01424" b="-0.05599" c="0.06278"/>
++            <tca model="poly3" focal="35" vr="1.0003987" vb="0.9998001"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.9017" k2="0.7077" k3="-0.2871"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.9017" k2="0.7077" k3="-0.2871"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3212" k2="0.1698" k3="-0.1072"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3212" k2="0.1698" k3="-0.1072"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.3244" k2="0.1541" k3="-0.0597"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3244" k2="0.1541" k3="-0.0597"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3333" k2="0.1705" k3="-0.0689"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3333" k2="0.1705" k3="-0.0689"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3400" k2="0.1814" k3="-0.0735"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3400" k2="0.1814" k3="-0.0735"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3469" k2="0.1942" k3="-0.0806"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3469" k2="0.1942" k3="-0.0806"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.3515" k2="0.2028" k3="-0.0851"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3515" k2="0.2028" k3="-0.0851"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Minolta</maker>
++        <model>Minolta MD Rokkor 50mm 1:1.4</model>
++        <mount>Minolta MD</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="poly3" focal="50" k1="-0.00294"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Minolta</maker>
++        <model>Minolta AF 135mm f/2.8</model>
++        <mount>Minolta AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A850 -->
++            <distortion model="poly3" focal="135" k1="0.00136"/>
++            <tca model="poly3" focal="135" vr="0.9998722" vb="0.9999076"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.9880" k2="0.4795" k3="-0.0632"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.9880" k2="0.4795" k3="-0.0632"/>
++            <vignetting model="pa" focal="135" aperture="3.2" distance="10" k1="-0.4583" k2="-0.5567" k3="0.4936"/>
++            <vignetting model="pa" focal="135" aperture="3.2" distance="1000" k1="-0.4583" k2="-0.5567" k3="0.4936"/>
++            <vignetting model="pa" focal="135" aperture="3.5" distance="10" k1="0.1686" k2="-1.4470" k3="0.8710"/>
++            <vignetting model="pa" focal="135" aperture="3.5" distance="1000" k1="0.1686" k2="-1.4470" k3="0.8710"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.2360" k2="-0.9887" k3="0.4454"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.2360" k2="-0.9887" k3="0.4454"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.0214" k2="0.0833" k3="-0.1933"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.0214" k2="0.0833" k3="-0.1933"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="10" k1="-0.0433" k2="0.1037" k3="-0.0855"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.0433" k2="0.1037" k3="-0.0855"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1249" k2="0.1968" k3="-0.1170"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1249" k2="0.1968" k3="-0.1170"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1124" k2="0.1442" k3="-0.0612"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1124" k2="0.1442" k3="-0.0612"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1185" k2="0.1469" k3="-0.0561"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1185" k2="0.1469" k3="-0.0561"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Minolta</maker>
++        <model>Minolta AF 100-300mm f/4.5-5.6 APO (D)</model>
++        <mount>Minolta AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A850 -->
++            <distortion model="ptlens" focal="100" a="0.01066" b="-0.02087" c="0.01828"/>
++            <distortion model="ptlens" focal="135" a="0.00666" b="-0.00983" c="0.01796"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.01068" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00996" c="0"/>
++            <tca model="poly3" focal="100" vr="1.0000021" vb="1.0000132"/>
++            <tca model="poly3" focal="135" vr="1.0000405" vb="0.9998866"/>
++            <tca model="poly3" focal="200" vr="1.0000447" vb="0.9996730"/>
++            <tca model="poly3" focal="300" vr="0.9998567" vb="0.9999192"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="10" k1="-1.1528" k2="0.7718" k3="-0.3134"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-1.1528" k2="0.7718" k3="-0.3134"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.7702" k2="0.0499" k3="0.0543"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.7702" k2="0.0499" k3="0.0543"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.3950" k2="-0.4226" k3="0.2211"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.3950" k2="-0.4226" k3="0.2211"/>
++            <vignetting model="pa" focal="100" aperture="7.1" distance="10" k1="-0.2099" k2="-0.3191" k3="0.0796"/>
++            <vignetting model="pa" focal="100" aperture="7.1" distance="1000" k1="-0.2099" k2="-0.3191" k3="0.0796"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="10" k1="-0.3329" k2="0.2104" k3="-0.2119"/>
++            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.3329" k2="0.2104" k3="-0.2119"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.3499" k2="0.2146" k3="-0.1399"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.3499" k2="0.2146" k3="-0.1399"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.3151" k2="0.0864" k3="-0.0221"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.3151" k2="0.0864" k3="-0.0221"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-1.0189" k2="0.7961" k3="-0.3251"/>
++            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-1.0189" k2="0.7961" k3="-0.3251"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.5500" k2="-0.0600" k3="0.1284"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.5500" k2="-0.0600" k3="0.1284"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="10" k1="-0.1956" k2="-0.2818" k3="0.1253"/>
++            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.1956" k2="-0.2818" k3="0.1253"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.2728" k2="0.1508" k3="-0.1133"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2728" k2="0.1508" k3="-0.1133"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.2609" k2="0.0731" k3="-0.0145"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2609" k2="0.0731" k3="-0.0145"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.2479" k2="0.0543" k3="-0.0043"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.2479" k2="0.0543" k3="-0.0043"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.8628" k2="0.8759" k3="-0.4095"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.8628" k2="0.8759" k3="-0.4095"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.2360" k2="-0.2759" k3="0.2161"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.2360" k2="-0.2759" k3="0.2161"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="-0.1425" k2="-0.1613" k3="0.0715"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.1425" k2="-0.1613" k3="0.0715"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.2215" k2="0.1493" k3="-0.0850"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.2215" k2="0.1493" k3="-0.0850"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.2241" k2="0.1547" k3="-0.0875"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.2241" k2="0.1547" k3="-0.0875"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.2079" k2="0.1061" k3="-0.0479"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.2079" k2="0.1061" k3="-0.0479"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.1856" k2="0.0546" k3="-0.0125"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.1856" k2="0.0546" k3="-0.0125"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-1.2143" k2="1.2116" k3="-0.5216"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.2143" k2="1.2116" k3="-0.5216"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-0.8218" k2="0.4737" k3="-0.1237"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-0.8218" k2="0.4737" k3="-0.1237"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.4422" k2="-0.1278" k3="0.1810"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.4422" k2="-0.1278" k3="0.1810"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="0.0795" k2="-0.7179" k3="0.3952"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="0.0795" k2="-0.7179" k3="0.3952"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.1463" k2="0.0925" k3="-0.1780"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.1463" k2="0.0925" k3="-0.1780"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="10" k1="-0.1463" k2="0.0717" k3="-0.0336"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.1463" k2="0.0717" k3="-0.0336"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-leica.xml b/data/db/slr-leica.xml
+--- a/data/db/slr-leica.xml	2013-02-02 18:11:04.000000000 +0100
++++ b/data/db/slr-leica.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,12 +1,40 @@
+ <lensdatabase>
+-
++    <mount>
++        <name>Leica R</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Leica S</name>
++        <compat>Generic</compat>
++    </mount>
+     <camera>
+-        <maker>LEICA</maker>
+-        <maker lang="en">Leica</maker>
+-        <model>DIGILUX 3</model>
+-        <model lang="en">Digilux 3</model>
++        <maker>Leica</maker>
++        <model>Digilux 3</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
++    <lens>
++        <maker>Leica</maker>
++        <model>Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS</model>
++        <mount>4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus OMD E-M1 -->
++            <distortion model="ptlens" focal="14" a="0.01426" b="-0.01566" c="-0.05658"/>
++            <distortion model="ptlens" focal="18" a="0.00643" b="-0.00588" c="-0.02274"/>
++            <distortion model="ptlens" focal="51" a="0" b="0.00491" c="0"/>
++            <distortion model="ptlens" focal="94" a="0" b="0.00084" c="0"/>
++            <distortion model="ptlens" focal="150" a="0" b="-0.00129" c="0"/>
++            <tca model="poly3" focal="14" vr="1.0002619" vb="1.0001837"/>
++            <tca model="poly3" focal="18" vr="1.0001973" vb="1.0001705"/>
++            <tca model="poly3" focal="51" vr="1.0001" vb="1"/>
++            <tca model="poly3" focal="94" vr="0.9996" vb="1"/>
++            <tca model="poly3" focal="150" vr="0.9991" vb="0.9999"/>
++        </calibration>
++    </lens>
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-nikon.xml b/data/db/slr-nikon.xml
+--- a/data/db/slr-nikon.xml	2013-10-12 10:15:59.000000000 +0200
++++ b/data/db/slr-nikon.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,1304 +1,2450 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Nikon F</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Nikon F AI</compat>
+         <compat>Nikon F AI-S</compat>
+         <compat>Nikon F AF</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Nikon F AI</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Nikon F</compat>
+         <compat>Nikon F AI-S</compat>
+         <compat>Nikon F AF</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Nikon F AI-S</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Nikon F</compat>
+         <compat>Nikon F AI</compat>
+         <compat>Nikon F AF</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Nikon F AF</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Nikon F</compat>
+         <compat>Nikon F AI</compat>
+         <compat>Nikon F AI-S</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D40</model>
++        <model>Nikon D40</model>
+         <model lang="en">D40</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D40X</model>
++        <model>Nikon D40X</model>
+         <model lang="en">D40X</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D50</model>
++        <model>Nikon D50</model>
+         <model lang="en">D50</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D60</model>
++        <model>Nikon D60</model>
+         <model lang="en">D60</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D70</model>
++        <model>Nikon D70</model>
+         <model lang="en">D70</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D70s</model>
++        <model>Nikon D70s</model>
+         <model lang="en">D70s</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D80</model>
++        <model>Nikon D80</model>
+         <model lang="en">D80</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D90</model>
++        <model>Nikon D90</model>
+         <model lang="en">D90</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D100</model>
++        <model>Nikon D100</model>
+         <model lang="en">D100</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D200</model>
++        <model>Nikon D200</model>
+         <model lang="en">D200</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D300</model>
++        <model>Nikon D300</model>
+         <model lang="en">D300</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D300S</model>
++        <model>Nikon D300S</model>
+         <model lang="en">D300S</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D600</model>
++        <model>Nikon D500</model>
++        <model lang="en">D500</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D600</model>
+         <model lang="en">D600</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D700</model>
++        <model>Nikon D610</model>
++        <model lang="en">D610</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D700</model>
+         <model lang="en">D700</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D800</model>
++        <model>Nikon D750</model>
++        <model lang="en">D750</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D800</model>
+         <model lang="en">D800</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D800E</model>
++        <model>Nikon D800E</model>
+         <model lang="en">D800E</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D3000</model>
++        <model>Nikon D810</model>
++        <model lang="en">D810</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D3000</model>
+         <model lang="en">D3000</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D3100</model>
++        <model>Nikon D3100</model>
+         <model lang="en">D3100</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D3200</model>
++        <model>Nikon D3200</model>
+         <model lang="en">D3200</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D5000</model>
++        <model>Nikon D3300</model>
++        <model lang="en">D3300</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D3400</model>
++        <model lang="en">D3400</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D5000</model>
+         <model lang="en">D5000</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D5100</model>
++        <model>Nikon D5100</model>
+         <model lang="en">D5100</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D5200</model>
++        <model>Nikon D5200</model>
+         <model lang="en">D5200</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D7000</model>
++        <model>Nikon D5300</model>
++        <model lang="en">D5300</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D5500</model>
++        <model lang="en">D5500</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D7000</model>
+         <model lang="en">D7000</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D7100</model>
++        <model>Nikon D7100</model>
+         <model lang="en">D7100</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D1</model>
++        <model>Nikon D7200</model>
++        <model lang="en">D7200</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D1</model>
+         <model lang="en">D1</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D1H</model>
++        <model>Nikon D1H</model>
+         <model lang="en">D1H</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D1X</model>
++        <model>Nikon D1X</model>
+         <model lang="en">D1X</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D2H</model>
++        <model>Nikon D2H</model>
+         <model lang="en">D2H</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D2Hs</model>
++        <model>Nikon D2Hs</model>
+         <model lang="en">D2Hs</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D2X</model>
++        <model>Nikon D2X</model>
+         <model lang="en">D2X</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D2Xs</model>
++        <model>Nikon D2Xs</model>
+         <model lang="en">D2Xs</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D3</model>
++        <model>Nikon D3</model>
+         <model lang="en">D3</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D3X</model>
++        <model>Nikon D3X</model>
+         <model lang="en">D3X</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D3S</model>
++        <model>Nikon D3S</model>
+         <model lang="en">D3S</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>NIKON CORPORATION</maker>
++        <maker>Nikon Corporation</maker>
+         <maker lang="en">Nikon</maker>
+-        <model>NIKON D4</model>
++        <model>Nikon D4</model>
+         <model lang="en">D4</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D4s</model>
++        <model lang="en">D4s</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon D5</model>
++        <model lang="en">D5</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.003</cropfactor>
++    </camera>
++    <camera>
++        <maker>Nikon Corporation</maker>
++        <maker lang="en">Nikon</maker>
++        <model>Nikon Df</model>
++        <model lang="en">Df</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.001</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
+         <model>FinePixS1Pro</model>
+         <model lang="en">FinePix S1 Pro</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePixS2Pro</model>
+         <model lang="en">FinePix S2 Pro</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S3Pro</model>
+         <model lang="en">FinePix S3 Pro</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>FUJIFILM</maker>
+-        <maker lang="en">Fujifilm</maker>
++        <maker>Fujifilm</maker>
+         <model>FinePix S5Pro</model>
+         <model lang="en">FinePix S5 Pro</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.5</cropfactor>
++        <cropfactor>1.560</cropfactor>
++    </camera>
++    <camera>
++        <maker>Fujifilm</maker>
++        <model>IS Pro</model>
++        <model lang="en">FinePix IS Pro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.560</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Kodak</maker>
+         <model>DCS Pro SLR/n</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Kodak</maker>
+         <model>DCS Pro 14nx</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Kodak</maker>
+         <model>DCS Pro 14N</model>
+         <variant>DCS-14n</variant>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Nikon</maker>
+         <model>35mm film: full frame</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 12-24mm f/4G ED-IF AF-S DX</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED</model>
++        <model lang="en">Nikkor AF-S 12-24mm f/4G DX IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="12" a="-0.016006" b="0.024041" c="0" />
+-            <distortion model="ptlens" focal="13" a="-0.017096" b="0.030498" c="0" />
+-            <distortion model="ptlens" focal="14" a="-0.01773" b="0.031719" c="0" />
+-            <distortion model="ptlens" focal="15" a="-0.013174" b="0.027255" c="0" />
+-            <distortion model="ptlens" focal="16" a="-0.009629" b="0.021705" c="0" />
+-            <distortion model="ptlens" focal="17" a="-0.006736" b="0.016621" c="0" />
+-            <distortion model="ptlens" focal="18" a="-0.007763" b="0.019343" c="0" />
+-            <distortion model="ptlens" focal="19" a="-0.005218" b="0.014696" c="0" />
+-            <distortion model="ptlens" focal="20" a="-0.005775" b="0.015956" c="0" />
+-            <distortion model="ptlens" focal="22" a="-0.005197" b="0.015329" c="0" />
+-            <distortion model="ptlens" focal="24" a="-0.007101" b="0.018378" c="0" />
++            <distortion model="ptlens" focal="12" a="-0.016006" b="0.024041" c="0"/>
++            <distortion model="ptlens" focal="13" a="-0.017096" b="0.030498" c="0"/>
++            <distortion model="ptlens" focal="14" a="-0.01773" b="0.031719" c="0"/>
++            <distortion model="ptlens" focal="15" a="-0.013174" b="0.027255" c="0"/>
++            <distortion model="ptlens" focal="16" a="-0.009629" b="0.021705" c="0"/>
++            <distortion model="ptlens" focal="17" a="-0.006736" b="0.016621" c="0"/>
++            <distortion model="ptlens" focal="18" a="-0.007763" b="0.019343" c="0"/>
++            <distortion model="ptlens" focal="19" a="-0.005218" b="0.014696" c="0"/>
++            <distortion model="ptlens" focal="20" a="-0.005775" b="0.015956" c="0"/>
++            <distortion model="ptlens" focal="22" a="-0.005197" b="0.015329" c="0"/>
++            <distortion model="ptlens" focal="24" a="-0.007101" b="0.018378" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 16-35mm f/4G ED-AFS VR</model>
++        <model>Nikon AF-S Zoom-Nikkor 16-35mm f/4G ED VR</model>
++        <model lang="en">Nikkor AF-S 16-35mm f/4G ED VR</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16" a="0.015" b="-0.08" c="0.067" />
+-            <distortion model="ptlens" focal="20" a="0.013" b="-0.149" c="0.148" />
+-            <distortion model="ptlens" focal="24" a="0.023" b="-0.076" c="0.078" />
+-            <distortion model="ptlens" focal="28" a="-0.089" b="0.222" c="-0.176" />
+-            <distortion model="ptlens" focal="35" a="-0.016" b="0.057" c="-0.048" />
+-            <tca model="poly3" focal="16" br="0.0000014" vr="0.9999959" bb="0.0000008" vb="0.9999910" />
+-            <tca model="poly3" focal="20" br="-0.0000247" vr="1.0000177" bb="-0.0000517" vb="1.0000583" />
+-            <tca model="poly3" focal="24" br="-0.0000082" vr="0.9999821" bb="-0.0000450" vb="1.0000369" />
+-            <tca model="poly3" focal="28" br="0.0000122" vr="0.9999531" bb="-0.0000058" vb="0.9999931" />
+-            <tca model="poly3" focal="35" br="-0.0000239" vr="1.0000166" bb="-0.0000398" vb="1.0000519" />
++            <!-- Taken with Nikon D750 -->
++            <distortion model="ptlens" focal="16" a="0.01589" b="-0.08067" c="0.06712"/>
++            <distortion model="ptlens" focal="20" a="0.00036" b="-0.01787" c="0.02308"/>
++            <distortion model="ptlens" focal="24" a="0" b="-0.0002" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="0.004" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.00551" c="0"/>
++            <tca model="poly3" focal="16" vr="1.0000631" vb="1.0003332"/>
++            <tca model="poly3" focal="20" vr="1.0000741" vb="1.0002447"/>
++            <tca model="poly3" focal="24" vr="1.0000321" vb="1.0002009"/>
++            <tca model="poly3" focal="28" vr="1.0000512" vb="1.0001421"/>
++            <tca model="poly3" focal="35" vr="1.0000943" vb="1.0000318"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 16-85mm f/3.5-5.6G AF-S ED VR DX</model>
++        <model>Nikon AF-S DX Nikkor 16-80mm f/2.8-4.0E ED VR</model>
++        <model lang="en">Nikkor AF-S 16-80mm f/2.8-4E DX ED VR</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16" a="0.0199837" b="-0.0681903" c="0.0388181" />
+-            <distortion model="ptlens" focal="18" a="0.0101226" b="-0.0323001" c="0.00392398" />
+-            <distortion model="ptlens" focal="20" a="0.00337762" b="-0.0059244" c="-0.0160513" />
+-            <distortion model="ptlens" focal="22" a="-0.00565925" b="0.0323698" c="-0.0738213" />
+-            <distortion model="ptlens" focal="24" a="0.00498966" b="-0.0163608" c="0.011626" />
+-            <distortion model="ptlens" focal="35" a="0.00452151" b="-0.0101545" c="0.00874731" />
+-            <distortion model="ptlens" focal="50" a="0.00822439" b="-0.0246265" c="0.0257984" />
+-            <distortion model="ptlens" focal="85" a="-0.00473509" b="0.0253574" c="-0.0342333" />
++            <!-- Taken with Nikon D7200 -->
++            <distortion model="ptlens" focal="16" a="0.01368" b="-0.04363" c="0.00904"/>
++            <distortion model="ptlens" focal="18" a="0.03553" b="-0.06901" c="0.0202"/>
++            <distortion model="ptlens" focal="20" a="0.00324" b="0.00545" c="-0.01603"/>
++            <distortion model="ptlens" focal="22" a="-0.0068" b="0.03696" c="-0.03991"/>
++            <distortion model="ptlens" focal="28" a="0.01925" b="-0.04931" c="0.05884"/>
++            <distortion model="ptlens" focal="34" a="-0.00711" b="0.03741" c="-0.02289"/>
++            <distortion model="ptlens" focal="40" a="0.00892" b="-0.0052" c="0.01119"/>
++            <distortion model="ptlens" focal="44" a="0.01529" b="-0.0184" c="0.01554"/>
++            <distortion model="ptlens" focal="50" a="0.00491" b="-0.00007" c="0.01417"/>
++            <distortion model="ptlens" focal="55" a="0.02076" b="-0.0394" c="0.04369"/>
++            <distortion model="ptlens" focal="58" a="0.00009" b="0.01279" c="0.00076"/>
++            <distortion model="ptlens" focal="60" a="0.00876" b="-0.00268" c="0.00458"/>
++            <distortion model="ptlens" focal="62" a="-0.00059" b="0.02024" c="-0.01362"/>
++            <distortion model="ptlens" focal="66" a="-0.00417" b="0.02593" c="-0.01421"/>
++            <distortion model="ptlens" focal="72" a="0.03333" b="-0.06751" c="0.06361"/>
++            <distortion model="ptlens" focal="75" a="-0.00173" b="0.01554" c="-0.00392"/>
++            <distortion model="ptlens" focal="80" a="-0.00074" b="0.01741" c="-0.01376"/>
++            <!-- Taken with unknown camera model -->
++            <tca model="poly3" focal="16" br="-0.0000411" vr="1.0004024" bb="0.0000383" vb="0.9999716"/>
++            <tca model="poly3" focal="24" br="-0.0000360" vr="1.0001751" bb="0.0000671" vb="0.9999619"/>
++            <tca model="poly3" focal="25" br="-0.0000500" vr="1.0002395" bb="0.0000739" vb="0.9999166"/>
++            <tca model="poly3" focal="35" br="-0.0000464" vr="1.0001052" bb="0.0000301" vb="0.9999806"/>
++            <tca model="poly3" focal="38" br="-0.0000213" vr="1.0000390" bb="-0.0000091" vb="1.0000303"/>
++            <tca model="poly3" focal="50" br="0.0000022" vr="0.9998829" bb="-0.0000146" vb="0.9999875"/>
++            <tca model="poly3" focal="80" br="-0.0000238" vr="0.9997903" bb="-0.0000055" vb="0.9998115"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="0.35" k1="-0.8839" k2="0.3654" k3="-0.2446"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="0.8" k1="-0.9376" k2="0.5401" k3="-0.3379"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="2.99" k1="-1.0385" k2="0.8115" k3="-0.5029"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.8988" k2="0.4834" k3="-0.2968"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="0.35" k1="-0.5092" k2="0.2886" k3="-0.3686"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="0.8" k1="-0.4627" k2="0.1615" k3="-0.2543"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="2.99" k1="-0.5547" k2="0.3727" k3="-0.3579"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.4080" k2="0.0320" k3="-0.1436"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="0.35" k1="-0.4849" k2="0.0920" k3="-0.0481"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="0.8" k1="-0.5084" k2="0.1712" k3="-0.0831"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="2.99" k1="-0.5147" k2="0.1494" k3="-0.0429"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4259" k2="-0.0384" k3="0.0656"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="0.35" k1="-0.4684" k2="0.0017" k3="0.0394"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="0.8" k1="-0.5063" k2="0.1195" k3="-0.0245"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="2.99" k1="-0.5173" k2="0.1450" k3="-0.0347"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4280" k2="-0.0421" k3="0.0719"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="0.35" k1="-0.5203" k2="0.1335" k3="-0.0444"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="0.8" k1="-0.5595" k2="0.2428" k3="-0.1004"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="2.99" k1="-0.5695" k2="0.2751" k3="-0.1178"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.4935" k2="0.1180" k3="-0.0263"/>
++            <vignetting model="pa" focal="25" aperture="3" distance="0.35" k1="-1.0433" k2="1.0169" k3="-0.4565"/>
++            <vignetting model="pa" focal="25" aperture="3" distance="0.8" k1="-1.0472" k2="1.0773" k3="-0.5258"/>
++            <vignetting model="pa" focal="25" aperture="3" distance="2.99" k1="-1.0578" k2="1.1454" k3="-0.5951"/>
++            <vignetting model="pa" focal="25" aperture="3" distance="1000" k1="-1.0880" k2="1.2529" k3="-0.6837"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="0.35" k1="-0.3623" k2="-0.1243" k3="0.1207"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="0.8" k1="-0.3568" k2="-0.1078" k3="0.0943"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="2.99" k1="-0.3464" k2="-0.1200" k3="0.1081"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.3536" k2="-0.0855" k3="0.0717"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.35" k1="-0.4511" k2="0.2230" k3="-0.0787"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.8" k1="-0.4283" k2="0.1752" k3="-0.0452"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="2.99" k1="-0.4228" k2="0.1805" k3="-0.0530"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.4412" k2="0.2474" k3="-0.1082"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.35" k1="-0.4491" k2="0.2040" k3="-0.0568"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.8" k1="-0.4269" k2="0.1685" k3="-0.0349"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="2.99" k1="-0.4240" k2="0.1764" k3="-0.0451"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.4397" k2="0.2257" k3="-0.0872"/>
++            <vignetting model="pa" focal="25" aperture="24" distance="0.35" k1="-0.4458" k2="0.1920" k3="-0.0424"/>
++            <vignetting model="pa" focal="25" aperture="24" distance="0.8" k1="-0.4254" k2="0.1645" k3="-0.0261"/>
++            <vignetting model="pa" focal="25" aperture="24" distance="2.99" k1="-0.4206" k2="0.1711" k3="-0.0336"/>
++            <vignetting model="pa" focal="26" aperture="3" distance="0.35" k1="-1.0181" k2="0.9499" k3="-0.4015"/>
++            <vignetting model="pa" focal="26" aperture="3" distance="0.8" k1="-1.0192" k2="1.0317" k3="-0.4985"/>
++            <vignetting model="pa" focal="26" aperture="3" distance="2.99" k1="-1.0278" k2="1.0921" k3="-0.5614"/>
++            <vignetting model="pa" focal="26" aperture="3" distance="1000" k1="-1.0801" k2="1.2372" k3="-0.6679"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="0.35" k1="-0.3474" k2="-0.1357" k3="0.1202"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="0.8" k1="-0.3232" k2="-0.1514" k3="0.1159"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="2.99" k1="-0.2914" k2="-0.2438" k3="0.1850"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.3374" k2="-0.1311" k3="0.1110"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="0.35" k1="-0.4423" k2="0.2154" k3="-0.0635"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="0.8" k1="-0.4124" k2="0.1678" k3="-0.0399"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="2.99" k1="-0.4029" k2="0.1511" k3="-0.0309"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.4374" k2="0.2245" k3="-0.0718"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="0.35" k1="-0.4443" k2="0.2155" k3="-0.0645"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="0.8" k1="-0.4167" k2="0.1714" k3="-0.0431"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="2.99" k1="-0.4054" k2="0.1469" k3="-0.0267"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.4430" k2="0.2364" k3="-0.0824"/>
++            <vignetting model="pa" focal="26" aperture="24" distance="0.35" k1="-0.4295" k2="0.1579" k3="-0.0210"/>
++            <vignetting model="pa" focal="26" aperture="24" distance="0.8" k1="-0.4014" k2="0.1108" k3="0.0059"/>
++            <vignetting model="pa" focal="26" aperture="24" distance="2.99" k1="-0.3909" k2="0.0908" k3="0.0174"/>
++            <vignetting model="pa" focal="26" aperture="24" distance="1000" k1="-0.4206" k2="0.1579" k3="-0.0225"/>
++            <vignetting model="pa" focal="38" aperture="3.3" distance="0.35" k1="-0.9194" k2="0.9594" k3="-0.4877"/>
++            <vignetting model="pa" focal="38" aperture="3.3" distance="0.8" k1="-0.9355" k2="1.1463" k3="-0.7162"/>
++            <vignetting model="pa" focal="38" aperture="3.3" distance="2.99" k1="-0.9188" k2="1.1454" k3="-0.7483"/>
++            <vignetting model="pa" focal="38" aperture="3.3" distance="1000" k1="-0.9856" k2="1.2859" k3="-0.8395"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="0.35" k1="-0.2415" k2="-0.1767" k3="0.1105"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="2.99" k1="-0.2367" k2="-0.1219" k3="0.0279"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="1000" k1="-0.1952" k2="-0.2001" k3="0.0524"/>
++            <vignetting model="pa" focal="38" aperture="5" distance="0.35" k1="-0.3175" k2="0.1703" k3="-0.1231"/>
++            <vignetting model="pa" focal="38" aperture="5" distance="0.8" k1="-0.1796" k2="-0.1250" k3="0.0402"/>
++            <vignetting model="pa" focal="38" aperture="5" distance="2.99" k1="-0.2587" k2="0.1200" k3="-0.1066"/>
++            <vignetting model="pa" focal="38" aperture="6.3" distance="0.35" k1="-0.3499" k2="0.2404" k3="-0.1221"/>
++            <vignetting model="pa" focal="38" aperture="6.3" distance="2.99" k1="-0.3043" k2="0.1045" k3="-0.0209"/>
++            <vignetting model="pa" focal="38" aperture="6.3" distance="1000" k1="-0.2494" k2="-0.0096" k3="0.0475"/>
++            <vignetting model="pa" focal="38" aperture="7.1" distance="0.35" k1="-0.3255" k2="0.1420" k3="-0.0413"/>
++            <vignetting model="pa" focal="38" aperture="7.1" distance="0.8" k1="-0.2127" k2="-0.0783" k3="0.0818"/>
++            <vignetting model="pa" focal="38" aperture="7.1" distance="2.99" k1="-0.2615" k2="0.0942" k3="-0.0413"/>
++            <vignetting model="pa" focal="38" aperture="9" distance="0.35" k1="-0.3304" k2="0.1910" k3="-0.0877"/>
++            <vignetting model="pa" focal="38" aperture="9" distance="2.99" k1="-0.2948" k2="0.0632" k3="0.0084"/>
++            <vignetting model="pa" focal="38" aperture="9" distance="1000" k1="-0.2501" k2="-0.0139" k3="0.0503"/>
++            <vignetting model="pa" focal="38" aperture="10" distance="0.35" k1="-0.3139" k2="0.1111" k3="-0.0231"/>
++            <vignetting model="pa" focal="38" aperture="10" distance="0.8" k1="-0.2054" k2="-0.0893" k3="0.0840"/>
++            <vignetting model="pa" focal="38" aperture="10" distance="2.99" k1="-0.2487" k2="0.0702" k3="-0.0309"/>
++            <vignetting model="pa" focal="38" aperture="27" distance="0.35" k1="-0.2429" k2="-0.0386" k3="0.0568"/>
++            <vignetting model="pa" focal="38" aperture="27" distance="0.8" k1="-0.2201" k2="-0.0666" k3="0.0689"/>
++            <vignetting model="pa" focal="38" aperture="27" distance="2.99" k1="-0.2537" k2="0.0273" k3="0.0118"/>
++            <vignetting model="pa" focal="38" aperture="27" distance="1000" k1="-0.2525" k2="-0.0187" k3="0.0514"/>
++            <vignetting model="pa" focal="52" aperture="3.8" distance="0.35" k1="-0.9862" k2="1.5176" k3="-1.0571"/>
++            <vignetting model="pa" focal="52" aperture="3.8" distance="0.8" k1="-0.9201" k2="1.3741" k3="-1.0449"/>
++            <vignetting model="pa" focal="52" aperture="3.8" distance="2.99" k1="-0.8762" k2="1.2055" k3="-0.9318"/>
++            <vignetting model="pa" focal="52" aperture="3.8" distance="1000" k1="-0.7985" k2="0.9920" k3="-0.8039"/>
++            <vignetting model="pa" focal="52" aperture="5" distance="0.35" k1="-0.1400" k2="-0.0891" k3="-0.0669"/>
++            <vignetting model="pa" focal="52" aperture="5" distance="0.8" k1="-0.2264" k2="0.2546" k3="-0.3762"/>
++            <vignetting model="pa" focal="52" aperture="5" distance="2.99" k1="-0.2442" k2="0.2825" k3="-0.4003"/>
++            <vignetting model="pa" focal="52" aperture="5" distance="1000" k1="-0.1924" k2="0.1805" k3="-0.3570"/>
++            <vignetting model="pa" focal="52" aperture="7.1" distance="0.35" k1="-0.1742" k2="0.0081" k3="0.0011"/>
++            <vignetting model="pa" focal="52" aperture="7.1" distance="0.8" k1="-0.2320" k2="0.1925" k3="-0.1316"/>
++            <vignetting model="pa" focal="52" aperture="7.1" distance="2.99" k1="-0.2439" k2="0.2000" k3="-0.1284"/>
++            <vignetting model="pa" focal="52" aperture="7.1" distance="1000" k1="-0.1994" k2="0.1043" k3="-0.0799"/>
++            <vignetting model="pa" focal="52" aperture="10" distance="0.35" k1="-0.1757" k2="0.0071" k3="0.0034"/>
++            <vignetting model="pa" focal="52" aperture="10" distance="0.8" k1="-0.2301" k2="0.1639" k3="-0.0930"/>
++            <vignetting model="pa" focal="52" aperture="10" distance="2.99" k1="-0.2567" k2="0.2141" k3="-0.1172"/>
++            <vignetting model="pa" focal="52" aperture="10" distance="1000" k1="-0.1917" k2="0.0589" k3="-0.0272"/>
++            <vignetting model="pa" focal="52" aperture="30" distance="0.35" k1="-0.2153" k2="0.1282" k3="-0.0825"/>
++            <vignetting model="pa" focal="52" aperture="30" distance="0.8" k1="-0.3277" k2="0.3847" k3="-0.2234"/>
++            <vignetting model="pa" focal="52" aperture="30" distance="2.99" k1="-0.2613" k2="0.2269" k3="-0.1220"/>
++            <vignetting model="pa" focal="52" aperture="30" distance="1000" k1="-0.2448" k2="0.2069" k3="-0.1295"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="0.35" k1="-1.0001" k2="1.7099" k3="-1.2508"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="0.8" k1="-0.8171" k2="1.1223" k3="-0.9048"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="2.99" k1="-0.6866" k2="0.6255" k3="-0.5542"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.6040" k2="0.3049" k3="-0.3172"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="0.35" k1="-0.2211" k2="0.3804" k3="-0.4195"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="0.8" k1="-0.2554" k2="0.5219" k3="-0.5681"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="2.99" k1="-0.2511" k2="0.5054" k3="-0.5791"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1988" k2="0.3306" k3="-0.4572"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="0.35" k1="-0.1692" k2="0.1116" k3="-0.0705"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="0.8" k1="-0.2144" k2="0.2462" k3="-0.1723"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="2.99" k1="-0.2371" k2="0.2874" k3="-0.1936"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.2016" k2="0.1824" k3="-0.1275"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="0.35" k1="-0.1934" k2="0.1962" k3="-0.1297"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="0.8" k1="-0.1820" k2="0.1394" k3="-0.0807"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="2.99" k1="-0.2342" k2="0.2463" k3="-0.1382"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.2174" k2="0.1818" k3="-0.0894"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="0.35" k1="-0.1182" k2="-0.0327" k3="0.0226"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="0.8" k1="-0.2135" k2="0.2117" k3="-0.1167"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="2.99" k1="-0.2355" k2="0.2356" k3="-0.1218"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.2462" k2="0.2443" k3="-0.1243"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 17-35mm f/2.8 ED-AFS</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 16-85mm f/3.5-5.6G ED VR</model>
++        <model lang="en">Nikkor AF-S 16-85mm f/3.5-5.6G DX ED VR</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.005" b="-0.02" c="0" />
+-            <distortion model="ptlens" focal="20" a="0" b="-0.0055" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="-0.001" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="0.0005" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0.0025" c="0" />
++            <distortion model="ptlens" focal="16" a="0.0199837" b="-0.0681903" c="0.0388181"/>
++            <distortion model="ptlens" focal="18" a="0.0101226" b="-0.0323001" c="0.00392398"/>
++            <distortion model="ptlens" focal="20" a="0.00337762" b="-0.0059244" c="-0.0160513"/>
++            <distortion model="ptlens" focal="22" a="-0.00565925" b="0.0323698" c="-0.0738213"/>
++            <distortion model="ptlens" focal="24" a="0.00498966" b="-0.0163608" c="0.011626"/>
++            <distortion model="ptlens" focal="35" a="0.00452151" b="-0.0101545" c="0.00874731"/>
++            <distortion model="ptlens" focal="50" a="0.00822439" b="-0.0246265" c="0.0257984"/>
++            <distortion model="ptlens" focal="85" a="-0.00473509" b="0.0253574" c="-0.0342333"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.7912" k2="0.4272" k3="-0.3319"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.7912" k2="0.4272" k3="-0.3319"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.5441" k2="0.0487" k3="-0.1416"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.5441" k2="0.0487" k3="-0.1416"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.4981" k2="0.2109" k3="-0.2763"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4981" k2="0.2109" k3="-0.2763"/>
++            <vignetting model="pa" focal="16" aperture="6.3" distance="10" k1="-0.5432" k2="0.3655" k3="-0.3278"/>
++            <vignetting model="pa" focal="16" aperture="6.3" distance="1000" k1="-0.5432" k2="0.3655" k3="-0.3278"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.4511" k2="-0.0183" k3="0.0352"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.4511" k2="-0.0183" k3="0.0352"/>
++            <vignetting model="pa" focal="32" aperture="4.5" distance="10" k1="-0.6311" k2="0.4510" k3="-0.2609"/>
++            <vignetting model="pa" focal="32" aperture="4.5" distance="1000" k1="-0.6311" k2="0.4510" k3="-0.2609"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="10" k1="-0.2248" k2="-0.3703" k3="0.2330"/>
++            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.2248" k2="-0.3703" k3="0.2330"/>
++            <vignetting model="pa" focal="32" aperture="6.3" distance="10" k1="-0.1713" k2="-0.2270" k3="0.0983"/>
++            <vignetting model="pa" focal="32" aperture="6.3" distance="1000" k1="-0.1713" k2="-0.2270" k3="0.0983"/>
++            <vignetting model="pa" focal="32" aperture="7.1" distance="10" k1="-0.2200" k2="-0.0015" k3="-0.0304"/>
++            <vignetting model="pa" focal="32" aperture="7.1" distance="1000" k1="-0.2200" k2="-0.0015" k3="-0.0304"/>
++            <vignetting model="pa" focal="32" aperture="29" distance="10" k1="-0.1969" k2="-0.0880" k3="0.0588"/>
++            <vignetting model="pa" focal="32" aperture="29" distance="1000" k1="-0.1969" k2="-0.0880" k3="0.0588"/>
++            <vignetting model="pa" focal="46" aperture="5" distance="10" k1="-0.6289" k2="0.7325" k3="-0.5494"/>
++            <vignetting model="pa" focal="46" aperture="5" distance="1000" k1="-0.6289" k2="0.7325" k3="-0.5494"/>
++            <vignetting model="pa" focal="46" aperture="6.3" distance="10" k1="-0.2200" k2="-0.1204" k3="-0.0024"/>
++            <vignetting model="pa" focal="46" aperture="6.3" distance="1000" k1="-0.2200" k2="-0.1204" k3="-0.0024"/>
++            <vignetting model="pa" focal="46" aperture="7.1" distance="10" k1="-0.1393" k2="-0.0707" k3="-0.0409"/>
++            <vignetting model="pa" focal="46" aperture="7.1" distance="1000" k1="-0.1393" k2="-0.0707" k3="-0.0409"/>
++            <vignetting model="pa" focal="46" aperture="8" distance="10" k1="-0.1859" k2="0.0398" k3="-0.0495"/>
++            <vignetting model="pa" focal="46" aperture="8" distance="1000" k1="-0.1859" k2="0.0398" k3="-0.0495"/>
++            <vignetting model="pa" focal="46" aperture="32" distance="10" k1="-0.1404" k2="-0.0884" k3="0.0543"/>
++            <vignetting model="pa" focal="46" aperture="32" distance="1000" k1="-0.1404" k2="-0.0884" k3="0.0543"/>
++            <vignetting model="pa" focal="65" aperture="5.3" distance="10" k1="-0.5998" k2="0.8238" k3="-0.7024"/>
++            <vignetting model="pa" focal="65" aperture="5.3" distance="1000" k1="-0.5998" k2="0.8238" k3="-0.7024"/>
++            <vignetting model="pa" focal="65" aperture="6.3" distance="10" k1="-0.4462" k2="0.4906" k3="-0.4686"/>
++            <vignetting model="pa" focal="65" aperture="6.3" distance="1000" k1="-0.4462" k2="0.4906" k3="-0.4686"/>
++            <vignetting model="pa" focal="65" aperture="7.1" distance="10" k1="-0.2166" k2="0.1145" k3="-0.2471"/>
++            <vignetting model="pa" focal="65" aperture="7.1" distance="1000" k1="-0.2166" k2="0.1145" k3="-0.2471"/>
++            <vignetting model="pa" focal="65" aperture="8" distance="10" k1="-0.1573" k2="0.1342" k3="-0.2494"/>
++            <vignetting model="pa" focal="65" aperture="8" distance="1000" k1="-0.1573" k2="0.1342" k3="-0.2494"/>
++            <vignetting model="pa" focal="65" aperture="36" distance="10" k1="-0.0828" k2="-0.1221" k3="0.0703"/>
++            <vignetting model="pa" focal="65" aperture="36" distance="1000" k1="-0.0828" k2="-0.1221" k3="0.0703"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="-0.5044" k2="0.5812" k3="-0.5718"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.5044" k2="0.5812" k3="-0.5718"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="10" k1="-0.4340" k2="0.4624" k3="-0.4777"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="1000" k1="-0.4340" k2="0.4624" k3="-0.4777"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="10" k1="-0.2072" k2="0.1000" k3="-0.2701"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="1000" k1="-0.2072" k2="0.1000" k3="-0.2701"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="10" k1="-0.1676" k2="0.2700" k3="-0.3584"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.1676" k2="0.2700" k3="-0.3584"/>
++            <vignetting model="pa" focal="85" aperture="36" distance="10" k1="-0.0937" k2="-0.0561" k3="0.0275"/>
++            <vignetting model="pa" focal="85" aperture="36" distance="1000" k1="-0.0937" k2="-0.0561" k3="0.0275"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 17-55mm f/2.8G ED-IF AF-S DX</model>
++        <model>Nikon AF-S Zoom-Nikkor 17-35mm f/2.8D IF-ED</model>
++        <model lang="en">Nikkor AF-S 17-35mm f/2.8D IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0" b="-0.010424" c="0" />
+-            <distortion model="ptlens" focal="19" a="0" b="-0.00567" c="0" />
+-            <distortion model="ptlens" focal="22" a="0" b="-0.000148" c="0" />
+-            <distortion model="ptlens" focal="26" a="0" b="0.004472" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.005657" c="0" />
+-            <distortion model="ptlens" focal="38" a="0" b="0.007283" c="0" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.005143" c="0" />
++            <distortion model="ptlens" focal="17" a="0.005" b="-0.02" c="0"/>
++            <distortion model="ptlens" focal="20" a="0" b="-0.0055" c="0"/>
++            <distortion model="ptlens" focal="24" a="0" b="-0.001" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="0.0005" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.0025" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 18-35mm f/3.5-4.5D ED-IF AF</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED</model>
++        <model lang="en">Nikkor AF-S 17-55mm f/2.8G DX IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.005981" b="-0.024888" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.005045" b="-0.019527" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.001429" b="-0.00989" c="0" />
+-            <distortion model="ptlens" focal="26" a="0" b="-0.00509" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="-0.003797" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.002437" c="0" />
++            <distortion model="poly3" focal="17" k1="-0.010424"/>
++            <distortion model="poly3" focal="19" k1="-0.00567"/>
++            <distortion model="poly3" focal="22" k1="-0.000148"/>
++            <distortion model="poly3" focal="26" k1="0.004472"/>
++            <distortion model="poly3" focal="30" k1="0.005657"/>
++            <distortion model="poly3" focal="38" k1="0.007283"/>
++            <distortion model="poly3" focal="55" k1="0.005143"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 18-55mm f/3.5-5.6G ED AF-S DX</model>
++        <model>Nikon AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED</model>
++        <model lang="en">Nikkor AF 18-35mm f/3.5-4.5D IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.003409" b="-0.019128" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.0042" b="-0.018625" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.001149" b="-0.008657" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="-0.003041" c="0" />
+-            <distortion model="ptlens" focal="31" a="0" b="-0.003664" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.002371" c="0" />
+-            <distortion model="ptlens" focal="45" a="0" b="-0.001655" c="0" />
+-            <distortion model="ptlens" focal="55" a="0" b="-0.001004" c="0" />
++            <distortion model="ptlens" focal="18" a="0.005981" b="-0.024888" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.005045" b="-0.019527" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.001429" b="-0.00989" c="0"/>
++            <distortion model="ptlens" focal="26" a="0" b="-0.00509" c="0"/>
++            <distortion model="ptlens" focal="30" a="0" b="-0.003797" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="-0.002437" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 18-55mm f/3.5-5.6G AF-S DX VR</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED</model>
++        <model lang="en">Nikkor AF-S 18-55mm f/3.5-5.6G DX ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.000658776" b="-0.0150048" c="-0.00123339" />
+-            <distortion model="ptlens" focal="20" a="0.0154927" b="-0.0685976" c="0.0638405" />
+-            <distortion model="ptlens" focal="22" a="0.00163489" b="-0.0157578" c="0.0044202" />
+-            <distortion model="ptlens" focal="24" a="0.0238367" b="-0.102409" c="0.124563" />
+-            <distortion model="ptlens" focal="29" a="-5.82382e-05" b="0.0021913" c="-0.0142704" />
+-            <distortion model="ptlens" focal="35" a="0.00346406" b="-0.0126111" c="0.013148" />
+-            <distortion model="ptlens" focal="45" a="-0.000340008" b="-0.000412014" c="0.00561741" />
+-            <distortion model="ptlens" focal="55" a="-0.000340008" b="-0.000412014" c="0.00561741" />
++            <distortion model="ptlens" focal="18" a="0.003409" b="-0.019128" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.0042" b="-0.018625" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.001149" b="-0.008657" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="-0.003041" c="0"/>
++            <distortion model="ptlens" focal="31" a="0" b="-0.003664" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="-0.002371" c="0"/>
++            <distortion model="ptlens" focal="45" a="0" b="-0.001655" c="0"/>
++            <distortion model="ptlens" focal="55" a="0" b="-0.001004" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikon AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G VR</model>
++        <model lang="en">Nikkor AF-S 18-55mm f/3.5-5.6G DX VR</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="-0.003" b="-0.004" c="-0.018" />
+-            <distortion model="ptlens" focal="24" a="0.001" b="-0.010" c="0.002" />
+-            <distortion model="ptlens" focal="35" a="0.004" b="-0.012" c="0.009" />
+-            <distortion model="ptlens" focal="45" a="-0.001" b="0.002" c="-0.002" />
+-            <distortion model="ptlens" focal="55" a="0.000" b="0.002" c="-0.001" />
++            <distortion model="ptlens" focal="18" a="0.000658776" b="-0.0150048" c="-0.00123339"/>
++            <distortion model="ptlens" focal="20" a="0.0154927" b="-0.0685976" c="0.0638405"/>
++            <distortion model="ptlens" focal="22" a="0.00163489" b="-0.0157578" c="0.0044202"/>
++            <distortion model="ptlens" focal="24" a="0.0238367" b="-0.102409" c="0.124563"/>
++            <distortion model="ptlens" focal="29" a="-5.82382e-05" b="0.0021913" c="-0.0142704"/>
++            <distortion model="ptlens" focal="35" a="0.00346406" b="-0.0126111" c="0.013148"/>
++            <distortion model="ptlens" focal="45" a="-0.000340008" b="-0.000412014" c="0.00561741"/>
++            <distortion model="ptlens" focal="55" a="-0.000340008" b="-0.000412014" c="0.00561741"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.6969" k2="0.1514" k3="0.0042"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.6969" k2="0.1514" k3="0.0042"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2523" k2="-0.2930" k3="0.1084"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2523" k2="-0.2930" k3="0.1084"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.3275" k2="0.1982" k3="-0.2173"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3275" k2="0.1982" k3="-0.2173"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.3721" k2="0.2886" k3="-0.2333"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.3721" k2="0.2886" k3="-0.2333"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3160" k2="0.1477" k3="-0.1164"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3160" k2="0.1477" k3="-0.1164"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2541" k2="-0.0683" k3="0.0699"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2541" k2="-0.0683" k3="0.0699"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.2757" k2="-0.5245" k3="0.3889"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.2757" k2="-0.5245" k3="0.3889"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.1462" k2="-0.1231" k3="0.0071"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.1462" k2="-0.1231" k3="0.0071"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="10" k1="-0.1925" k2="0.0426" k3="-0.0306"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.1925" k2="0.0426" k3="-0.0306"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.1827" k2="-0.0003" k3="0.0134"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.1827" k2="-0.0003" k3="0.0134"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.1765" k2="-0.0111" k3="0.0216"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.1765" k2="-0.0111" k3="0.0216"/>
++            <vignetting model="pa" focal="36" aperture="5" distance="10" k1="-0.2481" k2="-0.4958" k3="0.3604"/>
++            <vignetting model="pa" focal="36" aperture="5" distance="1000" k1="-0.2481" k2="-0.4958" k3="0.3604"/>
++            <vignetting model="pa" focal="36" aperture="6.3" distance="10" k1="-0.0370" k2="-0.3205" k3="0.1124"/>
++            <vignetting model="pa" focal="36" aperture="6.3" distance="1000" k1="-0.0370" k2="-0.3205" k3="0.1124"/>
++            <vignetting model="pa" focal="36" aperture="7.1" distance="10" k1="-0.1283" k2="0.0419" k3="-0.0432"/>
++            <vignetting model="pa" focal="36" aperture="7.1" distance="1000" k1="-0.1283" k2="0.0419" k3="-0.0432"/>
++            <vignetting model="pa" focal="36" aperture="8" distance="10" k1="-0.1086" k2="-0.0181" k3="0.0192"/>
++            <vignetting model="pa" focal="36" aperture="8" distance="1000" k1="-0.1086" k2="-0.0181" k3="0.0192"/>
++            <vignetting model="pa" focal="36" aperture="32" distance="10" k1="-0.0985" k2="-0.0502" k3="0.0426"/>
++            <vignetting model="pa" focal="36" aperture="32" distance="1000" k1="-0.0985" k2="-0.0502" k3="0.0426"/>
++            <vignetting model="pa" focal="46" aperture="5.3" distance="10" k1="-0.7264" k2="0.3744" k3="-0.0913"/>
++            <vignetting model="pa" focal="46" aperture="5.3" distance="1000" k1="-0.7264" k2="0.3744" k3="-0.0913"/>
++            <vignetting model="pa" focal="46" aperture="6.3" distance="10" k1="-0.1890" k2="-0.5123" k3="0.3514"/>
++            <vignetting model="pa" focal="46" aperture="6.3" distance="1000" k1="-0.1890" k2="-0.5123" k3="0.3514"/>
++            <vignetting model="pa" focal="46" aperture="7.1" distance="10" k1="-0.0057" k2="-0.3085" k3="0.1097"/>
++            <vignetting model="pa" focal="46" aperture="7.1" distance="1000" k1="-0.0057" k2="-0.3085" k3="0.1097"/>
++            <vignetting model="pa" focal="46" aperture="8" distance="10" k1="-0.0905" k2="0.0453" k3="-0.0656"/>
++            <vignetting model="pa" focal="46" aperture="8" distance="1000" k1="-0.0905" k2="0.0453" k3="-0.0656"/>
++            <vignetting model="pa" focal="46" aperture="36" distance="10" k1="-0.0903" k2="0.0086" k3="0.0017"/>
++            <vignetting model="pa" focal="46" aperture="36" distance="1000" k1="-0.0903" k2="0.0086" k3="0.0017"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.8226" k2="0.6387" k3="-0.2484"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.8226" k2="0.6387" k3="-0.2484"/>
++            <vignetting model="pa" focal="55" aperture="6.3" distance="10" k1="-0.3127" k2="-0.2860" k3="0.2449"/>
++            <vignetting model="pa" focal="55" aperture="6.3" distance="1000" k1="-0.3127" k2="-0.2860" k3="0.2449"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="-0.0370" k2="-0.5520" k3="0.3181"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.0370" k2="-0.5520" k3="0.3181"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0248" k2="-0.1223" k3="0.0078"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0248" k2="-0.1223" k3="0.0078"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.0567" k2="-0.0167" k3="0.0137"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.0567" k2="-0.0167" k3="0.0137"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Nikon</maker>
+-	    <model>Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED</model>
+-	    <focal min="18" max="70" />
+-	    <aperture min="3.5" max="29" />
+-	    <mount>Nikon F AF</mount>
+-	    <cropfactor>1.5</cropfactor>
+-	    <calibration>
+-	        <distortion focal="18" model="ptlens" a="0.0266119" b="-0.0709405" c="0.0182763" />
+-	        <distortion focal="24" model="ptlens" a="0.010714" b="-0.0216807" c="0.00448524" />
+-	        <distortion focal="35" model="ptlens" a="0.00697599" b="-0.0102385" c="0.00602236" />
+-	        <distortion focal="50" model="ptlens" a="0.00169805" b="0.00159488" c="0.0010821" />
+-	        <distortion focal="70" model="ptlens" a="-0.00396747" b="0.0190794" c="-0.0154349" />
+-            <tca model="poly3" focal="18" br="-0.0000685" vr="1.0004744" bb="0.0000037" vb="0.9999796" />
+-            <tca model="poly3" focal="24" br="-0.0000613" vr="1.0003619" bb="0.0000118" vb="0.9999364" />
+-            <tca model="poly3" focal="35" br="-0.0000395" vr="1.0001576" bb="0.0000035" vb="0.9999682" />
+-            <tca model="poly3" focal="50" br="-0.0000093" vr="0.9999760" bb="0.0000071" vb="0.9998723" />
+-            <tca model="poly3" focal="70" br="-0.0000251" vr="0.9996060" bb="-0.0000149" vb="0.9999705" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.4" k1="-0.4339" k2="-0.4917" k3="0.1496" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.79" k1="-0.4247" k2="-0.4148" k3="0.1097" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="2.37" k1="-0.4155" k2="-0.3594" k3="0.0752" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4157" k2="-0.3406" k3="0.0641" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.4" k1="-0.2207" k2="-0.4523" k3="-0.0436" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.79" k1="-0.1989" k2="-0.4270" k3="-0.0320" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="2.37" k1="-0.2246" k2="-0.3894" k3="-0.0232" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2128" k2="-0.4118" k3="-0.0042" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.4801" k2="0.6179" k3="-0.7049" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.79" k1="-0.3862" k2="0.3465" k3="-0.4484" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="2.37" k1="-0.3644" k2="0.2809" k3="-0.3633" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3390" k2="0.2206" k3="-0.3165" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.4582" k2="0.4636" k3="-0.4626" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.79" k1="-0.2977" k2="-0.0289" k3="-0.0519" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="2.37" k1="-0.2683" k2="-0.1113" k3="0.0322" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2466" k2="-0.1544" k3="0.0583" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.3315" k2="-0.0337" k3="-0.0027" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.79" k1="-0.2472" k2="-0.2055" k3="0.1004" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="2.37" k1="-0.2423" k2="-0.1967" k3="0.1024" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2262" k2="-0.2170" k3="0.1082" />
+-            <vignetting model="pa" focal="24" aperture="3.8" distance="0.4" k1="-0.6454" k2="0.4598" k3="-0.3376" />
+-            <vignetting model="pa" focal="24" aperture="3.8" distance="0.79" k1="-0.6110" k2="0.3951" k3="-0.2879" />
+-            <vignetting model="pa" focal="24" aperture="3.8" distance="2.37" k1="-0.5970" k2="0.3914" k3="-0.2691" />
+-            <vignetting model="pa" focal="24" aperture="3.8" distance="1000" k1="-0.6381" k2="0.4938" k3="-0.3324" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.4839" k2="0.2137" k3="-0.2061" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.79" k1="-0.4297" k2="0.0893" k3="-0.1172" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.4099" k2="0.0524" k3="-0.0715" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.4459" k2="0.1407" k3="-0.1254" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.3013" k2="0.0851" k3="-0.0703" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="0.79" k1="-0.2410" k2="-0.0363" k3="-0.0146" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.2262" k2="-0.0491" k3="-0.0035" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2497" k2="-0.0056" k3="-0.0238" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2701" k2="-0.0244" k3="0.0301" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.79" k1="-0.2097" k2="-0.1413" k3="0.0818" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.1974" k2="-0.1468" k3="0.0850" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2212" k2="-0.1039" k3="0.0669" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="0.4" k1="-0.2562" k2="-0.0549" k3="0.0432" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="0.79" k1="-0.1945" k2="-0.1724" k3="0.0962" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="2.37" k1="-0.1840" k2="-0.1712" k3="0.0944" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2040" k2="-0.1382" k3="0.0823" />
+-            <vignetting model="pa" focal="34" aperture="25" distance="0.79" k1="-0.1353" k2="-0.0950" k3="0.0404" />
+-            <vignetting model="pa" focal="35" aperture="4.2" distance="0.4" k1="-0.5430" k2="0.2235" k3="-0.0402" />
+-            <vignetting model="pa" focal="35" aperture="4.2" distance="0.79" k1="-0.5389" k2="0.2196" k3="-0.0458" />
+-            <vignetting model="pa" focal="35" aperture="4.2" distance="2.37" k1="-0.5584" k2="0.2464" k3="-0.0528" />
+-            <vignetting model="pa" focal="35" aperture="4.2" distance="1000" k1="-0.5511" k2="0.2448" k3="-0.0589" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1205" k2="-0.1893" k3="0.0717" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.79" k1="-0.1153" k2="-0.2323" k3="0.0948" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1302" k2="-0.2226" k3="0.1008" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1302" k2="-0.2160" k3="0.0968" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.1460" k2="-0.0881" k3="0.0531" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.79" k1="-0.1497" k2="-0.0747" k3="0.0383" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1638" k2="-0.0669" k3="0.0463" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1623" k2="-0.0706" k3="0.0497" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.1342" k2="-0.1118" k3="0.0658" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.79" k1="-0.1386" k2="-0.0966" k3="0.0496" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="2.37" k1="-0.1501" k2="-0.0944" k3="0.0614" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1499" k2="-0.0941" k3="0.0615" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="0.4" k1="-0.1277" k2="-0.1208" k3="0.0640" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="2.37" k1="-0.1443" k2="-0.0998" k3="0.0570" />
+-            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1425" k2="-0.1031" k3="0.0593" />
+-            <vignetting model="pa" focal="50" aperture="4.5" distance="0.4" k1="-0.4919" k2="0.1239" k3="0.0183" />
+-            <vignetting model="pa" focal="50" aperture="4.5" distance="0.79" k1="-0.4998" k2="0.1382" k3="0.0087" />
+-            <vignetting model="pa" focal="50" aperture="4.5" distance="2.37" k1="-0.4940" k2="0.1149" k3="0.0269" />
+-            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.5219" k2="0.1531" k3="0.0125" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.0465" k2="-0.4662" k3="0.2488" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.79" k1="-0.0669" k2="-0.4827" k3="0.2726" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.0596" k2="-0.5154" k3="0.2985" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0986" k2="-0.4527" k3="0.2701" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1163" k2="-0.0224" k3="-0.0228" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="0.79" k1="-0.1208" k2="-0.0110" k3="-0.0314" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1115" k2="-0.0445" k3="-0.0067" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1529" k2="0.0111" k3="-0.0273" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="0.4" k1="-0.0989" k2="-0.0897" k3="0.0486" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="0.79" k1="-0.1072" k2="-0.0677" k3="0.0323" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="2.37" k1="-0.0964" k2="-0.1058" k3="0.0599" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1370" k2="-0.0523" k3="0.0401" />
+-            <vignetting model="pa" focal="50" aperture="29" distance="0.4" k1="-0.0957" k2="-0.0951" k3="0.0483" />
+-            <vignetting model="pa" focal="50" aperture="29" distance="0.79" k1="-0.1020" k2="-0.0797" k3="0.0384" />
+-            <vignetting model="pa" focal="50" aperture="29" distance="2.37" k1="-0.0930" k2="-0.1109" k3="0.0599" />
+-            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.1289" k2="-0.0699" k3="0.0489" />
+-            <vignetting model="pa" focal="70" aperture="4.5" distance="0.4" k1="-0.7126" k2="1.0859" k3="-0.9096" />
+-            <vignetting model="pa" focal="70" aperture="4.5" distance="0.79" k1="-0.6525" k2="0.8721" k3="-0.7779" />
+-            <vignetting model="pa" focal="70" aperture="4.5" distance="2.37" k1="-0.6184" k2="0.7293" k3="-0.6707" />
+-            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.5974" k2="0.6060" k3="-0.5678" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="0.4" k1="-0.2156" k2="0.2280" k3="-0.3906" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="0.79" k1="-0.2182" k2="0.1461" k3="-0.3395" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="2.37" k1="-0.2239" k2="0.1152" k3="-0.3041" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2302" k2="0.0877" k3="-0.2681" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="0.4" k1="-0.1737" k2="0.2570" k3="-0.2841" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="0.79" k1="-0.1750" k2="0.2572" k3="-0.3145" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="2.37" k1="-0.1811" k2="0.2072" k3="-0.2244" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2074" k2="0.2267" k3="-0.2155" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="0.4" k1="-0.0935" k2="-0.0624" k3="0.0205" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="0.79" k1="-0.0867" k2="-0.1024" k3="0.0497" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="2.37" k1="-0.1057" k2="-0.0858" k3="0.0538" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1501" k2="-0.0110" k3="0.0169" />
+-            <vignetting model="pa" focal="70" aperture="29" distance="0.4" k1="-0.0724" k2="-0.1272" k3="0.0692" />
+-            <vignetting model="pa" focal="70" aperture="29" distance="0.79" k1="-0.0722" k2="-0.1435" k3="0.0781" />
+-            <vignetting model="pa" focal="70" aperture="29" distance="2.37" k1="-0.0963" k2="-0.1079" k3="0.0657" />
+-            <vignetting model="pa" focal="70" aperture="29" distance="1000" k1="-0.1466" k2="-0.0219" k3="0.0228" />
+-	    </calibration>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX VR Nikkor 18-55mm f/3.5-5.6G II</model>
++        <model lang="en">Nikkor AF-S 18-55mm f/3.5-5.6G DX VR II</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3300 -->
++            <distortion model="ptlens" focal="18" a="-0.00033" b="-0.007745" c="-0.015154"/>
++            <distortion model="ptlens" focal="20" a="0.000646" b="-0.011226" c="-0.003154"/>
++            <distortion model="ptlens" focal="21" a="0.011166" b="-0.051056" c="0.04664"/>
++            <distortion model="ptlens" focal="25" a="0.00078" b="-0.008896" c="0.003416"/>
++            <distortion model="ptlens" focal="32" a="0.000849" b="-0.005467" c="0.004324"/>
++            <distortion model="ptlens" focal="40" a="0.002578" b="-0.008653" c="0.010631"/>
++            <distortion model="ptlens" focal="46" a="-0.004517" b="0.015171" c="-0.010555"/>
++            <distortion model="ptlens" focal="50" a="-0.00118" b="0.005271" c="-0.002504"/>
++            <distortion model="ptlens" focal="55" a="-0.002502" b="0.009876" c="-0.007068"/>
++            <tca model="poly3" focal="18" br="-0.0001140" vr="1.0008246" bb="0.0001631" vb="0.9995273"/>
++            <tca model="poly3" focal="20" br="-0.0000706" vr="1.0007579" bb="0.0001198" vb="0.9995775"/>
++            <tca model="poly3" focal="21" br="-0.0000578" vr="1.0007205" bb="0.0001100" vb="0.9995902"/>
++            <tca model="poly3" focal="25" br="0.0000003" vr="1.0005248" bb="0.0000604" vb="0.9997175"/>
++            <tca model="poly3" focal="32" br="-0.0000060" vr="1.0003273" bb="0.0000307" vb="0.9998234"/>
++            <tca model="poly3" focal="40" br="-0.0000164" vr="1.0001566" bb="0.0000247" vb="0.9999039"/>
++            <tca model="poly3" focal="46" br="-0.0000266" vr="1.0000953" bb="0.0000241" vb="0.9999198"/>
++            <tca model="poly3" focal="50" br="-0.0000254" vr="1.0000472" bb="0.0000251" vb="0.9999325"/>
++            <tca model="poly3" focal="55" br="-0.0000181" vr="1.0000225" bb="0.0000268" vb="0.9999503"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikon AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED</model>
++        <model lang="en">Nikkor AF-S 18-70mm f/3.5-4.5G DX IF-ED</model>
+         <mount>Nikon F AF</mount>
+-        <focal min="18" max="105" />
+-        <aperture min="3.5" max="22" />
++        <focal min="18" max="70"/>
++        <aperture min="3.5" max="29"/>
++        <!-- Average crop factor of Nikon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion focal="18" model="ptlens" a="0.0266119" b="-0.0709405" c="0.0182763"/>
++            <distortion focal="24" model="ptlens" a="0.010714" b="-0.0216807" c="0.00448524"/>
++            <distortion focal="35" model="ptlens" a="0.00697599" b="-0.0102385" c="0.00602236"/>
++            <distortion focal="50" model="ptlens" a="0.00169805" b="0.00159488" c="0.0010821"/>
++            <distortion focal="70" model="ptlens" a="-0.00396747" b="0.0190794" c="-0.0154349"/>
++            <tca model="poly3" focal="18" br="-0.0000685" vr="1.0004744" bb="0.0000037" vb="0.9999796"/>
++            <tca model="poly3" focal="24" br="-0.0000613" vr="1.0003619" bb="0.0000118" vb="0.9999364"/>
++            <tca model="poly3" focal="35" br="-0.0000395" vr="1.0001576" bb="0.0000035" vb="0.9999682"/>
++            <tca model="poly3" focal="50" br="-0.0000093" vr="0.9999760" bb="0.0000071" vb="0.9998723"/>
++            <tca model="poly3" focal="70" br="-0.0000251" vr="0.9996060" bb="-0.0000149" vb="0.9999705"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.4" k1="-0.4339" k2="-0.4917" k3="0.1496"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.79" k1="-0.4247" k2="-0.4148" k3="0.1097"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="2.37" k1="-0.4155" k2="-0.3594" k3="0.0752"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4157" k2="-0.3406" k3="0.0641"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="0.4" k1="-0.2207" k2="-0.4523" k3="-0.0436"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="0.79" k1="-0.1989" k2="-0.4270" k3="-0.0320"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="2.37" k1="-0.2246" k2="-0.3894" k3="-0.0232"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2128" k2="-0.4118" k3="-0.0042"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.4801" k2="0.6179" k3="-0.7049"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.79" k1="-0.3862" k2="0.3465" k3="-0.4484"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="2.37" k1="-0.3644" k2="0.2809" k3="-0.3633"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3390" k2="0.2206" k3="-0.3165"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.4582" k2="0.4636" k3="-0.4626"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.79" k1="-0.2977" k2="-0.0289" k3="-0.0519"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="2.37" k1="-0.2683" k2="-0.1113" k3="0.0322"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2466" k2="-0.1544" k3="0.0583"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.3315" k2="-0.0337" k3="-0.0027"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.79" k1="-0.2472" k2="-0.2055" k3="0.1004"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="2.37" k1="-0.2423" k2="-0.1967" k3="0.1024"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2262" k2="-0.2170" k3="0.1082"/>
++            <vignetting model="pa" focal="24" aperture="3.8" distance="0.4" k1="-0.6454" k2="0.4598" k3="-0.3376"/>
++            <vignetting model="pa" focal="24" aperture="3.8" distance="0.79" k1="-0.6110" k2="0.3951" k3="-0.2879"/>
++            <vignetting model="pa" focal="24" aperture="3.8" distance="2.37" k1="-0.5970" k2="0.3914" k3="-0.2691"/>
++            <vignetting model="pa" focal="24" aperture="3.8" distance="1000" k1="-0.6381" k2="0.4938" k3="-0.3324"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.4839" k2="0.2137" k3="-0.2061"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.79" k1="-0.4297" k2="0.0893" k3="-0.1172"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.4099" k2="0.0524" k3="-0.0715"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.4459" k2="0.1407" k3="-0.1254"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.3013" k2="0.0851" k3="-0.0703"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.79" k1="-0.2410" k2="-0.0363" k3="-0.0146"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.2262" k2="-0.0491" k3="-0.0035"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2497" k2="-0.0056" k3="-0.0238"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2701" k2="-0.0244" k3="0.0301"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.79" k1="-0.2097" k2="-0.1413" k3="0.0818"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.1974" k2="-0.1468" k3="0.0850"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2212" k2="-0.1039" k3="0.0669"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="0.4" k1="-0.2562" k2="-0.0549" k3="0.0432"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="0.79" k1="-0.1945" k2="-0.1724" k3="0.0962"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="2.37" k1="-0.1840" k2="-0.1712" k3="0.0944"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2040" k2="-0.1382" k3="0.0823"/>
++            <vignetting model="pa" focal="34" aperture="25" distance="0.79" k1="-0.1353" k2="-0.0950" k3="0.0404"/>
++            <vignetting model="pa" focal="35" aperture="4.2" distance="0.4" k1="-0.5430" k2="0.2235" k3="-0.0402"/>
++            <vignetting model="pa" focal="35" aperture="4.2" distance="0.79" k1="-0.5389" k2="0.2196" k3="-0.0458"/>
++            <vignetting model="pa" focal="35" aperture="4.2" distance="2.37" k1="-0.5584" k2="0.2464" k3="-0.0528"/>
++            <vignetting model="pa" focal="35" aperture="4.2" distance="1000" k1="-0.5511" k2="0.2448" k3="-0.0589"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1205" k2="-0.1893" k3="0.0717"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.79" k1="-0.1153" k2="-0.2323" k3="0.0948"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1302" k2="-0.2226" k3="0.1008"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1302" k2="-0.2160" k3="0.0968"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.1460" k2="-0.0881" k3="0.0531"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.79" k1="-0.1497" k2="-0.0747" k3="0.0383"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1638" k2="-0.0669" k3="0.0463"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1623" k2="-0.0706" k3="0.0497"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.1342" k2="-0.1118" k3="0.0658"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.79" k1="-0.1386" k2="-0.0966" k3="0.0496"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="2.37" k1="-0.1501" k2="-0.0944" k3="0.0614"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1499" k2="-0.0941" k3="0.0615"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="0.4" k1="-0.1277" k2="-0.1208" k3="0.0640"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="2.37" k1="-0.1443" k2="-0.0998" k3="0.0570"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1425" k2="-0.1031" k3="0.0593"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="0.4" k1="-0.4919" k2="0.1239" k3="0.0183"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="0.79" k1="-0.4998" k2="0.1382" k3="0.0087"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="2.37" k1="-0.4940" k2="0.1149" k3="0.0269"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.5219" k2="0.1531" k3="0.0125"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.0465" k2="-0.4662" k3="0.2488"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.79" k1="-0.0669" k2="-0.4827" k3="0.2726"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.0596" k2="-0.5154" k3="0.2985"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0986" k2="-0.4527" k3="0.2701"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1163" k2="-0.0224" k3="-0.0228"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.79" k1="-0.1208" k2="-0.0110" k3="-0.0314"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1115" k2="-0.0445" k3="-0.0067"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1529" k2="0.0111" k3="-0.0273"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.4" k1="-0.0989" k2="-0.0897" k3="0.0486"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.79" k1="-0.1072" k2="-0.0677" k3="0.0323"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="2.37" k1="-0.0964" k2="-0.1058" k3="0.0599"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1370" k2="-0.0523" k3="0.0401"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="0.4" k1="-0.0957" k2="-0.0951" k3="0.0483"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="0.79" k1="-0.1020" k2="-0.0797" k3="0.0384"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="2.37" k1="-0.0930" k2="-0.1109" k3="0.0599"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.1289" k2="-0.0699" k3="0.0489"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="0.4" k1="-0.7126" k2="1.0859" k3="-0.9096"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="0.79" k1="-0.6525" k2="0.8721" k3="-0.7779"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="2.37" k1="-0.6184" k2="0.7293" k3="-0.6707"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.5974" k2="0.6060" k3="-0.5678"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.4" k1="-0.2156" k2="0.2280" k3="-0.3906"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="0.79" k1="-0.2182" k2="0.1461" k3="-0.3395"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="2.37" k1="-0.2239" k2="0.1152" k3="-0.3041"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2302" k2="0.0877" k3="-0.2681"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.4" k1="-0.1737" k2="0.2570" k3="-0.2841"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="0.79" k1="-0.1750" k2="0.2572" k3="-0.3145"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="2.37" k1="-0.1811" k2="0.2072" k3="-0.2244"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2074" k2="0.2267" k3="-0.2155"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.4" k1="-0.0935" k2="-0.0624" k3="0.0205"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="0.79" k1="-0.0867" k2="-0.1024" k3="0.0497"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="2.37" k1="-0.1057" k2="-0.0858" k3="0.0538"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1501" k2="-0.0110" k3="0.0169"/>
++            <vignetting model="pa" focal="70" aperture="29" distance="0.4" k1="-0.0724" k2="-0.1272" k3="0.0692"/>
++            <vignetting model="pa" focal="70" aperture="29" distance="0.79" k1="-0.0722" k2="-0.1435" k3="0.0781"/>
++            <vignetting model="pa" focal="70" aperture="29" distance="2.37" k1="-0.0963" k2="-0.1079" k3="0.0657"/>
++            <vignetting model="pa" focal="70" aperture="29" distance="1000" k1="-0.1466" k2="-0.0219" k3="0.0228"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Zoom-Nikkor 18-105mm f/3.5-5.6G ED VR</model>
++        <model lang="en">Nikkor AF-S 18-105mm f/3.5-5.6G DX ED VR</model>
++        <mount>Nikon F AF</mount>
++        <focal min="18" max="105"/>
++        <aperture min="3.5" max="22"/>
+         <type>rectilinear</type>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18.0" a="0.00529" b="-0.02091" c="-0.01697" />
+-            <distortion model="ptlens" focal="25.0" a="0.01542" b="-0.03457" c="0.02371" />
+-            <distortion model="ptlens" focal="35.0" a="0.00716" b="-0.00354" c="0.00352" />
+-            <distortion model="ptlens" focal="50.0" a="0.00477" b="-0.00182" c="0.00982" />
+-            <distortion model="ptlens" focal="75.0" a="-0.0024" b="0.02231" c="-0.01516" />
+-            <distortion model="ptlens" focal="105.0" a="0.00392" b="-0.00253" c="0.01061" />
++            <!-- Taken with Nikon D7100 -->
++            <distortion model="ptlens" focal="18.0" a="0.02437" b="-0.06486" c="0.00154"/>
++            <distortion model="ptlens" focal="24.0" a="0.01857" b="-0.03885" c="0.01733"/>
++            <!-- The three following lines are older data, but verified.  -->
++            <distortion model="ptlens" focal="35.0" a="0.00716" b="-0.00354" c="0.00352"/>
++            <distortion model="ptlens" focal="50.0" a="0.00477" b="-0.00182" c="0.00982"/>
++            <distortion model="ptlens" focal="75.0" a="-0.0024" b="0.02231" c="-0.01516"/>
++            <distortion model="ptlens" focal="105.0" a="-0.00026" b="0.02117" c="-0.02621"/>
++            <tca model="poly3" focal="18" br="0.0000278" vr="1.0005774" bb="-0.0000782" vb="1.0002245"/>
++            <tca model="poly3" focal="24" br="0.0000228" vr="1.0003575" bb="-0.0000433" vb="1.0002590"/>
++            <tca model="poly3" focal="35" br="-0.0000268" vr="1.0001459" bb="0.0000296" vb="1.0002736"/>
++            <tca model="poly3" focal="50" br="-0.0000121" vr="0.9999792" bb="-0.0000053" vb="1.0002278"/>
++            <tca model="poly3" focal="70" br="-0.0000235" vr="0.9998510" bb="-0.0000448" vb="1.0001296"/>
++            <tca model="poly3" focal="105" br="0.0000014" vr="0.9996695" bb="-0.0000464" vb="0.9998467"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.0091" k2="1.4434" k3="-0.9751"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.0091" k2="1.4434" k3="-0.9751"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.8303" k2="1.0615" k3="-0.7330"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.8303" k2="1.0615" k3="-0.7330"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.3431" k2="0.1553" k3="-0.1979"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.3431" k2="0.1553" k3="-0.1979"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.3340" k2="0.4233" k3="-0.3763"/>
++            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.3340" k2="0.4233" k3="-0.3763"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3721" k2="0.4754" k3="-0.3399"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3721" k2="0.4754" k3="-0.3399"/>
++            <vignetting model="pa" focal="24" aperture="3.8" distance="10" k1="-0.9580" k2="1.2701" k3="-0.7945"/>
++            <vignetting model="pa" focal="24" aperture="3.8" distance="1000" k1="-0.9580" k2="1.2701" k3="-0.7945"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="10" k1="-0.4599" k2="0.2245" k3="-0.1597"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4599" k2="0.2245" k3="-0.1597"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.3495" k2="0.3652" k3="-0.2504"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.3495" k2="0.3652" k3="-0.2504"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.3566" k2="0.3075" k3="-0.1567"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3566" k2="0.3075" k3="-0.1567"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.9253" k2="1.0357" k3="-0.5530"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.9253" k2="1.0357" k3="-0.5530"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.4737" k2="0.0943" k3="0.0128"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.4737" k2="0.0943" k3="0.0128"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.3521" k2="0.3061" k3="-0.1936"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.3521" k2="0.3061" k3="-0.1936"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3966" k2="0.4147" k3="-0.2308"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3966" k2="0.4147" k3="-0.2308"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.3908" k2="0.3623" k3="-0.1608"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.3908" k2="0.3623" k3="-0.1608"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.9333" k2="1.0885" k3="-0.6050"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.9333" k2="1.0885" k3="-0.6050"/>
++            <vignetting model="pa" focal="50" aperture="6.3" distance="10" k1="-0.5051" k2="0.1895" k3="-0.0579"/>
++            <vignetting model="pa" focal="50" aperture="6.3" distance="1000" k1="-0.5051" k2="0.1895" k3="-0.0579"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.4045" k2="0.4390" k3="-0.2713"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4045" k2="0.4390" k3="-0.2713"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.4143" k2="0.4310" k3="-0.1988"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4143" k2="0.4310" k3="-0.1988"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.4299" k2="0.4566" k3="-0.2147"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.4299" k2="0.4566" k3="-0.2147"/>
++            <vignetting model="pa" focal="70" aperture="5.3" distance="10" k1="-0.9031" k2="1.1685" k3="-0.7825"/>
++            <vignetting model="pa" focal="70" aperture="5.3" distance="1000" k1="-0.9031" k2="1.1685" k3="-0.7825"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.6414" k2="0.6397" k3="-0.4576"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.6414" k2="0.6397" k3="-0.4576"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.3652" k2="0.3302" k3="-0.2938"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3652" k2="0.3302" k3="-0.2938"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.4345" k2="0.5964" k3="-0.3638"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.4345" k2="0.5964" k3="-0.3638"/>
++            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.4377" k2="0.5434" k3="-0.2778"/>
++            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.4377" k2="0.5434" k3="-0.2778"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.6245" k2="0.4078" k3="-0.3761"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.6245" k2="0.4078" k3="-0.3761"/>
++            <vignetting model="pa" focal="105" aperture="7.1" distance="10" k1="-0.2826" k2="-0.0908" k3="-0.1252"/>
++            <vignetting model="pa" focal="105" aperture="7.1" distance="1000" k1="-0.2826" k2="-0.0908" k3="-0.1252"/>
++            <vignetting model="pa" focal="105" aperture="9" distance="10" k1="-0.2430" k2="0.4217" k3="-0.4383"/>
++            <vignetting model="pa" focal="105" aperture="9" distance="1000" k1="-0.2430" k2="0.4217" k3="-0.4383"/>
++            <vignetting model="pa" focal="105" aperture="36" distance="10" k1="-0.2340" k2="0.1934" k3="-0.0849"/>
++            <vignetting model="pa" focal="105" aperture="36" distance="1000" k1="-0.2340" k2="0.1934" k3="-0.0849"/>
+         </calibration>
+-    </lens>    
+-
++    </lens>
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 18-135mm f/3.5-5.6G IF-ED AF-S DX</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF-S 18-135mm f/3.5-5.6G DX IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.010516" b="-0.033415" c="0.000000" />
+-            <distortion model="ptlens" focal="20" a="0.013430" b="-0.028560" c="0.000000" />
+-            <distortion model="ptlens" focal="28" a="0.010740" b="-0.007090" c="0.000000" />
+-            <distortion model="ptlens" focal="32" a="0.000000" b="0.013840" c="0.002600" />
+-            <distortion model="ptlens" focal="40" a="0.000000" b="0.022370" c="-0.026420" />
+-            <distortion model="ptlens" focal="48" a="0.000000" b="-0.006420" c="0.019040" />
+-            <distortion model="ptlens" focal="58" a="0.000000" b="0.023710" c="-0.031210" />
+-            <distortion model="ptlens" focal="85" a="0.000000" b="0.010900" c="-0.007660" />
+-            <distortion model="ptlens" focal="105" a="0.000000" b="-0.000450" c="0.013550" />
+-            <distortion model="ptlens" focal="135" a="0.000000" b="0.027500" c="-0.043800" />
++            <distortion model="ptlens" focal="18" a="0.010516" b="-0.033415" c="0.000000"/>
++            <distortion model="ptlens" focal="20" a="0.013430" b="-0.028560" c="0.000000"/>
++            <distortion model="ptlens" focal="28" a="0.010740" b="-0.007090" c="0.000000"/>
++            <distortion model="ptlens" focal="32" a="0.000000" b="0.013840" c="0.002600"/>
++            <distortion model="ptlens" focal="40" a="0.000000" b="0.022370" c="-0.026420"/>
++            <distortion model="ptlens" focal="48" a="0.000000" b="-0.006420" c="0.019040"/>
++            <distortion model="ptlens" focal="58" a="0.000000" b="0.023710" c="-0.031210"/>
++            <distortion model="ptlens" focal="85" a="0.000000" b="0.010900" c="-0.007660"/>
++            <distortion model="ptlens" focal="105" a="0.000000" b="-0.000450" c="0.013550"/>
++            <distortion model="ptlens" focal="135" a="0.000000" b="0.027500" c="-0.043800"/>
++            <!-- Taken with Nikon D90 -->
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.45" k1="-0.4366" k2="-0.0049" k3="-0.2457"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.71" k1="-0.4287" k2="0.0020" k3="-0.2360"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1.5" k1="-0.4170" k2="-0.0228" k3="-0.2076"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4253" k2="-0.0042" k3="-0.2041"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="0.45" k1="-0.4965" k2="0.3730" k3="-0.5047"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="0.71" k1="-0.4959" k2="0.3644" k3="-0.4743"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1.5" k1="-0.4869" k2="0.3357" k3="-0.4391"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.4808" k2="0.3155" k3="-0.4083"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.45" k1="-0.5745" k2="0.6838" k3="-0.6216"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.71" k1="-0.5509" k2="0.6087" k3="-0.5407"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.5414" k2="0.5667" k3="-0.4991"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.5276" k2="0.5202" k3="-0.4522"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.45" k1="-0.5202" k2="0.4010" k3="-0.2697"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.71" k1="-0.5014" k2="0.3504" k3="-0.2217"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.5043" k2="0.3744" k3="-0.2431"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4890" k2="0.3444" k3="-0.2203"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.45" k1="-0.4895" k2="0.2941" k3="-0.1764"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.71" k1="-0.4800" k2="0.2827" k3="-0.1659"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1.5" k1="-0.4777" k2="0.2805" k3="-0.1619"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4801" k2="0.2996" k3="-0.1751"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="0.45" k1="-0.4959" k2="0.3079" k3="-0.1857"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="0.71" k1="-0.4825" k2="0.2874" k3="-0.1697"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1.5" k1="-0.4818" k2="0.2931" k3="-0.1724"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.4770" k2="0.2926" k3="-0.1721"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.45" k1="-0.4837" k2="0.2803" k3="-0.1696"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.71" k1="-0.4913" k2="0.3040" k3="-0.1793"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.4888" k2="0.3092" k3="-0.1827"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4857" k2="0.3092" k3="-0.1816"/>
++            <vignetting model="pa" focal="26" aperture="3.8" distance="0.45" k1="-0.4366" k2="0.2064" k3="-0.1915"/>
++            <vignetting model="pa" focal="26" aperture="3.8" distance="0.71" k1="-0.4641" k2="0.3208" k3="-0.2908"/>
++            <vignetting model="pa" focal="26" aperture="3.8" distance="1.5" k1="-0.4639" k2="0.3514" k3="-0.3301"/>
++            <vignetting model="pa" focal="26" aperture="3.8" distance="1000" k1="-0.4925" k2="0.4459" k3="-0.4118"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="0.45" k1="-0.4089" k2="0.3393" k3="-0.2456"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="0.71" k1="-0.4066" k2="0.3478" k3="-0.2564"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1.5" k1="-0.4054" k2="0.3524" k3="-0.2636"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.4378" k2="0.4454" k3="-0.3543"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="0.45" k1="-0.3831" k2="0.2275" k3="-0.1195"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="0.71" k1="-0.3798" k2="0.2247" k3="-0.1172"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1.5" k1="-0.3711" k2="0.2064" k3="-0.1039"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.3665" k2="0.1963" k3="-0.0959"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="0.45" k1="-0.3761" k2="0.2091" k3="-0.1074"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="0.71" k1="-0.3661" k2="0.1927" k3="-0.0969"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="1.5" k1="-0.3619" k2="0.1819" k3="-0.0871"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.3590" k2="0.1767" k3="-0.0831"/>
++            <vignetting model="pa" focal="26" aperture="16" distance="0.45" k1="-0.3707" k2="0.2019" k3="-0.1071"/>
++            <vignetting model="pa" focal="26" aperture="16" distance="0.71" k1="-0.3602" k2="0.1832" k3="-0.0946"/>
++            <vignetting model="pa" focal="26" aperture="16" distance="1.5" k1="-0.3565" k2="0.1744" k3="-0.0861"/>
++            <vignetting model="pa" focal="26" aperture="16" distance="1000" k1="-0.3573" k2="0.1757" k3="-0.0854"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="0.45" k1="-0.3674" k2="0.1951" k3="-0.1017"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="0.71" k1="-0.3704" k2="0.2060" k3="-0.1089"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="1.5" k1="-0.3583" k2="0.1795" k3="-0.0905"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="1000" k1="-0.3637" k2="0.1904" k3="-0.0967"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="0.45" k1="-0.3856" k2="0.1782" k3="-0.1326"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="0.71" k1="-0.3996" k2="0.2618" k3="-0.2199"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="1.5" k1="-0.4123" k2="0.3223" k3="-0.2810"/>
++            <vignetting model="pa" focal="38" aperture="4.5" distance="1000" k1="-0.4247" k2="0.3757" k3="-0.3386"/>
++            <vignetting model="pa" focal="38" aperture="5.6" distance="0.45" k1="-0.2895" k2="0.1122" k3="-0.1003"/>
++            <vignetting model="pa" focal="38" aperture="5.6" distance="0.71" k1="-0.3036" k2="0.1829" k3="-0.1666"/>
++            <vignetting model="pa" focal="38" aperture="5.6" distance="1.5" k1="-0.3144" k2="0.2345" k3="-0.2175"/>
++            <vignetting model="pa" focal="38" aperture="5.6" distance="1000" k1="-0.3075" k2="0.2209" k3="-0.2343"/>
++            <vignetting model="pa" focal="38" aperture="8" distance="0.45" k1="-0.2597" k2="0.0939" k3="-0.0296"/>
++            <vignetting model="pa" focal="38" aperture="8" distance="0.71" k1="-0.2614" k2="0.1005" k3="-0.0339"/>
++            <vignetting model="pa" focal="38" aperture="8" distance="1.5" k1="-0.2532" k2="0.0878" k3="-0.0291"/>
++            <vignetting model="pa" focal="38" aperture="8" distance="1000" k1="-0.2621" k2="0.1126" k3="-0.0462"/>
++            <vignetting model="pa" focal="38" aperture="11" distance="0.45" k1="-0.2560" k2="0.0849" k3="-0.0246"/>
++            <vignetting model="pa" focal="38" aperture="11" distance="0.71" k1="-0.2540" k2="0.0847" k3="-0.0253"/>
++            <vignetting model="pa" focal="38" aperture="11" distance="1.5" k1="-0.2515" k2="0.0801" k3="-0.0230"/>
++            <vignetting model="pa" focal="38" aperture="11" distance="1000" k1="-0.2477" k2="0.0757" k3="-0.0219"/>
++            <vignetting model="pa" focal="38" aperture="16" distance="0.45" k1="-0.2596" k2="0.0949" k3="-0.0315"/>
++            <vignetting model="pa" focal="38" aperture="16" distance="0.71" k1="-0.2437" k2="0.0601" k3="-0.0106"/>
++            <vignetting model="pa" focal="38" aperture="16" distance="1.5" k1="-0.2499" k2="0.0760" k3="-0.0210"/>
++            <vignetting model="pa" focal="38" aperture="16" distance="1000" k1="-0.2532" k2="0.0844" k3="-0.0264"/>
++            <vignetting model="pa" focal="38" aperture="22" distance="0.45" k1="-0.2408" k2="0.0534" k3="-0.0081"/>
++            <vignetting model="pa" focal="38" aperture="22" distance="0.71" k1="-0.2565" k2="0.0860" k3="-0.0260"/>
++            <vignetting model="pa" focal="38" aperture="22" distance="1.5" k1="-0.2311" k2="0.0264" k3="0.0110"/>
++            <vignetting model="pa" focal="38" aperture="22" distance="1000" k1="-0.2338" k2="0.0366" k3="0.0031"/>
++            <vignetting model="pa" focal="38" aperture="29" distance="0.45" k1="-0.2610" k2="0.0949" k3="-0.0325"/>
++            <vignetting model="pa" focal="38" aperture="29" distance="0.71" k1="-0.2468" k2="0.0662" k3="-0.0160"/>
++            <vignetting model="pa" focal="38" aperture="29" distance="1.5" k1="-0.2422" k2="0.0578" k3="-0.0115"/>
++            <vignetting model="pa" focal="38" aperture="29" distance="1000" k1="-0.2399" k2="0.0603" k3="-0.0153"/>
++            <vignetting model="pa" focal="66" aperture="5.3" distance="0.45" k1="-0.2802" k2="-0.0066" k3="-0.0074"/>
++            <vignetting model="pa" focal="66" aperture="5.3" distance="0.71" k1="-0.2908" k2="0.0716" k3="-0.0906"/>
++            <vignetting model="pa" focal="66" aperture="5.3" distance="1.5" k1="-0.3092" k2="0.1425" k3="-0.1618"/>
++            <vignetting model="pa" focal="66" aperture="5.3" distance="1000" k1="-0.2987" k2="0.1582" k3="-0.2062"/>
++            <vignetting model="pa" focal="66" aperture="8" distance="0.45" k1="-0.1504" k2="0.0195" k3="-0.0373"/>
++            <vignetting model="pa" focal="66" aperture="8" distance="0.71" k1="-0.1533" k2="0.0401" k3="-0.0567"/>
++            <vignetting model="pa" focal="66" aperture="8" distance="1.5" k1="-0.1651" k2="0.0949" k3="-0.1072"/>
++            <vignetting model="pa" focal="66" aperture="8" distance="1000" k1="-0.1654" k2="0.1009" k3="-0.1125"/>
++            <vignetting model="pa" focal="66" aperture="11" distance="0.45" k1="-0.1931" k2="0.0992" k3="-0.0485"/>
++            <vignetting model="pa" focal="66" aperture="11" distance="0.71" k1="-0.1904" k2="0.0986" k3="-0.0489"/>
++            <vignetting model="pa" focal="66" aperture="11" distance="1.5" k1="-0.1810" k2="0.0857" k3="-0.0430"/>
++            <vignetting model="pa" focal="66" aperture="11" distance="1000" k1="-0.1753" k2="0.0782" k3="-0.0393"/>
++            <vignetting model="pa" focal="66" aperture="16" distance="0.45" k1="-0.1653" k2="0.0450" k3="-0.0181"/>
++            <vignetting model="pa" focal="66" aperture="16" distance="0.71" k1="-0.1663" k2="0.0519" k3="-0.0226"/>
++            <vignetting model="pa" focal="66" aperture="16" distance="1.5" k1="-0.1718" k2="0.0691" k3="-0.0341"/>
++            <vignetting model="pa" focal="66" aperture="16" distance="1000" k1="-0.1698" k2="0.0691" k3="-0.0344"/>
++            <vignetting model="pa" focal="66" aperture="22" distance="0.45" k1="-0.1773" k2="0.0786" k3="-0.0425"/>
++            <vignetting model="pa" focal="66" aperture="22" distance="0.71" k1="-0.1685" k2="0.0545" k3="-0.0248"/>
++            <vignetting model="pa" focal="66" aperture="22" distance="1.5" k1="-0.1648" k2="0.0477" k3="-0.0199"/>
++            <vignetting model="pa" focal="66" aperture="22" distance="1000" k1="-0.1579" k2="0.0485" k3="-0.0257"/>
++            <vignetting model="pa" focal="66" aperture="32" distance="0.45" k1="-0.1532" k2="0.0243" k3="-0.0114"/>
++            <vignetting model="pa" focal="66" aperture="32" distance="0.71" k1="-0.1527" k2="0.0276" k3="-0.0137"/>
++            <vignetting model="pa" focal="66" aperture="32" distance="1.5" k1="-0.1678" k2="0.0570" k3="-0.0272"/>
++            <vignetting model="pa" focal="66" aperture="32" distance="1000" k1="-0.1724" k2="0.0821" k3="-0.0470"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="0.45" k1="-0.4546" k2="0.6941" k3="-0.8142"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="0.71" k1="-0.2959" k2="0.1212" k3="-0.3940"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1.5" k1="-0.1503" k2="-0.4542" k3="0.0444"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0539" k2="-1.0715" k3="0.5786"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="0.45" k1="-0.2950" k2="0.7893" k3="-0.9211"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="0.71" k1="-0.2589" k2="0.6613" k3="-0.7979"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1.5" k1="-0.1785" k2="0.4243" k3="-0.6086"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0296" k2="-0.1668" k3="-0.1797"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="0.45" k1="-0.3331" k2="0.8486" k3="-0.7755"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="0.71" k1="-0.3010" k2="0.6949" k3="-0.6338"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1.5" k1="-0.2568" k2="0.5724" k3="-0.5355"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2196" k2="0.4151" k3="-0.3985"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="0.45" k1="-0.2619" k2="0.5253" k3="-0.4588"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="0.71" k1="-0.1872" k2="0.2860" k3="-0.2475"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1.5" k1="-0.1509" k2="0.1545" k3="-0.1294"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1263" k2="0.0668" k3="-0.0490"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="0.45" k1="-0.1560" k2="0.1344" k3="-0.1057"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="0.71" k1="-0.1220" k2="0.0327" k3="-0.0202"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1.5" k1="-0.1362" k2="0.0546" k3="-0.0252"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1347" k2="0.0732" k3="-0.0427"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="0.45" k1="-0.1322" k2="0.0409" k3="-0.0217"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="0.71" k1="-0.1412" k2="0.0646" k3="-0.0332"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1.5" k1="-0.1226" k2="0.0278" k3="-0.0134"/>
++            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1261" k2="0.0423" k3="-0.0225"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- Also update copy at "Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II" below. -->
+         <maker>Nikon</maker>
+-        <model>Nikkor 18-200mm f/3.5-5.6 G ED-IF AF-S VR DX</model>
++        <model>Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF-S 18-200mm f/3.5-5.6G DX VR IF-ED</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.017598" b="-0.049569" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.013846" b="-0.036284" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.014876" b="-0.023039" c="0" />
+-            <distortion model="ptlens" focal="34" a="0.008669" b="-0.007258" c="0" />
+-            <distortion model="ptlens" focal="38" a="0" b="0.012308" c="0" />
+-            <distortion model="ptlens" focal="44" a="0" b="0.012651" c="0" />
+-            <distortion model="ptlens" focal="56" a="0" b="0.010344" c="0" />
+-            <distortion model="ptlens" focal="65" a="0" b="0.011336" c="0" />
+-            <distortion model="ptlens" focal="82" a="0" b="0.009171" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.010009" c="0" />
+-            <distortion model="ptlens" focal="130" a="0" b="0.007883" c="0" />
+-            <distortion model="ptlens" focal="170" a="0" b="0.00648" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.005237" c="0" />
++            <!-- Taken with Nikon D610 -->
++            <distortion model="ptlens" focal="18" a="0.03144" b="-0.10111" c="0.07201"/>
++            <distortion model="ptlens" focal="22" a="0.02892" b="-0.08487" c="0.0628"/>
++            <distortion model="ptlens" focal="24" a="0.02181" b="-0.05683" c="0.04436"/>
++            <distortion model="ptlens" focal="28" a="0.02153" b="-0.05332" c="0.05183"/>
++            <distortion model="ptlens" focal="35" a="0.01273" b="-0.02637" c="0.03572"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.01185" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.00843" c="0"/>
++            <distortion model="ptlens" focal="170" a="0" b="0.00678" c="0"/>
++            <distortion model="ptlens" focal="200" a="-0.00506" b="0.01451" c="0.00917"/>
++            <tca model="poly3" focal="18" br="0.0000478" vr="1.0002822" bb="-0.0000268" vb="1.0001601"/>
++            <tca model="poly3" focal="22" br="0.0000328" vr="1.0002660" bb="-0.0000361" vb="1.0001878"/>
++            <tca model="poly3" focal="24" br="-0.0000377" vr="1.0002759" bb="-0.0000243" vb="1.0001775"/>
++            <tca model="poly3" focal="28" br="0.0000072" vr="1.0001592" bb="0.0000002" vb="1.0001560"/>
++            <tca model="poly3" focal="35" br="0.0000070" vr="1.0000994" bb="-0.0000475" vb="1.0002158"/>
++            <tca model="poly3" focal="70" br="0.0000121" vr="1.0000494" bb="-0.0000422" vb="1.0001103"/>
++            <tca model="poly3" focal="135" br="0.0000062" vr="0.9998629" bb="0.0000084" vb="0.9998582"/>
++            <tca model="poly3" focal="170" br="0.0000074" vr="0.9999426" bb="0.0000855" vb="0.9995827"/>
++            <tca model="poly3" focal="200" br="-0.0000064" vr="0.9999083" bb="0.0000246" vb="0.9996926"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- Also update copy at "Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED" above. -->
+         <maker>Nikon</maker>
+-        <model>Nikkor 24-50mm f/3.3-4.5D Ai AF</model>
++        <model>Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II</model>
++        <model lang="en">Nikkor AF-S 18-200mm f/3.5-5.6G DX VR IF-ED II</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0" b="-0.010413" c="0" />
+-            <distortion model="ptlens" focal="29" a="0" b="-0.006777" c="0" />
+-            <distortion model="ptlens" focal="38" a="0" b="-0.003447" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="-0.003329" c="0" />
++            <!-- Taken with Nikon D610 -->
++            <distortion model="ptlens" focal="18" a="0.03144" b="-0.10111" c="0.07201"/>
++            <distortion model="ptlens" focal="22" a="0.02892" b="-0.08487" c="0.0628"/>
++            <distortion model="ptlens" focal="24" a="0.02181" b="-0.05683" c="0.04436"/>
++            <distortion model="ptlens" focal="28" a="0.02153" b="-0.05332" c="0.05183"/>
++            <distortion model="ptlens" focal="35" a="0.01273" b="-0.02637" c="0.03572"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.01185" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.00843" c="0"/>
++            <distortion model="ptlens" focal="170" a="0" b="0.00678" c="0"/>
++            <distortion model="ptlens" focal="200" a="-0.00506" b="0.01451" c="0.00917"/>
++            <tca model="poly3" focal="18" br="0.0000478" vr="1.0002822" bb="-0.0000268" vb="1.0001601"/>
++            <tca model="poly3" focal="22" br="0.0000328" vr="1.0002660" bb="-0.0000361" vb="1.0001878"/>
++            <tca model="poly3" focal="24" br="-0.0000377" vr="1.0002759" bb="-0.0000243" vb="1.0001775"/>
++            <tca model="poly3" focal="28" br="0.0000072" vr="1.0001592" bb="0.0000002" vb="1.0001560"/>
++            <tca model="poly3" focal="35" br="0.0000070" vr="1.0000994" bb="-0.0000475" vb="1.0002158"/>
++            <tca model="poly3" focal="70" br="0.0000121" vr="1.0000494" bb="-0.0000422" vb="1.0001103"/>
++            <tca model="poly3" focal="135" br="0.0000062" vr="0.9998629" bb="0.0000084" vb="0.9998582"/>
++            <tca model="poly3" focal="170" br="0.0000074" vr="0.9999426" bb="0.0000855" vb="0.9995827"/>
++            <tca model="poly3" focal="200" br="-0.0000064" vr="0.9999083" bb="0.0000246" vb="0.9996926"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24-85mm f/2.8-4.0D AF</model>
++        <model>Nikon AF Zoom-Nikkor 24-50mm f/3.3-4.5D</model>
++        <model lang="en">Nikkor AF 24-50mm f/3.3-4.5D</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.005" b="-0.022" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.004" b="-0.015" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.0008" b="-0.0025" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.0025" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.004" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.004" c="0" />
++            <distortion model="poly3" focal="24" k1="-0.010413"/>
++            <distortion model="poly3" focal="29" k1="-0.006777"/>
++            <distortion model="poly3" focal="38" k1="-0.003447"/>
++            <distortion model="poly3" focal="50" k1="-0.003329"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24-85mm f/3.5-4.5G ED-IF AF-S</model>
++        <model>Nikon AF Zoom-Nikkor 24-85mm f/2.8-4D IF</model>
++        <model lang="en">Nikkor AF 24-85mm f/2.8-4D IF</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.023939" b="-0.061462" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.013898" b="-0.018385" c="0" />
+-            <distortion model="ptlens" focal="52" a="0.00715" b="-0.000592" c="0" />
+-            <distortion model="ptlens" focal="70" a="0.003769" b="0.007774" c="0" />
+-            <distortion model="ptlens" focal="85" a="0.003412" b="0.0089" c="0" />
++            <!-- Taken with Nikon D700 -->
++            <distortion model="ptlens" focal="24" a="0.07" b="-0.19609" c="0.12989"/>
++            <distortion model="ptlens" focal="28" a="0.05574" b="-0.15106" c="0.10719"/>
++            <distortion model="ptlens" focal="35" a="0.02315" b="-0.05159" c="0.03497"/>
++            <distortion model="ptlens" focal="50" a="0.03875" b="-0.1185" c="0.13239"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.01224" c="0"/>
++            <distortion model="ptlens" focal="85" a="0.01293" b="-0.03888" c="0.06945"/>
++            <tca model="poly3" focal="24" br="0.0001551" vr="1.0000830" bb="-0.0002466" vb="1.0004527"/>
++            <tca model="poly3" focal="26" br="0.0001998" vr="0.9999858" bb="-0.0001978" vb="1.0003660"/>
++            <tca model="poly3" focal="28" br="0.0002641" vr="0.9998895" bb="-0.0002754" vb="1.0005002"/>
++            <tca model="poly3" focal="35" br="0.0000829" vr="0.9999597" bb="-0.0001594" vb="1.0003188"/>
++            <tca model="poly3" focal="50" br="0.0000425" vr="0.9999190" bb="-0.0000953" vb="1.0002240"/>
++            <tca model="poly3" focal="70" br="0.0000382" vr="0.9998777" bb="-0.0000390" vb="1.0000807"/>
++            <tca model="poly3" focal="85" br="0.0000388" vr="0.9998218" bb="-0.0000124" vb="1.0000196"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24-120mm f/3.5-5.6G ED-IF AF-S VR</model>
++        <model>Nikon AF Zoom-Nikkor 24-85mm f/2.8-4D IF</model>
++        <model lang="en">Nikkor AF 24-85mm f/2.8-4D IF</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.004393" b="-0.01801" c="0" />
+-            <distortion model="ptlens" focal="29" a="0" b="-0.003796" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0.002203" c="0" />
+-            <distortion model="ptlens" focal="52" a="0" b="0.005193" c="0" />
+-            <distortion model="ptlens" focal="62" a="0" b="0.005274" c="0" />
+-            <distortion model="ptlens" focal="75" a="0" b="0.00512" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.005317" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.00562" c="0" />
+-            <distortion model="ptlens" focal="120" a="0" b="0.005123" c="0" />
++            <distortion model="ptlens" focal="24" a="0.005" b="-0.022" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.004" b="-0.015" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.0008" b="-0.0025" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.0025" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.004" c="0"/>
++            <distortion model="ptlens" focal="85" a="0" b="0.004" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 28-200mm f/3.5-5.6G ED-IF AF</model>
++        <model>Nikon AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED</model>
++        <model lang="en">Nikkor AF-S 24-85mm f/3.5-4.5G IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="24" a="0.023939" b="-0.061462" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.013898" b="-0.018385" c="0"/>
++            <distortion model="ptlens" focal="52" a="0.00715" b="-0.000592" c="0"/>
++            <distortion model="ptlens" focal="70" a="0.003769" b="0.007774" c="0"/>
++            <distortion model="ptlens" focal="85" a="0.003412" b="0.0089" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF-S 24-120mm f/3.5-5.6G VR IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="-0.005311" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.004112" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.006691" c="0" />
+-            <distortion model="ptlens" focal="90" a="0" b="0.007929" c="0" />
+-            <distortion model="ptlens" focal="125" a="0" b="0.007482" c="0" />
+-            <distortion model="ptlens" focal="150" a="0" b="0.007459" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.007103" c="0" />
++            <distortion model="ptlens" focal="24" a="0.004393" b="-0.01801" c="0"/>
++            <distortion model="ptlens" focal="29" a="0" b="-0.003796" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.002203" c="0"/>
++            <distortion model="ptlens" focal="52" a="0" b="0.005193" c="0"/>
++            <distortion model="ptlens" focal="62" a="0" b="0.005274" c="0"/>
++            <distortion model="ptlens" focal="75" a="0" b="0.00512" c="0"/>
++            <distortion model="ptlens" focal="85" a="0" b="0.005317" c="0"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.00562" c="0"/>
++            <distortion model="ptlens" focal="120" a="0" b="0.005123" c="0"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 28-300mm f/3.5-5.6G ED VR AF-S</model>
++        <model>Nikon AF-S Nikkor 24-120mm f/4G ED VR</model>
++        <model lang="en">Nikkor AF-S 24-120mm f/4G ED VR</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="-0.02406" c="0" />
+-            <distortion model="ptlens" focal="32" a="0" b="-0.01294" c="0" />
+-            <distortion model="ptlens" focal="34" a="0" b="-0.00517" c="0" />
+-            <distortion model="ptlens" focal="36" a="0" b="-0.00147" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.00848" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.01241" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.01124" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.00807" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.00904" c="0" />
++            <!-- Taken with Nikon D700 -->
++            <distortion model="ptlens" focal="24" a="0.01497" b="-0.04816" c="0.01104"/>
++            <distortion model="ptlens" focal="28" a="0.01614" b="-0.04771" c="0.04039"/>
++            <distortion model="ptlens" focal="35" a="0.01013" b="-0.0181" c="0.02252"/>
++            <distortion model="ptlens" focal="50" a="-0.00625" b="0.05219" c="-0.06038"/>
++            <distortion model="ptlens" focal="85" a="0.00892" b="-0.00361" c="0.00588"/>
++            <distortion model="ptlens" focal="120" a="0.00886" b="-0.01374" c="0.02566"/>
++            <tca model="poly3" focal="24" br="-0.0000026" vr="1.0004833" bb="0.0000117" vb="1.0000751"/>
++            <tca model="poly3" focal="28" br="0.0000002" vr="1.0004185" bb="-0.0000181" vb="1.0001370"/>
++            <tca model="poly3" focal="35" br="0.0000152" vr="1.0002567" bb="-0.0000347" vb="1.0001667"/>
++            <tca model="poly3" focal="50" br="-0.0000101" vr="1.0001043" bb="-0.0000518" vb="1.0001772"/>
++            <tca model="poly3" focal="85" br="0.0000209" vr="0.9998799" bb="-0.0000182" vb="0.9999789"/>
++            <tca model="poly3" focal="120" br="-0.0000034" vr="0.9997514" bb="0.0000435" vb="0.9998576"/>
+         </calibration>
+-    </lens>    
+-
++    </lens>
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 35-70mm f/2.8D AF</model>
++        <model>Nikon AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF 28-200mm f/3.5-5.6G IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0" b="-0.005179" c="0" />
+-            <distortion model="ptlens" focal="39" a="0" b="-0.003271" c="0" />
+-            <distortion model="ptlens" focal="44" a="0" b="-0.001363" c="0" />
+-            <distortion model="ptlens" focal="52" a="0" b="0.002606" c="0" />
+-            <distortion model="ptlens" focal="62" a="0" b="0.002756" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.003679" c="0" />
++            <distortion model="poly3" focal="28" k1="-0.005311"/>
++            <distortion model="poly3" focal="35" k1="0"/>
++            <distortion model="poly3" focal="50" k1="0.004112"/>
++            <distortion model="poly3" focal="70" k1="0.006691"/>
++            <distortion model="poly3" focal="90" k1="0.007929"/>
++            <distortion model="poly3" focal="125" k1="0.007482"/>
++            <distortion model="poly3" focal="150" k1="0.007459"/>
++            <distortion model="poly3" focal="200" k1="0.007103"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 50-135mm f/3.5 AI-S</model>
++        <model>Nikon AF-S Zoom-Nikkor 28-300mm f/3.5-5.6G ED VR</model>
++        <model lang="en">Nikkor AF-S 28-300mm f/3.5-5.6G ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="ptlens" focal="28" a="0.02437" b="-0.07944" c="0.03221"/>
++            <distortion model="ptlens" focal="32" a="0.02279" b="-0.05938" c="0.02075"/>
++            <distortion model="ptlens" focal="35" a="0.02285" b="-0.05351" c="0.02656"/>
++            <distortion model="ptlens" focal="50" a="0.00822" b="-0.00508" c="0.01128"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.01364" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.01154" c="0"/>
++            <tca model="poly3" focal="28" br="-0.0000975" vr="1.0006202" bb="0.0001084" vb="0.9999783"/>
++            <tca model="poly3" focal="32" br="-0.0000959" vr="1.0005671" bb="0.0000886" vb="1.0000226"/>
++            <tca model="poly3" focal="35" br="-0.0000971" vr="1.0004956" bb="0.0000702" vb="1.0000984"/>
++            <tca model="poly3" focal="50" br="-0.0000442" vr="1.0001869" bb="0.0000512" vb="1.0001978"/>
++            <tca model="poly3" focal="135" br="0.0000755" vr="0.9997563" bb="-0.0000986" vb="1.0002884"/>
++            <tca model="poly3" focal="300" br="-0.0000196" vr="0.9998476" bb="-0.0000967" vb="0.9999651"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Zoom-Nikkor 35-70mm f/2.8D</model>
++        <model lang="en">Nikkor AF 35-70mm f/2.8D</model>
++        <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="35" k1="-0.005179"/>
++            <distortion model="poly3" focal="39" k1="-0.003271"/>
++            <distortion model="poly3" focal="44" k1="-0.001363"/>
++            <distortion model="poly3" focal="52" k1="0.002606"/>
++            <distortion model="poly3" focal="62" k1="0.002756"/>
++            <distortion model="poly3" focal="70" k1="0.003679"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Zoom-Nikkor 50-135mm f/3.5</model>
++        <model lang="en">Nikkor AI-S 50-135mm f/3.5</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.0045" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.002" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.004" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.0045"/>
++            <distortion model="poly3" focal="85" k1="0.002"/>
++            <distortion model="poly3" focal="135" k1="0.004"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 55-200mm f/4-5.6 G ED AF-S DX</model>
++        <model>Nikon AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED</model>
++        <model lang="en">Nikkor AF-S 55-200mm f/4-5.6G DX ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="55" a="0" b="-0.000404" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.004874" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.00919" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.010207" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.010639" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.008208" c="0" />
++            <distortion model="poly3" focal="55" k1="-0.000404"/>
++            <distortion model="poly3" focal="70" k1="0.004874"/>
++            <distortion model="poly3" focal="85" k1="0.00919"/>
++            <distortion model="poly3" focal="105" k1="0.010207"/>
++            <distortion model="poly3" focal="135" k1="0.010639"/>
++            <distortion model="poly3" focal="200" k1="0.008208"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 70-180mm f/4.5-5.6 ED-AF-D Micro</model>
++        <model>Nikon AF Zoom-Nikkor 70-180mm f/4.5-5.6D ED Micro</model>
++        <model lang="en">Nikkor AF 70-180mm f/4.5-5.6D ED Micro</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.0012" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.002" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.0025" c="0" />
+-            <distortion model="ptlens" focal="180" a="0" b="0.0025" c="0" />
++            <distortion model="poly3" focal="70" k1="0"/>
++            <distortion model="poly3" focal="85" k1="0.0012"/>
++            <distortion model="poly3" focal="105" k1="0.002"/>
++            <distortion model="poly3" focal="135" k1="0.0025"/>
++            <distortion model="poly3" focal="180" k1="0.0025"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 70-200mm f/2.8G ED-IF AF-S VR</model>
++        <model>Nikon AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED</model>
++        <model lang="en">Nikkor AF-S 70-200mm f/2.8G VR IF-ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.004652" c="0" />
+-            <distortion model="ptlens" focal="80" a="0" b="-0.003298" c="0" />
+-            <distortion model="ptlens" focal="90" a="0" b="-0.001805" c="0" />
+-            <distortion model="ptlens" focal="120" a="0" b="0.001192" c="0" />
+-            <distortion model="ptlens" focal="175" a="0" b="0.003465" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.003092" c="0" />
++            <distortion model="poly3" focal="70" k1="-0.004652"/>
++            <distortion model="poly3" focal="80" k1="-0.003298"/>
++            <distortion model="poly3" focal="90" k1="-0.001805"/>
++            <distortion model="poly3" focal="120" k1="0.001192"/>
++            <distortion model="poly3" focal="175" k1="0.003465"/>
++            <distortion model="poly3" focal="200" k1="0.003092"/>
++            <!-- Taken with Nikon D200 -->
++            <tca model="poly3" focal="70" br="-0.0000139" vr="1.0005016" bb="0.0000440" vb="0.9999365"/>
++            <tca model="poly3" focal="105" br="-0.0000755" vr="1.0004989" bb="0.0000212" vb="0.9997837"/>
++            <tca model="poly3" focal="200" br="-0.0000333" vr="1.0000038" bb="-0.0000116" vb="0.9998885"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.1548" k2="-0.0576" k3="0.0691"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.1548" k2="-0.0576" k3="0.0691"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0502" k2="-0.0086" k3="0.0318"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0502" k2="-0.0086" k3="0.0318"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0752" k2="0.0601" k3="-0.0098"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0752" k2="0.0601" k3="-0.0098"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0222" k2="-0.0378" k3="0.0339"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0222" k2="-0.0378" k3="0.0339"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.0779" k2="0.0479" k3="0.0008"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0779" k2="0.0479" k3="0.0008"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.0812" k2="-0.2020" k3="0.1569"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.0812" k2="-0.2020" k3="0.1569"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0804" k2="0.0396" k3="0.0114"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0804" k2="0.0396" k3="0.0114"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.0623" k2="-0.0287" k3="0.0571"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.0623" k2="-0.0287" k3="0.0571"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0873" k2="0.0007" k3="0.0506"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0873" k2="0.0007" k3="0.0506"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.0870" k2="0.0578" k3="-0.0007"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.0870" k2="0.0578" k3="-0.0007"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-0.0805" k2="-0.0846" k3="0.0237"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-0.0805" k2="-0.0846" k3="0.0237"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.0399" k2="-0.0181" k3="0.0355"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.0399" k2="-0.0181" k3="0.0355"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0396" k2="-0.0572" k3="0.0756"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0396" k2="-0.0572" k3="0.0756"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0297" k2="-0.1049" k3="0.1044"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0297" k2="-0.1049" k3="0.1044"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.1020" k2="0.0707" k3="-0.0067"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.1020" k2="0.0707" k3="-0.0067"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="0.0145" k2="-0.5274" k3="0.2697"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="0.0145" k2="-0.5274" k3="0.2697"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.0682" k2="0.0135" k3="0.0063"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.0682" k2="0.0135" k3="0.0063"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.0379" k2="-0.0497" k3="0.0685"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0379" k2="-0.0497" k3="0.0685"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0447" k2="-0.0226" k3="0.0472"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0447" k2="-0.0226" k3="0.0472"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.1378" k2="0.1011" k3="-0.0091"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1378" k2="0.1011" k3="-0.0091"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.7336" k2="0.6048" k3="-0.2446"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.7336" k2="0.6048" k3="-0.2446"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="0.0202" k2="-0.3596" k3="0.1708"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="0.0202" k2="-0.3596" k3="0.1708"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0544" k2="0.0322" k3="-0.0097"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0544" k2="0.0322" k3="-0.0097"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0500" k2="-0.0288" k3="0.0551"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0500" k2="-0.0288" k3="0.0551"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1208" k2="0.0927" k3="-0.0197"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1208" k2="0.0927" k3="-0.0197"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This entry is odd.  I had to change the mount from AF to AI-S.
++             Besides, it is only measured up to 200mm. -->
+         <maker>Nikon</maker>
+-        <model>Nikkor 70-210mm f/4.5-5.6</model>
++        <model>Nikon AI-S Zoom-Nikkor 70-210mm f/4.5-5.6</model>
++        <model lang="en">Nikkor AI-S 70-210mm f/4.5-5.6</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="70" k1="-0.007958"/>
++            <distortion model="poly3" focal="82" k1="-0.001119"/>
++            <distortion model="poly3" focal="110" k1="0.00521"/>
++            <distortion model="poly3" focal="125" k1="0.006972"/>
++            <distortion model="poly3" focal="200" k1="0.006988"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Zoom-Nikkor 70-210mm f/4</model>
++        <model lang="en">Nikkor AF 70-210mm f/4</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <!-- Average crop factor of Nikon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.007958" c="0" />
+-            <distortion model="ptlens" focal="82" a="0" b="-0.001119" c="0" />
+-            <distortion model="ptlens" focal="110" a="0" b="0.00521" c="0" />
+-            <distortion model="ptlens" focal="125" a="0" b="0.006972" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.006988" c="0" />
++            <distortion model="ptlens" focal="70" a="-0.002443" b="0.001936" c="0"/>
++            <distortion model="ptlens" focal="78" a="0.000804" b="-0.004536" c="0"/>
++            <distortion model="ptlens" focal="82" a="0.002886" b="-0.009226" c="0"/>
++            <distortion model="ptlens" focal="90" a="9.9e-05" b="-0.002281" c="0"/>
++            <distortion model="ptlens" focal="95" a="0.002007" b="-0.005764" c="0"/>
++            <distortion model="ptlens" focal="102" a="0.001088" b="-0.003316" c="0"/>
++            <distortion model="ptlens" focal="110" a="0.003534" b="-0.00822" c="0"/>
++            <distortion model="ptlens" focal="116" a="0.003553" b="-0.008697" c="0"/>
++            <distortion model="ptlens" focal="125" a="-0.001714" b="-0.00535" c="0"/>
++            <distortion model="ptlens" focal="135" a="0.002342" b="0" c="0"/>
++            <distortion model="ptlens" focal="155" a="0.002777" b="-0.005752" c="0"/>
++            <distortion model="ptlens" focal="165" a="0.004853" b="-0.00977" c="0"/>
++            <distortion model="ptlens" focal="210" a="0.003682" b="-0.006324" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 70-210mm f/4 AF</model>
++        <model>Nikon AF Nikkor 70-210mm f/4-5.6</model>
++        <model lang="en">Nikkor AF 70-210mm f/4-5.6</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="-0.002443" b="0.001936" c="0" />
+-            <distortion model="ptlens" focal="78" a="0.000804" b="-0.004536" c="0" />
+-            <distortion model="ptlens" focal="82" a="0.002886" b="-0.009226" c="0" />
+-            <distortion model="ptlens" focal="90" a="9.9e-05" b="-0.002281" c="0" />
+-            <distortion model="ptlens" focal="95" a="0.002007" b="-0.005764" c="0" />
+-            <distortion model="ptlens" focal="102" a="0.001088" b="-0.003316" c="0" />
+-            <distortion model="ptlens" focal="110" a="0.003534" b="-0.00822" c="0" />
+-            <distortion model="ptlens" focal="116" a="0.003553" b="-0.008697" c="0" />
+-            <distortion model="ptlens" focal="125" a="-0.001714" b="-0.00535" c="0" />
+-            <distortion model="ptlens" focal="135" a="0.002342" b="0" c="0" />
+-            <distortion model="ptlens" focal="155" a="0.002777" b="-0.005752" c="0" />
+-            <distortion model="ptlens" focal="165" a="0.004853" b="-0.00977" c="0" />
+-            <distortion model="ptlens" focal="210" a="0.003682" b="-0.006324" c="0" />
++            <!-- Taken with Nikon D200 -->
++            <distortion model="poly3" focal="70" k1="-0.0034"/>
++            <distortion model="poly3" focal="102" k1="0.00153"/>
++            <distortion model="poly3" focal="210" k1="0.00341"/>
++            <tca model="poly3" focal="70" br="0.0000373" vr="0.9998224" bb="-0.0000778" vb="1.0003677"/>
++            <tca model="poly3" focal="102" br="0.0000144" vr="0.9997907" bb="-0.0000537" vb="1.0001547"/>
++            <tca model="poly3" focal="210" br="0.0000270" vr="0.9997316" bb="-0.0000299" vb="0.9998035"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.2861" k2="-0.0601" k3="0.0734"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.2861" k2="-0.0601" k3="0.0734"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1225" k2="0.0837" k3="0.0004"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1225" k2="0.0837" k3="0.0004"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1345" k2="0.1328" k3="-0.0439"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1345" k2="0.1328" k3="-0.0439"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1416" k2="0.1935" k3="-0.0979"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1416" k2="0.1935" k3="-0.0979"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0502" k2="0.0245" k3="-0.0038"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0502" k2="0.0245" k3="-0.0038"/>
++            <vignetting model="pa" focal="82" aperture="4" distance="10" k1="-0.3226" k2="-0.0064" k3="0.0431"/>
++            <vignetting model="pa" focal="82" aperture="4" distance="1000" k1="-0.3226" k2="-0.0064" k3="0.0431"/>
++            <vignetting model="pa" focal="82" aperture="5.6" distance="10" k1="-0.0482" k2="-0.0181" k3="0.0398"/>
++            <vignetting model="pa" focal="82" aperture="5.6" distance="1000" k1="-0.0482" k2="-0.0181" k3="0.0398"/>
++            <vignetting model="pa" focal="82" aperture="8" distance="10" k1="-0.0871" k2="0.0600" k3="-0.0066"/>
++            <vignetting model="pa" focal="82" aperture="8" distance="1000" k1="-0.0871" k2="0.0600" k3="-0.0066"/>
++            <vignetting model="pa" focal="82" aperture="11" distance="10" k1="-0.0841" k2="0.0483" k3="-0.0014"/>
++            <vignetting model="pa" focal="82" aperture="11" distance="1000" k1="-0.0841" k2="0.0483" k3="-0.0014"/>
++            <vignetting model="pa" focal="82" aperture="32" distance="10" k1="0.0012" k2="-0.0493" k3="0.0208"/>
++            <vignetting model="pa" focal="82" aperture="32" distance="1000" k1="0.0012" k2="-0.0493" k3="0.0208"/>
++            <vignetting model="pa" focal="102" aperture="4.2" distance="10" k1="-0.3053" k2="-0.0583" k3="0.0852"/>
++            <vignetting model="pa" focal="102" aperture="4.2" distance="1000" k1="-0.3053" k2="-0.0583" k3="0.0852"/>
++            <vignetting model="pa" focal="102" aperture="5.6" distance="10" k1="-0.0559" k2="0.0156" k3="0.0125"/>
++            <vignetting model="pa" focal="102" aperture="5.6" distance="1000" k1="-0.0559" k2="0.0156" k3="0.0125"/>
++            <vignetting model="pa" focal="102" aperture="8" distance="10" k1="-0.0406" k2="0.0315" k3="-0.0077"/>
++            <vignetting model="pa" focal="102" aperture="8" distance="1000" k1="-0.0406" k2="0.0315" k3="-0.0077"/>
++            <vignetting model="pa" focal="102" aperture="11" distance="10" k1="-0.1018" k2="0.1464" k3="-0.0746"/>
++            <vignetting model="pa" focal="102" aperture="11" distance="1000" k1="-0.1018" k2="0.1464" k3="-0.0746"/>
++            <vignetting model="pa" focal="102" aperture="36" distance="10" k1="-0.0872" k2="0.0461" k3="0.0096"/>
++            <vignetting model="pa" focal="102" aperture="36" distance="1000" k1="-0.0872" k2="0.0461" k3="0.0096"/>
++            <vignetting model="pa" focal="125" aperture="4.5" distance="10" k1="-0.2286" k2="-0.2164" k3="0.1895"/>
++            <vignetting model="pa" focal="125" aperture="4.5" distance="1000" k1="-0.2286" k2="-0.2164" k3="0.1895"/>
++            <vignetting model="pa" focal="125" aperture="6.3" distance="10" k1="-0.0735" k2="0.0411" k3="0.0078"/>
++            <vignetting model="pa" focal="125" aperture="6.3" distance="1000" k1="-0.0735" k2="0.0411" k3="0.0078"/>
++            <vignetting model="pa" focal="125" aperture="9" distance="10" k1="-0.0528" k2="0.0101" k3="0.0271"/>
++            <vignetting model="pa" focal="125" aperture="9" distance="1000" k1="-0.0528" k2="0.0101" k3="0.0271"/>
++            <vignetting model="pa" focal="125" aperture="13" distance="10" k1="-0.0621" k2="0.0220" k3="0.0111"/>
++            <vignetting model="pa" focal="125" aperture="13" distance="1000" k1="-0.0621" k2="0.0220" k3="0.0111"/>
++            <vignetting model="pa" focal="125" aperture="36" distance="10" k1="-0.0675" k2="0.0527" k3="-0.0153"/>
++            <vignetting model="pa" focal="125" aperture="36" distance="1000" k1="-0.0675" k2="0.0527" k3="-0.0153"/>
++            <vignetting model="pa" focal="170" aperture="5" distance="10" k1="-0.4458" k2="0.1961" k3="-0.0162"/>
++            <vignetting model="pa" focal="170" aperture="5" distance="1000" k1="-0.4458" k2="0.1961" k3="-0.0162"/>
++            <vignetting model="pa" focal="170" aperture="7.1" distance="10" k1="-0.0658" k2="0.0562" k3="-0.0026"/>
++            <vignetting model="pa" focal="170" aperture="7.1" distance="1000" k1="-0.0658" k2="0.0562" k3="-0.0026"/>
++            <vignetting model="pa" focal="170" aperture="10" distance="10" k1="-0.0612" k2="0.0642" k3="-0.0133"/>
++            <vignetting model="pa" focal="170" aperture="10" distance="1000" k1="-0.0612" k2="0.0642" k3="-0.0133"/>
++            <vignetting model="pa" focal="170" aperture="14" distance="10" k1="-0.0313" k2="0.0656" k3="-0.0408"/>
++            <vignetting model="pa" focal="170" aperture="14" distance="1000" k1="-0.0313" k2="0.0656" k3="-0.0408"/>
++            <vignetting model="pa" focal="170" aperture="40" distance="10" k1="-0.1080" k2="0.1140" k3="-0.0363"/>
++            <vignetting model="pa" focal="170" aperture="40" distance="1000" k1="-0.1080" k2="0.1140" k3="-0.0363"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="10" k1="-0.6111" k2="0.6038" k3="-0.2677"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="1000" k1="-0.6111" k2="0.6038" k3="-0.2677"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="-0.0528" k2="0.0272" k3="0.0181"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="-0.0528" k2="0.0272" k3="0.0181"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="10" k1="-0.0371" k2="0.0583" k3="-0.0324"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="1000" k1="-0.0371" k2="0.0583" k3="-0.0324"/>
++            <vignetting model="pa" focal="210" aperture="16" distance="10" k1="-0.0773" k2="0.0963" k3="-0.0392"/>
++            <vignetting model="pa" focal="210" aperture="16" distance="1000" k1="-0.0773" k2="0.0963" k3="-0.0392"/>
++            <vignetting model="pa" focal="210" aperture="45" distance="10" k1="-0.1446" k2="0.2322" k3="-0.1162"/>
++            <vignetting model="pa" focal="210" aperture="45" distance="1000" k1="-0.1446" k2="0.2322" k3="-0.1162"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 70-300mm f/4-5.6D ED AF</model>
++        <model>Nikon AF Zoom-Nikkor 70-300mm f/4-5.6D ED</model>
++        <model lang="en">Nikkor AF 70-300mm f/4-5.6D ED</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.001254" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.004173" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.006434" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.005485" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.004364" c="0" />
++            <distortion model="poly3" focal="70" k1="-0.001254"/>
++            <distortion model="poly3" focal="100" k1="0.004173"/>
++            <distortion model="poly3" focal="135" k1="0.006434"/>
++            <distortion model="poly3" focal="200" k1="0.005485"/>
++            <distortion model="poly3" focal="300" k1="0.004364"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 70-300mm f/4-5.6G AF</model>
++        <model>Nikon AF Zoom-Nikkor 70-300mm f/4-5.6G</model>
++        <model lang="en">Nikkor AF 70-300mm f/4-5.6G</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.001254" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.004173" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.006434" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.005485" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.004364" c="0" />
++            <distortion model="poly3" focal="70" k1="-0.001254"/>
++            <distortion model="poly3" focal="100" k1="0.004173"/>
++            <distortion model="poly3" focal="135" k1="0.006434"/>
++            <distortion model="poly3" focal="200" k1="0.005485"/>
++            <distortion model="poly3" focal="300" k1="0.004364"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 80-200mm f/2.8D ED AF</model>
++        <model>Nikon AF Zoom-Nikkor 80-200mm f/2.8D ED</model>
++        <model lang="en">Nikkor AF 80-200mm f/2.8D ED</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="0" b="-0.00511" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.000515" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.004233" c="0" />
+-            <distortion model="ptlens" focal="180" a="0" b="0.010432" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.010603" c="0" />
++            <distortion model="poly3" focal="80" k1="-0.00511"/>
++            <distortion model="poly3" focal="105" k1="0.000515"/>
++            <distortion model="poly3" focal="135" k1="0.004233"/>
++            <distortion model="poly3" focal="180" k1="0.010432"/>
++            <distortion model="poly3" focal="200" k1="0.010603"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 80-400mm f/4.5-5.6 ED-AF-D-VR</model>
++        <model>Nikon AF Zoom-Nikkor 80-200mm f/2.8 ED</model>
++        <model lang="en">Nikkor AF 80-200mm f/2.8 ED</model>
+         <mount>Nikon F AF</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="0" b="-0.0043" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="-0.0015" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.001" c="0" />
+-            <distortion model="ptlens" focal="210" a="0" b="0.0025" c="0" />
+-            <distortion model="ptlens" focal="310" a="0" b="0.0035" c="0" />
+-            <distortion model="ptlens" focal="400" a="0" b="0.0045" c="0" />
++            <!-- Taken with Nikon D200 -->
++            <distortion model="poly3" focal="80" k1="-0.00191"/>
++            <distortion model="poly3" focal="110" k1="0.00107"/>
++            <distortion model="poly3" focal="200" k1="0.00438"/>
++            <tca model="poly3" focal="80" br="-0.0000366" vr="1.0002716" bb="0.0000285" vb="0.9997080"/>
++            <tca model="poly3" focal="110" br="-0.0000221" vr="1.0000859" bb="0.0000001" vb="0.9998561"/>
++            <tca model="poly3" focal="200" br="-0.0000060" vr="0.9998234" bb="-0.0000254" vb="0.9998604"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.4473" k2="0.4203" k3="-0.2007"/>
++            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.4473" k2="0.4203" k3="-0.2007"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0148" k2="-0.3189" k3="0.2149"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0148" k2="-0.3189" k3="0.2149"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.0473" k2="0.0287" k3="0.0064"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.0473" k2="0.0287" k3="0.0064"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0647" k2="0.0492" k3="0.0012"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0647" k2="0.0492" k3="0.0012"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.0761" k2="0.0601" k3="0.0006"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.0761" k2="0.0601" k3="0.0006"/>
++            <vignetting model="pa" focal="95" aperture="2.8" distance="10" k1="-0.3782" k2="0.3353" k3="-0.1566"/>
++            <vignetting model="pa" focal="95" aperture="2.8" distance="1000" k1="-0.3782" k2="0.3353" k3="-0.1566"/>
++            <vignetting model="pa" focal="95" aperture="4" distance="10" k1="-0.0143" k2="-0.2479" k3="0.1636"/>
++            <vignetting model="pa" focal="95" aperture="4" distance="1000" k1="-0.0143" k2="-0.2479" k3="0.1636"/>
++            <vignetting model="pa" focal="95" aperture="5.6" distance="10" k1="-0.0710" k2="0.0532" k3="-0.0012"/>
++            <vignetting model="pa" focal="95" aperture="5.6" distance="1000" k1="-0.0710" k2="0.0532" k3="-0.0012"/>
++            <vignetting model="pa" focal="95" aperture="8" distance="10" k1="-0.0398" k2="0.0049" k3="0.0291"/>
++            <vignetting model="pa" focal="95" aperture="8" distance="1000" k1="-0.0398" k2="0.0049" k3="0.0291"/>
++            <vignetting model="pa" focal="95" aperture="22" distance="10" k1="-0.0874" k2="0.0937" k3="-0.0267"/>
++            <vignetting model="pa" focal="95" aperture="22" distance="1000" k1="-0.0874" k2="0.0937" k3="-0.0267"/>
++            <vignetting model="pa" focal="110" aperture="2.8" distance="10" k1="-0.3351" k2="0.2800" k3="-0.1310"/>
++            <vignetting model="pa" focal="110" aperture="2.8" distance="1000" k1="-0.3351" k2="0.2800" k3="-0.1310"/>
++            <vignetting model="pa" focal="110" aperture="4" distance="10" k1="0.0172" k2="-0.2269" k3="0.1388"/>
++            <vignetting model="pa" focal="110" aperture="4" distance="1000" k1="0.0172" k2="-0.2269" k3="0.1388"/>
++            <vignetting model="pa" focal="110" aperture="5.6" distance="10" k1="-0.0253" k2="-0.0061" k3="0.0264"/>
++            <vignetting model="pa" focal="110" aperture="5.6" distance="1000" k1="-0.0253" k2="-0.0061" k3="0.0264"/>
++            <vignetting model="pa" focal="110" aperture="8" distance="10" k1="-0.0718" k2="0.0580" k3="0.0005"/>
++            <vignetting model="pa" focal="110" aperture="8" distance="1000" k1="-0.0718" k2="0.0580" k3="0.0005"/>
++            <vignetting model="pa" focal="110" aperture="22" distance="10" k1="-0.0147" k2="-0.0303" k3="0.0443"/>
++            <vignetting model="pa" focal="110" aperture="22" distance="1000" k1="-0.0147" k2="-0.0303" k3="0.0443"/>
++            <vignetting model="pa" focal="145" aperture="2.8" distance="10" k1="-0.3485" k2="0.3714" k3="-0.2311"/>
++            <vignetting model="pa" focal="145" aperture="2.8" distance="1000" k1="-0.3485" k2="0.3714" k3="-0.2311"/>
++            <vignetting model="pa" focal="145" aperture="4" distance="10" k1="-0.0255" k2="-0.0465" k3="-0.0269"/>
++            <vignetting model="pa" focal="145" aperture="4" distance="1000" k1="-0.0255" k2="-0.0465" k3="-0.0269"/>
++            <vignetting model="pa" focal="145" aperture="5.6" distance="10" k1="-0.0549" k2="0.0362" k3="0.0084"/>
++            <vignetting model="pa" focal="145" aperture="5.6" distance="1000" k1="-0.0549" k2="0.0362" k3="0.0084"/>
++            <vignetting model="pa" focal="145" aperture="8" distance="10" k1="-0.0316" k2="0.0254" k3="0.0026"/>
++            <vignetting model="pa" focal="145" aperture="8" distance="1000" k1="-0.0316" k2="0.0254" k3="0.0026"/>
++            <vignetting model="pa" focal="145" aperture="22" distance="10" k1="-0.0966" k2="0.1129" k3="-0.0535"/>
++            <vignetting model="pa" focal="145" aperture="22" distance="1000" k1="-0.0966" k2="0.1129" k3="-0.0535"/>
++            <vignetting model="pa" focal="170" aperture="2.8" distance="10" k1="-0.2468" k2="-0.0488" k3="0.0365"/>
++            <vignetting model="pa" focal="170" aperture="2.8" distance="1000" k1="-0.2468" k2="-0.0488" k3="0.0365"/>
++            <vignetting model="pa" focal="170" aperture="4" distance="10" k1="0.0696" k2="-0.4908" k3="0.2603"/>
++            <vignetting model="pa" focal="170" aperture="4" distance="1000" k1="0.0696" k2="-0.4908" k3="0.2603"/>
++            <vignetting model="pa" focal="170" aperture="5.6" distance="10" k1="-0.0527" k2="0.1160" k3="-0.0997"/>
++            <vignetting model="pa" focal="170" aperture="5.6" distance="1000" k1="-0.0527" k2="0.1160" k3="-0.0997"/>
++            <vignetting model="pa" focal="170" aperture="8" distance="10" k1="-0.0607" k2="0.0404" k3="0.0094"/>
++            <vignetting model="pa" focal="170" aperture="8" distance="1000" k1="-0.0607" k2="0.0404" k3="0.0094"/>
++            <vignetting model="pa" focal="170" aperture="22" distance="10" k1="-0.0148" k2="-0.0001" k3="0.0138"/>
++            <vignetting model="pa" focal="170" aperture="22" distance="1000" k1="-0.0148" k2="-0.0001" k3="0.0138"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.6363" k2="0.5329" k3="-0.2332"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.6363" k2="0.5329" k3="-0.2332"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.2372" k2="-0.2615" k3="0.2452"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.2372" k2="-0.2615" k3="0.2452"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.0625" k2="-0.2467" k3="0.0651"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0625" k2="-0.2467" k3="0.0651"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0299" k2="-0.0170" k3="0.0434"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0299" k2="-0.0170" k3="0.0434"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0755" k2="0.0954" k3="-0.0359"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0755" k2="0.0954" k3="-0.0359"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 14mm f/2.8D ED AF</model>
++        <model>Nikon AF Zoom-Nikkor 80-400mm f/4.5-5.6D ED VR</model>
++        <model lang="en">Nikkor AF 80-400mm f/4.5-5.6D ED VR</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0" />
++            <distortion model="poly3" focal="80" k1="-0.0043"/>
++            <distortion model="poly3" focal="105" k1="-0.0015"/>
++            <distortion model="poly3" focal="135" k1="0.001"/>
++            <distortion model="poly3" focal="210" k1="0.0025"/>
++            <distortion model="poly3" focal="310" k1="0.0035"/>
++            <distortion model="poly3" focal="400" k1="0.0045"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 15mm f/3.5 AI</model>
++        <model>Nikon AF Nikkor 14mm f/2.8D ED</model>
++        <model lang="en">Nikkor AF 14mm f/2.8D ED</model>
++        <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI Nikkor 15mm f/3.5</model>
++        <model lang="en">Nikkor AI 15mm f/3.5</model>
+         <mount>Nikon F AI</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="15" a="0.007" b="-0.021" c="0" />
++            <distortion model="ptlens" focal="15" a="0.007" b="-0.021" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 20mm f/2.8D AF</model>
++        <model>Nikon AF-S Nikkor 20mm f/1.8G ED</model>
++        <model lang="en">Nikkor AF-S 20mm f/1.8G ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <tca model="poly3" focal="20" br="-0.0003228" cr="0.0006409" vr="1.0000679" bb="-0.0000913" cb="0.0003007" vb="0.9998503"/>
++            <distortion model="ptlens" focal="20" a="0.0108146" b="-0.0341733" c="0.0157005"/>
++            <vignetting model="pa" focal="20" aperture="1.8" distance="0.2" k1="-1.0686" k2="0.3951" k3="0.0186"/>
++            <vignetting model="pa" focal="20" aperture="1.8" distance="0.24" k1="-1.2096" k2="0.5366" k3="-0.0236"/>
++            <vignetting model="pa" focal="20" aperture="1.8" distance="0.38" k1="-1.5504" k2="1.2150" k3="-0.3890"/>
++            <vignetting model="pa" focal="20" aperture="1.8" distance="1000" k1="-1.7048" k2="1.3931" k3="-0.4582"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="0.2" k1="-0.3641" k2="-0.8225" k3="0.6214"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="0.24" k1="-0.4548" k2="-0.8643" k3="0.7026"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="0.38" k1="-0.7270" k2="-0.4434" k3="0.5024"/>
++            <vignetting model="pa" focal="20" aperture="2" distance="1000" k1="-0.8702" k2="-0.2522" k3="0.4335"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.2" k1="-0.3622" k2="-0.2167" k3="0.2116"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.24" k1="-0.4164" k2="-0.1534" k3="0.1744"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="0.38" k1="-0.6996" k2="0.4790" k3="-0.2240"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.6336" k2="0.2486" k3="-0.1033"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.2" k1="-0.3516" k2="-0.2383" k3="0.2291"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.24" k1="-0.3952" k2="-0.2131" k3="0.2275"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="0.38" k1="-0.6166" k2="0.2305" k3="0.0035"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.6475" k2="0.3006" k3="-0.0426"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.2" k1="-0.3515" k2="-0.2368" k3="0.2315"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.24" k1="-0.3966" k2="-0.1973" k3="0.2139"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.38" k1="-0.6048" k2="0.2022" k3="0.0237"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5465" k2="0.0499" k3="0.1272"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.2" k1="-0.3512" k2="-0.2374" k3="0.2355"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.24" k1="-0.4014" k2="-0.1749" k3="0.1965"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.38" k1="-0.6057" k2="0.2036" k3="0.0249"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.5930" k2="0.1330" k3="0.0826"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.2" k1="-0.3541" k2="-0.2391" k3="0.2406"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.24" k1="-0.4074" k2="-0.1555" k3="0.1818"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.38" k1="-0.4803" k2="-0.0870" k3="0.2016"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.5851" k2="0.1049" k3="0.0964"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.2" k1="-0.3583" k2="-0.2654" k3="0.2630"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.24" k1="-0.4116" k2="-0.1414" k3="0.1713"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.38" k1="-0.6261" k2="0.2633" k3="-0.0120"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4951" k2="0.1771" k3="0.0365"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Nikkor 20mm f/2.8D</model>
++        <model lang="en">Nikkor AF 20mm f/2.8D</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="20" a="0.0063" b="-0.021" c="0" />
++            <distortion model="ptlens" focal="20" a="0.0063" b="-0.021" c="0"/>
+         </calibration>
+     </lens>
+-
+-    <!--lens>  replaced by new entry below which should give better results
++    <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24mm f/2.8D AF</model>
++        <model>Nikon AI-S Nikkor 24mm f/2.8</model>
++        <model lang="en">Nikkor AI-S 24mm f/2.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="24" a="0.0202" b="-0.05926" c="0.03781"/>
++            <!-- Taken with Nikon D600 -->
++            <tca model="poly3" focal="24" br="-0.0002082" vr="1.0007055" bb="0.0001896" vb="0.9996373"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Nikkor 24mm f/2.8D</model>
++        <model lang="en">Nikkor AF 24mm f/2.8D</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.00112" b="-0.00753" c="-0.00379" />
++            <distortion model="ptlens" focal="24" a="0.00112" b="-0.00753" c="-0.00379"/>
+         </calibration>
+-    </lens-->
+-
++    </lens>
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24mm f/2.8D AF</model>
++        <model>Nikon AF Nikkor 24mm f/2.8D</model>
++        <model lang="en">Nikkor AF 24mm f/2.8D</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.022" b="-0.056" c="0.022" />
++            <distortion model="ptlens" focal="24" a="0.022" b="-0.056" c="0.022"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24mm f/2.0 AI-S</model>
++        <model>Nikon AI-S Nikkor 24mm f/2.0</model>
++        <model lang="en">Nikkor AI-S 24mm f/2.0</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0" b="-0.008" c="0" />
++            <distortion model="poly3" focal="24" k1="-0.008"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 28mm f/2.8D AF</model>
++        <model>Nikon AI-S Nikkor 28mm f/2.8</model>
++        <model lang="en">Nikkor AI-S 28mm f/2.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="28" a="0.00929" b="-0.02155" c="0.0021"/>
++            <tca model="poly3" focal="28" br="-0.0002306" vr="1.0006860" bb="0.0002350" vb="0.9995614"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Nikkor 28mm f/2.8D</model>
++        <model lang="en">Nikkor AF 28mm f/2.8D</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="0.025773" c="-0.085777" />
++            <distortion model="ptlens" focal="28" a="0" b="0.025773" c="-0.085777"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 28mm f/2.0 AI-S</model>
++        <model>Nikon AI-S Nikkor 28mm f/2.0</model>
++        <model lang="en">Nikkor AI-S 28mm f/2.0</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="-0.0044" c="0" />
++            <distortion model="poly3" focal="28" k1="-0.0044"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 28mm f/3.5 AI-S PC (unshifted)</model>
++        <model>Nikon AI-S Nikkor 28mm f/3.5 PC (unshifted)</model>
++        <model lang="en">Nikkor AI-S 28mm f/3.5 PC (unshifted)</model>
++        <model lang="de">Nikkor AI-S 28mm f/3.5 PC (ungeshiftet)</model>
+         <mount>Nikon F AI-S</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.007377" b="-0.021769" c="0" />
++            <distortion model="ptlens" focal="28" a="0.007377" b="-0.021769" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 35mm f/1.4 AI-S</model>
+-        <mount>Nikon F AI-S</mount>
+-        <cropfactor>1.5</cropfactor>
++        <model>Nikon AF-S Nikkor 28mm f/1.8G</model>
++        <model lang="en">Nikkor AF-S 28mm f/1.8G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0" b="-0.005" c="0" />
++            <!-- Taken with Nikon D810 -->
++            <distortion model="ptlens" focal="28" a="0.00961" b="-0.02915" c="0.01024"/>
++            <tca model="poly3" focal="28" br="-0.0000955" vr="1.0002765" bb="0.0000582" vb="0.9999656"/>
+         </calibration>
+     </lens>
+-    
+-    <!--lens>  Superseeded by the following profile. Can be removed in future.
++    <lens>
+         <maker>Nikon</maker>
+-        <model>Nikon Nikkor 35mm f/1.8G AF-S DX</model>
++        <model>Nikon AF Nikkor 28mm f/1.4D</model>
++        <model lang="en">Nikkor AF 28mm f/1.4D</model>
+         <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3S -->
++            <distortion model="ptlens" focal="28" a="0.00913976" b="-0.0245588" c="0.000542579"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 35mm f/2.0</model>
++        <model lang="en">Nikkor AI-S 35mm f/2.0</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="35" a="0.01447" b="-0.03949" c="0.0153"/>
++            <tca model="poly3" focal="35" br="-0.0001699" vr="1.0005262" bb="0.0001817" vb="0.9996614"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 35mm f/1.4</model>
++        <model lang="en">Nikkor AI-S 35mm f/1.4</model>
++        <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="-0.00899" b="0.02507" c="-0.04009" />
++            <distortion model="poly3" focal="35" k1="-0.005"/>
+         </calibration>
+-    </lens-->
+-
++    </lens>
+     <lens>
+         <maker>Nikon</maker>
+         <model>Nikon AF-S DX Nikkor 35mm f/1.8G</model>
++        <model lang="en">Nikkor AF-S 35mm f/1.8G DX</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.003" b="-0.017" c="0.005" />
+-            <tca model="linear" focal="35" kr="1.0003" kb="1.0003" />
++            <distortion model="ptlens" focal="35" a="0.003" b="-0.017" c="0.005"/>
++            <tca model="linear" focal="35" kr="1.0003" kb="1.0003"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-0.3298" k2="-0.0595" k3="0.0938"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-0.3298" k2="-0.0595" k3="0.0938"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.1367" k2="0.0656" k3="-0.0502"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.1367" k2="0.0656" k3="-0.0502"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.1170" k2="0.0027" k3="0.0072"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1170" k2="0.0027" k3="0.0072"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.1203" k2="0.0086" k3="0.0030"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.1203" k2="0.0086" k3="0.0030"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1143" k2="-0.0162" k3="0.0186"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1143" k2="-0.0162" k3="0.0186"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 35mm f/2.0D AF</model>
++        <model>Nikon AF Nikkor 35mm f/2.0D</model>
++        <model lang="en">Nikkor AF 35mm f/2.0D</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="35" a="0.001968" b="-0.009475" c="0" />
++            <distortion model="ptlens" focal="35" a="0.001968" b="-0.009475" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 45mm f/2.8 AI GN</model>
++        <model>Nikon AI Nikkor 45mm f/2.8 GN</model>
++        <model lang="en">Nikkor AI 45mm f/2.8 GN</model>
+         <mount>Nikon F AI</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="45" a="0" b="-0.0005" c="0" />
++            <distortion model="poly3" focal="45" k1="-0.0005"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 50mm f/1.4D AF</model>
++        <model>Nikon AF Nikkor 50mm f/1.4D</model>
++        <model lang="en">Nikkor AF 50mm f/1.4D</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.004672" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.004672"/>
++            <!-- Taken with Nikon D800 -->
++            <tca model="poly3" focal="50" br="-0.0000912" vr="1.0001917" bb="0.0001150" vb="0.9998601"/>
++            <!-- Taken with Nikon D610 -->
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.6128" k2="1.1600" k3="-0.2864"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.6128" k2="1.1600" k3="-0.2864"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="0.0016" k2="-0.4910" k3="-0.0246"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="0.0016" k2="-0.4910" k3="-0.0246"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3729" k2="0.3408" k3="-0.2180"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3729" k2="0.3408" k3="-0.2180"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.4912" k2="0.5335" k3="-0.2775"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4912" k2="0.5335" k3="-0.2775"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 50mm f/1.4 AI-S</model>
++        <model>Nikon AI-S Nikkor 50mm f/1.4</model>
++        <model lang="en">Nikkor AI-S 50mm f/1.4</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.0025" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.0025"/>
+         </calibration>
+     </lens>
+-    
+-    <lens> <!-- http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3047&group_id=9034 -->
++    <lens>
++        <!-- Submitted by Ed Gomez -->
+         <maker>Nikon</maker>
+         <model>Nikon AF Nikkor 50mm f/1.8D</model>
++        <model lang="en">Nikkor AF 50mm f/1.8D</model>
+         <mount>Nikon F AF</mount>
+-        <focal value="50" />
+-        <aperture min="1.8" max="22" />
++        <focal value="50"/>
++        <aperture min="1.8" max="22"/>
+         <type>rectilinear</type>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50.0" a="-0.00255" b="0.00841" c="-0.01107" />
++            <distortion model="ptlens" focal="50" a="-0.00255" b="0.00841" c="-0.01107"/>
+         </calibration>
+-    </lens>    
+-
++    </lens>
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 50mm f/1.8 AI-S</model>
++        <model>Nikon AF Nikkor 50mm f/1.8D</model>
++        <model lang="en">Nikkor AF 50mm f/1.8D</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="ptlens" focal="50" a="0.00139" b="-0.00804" c="0.00877"/>
++            <tca model="poly3" focal="50" br="-0.0000176" vr="1.0000537" bb="0.0000226" vb="0.9998589"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-0.9908" k2="0.9074" k3="-0.3911"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.9908" k2="0.9074" k3="-0.3911"/>
++            <vignetting model="pa" focal="50" aperture="2.5" distance="10" k1="-0.0795" k2="-0.6086" k3="0.3210"/>
++            <vignetting model="pa" focal="50" aperture="2.5" distance="1000" k1="-0.0795" k2="-0.6086" k3="0.3210"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.2566" k2="0.1935" k3="-0.1485"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.2566" k2="0.1935" k3="-0.1485"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.2421" k2="0.0920" k3="-0.0371"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.2421" k2="0.0920" k3="-0.0371"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2490" k2="0.1102" k3="-0.0426"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2490" k2="0.1102" k3="-0.0426"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 50mm f/1.8</model>
++        <model lang="en">Nikkor AI-S 50mm f/1.8</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.0005" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.0005"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 50mm f/2.0</model>
++        <model>Nikon Nikkor 50mm f/2.0</model>
++        <model lang="en">Nikkor 50mm f/2.0</model>
+         <mount>Nikon F</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.002" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.002"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 55mm f/1.2 AI</model>
++        <model>Nikon AI Nikkor 55mm f/1.2</model>
++        <model lang="en">Nikkor AI 55mm f/1.2</model>
+         <mount>Nikon F AI</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="55" a="0" b="-0.003" c="0" />
++            <distortion model="poly3" focal="55" k1="-0.003"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 55mm f/2.8 AI-S Micro</model>
++        <model>Nikon AI-S Nikkor 55mm f/2.8 Micro</model>
++        <model lang="en">Nikkor AI-S 55mm f/2.8 Micro</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="55" a="0" b="-0.0002" c="0" />
++            <distortion model="poly3" focal="55" k1="-0.0002"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 58mm f/1.2 Noct</model>
+-        <mount>Nikon F AF</mount>
++        <model>Nikon AI-S Nikkor 58mm f/1.2 Noct</model>
++        <model lang="en">Nikkor AI-S 58mm f/1.2 Noct</model>
++        <mount>Nikon F AI</mount>
++        <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="58" a="0" b="-0.003" c="0" />
++            <distortion model="poly3" focal="58" k1="-0.003"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 85mm f/1.8D AF</model>
++        <model>Nikon AF Nikkor 85mm f/1.8D</model>
++        <model lang="en">Nikkor AF 85mm f/1.8D</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="85" a="0" b="-0.000852" c="0" />
++            <distortion model="poly3" focal="85" k1="-0.000852"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 105mm f/2.8D AF</model>
++        <model>Nikon AF Nikkor 105mm f/2.8D</model>
++        <model lang="en">Nikkor AF 105mm f/2.8D</model>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="105" a="0" b="0.00142" c="0" />
++            <distortion model="poly3" focal="105" k1="0.00142"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 135mm f/2.0 AI-S</model>
++        <model>Nikon AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED</model>
++        <model lang="en">Nikkor AF-S VR 105mm f/2.8G IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="poly3" focal="105" k1="-0.00131"/>
++            <tca model="poly3" focal="105" br="-0.0000282" vr="0.9999225" bb="0.0000075" vb="0.9999279"/>
++            <!-- Taken with Nikon D810 -->
++            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-1.6279" k2="1.8493" k3="-0.9319"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-1.6279" k2="1.8493" k3="-0.9319"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="0.1058" k2="-0.9844" k3="0.4094"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="0.1058" k2="-0.9844" k3="0.4094"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0224" k2="0.2310" k3="-0.4180"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0224" k2="0.2310" k3="-0.4180"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0786" k2="0.3183" k3="-0.2995"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0786" k2="0.3183" k3="-0.2995"/>
++            <vignetting model="pa" focal="105" aperture="32" distance="10" k1="-0.0451" k2="0.1358" k3="-0.0981"/>
++            <vignetting model="pa" focal="105" aperture="32" distance="1000" k1="-0.0451" k2="0.1358" k3="-0.0981"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 135mm f/2.0</model>
++        <model lang="en">Nikkor AI-S 135mm f/2.0</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="135" a="0" b="0.0015" c="0" />
++            <distortion model="poly3" focal="135" k1="0.0015"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 180mm f/2.8 ED AI-S</model>
++        <model>Nikon AI-S Nikkor 180mm f/2.8 ED</model>
++        <model lang="en">Nikkor AI-S 180mm f/2.8 ED</model>
+         <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="180" a="0" b="0.001" c="0" />
++            <distortion model="poly3" focal="180" k1="0.001"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 500mm f/8.0 Reflex</model>
++        <model>Nikon AI-S Nikkor 500mm f/8.0 Reflex</model>
++        <model lang="en">Nikkor AI-S 500mm f/8.0 Reflex</model>
+         <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="500" k1="0.00282"/>
++            <tca model="poly3" focal="500" vr="0.9999785" vb="0.9999698"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 500mm f/8.0 Reflex</model>
++        <model lang="en">Nikkor AI-S 500mm f/8.0 Reflex</model>
++        <mount>Nikon F AI-S</mount>
++        <!-- Average crop factor of Nikon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="500" a="0" b="0.001" c="0" />
++            <distortion model="poly3" focal="500" k1="0.001"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+         <model>Nikon AF-S Nikkor 85mm f/1.8G</model>
++        <model lang="en">Nikkor AF-S 85mm f/1.8G</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon D800 -->
+-            <distortion model="ptlens" focal="85" a="-0.00079" b="0.00341" c="-0.00179" />
+-            <tca model="poly3" focal="85" br="-0.0000076" vr="0.9999780" bb="0.0000002" vb="0.9999216" />
++            <distortion model="ptlens" focal="85" a="-0.00079" b="0.00341" c="-0.00179"/>
++            <tca model="poly3" focal="85" br="-0.0000076" vr="0.9999780" bb="0.0000002" vb="0.9999216"/>
++            <!-- Taken with Nikon D750 -->
++            <vignetting model="pa" focal="85" aperture="1.8" distance="0.8" k1="-0.6563" k2="0.2892" k3="-0.1379"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1.4" k1="-1.1454" k2="0.8844" k3="-0.3786"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="5" k1="-1.4834" k2="1.4131" k3="-0.6424"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-1.5735" k2="1.5101" k3="-0.6916"/>
++            <vignetting model="pa" focal="85" aperture="2" distance="0.8" k1="-0.1138" k2="-0.3747" k3="0.1213"/>
++            <vignetting model="pa" focal="85" aperture="2" distance="1.4" k1="-0.1175" k2="-0.9500" k3="0.5492"/>
++            <vignetting model="pa" focal="85" aperture="2" distance="5" k1="-0.5283" k2="-0.4789" k3="0.3776"/>
++            <vignetting model="pa" focal="85" aperture="2" distance="1000" k1="-0.9930" k2="0.3223" k3="-0.0428"/>
++            <vignetting model="pa" focal="85" aperture="2.2" distance="0.8" k1="-0.1373" k2="0.0219" k3="-0.1773"/>
++            <vignetting model="pa" focal="85" aperture="2.2" distance="1.4" k1="-0.0253" k2="-0.4803" k3="0.0900"/>
++            <vignetting model="pa" focal="85" aperture="2.2" distance="5" k1="-0.0675" k2="-0.8909" k3="0.4331"/>
++            <vignetting model="pa" focal="85" aperture="2.2" distance="1000" k1="-0.3585" k2="-0.6562" k3="0.3820"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="0.8" k1="-0.2031" k2="0.2207" k3="-0.2618"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1.4" k1="-0.2135" k2="0.2431" k3="-0.3526"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="5" k1="-0.0709" k2="-0.4721" k3="0.0945"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.1541" k2="-0.7479" k3="0.3349"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="0.8" k1="-0.2071" k2="0.1819" k3="-0.1763"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="1.4" k1="-0.2485" k2="0.2698" k3="-0.2543"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="5" k1="-0.1673" k2="-0.0136" k3="-0.1770"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="1000" k1="-0.1414" k2="-0.5232" k3="0.1574"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="0.8" k1="-0.1814" k2="0.0654" k3="-0.0581"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="1.4" k1="-0.2181" k2="0.1193" k3="-0.0966"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="5" k1="-0.2165" k2="0.1485" k3="-0.2325"/>
++            <vignetting model="pa" focal="85" aperture="3.2" distance="1000" k1="-0.2254" k2="-0.1586" k3="-0.0854"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="0.8" k1="-0.1680" k2="-0.0001" k3="0.0048"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1.4" k1="-0.2070" k2="0.0417" k3="-0.0123"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="5" k1="-0.2566" k2="0.2428" k3="-0.2328"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.3552" k2="0.3229" k3="-0.3960"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="0.8" k1="-0.1642" k2="-0.0275" k3="0.0297"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="1.4" k1="-0.2239" k2="0.0670" k3="-0.0223"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="5" k1="-0.2551" k2="0.1912" k3="-0.1453"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="1000" k1="-0.4569" k2="0.6881" k3="-0.6318"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="0.8" k1="-0.1679" k2="-0.0214" k3="0.0270"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="1.4" k1="-0.2348" k2="0.0953" k3="-0.0397"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="5" k1="-0.2397" k2="0.1250" k3="-0.0748"/>
++            <vignetting model="pa" focal="85" aperture="4.5" distance="1000" k1="-0.5002" k2="0.8496" k3="-0.7298"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="0.8" k1="-0.1724" k2="-0.0184" k3="0.0276"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="1.4" k1="-0.2561" k2="0.1401" k3="-0.0651"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="5" k1="-0.2411" k2="0.1099" k3="-0.0519"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.5027" k2="0.8676" k3="-0.7098"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="0.8" k1="-0.1766" k2="-0.0080" k3="0.0197"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1.4" k1="-0.2710" k2="0.1690" k3="-0.0803"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="5" k1="-0.2468" k2="0.1276" k3="-0.0643"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.4733" k2="0.7651" k3="-0.6064"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="0.8" k1="-0.1803" k2="-0.0057" k3="0.0195"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="1.4" k1="-0.2757" k2="0.1757" k3="-0.0834"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="5" k1="-0.2514" k2="0.1395" k3="-0.0720"/>
++            <vignetting model="pa" focal="85" aperture="6.3" distance="1000" k1="-0.4652" k2="0.7195" k3="-0.5563"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="0.8" k1="-0.1821" k2="-0.0044" k3="0.0201"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="1.4" k1="-0.2822" k2="0.1844" k3="-0.0874"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="5" k1="-0.2612" k2="0.1635" k3="-0.0875"/>
++            <vignetting model="pa" focal="85" aperture="7.1" distance="1000" k1="-0.4098" k2="0.5864" k3="-0.4657"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="0.8" k1="-0.1873" k2="0.0121" k3="0.0070"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1.4" k1="-0.2919" k2="0.2051" k3="-0.1003"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="5" k1="-0.2672" k2="0.1807" k3="-0.0981"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.3932" k2="0.5619" k3="-0.4559"/>
++            <vignetting model="pa" focal="85" aperture="9" distance="0.8" k1="-0.1902" k2="0.0204" k3="0.0010"/>
++            <vignetting model="pa" focal="85" aperture="9" distance="1.4" k1="-0.2989" k2="0.2176" k3="-0.1070"/>
++            <vignetting model="pa" focal="85" aperture="9" distance="5" k1="-0.2726" k2="0.1972" k3="-0.1086"/>
++            <vignetting model="pa" focal="85" aperture="9" distance="1000" k1="-0.3696" k2="0.5281" k3="-0.4426"/>
++            <vignetting model="pa" focal="85" aperture="10" distance="0.8" k1="-0.1941" k2="0.0326" k3="-0.0096"/>
++            <vignetting model="pa" focal="85" aperture="10" distance="1.4" k1="-0.3043" k2="0.2259" k3="-0.1109"/>
++            <vignetting model="pa" focal="85" aperture="10" distance="5" k1="-0.2823" k2="0.2200" k3="-0.1206"/>
++            <vignetting model="pa" focal="85" aperture="10" distance="1000" k1="-0.3431" k2="0.4918" k3="-0.4321"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="0.8" k1="-0.1962" k2="0.0487" k3="-0.0258"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1.4" k1="-0.3097" k2="0.2332" k3="-0.1148"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="5" k1="-0.2885" k2="0.2322" k3="-0.1255"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.3120" k2="0.4598" k3="-0.4282"/>
++            <vignetting model="pa" focal="85" aperture="13" distance="0.8" k1="-0.1882" k2="0.0280" k3="-0.0136"/>
++            <vignetting model="pa" focal="85" aperture="13" distance="1.4" k1="-0.3154" k2="0.2468" k3="-0.1247"/>
++            <vignetting model="pa" focal="85" aperture="13" distance="5" k1="-0.2935" k2="0.2425" k3="-0.1309"/>
++            <vignetting model="pa" focal="85" aperture="13" distance="1000" k1="-0.2636" k2="0.3599" k3="-0.3726"/>
++            <vignetting model="pa" focal="85" aperture="14" distance="0.8" k1="-0.1911" k2="0.0485" k3="-0.0356"/>
++            <vignetting model="pa" focal="85" aperture="14" distance="1.4" k1="-0.3285" k2="0.2790" k3="-0.1460"/>
++            <vignetting model="pa" focal="85" aperture="14" distance="5" k1="-0.2935" k2="0.2360" k3="-0.1247"/>
++            <vignetting model="pa" focal="85" aperture="14" distance="1000" k1="-0.2404" k2="0.3314" k3="-0.3657"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="0.8" k1="-0.1917" k2="0.0473" k3="-0.0364"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1.4" k1="-0.3379" k2="0.3036" k3="-0.1642"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="5" k1="-0.2892" k2="0.2205" k3="-0.1139"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.1997" k2="0.2217" k3="-0.2915"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+-        <model>Nikkor 24-70mm f/2.8G ED</model>
++        <model>Nikon AF Nikkor 85mm f/1.8</model>
++        <model lang="en">Nikkor AF 85mm f/1.8</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D200 -->
++            <distortion model="poly3" focal="85" k1="0"/>
++            <tca model="poly3" focal="85" br="-0.0000030" vr="0.9998635" bb="-0.0000082" vb="1.0000494"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="10" k1="-0.2163" k2="-0.3005" k3="0.1754"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-0.2163" k2="-0.3005" k3="0.1754"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="10" k1="-0.1047" k2="0.1946" k3="-0.1812"/>
++            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.1047" k2="0.1946" k3="-0.1812"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="10" k1="-0.0855" k2="0.0263" k3="0.0188"/>
++            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.0855" k2="0.0263" k3="0.0188"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="10" k1="-0.0926" k2="0.1445" k3="-0.0687"/>
++            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.0926" k2="0.1445" k3="-0.0687"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="10" k1="-0.1724" k2="0.2410" k3="-0.1074"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.1724" k2="0.2410" k3="-0.1074"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Zoom-Nikkor 24-70mm f/2.8G ED</model>
++        <model lang="en">Nikkor AF-S 24-70mm f/2.8G ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon D800 -->
+             <distortion model="ptlens" focal="24" a="0.01436" b="-0.06611" c="0.06436"/>
+@@ -1308,27 +2454,1308 @@
+             <distortion model="ptlens" focal="70" a="0.00933" b="-0.03902" c="0.05818"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Nikon</maker>
+         <model>Nikon AF-S Zoom-Nikkor 14-24mm f/2.8G ED</model>
++        <model lang="en">Nikkor AF-S 14-24mm f/2.8G ED</model>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon D700 -->
+-            <distortion model="poly3" focal="14" k1="-0.01343" />
+-            <distortion model="poly3" focal="16" k1="-0.00853" />
+-            <distortion model="poly3" focal="18" k1="-0.00354" />
+-            <distortion model="poly3" focal="20" k1="-0.00084" />
+-            <distortion model="poly3" focal="22" k1="0.00035" />
+-            <distortion model="poly3" focal="24" k1="0.00088" />
+-            <tca model="poly3" focal="14" br="0.0000628" vr="1.0001266" bb="-0.0000429" vb="1.0001134" />
+-            <tca model="poly3" focal="16" br="0.0001160" vr="1.0000512" bb="-0.0000490" vb="1.0001245" />
+-            <tca model="poly3" focal="18" br="0.0000802" vr="1.0000736" bb="-0.0000670" vb="1.0001496" />
+-            <tca model="poly3" focal="20" br="0.0001132" vr="1.0000380" bb="-0.0000470" vb="1.0001205" />
+-            <tca model="poly3" focal="22" br="0.0000941" vr="1.0000766" bb="-0.0000508" vb="1.0001177" />
+-            <tca model="poly3" focal="24" br="0.0000737" vr="1.0001211" bb="-0.0000343" vb="1.0000684" />
++            <distortion model="poly3" focal="14" k1="-0.01343"/>
++            <distortion model="poly3" focal="16" k1="-0.00853"/>
++            <distortion model="poly3" focal="18" k1="-0.00354"/>
++            <distortion model="poly3" focal="20" k1="-0.00084"/>
++            <distortion model="poly3" focal="22" k1="0.00035"/>
++            <distortion model="poly3" focal="24" k1="0.00088"/>
++            <tca model="poly3" focal="14" br="0.0000628" vr="1.0001266" bb="-0.0000429" vb="1.0001134"/>
++            <tca model="poly3" focal="16" br="0.0001160" vr="1.0000512" bb="-0.0000490" vb="1.0001245"/>
++            <tca model="poly3" focal="18" br="0.0000802" vr="1.0000736" bb="-0.0000670" vb="1.0001496"/>
++            <tca model="poly3" focal="20" br="0.0001132" vr="1.0000380" bb="-0.0000470" vb="1.0001205"/>
++            <tca model="poly3" focal="22" br="0.0000941" vr="1.0000766" bb="-0.0000508" vb="1.0001177"/>
++            <tca model="poly3" focal="24" br="0.0000737" vr="1.0001211" bb="-0.0000343" vb="1.0000684"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF-S 70-300mm f/4.5-5.6G VR IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="poly3" focal="70" k1="-0.00644"/>
++            <distortion model="poly3" focal="80" k1="-0.00183"/>
++            <distortion model="poly3" focal="92" k1="0.00496"/>
++            <distortion model="poly3" focal="170" k1="0.01292"/>
++            <distortion model="poly3" focal="240" k1="0.01199"/>
++            <distortion model="poly3" focal="300" k1="0.00746"/>
++            <tca model="poly3" focal="70" br="0.0000037" vr="1.0001035" bb="-0.0000180" vb="1.0000798"/>
++            <tca model="poly3" focal="92" br="-0.0000381" vr="1.0000853" bb="0.0000339" vb="0.9999527"/>
++            <tca model="poly3" focal="170" br="-0.0000355" vr="1.0000067" bb="0.0000500" vb="0.9998364"/>
++            <tca model="poly3" focal="240" br="-0.0000075" vr="0.9999618" bb="0.0000435" vb="0.9997818"/>
++            <tca model="poly3" focal="300" br="-0.0000515" vr="1.0000175" bb="0.0000673" vb="0.9996418"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF-S 70-300mm f/4.5-5.6G VR IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5100 -->
++            <distortion model="poly3" focal="70" k1="-0.0033"/>
++            <distortion model="poly3" focal="85" k1="-0.00177"/>
++            <distortion model="poly3" focal="100" k1="0.00201"/>
++            <distortion model="poly3" focal="200" k1="0.00316"/>
++            <distortion model="poly3" focal="300" k1="0.00387"/>
++            <tca model="poly3" focal="70" br="-0.0000054" vr="1.0001364" bb="0.0000012" vb="1.0000391"/>
++            <tca model="poly3" focal="85" br="-0.0000454" vr="1.0001576" bb="-0.0000234" vb="1.0000492"/>
++            <tca model="poly3" focal="100" br="-0.0000196" vr="1.0000860" bb="-0.0000066" vb="1.0000204"/>
++            <tca model="poly3" focal="140" br="-0.0000306" vr="1.0000669" bb="0.0000315" vb="0.9998543"/>
++            <tca model="poly3" focal="200" br="-0.0000460" vr="1.0000480" bb="0.0000096" vb="0.9997688"/>
++            <tca model="poly3" focal="250" br="-0.0000180" vr="1.0000398" bb="0.0000503" vb="0.9996853"/>
++            <tca model="poly3" focal="300" br="-0.0000299" vr="1.0000671" bb="0.0001185" vb="0.9994449"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.0671" k2="0.0055" k3="-0.0590"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.0671" k2="0.0055" k3="-0.0590"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0816" k2="0.0207" k3="-0.0141"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0816" k2="0.0207" k3="-0.0141"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.0737" k2="-0.0013" k3="0.0045"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.0737" k2="-0.0013" k3="0.0045"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.0830" k2="0.0152" k3="-0.0047"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.0830" k2="0.0152" k3="-0.0047"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0876" k2="0.0332" k3="-0.0183"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0876" k2="0.0332" k3="-0.0183"/>
++            <vignetting model="pa" focal="125" aperture="4.8" distance="10" k1="-0.0386" k2="-0.1118" k3="0.0070"/>
++            <vignetting model="pa" focal="125" aperture="4.8" distance="1000" k1="-0.0386" k2="-0.1118" k3="0.0070"/>
++            <vignetting model="pa" focal="125" aperture="5.6" distance="10" k1="-0.0723" k2="0.0431" k3="-0.0739"/>
++            <vignetting model="pa" focal="125" aperture="5.6" distance="1000" k1="-0.0723" k2="0.0431" k3="-0.0739"/>
++            <vignetting model="pa" focal="125" aperture="6.3" distance="10" k1="-0.0629" k2="-0.0017" k3="-0.0023"/>
++            <vignetting model="pa" focal="125" aperture="6.3" distance="1000" k1="-0.0629" k2="-0.0017" k3="-0.0023"/>
++            <vignetting model="pa" focal="125" aperture="7.1" distance="10" k1="-0.0558" k2="-0.0234" k3="0.0171"/>
++            <vignetting model="pa" focal="125" aperture="7.1" distance="1000" k1="-0.0558" k2="-0.0234" k3="0.0171"/>
++            <vignetting model="pa" focal="125" aperture="36" distance="10" k1="-0.0665" k2="0.0182" k3="-0.0098"/>
++            <vignetting model="pa" focal="125" aperture="36" distance="1000" k1="-0.0665" k2="0.0182" k3="-0.0098"/>
++            <vignetting model="pa" focal="185" aperture="5" distance="10" k1="-0.0028" k2="-0.2386" k3="0.0494"/>
++            <vignetting model="pa" focal="185" aperture="5" distance="1000" k1="-0.0028" k2="-0.2386" k3="0.0494"/>
++            <vignetting model="pa" focal="185" aperture="6.3" distance="10" k1="-0.0774" k2="0.1226" k3="-0.1592"/>
++            <vignetting model="pa" focal="185" aperture="6.3" distance="1000" k1="-0.0774" k2="0.1226" k3="-0.1592"/>
++            <vignetting model="pa" focal="185" aperture="7.1" distance="10" k1="-0.0573" k2="0.0064" k3="-0.0054"/>
++            <vignetting model="pa" focal="185" aperture="7.1" distance="1000" k1="-0.0573" k2="0.0064" k3="-0.0054"/>
++            <vignetting model="pa" focal="185" aperture="8" distance="10" k1="-0.0530" k2="-0.0087" k3="0.0082"/>
++            <vignetting model="pa" focal="185" aperture="8" distance="1000" k1="-0.0530" k2="-0.0087" k3="0.0082"/>
++            <vignetting model="pa" focal="185" aperture="36" distance="10" k1="-0.0596" k2="0.0033" k3="0.0041"/>
++            <vignetting model="pa" focal="185" aperture="36" distance="1000" k1="-0.0596" k2="0.0033" k3="0.0041"/>
++            <vignetting model="pa" focal="240" aperture="5.6" distance="10" k1="-0.0596" k2="-0.3878" k3="0.2221"/>
++            <vignetting model="pa" focal="240" aperture="5.6" distance="1000" k1="-0.0596" k2="-0.3878" k3="0.2221"/>
++            <vignetting model="pa" focal="240" aperture="6.3" distance="10" k1="0.0376" k2="-0.3203" k3="0.1160"/>
++            <vignetting model="pa" focal="240" aperture="6.3" distance="1000" k1="0.0376" k2="-0.3203" k3="0.1160"/>
++            <vignetting model="pa" focal="240" aperture="7.1" distance="10" k1="-0.0436" k2="0.0276" k3="-0.0918"/>
++            <vignetting model="pa" focal="240" aperture="7.1" distance="1000" k1="-0.0436" k2="0.0276" k3="-0.0918"/>
++            <vignetting model="pa" focal="240" aperture="8" distance="10" k1="-0.0510" k2="0.0102" k3="-0.0093"/>
++            <vignetting model="pa" focal="240" aperture="8" distance="1000" k1="-0.0510" k2="0.0102" k3="-0.0093"/>
++            <vignetting model="pa" focal="240" aperture="40" distance="10" k1="-0.0656" k2="0.0179" k3="-0.0044"/>
++            <vignetting model="pa" focal="240" aperture="40" distance="1000" k1="-0.0656" k2="0.0179" k3="-0.0044"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.4926" k2="0.4029" k3="-0.1830"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.4926" k2="0.4029" k3="-0.1830"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-0.1245" k2="-0.2125" k3="0.1338"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-0.1245" k2="-0.2125" k3="0.1338"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="0.0010" k2="-0.2665" k3="0.1203"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="0.0010" k2="-0.2665" k3="0.1203"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.0404" k2="0.0084" k3="-0.0388"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.0404" k2="0.0084" k3="-0.0388"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="10" k1="-0.0669" k2="0.0271" k3="-0.0091"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.0669" k2="0.0271" k3="-0.0091"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S VR Zoom-Nikkor 70-200mm f/4G IF-ED</model>
++        <model lang="en">Nikkor AF-S 70-200mm f/4G VR IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="poly3" focal="70" k1="-0.00849"/>
++            <distortion model="poly3" focal="86" k1="-0.00295"/>
++            <distortion model="poly3" focal="102" k1="0.00234"/>
++            <distortion model="poly3" focal="130" k1="0.00663"/>
++            <distortion model="poly3" focal="170" k1="0.00789"/>
++            <distortion model="poly3" focal="200" k1="0.00789"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 50mm f/1.2</model>
++        <model lang="en">Nikkor AI-S 50mm f/1.2</model>
++        <mount>Nikon F AI</mount>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="50" a="0.0042" b="-0.01715" c="0.00585"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 50mm f/1.8G</model>
++        <model lang="en">Nikkor AF-S 50mm f/1.8G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D200 -->
++            <distortion model="ptlens" focal="50" a="-0.00299" b="0.00708" c="-0.00949"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 50mm f/1.8G</model>
++        <model lang="en">Nikkor AF-S 50mm f/1.8G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="poly3" focal="50" k1="-0.00462"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Nikkor 10-24mm f/3.5-4.5G ED</model>
++        <model lang="en">Nikkor AF-S 10-24mm f/3.5-4.5G DX ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3100 -->
++            <distortion model="ptlens" focal="10" a="0.0054" b="-0.04682" c="0.05708"/>
++            <distortion model="ptlens" focal="12" a="-0.00189" b="-0.01666" c="0.03458"/>
++            <distortion model="ptlens" focal="15" a="-0.00516" b="0.00567" c="0.01351"/>
++            <distortion model="ptlens" focal="18" a="-0.0069" b="0.02453" c="-0.02009"/>
++            <distortion model="ptlens" focal="20" a="-0.00605" b="0.02554" c="-0.02419"/>
++            <distortion model="ptlens" focal="24" a="0.00279" b="-0.00922" c="0.01907"/>
++            <tca model="poly3" focal="10" vr="1.00043" vb="1.00014"/>
++            <tca model="poly3" focal="12" vr="1.00047" vb="1"/>
++            <tca model="poly3" focal="15" vr="1.00030" vb="1"/>
++            <tca model="poly3" focal="18" vr="1.00020" vb="1"/>
++            <tca model="poly3" focal="20" vr="1.00020" vb="1"/>
++            <tca model="poly3" focal="24" vr="1.00016" vb="1"/>
++            <!-- Taken with Nikon D5100 -->
++            <vignetting model="pa" focal="10" aperture="3.5" distance="10" k1="-0.6853" k2="0.2007" k3="-0.0649"/>
++            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-0.6853" k2="0.2007" k3="-0.0649"/>
++            <vignetting model="pa" focal="10" aperture="4.5" distance="10" k1="-0.6419" k2="0.2700" k3="-0.1483"/>
++            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-0.6419" k2="0.2700" k3="-0.1483"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="10" k1="-0.7370" k2="0.5622" k3="-0.2863"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.7370" k2="0.5622" k3="-0.2863"/>
++            <vignetting model="pa" focal="10" aperture="6.3" distance="10" k1="-0.7084" k2="0.4323" k3="-0.1541"/>
++            <vignetting model="pa" focal="10" aperture="6.3" distance="1000" k1="-0.7084" k2="0.4323" k3="-0.1541"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.7137" k2="0.4318" k3="-0.1499"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.7137" k2="0.4318" k3="-0.1499"/>
++            <vignetting model="pa" focal="13" aperture="3.8" distance="10" k1="-0.8748" k2="0.3837" k3="-0.0372"/>
++            <vignetting model="pa" focal="13" aperture="3.8" distance="1000" k1="-0.8748" k2="0.3837" k3="-0.0372"/>
++            <vignetting model="pa" focal="13" aperture="5" distance="10" k1="-0.5207" k2="-0.0806" k3="0.1316"/>
++            <vignetting model="pa" focal="13" aperture="5" distance="1000" k1="-0.5207" k2="-0.0806" k3="0.1316"/>
++            <vignetting model="pa" focal="13" aperture="5.6" distance="10" k1="-0.6026" k2="0.2867" k3="-0.1180"/>
++            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-0.6026" k2="0.2867" k3="-0.1180"/>
++            <vignetting model="pa" focal="13" aperture="7.1" distance="10" k1="-0.6500" k2="0.3972" k3="-0.1414"/>
++            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.6500" k2="0.3972" k3="-0.1414"/>
++            <vignetting model="pa" focal="13" aperture="25" distance="10" k1="-0.6453" k2="0.3623" k3="-0.1133"/>
++            <vignetting model="pa" focal="13" aperture="25" distance="1000" k1="-0.6453" k2="0.3623" k3="-0.1133"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.8350" k2="0.2741" k3="0.0331"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.8350" k2="0.2741" k3="0.0331"/>
++            <vignetting model="pa" focal="16" aperture="5" distance="10" k1="-0.4548" k2="-0.3554" k3="0.3268"/>
++            <vignetting model="pa" focal="16" aperture="5" distance="1000" k1="-0.4548" k2="-0.3554" k3="0.3268"/>
++            <vignetting model="pa" focal="16" aperture="6.3" distance="10" k1="-0.5034" k2="0.1695" k3="-0.0860"/>
++            <vignetting model="pa" focal="16" aperture="6.3" distance="1000" k1="-0.5034" k2="0.1695" k3="-0.0860"/>
++            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-0.5765" k2="0.3872" k3="-0.1987"/>
++            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-0.5765" k2="0.3872" k3="-0.1987"/>
++            <vignetting model="pa" focal="16" aperture="25" distance="10" k1="-0.5564" k2="0.2517" k3="-0.0497"/>
++            <vignetting model="pa" focal="16" aperture="25" distance="1000" k1="-0.5564" k2="0.2517" k3="-0.0497"/>
++            <vignetting model="pa" focal="20" aperture="4.5" distance="10" k1="-0.9957" k2="0.6301" k3="-0.1733"/>
++            <vignetting model="pa" focal="20" aperture="4.5" distance="1000" k1="-0.9957" k2="0.6301" k3="-0.1733"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.4075" k2="-0.4930" k3="0.4120"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.4075" k2="-0.4930" k3="0.4120"/>
++            <vignetting model="pa" focal="20" aperture="6.3" distance="10" k1="-0.3307" k2="-0.3853" k3="0.2640"/>
++            <vignetting model="pa" focal="20" aperture="6.3" distance="1000" k1="-0.3307" k2="-0.3853" k3="0.2640"/>
++            <vignetting model="pa" focal="20" aperture="7.1" distance="10" k1="-0.3795" k2="-0.1028" k3="0.0431"/>
++            <vignetting model="pa" focal="20" aperture="7.1" distance="1000" k1="-0.3795" k2="-0.1028" k3="0.0431"/>
++            <vignetting model="pa" focal="20" aperture="29" distance="10" k1="-0.3901" k2="0.0633" k3="0.0278"/>
++            <vignetting model="pa" focal="20" aperture="29" distance="1000" k1="-0.3901" k2="0.0633" k3="0.0278"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-1.1988" k2="1.1534" k3="-0.4938"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-1.1988" k2="1.1534" k3="-0.4938"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4573" k2="-0.3947" k3="0.3748"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4573" k2="-0.3947" k3="0.3748"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.2715" k2="-0.5475" k3="0.3702"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.2715" k2="-0.5475" k3="0.3702"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.1928" k2="-0.6044" k3="0.3684"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.1928" k2="-0.6044" k3="0.3684"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="10" k1="-0.4338" k2="0.2285" k3="-0.0697"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.4338" k2="0.2285" k3="-0.0697"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Nikkor 55-300mm f/4.5-5.6G ED VR</model>
++        <model lang="en">Nikkor AF-S 55-300mm f/4.5-5.6G DX ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5100 -->
++            <distortion model="poly3" focal="55" k1="-0.00476"/>
++            <distortion model="poly3" focal="70" k1="0.00214"/>
++            <distortion model="poly3" focal="80" k1="0.00586"/>
++            <distortion model="poly3" focal="102" k1="0.00753"/>
++            <distortion model="poly3" focal="120" k1="0.01046"/>
++            <distortion model="poly3" focal="210" k1="0.00842"/>
++            <distortion model="poly3" focal="240" k1="0.0078"/>
++            <distortion model="poly3" focal="300" k1="0.0052"/>
++            <tca model="poly3" focal="55" br="0.0000449" vr="1.0001027" bb="-0.0000593" vb="1.0001628"/>
++            <tca model="poly3" focal="72" br="-0.0000018" vr="1.0000297" bb="-0.0000243" vb="1.0000969"/>
++            <tca model="poly3" focal="85" br="-0.0000032" vr="0.9999327" bb="-0.0000219" vb="1.0001070"/>
++            <tca model="poly3" focal="105" br="-0.0000110" vr="0.9998510" bb="-0.0000130" vb="1.0000502"/>
++            <tca model="poly3" focal="120" br="-0.0000439" vr="0.9998686" bb="-0.0000061" vb="0.9999919"/>
++            <tca model="poly3" focal="180" br="-0.0000425" vr="0.9996593" bb="-0.0000118" vb="0.9999718"/>
++            <tca model="poly3" focal="240" br="-0.0000727" vr="0.9996030" bb="0.0000511" vb="0.9997629"/>
++            <tca model="poly3" focal="300" br="-0.0000846" vr="0.9995954" bb="0.0000817" vb="0.9996456"/>
++            <!-- Taken with Nikon D90 -->
++            <vignetting model="pa" focal="55" aperture="4.5" distance="1.4" k1="-0.1563" k2="-0.3853" k3="0.1925"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="2.5" k1="-0.1735" k2="-0.3557" k3="0.1750"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.1564" k2="-0.3885" k3="0.1978"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1.4" k1="-0.0310" k2="-0.5524" k3="0.2835"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="2.5" k1="-0.0288" k2="-0.5601" k3="0.2855"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0390" k2="-0.5439" k3="0.2817"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1.4" k1="-0.1775" k2="0.1813" k3="-0.1513"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="2.5" k1="-0.1828" k2="0.1651" k3="-0.1393"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1590" k2="0.1353" k3="-0.1260"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1.4" k1="-0.1346" k2="0.0096" k3="0.0074"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="2.5" k1="-0.1401" k2="0.0161" k3="0.0037"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1451" k2="0.0428" k3="-0.0228"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1.4" k1="-0.1327" k2="0.0170" k3="-0.0025"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="2.5" k1="-0.1373" k2="0.0211" k3="-0.0050"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1264" k2="-0.0069" k3="0.0072"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1.4" k1="-0.1283" k2="-0.0127" k3="0.0209"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="2.5" k1="-0.1460" k2="0.0254" k3="-0.0015"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1291" k2="0.0052" k3="-0.0024"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1.4" k1="-0.0345" k2="-0.5708" k3="0.0053"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="2.5" k1="-0.1741" k2="-0.2613" k3="0.0548"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.1408" k2="-0.4292" k3="0.2225"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1.4" k1="-0.0311" k2="-0.2050" k3="-0.2991"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="2.5" k1="-0.0535" k2="-0.3362" k3="0.0822"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0147" k2="-0.5100" k3="0.2469"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1.4" k1="-0.3110" k2="0.7826" k3="-0.7492"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="2.5" k1="-0.1528" k2="0.1013" k3="-0.0801"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1504" k2="0.0801" k3="-0.0633"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1.4" k1="-0.2062" k2="0.3240" k3="-0.2840"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="2.5" k1="-0.1310" k2="0.0148" k3="-0.0009"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1293" k2="-0.0016" k3="0.0101"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1.4" k1="-0.1342" k2="0.0136" k3="0.0040"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="2.5" k1="-0.1398" k2="0.0185" k3="0.0032"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.1454" k2="0.0315" k3="-0.0079"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1.4" k1="-0.1275" k2="0.0028" k3="0.0094"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="2.5" k1="-0.1328" k2="-0.0038" k3="0.0171"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1456" k2="0.0361" k3="-0.0134"/>
++            <vignetting model="pa" focal="98" aperture="4.5" distance="1.4" k1="0.2852" k2="-2.0509" k3="1.0577"/>
++            <vignetting model="pa" focal="98" aperture="4.5" distance="2.5" k1="0.0397" k2="-0.8815" k3="0.2856"/>
++            <vignetting model="pa" focal="98" aperture="4.5" distance="1000" k1="-0.1365" k2="-0.3014" k3="0.0175"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1.4" k1="0.3610" k2="-1.9637" k3="0.9196"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="2.5" k1="0.0699" k2="-0.7321" k3="0.1417"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.0769" k2="-0.3061" k3="0.0028"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1.4" k1="-0.0312" k2="-0.0059" k3="-0.4839"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="2.5" k1="-0.2787" k2="0.6651" k3="-0.6773"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.1921" k2="0.2401" k3="-0.2093"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="1.4" k1="-0.3166" k2="0.9387" k3="-1.0118"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="2.5" k1="-0.1696" k2="0.1722" k3="-0.1320"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.1189" k2="-0.0117" k3="0.0202"/>
++            <vignetting model="pa" focal="98" aperture="16" distance="1.4" k1="-0.3614" k2="0.9702" k3="-0.9038"/>
++            <vignetting model="pa" focal="98" aperture="16" distance="2.5" k1="-0.1250" k2="0.0193" k3="-0.0031"/>
++            <vignetting model="pa" focal="98" aperture="16" distance="1000" k1="-0.1317" k2="0.0209" k3="-0.0009"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="1.4" k1="-0.2500" k2="0.5202" k3="-0.4593"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="2.5" k1="-0.1172" k2="-0.0003" k3="0.0070"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.1145" k2="-0.0157" k3="0.0170"/>
++            <vignetting model="pa" focal="135" aperture="4.8" distance="1.4" k1="-0.0000" k2="-1.7913" k3="1.1319"/>
++            <vignetting model="pa" focal="135" aperture="4.8" distance="2.5" k1="0.0949" k2="-1.6174" k3="0.9373"/>
++            <vignetting model="pa" focal="135" aperture="4.8" distance="1000" k1="0.0103" k2="-0.9208" k3="0.4347"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1.4" k1="0.1404" k2="-1.9681" k3="1.1876"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="2.5" k1="0.1904" k2="-1.6793" k3="0.9253"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0441" k2="-0.8698" k3="0.3728"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1.4" k1="0.1546" k2="-0.8786" k3="0.2338"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="2.5" k1="0.0175" k2="-0.2614" k3="-0.1588"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2000" k2="0.4142" k3="-0.4362"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1.4" k1="-0.1678" k2="0.4078" k3="-0.5606"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="2.5" k1="-0.2055" k2="0.4059" k3="-0.3793"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1214" k2="0.0283" k3="-0.0043"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1.4" k1="-0.2353" k2="0.5213" k3="-0.4793"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="2.5" k1="-0.1171" k2="0.0310" k3="-0.0118"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1138" k2="-0.0008" k3="0.0149"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1.4" k1="-0.1065" k2="0.0031" k3="0.0017"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="2.5" k1="-0.1130" k2="0.0188" k3="-0.0028"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1087" k2="0.0038" k3="0.0074"/>
++            <vignetting model="pa" focal="220" aperture="5.6" distance="1.4" k1="-0.5993" k2="-0.2249" k3="0.2811"/>
++            <vignetting model="pa" focal="220" aperture="5.6" distance="2.5" k1="-0.2959" k2="-0.7383" k3="0.5473"/>
++            <vignetting model="pa" focal="220" aperture="5.6" distance="1000" k1="-0.0428" k2="-0.9540" k3="0.5939"/>
++            <vignetting model="pa" focal="220" aperture="8" distance="1.4" k1="0.0860" k2="-0.8901" k3="0.4400"/>
++            <vignetting model="pa" focal="220" aperture="8" distance="2.5" k1="0.0931" k2="-0.6291" k3="0.2267"/>
++            <vignetting model="pa" focal="220" aperture="8" distance="1000" k1="-0.0273" k2="-0.0840" k3="-0.1169"/>
++            <vignetting model="pa" focal="220" aperture="11" distance="1.4" k1="-0.1131" k2="0.1799" k3="-0.2257"/>
++            <vignetting model="pa" focal="220" aperture="11" distance="2.5" k1="-0.1260" k2="0.1105" k3="-0.0784"/>
++            <vignetting model="pa" focal="220" aperture="11" distance="1000" k1="-0.0840" k2="0.0040" k3="0.0019"/>
++            <vignetting model="pa" focal="220" aperture="16" distance="1.4" k1="-0.0855" k2="0.0183" k3="-0.0119"/>
++            <vignetting model="pa" focal="220" aperture="16" distance="2.5" k1="-0.1089" k2="0.0417" k3="-0.0135"/>
++            <vignetting model="pa" focal="220" aperture="16" distance="1000" k1="-0.1070" k2="0.0324" k3="-0.0067"/>
++            <vignetting model="pa" focal="220" aperture="22" distance="1.4" k1="-0.0830" k2="0.0047" k3="-0.0011"/>
++            <vignetting model="pa" focal="220" aperture="22" distance="2.5" k1="-0.0846" k2="0.0011" k3="0.0032"/>
++            <vignetting model="pa" focal="220" aperture="22" distance="1000" k1="-0.0912" k2="-0.0026" k3="0.0120"/>
++            <vignetting model="pa" focal="220" aperture="29" distance="1.4" k1="-0.0802" k2="-0.0018" k3="0.0019"/>
++            <vignetting model="pa" focal="220" aperture="29" distance="2.5" k1="-0.0863" k2="0.0085" k3="-0.0032"/>
++            <vignetting model="pa" focal="220" aperture="29" distance="1000" k1="-0.0919" k2="-0.0054" k3="0.0133"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1.4" k1="-0.5887" k2="0.0474" k3="0.1009"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="2.5" k1="-0.8507" k2="0.6406" k3="-0.2427"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.8204" k2="0.6367" k3="-0.2499"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1.4" k1="-0.5460" k2="0.2197" k3="-0.0757"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="2.5" k1="-0.1622" k2="-0.4699" k3="0.2976"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0345" k2="-0.7029" k3="0.3903"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1.4" k1="-0.0276" k2="-0.0953" k3="-0.0146"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="2.5" k1="-0.0842" k2="0.0697" k3="-0.0668"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0754" k2="0.0210" k3="-0.0086"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1.4" k1="-0.0726" k2="0.0125" k3="-0.0039"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="2.5" k1="-0.0711" k2="0.0118" k3="-0.0030"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0706" k2="0.0088" k3="-0.0017"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="1.4" k1="-0.0740" k2="0.0181" k3="-0.0071"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="2.5" k1="-0.0741" k2="0.0189" k3="-0.0076"/>
++            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.0727" k2="0.0005" k3="0.0054"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="1.4" k1="-0.0831" k2="0.0162" k3="-0.0018"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="2.5" k1="-0.0730" k2="0.0111" k3="-0.0044"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="1000" k1="-0.0716" k2="0.0050" k3="-0.0002"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 50mm f/1.4G</model>
++        <model lang="en">Nikkor AF-S 50mm f/1.4G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5200 -->
++            <distortion model="poly3" focal="50" k1="-0.00466"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 50mm f/1.4G</model>
++        <model lang="en">Nikkor AF-S 50mm f/1.4G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="50" a="0.0021108699879156" b="-0.0109814656926241" c="0.00166683305342055"/>
++            <tca model="poly3" focal="50" br="-0.0001128" vr="1.0003664" bb="0.0001510" vb="0.9998457"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-1.1508" k2="0.6858" k3="-0.2132"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="0.6" k1="-1.3327" k2="1.0063" k3="-0.3855"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1.5" k1="-1.5706" k2="1.4307" k3="-0.6168"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="2.99" k1="-1.6225" k2="1.5188" k3="-0.6647"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.6501" k2="1.5753" k3="-0.6982"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="0.0075" k2="-0.9356" k3="0.4575"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="0.6" k1="0.0366" k2="-1.1504" k3="0.5953"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1.5" k1="0.0980" k2="-1.4311" k3="0.7606"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="2.99" k1="0.1138" k2="-1.4885" k3="0.7895"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="0.1216" k2="-1.5112" k3="0.7984"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0511" k2="0.0361" k3="-0.2110"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.6" k1="-0.0591" k2="-0.0092" k3="-0.1988"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1.5" k1="-0.0937" k2="0.1135" k3="-0.3214"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="2.99" k1="-0.0902" k2="0.1371" k3="-0.3583"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0856" k2="0.1889" k3="-0.4171"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.1066" k2="0.1854" k3="-0.1845"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.6" k1="-0.1313" k2="0.2383" k3="-0.2417"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1.5" k1="-0.1593" k2="0.3318" k3="-0.3399"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="2.99" k1="-0.1616" k2="0.3870" k3="-0.3923"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1433" k2="0.3888" k3="-0.4128"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.45" k1="-0.0713" k2="-0.0071" k3="0.0249"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.6" k1="-0.0357" k2="-0.1225" k3="0.0943"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1.5" k1="-0.0485" k2="-0.0920" k3="0.0699"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="2.99" k1="-0.0664" k2="0.0142" k3="-0.0109"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0305" k2="-0.0424" k3="0.0102"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.45" k1="-0.1125" k2="0.0950" k3="-0.0365"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.6" k1="-0.0319" k2="-0.1457" k3="0.1152"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1.5" k1="-0.0486" k2="-0.1056" k3="0.0899"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="2.99" k1="-0.0601" k2="-0.0183" k3="0.0255"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0202" k2="-0.0970" k3="0.0663"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.45" k1="0.0218" k2="-0.1851" k3="0.1239"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.6" k1="-0.0392" k2="-0.1384" k3="0.1155"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1.5" k1="-0.0619" k2="-0.0729" k3="0.0702"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="2.99" k1="-0.0747" k2="0.0265" k3="0.0000"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="0.0455" k2="-0.2304" k3="0.1535"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.45" k1="0.0783" k2="-0.3106" k3="0.1983"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="0.6" k1="-0.0320" k2="-0.1747" k3="0.1511"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1.5" k1="-0.0657" k2="-0.0560" k3="0.0583"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="2.99" k1="-0.0804" k2="0.0464" k3="-0.0147"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="0.0439" k2="-0.2233" k3="0.1462"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- Also update copy at Nikon AI-S Nikkor 20mm f/2.8 below. -->
++        <maker>Nikon</maker>
++        <model>Nikon AF Nikkor 20mm f/2.8D</model>
++        <model lang="en">Nikkor AF 20mm f/2.8D</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="20" a="0.0346145503714303" b="-0.0771531442478898" c="0.0142974496031017"/>
++            <tca model="poly3" focal="20" br="-0.0003153" vr="1.0011160" bb="0.0003455" vb="0.9993072"/>
++            <!-- Taken with Nikon D750 -->
++            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- Also update copy at Nikon AF Nikkor 20mm f/2.8D above. -->
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 20mm f/2.8</model>
++        <model lang="en">Nikkor AI-S 20mm f/2.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="20" a="0.0346145503714303" b="-0.0771531442478898" c="0.0142974496031017"/>
++            <tca model="poly3" focal="20" br="-0.0003153" vr="1.0011160" bb="0.0003455" vb="0.9993072"/>
++            <!-- Taken with Nikon D750 -->
++            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 24-85 mm f/3.5-4.5G ED VR</model>
++        <model lang="en">Nikkor AF-S 24-85mm f/3.5-4.5G ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D610 -->
++            <distortion model="ptlens" focal="24" a="0.00771" b="-0.03274" c="0.01406"/>
++            <distortion model="ptlens" focal="28" a="0.01346" b="-0.04515" c="0.04487"/>
++            <distortion model="ptlens" focal="32" a="0.0165" b="-0.0444" c="0.05448"/>
++            <distortion model="ptlens" focal="42" a="0.00831" b="-0.00929" c="0.02554"/>
++            <distortion model="ptlens" focal="58" a="0.00581" b="-0.00104" c="0.0207"/>
++            <distortion model="ptlens" focal="68" a="0.00072" b="0.01909" c="-0.00624"/>
++            <distortion model="ptlens" focal="85" a="0.00148" b="0.01645" c="-0.00584"/>
++            <tca model="poly3" focal="24" br="0.0000562" vr="1.0003064" bb="-0.0000458" vb="1.0001659"/>
++            <tca model="poly3" focal="28" br="0.0000260" vr="1.0003036" bb="-0.0000758" vb="1.0001937"/>
++            <tca model="poly3" focal="32" br="0.0001195" vr="1.0000822" bb="-0.0000848" vb="1.0002045"/>
++            <tca model="poly3" focal="42" br="0.0000594" vr="0.9999884" bb="-0.0000847" vb="1.0001990"/>
++            <tca model="poly3" focal="58" br="0.0000426" vr="0.9998852" bb="-0.0000709" vb="1.0001834"/>
++            <tca model="poly3" focal="68" br="0.0000360" vr="0.9998503" bb="-0.0000556" vb="1.0001424"/>
++            <tca model="poly3" focal="85" br="0.0000118" vr="0.9998654" bb="-0.0000847" vb="1.0001720"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 800mm f/5.6E FL ED VR</model>
++        <model lang="en">Nikkor AF-S 800mm f/5.6E FL ED VR</model>
++        <mount>Nikon F AF</mount>
++        <aperture min="5.6" max="32"/>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="800" a="0.0015" b="-0.00178" c="0.00484"/>
++            <!-- Much vignetting data still missing -->
++            <vignetting model="pa" focal="800" aperture="5.6" distance="100" k1="-0.60708" k2="0.24577" k3="-0.10028"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 600mm f/4G ED VR</model>
++        <model lang="en">Nikkor AF-S 600mm f/4G ED VR</model>
++        <mount>Nikon F AF</mount>
++        <aperture min="4" max="22"/>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="600" a="-0.00089" b="0.00493" c="-0.00382"/>
++            <!-- Much vignetting data still missing -->
++            <vignetting model="pa" focal="600" aperture="4" distance="100" k1="-1.12925" k2="1.1294" k3="-0.5612"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR</model>
++        <model lang="en">Nikkor AF-S 18-140mm f/3.5-5.6G DX ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5100 -->
++            <distortion model="ptlens" focal="18" a="0.02" b="-0.06" c="0.006"/>
++            <distortion model="ptlens" focal="35" a="0.01" b="-0.014" c="0.017"/>
++            <distortion model="ptlens" focal="52" a="-0.001" b="0.02" c="-0.012"/>
++            <distortion model="ptlens" focal="70" a="0.001" b="0.014" c="-0.004"/>
++            <distortion model="ptlens" focal="85" a="0.002" b="0.006" c="0.007"/>
++            <distortion model="ptlens" focal="95" a="0.002" b="0.003" c="0.016"/>
++            <distortion model="ptlens" focal="112" a="0.002" b="0.005" c="0.007"/>
++            <distortion model="ptlens" focal="140" a="0.004" b="0.002" c="-0.002"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Fisheye-Nikkor 6mm f/2.8</model>
++        <model lang="en">Nikkor AI-S 6mm f/2.8 Fisheye</model>
++        <mount>Nikon F AI-S</mount>
++        <type>fisheye</type>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken from
++                 http://www.mir.com.my/rb/photography/companies/nikon/nikkoresources/fisheyes/6mm_FisheyeNikkor-Manual/8.jpg
++                 -->
++            <distortion model="ptlens" focal="6" a="0.011705" b="-0.01815" c="-0.03936"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Zoom-Nikkor 28-80mm f/3.3-5.6G</model>
++        <model lang="en">Nikkor AF 28-80mm f/3.3-5.6G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="28" a="0.0075" b="-0.02022" c="-0.02162"/>
++            <distortion model="ptlens" focal="35" a="0.00186" b="-0.00107" c="-0.02354"/>
++            <distortion model="ptlens" focal="44" a="0.00037" b="0.009" c="-0.02965"/>
++            <distortion model="ptlens" focal="52" a="-0.00025" b="0.00971" c="-0.02007"/>
++            <distortion model="ptlens" focal="62" a="0.00492" b="-0.01327" c="0.01487"/>
++            <distortion model="ptlens" focal="80" a="0.00758" b="-0.02553" c="0.03355"/>
++            <tca model="poly3" focal="28" vr="1.0002814" vb="1.0000076"/>
++            <tca model="poly3" focal="35" vr="1.0001889" vb="1.0000354"/>
++            <tca model="poly3" focal="44" vr="1.0001187" vb="1.0000880"/>
++            <tca model="poly3" focal="52" vr="1.0000687" vb="1.0001018"/>
++            <tca model="poly3" focal="62" vr="0.9999994" vb="1.0000803"/>
++            <tca model="poly3" focal="80" vr="0.9999976" vb="1.0000594"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED</model>
++        <model lang="en">Nikkor AF 28-200mm f/3.5-5.6G IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="28" a="0.03547" b="-0.10778" c="0.08687"/>
++            <distortion model="ptlens" focal="38" a="0.02089" b="-0.04522" c="0.02617"/>
++            <distortion model="ptlens" focal="48" a="0.01934" b="-0.04754" c="0.04983"/>
++            <distortion model="ptlens" focal="62" a="0.0182" b="-0.03995" c="0.04876"/>
++            <distortion model="ptlens" focal="85" a="0.01073" b="-0.00974" c="0.0161"/>
++            <distortion model="ptlens" focal="125" a="0.00065" b="0.03125" c="-0.03952"/>
++            <distortion model="ptlens" focal="200" a="0.01851" b="-0.05192" c="0.08089"/>
++            <tca model="poly3" focal="28" vr="1.0002152" vb="1.0000092"/>
++            <tca model="poly3" focal="38" vr="1.0001291" vb="1.0000999"/>
++            <tca model="poly3" focal="48" vr="1.0000649" vb="1.0000876"/>
++            <tca model="poly3" focal="62" vr="0.9999990" vb="1.0001145"/>
++            <tca model="poly3" focal="85" vr="0.9999428" vb="1.0000457"/>
++            <tca model="poly3" focal="125" vr="0.9999015" vb="0.9999823"/>
++            <tca model="poly3" focal="200" vr="0.9999001" vb="0.9998229"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Zoom-Nikkor 20-35mm f/2.8D IF</model>
++        <model lang="en">Nikkor AF 20-35mm f/2.8D IF</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D700 -->
++            <distortion model="ptlens" focal="20" a="0.01479" b="-0.03259" c="0.0026"/>
++            <distortion model="ptlens" focal="28" a="0.01506" b="-0.03716" c="0.02036"/>
++            <distortion model="ptlens" focal="32" a="0.01362" b="-0.03456" c="0.02473"/>
++            <distortion model="ptlens" focal="35" a="0.01467" b="-0.03881" c="0.03203"/>
++            <tca model="poly3" focal="20" br="0.0000771" vr="1.0004274" bb="0.0000135" vb="1.0001100"/>
++            <tca model="poly3" focal="28" br="0.0000742" vr="1.0001392" bb="-0.0000555" vb="1.0001588"/>
++            <tca model="poly3" focal="32" br="0.0000672" vr="1.0001007" bb="-0.0000585" vb="1.0001230"/>
++            <tca model="poly3" focal="35" br="0.0001757" vr="0.9999669" bb="-0.0000378" vb="1.0000656"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon Nikkor AI 20mm f/3.5</model>
++        <model lang="en">Nikkor AI 20mm f/3.5</model>
++        <mount>Nikon F AI</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D700 -->
++            <distortion model="ptlens" focal="20" a="0.02362" b="-0.04833" c="-0.00643"/>
++            <tca model="poly3" focal="20" br="-0.0000578" vr="1.0005977" bb="0.0002050" vb="0.9994372"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Micro-Nikkor 60mm f/2.8D</model>
++        <model lang="en">Nikkor AF 60mm f/2.8D Micro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D700 -->
++            <distortion model="poly3" focal="60" k1="0.00198"/>
++            <tca model="poly3" focal="60" vr="1.0001048" vb="0.9998597"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF DX Fisheye-Nikkor 10.5mm f/2.8G ED</model>
++        <model lang="en">Nikkor AF 10.5mm f/2.8G DX ED Fisheye</model>
++        <mount>Nikon F AF</mount>
++        <type>equisolid</type>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7000 -->
++            <!-- Taken with panorama -->
++            <distortion model="ptlens" focal="10.5" a="0.03347" b="-0.0964" c="0.08113"/>
++            <tca model="poly3" focal="10.5" br="0.0001472" vr="1.0001888" bb="-0.0000942" vb="1.0006018"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR</model>
++        <model lang="en">Nikkor AF-S 18-300mm f/3.5-6.3G DX ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D200 -->
++            <distortion model="ptlens" focal="18" a="0.0325" b="-0.10956" c="0.07226"/>
++            <distortion model="ptlens" focal="21" a="0.01497" b="-0.03351" c="0.00742"/>
++            <distortion model="ptlens" focal="26" a="0.00744" b="-0.00928" c="0.01137"/>
++            <distortion model="ptlens" focal="32" a="0.01341" b="-0.02006" c="0.02382"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.0134" c="0"/>
++            <distortion model="ptlens" focal="195" a="0" b="0.00838" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00612" c="0"/>
++            <tca model="poly3" focal="18" vr="1.0004549" vb="1.0001378"/>
++            <tca model="poly3" focal="21" vr="1.0004561" vb="1.0001891"/>
++            <tca model="poly3" focal="26" vr="1.0003475" vb="1.0001747"/>
++            <tca model="poly3" focal="32" vr="1.0002402" vb="1.0000919"/>
++            <tca model="poly3" focal="100" vr="1.0000580" vb="0.9998655"/>
++            <tca model="poly3" focal="195" vr="0.9999012" vb="0.9996384"/>
++            <tca model="poly3" focal="300" vr="0.9998668" vb="0.9991122"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Micro Nikkor 60mm f/2.8G ED</model>
++        <model lang="en">Nikkor AF-S 60mm f/2.8G ED Micro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7000 -->
++            <distortion model="poly3" focal="60" k1="-0.00069"/>
++            <tca model="poly3" focal="60" vr="0.9999113" vb="1.0000999"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 85mm f/1.4G</model>
++        <model lang="en">Nikkor AF-S 85mm f/1.4G</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="poly3" focal="85" k1="-0.00369"/>
++            <tca model="poly3" focal="85" br="0.0000048" vr="0.9999486" bb="-0.0000248" vb="1.0000052"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon Lens Series E 28mm f/2.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="28" a="0.01493" b="-0.05112" c="0.02965"/>
++            <tca model="poly3" focal="28" vr="1.0004587" vb="0.9998259"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon Lens Series E 50mm f/1.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="poly3" focal="50" k1="0.0007"/>
++            <tca model="poly3" focal="50" vr="1.0000550" vb="0.9999107"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon Lens Series E 100mm f/2.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="poly3" focal="100" k1="0.00588"/>
++            <tca model="poly3" focal="100" vr="0.9998270" vb="0.9999607"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Micro-Nikkor 105mm f/2.8D</model>
++        <model lang="en">Nikkor AF 105mm f/2.8D Micro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="poly3" focal="105" k1="0.00083"/>
++            <tca model="poly3" focal="105" vr="0.9999257" vb="1.0000278"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-1.2984" k2="1.4994" k3="-0.7772"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-1.2984" k2="1.4994" k3="-0.7772"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.0934" k2="-0.0239" k3="-0.1779"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.0934" k2="-0.0239" k3="-0.1779"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0950" k2="0.0021" k3="-0.0049"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0950" k2="0.0021" k3="-0.0049"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0866" k2="-0.0231" k3="0.0150"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0866" k2="-0.0231" k3="0.0150"/>
++            <vignetting model="pa" focal="105" aperture="32" distance="10" k1="-0.0379" k2="-0.1418" k3="0.0891"/>
++            <vignetting model="pa" focal="105" aperture="32" distance="1000" k1="-0.0379" k2="-0.1418" k3="0.0891"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikkor 55mm f/3.5 Micro</model>
++        <mount>Nikon F</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-E2 -->
++            <distortion model="poly3" focal="55" k1="0.000103"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 300mm f/4E PF ED VR</model>
++        <model lang="en">Nikkor AF-S 300mm f/4E PF ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="poly3" focal="300" k1="0.00407"/>
++            <tca model="poly3" focal="300" vr="0.9998" vb="0.9999"/>
++            <vignetting model="pa" focal="300" aperture="4" distance="10" k1="-1.4831" k2="1.6895" k3="-0.7941"/>
++            <vignetting model="pa" focal="300" aperture="4" distance="1000" k1="-1.4831" k2="1.6895" k3="-0.7941"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.0612" k2="-0.8987" k3="0.6192"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.0612" k2="-0.8987" k3="0.6192"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="0.0480" k2="-0.4219" k3="0.1247"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0480" k2="-0.4219" k3="0.1247"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.2131" k2="0.4794" k3="-0.3938"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.2131" k2="0.4794" k3="-0.3938"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.1730" k2="0.2293" k3="-0.0866"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.1730" k2="0.2293" k3="-0.0866"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR</model>
++        <model lang="en">Nikkor AF-S 18-300mm f/3.5-5.6G DX ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7200 -->
++            <distortion model="ptlens" focal="18" a="0.02888" b="-0.09293" c="0.04919"/>
++            <distortion model="ptlens" focal="21" a="0.02797" b="-0.07952" c="0.04821"/>
++            <distortion model="ptlens" focal="24" a="0.02199" b="-0.05351" c="0.04359"/>
++            <distortion model="ptlens" focal="34" a="0.00463" b="0.00143" c="0.00316"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.01465" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00896" c="0"/>
++            <tca model="poly3" focal="18" br="-0.0002581" vr="1.0018248" bb="0.0002104" vb="0.9995971"/>
++            <tca model="poly3" focal="21" br="-0.0002194" vr="1.0016713" bb="0.0001272" vb="0.9997500"/>
++            <tca model="poly3" focal="24" br="-0.0001499" vr="1.0013653" bb="0.0000950" vb="0.9998781"/>
++            <tca model="poly3" focal="34" br="-0.0000768" vr="1.0007444" bb="0.0000410" vb="1.0001477"/>
++            <tca model="poly3" focal="100" br="0.0000304" vr="0.9996903" bb="0.0000115" vb="1.0006660"/>
++            <tca model="poly3" focal="300" br="-0.0000065" vr="0.9994044" bb="-0.0000318" vb="1.0000918"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 35mm f/1.8G ED</model>
++        <model lang="en">Nikkor AF-S 35mm f/1.8G ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="ptlens" focal="35" a="0.02498" b="-0.07793" c="0.05642"/>
++            <tca model="poly3" focal="35" br="-0.0002043" vr="1.0006177" bb="0.0003032" vb="0.9996507"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF DC-Nikkor 135mm f/2D</model>
++        <model lang="en">Nikkor AF 135mm f/2D DC</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="ptlens" focal="135" a="0.00165" b="0.0009" c="-0.01172"/>
++            <tca model="poly3" focal="135" br="-0.0001287" vr="0.9997403" bb="-0.0000253" vb="1.0008556"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF DC-Nikkor 105mm f/2D</model>
++        <model lang="en">Nikkor AF 105mm f/2D DC</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D600 -->
++            <distortion model="ptlens" focal="105" a="-0.00457" b="0.01891" c="-0.02932"/>
++            <tca model="poly3" focal="105" vr="0.9998959" vb="1.0001104"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-P DX Nikkor 18-55mm f/3.5-5.6G VR</model>
++        <model lang="en">Nikkor AF-P 18-55mm f/3.5-5.6G DX VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3300 -->
++            <distortion model="ptlens" focal="18" a="0.01368" b="-0.06635" c="0.05634"/>
++            <distortion model="ptlens" focal="27" a="-0.00251" b="-0.00039" c="0.00216"/>
++            <distortion model="ptlens" focal="38" a="0.0081" b="-0.02326" c="0.01923"/>
++            <distortion model="ptlens" focal="42" a="0.00752" b="-0.02904" c="0.03851"/>
++            <distortion model="ptlens" focal="55" a="-0.00143" b="0.00372" c="0.00513"/>
++            <tca model="poly3" focal="18" vr="1.0000132" vb="0.9999439"/>
++            <tca model="poly3" focal="27" vr="1.0004023" vb="0.9999283"/>
++            <tca model="poly3" focal="38" vr="1.0001621" vb="0.9999533"/>
++            <tca model="poly3" focal="42" vr="1.0000028" vb="1.0000053"/>
++            <tca model="poly3" focal="55" vr="0.9999729" vb="1.0000319"/>
++            <!-- Taken with Nikon D3400 -->
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.6356" k2="1.4231" k3="-0.5427"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.6356" k2="1.4231" k3="-0.5427"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-1.5688" k2="1.2771" k3="-0.4589"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-1.5688" k2="1.2771" k3="-0.4589"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.6121" k2="-0.6114" k3="0.5564"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.6121" k2="-0.6114" k3="0.5564"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.2143" k2="-1.1858" k3="0.7928"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.2143" k2="-1.1858" k3="0.7928"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2764" k2="0.0855" k3="-0.1006"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2764" k2="0.0855" k3="-0.1006"/>
++            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.2414" k2="-0.0892" k3="0.0984"/>
++            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.2414" k2="-0.0892" k3="0.0984"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2474" k2="-0.0686" k3="0.0837"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2474" k2="-0.0686" k3="0.0837"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.3676" k2="1.1078" k3="-0.4141"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.3676" k2="1.1078" k3="-0.4141"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-1.2868" k2="0.9393" k3="-0.3194"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-1.2868" k2="0.9393" k3="-0.3194"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="10" k1="-0.5241" k2="-0.5435" k3="0.4787"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.5241" k2="-0.5435" k3="0.4787"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.0602" k2="-1.1325" k3="0.6922"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.0602" k2="-1.1325" k3="0.6922"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.2113" k2="0.0497" k3="-0.0532"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.2113" k2="0.0497" k3="-0.0532"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.1863" k2="-0.0574" k3="0.0545"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.1863" k2="-0.0574" k3="0.0545"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.1940" k2="-0.0331" k3="0.0381"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.1940" k2="-0.0331" k3="0.0381"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.8200" k2="0.3106" k3="-0.0168"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8200" k2="0.3106" k3="-0.0168"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.9279" k2="0.5293" k3="-0.1392"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.9279" k2="0.5293" k3="-0.1392"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.4456" k2="-0.3751" k3="0.3436"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.4456" k2="-0.3751" k3="0.3436"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.0201" k2="-0.9357" k3="0.5655"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.0201" k2="-0.9357" k3="0.5655"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.1389" k2="-0.0439" k3="0.0422"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.1389" k2="-0.0439" k3="0.0422"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.1400" k2="-0.0363" k3="0.0374"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.1400" k2="-0.0363" k3="0.0374"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1424" k2="-0.0317" k3="0.0358"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1424" k2="-0.0317" k3="0.0358"/>
++            <vignetting model="pa" focal="46" aperture="5" distance="10" k1="-0.6125" k2="0.0658" k3="0.0968"/>
++            <vignetting model="pa" focal="46" aperture="5" distance="1000" k1="-0.6125" k2="0.0658" k3="0.0968"/>
++            <vignetting model="pa" focal="46" aperture="5.6" distance="10" k1="-0.4587" k2="-0.1505" k3="0.1992"/>
++            <vignetting model="pa" focal="46" aperture="5.6" distance="1000" k1="-0.4587" k2="-0.1505" k3="0.1992"/>
++            <vignetting model="pa" focal="46" aperture="6.3" distance="10" k1="-0.2302" k2="-0.5199" k3="0.3812"/>
++            <vignetting model="pa" focal="46" aperture="6.3" distance="1000" k1="-0.2302" k2="-0.5199" k3="0.3812"/>
++            <vignetting model="pa" focal="46" aperture="7.1" distance="10" k1="0.0133" k2="-0.5083" k3="0.2342"/>
++            <vignetting model="pa" focal="46" aperture="7.1" distance="1000" k1="0.0133" k2="-0.5083" k3="0.2342"/>
++            <vignetting model="pa" focal="46" aperture="10" distance="10" k1="-0.1154" k2="-0.0211" k3="0.0249"/>
++            <vignetting model="pa" focal="46" aperture="10" distance="1000" k1="-0.1154" k2="-0.0211" k3="0.0249"/>
++            <vignetting model="pa" focal="46" aperture="14" distance="10" k1="-0.1177" k2="-0.0120" k3="0.0152"/>
++            <vignetting model="pa" focal="46" aperture="14" distance="1000" k1="-0.1177" k2="-0.0120" k3="0.0152"/>
++            <vignetting model="pa" focal="46" aperture="22" distance="10" k1="-0.1282" k2="0.0109" k3="0.0016"/>
++            <vignetting model="pa" focal="46" aperture="22" distance="1000" k1="-0.1282" k2="0.0109" k3="0.0016"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.2015" k2="-0.4393" k3="0.3198"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.2015" k2="-0.4393" k3="0.3198"/>
++            <vignetting model="pa" focal="55" aperture="6.3" distance="10" k1="-0.1454" k2="-0.5052" k3="0.3435"/>
++            <vignetting model="pa" focal="55" aperture="6.3" distance="1000" k1="-0.1454" k2="-0.5052" k3="0.3435"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="0.0103" k2="-0.4996" k3="0.2548"/>
++            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="0.0103" k2="-0.4996" k3="0.2548"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1047" k2="0.0383" k3="-0.0648"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1047" k2="0.0383" k3="-0.0648"/>
++            <vignetting model="pa" focal="55" aperture="14" distance="10" k1="-0.1056" k2="-0.0110" k3="0.0158"/>
++            <vignetting model="pa" focal="55" aperture="14" distance="1000" k1="-0.1056" k2="-0.0110" k3="0.0158"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1172" k2="0.0224" k3="-0.0061"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1172" k2="0.0224" k3="-0.0061"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 70-200mm f/2.8G ED VR II</model>
++        <model lang="en">Nikkor AF-S 70-200mm f/2.8G ED VR II</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D810 -->
++            <distortion model="ptlens" focal="70" a="-0.00191" b="0.00438" c="-0.0077"/>
++            <distortion model="ptlens" focal="85" a="0.00497" b="-0.01314" c="0.0114"/>
++            <distortion model="ptlens" focal="105" a="0.00213" b="-0.00208" c="0.00736"/>
++            <distortion model="ptlens" focal="135" a="-0.00136" b="0.0128" c="-0.00792"/>
++            <distortion model="ptlens" focal="170" a="0.00311" b="-0.00105" c="0.01086"/>
++            <distortion model="ptlens" focal="200" a="0.00022" b="0.00282" c="0.0104"/>
++            <tca model="poly3" focal="70" vr="1.0000089" vb="0.9999934"/>
++            <tca model="poly3" focal="85" vr="1.0000125" vb="1.0000026"/>
++            <tca model="poly3" focal="105" vr="0.9999989" vb="1.0000086"/>
++            <tca model="poly3" focal="135" vr="0.9999898" vb="1.0000243"/>
++            <tca model="poly3" focal="170" vr="0.9999686" vb="1.0000176"/>
++            <tca model="poly3" focal="200" vr="0.9999950" vb="0.9999548"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.5166" k2="0.3433" k3="-0.2940"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.5166" k2="0.3433" k3="-0.2940"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.1459" k2="0.2494" k3="-0.4068"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1459" k2="0.2494" k3="-0.4068"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2528" k2="0.5089" k3="-0.4378"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2528" k2="0.5089" k3="-0.4378"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1643" k2="0.1381" k3="-0.0751"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1643" k2="0.1381" k3="-0.0751"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1573" k2="0.0847" k3="-0.0337"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1573" k2="0.0847" k3="-0.0337"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="10" k1="-0.4391" k2="0.1694" k3="-0.1721"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="1000" k1="-0.4391" k2="0.1694" k3="-0.1721"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="10" k1="-0.1536" k2="0.2371" k3="-0.3583"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="1000" k1="-0.1536" k2="0.2371" k3="-0.3583"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="-0.2174" k2="0.3500" k3="-0.2789"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.2174" k2="0.3500" k3="-0.2789"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="10" k1="-0.1588" k2="0.1046" k3="-0.0413"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.1588" k2="0.1046" k3="-0.0413"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="10" k1="-0.1658" k2="0.1288" k3="-0.0599"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.1658" k2="0.1288" k3="-0.0599"/>
++            <vignetting model="pa" focal="85" aperture="22" distance="10" k1="-0.1571" k2="0.1027" k3="-0.0507"/>
++            <vignetting model="pa" focal="85" aperture="22" distance="1000" k1="-0.1571" k2="0.1027" k3="-0.0507"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-0.4334" k2="0.1775" k3="-0.2294"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-0.4334" k2="0.1775" k3="-0.2294"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.1451" k2="0.2872" k3="-0.4912"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.1451" k2="0.2872" k3="-0.4912"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.3012" k2="0.7289" k3="-0.6672"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.3012" k2="0.7289" k3="-0.6672"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.2107" k2="0.3128" k3="-0.2299"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.2107" k2="0.3128" k3="-0.2299"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="10" k1="-0.1630" k2="0.1252" k3="-0.0559"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="1000" k1="-0.1630" k2="0.1252" k3="-0.0559"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="10" k1="-0.1602" k2="0.1139" k3="-0.0501"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="1000" k1="-0.1602" k2="0.1139" k3="-0.0501"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.1525" k2="0.0890" k3="-0.0382"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.1525" k2="0.0890" k3="-0.0382"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.4124" k2="-0.2474" k3="0.1216"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.4124" k2="-0.2474" k3="0.1216"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.1241" k2="-0.7604" k3="0.2175"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.1241" k2="-0.7604" k3="0.2175"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1907" k2="0.4583" k3="-0.6099"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1907" k2="0.4583" k3="-0.6099"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.3091" k2="0.7561" k3="-0.6780"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.3091" k2="0.7561" k3="-0.6780"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.2050" k2="0.3081" k3="-0.2291"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2050" k2="0.3081" k3="-0.2291"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1550" k2="0.1038" k3="-0.0445"/>
++            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1550" k2="0.1038" k3="-0.0445"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.1663" k2="0.0990" k3="-0.0356"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1663" k2="0.0990" k3="-0.0356"/>
++            <vignetting model="pa" focal="170" aperture="2.8" distance="10" k1="-0.7295" k2="0.1446" k3="0.0136"/>
++            <vignetting model="pa" focal="170" aperture="2.8" distance="1000" k1="-0.7295" k2="0.1446" k3="0.0136"/>
++            <vignetting model="pa" focal="170" aperture="4" distance="10" k1="0.1824" k2="-1.3833" k3="0.7437"/>
++            <vignetting model="pa" focal="170" aperture="4" distance="1000" k1="0.1824" k2="-1.3833" k3="0.7437"/>
++            <vignetting model="pa" focal="170" aperture="5.6" distance="10" k1="0.0111" k2="-0.2554" k3="-0.1539"/>
++            <vignetting model="pa" focal="170" aperture="5.6" distance="1000" k1="0.0111" k2="-0.2554" k3="-0.1539"/>
++            <vignetting model="pa" focal="170" aperture="8" distance="10" k1="-0.2730" k2="0.7135" k3="-0.7440"/>
++            <vignetting model="pa" focal="170" aperture="8" distance="1000" k1="-0.2730" k2="0.7135" k3="-0.7440"/>
++            <vignetting model="pa" focal="170" aperture="11" distance="10" k1="-0.2959" k2="0.6707" k3="-0.5660"/>
++            <vignetting model="pa" focal="170" aperture="11" distance="1000" k1="-0.2959" k2="0.6707" k3="-0.5660"/>
++            <vignetting model="pa" focal="170" aperture="16" distance="10" k1="-0.1667" k2="0.1581" k3="-0.0961"/>
++            <vignetting model="pa" focal="170" aperture="16" distance="1000" k1="-0.1667" k2="0.1581" k3="-0.0961"/>
++            <vignetting model="pa" focal="170" aperture="22" distance="10" k1="-0.1553" k2="0.0771" k3="-0.0234"/>
++            <vignetting model="pa" focal="170" aperture="22" distance="1000" k1="-0.1553" k2="0.0771" k3="-0.0234"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.2393" k2="1.2317" k3="-0.5954"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.2393" k2="1.2317" k3="-0.5954"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.0661" k2="-1.2302" k3="0.8007"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.0661" k2="-1.2302" k3="0.8007"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.1736" k2="-1.0052" k3="0.3849"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.1736" k2="-1.0052" k3="0.3849"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1468" k2="0.3236" k3="-0.5533"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1468" k2="0.3236" k3="-0.5533"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.3307" k2="0.8727" k3="-0.8222"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.3307" k2="0.8727" k3="-0.8222"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.2653" k2="0.5301" k3="-0.4304"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2653" k2="0.5301" k3="-0.4304"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1448" k2="0.0653" k3="-0.0218"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1448" k2="0.0653" k3="-0.0218"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Zoom-Nikkor 28-70mm f/3.5-4.5D</model>
++        <model lang="en">Nikkor AF 28-70mm f/3.5-4.5D</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D700 -->
++            <distortion model="ptlens" focal="28" a="0.01986" b="-0.06207" c="0.02114"/>
++            <distortion model="ptlens" focal="35" a="0.00666" b="-0.02354" c="0.01038"/>
++            <distortion model="ptlens" focal="52" a="0" b="0.00198" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.00306" c="0"/>
++            <tca model="poly3" focal="28" vr="1.0003763" vb="1.0000255"/>
++            <tca model="poly3" focal="35" vr="1.0002477" vb="1.0001216"/>
++            <tca model="poly3" focal="52" vr="1.0001783" vb="1.0000956"/>
++            <tca model="poly3" focal="70" vr="1.0001524" vb="1.0000020"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-1.4675" k2="0.7434" k3="-0.1310"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-1.4675" k2="0.7434" k3="-0.1310"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-1.2902" k2="0.8541" k3="-0.3228"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-1.2902" k2="0.8541" k3="-0.3228"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-1.3575" k2="0.9766" k3="-0.3435"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-1.3575" k2="0.9766" k3="-0.3435"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-1.3371" k2="0.9300" k3="-0.3025"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-1.3371" k2="0.9300" k3="-0.3025"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-1.3918" k2="1.0227" k3="-0.3464"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-1.3918" k2="1.0227" k3="-0.3464"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-1.4224" k2="1.1016" k3="-0.3933"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-1.4224" k2="1.1016" k3="-0.3933"/>
++            <vignetting model="pa" focal="35" aperture="3.8" distance="10" k1="-1.4588" k2="0.8837" k3="-0.2016"/>
++            <vignetting model="pa" focal="35" aperture="3.8" distance="1000" k1="-1.4588" k2="0.8837" k3="-0.2016"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.8549" k2="0.1075" k3="0.0169"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.8549" k2="0.1075" k3="0.0169"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-1.0378" k2="0.7006" k3="-0.3200"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-1.0378" k2="0.7006" k3="-0.3200"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-1.0013" k2="0.6024" k3="-0.2213"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-1.0013" k2="0.6024" k3="-0.2213"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-1.0802" k2="0.7378" k3="-0.2765"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-1.0802" k2="0.7378" k3="-0.2765"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-1.0570" k2="0.7003" k3="-0.2526"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-1.0570" k2="0.7003" k3="-0.2526"/>
++            <vignetting model="pa" focal="52" aperture="4.2" distance="10" k1="-1.1030" k2="0.4458" k3="-0.0235"/>
++            <vignetting model="pa" focal="52" aperture="4.2" distance="1000" k1="-1.1030" k2="0.4458" k3="-0.0235"/>
++            <vignetting model="pa" focal="52" aperture="5.6" distance="10" k1="-0.3585" k2="-0.5951" k3="0.3361"/>
++            <vignetting model="pa" focal="52" aperture="5.6" distance="1000" k1="-0.3585" k2="-0.5951" k3="0.3361"/>
++            <vignetting model="pa" focal="52" aperture="8" distance="10" k1="-0.5565" k2="0.2942" k3="-0.2958"/>
++            <vignetting model="pa" focal="52" aperture="8" distance="1000" k1="-0.5565" k2="0.2942" k3="-0.2958"/>
++            <vignetting model="pa" focal="52" aperture="11" distance="10" k1="-0.7141" k2="0.6687" k3="-0.4469"/>
++            <vignetting model="pa" focal="52" aperture="11" distance="1000" k1="-0.7141" k2="0.6687" k3="-0.4469"/>
++            <vignetting model="pa" focal="52" aperture="16" distance="10" k1="-0.6568" k2="0.4393" k3="-0.2270"/>
++            <vignetting model="pa" focal="52" aperture="16" distance="1000" k1="-0.6568" k2="0.4393" k3="-0.2270"/>
++            <vignetting model="pa" focal="52" aperture="22" distance="10" k1="-0.6581" k2="0.3947" k3="-0.1600"/>
++            <vignetting model="pa" focal="52" aperture="22" distance="1000" k1="-0.6581" k2="0.3947" k3="-0.1600"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.8919" k2="0.1250" k3="0.1192"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.8919" k2="0.1250" k3="0.1192"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0614" k2="-1.2131" k3="0.7031"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0614" k2="-1.2131" k3="0.7031"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2945" k2="-0.1255" k3="-0.1471"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2945" k2="-0.1255" k3="-0.1471"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.4762" k2="0.6231" k3="-0.6553"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.4762" k2="0.6231" k3="-0.6553"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.5647" k2="0.8674" k3="-0.7639"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.5647" k2="0.8674" k3="-0.7639"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.5484" k2="0.7069" k3="-0.5361"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.5484" k2="0.7069" k3="-0.5361"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Micro Nikkor 40mm f/2.8G</model>
++        <model lang="en">Nikkor AF-S 40mm f/2.8G DX Micro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5500 -->
++            <distortion model="poly3" focal="40" k1="0.00139"/>
++            <tca model="poly3" focal="40" vr="1.0002635" vb="0.9999669"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-P DX Nikkor 70-300mm f/4.5-6.3G ED VR</model>
++        <model lang="en">Nikkor AF-P 70-300mm f/4.5-6.3G DX ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5300 -->
++            <distortion model="ptlens" focal="70" a="0.00027" b="-0.00374" c="-0.00068"/>
++            <distortion model="ptlens" focal="85" a="-0.00362" b="0.01006" c="-0.00651"/>
++            <distortion model="ptlens" focal="100" a="0.00374" b="-0.01034" c="0.0176"/>
++            <distortion model="ptlens" focal="135" a="0.00437" b="-0.00889" c="0.01926"/>
++            <distortion model="ptlens" focal="200" a="-0.002" b="0.01668" c="-0.01508"/>
++            <distortion model="ptlens" focal="300" a="0.00569" b="-0.01177" c="0.01233"/>
++            <tca model="poly3" focal="70" vr="1.0001637" vb="0.9999348"/>
++            <tca model="poly3" focal="85" vr="1.0000975" vb="0.9999123"/>
++            <tca model="poly3" focal="100" vr="0.9999979" vb="0.9998999"/>
++            <tca model="poly3" focal="135" vr="0.9999275" vb="0.9999038"/>
++            <tca model="poly3" focal="200" vr="0.9998593" vb="0.9997647"/>
++            <tca model="poly3" focal="300" vr="0.9997757" vb="0.9997447"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S DX Nikkor 35mm f/1.8G</model>
++        <model lang="en">Nikkor AF-S 35mm f/1.8G DX</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="ptlens" focal="35" a="0.01504" b="-0.05387" c="0.03379"/>
++            <tca model="poly3" focal="35" vr="1.0002896" vb="1.0003004"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Nikkor 35-70mm f/2.8</model>
++        <model lang="en">Nikkor AF 35-70mm f/2.8</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="ptlens" focal="35" a="0.01027" b="-0.03727" c="0.02147"/>
++            <distortion model="ptlens" focal="40" a="0.00645" b="-0.02212" c="0.01511"/>
++            <distortion model="ptlens" focal="44" a="0.00592" b="-0.01678" c="0.01032"/>
++            <distortion model="ptlens" focal="48" a="0.00372" b="-0.00651" c="0.00434"/>
++            <distortion model="ptlens" focal="58" a="0.00198" b="-0.00029" c="0.00444"/>
++            <distortion model="ptlens" focal="70" a="0.00308" b="-0.00151" c="0.0072"/>
++            <tca model="poly3" focal="35" vr="1.0001919" vb="1.0000261"/>
++            <tca model="poly3" focal="40" vr="1.0001573" vb="0.9999960"/>
++            <tca model="poly3" focal="44" vr="1.0001904" vb="0.9999758"/>
++            <tca model="poly3" focal="48" vr="1.0001616" vb="0.9999739"/>
++            <tca model="poly3" focal="58" vr="1.0001055" vb="0.9999782"/>
++            <tca model="poly3" focal="70" vr="1.0000968" vb="0.9999608"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 50mm f/1.4</model>
++        <model lang="en">Nikkor AI-S 50mm f/1.4</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="ptlens" focal="50" a="0.00762" b="-0.03144" c="0.02936"/>
++            <tca model="poly3" focal="50" vr="1.0000689" vb="0.9999818"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 50mm f/1.8</model>
++        <model lang="en">Nikkor AI-S 50mm f/1.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="50" k1="-0.0004"/>
++            <tca model="poly3" focal="50" vr="1.0000763" vb="0.9998909"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 135mm f/2.8</model>
++        <model lang="en">Nikkor AI-S 135mm f/2.8</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="135" k1="0.00204"/>
++            <tca model="poly3" focal="135" vr="0.9998352" vb="0.9999342"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF Nikkor 180mm f/2.8D IF-ED</model>
++        <model lang="en">Nikkor AF 180mm f/2.8D IF-ED</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="180" k1="0.00414"/>
++            <tca model="poly3" focal="180" vr="0.9998346" vb="0.9998166"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 200mm f/4</model>
++        <model lang="en">Nikkor AI-S 200mm f/4</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="200" k1="0.00338"/>
++            <tca model="poly3" focal="200" vr="0.9997286" vb="0.9998411"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 300mm f/4.5</model>
++        <model lang="en">Nikkor AI-S 300mm f/4.5</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="300" k1="0.0041"/>
++            <tca model="poly3" focal="300" vr="0.9997133" vb="0.9997451"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 400mm f/3.5</model>
++        <model lang="en">Nikkor AI-S 400mm f/3.5</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="ptlens" focal="400" a="0.00965" b="-0.03022" c="0.03424"/>
++            <tca model="poly3" focal="400" vr="0.9998761" vb="0.9998796"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AI-S Nikkor 400mm f/3.5 + TC14B teleconverter</model>
++        <model lang="en">Nikkor AI-S 400mm f/3.5 + TC14B teleconverter</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="poly3" focal="600" k1="0.00217"/>
++            <tca model="poly3" focal="600" vr="0.9998468" vb="0.9997375"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Nikon</maker>
++        <model>Nikon AF-S Nikkor 70-200mm f/2.8E FL ED VR</model>
++        <model lang="en">Nikkor AF-S 70-200mm f/2.8E FL ED VR</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="poly3" focal="70" k1="-0.00045"/>
++            <distortion model="poly3" focal="85" k1="0.00344"/>
++            <distortion model="poly3" focal="105" k1="0.0065"/>
++            <distortion model="poly3" focal="135" k1="0.00793"/>
++            <distortion model="poly3" focal="160" k1="0.00816"/>
++            <distortion model="poly3" focal="200" k1="0.00873"/>
++            <tca model="poly3" focal="70" vr="1.0000767" vb="1.0001289"/>
++            <tca model="poly3" focal="85" vr="1.0000226" vb="1.0000882"/>
++            <tca model="poly3" focal="105" vr="0.9999887" vb="1.0000729"/>
++            <tca model="poly3" focal="135" vr="0.9999568" vb="1.0000255"/>
++            <tca model="poly3" focal="160" vr="0.9999367" vb="0.9999862"/>
++            <tca model="poly3" focal="200" vr="0.9999579" vb="0.9998847"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-olympus.xml b/data/db/slr-olympus.xml
+--- a/data/db/slr-olympus.xml	2013-10-11 23:54:00.000000000 +0200
++++ b/data/db/slr-olympus.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,735 +1,822 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>4/3 System</name>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+-        <name>olympusE10</name>
++        <name>Olympus OM</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-300</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-330</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-400</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-410</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-420</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-450</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-500</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-510</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-520</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
++        <maker lang="en">Olympus</maker>
++        <model>E-600</model>
++        <mount>4/3 System</mount>
++        <cropfactor>2</cropfactor>
++    </camera>
++    <camera>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-620</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-10</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
++        <maker>Olympus Optical Co.,Ltd</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-20,E-20N,E-20P</model>
++        <model lang="en">E-20, E-20N, E-20P</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-30</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS CORPORATION</maker>
++        <maker>Olympus Corporation</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-1</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-3</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>OLYMPUS IMAGING CORP.</maker>
++        <maker>Olympus Imaging Corp.</maker>
+         <maker lang="en">Olympus</maker>
+         <model>E-5</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 7-14mm f/4.0</model>
++        <model>Olympus Zuiko Digital ED 7-14mm f/4.0</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="7" a="-0.013136" b="0.015797" c="0" />
+-            <distortion model="ptlens" focal="8" a="-0.020562" b="0.041619" c="0" />
+-            <distortion model="ptlens" focal="9" a="0" b="-0.00181" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="0.004183" c="0" />
+-            <distortion model="ptlens" focal="14" a="0" b="0.005149" c="0" />
++            <distortion model="ptlens" focal="7" a="-0.013136" b="0.015797" c="0"/>
++            <distortion model="ptlens" focal="8" a="-0.020562" b="0.041619" c="0"/>
++            <distortion model="ptlens" focal="9" a="0" b="-0.00181" c="0"/>
++            <distortion model="ptlens" focal="10" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="12" a="0" b="0.004183" c="0"/>
++            <distortion model="ptlens" focal="14" a="0" b="0.005149" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital ED 9-18mm F4.0-5.6</model>
+-	    <focal min="9" max="18" />
+-	    <aperture min="4" max="22" />
++        <model>Olympus Zuiko Digital ED 9-18mm f/4.0-5.6</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal min="9" max="18"/>
++        <aperture min="4" max="22"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9" a="-0.00278861" b="-0.0014655" c="0.00667809" />
+-            <distortion model="ptlens" focal="11" a="-0.00230113" b="0.00568337" c="0.00385418" />
+-            <distortion model="ptlens" focal="14" a="0.0028023" b="-0.00664244" c="0.0122182" />
+-            <distortion model="ptlens" focal="18" a="-0.0010959" b="0.00291188" c="0.00571393" />
+-            <tca model="poly3" focal="9" br="-0.0000859" vr="1.0002600" bb="-0.0001253" vb="1.0001971" />
+-            <tca model="poly3" focal="11" br="0.0000079" vr="1.0001843" bb="-0.0001521" vb="1.0002540" />
+-            <tca model="poly3" focal="14" br="0.0000509" vr="1.0001296" bb="-0.0001716" vb="1.0003184" />
+-            <tca model="poly3" focal="18" br="-0.0000076" vr="1.0001488" bb="-0.0001226" vb="1.0002276" />
+-            <vignetting model="pa" focal="9" aperture="4" distance="0.25" k1="-0.4907" k2="0.3365" k3="-0.3633" />
+-            <vignetting model="pa" focal="9" aperture="4" distance="0.5" k1="-0.3635" k2="-0.0437" k3="-0.1999" />
+-            <vignetting model="pa" focal="9" aperture="4" distance="1.5" k1="-0.3964" k2="0.0444" k3="-0.2357" />
+-            <vignetting model="pa" focal="9" aperture="4" distance="1000" k1="-0.4847" k2="0.3284" k3="-0.3659" />
+-            <vignetting model="pa" focal="9" aperture="5.6" distance="0.25" k1="-0.5288" k2="0.3913" k3="-0.2548" />
+-            <vignetting model="pa" focal="9" aperture="5.6" distance="0.5" k1="-0.5652" k2="0.5795" k3="-0.4992" />
+-            <vignetting model="pa" focal="9" aperture="5.6" distance="1.5" k1="-0.5558" k2="0.5286" k3="-0.4291" />
+-            <vignetting model="pa" focal="9" aperture="5.6" distance="1000" k1="-0.5262" k2="0.3968" k3="-0.2696" />
+-            <vignetting model="pa" focal="9" aperture="8" distance="0.25" k1="-0.4780" k2="0.1844" k3="-0.0634" />
+-            <vignetting model="pa" focal="9" aperture="8" distance="0.5" k1="-0.5467" k2="0.4370" k3="-0.2988" />
+-            <vignetting model="pa" focal="9" aperture="8" distance="1.5" k1="-0.5108" k2="0.2994" k3="-0.1706" />
+-            <vignetting model="pa" focal="9" aperture="8" distance="1000" k1="-0.4782" k2="0.1966" k3="-0.0830" />
+-            <vignetting model="pa" focal="9" aperture="11" distance="0.25" k1="-0.4465" k2="0.0730" k3="0.0311" />
+-            <vignetting model="pa" focal="9" aperture="11" distance="0.5" k1="-0.4664" k2="0.1210" k3="-0.0095" />
+-            <vignetting model="pa" focal="9" aperture="11" distance="1.5" k1="-0.4495" k2="0.0727" k3="0.0300" />
+-            <vignetting model="pa" focal="9" aperture="11" distance="1000" k1="-0.4440" k2="0.0753" k3="0.0203" />
+-            <vignetting model="pa" focal="9" aperture="22" distance="0.25" k1="-0.4413" k2="0.0577" k3="0.0418" />
+-            <vignetting model="pa" focal="9" aperture="22" distance="0.5" k1="-0.4435" k2="0.0396" k3="0.0603" />
+-            <vignetting model="pa" focal="9" aperture="22" distance="1.5" k1="-0.4350" k2="0.0336" k3="0.0564" />
+-            <vignetting model="pa" focal="9" aperture="22" distance="1000" k1="-0.4265" k2="0.0312" k3="0.0510" />
+-            <vignetting model="pa" focal="11" aperture="4.2" distance="0.25" k1="-0.3302" k2="-0.1235" k3="0.1126" />
+-            <vignetting model="pa" focal="11" aperture="4.2" distance="0.5" k1="-0.3220" k2="-0.1480" k3="0.1226" />
+-            <vignetting model="pa" focal="11" aperture="4.2" distance="1.5" k1="-0.3706" k2="-0.0564" k3="0.0705" />
+-            <vignetting model="pa" focal="11" aperture="4.2" distance="1000" k1="-0.3230" k2="-0.1432" k3="0.1203" />
+-            <vignetting model="pa" focal="11" aperture="5.6" distance="0.25" k1="-0.3821" k2="0.0319" k3="0.0501" />
+-            <vignetting model="pa" focal="11" aperture="5.6" distance="0.5" k1="-0.3751" k2="0.0128" k3="0.0537" />
+-            <vignetting model="pa" focal="11" aperture="5.6" distance="1.5" k1="-0.4153" k2="0.0847" k3="0.0139" />
+-            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.3694" k2="0.0036" k3="0.0593" />
+-            <vignetting model="pa" focal="11" aperture="8" distance="0.25" k1="-0.3874" k2="0.0419" k3="0.0427" />
+-            <vignetting model="pa" focal="11" aperture="8" distance="0.5" k1="-0.3802" k2="0.0288" k3="0.0419" />
+-            <vignetting model="pa" focal="11" aperture="8" distance="1.5" k1="-0.4239" k2="0.1017" k3="0.0041" />
+-            <vignetting model="pa" focal="11" aperture="8" distance="1000" k1="-0.3714" k2="0.0095" k3="0.0541" />
+-            <vignetting model="pa" focal="11" aperture="11" distance="0.25" k1="-0.3836" k2="0.0387" k3="0.0428" />
+-            <vignetting model="pa" focal="11" aperture="11" distance="0.5" k1="-0.3739" k2="0.0151" k3="0.0490" />
+-            <vignetting model="pa" focal="11" aperture="11" distance="1.5" k1="-0.4236" k2="0.0961" k3="0.0081" />
+-            <vignetting model="pa" focal="11" aperture="11" distance="1000" k1="-0.3638" k2="-0.0006" k3="0.0571" />
+-            <vignetting model="pa" focal="11" aperture="22" distance="0.25" k1="-0.3793" k2="0.0288" k3="0.0480" />
+-            <vignetting model="pa" focal="11" aperture="22" distance="0.5" k1="-0.3650" k2="-0.0044" k3="0.0596" />
+-            <vignetting model="pa" focal="11" aperture="22" distance="1.5" k1="-0.4100" k2="0.0695" k3="0.0227" />
+-            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.3504" k2="-0.0312" k3="0.0756" />
+-            <vignetting model="pa" focal="14" aperture="4.7" distance="0.25" k1="-0.2497" k2="-0.1201" k3="0.0833" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="0.5" k1="-0.2881" k2="-0.0597" k3="0.0502" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="1.5" k1="-0.2964" k2="-0.0383" k3="0.0359" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-0.2716" k2="-0.0830" k3="0.0621" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.2901" k2="-0.0018" k3="0.0393" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.3287" k2="0.0635" k3="0.0012" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.3408" k2="0.0883" k3="-0.0130" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3173" k2="0.0512" k3="0.0065" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.2956" k2="0.0042" k3="0.0370" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3288" k2="0.0609" k3="0.0024" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3445" k2="0.0924" k3="-0.0156" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.3168" k2="0.0513" k3="0.0055" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.25" k1="-0.3001" k2="0.0137" k3="0.0309" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.3303" k2="0.0659" k3="-0.0019" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1.5" k1="-0.3453" k2="0.0929" k3="-0.0154" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.3196" k2="0.0551" k3="0.0029" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.2913" k2="-0.0059" k3="0.0427" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3194" k2="0.0412" k3="0.0123" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3252" k2="0.0484" k3="0.0110" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3027" k2="0.0193" k3="0.0229" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.1995" k2="-0.0935" k3="0.0543" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2131" k2="-0.0960" k3="0.0617" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2363" k2="-0.0228" k3="0.0109" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1973" k2="-0.0914" k3="0.0520" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2243" k2="-0.0335" k3="0.0457" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2348" k2="-0.0381" k3="0.0523" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2563" k2="0.0297" k3="0.0063" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2175" k2="-0.0370" k3="0.0450" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.25" k1="-0.2260" k2="-0.0307" k3="0.0425" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2378" k2="-0.0365" k3="0.0525" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1.5" k1="-0.2581" k2="0.0291" k3="0.0082" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2174" k2="-0.0411" k3="0.0476" />
+-            <vignetting model="pa" focal="18" aperture="16" distance="0.25" k1="-0.2238" k2="-0.0346" k3="0.0442" />
+-            <vignetting model="pa" focal="18" aperture="16" distance="0.5" k1="-0.2330" k2="-0.0461" k3="0.0566" />
+-            <vignetting model="pa" focal="18" aperture="16" distance="1.5" k1="-0.2529" k2="0.0172" k3="0.0143" />
+-            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2168" k2="-0.0395" k3="0.0457" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2231" k2="-0.0364" k3="0.0441" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2267" k2="-0.0621" k3="0.0669" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2467" k2="0.0020" k3="0.0237" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2048" k2="-0.0675" k3="0.0626" />
++            <!-- Taken with Olympus E-M10 -->
++            <distortion model="poly3" focal="9" k1="-0.00991"/>
++            <distortion model="poly3" focal="11" k1="-0.00574"/>
++            <distortion model="poly3" focal="12" k1="-0.00412"/>
++            <distortion model="poly3" focal="13" k1="-0.00209"/>
++            <distortion model="poly3" focal="18" k1="-0.001"/>
++            <tca model="poly3" focal="9" vr="1.0004547" vb="0.9999902"/>
++            <tca model="poly3" focal="11" vr="1.0003758" vb="0.9999724"/>
++            <tca model="poly3" focal="12" vr="1.0002944" vb="0.9999781"/>
++            <tca model="poly3" focal="13" vr="1.0003339" vb="0.9999837"/>
++            <tca model="poly3" focal="18" vr="1.0003062" vb="0.9999625"/>
++            <vignetting model="pa" focal="9" aperture="4" distance="0.25" k1="-0.4907" k2="0.3365" k3="-0.3633"/>
++            <vignetting model="pa" focal="9" aperture="4" distance="0.5" k1="-0.3635" k2="-0.0437" k3="-0.1999"/>
++            <vignetting model="pa" focal="9" aperture="4" distance="1.5" k1="-0.3964" k2="0.0444" k3="-0.2357"/>
++            <vignetting model="pa" focal="9" aperture="4" distance="1000" k1="-0.4847" k2="0.3284" k3="-0.3659"/>
++            <vignetting model="pa" focal="9" aperture="5.6" distance="0.25" k1="-0.5288" k2="0.3913" k3="-0.2548"/>
++            <vignetting model="pa" focal="9" aperture="5.6" distance="0.5" k1="-0.5652" k2="0.5795" k3="-0.4992"/>
++            <vignetting model="pa" focal="9" aperture="5.6" distance="1.5" k1="-0.5558" k2="0.5286" k3="-0.4291"/>
++            <vignetting model="pa" focal="9" aperture="5.6" distance="1000" k1="-0.5262" k2="0.3968" k3="-0.2696"/>
++            <vignetting model="pa" focal="9" aperture="8" distance="0.25" k1="-0.4780" k2="0.1844" k3="-0.0634"/>
++            <vignetting model="pa" focal="9" aperture="8" distance="0.5" k1="-0.5467" k2="0.4370" k3="-0.2988"/>
++            <vignetting model="pa" focal="9" aperture="8" distance="1.5" k1="-0.5108" k2="0.2994" k3="-0.1706"/>
++            <vignetting model="pa" focal="9" aperture="8" distance="1000" k1="-0.4782" k2="0.1966" k3="-0.0830"/>
++            <vignetting model="pa" focal="9" aperture="11" distance="0.25" k1="-0.4465" k2="0.0730" k3="0.0311"/>
++            <vignetting model="pa" focal="9" aperture="11" distance="0.5" k1="-0.4664" k2="0.1210" k3="-0.0095"/>
++            <vignetting model="pa" focal="9" aperture="11" distance="1.5" k1="-0.4495" k2="0.0727" k3="0.0300"/>
++            <vignetting model="pa" focal="9" aperture="11" distance="1000" k1="-0.4440" k2="0.0753" k3="0.0203"/>
++            <vignetting model="pa" focal="9" aperture="22" distance="0.25" k1="-0.4413" k2="0.0577" k3="0.0418"/>
++            <vignetting model="pa" focal="9" aperture="22" distance="0.5" k1="-0.4435" k2="0.0396" k3="0.0603"/>
++            <vignetting model="pa" focal="9" aperture="22" distance="1.5" k1="-0.4350" k2="0.0336" k3="0.0564"/>
++            <vignetting model="pa" focal="9" aperture="22" distance="1000" k1="-0.4265" k2="0.0312" k3="0.0510"/>
++            <vignetting model="pa" focal="11" aperture="4.2" distance="0.25" k1="-0.3302" k2="-0.1235" k3="0.1126"/>
++            <vignetting model="pa" focal="11" aperture="4.2" distance="0.5" k1="-0.3220" k2="-0.1480" k3="0.1226"/>
++            <vignetting model="pa" focal="11" aperture="4.2" distance="1.5" k1="-0.3706" k2="-0.0564" k3="0.0705"/>
++            <vignetting model="pa" focal="11" aperture="4.2" distance="1000" k1="-0.3230" k2="-0.1432" k3="0.1203"/>
++            <vignetting model="pa" focal="11" aperture="5.6" distance="0.25" k1="-0.3821" k2="0.0319" k3="0.0501"/>
++            <vignetting model="pa" focal="11" aperture="5.6" distance="0.5" k1="-0.3751" k2="0.0128" k3="0.0537"/>
++            <vignetting model="pa" focal="11" aperture="5.6" distance="1.5" k1="-0.4153" k2="0.0847" k3="0.0139"/>
++            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.3694" k2="0.0036" k3="0.0593"/>
++            <vignetting model="pa" focal="11" aperture="8" distance="0.25" k1="-0.3874" k2="0.0419" k3="0.0427"/>
++            <vignetting model="pa" focal="11" aperture="8" distance="0.5" k1="-0.3802" k2="0.0288" k3="0.0419"/>
++            <vignetting model="pa" focal="11" aperture="8" distance="1.5" k1="-0.4239" k2="0.1017" k3="0.0041"/>
++            <vignetting model="pa" focal="11" aperture="8" distance="1000" k1="-0.3714" k2="0.0095" k3="0.0541"/>
++            <vignetting model="pa" focal="11" aperture="11" distance="0.25" k1="-0.3836" k2="0.0387" k3="0.0428"/>
++            <vignetting model="pa" focal="11" aperture="11" distance="0.5" k1="-0.3739" k2="0.0151" k3="0.0490"/>
++            <vignetting model="pa" focal="11" aperture="11" distance="1.5" k1="-0.4236" k2="0.0961" k3="0.0081"/>
++            <vignetting model="pa" focal="11" aperture="11" distance="1000" k1="-0.3638" k2="-0.0006" k3="0.0571"/>
++            <vignetting model="pa" focal="11" aperture="22" distance="0.25" k1="-0.3793" k2="0.0288" k3="0.0480"/>
++            <vignetting model="pa" focal="11" aperture="22" distance="0.5" k1="-0.3650" k2="-0.0044" k3="0.0596"/>
++            <vignetting model="pa" focal="11" aperture="22" distance="1.5" k1="-0.4100" k2="0.0695" k3="0.0227"/>
++            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.3504" k2="-0.0312" k3="0.0756"/>
++            <vignetting model="pa" focal="14" aperture="4.7" distance="0.25" k1="-0.2497" k2="-0.1201" k3="0.0833"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="0.5" k1="-0.2881" k2="-0.0597" k3="0.0502"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="1.5" k1="-0.2964" k2="-0.0383" k3="0.0359"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-0.2716" k2="-0.0830" k3="0.0621"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.2901" k2="-0.0018" k3="0.0393"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.3287" k2="0.0635" k3="0.0012"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.3408" k2="0.0883" k3="-0.0130"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3173" k2="0.0512" k3="0.0065"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.2956" k2="0.0042" k3="0.0370"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3288" k2="0.0609" k3="0.0024"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3445" k2="0.0924" k3="-0.0156"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.3168" k2="0.0513" k3="0.0055"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.25" k1="-0.3001" k2="0.0137" k3="0.0309"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.3303" k2="0.0659" k3="-0.0019"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1.5" k1="-0.3453" k2="0.0929" k3="-0.0154"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.3196" k2="0.0551" k3="0.0029"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.2913" k2="-0.0059" k3="0.0427"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3194" k2="0.0412" k3="0.0123"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3252" k2="0.0484" k3="0.0110"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3027" k2="0.0193" k3="0.0229"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.1995" k2="-0.0935" k3="0.0543"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2131" k2="-0.0960" k3="0.0617"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2363" k2="-0.0228" k3="0.0109"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1973" k2="-0.0914" k3="0.0520"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2243" k2="-0.0335" k3="0.0457"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2348" k2="-0.0381" k3="0.0523"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2563" k2="0.0297" k3="0.0063"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2175" k2="-0.0370" k3="0.0450"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.25" k1="-0.2260" k2="-0.0307" k3="0.0425"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2378" k2="-0.0365" k3="0.0525"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1.5" k1="-0.2581" k2="0.0291" k3="0.0082"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2174" k2="-0.0411" k3="0.0476"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="0.25" k1="-0.2238" k2="-0.0346" k3="0.0442"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="0.5" k1="-0.2330" k2="-0.0461" k3="0.0566"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1.5" k1="-0.2529" k2="0.0172" k3="0.0143"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2168" k2="-0.0395" k3="0.0457"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2231" k2="-0.0364" k3="0.0441"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2267" k2="-0.0621" k3="0.0669"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2467" k2="0.0020" k3="0.0237"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2048" k2="-0.0675" k3="0.0626"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 11-22mm f/2.8-3.5</model>
++        <model>Olympus Zuiko Digital 11-22mm f/2.8-3.5</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="11" a="0" b="-0.008811" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="-0.006178" c="0" />
+-            <distortion model="ptlens" focal="13" a="0" b="-0.004701" c="0" />
+-            <distortion model="ptlens" focal="14" a="0" b="-0.004665" c="0" />
+-            <distortion model="ptlens" focal="16" a="0" b="-0.002232" c="0" />
+-            <distortion model="ptlens" focal="20" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="22" a="0" b="0" c="0" />
++            <distortion model="poly3" focal="11" k1="-0.008811"/>
++            <distortion model="poly3" focal="12" k1="-0.006178"/>
++            <distortion model="poly3" focal="13" k1="-0.004701"/>
++            <distortion model="poly3" focal="14" k1="-0.004665"/>
++            <distortion model="poly3" focal="16" k1="-0.002232"/>
++            <distortion model="poly3" focal="20" k1="0"/>
++            <distortion model="poly3" focal="22" k1="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Olympus</maker>
+-	    <model>Zuiko Digital ED 14-42mm F3.5-5.6</model>
+-	    <focal min="14" max="42" />
+-	    <aperture min="3.5" max="22" />
+-	    <mount>4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="14" model="ptlens" a="0.0100665" b="-0.0270472" c="0.0022372" />
+-	        <distortion focal="18" model="ptlens" a="-0.00368686" b="0.00286171" c="-0.0102343" />
+-	        <distortion focal="25" model="ptlens" a="-1.55769e-05" b="-2.09253e-05" c="-0.00318557" />
+-	        <distortion focal="35" model="ptlens" a="-0.00265046" b="0.00843281" c="-0.00647169" />
+-	        <distortion focal="42" model="ptlens" a="-0.00342208" b="0.0114471" c="-0.0105329" />
+-            <tca model="poly3" focal="14" br="-0.0000061" vr="1.0003376" bb="-0.0000092" vb="1.0000329" />
+-            <tca model="poly3" focal="18" br="-0.0001031" vr="1.0003988" bb="0.0000126" vb="0.9999971" />
+-            <tca model="poly3" focal="25" br="-0.0001150" vr="1.0003942" bb="0.0000327" vb="0.9998980" />
+-            <tca model="poly3" focal="35" br="-0.0000998" vr="1.0003497" bb="0.0000562" vb="0.9997683" />
+-            <tca model="poly3" focal="42" br="-0.0000307" vr="1.0001997" bb="0.0000116" vb="0.9997666" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="0.25" k1="-1.1577" k2="1.1639" k3="-0.6325" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="0.5" k1="-1.1017" k2="1.0353" k3="-0.5372" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1.5" k1="-1.1102" k2="1.0456" k3="-0.5203" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-1.0734" k2="0.9650" k3="-0.4461" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.25" k1="-0.6583" k2="0.1519" k3="-0.0354" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.5834" k2="-0.0363" k3="0.0982" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1.5" k1="-0.5680" k2="-0.0885" k3="0.1539" />
+-            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.5430" k2="-0.1463" k3="0.2081" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.3608" k2="-0.0980" k3="0.0591" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.2904" k2="-0.2388" k3="0.1294" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.2905" k2="-0.2288" k3="0.1233" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2709" k2="-0.2310" k3="0.1168" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.3772" k2="-0.0503" k3="0.0933" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3059" k2="-0.1861" k3="0.1573" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3039" k2="-0.1733" k3="0.1464" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.2818" k2="-0.1810" k3="0.1460" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.3753" k2="-0.0567" k3="0.0960" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3181" k2="-0.1629" k3="0.1409" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3230" k2="-0.1354" k3="0.1224" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3002" k2="-0.1549" k3="0.1328" />
+-            <vignetting model="pa" focal="18" aperture="3.9" distance="0.25" k1="-0.6326" k2="0.3204" k3="-0.0775" />
+-            <vignetting model="pa" focal="18" aperture="3.9" distance="0.5" k1="-0.6116" k2="0.2713" k3="-0.0527" />
+-            <vignetting model="pa" focal="18" aperture="3.9" distance="1.5" k1="-0.6342" k2="0.3048" k3="-0.0662" />
+-            <vignetting model="pa" focal="18" aperture="3.9" distance="1000" k1="-0.6072" k2="0.2754" k3="-0.0563" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.25" k1="-0.6448" k2="0.3530" k3="-0.0992" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.5" k1="-0.6117" k2="0.2685" k3="-0.0499" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="1.5" k1="-0.6344" k2="0.3047" k3="-0.0649" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.6006" k2="0.2636" k3="-0.0503" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.2873" k2="-0.0066" k3="0.0357" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2627" k2="-0.0620" k3="0.0623" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2634" k2="-0.0668" k3="0.0694" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2369" k2="-0.0848" k3="0.0703" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2776" k2="-0.0226" k3="0.0424" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2568" k2="-0.0779" k3="0.0703" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2554" k2="-0.0828" k3="0.0770" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2246" k2="-0.1115" k3="0.0867" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2682" k2="-0.0430" k3="0.0519" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2542" k2="-0.0842" k3="0.0714" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2509" k2="-0.0956" k3="0.0838" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2244" k2="-0.1167" k3="0.0887" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="0.25" k1="-0.2192" k2="-0.0991" k3="0.0854" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.1840" k2="-0.1230" k3="0.0899" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="1.5" k1="-0.1954" k2="-0.1129" k3="0.0854" />
+-            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1780" k2="-0.1341" k3="0.0946" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.25" k1="-0.2087" k2="-0.0337" k3="0.0427" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1678" k2="-0.0753" k3="0.0589" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1.5" k1="-0.1802" k2="-0.0632" k3="0.0547" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1704" k2="-0.0629" k3="0.0492" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.25" k1="-0.1993" k2="-0.0546" k3="0.0532" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1729" k2="-0.0644" k3="0.0496" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1.5" k1="-0.1844" k2="-0.0506" k3="0.0426" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1692" k2="-0.0656" k3="0.0490" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.25" k1="-0.1951" k2="-0.0631" k3="0.0560" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1675" k2="-0.0746" k3="0.0534" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1.5" k1="-0.1763" k2="-0.0661" k3="0.0503" />
+-            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1645" k2="-0.0695" k3="0.0480" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.25" k1="-0.1937" k2="-0.0550" k3="0.0529" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1647" k2="-0.0858" k3="0.0616" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1.5" k1="-0.1755" k2="-0.0706" k3="0.0527" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1662" k2="-0.0726" k3="0.0511" />
+-            <vignetting model="pa" focal="35" aperture="5.3" distance="0.25" k1="-0.1492" k2="-0.0890" k3="0.0710" />
+-            <vignetting model="pa" focal="35" aperture="5.3" distance="0.5" k1="-0.1392" k2="-0.0753" k3="0.0562" />
+-            <vignetting model="pa" focal="35" aperture="5.3" distance="1.5" k1="-0.1340" k2="-0.0765" k3="0.0573" />
+-            <vignetting model="pa" focal="35" aperture="5.3" distance="1000" k1="-0.1386" k2="-0.0672" k3="0.0499" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.25" k1="-0.1202" k2="-0.1164" k3="0.0828" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.1168" k2="-0.0831" k3="0.0547" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1.5" k1="-0.1126" k2="-0.0797" k3="0.0521" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1134" k2="-0.0824" k3="0.0539" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.25" k1="-0.1173" k2="-0.1203" k3="0.0831" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.1159" k2="-0.0834" k3="0.0536" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1.5" k1="-0.1117" k2="-0.0819" k3="0.0523" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1575" k2="-0.0222" k3="0.0261" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.25" k1="-0.1118" k2="-0.1289" k3="0.0870" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.1097" k2="-0.0973" k3="0.0606" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1.5" k1="-0.1072" k2="-0.0876" k3="0.0532" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1715" k2="0.0012" k3="0.0129" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.25" k1="-0.1010" k2="-0.1523" k3="0.0986" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.5" k1="-0.1038" k2="-0.1111" k3="0.0675" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1.5" k1="-0.0966" k2="-0.1117" k3="0.0666" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1663" k2="-0.0167" k3="0.0242" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="0.25" k1="-0.1647" k2="0.0714" k3="-0.0687" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="0.5" k1="-0.2096" k2="0.2566" k3="-0.2572" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="1.5" k1="-0.2607" k2="0.5266" k3="-0.5213" />
+-            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.2696" k2="0.5231" k3="-0.5145" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="0.25" k1="-0.1154" k2="-0.0386" k3="0.0196" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="0.5" k1="-0.0888" k2="-0.1169" k3="0.0674" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="1.5" k1="-0.1220" k2="0.0535" k3="-0.0854" />
+-            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.1655" k2="0.1630" k3="-0.1650" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="0.25" k1="-0.1119" k2="-0.0449" k3="0.0222" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="0.5" k1="-0.0869" k2="-0.1179" k3="0.0709" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="1.5" k1="-0.0765" k2="-0.1123" k3="0.0598" />
+-            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.1099" k2="-0.0478" k3="0.0226" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="0.25" k1="-0.0950" k2="-0.0713" k3="0.0366" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="0.5" k1="-0.0759" k2="-0.1225" k3="0.0693" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="1.5" k1="-0.0611" k2="-0.1267" k3="0.0636" />
+-            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.0901" k2="-0.0788" k3="0.0410" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="0.25" k1="-0.1066" k2="-0.0598" k3="0.0317" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="0.5" k1="-0.0845" k2="-0.1211" k3="0.0722" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="1.5" k1="-0.0755" k2="-0.1128" k3="0.0580" />
+-            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1034" k2="-0.0652" k3="0.0355" />
+-	    </calibration>
++        <maker>Olympus</maker>
++        <model>Olympus Zuiko Digital ED 14-42mm f/3.5-5.6</model>
++        <mount>4/3 System</mount>
++        <focal min="14" max="42"/>
++        <aperture min="3.5" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="14" model="ptlens" a="0.0100665" b="-0.0270472" c="0.0022372"/>
++            <distortion focal="18" model="ptlens" a="-0.00368686" b="0.00286171" c="-0.0102343"/>
++            <distortion focal="25" model="ptlens" a="-1.55769e-05" b="-2.09253e-05" c="-0.00318557"/>
++            <distortion focal="35" model="ptlens" a="-0.00265046" b="0.00843281" c="-0.00647169"/>
++            <distortion focal="42" model="ptlens" a="-0.00342208" b="0.0114471" c="-0.0105329"/>
++            <tca model="poly3" focal="14" br="-0.0000061" vr="1.0003376" bb="-0.0000092" vb="1.0000329"/>
++            <tca model="poly3" focal="18" br="-0.0001031" vr="1.0003988" bb="0.0000126" vb="0.9999971"/>
++            <tca model="poly3" focal="25" br="-0.0001150" vr="1.0003942" bb="0.0000327" vb="0.9998980"/>
++            <tca model="poly3" focal="35" br="-0.0000998" vr="1.0003497" bb="0.0000562" vb="0.9997683"/>
++            <tca model="poly3" focal="42" br="-0.0000307" vr="1.0001997" bb="0.0000116" vb="0.9997666"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="0.25" k1="-1.1577" k2="1.1639" k3="-0.6325"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="0.5" k1="-1.1017" k2="1.0353" k3="-0.5372"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1.5" k1="-1.1102" k2="1.0456" k3="-0.5203"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-1.0734" k2="0.9650" k3="-0.4461"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.25" k1="-0.6583" k2="0.1519" k3="-0.0354"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.5834" k2="-0.0363" k3="0.0982"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1.5" k1="-0.5680" k2="-0.0885" k3="0.1539"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.5430" k2="-0.1463" k3="0.2081"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.3608" k2="-0.0980" k3="0.0591"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.2904" k2="-0.2388" k3="0.1294"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.2905" k2="-0.2288" k3="0.1233"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2709" k2="-0.2310" k3="0.1168"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.3772" k2="-0.0503" k3="0.0933"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3059" k2="-0.1861" k3="0.1573"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3039" k2="-0.1733" k3="0.1464"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.2818" k2="-0.1810" k3="0.1460"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.3753" k2="-0.0567" k3="0.0960"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3181" k2="-0.1629" k3="0.1409"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3230" k2="-0.1354" k3="0.1224"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3002" k2="-0.1549" k3="0.1328"/>
++            <vignetting model="pa" focal="18" aperture="3.9" distance="0.25" k1="-0.6326" k2="0.3204" k3="-0.0775"/>
++            <vignetting model="pa" focal="18" aperture="3.9" distance="0.5" k1="-0.6116" k2="0.2713" k3="-0.0527"/>
++            <vignetting model="pa" focal="18" aperture="3.9" distance="1.5" k1="-0.6342" k2="0.3048" k3="-0.0662"/>
++            <vignetting model="pa" focal="18" aperture="3.9" distance="1000" k1="-0.6072" k2="0.2754" k3="-0.0563"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="0.25" k1="-0.6448" k2="0.3530" k3="-0.0992"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="0.5" k1="-0.6117" k2="0.2685" k3="-0.0499"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1.5" k1="-0.6344" k2="0.3047" k3="-0.0649"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.6006" k2="0.2636" k3="-0.0503"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.2873" k2="-0.0066" k3="0.0357"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2627" k2="-0.0620" k3="0.0623"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2634" k2="-0.0668" k3="0.0694"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2369" k2="-0.0848" k3="0.0703"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2776" k2="-0.0226" k3="0.0424"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2568" k2="-0.0779" k3="0.0703"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2554" k2="-0.0828" k3="0.0770"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2246" k2="-0.1115" k3="0.0867"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2682" k2="-0.0430" k3="0.0519"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2542" k2="-0.0842" k3="0.0714"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2509" k2="-0.0956" k3="0.0838"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2244" k2="-0.1167" k3="0.0887"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="0.25" k1="-0.2192" k2="-0.0991" k3="0.0854"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.1840" k2="-0.1230" k3="0.0899"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="1.5" k1="-0.1954" k2="-0.1129" k3="0.0854"/>
++            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1780" k2="-0.1341" k3="0.0946"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.25" k1="-0.2087" k2="-0.0337" k3="0.0427"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1678" k2="-0.0753" k3="0.0589"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1.5" k1="-0.1802" k2="-0.0632" k3="0.0547"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1704" k2="-0.0629" k3="0.0492"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.25" k1="-0.1993" k2="-0.0546" k3="0.0532"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1729" k2="-0.0644" k3="0.0496"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1.5" k1="-0.1844" k2="-0.0506" k3="0.0426"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1692" k2="-0.0656" k3="0.0490"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.25" k1="-0.1951" k2="-0.0631" k3="0.0560"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1675" k2="-0.0746" k3="0.0534"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1.5" k1="-0.1763" k2="-0.0661" k3="0.0503"/>
++            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1645" k2="-0.0695" k3="0.0480"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.25" k1="-0.1937" k2="-0.0550" k3="0.0529"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1647" k2="-0.0858" k3="0.0616"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1.5" k1="-0.1755" k2="-0.0706" k3="0.0527"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1662" k2="-0.0726" k3="0.0511"/>
++            <vignetting model="pa" focal="35" aperture="5.3" distance="0.25" k1="-0.1492" k2="-0.0890" k3="0.0710"/>
++            <vignetting model="pa" focal="35" aperture="5.3" distance="0.5" k1="-0.1392" k2="-0.0753" k3="0.0562"/>
++            <vignetting model="pa" focal="35" aperture="5.3" distance="1.5" k1="-0.1340" k2="-0.0765" k3="0.0573"/>
++            <vignetting model="pa" focal="35" aperture="5.3" distance="1000" k1="-0.1386" k2="-0.0672" k3="0.0499"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.25" k1="-0.1202" k2="-0.1164" k3="0.0828"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.1168" k2="-0.0831" k3="0.0547"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1.5" k1="-0.1126" k2="-0.0797" k3="0.0521"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1134" k2="-0.0824" k3="0.0539"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.25" k1="-0.1173" k2="-0.1203" k3="0.0831"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.1159" k2="-0.0834" k3="0.0536"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1.5" k1="-0.1117" k2="-0.0819" k3="0.0523"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1575" k2="-0.0222" k3="0.0261"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.25" k1="-0.1118" k2="-0.1289" k3="0.0870"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.1097" k2="-0.0973" k3="0.0606"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1.5" k1="-0.1072" k2="-0.0876" k3="0.0532"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1715" k2="0.0012" k3="0.0129"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.25" k1="-0.1010" k2="-0.1523" k3="0.0986"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.5" k1="-0.1038" k2="-0.1111" k3="0.0675"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1.5" k1="-0.0966" k2="-0.1117" k3="0.0666"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1663" k2="-0.0167" k3="0.0242"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="0.25" k1="-0.1647" k2="0.0714" k3="-0.0687"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="0.5" k1="-0.2096" k2="0.2566" k3="-0.2572"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1.5" k1="-0.2607" k2="0.5266" k3="-0.5213"/>
++            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.2696" k2="0.5231" k3="-0.5145"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="0.25" k1="-0.1154" k2="-0.0386" k3="0.0196"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="0.5" k1="-0.0888" k2="-0.1169" k3="0.0674"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1.5" k1="-0.1220" k2="0.0535" k3="-0.0854"/>
++            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.1655" k2="0.1630" k3="-0.1650"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="0.25" k1="-0.1119" k2="-0.0449" k3="0.0222"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="0.5" k1="-0.0869" k2="-0.1179" k3="0.0709"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1.5" k1="-0.0765" k2="-0.1123" k3="0.0598"/>
++            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.1099" k2="-0.0478" k3="0.0226"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="0.25" k1="-0.0950" k2="-0.0713" k3="0.0366"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="0.5" k1="-0.0759" k2="-0.1225" k3="0.0693"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1.5" k1="-0.0611" k2="-0.1267" k3="0.0636"/>
++            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.0901" k2="-0.0788" k3="0.0410"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="0.25" k1="-0.1066" k2="-0.0598" k3="0.0317"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="0.5" k1="-0.0845" k2="-0.1211" k3="0.0722"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1.5" k1="-0.0755" k2="-0.1128" k3="0.0580"/>
++            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1034" k2="-0.0652" k3="0.0355"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 14-45mm f/3.5-5.6</model>
++        <model>Olympus Zuiko Digital 14-45mm f/3.5-5.6</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.015865" b="-0.045846" c="0" />
+-            <distortion model="ptlens" focal="18" a="0" b="-0.012163" c="0" />
+-            <distortion model="ptlens" focal="25" a="0" b="-0.007852" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.00285" c="0" />
+-            <distortion model="ptlens" focal="45" a="0" b="-0.001233" c="0" />
++            <distortion model="ptlens" focal="14" a="0.015865" b="-0.045846" c="0"/>
++            <distortion model="ptlens" focal="18" a="0" b="-0.012163" c="0"/>
++            <distortion model="ptlens" focal="25" a="0" b="-0.007852" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="-0.00285" c="0"/>
++            <distortion model="ptlens" focal="45" a="0" b="-0.001233" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 14-54mm f/2.8-3.5</model>
++        <model>Olympus Zuiko Digital 14-54mm f/2.8-3.5</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.019325" b="-0.040094" c="0" />
+-            <distortion model="ptlens" focal="19" a="0.010371" b="-0.017732" c="0" />
+-            <distortion model="ptlens" focal="25" a="0.002227" b="-0.001738" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="54" a="0" b="-0.001107" c="0" />
++            <distortion model="ptlens" focal="14" a="0.019325" b="-0.040094" c="0"/>
++            <distortion model="ptlens" focal="19" a="0.010371" b="-0.017732" c="0"/>
++            <distortion model="ptlens" focal="25" a="0.002227" b="-0.001738" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="54" a="0" b="-0.001107" c="0"/>
++            <!-- Taken with Olympus E-M10 -->
++            <tca model="poly3" focal="14" vr="1.0004652" vb="1.0000151"/>
++            <tca model="poly3" focal="19" vr="1.0003096" vb="1.0000367"/>
++            <tca model="poly3" focal="25" vr="1.0001643" vb="1.0000181"/>
++            <tca model="poly3" focal="35" vr="1.0000783" vb="0.9999489"/>
++            <tca model="poly3" focal="54" vr="0.9998060" vb="1.0000496"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Olympus</maker>
+-	    <model>Zuiko Digital 25mm F2.8</model>
+-	    <focal value="25" />
+-	    <aperture min="2.8" max="22"/>
+-	    <mount>4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="25" model="ptlens" a="0.0011362" b="-0.011804" c="0.00114701" />
+-            <tca model="poly3" focal="25" br="-0.0001559" vr="1.0006797" bb="0.0000854" vb="0.9999497" />
+-            <vignetting model="pa" focal="25" aperture="2.8" distance="0.2" k1="-0.8479" k2="0.6898" k3="-0.3084" />
+-            <vignetting model="pa" focal="25" aperture="2.8" distance="0.4" k1="-0.8254" k2="0.5649" k3="-0.2243" />
+-            <vignetting model="pa" focal="25" aperture="2.8" distance="1.2" k1="-0.8064" k2="0.4875" k3="-0.1799" />
+-            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.7963" k2="0.4332" k3="-0.1431" />
+-            <vignetting model="pa" focal="25" aperture="4" distance="0.2" k1="-0.0748" k2="-0.4244" k3="0.1704" />
+-            <vignetting model="pa" focal="25" aperture="4" distance="0.4" k1="-0.0741" k2="-0.4858" k3="0.2082" />
+-            <vignetting model="pa" focal="25" aperture="4" distance="1.2" k1="-0.0924" k2="-0.4644" k3="0.1906" />
+-            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.0801" k2="-0.5089" k3="0.2151" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2436" k2="0.1889" k3="-0.1742" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2576" k2="0.1878" k3="-0.1848" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2693" k2="0.2083" k3="-0.2068" />
+-            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2801" k2="0.2143" k3="-0.2131" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2013" k2="0.0131" k3="0.0016" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2148" k2="-0.0056" k3="0.0187" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.2162" k2="-0.0150" k3="0.0234" />
+-            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2257" k2="-0.0195" k3="0.0313" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1875" k2="-0.0367" k3="0.0326" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2230" k2="-0.0099" k3="0.0253" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.2387" k2="0.0085" k3="0.0141" />
+-            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2340" k2="-0.0217" k3="0.0337" />
++        <maker>Olympus</maker>
++        <model>Olympus Zuiko Digital 25mm f/2.8</model>
++        <mount>4/3 System</mount>
++        <focal value="25"/>
++        <aperture min="2.8" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="25" model="ptlens" a="0.0011362" b="-0.011804" c="0.00114701"/>
++            <tca model="poly3" focal="25" br="-0.0001559" vr="1.0006797" bb="0.0000854" vb="0.9999497"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="0.2" k1="-0.8479" k2="0.6898" k3="-0.3084"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="0.4" k1="-0.8254" k2="0.5649" k3="-0.2243"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1.2" k1="-0.8064" k2="0.4875" k3="-0.1799"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.7963" k2="0.4332" k3="-0.1431"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="0.2" k1="-0.0748" k2="-0.4244" k3="0.1704"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="0.4" k1="-0.0741" k2="-0.4858" k3="0.2082"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1.2" k1="-0.0924" k2="-0.4644" k3="0.1906"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.0801" k2="-0.5089" k3="0.2151"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2436" k2="0.1889" k3="-0.1742"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2576" k2="0.1878" k3="-0.1848"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2693" k2="0.2083" k3="-0.2068"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2801" k2="0.2143" k3="-0.2131"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2013" k2="0.0131" k3="0.0016"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2148" k2="-0.0056" k3="0.0187"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.2162" k2="-0.0150" k3="0.0234"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2257" k2="-0.0195" k3="0.0313"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1875" k2="-0.0367" k3="0.0326"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2230" k2="-0.0099" k3="0.0253"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.2387" k2="0.0085" k3="0.0141"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2340" k2="-0.0217" k3="0.0337"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Olympus</maker>
+-	    <model>Zuiko Digital 35mm f/3.5 Macro</model>
+-	    <focal value="35" />
+-	    <aperture min="3.5" max="22" />
++        <maker>Olympus</maker>
++        <model>Olympus Zuiko Digital 35mm f/3.5 Macro</model>
+         <mount>4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="35" model="ptlens" a="-0.00226197" b="0.00228625" c="-0.00756547" />
+-            <tca model="poly3" focal="35" br="-0.0000953" vr="1.0002105" bb="-0.0000137" vb="1.0000230" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="0.146" k1="-0.0315" k2="-0.3900" k3="0.2375" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="0.3" k1="-0.0648" k2="-0.1207" k3="-0.0010" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="0.9" k1="-0.1379" k2="0.0285" k3="-0.0643" />
+-            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.1887" k2="0.0391" k3="-0.0420" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="0.146" k1="0.0181" k2="-0.2089" k3="0.0596" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="0.3" k1="-0.1297" k2="0.1533" k3="-0.1323" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="0.9" k1="-0.1246" k2="0.0741" k3="-0.0450" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1571" k2="0.0589" k3="-0.0179" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.146" k1="-0.0541" k2="0.0385" k3="-0.0280" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.3" k1="-0.1127" k2="0.0588" k3="-0.0289" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.9" k1="-0.1202" k2="0.0395" k3="-0.0119" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1589" k2="0.0410" k3="0.0029" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.146" k1="-0.0510" k2="0.0293" k3="-0.0231" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.3" k1="-0.1092" k2="0.0506" k3="-0.0265" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.9" k1="-0.1144" k2="0.0211" k3="-0.0006" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1545" k2="0.0208" k3="0.0166" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.146" k1="-0.0532" k2="0.0389" k3="-0.0320" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.3" k1="-0.1032" k2="0.0350" k3="-0.0216" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.9" k1="-0.0993" k2="-0.0253" k3="0.0264" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1450" k2="-0.0149" k3="0.0368" />
++        <focal value="35"/>
++        <aperture min="3.5" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="35" model="ptlens" a="-0.00226197" b="0.00228625" c="-0.00756547"/>
++            <tca model="poly3" focal="35" br="-0.0000953" vr="1.0002105" bb="-0.0000137" vb="1.0000230"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="0.146" k1="-0.0315" k2="-0.3900" k3="0.2375"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="0.3" k1="-0.0648" k2="-0.1207" k3="-0.0010"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="0.9" k1="-0.1379" k2="0.0285" k3="-0.0643"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.1887" k2="0.0391" k3="-0.0420"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.146" k1="0.0181" k2="-0.2089" k3="0.0596"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.3" k1="-0.1297" k2="0.1533" k3="-0.1323"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.9" k1="-0.1246" k2="0.0741" k3="-0.0450"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1571" k2="0.0589" k3="-0.0179"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.146" k1="-0.0541" k2="0.0385" k3="-0.0280"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.3" k1="-0.1127" k2="0.0588" k3="-0.0289"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.9" k1="-0.1202" k2="0.0395" k3="-0.0119"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1589" k2="0.0410" k3="0.0029"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.146" k1="-0.0510" k2="0.0293" k3="-0.0231"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.3" k1="-0.1092" k2="0.0506" k3="-0.0265"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.9" k1="-0.1144" k2="0.0211" k3="-0.0006"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1545" k2="0.0208" k3="0.0166"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.146" k1="-0.0532" k2="0.0389" k3="-0.0320"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.3" k1="-0.1032" k2="0.0350" k3="-0.0216"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.9" k1="-0.0993" k2="-0.0253" k3="0.0264"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1450" k2="-0.0149" k3="0.0368"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 40-150mm f/3.5-4.5</model>
++        <model>Olympus Zuiko Digital 40-150mm f/3.5-4.5</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="40" a="0" b="-0.006351" c="0" />
+-            <distortion model="ptlens" focal="48" a="0" b="-0.00139" c="0" />
+-            <distortion model="ptlens" focal="68" a="0" b="0.004043" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.006806" c="0" />
+-            <distortion model="ptlens" focal="150" a="0" b="0.005332" c="0" />
++            <distortion model="poly3" focal="40" k1="-0.006351"/>
++            <distortion model="poly3" focal="48" k1="-0.00139"/>
++            <distortion model="poly3" focal="68" k1="0.004043"/>
++            <distortion model="poly3" focal="100" k1="0.006806"/>
++            <distortion model="poly3" focal="150" k1="0.005332"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital ED 40-150mm F4.0-5.6</model>
+-	    <focal min="40" max="150" />
+-	    <aperture min="4" max="22" />
++        <model>Olympus Zuiko Digital ED 40-150mm f/4.0-5.6</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <focal min="40" max="150"/>
++        <aperture min="4" max="22"/>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="40" a="-0.0069552" b="0.0128954" c="-0.0201501" />
+-            <distortion model="ptlens" focal="50" a="-0.00328196" b="0.00547778" c="-0.00507713" />
+-            <distortion model="ptlens" focal="73" a="0.00269235" b="-0.00470212" c="0.00974549" />
+-            <distortion model="ptlens" focal="98" a="-0.00377975" b="0.0155413" c="-0.00903773" />
+-            <distortion model="ptlens" focal="150" a="-0.000293389" b="0.00701827" c="-0.00528205" />
+-            <tca model="poly3" focal="40" br="-0.0000434" vr="1.0004182" bb="0.0000176" vb="0.9998313" />
+-            <tca model="poly3" focal="50" br="0.0000574" vr="1.0002451" bb="-0.0000307" vb="0.9998156" />
+-            <tca model="poly3" focal="73" br="0.0000138" vr="1.0001119" bb="-0.0001086" vb="0.9997898" />
+-            <tca model="poly3" focal="102" br="0.0000541" vr="0.9998625" bb="-0.0000497" vb="0.9997776" />
+-            <tca model="poly3" focal="150" br="-0.0000116" vr="0.9997582" bb="0.0000182" vb="0.9997618" />
+-            <tca model="poly3" focal="150" br="0.0000230" vr="0.9997236" bb="-0.0000526" vb="0.9999016" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="0.9" k1="-0.1908" k2="-0.3301" k3="0.1075" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="1.8" k1="-0.1819" k2="-0.3589" k3="0.1318" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="5.4" k1="-0.1970" k2="-0.3551" k3="0.1400" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1932" k2="-0.3487" k3="0.1356" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="0.9" k1="-0.1403" k2="0.1237" k3="-0.1488" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="1.8" k1="-0.1380" k2="0.1225" k3="-0.1507" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="5.4" k1="-0.1525" k2="0.1119" k3="-0.1358" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1493" k2="0.1369" k3="-0.1587" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="0.9" k1="-0.1116" k2="-0.0197" k3="0.0125" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="1.8" k1="-0.1101" k2="-0.0263" k3="0.0183" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="5.4" k1="-0.1184" k2="-0.0108" k3="0.0039" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1220" k2="0.0001" k3="0.0004" />
+-            <vignetting model="pa" focal="40" aperture="11" distance="0.9" k1="-0.1059" k2="-0.0273" k3="0.0134" />
+-            <vignetting model="pa" focal="40" aperture="11" distance="1.8" k1="-0.1059" k2="-0.0274" k3="0.0168" />
+-            <vignetting model="pa" focal="40" aperture="11" distance="5.4" k1="-0.1081" k2="-0.0270" k3="0.0104" />
+-            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.1148" k2="-0.0051" k3="-0.0014" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="0.9" k1="-0.1043" k2="-0.0328" k3="0.0155" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="1.8" k1="-0.1073" k2="-0.0249" k3="0.0138" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="5.4" k1="-0.1068" k2="-0.0302" k3="0.0117" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1107" k2="-0.0187" k3="0.0070" />
+-            <vignetting model="pa" focal="50" aperture="4.2" distance="0.9" k1="-0.1315" k2="-0.3638" k3="0.1167" />
+-            <vignetting model="pa" focal="50" aperture="4.2" distance="1.8" k1="-0.1096" k2="-0.4398" k3="0.1756" />
+-            <vignetting model="pa" focal="50" aperture="4.2" distance="5.4" k1="-0.1017" k2="-0.4550" k3="0.1898" />
+-            <vignetting model="pa" focal="50" aperture="4.2" distance="1000" k1="-0.1149" k2="-0.4205" k3="0.1688" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.9" k1="-0.1179" k2="0.0920" k3="-0.1641" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1.8" k1="-0.0944" k2="0.0160" k3="-0.1150" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="5.4" k1="-0.1060" k2="0.0378" k3="-0.1251" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1022" k2="0.0520" k3="-0.1425" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="0.9" k1="-0.1149" k2="0.0072" k3="-0.0053" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="1.8" k1="-0.0904" k2="-0.0656" k3="0.0424" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="5.4" k1="-0.1003" k2="-0.0519" k3="0.0384" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1035" k2="-0.0177" k3="0.0086" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="0.9" k1="-0.1107" k2="-0.0003" k3="-0.0014" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1.8" k1="-0.0861" k2="-0.0692" k3="0.0424" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="5.4" k1="-0.0937" k2="-0.0527" k3="0.0333" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1055" k2="-0.0039" k3="-0.0045" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.1026" k2="-0.0155" k3="0.0043" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="1.8" k1="-0.0938" k2="-0.0215" k3="0.0047" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="5.4" k1="-0.0877" k2="-0.0656" k3="0.0383" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0937" k2="-0.0243" k3="0.0029" />
+-            <vignetting model="pa" focal="73" aperture="4.6" distance="0.9" k1="-0.0287" k2="-0.2729" k3="-0.1884" />
+-            <vignetting model="pa" focal="73" aperture="4.6" distance="1.8" k1="0.0290" k2="-0.4975" k3="-0.0340" />
+-            <vignetting model="pa" focal="73" aperture="4.6" distance="5.4" k1="0.0859" k2="-0.7590" k3="0.1600" />
+-            <vignetting model="pa" focal="73" aperture="4.6" distance="1000" k1="0.1203" k2="-0.9424" k3="0.3031" />
+-            <vignetting model="pa" focal="73" aperture="5.6" distance="0.9" k1="-0.2098" k2="0.6214" k3="-0.7298" />
+-            <vignetting model="pa" focal="73" aperture="5.6" distance="1.8" k1="-0.1855" k2="0.5414" k3="-0.6897" />
+-            <vignetting model="pa" focal="73" aperture="5.6" distance="5.4" k1="-0.1571" k2="0.4288" k3="-0.6162" />
+-            <vignetting model="pa" focal="73" aperture="5.6" distance="1000" k1="-0.1232" k2="0.2953" k3="-0.5276" />
+-            <vignetting model="pa" focal="73" aperture="8" distance="0.9" k1="-0.1425" k2="0.2271" k3="-0.2193" />
+-            <vignetting model="pa" focal="73" aperture="8" distance="1.8" k1="-0.1591" k2="0.2766" k3="-0.2662" />
+-            <vignetting model="pa" focal="73" aperture="8" distance="5.4" k1="-0.1741" k2="0.3142" k3="-0.2965" />
+-            <vignetting model="pa" focal="73" aperture="8" distance="1000" k1="-0.1721" k2="0.3036" k3="-0.2981" />
+-            <vignetting model="pa" focal="73" aperture="11" distance="0.9" k1="-0.0691" k2="-0.0437" k3="0.0225" />
+-            <vignetting model="pa" focal="73" aperture="11" distance="1.8" k1="-0.0809" k2="-0.0197" k3="0.0024" />
+-            <vignetting model="pa" focal="73" aperture="11" distance="5.4" k1="-0.0858" k2="-0.0150" k3="0.0041" />
+-            <vignetting model="pa" focal="73" aperture="11" distance="1000" k1="-0.0966" k2="0.0009" k3="-0.0087" />
+-            <vignetting model="pa" focal="73" aperture="22" distance="0.9" k1="-0.0621" k2="-0.0569" k3="0.0274" />
+-            <vignetting model="pa" focal="73" aperture="22" distance="1.8" k1="-0.0749" k2="-0.0372" k3="0.0140" />
+-            <vignetting model="pa" focal="73" aperture="22" distance="5.4" k1="-0.0823" k2="-0.0257" k3="0.0106" />
+-            <vignetting model="pa" focal="73" aperture="22" distance="1000" k1="-0.0769" k2="-0.0485" k3="0.0244" />
+-            <vignetting model="pa" focal="98" aperture="5" distance="0.9" k1="-0.1835" k2="-0.0290" k3="-0.1856" />
+-            <vignetting model="pa" focal="98" aperture="5" distance="1.8" k1="-0.1099" k2="-0.2740" k3="-0.0305" />
+-            <vignetting model="pa" focal="98" aperture="5" distance="5.4" k1="-0.0473" k2="-0.5586" k3="0.1726" />
+-            <vignetting model="pa" focal="98" aperture="5" distance="1000" k1="0.0019" k2="-0.8142" k3="0.3669" />
+-            <vignetting model="pa" focal="98" aperture="5.6" distance="0.9" k1="-0.0864" k2="0.1239" k3="-0.3224" />
+-            <vignetting model="pa" focal="98" aperture="5.6" distance="1.8" k1="-0.0386" k2="-0.0035" k3="-0.2593" />
+-            <vignetting model="pa" focal="98" aperture="5.6" distance="5.4" k1="0.0072" k2="-0.1462" k3="-0.1789" />
+-            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="0.0660" k2="-0.3692" k3="-0.0340" />
+-            <vignetting model="pa" focal="98" aperture="8" distance="0.9" k1="-0.0770" k2="-0.0171" k3="0.0049" />
+-            <vignetting model="pa" focal="98" aperture="8" distance="1.8" k1="-0.0642" k2="-0.0396" k3="0.0160" />
+-            <vignetting model="pa" focal="98" aperture="8" distance="5.4" k1="-0.0799" k2="0.0279" k3="-0.0389" />
+-            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.0849" k2="0.0597" k3="-0.0735" />
+-            <vignetting model="pa" focal="98" aperture="11" distance="0.9" k1="-0.0722" k2="-0.0278" k3="0.0128" />
+-            <vignetting model="pa" focal="98" aperture="11" distance="1.8" k1="-0.0584" k2="-0.0571" k3="0.0321" />
+-            <vignetting model="pa" focal="98" aperture="11" distance="5.4" k1="-0.0631" k2="-0.0290" k3="0.0118" />
+-            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.0493" k2="-0.0516" k3="0.0233" />
+-            <vignetting model="pa" focal="98" aperture="22" distance="0.9" k1="-0.0671" k2="-0.0364" k3="0.0165" />
+-            <vignetting model="pa" focal="98" aperture="22" distance="1.8" k1="-0.0525" k2="-0.0685" k3="0.0375" />
+-            <vignetting model="pa" focal="98" aperture="22" distance="5.4" k1="-0.0528" k2="-0.0455" k3="0.0179" />
+-            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.0376" k2="-0.0773" k3="0.0379" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="0.9" k1="-0.3558" k2="0.3658" k3="-0.2826" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1.8" k1="-0.3367" k2="0.2887" k3="-0.2490" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="5.4" k1="-0.2592" k2="-0.0102" k3="-0.0646" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.2386" k2="-0.3227" k3="0.1913" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="0.9" k1="-0.0590" k2="0.0188" k3="-0.0358" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1.8" k1="-0.0630" k2="0.0075" k3="-0.0261" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="5.4" k1="-0.0723" k2="0.0526" k3="-0.0643" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0841" k2="0.1164" k3="-0.1405" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="0.9" k1="-0.0397" k2="-0.0551" k3="0.0323" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1.8" k1="-0.0418" k2="-0.0754" k3="0.0503" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="5.4" k1="-0.0471" k2="-0.0558" k3="0.0388" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0339" k2="-0.0852" k3="0.0580" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="0.9" k1="-0.0242" k2="-0.0799" k3="0.0506" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="1.8" k1="-0.0393" k2="-0.0912" k3="0.0650" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="5.4" k1="-0.0435" k2="-0.0699" k3="0.0528" />
+-            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.0271" k2="-0.1145" k3="0.0840" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="0.9" k1="-0.0227" k2="-0.0935" k3="0.0652" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1.8" k1="-0.0345" k2="-0.1071" k3="0.0792" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="5.4" k1="-0.0358" k2="-0.0953" k3="0.0747" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0257" k2="-0.1300" k3="0.0997" />
++            <distortion model="ptlens" focal="40" a="-0.0069552" b="0.0128954" c="-0.0201501"/>
++            <distortion model="ptlens" focal="50" a="-0.00328196" b="0.00547778" c="-0.00507713"/>
++            <distortion model="ptlens" focal="73" a="0.00269235" b="-0.00470212" c="0.00974549"/>
++            <distortion model="ptlens" focal="98" a="-0.00377975" b="0.0155413" c="-0.00903773"/>
++            <distortion model="ptlens" focal="150" a="-0.000293389" b="0.00701827" c="-0.00528205"/>
++            <tca model="poly3" focal="40" br="-0.0000434" vr="1.0004182" bb="0.0000176" vb="0.9998313"/>
++            <tca model="poly3" focal="50" br="0.0000574" vr="1.0002451" bb="-0.0000307" vb="0.9998156"/>
++            <tca model="poly3" focal="73" br="0.0000138" vr="1.0001119" bb="-0.0001086" vb="0.9997898"/>
++            <tca model="poly3" focal="102" br="0.0000541" vr="0.9998625" bb="-0.0000497" vb="0.9997776"/>
++            <tca model="poly3" focal="150" br="-0.0000116" vr="0.9997582" bb="0.0000182" vb="0.9997618"/>
++            <tca model="poly3" focal="150" br="0.0000230" vr="0.9997236" bb="-0.0000526" vb="0.9999016"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="0.9" k1="-0.1908" k2="-0.3301" k3="0.1075"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1.8" k1="-0.1819" k2="-0.3589" k3="0.1318"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="5.4" k1="-0.1970" k2="-0.3551" k3="0.1400"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1932" k2="-0.3487" k3="0.1356"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="0.9" k1="-0.1403" k2="0.1237" k3="-0.1488"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="1.8" k1="-0.1380" k2="0.1225" k3="-0.1507"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="5.4" k1="-0.1525" k2="0.1119" k3="-0.1358"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1493" k2="0.1369" k3="-0.1587"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="0.9" k1="-0.1116" k2="-0.0197" k3="0.0125"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="1.8" k1="-0.1101" k2="-0.0263" k3="0.0183"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="5.4" k1="-0.1184" k2="-0.0108" k3="0.0039"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1220" k2="0.0001" k3="0.0004"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="0.9" k1="-0.1059" k2="-0.0273" k3="0.0134"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="1.8" k1="-0.1059" k2="-0.0274" k3="0.0168"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="5.4" k1="-0.1081" k2="-0.0270" k3="0.0104"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.1148" k2="-0.0051" k3="-0.0014"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="0.9" k1="-0.1043" k2="-0.0328" k3="0.0155"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1.8" k1="-0.1073" k2="-0.0249" k3="0.0138"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="5.4" k1="-0.1068" k2="-0.0302" k3="0.0117"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1107" k2="-0.0187" k3="0.0070"/>
++            <vignetting model="pa" focal="50" aperture="4.2" distance="0.9" k1="-0.1315" k2="-0.3638" k3="0.1167"/>
++            <vignetting model="pa" focal="50" aperture="4.2" distance="1.8" k1="-0.1096" k2="-0.4398" k3="0.1756"/>
++            <vignetting model="pa" focal="50" aperture="4.2" distance="5.4" k1="-0.1017" k2="-0.4550" k3="0.1898"/>
++            <vignetting model="pa" focal="50" aperture="4.2" distance="1000" k1="-0.1149" k2="-0.4205" k3="0.1688"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.9" k1="-0.1179" k2="0.0920" k3="-0.1641"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1.8" k1="-0.0944" k2="0.0160" k3="-0.1150"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="5.4" k1="-0.1060" k2="0.0378" k3="-0.1251"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1022" k2="0.0520" k3="-0.1425"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.9" k1="-0.1149" k2="0.0072" k3="-0.0053"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1.8" k1="-0.0904" k2="-0.0656" k3="0.0424"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="5.4" k1="-0.1003" k2="-0.0519" k3="0.0384"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1035" k2="-0.0177" k3="0.0086"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="0.9" k1="-0.1107" k2="-0.0003" k3="-0.0014"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1.8" k1="-0.0861" k2="-0.0692" k3="0.0424"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="5.4" k1="-0.0937" k2="-0.0527" k3="0.0333"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1055" k2="-0.0039" k3="-0.0045"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.1026" k2="-0.0155" k3="0.0043"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1.8" k1="-0.0938" k2="-0.0215" k3="0.0047"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="5.4" k1="-0.0877" k2="-0.0656" k3="0.0383"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0937" k2="-0.0243" k3="0.0029"/>
++            <vignetting model="pa" focal="73" aperture="4.6" distance="0.9" k1="-0.0287" k2="-0.2729" k3="-0.1884"/>
++            <vignetting model="pa" focal="73" aperture="4.6" distance="1.8" k1="0.0290" k2="-0.4975" k3="-0.0340"/>
++            <vignetting model="pa" focal="73" aperture="4.6" distance="5.4" k1="0.0859" k2="-0.7590" k3="0.1600"/>
++            <vignetting model="pa" focal="73" aperture="4.6" distance="1000" k1="0.1203" k2="-0.9424" k3="0.3031"/>
++            <vignetting model="pa" focal="73" aperture="5.6" distance="0.9" k1="-0.2098" k2="0.6214" k3="-0.7298"/>
++            <vignetting model="pa" focal="73" aperture="5.6" distance="1.8" k1="-0.1855" k2="0.5414" k3="-0.6897"/>
++            <vignetting model="pa" focal="73" aperture="5.6" distance="5.4" k1="-0.1571" k2="0.4288" k3="-0.6162"/>
++            <vignetting model="pa" focal="73" aperture="5.6" distance="1000" k1="-0.1232" k2="0.2953" k3="-0.5276"/>
++            <vignetting model="pa" focal="73" aperture="8" distance="0.9" k1="-0.1425" k2="0.2271" k3="-0.2193"/>
++            <vignetting model="pa" focal="73" aperture="8" distance="1.8" k1="-0.1591" k2="0.2766" k3="-0.2662"/>
++            <vignetting model="pa" focal="73" aperture="8" distance="5.4" k1="-0.1741" k2="0.3142" k3="-0.2965"/>
++            <vignetting model="pa" focal="73" aperture="8" distance="1000" k1="-0.1721" k2="0.3036" k3="-0.2981"/>
++            <vignetting model="pa" focal="73" aperture="11" distance="0.9" k1="-0.0691" k2="-0.0437" k3="0.0225"/>
++            <vignetting model="pa" focal="73" aperture="11" distance="1.8" k1="-0.0809" k2="-0.0197" k3="0.0024"/>
++            <vignetting model="pa" focal="73" aperture="11" distance="5.4" k1="-0.0858" k2="-0.0150" k3="0.0041"/>
++            <vignetting model="pa" focal="73" aperture="11" distance="1000" k1="-0.0966" k2="0.0009" k3="-0.0087"/>
++            <vignetting model="pa" focal="73" aperture="22" distance="0.9" k1="-0.0621" k2="-0.0569" k3="0.0274"/>
++            <vignetting model="pa" focal="73" aperture="22" distance="1.8" k1="-0.0749" k2="-0.0372" k3="0.0140"/>
++            <vignetting model="pa" focal="73" aperture="22" distance="5.4" k1="-0.0823" k2="-0.0257" k3="0.0106"/>
++            <vignetting model="pa" focal="73" aperture="22" distance="1000" k1="-0.0769" k2="-0.0485" k3="0.0244"/>
++            <vignetting model="pa" focal="98" aperture="5" distance="0.9" k1="-0.1835" k2="-0.0290" k3="-0.1856"/>
++            <vignetting model="pa" focal="98" aperture="5" distance="1.8" k1="-0.1099" k2="-0.2740" k3="-0.0305"/>
++            <vignetting model="pa" focal="98" aperture="5" distance="5.4" k1="-0.0473" k2="-0.5586" k3="0.1726"/>
++            <vignetting model="pa" focal="98" aperture="5" distance="1000" k1="0.0019" k2="-0.8142" k3="0.3669"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="0.9" k1="-0.0864" k2="0.1239" k3="-0.3224"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1.8" k1="-0.0386" k2="-0.0035" k3="-0.2593"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="5.4" k1="0.0072" k2="-0.1462" k3="-0.1789"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="0.0660" k2="-0.3692" k3="-0.0340"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="0.9" k1="-0.0770" k2="-0.0171" k3="0.0049"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1.8" k1="-0.0642" k2="-0.0396" k3="0.0160"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="5.4" k1="-0.0799" k2="0.0279" k3="-0.0389"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.0849" k2="0.0597" k3="-0.0735"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="0.9" k1="-0.0722" k2="-0.0278" k3="0.0128"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="1.8" k1="-0.0584" k2="-0.0571" k3="0.0321"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="5.4" k1="-0.0631" k2="-0.0290" k3="0.0118"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.0493" k2="-0.0516" k3="0.0233"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="0.9" k1="-0.0671" k2="-0.0364" k3="0.0165"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="1.8" k1="-0.0525" k2="-0.0685" k3="0.0375"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="5.4" k1="-0.0528" k2="-0.0455" k3="0.0179"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.0376" k2="-0.0773" k3="0.0379"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="0.9" k1="-0.3558" k2="0.3658" k3="-0.2826"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1.8" k1="-0.3367" k2="0.2887" k3="-0.2490"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="5.4" k1="-0.2592" k2="-0.0102" k3="-0.0646"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.2386" k2="-0.3227" k3="0.1913"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="0.9" k1="-0.0590" k2="0.0188" k3="-0.0358"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1.8" k1="-0.0630" k2="0.0075" k3="-0.0261"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="5.4" k1="-0.0723" k2="0.0526" k3="-0.0643"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0841" k2="0.1164" k3="-0.1405"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="0.9" k1="-0.0397" k2="-0.0551" k3="0.0323"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1.8" k1="-0.0418" k2="-0.0754" k3="0.0503"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="5.4" k1="-0.0471" k2="-0.0558" k3="0.0388"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0339" k2="-0.0852" k3="0.0580"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="0.9" k1="-0.0242" k2="-0.0799" k3="0.0506"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="1.8" k1="-0.0393" k2="-0.0912" k3="0.0650"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="5.4" k1="-0.0435" k2="-0.0699" k3="0.0528"/>
++            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.0271" k2="-0.1145" k3="0.0840"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="0.9" k1="-0.0227" k2="-0.0935" k3="0.0652"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1.8" k1="-0.0345" k2="-0.1071" k3="0.0792"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="5.4" k1="-0.0358" k2="-0.0953" k3="0.0747"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0257" k2="-0.1300" k3="0.0997"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- Also update copy with "SWD" below. -->
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 50-200mm f/2.8-3.5</model>
++        <model>Olympus Zuiko Digital ED 50-200mm f/2.8-3.5</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.005194" c="0" />
+-            <distortion model="ptlens" focal="62" a="0" b="-0.002175" c="0" />
+-            <distortion model="ptlens" focal="69" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="83" a="0" b="0.001879" c="0" />
+-            <distortion model="ptlens" focal="101" a="0" b="0.00369" c="0" />
+-            <distortion model="ptlens" focal="130" a="0" b="0.004293" c="0" />
+-            <distortion model="ptlens" focal="158" a="0" b="0.004686" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.003465" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.005194"/>
++            <distortion model="poly3" focal="62" k1="-0.002175"/>
++            <distortion model="poly3" focal="69" k1="0"/>
++            <distortion model="poly3" focal="83" k1="0.001879"/>
++            <distortion model="poly3" focal="101" k1="0.00369"/>
++            <distortion model="poly3" focal="130" k1="0.004293"/>
++            <distortion model="poly3" focal="158" k1="0.004686"/>
++            <distortion model="poly3" focal="200" k1="0.003465"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- Also update copy without "SWD" above. -->
+         <maker>Olympus</maker>
+-        <model>Zuiko Digital 50mm f/2.0 Macro</model>
++        <model>Olympus Zuiko Digital ED 50-200mm f/2.8-3.5 SWD</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0.001878" b="-0.005529" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.005194"/>
++            <distortion model="poly3" focal="62" k1="-0.002175"/>
++            <distortion model="poly3" focal="69" k1="0"/>
++            <distortion model="poly3" focal="83" k1="0.001879"/>
++            <distortion model="poly3" focal="101" k1="0.00369"/>
++            <distortion model="poly3" focal="130" k1="0.004293"/>
++            <distortion model="poly3" focal="158" k1="0.004686"/>
++            <distortion model="poly3" focal="200" k1="0.003465"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>Standard</model>
++        <model>Olympus Zuiko Digital ED 50mm f/2.0 Macro</model>
++        <mount>4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="50" a="0.001878" b="-0.005529" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus E-10 &amp; compatibles (Standard)</model>
++        <model lang="en">fixed lens</model>
++        <model lang="de">festes Objektiv</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9" a="0" b="-0.015682" c="0" />
+-            <distortion model="ptlens" focal="10" a="0" b="-0.011648" c="0" />
+-            <distortion model="ptlens" focal="11" a="0" b="-0.006453" c="0" />
+-            <distortion model="ptlens" focal="12" a="0" b="-0.003862" c="0" />
+-            <distortion model="ptlens" focal="13" a="0" b="-0.002817" c="0" />
+-            <distortion model="ptlens" focal="15" a="0" b="-0.000837" c="0" />
+-            <distortion model="ptlens" focal="18" a="0" b="-0.000867" c="0" />
+-            <distortion model="ptlens" focal="21" a="0" b="0.000116" c="0" />
+-            <distortion model="ptlens" focal="26" a="0" b="-2.3e-05" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="0.000273" c="0" />
+-            <distortion model="ptlens" focal="36" a="0" b="2.9e-05" c="0" />
++            <distortion model="poly3" focal="9" k1="-0.015682"/>
++            <distortion model="poly3" focal="10" k1="-0.011648"/>
++            <distortion model="poly3" focal="11" k1="-0.006453"/>
++            <distortion model="poly3" focal="12" k1="-0.003862"/>
++            <distortion model="poly3" focal="13" k1="-0.002817"/>
++            <distortion model="poly3" focal="15" k1="-0.000837"/>
++            <distortion model="poly3" focal="18" k1="-0.000867"/>
++            <distortion model="poly3" focal="21" k1="0.000116"/>
++            <distortion model="poly3" focal="26" k1="-2.3e-05"/>
++            <distortion model="poly3" focal="30" k1="0.000273"/>
++            <distortion model="poly3" focal="36" k1="2.9e-05"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>WCON-08B</model>
++        <model>Olympus E-10 &amp; compatibles, with WCON-08B</model>
++        <model lang="en">fixed lens, with WCON-08B</model>
++        <model lang="de">festes Objektiv, mit WCON-08B</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="9" a="0.015434" b="-0.044944" c="0" />
+-            <distortion model="ptlens" focal="10" a="0.015297" b="-0.039777" c="0" />
+-            <distortion model="ptlens" focal="11" a="0.011044" b="-0.029992" c="0" />
+-            <distortion model="ptlens" focal="12" a="0.010271" b="-0.025622" c="0" />
+-            <distortion model="ptlens" focal="13" a="0.006898" b="-0.012403" c="0" />
++            <distortion model="ptlens" focal="9" a="0.015434" b="-0.044944" c="0"/>
++            <distortion model="ptlens" focal="10" a="0.015297" b="-0.039777" c="0"/>
++            <distortion model="ptlens" focal="11" a="0.011044" b="-0.029992" c="0"/>
++            <distortion model="ptlens" focal="12" a="0.010271" b="-0.025622" c="0"/>
++            <distortion model="ptlens" focal="13" a="0.006898" b="-0.012403" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>B-300 (full tele)</model>
++        <model>Olympus E-10 &amp; compatibles, with B-300 (full tele)</model>
++        <model lang="en">fixed lens, with B-300 (full tele)</model>
++        <model lang="de">festes Objektiv, mit B-300 (längste Brennw.)</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="36" a="0.001885" b="0.002595" c="0" />
++            <distortion model="ptlens" focal="36" a="0.001885" b="0.002595" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>macro (full tele): 8 inches lens-to-subject</model>
++        <model>Olympus E-10 &amp; compatibles, macro (full tele): 8 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro (full tele): 8 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro (längste Brennw.): 8 Zoll Fokusabstand</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="36" a="0" b="-0.002276" c="0" />
++            <distortion model="poly3" focal="36" k1="-0.002276"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>macro (full tele): 12 inches lens-to-subject</model>
++        <model>Olympus E-10 &amp; compatibles, macro (full tele): 12 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro (full tele): 12 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro (längste Brennw.): 12 Zoll Fokusabstand</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="36" a="0" b="-0.0014" c="0" />
++            <distortion model="poly3" focal="36" k1="-0.0014"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>macro (full tele): 16 inches lens-to-subject</model>
++        <model>Olympus E-10 &amp; compatibles, macro (full tele): 16 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro (full tele): 16 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro (längste Brennw.): 16 Zoll Fokusabstand</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="36" a="0" b="-0.001229" c="0" />
++            <distortion model="poly3" focal="36" k1="-0.001229"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Olympus</maker>
+-        <model>macro (full tele): 20 inches lens-to-subject</model>
++        <model>Olympus E-10 &amp; compatibles, macro (full tele): 20 inches lens-to-subject</model>
++        <model lang="en">fixed lens, macro (full tele): 20 inches lens-to-subject</model>
++        <model lang="de">festes Objektiv, Makro (längste Brennw.): 20 Zoll Fokusabstand</model>
+         <mount>olympusE10</mount>
+         <cropfactor>3.933</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="36" a="0" b="-0.001085" c="0" />
++            <distortion model="poly3" focal="36" k1="-0.001085"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus Zuiko Digital ED 12-60mm f/2.8-4.0 SWD</model>
++        <mount>4/3 System</mount>
++        <focal min="12" max="60"/>
++        <aperture min="2.8" max="4"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="12" a="0.0378606" b="-0.0903769" c="0.0209704"/>
++            <distortion model="ptlens" focal="14" a="0.0356288" b="-0.0735374" c="0.0090992"/>
++            <distortion model="ptlens" focal="16" a="0.0199475" b="-0.0359737" c="-0.00727696"/>
++            <distortion model="ptlens" focal="18" a="0.0110679" b="-0.0172287" c="-0.00120671"/>
++            <distortion model="ptlens" focal="20" a="0.0112205" b="-0.0191171" c="0.00416202"/>
++            <distortion model="ptlens" focal="25" a="0.00924039" b="-0.0158513" c="0.00738501"/>
++            <distortion model="ptlens" focal="30" a="0.00276997" b="0.00320495" c="-0.00998594"/>
++            <distortion model="ptlens" focal="35" a="0.00525429" b="-0.0093383" c="0.00864948"/>
++            <distortion model="ptlens" focal="40" a="0.00518391" b="-0.011341" c="0.0138034"/>
++            <distortion model="ptlens" focal="45" a="0.0029713" b="-0.00562078" c="0.00965514"/>
++            <distortion model="ptlens" focal="50" a="0.00398971" b="-0.0106269" c="0.0164902"/>
++            <distortion model="ptlens" focal="55" a="0.00291466" b="-0.00562177" c="0.0084578"/>
++            <distortion model="ptlens" focal="60" a="0.00155019" b="-0.00153152" c="0.0052106"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Olympus Zuiko Digital ED 14-35mm F2.0 SWD</model>
++        <mount>4/3 System</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-M1 -->
++            <distortion model="ptlens" focal="14" a="0.02286" b="-0.06336" c="0.03264"/>
++            <distortion model="ptlens" focal="16" a="0.01596" b="-0.0447" c="0.02397"/>
++            <distortion model="ptlens" focal="18" a="0.00819" b="-0.0231" c="0.0114"/>
++            <distortion model="ptlens" focal="20" a="-0.00103" b="0.00768" c="-0.01591"/>
++            <distortion model="ptlens" focal="23" a="0.00102" b="0.00424" c="-0.01246"/>
++            <distortion model="ptlens" focal="26" a="0.00075" b="0.00295" c="-0.00626"/>
++            <distortion model="ptlens" focal="30" a="0.00183" b="-0.00279" c="0.00304"/>
++            <distortion model="ptlens" focal="35" a="0.00544" b="-0.01855" c="0.0247"/>
++            <tca model="poly3" focal="14" vr="1.0001858" vb="1.0000144"/>
++            <tca model="poly3" focal="16" vr="1.0001931" vb="0.9999968"/>
++            <tca model="poly3" focal="18" vr="1.0002164" vb="0.9999765"/>
++            <tca model="poly3" focal="20" vr="1.0002153" vb="0.9999632"/>
++            <tca model="poly3" focal="23" vr="1.0002047" vb="0.9999521"/>
++            <tca model="poly3" focal="26" vr="1.0001182" vb="0.9999707"/>
++            <tca model="poly3" focal="30" vr="1.0000099" vb="1.0000244"/>
++            <tca model="poly3" focal="35" vr="0.9997740" vb="1.0001929"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Olympus</maker>
++        <model>Zuiko Auto-S 50mm f/1.8</model>
++        <mount>Olympus OM</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon M -->
++            <distortion model="ptlens" focal="50" a="0.00004" b="0.00389" c="-0.01321"/>
++            <tca model="poly3" focal="50" vr="0.9999506" vb="0.9999648"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-0.8671" k2="0.7934" k3="-0.3523"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.8671" k2="0.7934" k3="-0.3523"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.0651" k2="-0.0319" k3="0.0334"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0651" k2="-0.0319" k3="0.0334"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.0648" k2="-0.0231" k3="0.0267"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0648" k2="-0.0231" k3="0.0267"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.0494" k2="-0.0551" k3="0.0491"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0494" k2="-0.0551" k3="0.0491"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.0023" k2="-0.2127" k3="0.1554"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.0023" k2="-0.2127" k3="0.1554"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-panasonic.xml b/data/db/slr-panasonic.xml
+--- a/data/db/slr-panasonic.xml	2013-10-12 23:20:19.000000000 +0200
++++ b/data/db/slr-panasonic.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,17 +1,14 @@
+ <lensdatabase>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-L1</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>Panasonic</maker>
+         <model>DMC-L10</model>
+         <mount>4/3 System</mount>
+-        <cropfactor>2.0</cropfactor>
++        <cropfactor>2</cropfactor>
+     </camera>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-pentax.xml b/data/db/slr-pentax.xml
+--- a/data/db/slr-pentax.xml	2013-10-16 20:48:25.000000000 +0200
++++ b/data/db/slr-pentax.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,835 +1,1760 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Pentax K</name>
+         <name lang="ru">Байонет K</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Pentax KA</compat>
+         <compat>Pentax KAF</compat>
+         <compat>Pentax KAF2</compat>
++        <compat>Pentax KAF3</compat>
++        <compat>Pentax KAF4</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Pentax KA</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Pentax K</compat>
+         <compat>Pentax KAF</compat>
+         <compat>Pentax KAF2</compat>
++        <compat>Pentax KAF3</compat>
++        <compat>Pentax KAF4</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Pentax KAF</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Pentax K</compat>
+         <compat>Pentax KA</compat>
+         <compat>Pentax KAF2</compat>
++        <compat>Pentax KAF3</compat>
++        <compat>Pentax KAF4</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Pentax KAF2</name>
+-        <compat>M42</compat>
+-        <compat>T2</compat>
+         <compat>Pentax K</compat>
+         <compat>Pentax KA</compat>
+         <compat>Pentax KAF</compat>
++        <compat>Pentax KAF3</compat>
++        <compat>Pentax KAF4</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <mount>
+         <name>Pentax KAF3</name>
++        <compat>Pentax K</compat>
++        <compat>Pentax KA</compat>
++        <compat>Pentax KAF</compat>
++        <compat>Pentax KAF2</compat>
++        <compat>Pentax KAF4</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
++        <compat>Generic</compat>
++    </mount>
++    <mount>
++        <name>Pentax KAF4</name>
+         <compat>Pentax K</compat>
+         <compat>Pentax KA</compat>
+         <compat>Pentax KAF</compat>
+         <compat>Pentax KAF2</compat>
++        <compat>Pentax KAF3</compat>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+         <maker>Pentax</maker>
+-        <maker lang="en">Pentax</maker>
+         <model>35mm film: full frame</model>
+         <mount>Pentax KAF2</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX *ist DL2</model>
++        <model>Pentax *ist DL2</model>
+         <model lang="en">*ist DL2</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX *ist DL</model>
++        <model>Pentax *ist DL</model>
+         <model lang="en">*ist DL</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX *ist DS2</model>
++        <model>Pentax *ist DS2</model>
+         <model lang="en">*ist DS2</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX *ist DS</model>
++        <model>Pentax *ist DS</model>
+         <model lang="en">*ist DS</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX *ist D</model>
++        <model>Pentax *ist D</model>
+         <model lang="en">*ist D</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-m</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-m</model>
+         <model lang="en">K-m</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX K100</model>
+-        <model lang="en">K100</model>
++        <model>Pentax K100D</model>
++        <model lang="en">K100D</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX K100D Super</model>
++        <model>Pentax K100D Super</model>
+         <model lang="en">K100D Super</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX K110</model>
+-        <model lang="en">K110</model>
++        <model>Pentax K110D</model>
++        <model lang="en">K110D</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX K10D</model>
++        <model>Pentax K10D</model>
+         <model lang="en">K10D</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX Corporation</maker>
++        <maker>Pentax Corporation</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX K20D</model>
++        <model>Pentax K20D</model>
+         <model lang="en">K20D</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-30</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-30</model>
+         <model lang="en">K-30</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-50</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-50</model>
+         <model lang="en">K-50</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-500</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-500</model>
+         <model lang="en">K-500</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-7</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-7</model>
+         <model lang="en">K-7</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-5</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-5</model>
+         <model lang="en">K-5</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-5 II</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-5 II</model>
+         <model lang="en">K-5 II</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-5 II s</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-5 II s</model>
+         <model lang="en">K-5 II s</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
++        <maker>Pentax</maker>
++        <model>Pentax K-3</model>
++        <model lang="en">K-3</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Ricoh Imaging Company, Ltd.</maker>
++        <model>Pentax K-3 II</model>
++        <model lang="en">K-3 II</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Ricoh Imaging Company, Ltd.</maker>
+         <maker lang="en">Pentax</maker>
+-        <model>PENTAX K2000</model>
+-        <model lang="en">K2000</model>
++        <model>Pentax K-1</model>
++        <model lang="en">K-1</model>
+         <mount>Pentax KAF3</mount>
++        <cropfactor>1</cropfactor>
++    </camera>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax K2000</model>
++        <model lang="en">K2000</model>
++        <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K200D</model>
++        <maker>Pentax</maker>
++        <model>Pentax K200D</model>
+         <model lang="en">K200D</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-x</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-x</model>
+         <model lang="en">K-x</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>PENTAX</maker>
+-        <maker lang="en">Pentax</maker>
+-        <model>PENTAX K-r</model>
++        <maker>Pentax</maker>
++        <model>Pentax K-r</model>
+         <model lang="en">K-r</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax K-S2</model>
++        <model lang="en">K-S2</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax K-S1</model>
++        <model lang="en">K-S1</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Ricoh Imaging Company, Ltd.</maker>
++        <model>Pentax K-70</model>
++        <model lang="en">K-70</model>
++        <mount>Pentax KAF3</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax K-01</model>
++        <model lang="en">K-01</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Pentax</maker>
++        <model>Pentax KP</model>
++        <model lang="en">KP</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX DA 12-24mm f/4 ED AL IF</model>
++        <model>smc Pentax-DA 12-24mm f/4 ED AL IF</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="12" k1="-0.01919" />
+-            <distortion model="poly3" focal="15" k1="-0.00774" />
+-            <distortion model="poly3" focal="18" k1="-0.00345" />
+-            <distortion model="poly3" focal="21" k1="-0.00199" />
+-            <distortion model="poly3" focal="24" k1="0.00061" />
+-            <tca model="poly3" focal="12" br="0.0000916" vr="0.9999904" bb="-0.0002397" vb="1.0006490" />
+-            <tca model="poly3" focal="15" br="0.0001253" vr="0.9999184" bb="-0.0002858" vb="1.0008241" />
+-            <tca model="poly3" focal="18" br="0.0001204" vr="0.9999075" bb="-0.0001990" vb="1.0006258" />
+-            <tca model="poly3" focal="21" br="0.0001063" vr="0.9999562" bb="-0.0001477" vb="1.0005692" />
+-            <tca model="poly3" focal="24" br="0.0000982" vr="1.0000005" bb="-0.0001137" vb="1.0004136" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="100" k1="-0.19267" k2="0.09379" k3="-0.38938" />
+-            <vignetting model="pa" focal="15" aperture="4.5" distance="100" k1="-0.08756" k2="-0.28192" k3="0.06908" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="100" k1="-0.05982" k2="-0.45748" k3="0.25039" />
+-            <vignetting model="pa" focal="21" aperture="4.5" distance="100" k1="-0.28874" k2="-0.06687" k3="0.09488" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="100" k1="-0.44227" k2="0.2599" k3="-0.09436" />
++            <distortion model="poly3" focal="12" k1="-0.01919"/>
++            <distortion model="poly3" focal="15" k1="-0.00774"/>
++            <distortion model="poly3" focal="18" k1="-0.00345"/>
++            <distortion model="poly3" focal="21" k1="-0.00199"/>
++            <distortion model="poly3" focal="24" k1="0.00061"/>
++            <tca model="poly3" focal="12" br="0.0000916" vr="0.9999904" bb="-0.0002397" vb="1.0006490"/>
++            <tca model="poly3" focal="15" br="0.0001253" vr="0.9999184" bb="-0.0002858" vb="1.0008241"/>
++            <tca model="poly3" focal="18" br="0.0001204" vr="0.9999075" bb="-0.0001990" vb="1.0006258"/>
++            <tca model="poly3" focal="21" br="0.0001063" vr="0.9999562" bb="-0.0001477" vb="1.0005692"/>
++            <tca model="poly3" focal="24" br="0.0000982" vr="1.0000005" bb="-0.0001137" vb="1.0004136"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="100" k1="-0.19267" k2="0.09379" k3="-0.38938"/>
++            <vignetting model="pa" focal="15" aperture="4.5" distance="100" k1="-0.08756" k2="-0.28192" k3="0.06908"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="100" k1="-0.05982" k2="-0.45748" k3="0.25039"/>
++            <vignetting model="pa" focal="21" aperture="4.5" distance="100" k1="-0.28874" k2="-0.06687" k3="0.09488"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="100" k1="-0.44227" k2="0.2599" k3="-0.09436"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC Pentax DA 16-45mm f/4.0 ED AL</model>
++        <model>smc Pentax-DA 16-45mm f/4 ED AL</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16" a="0.012341" b="-0.035947" c="0" />
+-            <distortion model="ptlens" focal="18" a="0.009928" b="-0.02993" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.005774" b="-0.01641" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.006045" b="-0.015109" c="0" />
+-            <distortion model="ptlens" focal="26" a="0" b="0.000197" c="0" />
+-            <distortion model="ptlens" focal="29" a="0" b="0.002637" c="0" />
+-            <distortion model="ptlens" focal="34" a="0" b="0.003505" c="0" />
+-            <distortion model="ptlens" focal="40" a="0" b="0.003288" c="0" />
+-            <distortion model="ptlens" focal="45" a="0" b="0.003622" c="0" />
++            <distortion model="ptlens" focal="16" a="0.012341" b="-0.035947" c="0"/>
++            <distortion model="ptlens" focal="18" a="0.009928" b="-0.02993" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.005774" b="-0.01641" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.006045" b="-0.015109" c="0"/>
++            <distortion model="ptlens" focal="26" a="0" b="0.000197" c="0"/>
++            <distortion model="ptlens" focal="29" a="0" b="0.002637" c="0"/>
++            <distortion model="ptlens" focal="34" a="0" b="0.003505" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="0.003288" c="0"/>
++            <distortion model="ptlens" focal="45" a="0" b="0.003622" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC Pentax DA 18-55mm f/3.5-5.6</model>
++        <model>HD Pentax-DA 16-85mm f/3.5-5.6 ED DC WR</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.004593" b="-0.021008" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.00371" b="-0.014625" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="-0.004166" c="0" />
+-            <distortion model="ptlens" focal="33" a="0" b="0.000528" c="0" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.003215" c="0" />
++            <!-- Taken with Pentax K5 -->
++            <distortion model="ptlens" focal="16" a="0.0128194" b="-0.0316035" c="-0.0188219"/>
++            <distortion model="ptlens" focal="21" a="0.00900492" b="-0.0197809" c="-0.000667816"/>
++            <distortion model="ptlens" focal="26" a="0.000946351" b="0.00713425" c="-0.0166867"/>
++            <distortion model="ptlens" focal="28" a="-0.0044335" b="0.0251402" c="-0.0279517"/>
++            <distortion model="ptlens" focal="35" a="-0.00319378" b="0.0213484" c="-0.0248333"/>
++            <distortion model="ptlens" focal="43" a="0.000425028" b="0.00919418" c="-0.0109862"/>
++            <distortion model="ptlens" focal="68" a="-0.000323365" b="0.00551294" c="0.00186962"/>
++            <distortion model="ptlens" focal="85" a="0.00564139" b="-0.0180164" c="0.0337795"/>
++            <tca model="poly3" focal="16" br="-0.0000704" vr="1.0005077" bb="0.0000690" vb="0.9999805"/>
++            <tca model="poly3" focal="21" br="-0.0000044" vr="1.0004007" bb="0.0000207" vb="0.9999686"/>
++            <tca model="poly3" focal="26" br="0.0000063" vr="1.0003142" bb="0.0000010" vb="0.9999308"/>
++            <tca model="poly3" focal="28" br="0.0000026" vr="1.0002490" bb="-0.0000145" vb="0.9999347"/>
++            <tca model="poly3" focal="35" br="-0.0000295" vr="1.0002180" bb="-0.0000030" vb="0.9999106"/>
++            <tca model="poly3" focal="43" br="-0.0000267" vr="1.0001546" bb="-0.0000031" vb="0.9998828"/>
++            <tca model="poly3" focal="48" br="-0.0000256" vr="1.0000562" bb="0.0000067" vb="0.9998701"/>
++            <tca model="poly3" focal="68" br="-0.0000360" vr="0.9999061" bb="0.0000238" vb="0.9998529"/>
++            <tca model="poly3" focal="85" br="-0.0000305" vr="0.9998040" bb="0.0000295" vb="0.9997888"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC Pentax DA L 18-55mm f/3.5-5.6</model>
++        <model>smc Pentax-DA 18-55mm f/3.5-5.6 AL</model>
++        <!-- FixMe: According to
++             <http://en.wikipedia.org/wiki/Pentax_DA_18-55mm_lens>, Samsung
++             D-XENON 18-55mm 1:3.5-5.6 AL is an alias. -->
+         <mount>Pentax KAF2</mount>
++        <focal min="18" max="55"/>
++        <aperture min="3.5" max="40"/>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.00117" b="-0.01707" c="-0.00529" />
+-            <distortion model="ptlens" focal="24" a="0" b="-0.0071" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0.0002" c="0" />
+-            <distortion model="ptlens" focal="42.5" a="0.00291" b="-0.00765" c="0.00808" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.00333" c="0" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.26538" k2="0.5437" k3="-0.51036" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.08271" k2="0.02282" k3="-0.04481" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.05666" k2="0.02789" k3="-0.01283" />
+-            <vignetting model="pa" focal="42.5" aperture="11" distance="1000" k1="-0.03675" k2="0.01041" k3="-0.00479" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.07077" k2="0.07738" k3="-0.04494" />
+-            <tca model="poly3" focal="18" br="0.0000246" vr="1.0008065" bb="0.00025" vb="0.9998" />
+-            <tca model="poly3" focal="24" br="0.00004" vr="1.00056" bb="0.00024" vb="0.9999" />
+-            <tca model="poly3" focal="35" br="0.00001" vr="1.000127" bb="0.000022" vb="1.0001" />
+-            <tca model="poly3" focal="42.5" br="0.000084" vr="1.0000218" bb="-0.0000375" vb="1.0000794" />
+-            <tca model="poly3" focal="55" br="0.0000165" vr="0.99999" bb="-0.0000538" vb="1.0000742" />
++            <distortion focal="18" model="ptlens" a="0.00606571" b="-0.0251409" c="-0.00216764"/>
++            <distortion focal="24" model="ptlens" a="0.00100173" b="-0.0115495" c="0.00286152"/>
++            <distortion focal="35" model="ptlens" a="-8.27771e-05" b="0.000563308" c="-0.000657665"/>
++            <distortion focal="45" model="ptlens" a="0.00340219" b="-0.0072762" c="0.00763624"/>
++            <distortion focal="55" model="ptlens" a="-0.000442312" b="0.00460551" c="-0.00158524"/>
++            <tca model="poly3" focal="18" br="-0.0000871" vr="1.0004828" bb="-0.0000263" vb="1.0001433"/>
++            <tca model="poly3" focal="20" br="-0.0006746" cr="0.0017899" vr="0.9997634" bb="0.0007446" cb="-0.0011695" vb="1.0005314"/>
++            <tca model="poly3" focal="21" br="-0.0012575" cr="0.0022420" vr="1.0000624" bb="-0.0004657" cb="0.0009917" vb="0.9995849"/>
++            <tca model="poly3" focal="23" br="0.0008593" cr="-0.0018130" vr="1.0014264" bb="-0.0004830" cb="0.0011743" vb="0.9995325"/>
++            <tca model="poly3" focal="24" br="-0.0000122" vr="1.0002181" bb="0.0000383" vb="1.0002671"/>
++            <tca model="poly3" focal="26" br="-0.0000261" cr="0.0001475" vr="1.0003238" bb="0.0002433" cb="-0.0002405" vb="1.0002520"/>
++            <tca model="poly3" focal="28" br="-0.0000056" cr="-0.0000342" vr="1.0004965" bb="0.0001311" cb="-0.0001193" vb="1.0003247"/>
++            <tca model="poly3" focal="31" br="-0.0000110" cr="0.0001737" vr="1.0001522" bb="-0.0004369" cb="0.0009840" vb="0.9997737"/>
++            <tca model="poly3" focal="33" br="-0.0004712" cr="0.0008834" vr="0.9998863" bb="-0.0000441" cb="0.0002601" vb="1.0007441"/>
++            <tca model="poly3" focal="35" br="-0.0000093" vr="1.0001056" bb="-0.0000299" vb="1.0001859"/>
++            <tca model="poly3" focal="38" br="-0.0002914" cr="0.0006529" vr="0.9998320" bb="0.0002885" cb="-0.0004075" vb="1.0007491"/>
++            <tca model="poly3" focal="40" br="0.0000435" cr="0.0000393" vr="1.0000392" bb="0.0000098" cb="-0.0001665" vb="1.0002437"/>
++            <tca model="poly3" focal="43" br="-0.0000113" vr="1.0001417" bb="0.0000241" vb="1.0000489"/>
++            <tca model="poly3" focal="50" br="-0.0001694" cr="0.0004921" vr="0.9997155" bb="0.0000873" cb="-0.0000946" vb="1.0002636"/>
++            <tca model="poly3" focal="55" br="-0.0000059" vr="1.0000907" bb="0.0000077" vb="0.9999907"/>
++            <!-- Taken with Pentax K20D -->
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2263" k2="-1.0015" k3="0.6598"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2263" k2="-1.0015" k3="0.6598"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.1131" k2="-1.0728" k3="0.6578"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.1131" k2="-1.0728" k3="0.6578"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.0802" k2="-0.4710" k3="0.0853"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.0802" k2="-0.4710" k3="0.0853"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3532" k2="0.5124" k3="-0.5488"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3532" k2="0.5124" k3="-0.5488"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3444" k2="0.3737" k3="-0.3126"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3444" k2="0.3737" k3="-0.3126"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2724" k2="0.0741" k3="-0.0304"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2724" k2="0.0741" k3="-0.0304"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2612" k2="0.0255" k3="0.0105"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2612" k2="0.0255" k3="0.0105"/>
++            <vignetting model="pa" focal="24.4" aperture="4" distance="10" k1="-0.2054" k2="-0.9019" k3="0.5965"/>
++            <vignetting model="pa" focal="24.4" aperture="4" distance="1000" k1="-0.2054" k2="-0.9019" k3="0.5965"/>
++            <vignetting model="pa" focal="24.4" aperture="5.6" distance="10" k1="-0.1241" k2="-0.0710" k3="-0.0923"/>
++            <vignetting model="pa" focal="24.4" aperture="5.6" distance="1000" k1="-0.1241" k2="-0.0710" k3="-0.0923"/>
++            <vignetting model="pa" focal="24.4" aperture="8" distance="10" k1="-0.2021" k2="0.0920" k3="-0.0522"/>
++            <vignetting model="pa" focal="24.4" aperture="8" distance="1000" k1="-0.2021" k2="0.0920" k3="-0.0522"/>
++            <vignetting model="pa" focal="24.4" aperture="11" distance="10" k1="-0.1982" k2="0.0453" k3="0.0005"/>
++            <vignetting model="pa" focal="24.4" aperture="11" distance="1000" k1="-0.1982" k2="0.0453" k3="0.0005"/>
++            <vignetting model="pa" focal="24.4" aperture="16" distance="10" k1="-0.2011" k2="0.0450" k3="0.0029"/>
++            <vignetting model="pa" focal="24.4" aperture="16" distance="1000" k1="-0.2011" k2="0.0450" k3="0.0029"/>
++            <vignetting model="pa" focal="24.4" aperture="29" distance="10" k1="-0.1973" k2="0.0260" k3="0.0152"/>
++            <vignetting model="pa" focal="24.4" aperture="29" distance="1000" k1="-0.1973" k2="0.0260" k3="0.0152"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.7670" k2="0.7438" k3="-0.3915"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.7670" k2="0.7438" k3="-0.3915"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.0805" k2="-0.4983" k3="0.3216"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.0805" k2="-0.4983" k3="0.3216"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1238" k2="0.0697" k3="-0.0407"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1238" k2="0.0697" k3="-0.0407"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.1224" k2="0.0371" k3="-0.0021"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1224" k2="0.0371" k3="-0.0021"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.1327" k2="0.0464" k3="-0.0045"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1327" k2="0.0464" k3="-0.0045"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.1457" k2="0.0648" k3="-0.0147"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1457" k2="0.0648" k3="-0.0147"/>
++            <vignetting model="pa" focal="47.5" aperture="5.6" distance="10" k1="-0.7362" k2="0.6621" k3="-0.2797"/>
++            <vignetting model="pa" focal="47.5" aperture="5.6" distance="1000" k1="-0.7362" k2="0.6621" k3="-0.2797"/>
++            <vignetting model="pa" focal="47.5" aperture="8" distance="10" k1="0.0203" k2="-0.4593" k3="0.2325"/>
++            <vignetting model="pa" focal="47.5" aperture="8" distance="1000" k1="0.0203" k2="-0.4593" k3="0.2325"/>
++            <vignetting model="pa" focal="47.5" aperture="11" distance="10" k1="-0.1050" k2="0.0566" k3="-0.0233"/>
++            <vignetting model="pa" focal="47.5" aperture="11" distance="1000" k1="-0.1050" k2="0.0566" k3="-0.0233"/>
++            <vignetting model="pa" focal="47.5" aperture="16" distance="10" k1="-0.1106" k2="0.0594" k3="-0.0195"/>
++            <vignetting model="pa" focal="47.5" aperture="16" distance="1000" k1="-0.1106" k2="0.0594" k3="-0.0195"/>
++            <vignetting model="pa" focal="47.5" aperture="22" distance="10" k1="-0.1220" k2="0.0828" k3="-0.0331"/>
++            <vignetting model="pa" focal="47.5" aperture="22" distance="1000" k1="-0.1220" k2="0.0828" k3="-0.0331"/>
++            <vignetting model="pa" focal="47.5" aperture="40" distance="10" k1="-0.1314" k2="0.1027" k3="-0.0451"/>
++            <vignetting model="pa" focal="47.5" aperture="40" distance="1000" k1="-0.1314" k2="0.1027" k3="-0.0451"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6413" k2="0.4960" k3="-0.1884"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6413" k2="0.4960" k3="-0.1884"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0357" k2="-0.5717" k3="0.3609"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0357" k2="-0.5717" k3="0.3609"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1113" k2="0.1211" k3="-0.0996"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1113" k2="0.1211" k3="-0.0996"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.1029" k2="0.0627" k3="-0.0232"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1029" k2="0.0627" k3="-0.0232"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1142" k2="0.0827" k3="-0.0331"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1142" k2="0.0827" k3="-0.0331"/>
++            <vignetting model="pa" focal="55" aperture="40" distance="10" k1="-0.1198" k2="0.0906" k3="-0.0350"/>
++            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.1198" k2="0.0906" k3="-0.0350"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Pentax</maker>
+-	    <model>smc PENTAX-DA 18-55mm f/3.5-5.6 AL</model>
+-	    <focal min="18" max="55" />
+-	    <aperture min="3.5" max="40" />
+-	    <mount>Pentax KAF2</mount>
+-	    <cropfactor>1.5</cropfactor>
+-	    <calibration>
+-	        <distortion focal="18" model="ptlens" a="0.00606571" b="-0.0251409" c="-0.00216764" />
+-	        <distortion focal="24" model="ptlens" a="0.00100173" b="-0.0115495" c="0.00286152" />
+-	        <distortion focal="35" model="ptlens" a="-8.27771e-05" b="0.000563308" c="-0.000657665" />
+-	        <distortion focal="45" model="ptlens" a="0.00340219" b="-0.0072762" c="0.00763624" />
+-	        <distortion focal="55" model="ptlens" a="-0.000442312" b="0.00460551" c="-0.00158524" />
+-            <tca model="poly3" focal="18" br="-0.0000871" vr="1.0004828" bb="-0.0000263" vb="1.0001433" />
+-            <tca model="poly3" focal="24" br="-0.0000122" vr="1.0002181" bb="0.0000383" vb="1.0002671" />
+-            <tca model="poly3" focal="35" br="-0.0000093" vr="1.0001056" bb="-0.0000299" vb="1.0001859" />
+-            <tca model="poly3" focal="43" br="-0.0000113" vr="1.0001417" bb="0.0000241" vb="1.0000489" />
+-            <tca model="poly3" focal="55" br="-0.0000059" vr="1.0000907" bb="0.0000077" vb="0.9999907" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.25" k1="-0.1755" k2="-1.3129" k3="0.8855" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.6" k1="-0.1680" k2="-1.2909" k3="0.8623" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="2" k1="-0.1445" k2="-1.3289" k3="0.8829" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.1762" k2="-1.2707" k3="0.8516" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.25" k1="-0.1983" k2="-1.1895" k3="0.7927" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.6" k1="-0.2207" k2="-1.1489" k3="0.7757" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="2" k1="-0.1777" k2="-1.2306" k3="0.8204" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.1999" k2="-1.1911" k3="0.8012" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="0.0765" k2="-1.2574" k3="0.6296" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.6" k1="0.0549" k2="-1.2017" k3="0.5965" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="2" k1="0.0937" k2="-1.2993" k3="0.6556" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="0.0835" k2="-1.2746" k3="0.6417" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.1519" k2="-0.1340" k3="-0.2433" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.6" k1="-0.1737" k2="-0.0777" k3="-0.2721" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="2" k1="-0.1367" k2="-0.1557" k3="-0.2318" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1785" k2="-0.0474" k3="-0.2986" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.3873" k2="0.5175" k3="-0.4627" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.6" k1="-0.3598" k2="0.3691" k3="-0.3191" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="2" k1="-0.3429" k2="0.3929" k3="-0.3669" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3412" k2="0.3591" k3="-0.3262" />
+-            <vignetting model="pa" focal="23" aperture="4" distance="0.25" k1="-0.1083" k2="-1.3195" k3="0.8777" />
+-            <vignetting model="pa" focal="23" aperture="4" distance="1000" k1="-0.1056" k2="-1.3090" k3="0.8674" />
+-            <vignetting model="pa" focal="23" aperture="5.6" distance="0.25" k1="-0.0110" k2="-0.7515" k3="0.3394" />
+-            <vignetting model="pa" focal="23" aperture="5.6" distance="1000" k1="0.0358" k2="-0.7844" k3="0.3455" />
+-            <vignetting model="pa" focal="23" aperture="8" distance="0.25" k1="-0.2591" k2="0.2727" k3="-0.3404" />
+-            <vignetting model="pa" focal="23" aperture="8" distance="1000" k1="-0.2153" k2="0.2378" k3="-0.3224" />
+-            <vignetting model="pa" focal="23" aperture="11" distance="0.25" k1="-0.2709" k2="0.2130" k3="-0.1650" />
+-            <vignetting model="pa" focal="23" aperture="11" distance="1000" k1="-0.2061" k2="0.1046" k3="-0.0996" />
+-            <vignetting model="pa" focal="23" aperture="29" distance="0.25" k1="-0.2345" k2="0.0523" k3="-0.0149" />
+-            <vignetting model="pa" focal="23" aperture="29" distance="1000" k1="-0.1561" k2="-0.0728" k3="0.0550" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.25" k1="-0.2093" k2="-1.1201" k3="0.7655" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.6" k1="-0.0825" k2="-1.3539" k3="0.8954" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="2" k1="-0.0815" k2="-1.3603" k3="0.8991" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.1671" k2="-1.2042" k3="0.8109" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="0.25" k1="-0.0120" k2="-0.6761" k3="0.2803" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="0.6" k1="0.0309" k2="-0.7681" k3="0.3355" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="2" k1="0.0579" k2="-0.8066" k3="0.3529" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.0097" k2="-0.6238" k3="0.2363" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.25" k1="-0.2157" k2="0.1804" k3="-0.2651" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.6" k1="-0.2366" k2="0.2562" k3="-0.3137" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="2" k1="-0.1931" k2="0.1963" k3="-0.2894" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2442" k2="0.2699" k3="-0.3237" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="0.25" k1="-0.1979" k2="0.0165" k3="-0.0209" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="0.6" k1="-0.2233" k2="0.1219" k3="-0.1012" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="2" k1="-0.1950" k2="0.0846" k3="-0.0867" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2016" k2="0.0442" k3="-0.0524" />
+-            <vignetting model="pa" focal="24" aperture="29" distance="0.25" k1="-0.1734" k2="-0.0851" k3="0.0692" />
+-            <vignetting model="pa" focal="24" aperture="29" distance="0.6" k1="-0.1834" k2="-0.0331" k3="0.0361" />
+-            <vignetting model="pa" focal="24" aperture="29" distance="2" k1="-0.1558" k2="-0.0687" k3="0.0529" />
+-            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.1658" k2="-0.0980" k3="0.0768" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="0.25" k1="-0.6412" k2="0.3774" k3="-0.1775" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="0.6" k1="-0.6045" k2="0.3120" k3="-0.1406" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="2" k1="-0.6122" k2="0.3215" k3="-0.1467" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.6298" k2="0.3768" k3="-0.1810" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.25" k1="-0.3149" k2="-0.1624" k3="0.1100" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.6" k1="-0.3071" k2="-0.1822" k3="0.1225" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="2" k1="-0.2825" k2="-0.2233" k3="0.1441" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2159" k2="-0.3123" k3="0.1960" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.25" k1="-0.0911" k2="0.0007" k3="-0.0396" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.6" k1="-0.0607" k2="-0.0467" k3="-0.0089" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="2" k1="-0.0670" k2="-0.0315" k3="-0.0141" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.0720" k2="-0.0183" k3="-0.0294" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.25" k1="-0.1209" k2="0.0327" k3="-0.0185" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="0.6" k1="-0.0763" k2="-0.0448" k3="0.0288" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="2" k1="-0.0855" k2="-0.0227" k3="0.0154" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.0834" k2="-0.0231" k3="0.0149" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="0.25" k1="-0.1378" k2="0.0655" k3="-0.0360" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="0.6" k1="-0.1071" k2="0.0188" k3="-0.0079" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="2" k1="-0.1055" k2="0.0134" k3="-0.0044" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1010" k2="0.0103" k3="-0.0032" />
+-            <vignetting model="pa" focal="45" aperture="4.5" distance="0.25" k1="-0.6527" k2="0.4378" k3="-0.1586" />
+-            <vignetting model="pa" focal="45" aperture="4.5" distance="0.6" k1="-0.6557" k2="0.4443" k3="-0.1603" />
+-            <vignetting model="pa" focal="45" aperture="4.5" distance="2" k1="-0.6573" k2="0.4517" k3="-0.1669" />
+-            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.6473" k2="0.4314" k3="-0.1548" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="0.25" k1="-0.6671" k2="0.4701" k3="-0.1797" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="0.6" k1="-0.6395" k2="0.4145" k3="-0.1436" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="2" k1="-0.6592" k2="0.4504" k3="-0.1642" />
+-            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.6589" k2="0.4587" k3="-0.1722" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="0.25" k1="0.0410" k2="-0.6839" k3="0.4004" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="0.6" k1="0.0515" k2="-0.7218" k3="0.4303" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="2" k1="0.0541" k2="-0.7041" k3="0.4121" />
+-            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="0.0404" k2="-0.6814" k3="0.4027" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="0.25" k1="-0.0735" k2="0.0172" k3="-0.0354" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="0.6" k1="-0.0648" k2="0.0113" k3="-0.0349" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="2" k1="-0.0679" k2="0.0085" k3="-0.0275" />
+-            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.0634" k2="0.0019" k3="-0.0242" />
+-            <vignetting model="pa" focal="45" aperture="32" distance="0.25" k1="-0.0777" k2="-0.0037" k3="-0.0006" />
+-            <vignetting model="pa" focal="45" aperture="32" distance="0.6" k1="-0.0579" k2="-0.0349" k3="0.0201" />
+-            <vignetting model="pa" focal="45" aperture="32" distance="2" k1="-0.0611" k2="-0.0232" k3="0.0112" />
+-            <vignetting model="pa" focal="45" aperture="32" distance="1000" k1="-0.0634" k2="-0.0223" k3="0.0120" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="0.25" k1="-0.6061" k2="0.3914" k3="-0.1375" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="0.6" k1="-0.6044" k2="0.3888" k3="-0.1360" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="2" k1="-0.6040" k2="0.3870" k3="-0.1338" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6206" k2="0.4281" k3="-0.1610" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="0.25" k1="-0.1431" k2="-0.4677" k3="0.3375" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="0.6" k1="-0.1116" k2="-0.5205" k3="0.3666" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="2" k1="-0.1104" k2="-0.5172" k3="0.3621" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1133" k2="-0.5112" k3="0.3579" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="0.25" k1="-0.0663" k2="0.0402" k3="-0.0837" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="0.6" k1="-0.0440" k2="0.0033" k3="-0.0590" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="2" k1="-0.0486" k2="0.0093" k3="-0.0599" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0589" k2="0.0334" k3="-0.0722" />
+-            <vignetting model="pa" focal="55" aperture="16" distance="0.25" k1="-0.0495" k2="-0.0346" k3="0.0184" />
+-            <vignetting model="pa" focal="55" aperture="16" distance="0.6" k1="-0.0344" k2="-0.0638" k3="0.0393" />
+-            <vignetting model="pa" focal="55" aperture="16" distance="2" k1="-0.0391" k2="-0.0528" k3="0.0325" />
+-            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.0362" k2="-0.0538" k3="0.0282" />
+-            <vignetting model="pa" focal="55" aperture="40" distance="0.25" k1="-0.0696" k2="0.0006" k3="0.0005" />
+-            <vignetting model="pa" focal="55" aperture="40" distance="0.6" k1="-0.0487" k2="-0.0344" k3="0.0193" />
+-            <vignetting model="pa" focal="55" aperture="40" distance="2" k1="-0.0544" k2="-0.0287" k3="0.0192" />
+-            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.0620" k2="-0.0024" k3="-0.0017" />
+-	        <field_of_view focal="18" fov="67.3129" />
+-	        <field_of_view focal="24" fov="53.0718" />
+-	        <field_of_view focal="35" fov="37.8046" />
+-	        <field_of_view focal="45" fov="30.0391" />
+-	        <field_of_view focal="55" fov="24.731" />
+-	    </calibration>
++        <maker>Pentax</maker>
++        <!-- FixMe: The following is an artificial compound name.  It should be
++             refactored in aliases.  The optical equivalence is documented on
++             <http://en.wikipedia.org/wiki/Pentax_DA_18-55mm_lens>. -->
++        <model>smc Pentax-DA 18-55mm f/3.5-5.6 AL II L WR</model>
++        <model lang="en">smc Pentax-DA 18-55mm f/3.5-5.6 AL II/L/WR</model>
++        <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="18" a="0.01335" b="-0.04723" c="0.02086"/>
++            <distortion model="ptlens" focal="23.1" a="0.00661" b="-0.02435" c="0.01004"/>
++            <distortion model="ptlens" focal="28.1" a="0.00284" b="-0.00551" c="-0.0061"/>
++            <distortion model="ptlens" focal="37.5" a="-0.00268" b="0.00861" c="-0.00565"/>
++            <distortion model="ptlens" focal="42.5" a="0.00025" b="0.00247" c="-0.00182"/>
++            <distortion model="ptlens" focal="55" a="0.00071" b="0.00057" c="0.00481"/>
++            <tca model="poly3" focal="18" br="-0.0001755" vr="1.0009435" bb="0.0001675" vb="0.9998249"/>
++            <tca model="poly3" focal="23.1" br="-0.0000950" vr="1.0006570" bb="0.0001151" vb="0.9999357"/>
++            <tca model="poly3" focal="26.2" br="-0.0000496" vr="1.0003769" bb="0.0000072" vb="1.0000781"/>
++            <tca model="poly3" focal="28.1" br="-0.0000057" vr="1.0003676" bb="0.0000552" vb="1.0000001"/>
++            <tca model="poly3" focal="32.5" br="0.0000248" vr="1.0002094" bb="-0.0000015" vb="1.0000721"/>
++            <tca model="poly3" focal="37.5" br="0.0000312" vr="1.0001768" bb="-0.0000128" vb="0.9999995"/>
++            <tca model="poly3" focal="42.5" br="0.0000284" vr="1.0001411" bb="-0.0000171" vb="0.9999667"/>
++            <tca model="poly3" focal="55" br="-0.0000088" vr="1.0001134" bb="0.0000106" vb="0.9999101"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.25" k1="-0.5281" k2="-0.5422" k3="0.4168"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4609" k2="-0.7272" k3="0.5617"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2056" k2="-0.9233" k3="0.5627"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2056" k2="-0.9233" k3="0.5627"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="0.25" k1="-0.2576" k2="-0.5723" k3="0.2665"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2809" k2="-0.2994" k3="0.0404"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2809" k2="-0.2994" k3="0.0404"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="0.25" k1="-0.4691" k2="0.3354" k3="-0.3851"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.4828" k2="0.4576" k3="-0.4579"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4828" k2="0.4576" k3="-0.4579"/>
++            <vignetting model="pa" focal="18" aperture="10" distance="0.25" k1="-0.5710" k2="0.6335" k3="-0.5060"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.4740" k2="0.1812" k3="-0.0413"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4238" k2="0.0931" k3="0.0117"/>
++            <vignetting model="pa" focal="24.4" aperture="4" distance="0.25" k1="-0.3716" k2="-0.7308" k3="0.5379"/>
++            <vignetting model="pa" focal="24.4" aperture="4" distance="1000" k1="-0.3282" k2="-0.8336" k3="0.6009"/>
++            <vignetting model="pa" focal="24.4" aperture="5.6" distance="0.25" k1="-0.3151" k2="0.1493" k3="-0.1858"/>
++            <vignetting model="pa" focal="24.4" aperture="5.6" distance="1000" k1="-0.2824" k2="0.0834" k3="-0.1526"/>
++            <vignetting model="pa" focal="24.4" aperture="7.1" distance="10" k1="-0.3295" k2="0.2088" k3="-0.1640"/>
++            <vignetting model="pa" focal="24.4" aperture="7.1" distance="1000" k1="-0.3295" k2="0.2088" k3="-0.1640"/>
++            <vignetting model="pa" focal="24.4" aperture="8" distance="0.25" k1="-0.3386" k2="0.1627" k3="-0.0775"/>
++            <vignetting model="pa" focal="24.4" aperture="9" distance="10" k1="-0.2816" k2="0.0108" k3="0.0353"/>
++            <vignetting model="pa" focal="24.4" aperture="9" distance="1000" k1="-0.2816" k2="0.0108" k3="0.0353"/>
++            <vignetting model="pa" focal="24.4" aperture="11" distance="0.25" k1="-0.3184" k2="0.0826" k3="-0.0034"/>
++            <vignetting model="pa" focal="24.4" aperture="13" distance="10" k1="-0.2776" k2="-0.0099" k3="0.0554"/>
++            <vignetting model="pa" focal="24.4" aperture="13" distance="1000" k1="-0.2776" k2="-0.0099" k3="0.0554"/>
++            <vignetting model="pa" focal="24.4" aperture="22" distance="10" k1="-0.2868" k2="0.0077" k3="0.0452"/>
++            <vignetting model="pa" focal="24.4" aperture="22" distance="1000" k1="-0.2868" k2="0.0077" k3="0.0452"/>
++            <vignetting model="pa" focal="24.4" aperture="29" distance="0.25" k1="-0.3367" k2="0.1198" k3="-0.0267"/>
++            <vignetting model="pa" focal="24.4" aperture="29" distance="1000" k1="-0.2755" k2="0.0089" k3="0.0409"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="0.25" k1="-0.8683" k2="0.8449" k3="-0.4290"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8083" k2="0.7058" k3="-0.3560"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="0.25" k1="-0.1840" k2="0.0280" k3="-0.0638"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1620" k2="-0.0033" k3="-0.0406"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1710" k2="-0.0044" k3="0.0292"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1710" k2="-0.0044" k3="0.0292"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="0.25" k1="-0.2228" k2="0.1188" k3="-0.0436"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.1678" k2="-0.0095" k3="0.0323"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.1678" k2="-0.0095" k3="0.0323"/>
++            <vignetting model="pa" focal="35" aperture="13" distance="0.25" k1="-0.2337" k2="0.1526" k3="-0.0683"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="0.25" k1="-0.2843" k2="0.2684" k3="-0.1417"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2018" k2="0.0702" k3="-0.0174"/>
++            <vignetting model="pa" focal="47.5" aperture="5.6" distance="0.25" k1="-0.7973" k2="0.6968" k3="-0.2860"/>
++            <vignetting model="pa" focal="47.5" aperture="8" distance="0.25" k1="-0.1196" k2="-0.0810" k3="-0.0139"/>
++            <vignetting model="pa" focal="47.5" aperture="9" distance="0.25" k1="-0.1910" k2="0.1532" k3="-0.1149"/>
++            <vignetting model="pa" focal="47.5" aperture="11" distance="0.25" k1="-0.1745" k2="0.0635" k3="-0.0075"/>
++            <vignetting model="pa" focal="47.5" aperture="16" distance="0.25" k1="-0.1837" k2="0.0723" k3="-0.0059"/>
++            <vignetting model="pa" focal="47.5" aperture="32" distance="10" k1="-0.1783" k2="0.1006" k3="-0.0421"/>
++            <vignetting model="pa" focal="47.5" aperture="32" distance="1000" k1="-0.1783" k2="0.1006" k3="-0.0421"/>
++            <vignetting model="pa" focal="47.5" aperture="40" distance="0.25" k1="-0.2496" k2="0.2218" k3="-0.0956"/>
++            <vignetting model="pa" focal="47.5" aperture="40" distance="1000" k1="-0.1828" k2="0.1129" k3="-0.0506"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="0.25" k1="-0.6843" k2="0.4937" k3="-0.1732"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6731" k2="0.4889" k3="-0.1775"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="0.25" k1="-0.0285" k2="-0.5030" k3="0.2810"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0107" k2="-0.4980" k3="0.2650"/>
++            <vignetting model="pa" focal="55" aperture="10" distance="0.25" k1="-0.1616" k2="0.1161" k3="-0.1142"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1306" k2="0.0466" k3="-0.0324"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1306" k2="0.0466" k3="-0.0324"/>
++            <vignetting model="pa" focal="55" aperture="13" distance="0.25" k1="-0.1488" k2="0.0273" k3="0.0133"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="0.25" k1="-0.1449" k2="0.0118" k3="0.0245"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1099" k2="-0.0250" k3="0.0301"/>
++            <vignetting model="pa" focal="55" aperture="40" distance="0.25" k1="-0.2083" k2="0.1109" k3="-0.0162"/>
++            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.1585" k2="0.0524" k3="0.0008"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>PENTAX</maker>
+-        <model>smc PENTAX-DA 18-55mm f/3.5-5.6 AL WR</model>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 18-135mm f/3.5-5.6 ED AL IF DC WR</model>
++        <model lang="en">smc PENTAX-DA 18-135mm f/3.5-5.6 ED AL IF DC WR</model>
++        <mount>Pentax K</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Distortion only: taken with Pentax K-30 -->
++            <!-- c param manually adjusted for better correction -->
++            <distortion model="ptlens" focal="18" a="0.02393" b="-0.05763" c="0.00100"/>
++            <distortion model="ptlens" focal="21" a="0.01763" b="-0.05222" c="0.03794"/>
++            <distortion model="ptlens" focal="28" a="0.01089" b="-0.02102" c="0.01433"/>
++            <distortion model="ptlens" focal="36" a="-0.00227" b="0.02123" c="-0.01979"/>
++            <distortion model="ptlens" focal="60" a="0.00341" b="0.00207" c="-0.0044"/>
++            <distortion model="ptlens" focal="115" a="0.00593" b="-0.02413" c="0.04608"/>
++            <distortion model="ptlens" focal="135" a="-0.00175" b="0.0149" c="-0.01197"/>
++            <tca model="poly3" focal="18" br="0.0001" vr="1.00017" bb="0.00005" vb="1.00048"/>
++            <tca model="poly3" focal="24" br="0.000" vr="1.00013" bb="0.0001" vb="1.000223"/>
++            <tca model="poly3" focal="36" br="-0.000019" vr="1.00003" bb="-0.00005" vb="1.00023"/>
++            <tca model="poly3" focal="53" br="0.0000" vr="0.9999" bb="-0.00005" vb="1.0001"/>
++            <tca model="poly3" focal="68" br="0.000" vr="0.9998" bb="-0.00005" vb="1.0000"/>
++            <tca model="poly3" focal="100" br="-0.00015" vr="0.99955" bb="-0.00005" vb="0.99996"/>
++            <tca model="poly3" focal="135" br="-0.0004" vr="0.9994" bb="-0.00007" vb="0.99991"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.0932" k2="0.02721" k3="-0.0432"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.12861" k2="0.09689" k3="-0.05551"/>
++            <vignetting model="pa" focal="36" aperture="11" distance="1000" k1="-0.14874" k2="0.19321" k3="-0.12757"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.05186" k2="-0.06742" k3="0.05663"/>
++            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.11324" k2="0.21297" k3="-0.19382"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.10339" k2="0.24899" k3="-0.28571"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.16882" k2="0.35516" k3="-0.28791"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 18-250mm f/3.5-6.3 ED AL [IF]</model>
++        <!-- This lens is a clone of the Tamron 18-250 with identical specs -->
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.01335" b="-0.04723" c="0.02086" />
+-            <distortion model="ptlens" focal="23.1" a="0.00661" b="-0.02435" c="0.01004" />
+-            <distortion model="ptlens" focal="28.1" a="0.00284" b="-0.00551" c="-0.0061" />
+-            <distortion model="ptlens" focal="37.5" a="-0.00268" b="0.00861" c="-0.00565" />
+-            <distortion model="ptlens" focal="42.5" a="0.00025" b="0.00247" c="-0.00182" />
+-            <distortion model="ptlens" focal="55" a="0.00071" b="0.00057" c="0.00481" />
+-            <tca model="poly3" focal="18" br="-0.0001372" vr="1.0007557" bb="0.0000782" vb="0.9999286" />
+-            <tca model="poly3" focal="18" br="-0.0001440" vr="1.0007660" bb="0.0000880" vb="0.9999157" />
+-            <tca model="poly3" focal="18" br="-0.0001506" vr="1.0009070" bb="0.0001677" vb="0.9998234" />
+-            <tca model="poly3" focal="18" br="-0.0001750" vr="1.0008773" bb="0.0001118" vb="0.9998886" />
+-            <tca model="poly3" focal="18" br="-0.0001755" vr="1.0009435" bb="0.0001675" vb="0.9998249" />
+-            <tca model="poly3" focal="23.1" br="-0.0000913" vr="1.0006518" bb="0.0001042" vb="0.9999483" />
+-            <tca model="poly3" focal="23.1" br="-0.0000950" vr="1.0006570" bb="0.0001151" vb="0.9999357" />
+-            <tca model="poly3" focal="26.2" br="-0.0000496" vr="1.0003769" bb="0.0000072" vb="1.0000781" />
+-            <tca model="poly3" focal="28.1" br="-0.0000057" vr="1.0003676" bb="0.0000552" vb="1.0000001" />
+-            <tca model="poly3" focal="32.5" br="0.0000248" vr="1.0002094" bb="-0.0000015" vb="1.0000721" />
+-            <tca model="poly3" focal="37.5" br="0.0000312" vr="1.0001768" bb="-0.0000128" vb="0.9999995" />
+-            <tca model="poly3" focal="42.5" br="0.0000237" vr="1.0001103" bb="-0.0000313" vb="1.0000069" />
+-            <tca model="poly3" focal="42.5" br="0.0000284" vr="1.0001411" bb="-0.0000171" vb="0.9999667" />
+-            <tca model="poly3" focal="55" br="-0.0000088" vr="1.0001134" bb="0.0000106" vb="0.9999101" />
+-            <tca model="poly3" focal="55" br="-0.0000114" vr="1.0001156" bb="0.0000172" vb="0.9999106" />
+-            <tca model="poly3" focal="55" br="0.0000193" vr="1.0001092" bb="-0.0000000" vb="0.9998871" />
+-            <tca model="poly3" focal="55" br="0.0000317" vr="1.0000958" bb="0.0000118" vb="0.9998816" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.25" k1="-0.5281" k2="-0.5422" k3="0.4168" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4609" k2="-0.7272" k3="0.5617" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2056" k2="-0.9233" k3="0.5627" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2056" k2="-0.9233" k3="0.5627" />
+-            <vignetting model="pa" focal="18" aperture="5" distance="0.25" k1="-0.2576" k2="-0.5723" k3="0.2665" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2809" k2="-0.2994" k3="0.0404" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2809" k2="-0.2994" k3="0.0404" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="0.25" k1="-0.4691" k2="0.3354" k3="-0.3851" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.4828" k2="0.4576" k3="-0.4579" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4828" k2="0.4576" k3="-0.4579" />
+-            <vignetting model="pa" focal="18" aperture="10" distance="0.25" k1="-0.5710" k2="0.6335" k3="-0.5060" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.4740" k2="0.1812" k3="-0.0413" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4238" k2="0.0931" k3="0.0117" />
+-            <vignetting model="pa" focal="24.4" aperture="4" distance="0.25" k1="-0.3716" k2="-0.7308" k3="0.5379" />
+-            <vignetting model="pa" focal="24.4" aperture="4" distance="1000" k1="-0.3282" k2="-0.8336" k3="0.6009" />
+-            <vignetting model="pa" focal="24.4" aperture="5.6" distance="0.25" k1="-0.3151" k2="0.1493" k3="-0.1858" />
+-            <vignetting model="pa" focal="24.4" aperture="5.6" distance="1000" k1="-0.2824" k2="0.0834" k3="-0.1526" />
+-            <vignetting model="pa" focal="24.4" aperture="7.1" distance="10" k1="-0.3295" k2="0.2088" k3="-0.1640" />
+-            <vignetting model="pa" focal="24.4" aperture="7.1" distance="1000" k1="-0.3295" k2="0.2088" k3="-0.1640" />
+-            <vignetting model="pa" focal="24.4" aperture="8" distance="0.25" k1="-0.3386" k2="0.1627" k3="-0.0775" />
+-            <vignetting model="pa" focal="24.4" aperture="9" distance="10" k1="-0.2816" k2="0.0108" k3="0.0353" />
+-            <vignetting model="pa" focal="24.4" aperture="9" distance="1000" k1="-0.2816" k2="0.0108" k3="0.0353" />
+-            <vignetting model="pa" focal="24.4" aperture="11" distance="0.25" k1="-0.3184" k2="0.0826" k3="-0.0034" />
+-            <vignetting model="pa" focal="24.4" aperture="13" distance="10" k1="-0.2776" k2="-0.0099" k3="0.0554" />
+-            <vignetting model="pa" focal="24.4" aperture="13" distance="1000" k1="-0.2776" k2="-0.0099" k3="0.0554" />
+-            <vignetting model="pa" focal="24.4" aperture="22" distance="10" k1="-0.2868" k2="0.0077" k3="0.0452" />
+-            <vignetting model="pa" focal="24.4" aperture="22" distance="1000" k1="-0.2868" k2="0.0077" k3="0.0452" />
+-            <vignetting model="pa" focal="24.4" aperture="29" distance="0.25" k1="-0.3367" k2="0.1198" k3="-0.0267" />
+-            <vignetting model="pa" focal="24.4" aperture="29" distance="1000" k1="-0.2755" k2="0.0089" k3="0.0409" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="0.25" k1="-0.8683" k2="0.8449" k3="-0.4290" />
+-            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8083" k2="0.7058" k3="-0.3560" />
+-            <vignetting model="pa" focal="35" aperture="6.3" distance="0.25" k1="-0.1840" k2="0.0280" k3="-0.0638" />
+-            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1620" k2="-0.0033" k3="-0.0406" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1710" k2="-0.0044" k3="0.0292" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1710" k2="-0.0044" k3="0.0292" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="0.25" k1="-0.2228" k2="0.1188" k3="-0.0436" />
+-            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.1678" k2="-0.0095" k3="0.0323" />
+-            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.1678" k2="-0.0095" k3="0.0323" />
+-            <vignetting model="pa" focal="35" aperture="13" distance="0.25" k1="-0.2337" k2="0.1526" k3="-0.0683" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="0.25" k1="-0.2843" k2="0.2684" k3="-0.1417" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2018" k2="0.0702" k3="-0.0174" />
+-            <vignetting model="pa" focal="47.5" aperture="5.6" distance="0.25" k1="-0.7973" k2="0.6968" k3="-0.2860" />
+-            <vignetting model="pa" focal="47.5" aperture="8" distance="0.25" k1="-0.1196" k2="-0.0810" k3="-0.0139" />
+-            <vignetting model="pa" focal="47.5" aperture="9" distance="0.25" k1="-0.1910" k2="0.1532" k3="-0.1149" />
+-            <vignetting model="pa" focal="47.5" aperture="11" distance="0.25" k1="-0.1745" k2="0.0635" k3="-0.0075" />
+-            <vignetting model="pa" focal="47.5" aperture="16" distance="0.25" k1="-0.1837" k2="0.0723" k3="-0.0059" />
+-            <vignetting model="pa" focal="47.5" aperture="32" distance="10" k1="-0.1783" k2="0.1006" k3="-0.0421" />
+-            <vignetting model="pa" focal="47.5" aperture="32" distance="1000" k1="-0.1783" k2="0.1006" k3="-0.0421" />
+-            <vignetting model="pa" focal="47.5" aperture="40" distance="0.25" k1="-0.2496" k2="0.2218" k3="-0.0956" />
+-            <vignetting model="pa" focal="47.5" aperture="40" distance="1000" k1="-0.1828" k2="0.1129" k3="-0.0506" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="0.25" k1="-0.6843" k2="0.4937" k3="-0.1732" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6731" k2="0.4889" k3="-0.1775" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="0.25" k1="-0.0285" k2="-0.5030" k3="0.2810" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0107" k2="-0.4980" k3="0.2650" />
+-            <vignetting model="pa" focal="55" aperture="10" distance="0.25" k1="-0.1616" k2="0.1161" k3="-0.1142" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1306" k2="0.0466" k3="-0.0324" />
+-            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1306" k2="0.0466" k3="-0.0324" />
+-            <vignetting model="pa" focal="55" aperture="13" distance="0.25" k1="-0.1488" k2="0.0273" k3="0.0133" />
+-            <vignetting model="pa" focal="55" aperture="16" distance="0.25" k1="-0.1449" k2="0.0118" k3="0.0245" />
+-            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1099" k2="-0.0250" k3="0.0301" />
+-            <vignetting model="pa" focal="55" aperture="40" distance="0.25" k1="-0.2083" k2="0.1109" k3="-0.0162" />
+-            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.1585" k2="0.0524" k3="0.0008" />
++            <distortion model="ptlens" focal="18" a="0.020360" b="-0.059050" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.020770" b="-0.052400" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.016230" b="-0.032540" c="0"/>
++            <distortion model="ptlens" focal="29" a="0.012160" b="-0.015480" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.037550" c="-0"/>
++            <distortion model="ptlens" focal="47" a="0" b="0.033220" c="-0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.017510" c="-0.014350"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.018700" c="-0.018810"/>
++            <distortion model="ptlens" focal="120" a="0" b="0.018400" c="-0.019970"/>
++            <distortion model="ptlens" focal="155" a="0" b="0.009580" c="-0.002450"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.001230" c="0.013960"/>
++            <distortion model="ptlens" focal="250" a="0" b="-0.000110" c="0.008560"/>
++            <tca model="poly3" focal="18" br="0.0000455" cr="0.0001324" vr="1.0003247" bb="-0.0002737" cb="0.0006098" vb="1.0000266"/>
++            <tca model="poly3" focal="23.1" br="-0.0000830" cr="0.0002635" vr="1.0002333" bb="-0.0001797" cb="0.0007033" vb="0.9999820"/>
++            <tca model="poly3" focal="26.9" br="-0.0003871" cr="0.0008622" vr="0.9999533" bb="-0.0001398" cb="0.0006987" vb="0.9999226"/>
++            <tca model="poly3" focal="29.4" br="-0.0003218" cr="0.0007089" vr="0.9999775" bb="0.0001630" cb="-0.0000255" vb="1.0003434"/>
++            <tca model="poly3" focal="35" br="-0.0001337" cr="0.0002671" vr="1.0000620" bb="-0.0000737" cb="0.0004179" vb="1.0001761"/>
++            <tca model="poly3" focal="55" br="-0.0000006" cr="-0.0000747" vr="1.0000795" bb="-0.0000202" cb="0.0002275" vb="1.0002342"/>
++            <tca model="poly3" focal="70" br="-0.0000020" cr="-0.0000449" vr="0.9999473" bb="-0.0002686" cb="0.0006367" vb="1.0000025"/>
++            <tca model="poly3" focal="100" br="0.0000928" cr="-0.0002755" vr="0.9998440" bb="-0.0001632" cb="0.0002535" vb="1.0000525"/>
++            <tca model="poly3" focal="142.5" br="0.0001761" cr="-0.0004582" vr="0.9996290" bb="-0.0003233" cb="0.0005660" vb="0.9996693"/>
++            <tca model="poly3" focal="220" br="0.0001387" cr="-0.0004467" vr="0.9993390" bb="0.0000952" cb="-0.0001185" vb="0.9997363"/>
++            <tca model="poly3" focal="250" br="0.0005417" cr="-0.0013082" vr="0.9997014" bb="-0.0007442" cb="0.0015463" vb="0.9988026"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX DA 18-135mm f/3.5-5.6 ED AL [IF] DC WR</model>
+-        <mount>Pentax K</mount>
++        <model>Pentax-F 28-80mm f/3.5-4.5</model>
++        <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3"  focal="18" k1="-0.02615" />
+-            <distortion model="poly3"  focal="24" k1="-0.00343" />
+-            <distortion model="ptlens" focal="36" a="0.01095" b="-0.01774" c="0.01645" />
+-            <distortion model="poly3"  focal="53" k1="0.00971" />
+-            <distortion model="ptlens" focal="68" a="-0.00032" b="0.00979" c="-0.00265" />
+-            <distortion model="poly3"  focal="100" k1="0.00771" />
+-            <distortion model="poly3"  focal="135" k1="0.00701" />
+-            <tca model="poly3" focal="18" br="0.0001" vr="1.00017" bb="0.00005" vb="1.00048" />
+-            <tca model="poly3" focal="24" br="0.000" vr="1.00013" bb="0.0001" vb="1.000223" />
+-            <tca model="poly3" focal="36" br="-0.000019" vr="1.00003" bb="-0.00005" vb="1.00023" />
+-            <tca model="poly3" focal="53" br="0.0000" vr="0.9999" bb="-0.00005" vb="1.0001" />
+-            <tca model="poly3" focal="68" br="0.000" vr="0.9998" bb="-0.00005" vb="1.0000" />
+-            <tca model="poly3" focal="100" br="-0.00015" vr="0.99955" bb="-0.00005" vb="0.99996" />
+-            <tca model="poly3" focal="135" br="-0.0004" vr="0.9994" bb="-0.00007" vb="0.99991" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.0932" k2="0.02721" k3="-0.0432" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.12861" k2="0.09689" k3="-0.05551" />
+-            <vignetting model="pa" focal="36" aperture="11" distance="1000" k1="-0.14874" k2="0.19321" k3="-0.12757" />
+-            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.05186" k2="-0.06742" k3="0.05663" />
+-            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.11324" k2="0.21297" k3="-0.19382" />
+-            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.10339" k2="0.24899" k3="-0.28571" />
+-            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.16882" k2="0.35516" k3="-0.28791" />
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="ptlens" focal="28" a="0.00103457" b="-0.0104385" c="-0.00251646"/>
++            <distortion model="ptlens" focal="36" a="-0.00951146" b="0.0384678" c="-0.0644029"/>
++            <distortion model="ptlens" focal="50" a="0.000214314" b="0.00652746" c="-0.0189032"/>
++            <distortion model="ptlens" focal="68" a="-0.00808015" b="0.0359238" c="-0.052148"/>
++            <distortion model="ptlens" focal="80" a="-0.0033906" b="0.0165939" c="-0.0253379"/>
++            <tca model="poly3" focal="28" br="0.0000000" vr="1.0003470" bb="0.0000514" vb="1.0000402"/>
++            <tca model="poly3" focal="36" br="0.0000153" vr="1.0002037" bb="0.0000424" vb="1.0000780"/>
++            <tca model="poly3" focal="50" br="-0.0000103" vr="1.0001007" bb="0.0000085" vb="1.0001358"/>
++            <tca model="poly3" focal="68" br="-0.0000330" vr="1.0001177" bb="-0.0000271" vb="1.0001116"/>
++            <tca model="poly3" focal="80" br="-0.0000109" vr="1.0000879" bb="-0.0000033" vb="1.0000849"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC Pentax DA 50-200mm f/4-5.6 DA ED</model>
++        <model>smc Pentax-DA 50-200mm f/4-5.6 DA ED</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.004038" c="0" />
+-            <distortion model="ptlens" focal="63" a="0" b="0.001607" c="0" />
+-            <distortion model="ptlens" focal="95" a="0" b="0.007697" c="0" />
+-            <distortion model="ptlens" focal="125" a="0" b="0.007991" c="0" />
+-            <distortion model="ptlens" focal="138" a="0" b="0.008036" c="0" />
+-            <distortion model="ptlens" focal="160" a="0" b="0.007909" c="0" />
+-            <distortion model="ptlens" focal="180" a="0" b="0.009293" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.007685" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.004038"/>
++            <distortion model="poly3" focal="63" k1="0.001607"/>
++            <distortion model="poly3" focal="95" k1="0.007697"/>
++            <distortion model="poly3" focal="125" k1="0.007991"/>
++            <distortion model="poly3" focal="138" k1="0.008036"/>
++            <distortion model="poly3" focal="160" k1="0.007909"/>
++            <distortion model="poly3" focal="180" k1="0.009293"/>
++            <distortion model="poly3" focal="200" k1="0.007685"/>
++            <!-- Vignetting pictures taken with Pentax K20D -->
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.3248" k2="-0.4362" k3="0.2366"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.3248" k2="-0.4362" k3="0.2366"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.0309" k2="-0.5537" k3="0.1946"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0309" k2="-0.5537" k3="0.1946"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1649" k2="0.1234" k3="-0.0901"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1649" k2="0.1234" k3="-0.0901"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1447" k2="0.0450" k3="-0.0100"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1447" k2="0.0450" k3="-0.0100"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1432" k2="0.0458" k3="-0.0110"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1432" k2="0.0458" k3="-0.0110"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1475" k2="0.0581" k3="-0.0199"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1475" k2="0.0581" k3="-0.0199"/>
++            <vignetting model="pa" focal="80" aperture="4.5" distance="10" k1="-0.3824" k2="-0.0328" k3="0.0285"/>
++            <vignetting model="pa" focal="80" aperture="4.5" distance="1000" k1="-0.3824" k2="-0.0328" k3="0.0285"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.2982" k2="-0.1506" k3="0.0941"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.2982" k2="-0.1506" k3="0.0941"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.1328" k2="0.1286" k3="-0.1262"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.1328" k2="0.1286" k3="-0.1262"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.1183" k2="0.0474" k3="-0.0136"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.1183" k2="0.0474" k3="-0.0136"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.1181" k2="0.0538" k3="-0.0187"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.1181" k2="0.0538" k3="-0.0187"/>
++            <vignetting model="pa" focal="80" aperture="29" distance="10" k1="-0.1252" k2="0.0746" k3="-0.0325"/>
++            <vignetting model="pa" focal="80" aperture="29" distance="1000" k1="-0.1252" k2="0.0746" k3="-0.0325"/>
++            <vignetting model="pa" focal="95" aperture="4.5" distance="10" k1="-0.3324" k2="-0.0859" k3="-0.0037"/>
++            <vignetting model="pa" focal="95" aperture="4.5" distance="1000" k1="-0.3324" k2="-0.0859" k3="-0.0037"/>
++            <vignetting model="pa" focal="95" aperture="5.6" distance="10" k1="-0.3247" k2="-0.0748" k3="-0.0124"/>
++            <vignetting model="pa" focal="95" aperture="5.6" distance="1000" k1="-0.3247" k2="-0.0748" k3="-0.0124"/>
++            <vignetting model="pa" focal="95" aperture="8" distance="10" k1="-0.1183" k2="0.0992" k3="-0.0802"/>
++            <vignetting model="pa" focal="95" aperture="8" distance="1000" k1="-0.1183" k2="0.0992" k3="-0.0802"/>
++            <vignetting model="pa" focal="95" aperture="11" distance="10" k1="-0.1099" k2="0.0501" k3="-0.0152"/>
++            <vignetting model="pa" focal="95" aperture="11" distance="1000" k1="-0.1099" k2="0.0501" k3="-0.0152"/>
++            <vignetting model="pa" focal="95" aperture="16" distance="10" k1="-0.1123" k2="0.0613" k3="-0.0225"/>
++            <vignetting model="pa" focal="95" aperture="16" distance="1000" k1="-0.1123" k2="0.0613" k3="-0.0225"/>
++            <vignetting model="pa" focal="95" aperture="29" distance="10" k1="-0.1108" k2="0.0588" k3="-0.0192"/>
++            <vignetting model="pa" focal="95" aperture="29" distance="1000" k1="-0.1108" k2="0.0588" k3="-0.0192"/>
++            <vignetting model="pa" focal="138" aperture="4.5" distance="10" k1="-0.2629" k2="-0.6520" k3="0.4563"/>
++            <vignetting model="pa" focal="138" aperture="4.5" distance="1000" k1="-0.2629" k2="-0.6520" k3="0.4563"/>
++            <vignetting model="pa" focal="138" aperture="5.6" distance="10" k1="-0.2687" k2="-0.6321" k3="0.4415"/>
++            <vignetting model="pa" focal="138" aperture="5.6" distance="1000" k1="-0.2687" k2="-0.6321" k3="0.4415"/>
++            <vignetting model="pa" focal="138" aperture="8" distance="10" k1="-0.1056" k2="0.1631" k3="-0.2354"/>
++            <vignetting model="pa" focal="138" aperture="8" distance="1000" k1="-0.1056" k2="0.1631" k3="-0.2354"/>
++            <vignetting model="pa" focal="138" aperture="11" distance="10" k1="-0.0966" k2="0.0415" k3="-0.0081"/>
++            <vignetting model="pa" focal="138" aperture="11" distance="1000" k1="-0.0966" k2="0.0415" k3="-0.0081"/>
++            <vignetting model="pa" focal="138" aperture="16" distance="10" k1="-0.1000" k2="0.0559" k3="-0.0186"/>
++            <vignetting model="pa" focal="138" aperture="16" distance="1000" k1="-0.1000" k2="0.0559" k3="-0.0186"/>
++            <vignetting model="pa" focal="138" aperture="29" distance="10" k1="-0.1014" k2="0.0582" k3="-0.0171"/>
++            <vignetting model="pa" focal="138" aperture="29" distance="1000" k1="-0.1014" k2="0.0582" k3="-0.0171"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.9874" k2="0.8298" k3="-0.3319"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.9874" k2="0.8298" k3="-0.3319"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.0101" k2="-0.2621" k3="0.0531"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.0101" k2="-0.2621" k3="0.0531"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.0830" k2="0.0376" k3="-0.0069"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0830" k2="0.0376" k3="-0.0069"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.0857" k2="0.0459" k3="-0.0106"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0857" k2="0.0459" k3="-0.0106"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0787" k2="0.0275" k3="0.0014"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0787" k2="0.0275" k3="0.0014"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This is a copy of the smc Pentax-DA L 55-300mm f/4-5.8 ED below.
++             Please keep in sync. -->
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX DA 55-300mm f/4-5.8 ED</model>
++        <model>smc Pentax-DA 55-300mm f/4-5.8 ED</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824" />
+-            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127" />
+-            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643" />
+-            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078" />
+-            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102" />
+-            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349" />
+-            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061" />
+-            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017" />
+-            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925" />
+-            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750" />
+-            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342" />
+-            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492" />
++            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824"/>
++            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127"/>
++            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643"/>
++            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078"/>
++            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102"/>
++            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349"/>
++            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061"/>
++            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017"/>
++            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925"/>
++            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750"/>
++            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342"/>
++            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>PENTAX</maker>
+-        <model>smc PENTAX-DA 15mm F4 ED AL Limited</model>
++        <!-- This is a copy of the smc Pentax-DA 55-300mm f/4-5.8 ED above.
++             Please keep in sync. -->
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA L 55-300mm f/4-5.8 ED</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="15" a="0.00305" b="0.00418" c="-0.01276" />
+-            <tca model="poly3" focal="15" br="-0.0000314" vr="1.0005721" bb="0.0000869" vb="0.9999889" />
+-            <tca model="poly3" focal="15" br="-0.0000370" vr="1.0005702" bb="0.0000869" vb="0.9999918" />
+-            <tca model="poly3" focal="15" br="-0.0001275" vr="1.0006628" bb="0.0000063" vb="1.0000738" />
+-            <vignetting model="pa" focal="15" aperture="4" distance="0.18" k1="-0.5838" k2="-0.1163" k3="0.1375" />
+-            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.5817" k2="-0.4431" k3="0.3722" />
+-            <vignetting model="pa" focal="15" aperture="5.6" distance="0.18" k1="-0.4834" k2="0.3429" k3="-0.2120" />
+-            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.5629" k2="0.5126" k3="-0.3451" />
+-            <vignetting model="pa" focal="15" aperture="8" distance="0.18" k1="-0.4770" k2="0.2792" k3="-0.1004" />
+-            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.5111" k2="0.2703" k3="-0.0816" />
+-            <vignetting model="pa" focal="15" aperture="11" distance="0.18" k1="-0.4775" k2="0.2770" k3="-0.0985" />
+-            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.5117" k2="0.2676" k3="-0.0796" />
+-            <vignetting model="pa" focal="15" aperture="22" distance="0.18" k1="-0.4794" k2="0.2759" k3="-0.0990" />
+-            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.5126" k2="0.2608" k3="-0.0756" />
++            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824"/>
++            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127"/>
++            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643"/>
++            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078"/>
++            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102"/>
++            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349"/>
++            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061"/>
++            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017"/>
++            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925"/>
++            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750"/>
++            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342"/>
++            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX K 30mm f/2.8</model>
++        <model>smc Pentax-DA 15mm f/4 ED AL Limited</model>
++        <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="15" a="0.00305" b="0.00418" c="-0.01276"/>
++            <tca model="poly3" focal="15" br="-0.0000314" vr="1.0005721" bb="0.0000869" vb="0.9999889"/>
++            <tca model="poly3" focal="15" br="-0.0000370" vr="1.0005702" bb="0.0000869" vb="0.9999918"/>
++            <tca model="poly3" focal="15" br="-0.0001275" vr="1.0006628" bb="0.0000063" vb="1.0000738"/>
++            <vignetting model="pa" focal="15" aperture="4" distance="0.18" k1="-0.5838" k2="-0.1163" k3="0.1375"/>
++            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.5817" k2="-0.4431" k3="0.3722"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="0.18" k1="-0.4834" k2="0.3429" k3="-0.2120"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.5629" k2="0.5126" k3="-0.3451"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="0.18" k1="-0.4770" k2="0.2792" k3="-0.1004"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.5111" k2="0.2703" k3="-0.0816"/>
++            <vignetting model="pa" focal="15" aperture="11" distance="0.18" k1="-0.4775" k2="0.2770" k3="-0.0985"/>
++            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.5117" k2="0.2676" k3="-0.0796"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="0.18" k1="-0.4794" k2="0.2759" k3="-0.0990"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.5126" k2="0.2608" k3="-0.0756"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax K 30mm f/2.8</model>
+         <mount>Pentax K</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="30" k1="-0.00537" />
+-            <tca model="poly3" focal="30" br="0.0000083" vr="1.0002" bb="0.00008" vb="0.99976" />
+-            <vignetting model="pa" focal="30" aperture="11" distance="1000" k1="-0.36804" k2="0.318" k3="-0.18433" />
++            <distortion model="poly3" focal="30" k1="-0.00537"/>
++            <tca model="poly3" focal="30" br="0.0000083" vr="1.0002" bb="0.00008" vb="0.99976"/>
++            <vignetting model="pa" focal="30" aperture="11" distance="1000" k1="-0.36804" k2="0.318" k3="-0.18433"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX DA 40mm f/2.8 Limited</model>
++        <model>smc Pentax-DA 40mm f/2.8 Limited</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="40" k1="-0.00384" />
+-            <tca model="poly3" focal="40" br="-0.0000230" vr="1.0001421" bb="0.0000150" vb="0.9999150" />
+-            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.17248" k2="0.21247" k3="-0.13119" />
++            <distortion model="poly3" focal="40" k1="-0.00384"/>
++            <tca model="poly3" focal="40" br="-0.0000230" vr="1.0001421" bb="0.0000150" vb="0.9999150"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.17248" k2="0.21247" k3="-0.13119"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>PENTAX</maker>
+-        <model>smc PENTAX-FA 43mm f/1.9 Limited</model>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 40mm f/2.8 XS</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-1 -->
++            <distortion model="ptlens" focal="40" a="0.00084" b="0.0026" c="-0.01446"/>
++            <tca model="poly3" focal="40.0" br="-0.0000344" vr="1.0002530" bb="0.0000659" vb="0.9998578"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="10" k1="-1.6422" k2="1.4812" k3="-0.6072"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-1.6422" k2="1.4812" k3="-0.6072"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="10" k1="-0.4285" k2="-0.7416" k3="0.5401"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.4285" k2="-0.7416" k3="0.5401"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="10" k1="-0.5051" k2="0.1224" k3="-0.1631"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.5051" k2="0.1224" k3="-0.1631"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="10" k1="-0.5724" k2="0.3651" k3="-0.2500"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.5724" k2="0.3651" k3="-0.2500"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="10" k1="-0.5495" k2="0.0721" k3="0.0591"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.5495" k2="0.0721" k3="0.0591"/>
++            <vignetting model="pa" focal="40" aperture="16" distance="10" k1="-0.5480" k2="0.0905" k3="0.0287"/>
++            <vignetting model="pa" focal="40" aperture="16" distance="1000" k1="-0.5480" k2="0.0905" k3="0.0287"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="10" k1="-0.6683" k2="0.3178" k3="-0.0722"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.6683" k2="0.3178" k3="-0.0722"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-FA 43mm f/1.9 Limited</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="43" a="-0.00469" b="0.01317" c="-0" />
+-            <tca model="poly3" focal="43" br="-0.0000002" vr="1.0004216" bb="0.0000154" vb="0.9996758" />
+-            <tca model="poly3" focal="43" br="-0.0000052" vr="1.0003816" bb="0.0000293" vb="0.9997198" />
+-            <tca model="poly3" focal="43" br="-0.0000240" vr="1.0003765" bb="0.0000283" vb="0.9997431" />
+-            <tca model="poly3" focal="43" br="0.0000277" vr="1.0003967" bb="-0.0000121" vb="0.9997040" />
+-            <tca model="poly3" focal="43" br="0.0000411" vr="1.0003521" bb="0.0000012" vb="0.9996986" />
+-            <vignetting model="pa" focal="43" aperture="1.9" distance="0.45" k1="-0.6622" k2="0.4306" k3="-0.1437" />
+-            <vignetting model="pa" focal="43" aperture="1.9" distance="1000" k1="-0.8815" k2="0.7667" k3="-0.3234" />
+-            <vignetting model="pa" focal="43" aperture="2.8" distance="0.45" k1="-0.1673" k2="0.0212" k3="0.0073" />
+-            <vignetting model="pa" focal="43" aperture="2.8" distance="1000" k1="-0.2041" k2="0.0207" k3="0.0152" />
+-            <vignetting model="pa" focal="43" aperture="4" distance="0.45" k1="-0.1679" k2="0.0215" k3="0.0114" />
+-            <vignetting model="pa" focal="43" aperture="4" distance="1000" k1="-0.2129" k2="0.0349" k3="0.0118" />
+-            <vignetting model="pa" focal="43" aperture="5.6" distance="0.45" k1="-0.1754" k2="0.0408" k3="-0.0015" />
+-            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.2232" k2="0.0558" k3="-0.0010" />
+-            <vignetting model="pa" focal="43" aperture="22" distance="0.45" k1="-0.2472" k2="0.1832" k3="-0.0817" />
+-            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.2885" k2="0.1864" k3="-0.0748" />
++            <distortion model="ptlens" focal="43" a="-0.00469" b="0.01317" c="-0"/>
++            <tca model="poly3" focal="43" br="-0.0000002" vr="1.0004216" bb="0.0000154" vb="0.9996758"/>
++            <tca model="poly3" focal="43" br="-0.0000052" vr="1.0003816" bb="0.0000293" vb="0.9997198"/>
++            <tca model="poly3" focal="43" br="-0.0000240" vr="1.0003765" bb="0.0000283" vb="0.9997431"/>
++            <tca model="poly3" focal="43" br="0.0000277" vr="1.0003967" bb="-0.0000121" vb="0.9997040"/>
++            <tca model="poly3" focal="43" br="0.0000411" vr="1.0003521" bb="0.0000012" vb="0.9996986"/>
++            <vignetting model="pa" focal="43" aperture="1.9" distance="0.45" k1="-0.6622" k2="0.4306" k3="-0.1437"/>
++            <vignetting model="pa" focal="43" aperture="1.9" distance="1000" k1="-0.8815" k2="0.7667" k3="-0.3234"/>
++            <vignetting model="pa" focal="43" aperture="2.8" distance="0.45" k1="-0.1673" k2="0.0212" k3="0.0073"/>
++            <vignetting model="pa" focal="43" aperture="2.8" distance="1000" k1="-0.2041" k2="0.0207" k3="0.0152"/>
++            <vignetting model="pa" focal="43" aperture="4" distance="0.45" k1="-0.1679" k2="0.0215" k3="0.0114"/>
++            <vignetting model="pa" focal="43" aperture="4" distance="1000" k1="-0.2129" k2="0.0349" k3="0.0118"/>
++            <vignetting model="pa" focal="43" aperture="5.6" distance="0.45" k1="-0.1754" k2="0.0408" k3="-0.0015"/>
++            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.2232" k2="0.0558" k3="-0.0010"/>
++            <vignetting model="pa" focal="43" aperture="22" distance="0.45" k1="-0.2472" k2="0.1832" k3="-0.0817"/>
++            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.2885" k2="0.1864" k3="-0.0748"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+         <model>Takumar 135mm f/2.5 Bayonet</model>
+         <mount>Pentax K</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="135" k1="0.00185" />
+-            <tca model="poly3" focal="135" br="0.0000400" vr="0.999887" bb="-0.00012" vb="1.0002" />
+-            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.40098" k2="0.46402" k3="-0.26756" />
++            <distortion model="poly3" focal="135" k1="0.00185"/>
++            <tca model="poly3" focal="135" br="0.0000400" vr="0.999887" bb="-0.00012" vb="1.0002"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.40098" k2="0.46402" k3="-0.26756"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX M 50mm f/2</model>
++        <model>smc Pentax-M 50mm f/1.7</model>
+         <mount>Pentax K</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="50" k1="-0.00239" />
+-            <tca model="poly3" focal="50" br="0.0000100" vr="1.00005" bb="-0.0000100" vb="0.99974" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.30738" k2="0.29474" k3="-0.16389" />
++            <!-- Taken with Pentax K-5 II -->
++            <distortion model="ptlens" focal="50" a="0.00266415" b="-0.0099024" c="0.0120246"/>
++            <tca model="poly3" focal="50" br="-0.0000256" vr="1.0000546" bb="-0.0000066" vb="0.9999937"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>PENTAX</maker>
+-        <model>smc PENTAX-D FA Macro 100mm f/2.8 WR</model>
++        <maker>Pentax</maker>
++        <model>smc Pentax-M 50mm f/2</model>
++        <mount>Pentax K</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="50" k1="-0.00239"/>
++            <tca model="poly3" focal="50" br="0.0000100" vr="1.00005" bb="-0.0000100" vb="0.99974"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.30738" k2="0.29474" k3="-0.16389"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-D FA Macro 100mm f/2.8 WR</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="100" a="0" b="00484" c="-0.01993" />
+-            <tca model="poly3" focal="100" br="0.0000044" vr="0.9999354" bb="-0.0000404" vb="0.9997796" />
+-            <tca model="poly3" focal="100" br="0.0000051" vr="0.9999355" bb="-0.0000111" vb="0.9997510" />
+-            <tca model="poly3" focal="100" br="0.0000135" vr="0.9999237" bb="0.0000050" vb="0.9997609" />
+-            <tca model="poly3" focal="100" br="0.0000160" vr="0.9999237" bb="0.0000027" vb="0.9998788" />
+-            <tca model="poly3" focal="100" br="0.0000167" vr="0.9998977" bb="0.0000079" vb="0.9998621" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="0.3" k1="-0.0519" k2="-0.0004" k3="0.0078" />
+-            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.6568" k2="0.6101" k3="-0.2619" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="0.3" k1="-0.0530" k2="0.0032" k3="0.0058" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0160" k2="-0.4279" k3="0.2562" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="0.3" k1="-0.0558" k2="0.0059" k3="0.0055" />
+-            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0952" k2="-0.0017" k3="0.0219" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="0.3" k1="-0.0639" k2="0.0263" k3="-0.0075" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1030" k2="0.0156" k3="0.0117" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="0.3" k1="-0.0485" k2="-0.0204" k3="0.0258" />
+-            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1224" k2="0.0565" k3="-0.0130" />
++            <distortion model="ptlens" focal="100" a="0.00355" b="-0.01675" c="0.02729"/>
++            <tca model="poly3" focal="100" br="0.0000044" vr="0.9999354" bb="-0.0000404" vb="0.9997796"/>
++            <tca model="poly3" focal="100" br="0.0000051" vr="0.9999355" bb="-0.0000111" vb="0.9997510"/>
++            <tca model="poly3" focal="100" br="0.0000135" vr="0.9999237" bb="0.0000050" vb="0.9997609"/>
++            <tca model="poly3" focal="100" br="0.0000160" vr="0.9999237" bb="0.0000027" vb="0.9998788"/>
++            <tca model="poly3" focal="100" br="0.0000167" vr="0.9998977" bb="0.0000079" vb="0.9998621"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="0.3" k1="-0.0519" k2="-0.0004" k3="0.0078"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.6568" k2="0.6101" k3="-0.2619"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="0.3" k1="-0.0530" k2="0.0032" k3="0.0058"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0160" k2="-0.4279" k3="0.2562"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="0.3" k1="-0.0558" k2="0.0059" k3="0.0055"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0952" k2="-0.0017" k3="0.0219"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="0.3" k1="-0.0639" k2="0.0263" k3="-0.0075"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1030" k2="0.0156" k3="0.0117"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="0.3" k1="-0.0485" k2="-0.0204" k3="0.0258"/>
++            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1224" k2="0.0565" k3="-0.0130"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>SMC PENTAX M 150mm f/3.5</model>
++        <model>smc Pentax-M 150mm f/3.5</model>
+         <mount>Pentax K</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="150" k1="0.00133" />
+-            <tca model="poly3" focal="150" br="-0.00001" vr="0.9999" bb="-0.00005" vb="1.00007" />
+-            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.45436" k2="0.68491" k3="-0.48506" />
++            <distortion model="poly3" focal="150" k1="0.00133"/>
++            <tca model="poly3" focal="150" br="-0.00001" vr="0.9999" bb="-0.00005" vb="1.00007"/>
++            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.45436" k2="0.68491" k3="-0.48506"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>smc PENTAX-DA 35mm f/2.4 AL</model>
++        <model>smc Pentax-DA 35mm f/2.4 AL</model>
+         <mount>Pentax KAF2</mount>
+-        <!-- FixMe: Actually cropfactor 1.522 -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Pentax K-30 -->
+-            <distortion model="poly3" focal="35" k1="-0.0038" />
+-            <tca model="poly3" focal="35" vr="1.0003130" vb="0.9998969" />
++            <distortion model="poly3" focal="35" k1="-0.0038"/>
++            <!-- Taken with Pentax K-20 and a crop factor of 1.538 -->
++            <tca model="poly3" focal="35" vr="1.0003130" vb="0.9998969"/>
++            <vignetting model="pa" focal="35" aperture="2.4" distance="10" k1="-0.8061" k2="0.4347" k3="-0.1091"/>
++            <vignetting model="pa" focal="35" aperture="2.4" distance="1000" k1="-0.8061" k2="0.4347" k3="-0.1091"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4977" k2="-0.1214" k3="0.1835"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4977" k2="-0.1214" k3="0.1835"/>
++            <vignetting model="pa" focal="35" aperture="3.2" distance="10" k1="-0.2246" k2="-0.4345" k3="0.2930"/>
++            <vignetting model="pa" focal="35" aperture="3.2" distance="1000" k1="-0.2246" k2="-0.4345" k3="0.2930"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2159" k2="0.0471" k3="-0.0511"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2159" k2="0.0471" k3="-0.0511"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2181" k2="0.0344" k3="0.0057"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2181" k2="0.0344" k3="0.0057"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2257" k2="0.0476" k3="-0.0010"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2257" k2="0.0476" k3="-0.0010"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2233" k2="0.0485" k3="-0.0046"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2233" k2="0.0485" k3="-0.0046"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.2197" k2="0.0419" k3="-0.0017"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.2197" k2="0.0419" k3="-0.0017"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2166" k2="0.0363" k3="0.0025"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2166" k2="0.0363" k3="0.0025"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This is an alias of smc Pentax-DA 70mm f/2.4 Limited.  According
++             to da...@corr.eu.org, they are optically equivalent. -->
+         <maker>Pentax</maker>
+-        <model>smc PENTAX-DA* 50-135mm f/2.8 ED [IF] SDM</model>
++        <model>HD Pentax-DA 70mm f/2.4 Limited</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-70 -->
++            <distortion model="poly3" focal="70" k1="0.000985364"/>
++            <tca model="poly3" focal="70" vr="0.9997643" vb="0.9999367"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 70mm f/2.4 Limited</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-70 -->
++            <distortion model="poly3" focal="70" k1="0.000985364"/>
++            <tca model="poly3" focal="70" vr="0.9997643" vb="0.9999367"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA* 50-135mm f/2.8 ED IF SDM</model>
+         <mount>Pentax KAF2</mount>
+-        <!-- FixMe: Actually cropfactor 1.522 -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Pentax K-30 -->
+-            <distortion model="poly3" focal="50" k1="-0.00786" />
+-            <distortion model="poly3" focal="63" k1="-0.00367" />
+-            <distortion model="poly3" focal="70" k1="0.00052" />
+-            <distortion model="poly3" focal="75" k1="-0.00155" />
+-            <distortion model="poly3" focal="95" k1="0.00337" />
+-            <distortion model="poly3" focal="108" k1="0.00464" />
+-            <distortion model="poly3" focal="135" k1="0.00586" />
+-            <tca model="poly3" focal="50" vr="1.0003343" vb="0.9998633" />
+-            <tca model="poly3" focal="63" vr="1.0001639" vb="0.9999264" />
+-            <tca model="poly3" focal="70" vr="1.0000366" vb="0.9999579" />
+-            <tca model="poly3" focal="75" vr="1.0000653" vb="0.9999403" />
+-            <tca model="poly3" focal="95" vr="0.9999718" vb="0.9998939" />
+-            <tca model="poly3" focal="108" vr="0.9999556" vb="0.9998626" />
+-            <tca model="poly3" focal="135" vr="0.9999410" vb="0.9996804" />
++            <distortion model="poly3" focal="50" k1="-0.00786"/>
++            <distortion model="poly3" focal="63" k1="-0.00367"/>
++            <distortion model="poly3" focal="70" k1="0.00052"/>
++            <distortion model="poly3" focal="75" k1="-0.00155"/>
++            <distortion model="poly3" focal="95" k1="0.00337"/>
++            <distortion model="poly3" focal="108" k1="0.00464"/>
++            <distortion model="poly3" focal="135" k1="0.00586"/>
++            <tca model="poly3" focal="50" vr="1.0003343" vb="0.9998633"/>
++            <tca model="poly3" focal="63" vr="1.0001639" vb="0.9999264"/>
++            <tca model="poly3" focal="70" vr="1.0000366" vb="0.9999579"/>
++            <tca model="poly3" focal="75" vr="1.0000653" vb="0.9999403"/>
++            <tca model="poly3" focal="95" vr="0.9999718" vb="0.9998939"/>
++            <tca model="poly3" focal="108" vr="0.9999556" vb="0.9998626"/>
++            <tca model="poly3" focal="135" vr="0.9999410" vb="0.9996804"/>
++            <!-- Taken with Pentax K-5 II -->
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.5219" k2="0.3879" k3="-0.2569"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.5219" k2="0.3879" k3="-0.2569"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1032" k2="-0.1508" k3="-0.0429"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1032" k2="-0.1508" k3="-0.0429"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1785" k2="0.2736" k3="-0.3085"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1785" k2="0.2736" k3="-0.3085"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.1865" k2="0.2555" k3="-0.2344"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.1865" k2="0.2555" k3="-0.2344"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1666" k2="0.1604" k3="-0.1341"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1666" k2="0.1604" k3="-0.1341"/>
++            <vignetting model="pa" focal="50" aperture="6.7" distance="10" k1="-0.1526" k2="0.1031" k3="-0.0798"/>
++            <vignetting model="pa" focal="50" aperture="6.7" distance="1000" k1="-0.1526" k2="0.1031" k3="-0.0798"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1543" k2="0.1080" k3="-0.0830"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1543" k2="0.1080" k3="-0.0830"/>
++            <vignetting model="pa" focal="50" aperture="9.5" distance="10" k1="-0.1567" k2="0.1140" k3="-0.0868"/>
++            <vignetting model="pa" focal="50" aperture="9.5" distance="1000" k1="-0.1567" k2="0.1140" k3="-0.0868"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1579" k2="0.1180" k3="-0.0899"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1579" k2="0.1180" k3="-0.0899"/>
++            <vignetting model="pa" focal="63" aperture="2.8" distance="10" k1="-0.4650" k2="0.4721" k3="-0.3874"/>
++            <vignetting model="pa" focal="63" aperture="2.8" distance="1000" k1="-0.4650" k2="0.4721" k3="-0.3874"/>
++            <vignetting model="pa" focal="63" aperture="3.5" distance="10" k1="-0.1333" k2="0.1220" k3="-0.2921"/>
++            <vignetting model="pa" focal="63" aperture="3.5" distance="1000" k1="-0.1333" k2="0.1220" k3="-0.2921"/>
++            <vignetting model="pa" focal="63" aperture="4" distance="10" k1="-0.2373" k2="0.5212" k3="-0.5011"/>
++            <vignetting model="pa" focal="63" aperture="4" distance="1000" k1="-0.2373" k2="0.5212" k3="-0.5011"/>
++            <vignetting model="pa" focal="63" aperture="4.5" distance="10" k1="-0.2130" k2="0.4030" k3="-0.3658"/>
++            <vignetting model="pa" focal="63" aperture="4.5" distance="1000" k1="-0.2130" k2="0.4030" k3="-0.3658"/>
++            <vignetting model="pa" focal="63" aperture="5.6" distance="10" k1="-0.1820" k2="0.2641" k3="-0.2274"/>
++            <vignetting model="pa" focal="63" aperture="5.6" distance="1000" k1="-0.1820" k2="0.2641" k3="-0.2274"/>
++            <vignetting model="pa" focal="63" aperture="6.7" distance="10" k1="-0.1399" k2="0.1001" k3="-0.0774"/>
++            <vignetting model="pa" focal="63" aperture="6.7" distance="1000" k1="-0.1399" k2="0.1001" k3="-0.0774"/>
++            <vignetting model="pa" focal="63" aperture="8" distance="10" k1="-0.1407" k2="0.0984" k3="-0.0734"/>
++            <vignetting model="pa" focal="63" aperture="8" distance="1000" k1="-0.1407" k2="0.0984" k3="-0.0734"/>
++            <vignetting model="pa" focal="63" aperture="9.5" distance="10" k1="-0.1416" k2="0.0996" k3="-0.0731"/>
++            <vignetting model="pa" focal="63" aperture="9.5" distance="1000" k1="-0.1416" k2="0.0996" k3="-0.0731"/>
++            <vignetting model="pa" focal="63" aperture="11" distance="10" k1="-0.1431" k2="0.1039" k3="-0.0766"/>
++            <vignetting model="pa" focal="63" aperture="11" distance="1000" k1="-0.1431" k2="0.1039" k3="-0.0766"/>
++            <vignetting model="pa" focal="75" aperture="2.8" distance="10" k1="-0.3264" k2="0.2025" k3="-0.3131"/>
++            <vignetting model="pa" focal="75" aperture="2.8" distance="1000" k1="-0.3264" k2="0.2025" k3="-0.3131"/>
++            <vignetting model="pa" focal="75" aperture="3.5" distance="10" k1="-0.0353" k2="-0.0719" k3="-0.2639"/>
++            <vignetting model="pa" focal="75" aperture="3.5" distance="1000" k1="-0.0353" k2="-0.0719" k3="-0.2639"/>
++            <vignetting model="pa" focal="75" aperture="4" distance="10" k1="-0.1978" k2="0.4842" k3="-0.5732"/>
++            <vignetting model="pa" focal="75" aperture="4" distance="1000" k1="-0.1978" k2="0.4842" k3="-0.5732"/>
++            <vignetting model="pa" focal="75" aperture="4.5" distance="10" k1="-0.2288" k2="0.5538" k3="-0.5654"/>
++            <vignetting model="pa" focal="75" aperture="4.5" distance="1000" k1="-0.2288" k2="0.5538" k3="-0.5654"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="10" k1="-0.2323" k2="0.5285" k3="-0.5025"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.2323" k2="0.5285" k3="-0.5025"/>
++            <vignetting model="pa" focal="75" aperture="6.7" distance="10" k1="-0.1877" k2="0.3202" k3="-0.2807"/>
++            <vignetting model="pa" focal="75" aperture="6.7" distance="1000" k1="-0.1877" k2="0.3202" k3="-0.2807"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="10" k1="-0.1368" k2="0.1149" k3="-0.0896"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1368" k2="0.1149" k3="-0.0896"/>
++            <vignetting model="pa" focal="75" aperture="9.5" distance="10" k1="-0.1342" k2="0.0964" k3="-0.0698"/>
++            <vignetting model="pa" focal="75" aperture="9.5" distance="1000" k1="-0.1342" k2="0.0964" k3="-0.0698"/>
++            <vignetting model="pa" focal="75" aperture="11" distance="10" k1="-0.1359" k2="0.1011" k3="-0.0731"/>
++            <vignetting model="pa" focal="75" aperture="11" distance="1000" k1="-0.1359" k2="0.1011" k3="-0.0731"/>
++            <vignetting model="pa" focal="95" aperture="2.8" distance="10" k1="-0.1002" k2="-0.6727" k3="0.3072"/>
++            <vignetting model="pa" focal="95" aperture="2.8" distance="1000" k1="-0.1002" k2="-0.6727" k3="0.3072"/>
++            <vignetting model="pa" focal="95" aperture="3.5" distance="10" k1="0.1503" k2="-0.8768" k3="0.3289"/>
++            <vignetting model="pa" focal="95" aperture="3.5" distance="1000" k1="0.1503" k2="-0.8768" k3="0.3289"/>
++            <vignetting model="pa" focal="95" aperture="4" distance="10" k1="-0.0157" k2="-0.1187" k3="-0.1951"/>
++            <vignetting model="pa" focal="95" aperture="4" distance="1000" k1="-0.0157" k2="-0.1187" k3="-0.1951"/>
++            <vignetting model="pa" focal="95" aperture="4.5" distance="10" k1="-0.1339" k2="0.2905" k3="-0.4368"/>
++            <vignetting model="pa" focal="95" aperture="4.5" distance="1000" k1="-0.1339" k2="0.2905" k3="-0.4368"/>
++            <vignetting model="pa" focal="95" aperture="5.6" distance="10" k1="-0.1861" k2="0.4445" k3="-0.5054"/>
++            <vignetting model="pa" focal="95" aperture="5.6" distance="1000" k1="-0.1861" k2="0.4445" k3="-0.5054"/>
++            <vignetting model="pa" focal="95" aperture="6.7" distance="10" k1="-0.2024" k2="0.4379" k3="-0.4178"/>
++            <vignetting model="pa" focal="95" aperture="6.7" distance="1000" k1="-0.2024" k2="0.4379" k3="-0.4178"/>
++            <vignetting model="pa" focal="95" aperture="8" distance="10" k1="-0.1620" k2="0.2444" k3="-0.2092"/>
++            <vignetting model="pa" focal="95" aperture="8" distance="1000" k1="-0.1620" k2="0.2444" k3="-0.2092"/>
++            <vignetting model="pa" focal="95" aperture="9.5" distance="10" k1="-0.1265" k2="0.0928" k3="-0.0656"/>
++            <vignetting model="pa" focal="95" aperture="9.5" distance="1000" k1="-0.1265" k2="0.0928" k3="-0.0656"/>
++            <vignetting model="pa" focal="95" aperture="11" distance="10" k1="-0.1311" k2="0.1012" k3="-0.0698"/>
++            <vignetting model="pa" focal="95" aperture="11" distance="1000" k1="-0.1311" k2="0.1012" k3="-0.0698"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.4911" k2="-0.2737" k3="0.2751"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.4911" k2="-0.2737" k3="0.2751"/>
++            <vignetting model="pa" focal="135" aperture="3.5" distance="10" k1="-0.1401" k2="-0.8317" k3="0.5450"/>
++            <vignetting model="pa" focal="135" aperture="3.5" distance="1000" k1="-0.1401" k2="-0.8317" k3="0.5450"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.1172" k2="-0.8981" k3="0.4452"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.1172" k2="-0.8981" k3="0.4452"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="0.0586" k2="-0.4735" k3="0.1209"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="0.0586" k2="-0.4735" k3="0.1209"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.0381" k2="-0.0710" k3="-0.1489"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0381" k2="-0.0710" k3="-0.1489"/>
++            <vignetting model="pa" focal="135" aperture="6.7" distance="10" k1="-0.1495" k2="0.2878" k3="-0.3328"/>
++            <vignetting model="pa" focal="135" aperture="6.7" distance="1000" k1="-0.1495" k2="0.2878" k3="-0.3328"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1498" k2="0.2196" k3="-0.1947"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1498" k2="0.2196" k3="-0.1947"/>
++            <vignetting model="pa" focal="135" aperture="9.5" distance="10" k1="-0.1127" k2="0.0656" k3="-0.0447"/>
++            <vignetting model="pa" focal="135" aperture="9.5" distance="1000" k1="-0.1127" k2="0.0656" k3="-0.0447"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1189" k2="0.0784" k3="-0.0518"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1189" k2="0.0784" k3="-0.0518"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>smc PENTAX-FA 50mm f/1.4</model>
++        <model>smc Pentax-FA 50mm f/1.4</model>
+         <mount>Pentax KAF2</mount>
+-        <!-- FixMe: Actually cropfactor 1.522 -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Pentax K-30 -->
+-            <distortion model="poly3" focal="50" k1="-0.00203" />
+-            <tca model="poly3" focal="50" vr="1.0002324" vb="0.9997591" />
++            <distortion model="poly3" focal="50" k1="-0.00203"/>
++            <tca model="poly3" focal="50" br="-0.0000488" cr="0.0001144" vr="1.0005239" bb="0.0001427" cb="-0.0002953" vb="0.9994200"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.75531" k2="0.64285" k3="-0.26061"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.06676" k2="-0.04799" k3="0.02031"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.15783" k2="0.15089" k3="-0.01524"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1018" k2="-0.00066" k3="0.06612"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.00027" k2="-0.25301" k3="0.20985"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.13985" k2="0.13367" k3="-0.03586"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.05391" k2="-0.06313" k3="0.11027"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Pentax</maker>
+-        <model>smc PENTAX-DA 21mm f/3.2 AL Limited</model>
++        <model>smc Pentax-FA 50mm f/1.4</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-1 -->
++            <distortion model="ptlens" focal="50" a="0.00533" b="-0.02067" c="0.02125"/>
++            <tca model="poly3" focal="50.0" br="0.0000394" vr="1.0001857" bb="0.0000526" vb="0.9993940"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.4574" k2="1.1617" k3="-0.4518"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0461" k2="-1.2152" k3="0.6719"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3162" k2="0.3087" k3="-0.3464"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2434" k2="0.0061" k3="0.0194"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3038" k2="0.1823" k3="-0.1025"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3308" k2="0.2728" k3="-0.1756"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3380" k2="0.2932" k3="-0.2021"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3380" k2="0.2678" k3="-0.1838"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.3555" k2="0.2764" k3="-0.1692"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This is an alias of smc Pentax-DA 21mm f/3.2 AL Limited.
++             According to da...@corr.eu.org, they are optically equivalent. -->
++        <maker>Pentax</maker>
++        <model>HD Pentax-DA 21mm f/3.2 ED AL Limited</model>
+         <mount>Pentax KAF2</mount>
+-        <!-- FixMe: Actually cropfactor 1.522 -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Pentax K-5 -->
+-            <distortion model="poly3" focal="21" k1="-0.01388" />
++            <distortion model="poly3" focal="21" k1="-0.01388"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 21mm f/3.2 AL Limited</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="poly3" focal="21" k1="-0.01388"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-FA 28mm f/2.8 AL</model>
++        <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="28" k1="-0.00843"/>
++            <tca model="poly3" focal="28" br="0.0000578" cr="-0.0001581" vr="1.0005750" bb="-0.0000046" cb="0.0001367" vb="0.9996466"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="100" k1="-0.38602" k2="1.0657" k3="-0.86036"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="100" k1="-0.41027" k2="0.96832" k3="-0.79405"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="100" k1="-0.38055" k2="1.06408" k3="-0.92936"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="100" k1="-0.87866" k2="1.00009" k3="-0.5801"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-FA 28mm f/2.8 AL</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-1 -->
++            <distortion model="ptlens" focal="28" a="0.01253" b="-0.03208" c="0.00563"/>
++            <tca model="poly3" focal="28" br="-0.0000563" vr="1.0002879" bb="0.0001022" vb="0.9998245"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-2.0397" k2="2.1920" k3="-0.9456"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-2.0397" k2="2.1920" k3="-0.9456"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.7531" k2="0.1413" k3="0.0144"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.7531" k2="0.1413" k3="0.0144"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.7244" k2="0.0516" k3="0.1462"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.7244" k2="0.0516" k3="0.1462"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.6642" k2="-0.0844" k3="0.2290"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6642" k2="-0.0844" k3="0.2290"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.9747" k2="0.6184" k3="-0.1904"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.9747" k2="0.6184" k3="-0.1904"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.9730" k2="0.6071" k3="-0.1809"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.9730" k2="0.6071" k3="-0.1809"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.8601" k2="0.3664" k3="-0.0386"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.8601" k2="0.3664" k3="-0.0386"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA* 16-50mm f/2.8 ED AL IF SDM</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 II -->
++            <distortion model="ptlens" focal="16" a="0.02994" b="-0.08352" c="0.03371"/>
++            <distortion model="ptlens" focal="19" a="0.02558" b="-0.07384" c="0.04704"/>
++            <distortion model="ptlens" focal="28" a="0.00607" b="-0.01352" c="0.01649"/>
++            <distortion model="ptlens" focal="34" a="0" b="0.00495" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00588" c="0"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.1567" k2="-0.9384" k3="0.4156"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.1567" k2="-0.9384" k3="0.4156"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.4466" k2="0.3537" k3="-0.4406"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.4466" k2="0.3537" k3="-0.4406"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.5021" k2="0.5090" k3="-0.4918"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.5021" k2="0.5090" k3="-0.4918"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.5129" k2="0.5057" k3="-0.4417"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.5129" k2="0.5057" k3="-0.4417"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.4748" k2="0.3967" k3="-0.3273"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4748" k2="0.3967" k3="-0.3273"/>
++            <vignetting model="pa" focal="16" aperture="6.7" distance="10" k1="-0.4447" k2="0.2538" k3="-0.1859"/>
++            <vignetting model="pa" focal="16" aperture="6.7" distance="1000" k1="-0.4447" k2="0.2538" k3="-0.1859"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.4540" k2="0.1751" k3="-0.0932"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4540" k2="0.1751" k3="-0.0932"/>
++            <vignetting model="pa" focal="16" aperture="9.5" distance="10" k1="-0.4308" k2="0.1450" k3="-0.0774"/>
++            <vignetting model="pa" focal="16" aperture="9.5" distance="1000" k1="-0.4308" k2="0.1450" k3="-0.0774"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.4358" k2="0.1504" k3="-0.0787"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.4358" k2="0.1504" k3="-0.0787"/>
++            <vignetting model="pa" focal="21" aperture="2.8" distance="10" k1="-0.4623" k2="0.4206" k3="-0.3463"/>
++            <vignetting model="pa" focal="21" aperture="2.8" distance="1000" k1="-0.4623" k2="0.4206" k3="-0.3463"/>
++            <vignetting model="pa" focal="21" aperture="3.5" distance="10" k1="-0.4755" k2="0.4571" k3="-0.3094"/>
++            <vignetting model="pa" focal="21" aperture="3.5" distance="1000" k1="-0.4755" k2="0.4571" k3="-0.3094"/>
++            <vignetting model="pa" focal="21" aperture="4" distance="10" k1="-0.4441" k2="0.3262" k3="-0.1788"/>
++            <vignetting model="pa" focal="21" aperture="4" distance="1000" k1="-0.4441" k2="0.3262" k3="-0.1788"/>
++            <vignetting model="pa" focal="21" aperture="4.5" distance="10" k1="-0.4724" k2="0.3480" k3="-0.1808"/>
++            <vignetting model="pa" focal="21" aperture="4.5" distance="1000" k1="-0.4724" k2="0.3480" k3="-0.1808"/>
++            <vignetting model="pa" focal="21" aperture="5.6" distance="10" k1="-0.4800" k2="0.3717" k3="-0.1971"/>
++            <vignetting model="pa" focal="21" aperture="5.6" distance="1000" k1="-0.4800" k2="0.3717" k3="-0.1971"/>
++            <vignetting model="pa" focal="21" aperture="6.7" distance="10" k1="-0.4735" k2="0.3730" k3="-0.2007"/>
++            <vignetting model="pa" focal="21" aperture="6.7" distance="1000" k1="-0.4735" k2="0.3730" k3="-0.2007"/>
++            <vignetting model="pa" focal="21" aperture="8" distance="10" k1="-0.4837" k2="0.3873" k3="-0.2085"/>
++            <vignetting model="pa" focal="21" aperture="8" distance="1000" k1="-0.4837" k2="0.3873" k3="-0.2085"/>
++            <vignetting model="pa" focal="21" aperture="9.5" distance="10" k1="-0.4879" k2="0.3922" k3="-0.2105"/>
++            <vignetting model="pa" focal="21" aperture="9.5" distance="1000" k1="-0.4879" k2="0.3922" k3="-0.2105"/>
++            <vignetting model="pa" focal="21" aperture="11" distance="10" k1="-0.4796" k2="0.3733" k3="-0.1987"/>
++            <vignetting model="pa" focal="21" aperture="11" distance="1000" k1="-0.4796" k2="0.3733" k3="-0.1987"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.4431" k2="0.5819" k3="-0.5154"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.4431" k2="0.5819" k3="-0.5154"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.4463" k2="0.6478" k3="-0.5407"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.4463" k2="0.6478" k3="-0.5407"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3905" k2="0.3900" k3="-0.2633"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3905" k2="0.3900" k3="-0.2633"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.3523" k2="0.2523" k3="-0.1422"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.3523" k2="0.2523" k3="-0.1422"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3546" k2="0.2350" k3="-0.1180"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3546" k2="0.2350" k3="-0.1180"/>
++            <vignetting model="pa" focal="28" aperture="6.7" distance="10" k1="-0.3546" k2="0.2302" k3="-0.1114"/>
++            <vignetting model="pa" focal="28" aperture="6.7" distance="1000" k1="-0.3546" k2="0.2302" k3="-0.1114"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3633" k2="0.2473" k3="-0.1209"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3633" k2="0.2473" k3="-0.1209"/>
++            <vignetting model="pa" focal="28" aperture="9.5" distance="10" k1="-0.3661" k2="0.2509" k3="-0.1223"/>
++            <vignetting model="pa" focal="28" aperture="9.5" distance="1000" k1="-0.3661" k2="0.2509" k3="-0.1223"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3666" k2="0.2498" k3="-0.1207"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3666" k2="0.2498" k3="-0.1207"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.4080" k2="0.6327" k3="-0.6318"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.4080" k2="0.6327" k3="-0.6318"/>
++            <vignetting model="pa" focal="34" aperture="3.5" distance="10" k1="-0.4155" k2="0.6923" k3="-0.6645"/>
++            <vignetting model="pa" focal="34" aperture="3.5" distance="1000" k1="-0.4155" k2="0.6923" k3="-0.6645"/>
++            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.4089" k2="0.6402" k3="-0.5230"/>
++            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.4089" k2="0.6402" k3="-0.5230"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.3500" k2="0.3962" k3="-0.2882"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.3500" k2="0.3962" k3="-0.2882"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.3225" k2="0.2645" k3="-0.1622"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.3225" k2="0.2645" k3="-0.1622"/>
++            <vignetting model="pa" focal="34" aperture="6.7" distance="10" k1="-0.3072" k2="0.2018" k3="-0.1037"/>
++            <vignetting model="pa" focal="34" aperture="6.7" distance="1000" k1="-0.3072" k2="0.2018" k3="-0.1037"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.3108" k2="0.2008" k3="-0.0977"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.3108" k2="0.2008" k3="-0.0977"/>
++            <vignetting model="pa" focal="34" aperture="9.5" distance="10" k1="-0.3171" k2="0.2073" k3="-0.0989"/>
++            <vignetting model="pa" focal="34" aperture="9.5" distance="1000" k1="-0.3171" k2="0.2073" k3="-0.0989"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.3269" k2="0.2291" k3="-0.1142"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.3269" k2="0.2291" k3="-0.1142"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.3942" k2="0.5134" k3="-0.5866"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3942" k2="0.5134" k3="-0.5866"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.3868" k2="0.5070" k3="-0.5845"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3868" k2="0.5070" k3="-0.5845"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2986" k2="0.4743" k3="-0.5864"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2986" k2="0.4743" k3="-0.5864"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.3509" k2="0.6401" k3="-0.5701"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.3509" k2="0.6401" k3="-0.5701"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3141" k2="0.4269" k3="-0.3366"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3141" k2="0.4269" k3="-0.3366"/>
++            <vignetting model="pa" focal="50" aperture="6.7" distance="10" k1="-0.2683" k2="0.2352" k3="-0.1556"/>
++            <vignetting model="pa" focal="50" aperture="6.7" distance="1000" k1="-0.2683" k2="0.2352" k3="-0.1556"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2480" k2="0.1389" k3="-0.0629"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2480" k2="0.1389" k3="-0.0629"/>
++            <vignetting model="pa" focal="50" aperture="9.5" distance="10" k1="-0.2537" k2="0.1430" k3="-0.0595"/>
++            <vignetting model="pa" focal="50" aperture="9.5" distance="1000" k1="-0.2537" k2="0.1430" k3="-0.0595"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2615" k2="0.1624" k3="-0.0720"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2615" k2="0.1624" k3="-0.0720"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA Fish-Eye 10-17mm f/3.5-4.5 ED IF</model>
++        <mount>Pentax KAF2</mount>
++        <type>equisolid</type>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-7 -->
++            <distortion model="ptlens" focal="10" a="-0.03518" b="0.12586" c="-0.09198"/>
++            <distortion model="ptlens" focal="11" a="-0.02913" b="0.12685" c="-0.07233"/>
++            <distortion model="ptlens" focal="13" a="-0.01146" b="0.05636" c="-0.02116"/>
++            <distortion model="ptlens" focal="15" a="-0.00892" b="0.03724" c="-0.02424"/>
++            <distortion model="ptlens" focal="17" a="-0.00536" b="0.01752" c="-0.01391"/>
++            <tca model="poly3" focal="10" br="0.0000405" vr="1.0004481" bb="-0.0000364" vb="1.0004715"/>
++            <tca model="poly3" focal="11" br="0.0000400" vr="1.0004872" bb="-0.0000348" vb="1.0003633"/>
++            <tca model="poly3" focal="13" br="0.0000281" vr="1.0005141" bb="-0.0000286" vb="1.0002823"/>
++            <tca model="poly3" focal="15" br="0.0000214" vr="1.0005105" bb="-0.0000117" vb="1.0002102"/>
++            <tca model="poly3" focal="17" br="0.0000094" vr="1.0005640" bb="-0.0000273" vb="1.0001892"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-A 50mm f/1.7</model>
++        <mount>Pentax KA</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="ptlens" focal="50" a="-0.00487" b="0.01496" c="-0.01497"/>
++            <tca model="poly3" focal="50" br="-0.0000066" vr="1.0000443" bb="0.0000030" vb="0.9999706"/>
++            <!-- Taken with Pentax K-20 with a different crop factor of 1.538 -->
++            <vignetting model="pa" focal="50" aperture="1.7" distance="10" k1="-0.8751" k2="0.7622" k3="-0.3250"/>
++            <vignetting model="pa" focal="50" aperture="1.7" distance="1000" k1="-0.8751" k2="0.7622" k3="-0.3250"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.0567" k2="-0.1913" k3="0.0378"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0567" k2="-0.1913" k3="0.0378"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1325" k2="0.0376" k3="-0.0060"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1325" k2="0.0376" k3="-0.0060"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1361" k2="0.0458" k3="-0.0117"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1361" k2="0.0458" k3="-0.0117"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1449" k2="0.0675" k3="-0.0268"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1449" k2="0.0675" k3="-0.0268"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1453" k2="0.0706" k3="-0.0297"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1453" k2="0.0706" k3="-0.0297"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1455" k2="0.0716" k3="-0.0307"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1455" k2="0.0716" k3="-0.0307"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1423" k2="0.0615" k3="-0.0240"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1423" k2="0.0615" k3="-0.0240"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1451" k2="0.0701" k3="-0.0294"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1451" k2="0.0701" k3="-0.0294"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-A 28mm 1:2.8</model>
++        <mount>Pentax KA</mount>
++        <aperture min="2.8" max="22"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="ptlens" focal="28" a="0.00207" b="-0.0073" c="-0.00479"/>
++            <tca model="poly3" focal="28" br="-0.0000016" vr="1.0004852" bb="0.0000372" vb="0.9997864"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-1.0219" k2="0.9483" k3="-0.4035"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-1.0219" k2="0.9483" k3="-0.4035"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2157" k2="-0.3435" k3="0.2363"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2157" k2="-0.3435" k3="0.2363"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2952" k2="0.0609" k3="-0.0049"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2952" k2="0.0609" k3="-0.0049"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3061" k2="0.0725" k3="0.0005"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3061" k2="0.0725" k3="0.0005"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3185" k2="0.0950" k3="-0.0119"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3185" k2="0.0950" k3="-0.0119"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.3235" k2="0.1039" k3="-0.0177"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.3235" k2="0.1039" k3="-0.0177"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3305" k2="0.1152" k3="-0.0231"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3305" k2="0.1152" k3="-0.0231"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-M 28mm 1:3.5</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="ptlens" focal="28" a="0.01008" b="-0.03516" c="0.02694"/>
++            <tca model="poly3" focal="28" br="-0.0000437" vr="1.0003568" bb="0.0000701" vb="0.9997667"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.8363" k2="0.5255" k3="-0.1650"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.8363" k2="0.5255" k3="-0.1650"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2875" k2="0.1126" k3="-0.0632"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2875" k2="0.1126" k3="-0.0632"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2926" k2="0.1061" k3="-0.0221"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2926" k2="0.1061" k3="-0.0221"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3000" k2="0.1243" k3="-0.0334"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3000" k2="0.1243" k3="-0.0334"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.3024" k2="0.1304" k3="-0.0373"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.3024" k2="0.1304" k3="-0.0373"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3028" k2="0.1272" k3="-0.0337"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3028" k2="0.1272" k3="-0.0337"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-M 35mm 1:2</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="poly3" focal="35" k1="-0.00269"/>
++            <tca model="poly3" focal="35" br="0.0000109" vr="1.0003580" bb="0.0000502" vb="0.9997821"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-FA 31mm f/1.8 AL Limited</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="ptlens" focal="31" a="-0.000413" b="-0.000458" c="-0.007123"/>
++            <tca model="poly3" focal="31" br="-0.0000163" vr="1.0002445" bb="0.0000185" vb="0.9999495"/>
++            <vignetting model="pa" focal="31" aperture="1.8" distance="10" k1="-1.1124" k2="0.9087" k3="-0.3628"/>
++            <vignetting model="pa" focal="31" aperture="1.8" distance="1000" k1="-1.1124" k2="0.9087" k3="-0.3628"/>
++            <vignetting model="pa" focal="31" aperture="2" distance="10" k1="-1.1177" k2="0.9163" k3="-0.3658"/>
++            <vignetting model="pa" focal="31" aperture="2" distance="1000" k1="-1.1177" k2="0.9163" k3="-0.3658"/>
++            <vignetting model="pa" focal="31" aperture="2.2" distance="10" k1="-0.3517" k2="-0.5352" k3="0.4247"/>
++            <vignetting model="pa" focal="31" aperture="2.2" distance="1000" k1="-0.3517" k2="-0.5352" k3="0.4247"/>
++            <vignetting model="pa" focal="31" aperture="2.5" distance="10" k1="-0.5310" k2="0.1356" k3="-0.0662"/>
++            <vignetting model="pa" focal="31" aperture="2.5" distance="1000" k1="-0.5310" k2="0.1356" k3="-0.0662"/>
++            <vignetting model="pa" focal="31" aperture="2.8" distance="10" k1="-0.3663" k2="0.0886" k3="-0.0532"/>
++            <vignetting model="pa" focal="31" aperture="2.8" distance="1000" k1="-0.3663" k2="0.0886" k3="-0.0532"/>
++            <vignetting model="pa" focal="31" aperture="3.2" distance="10" k1="-0.7491" k2="0.8562" k3="-0.4876"/>
++            <vignetting model="pa" focal="31" aperture="3.2" distance="1000" k1="-0.7491" k2="0.8562" k3="-0.4876"/>
++            <vignetting model="pa" focal="31" aperture="3.5" distance="10" k1="-0.2778" k2="-0.1030" k3="0.1181"/>
++            <vignetting model="pa" focal="31" aperture="3.5" distance="1000" k1="-0.2778" k2="-0.1030" k3="0.1181"/>
++            <vignetting model="pa" focal="31" aperture="4" distance="10" k1="-0.7966" k2="0.9512" k3="-0.5645"/>
++            <vignetting model="pa" focal="31" aperture="4" distance="1000" k1="-0.7966" k2="0.9512" k3="-0.5645"/>
++            <vignetting model="pa" focal="31" aperture="4.5" distance="10" k1="-0.2722" k2="-0.1128" k3="0.1237"/>
++            <vignetting model="pa" focal="31" aperture="4.5" distance="1000" k1="-0.2722" k2="-0.1128" k3="0.1237"/>
++            <vignetting model="pa" focal="31" aperture="5" distance="10" k1="-0.3045" k2="-0.0517" k3="0.0850"/>
++            <vignetting model="pa" focal="31" aperture="5" distance="1000" k1="-0.3045" k2="-0.0517" k3="0.0850"/>
++            <vignetting model="pa" focal="31" aperture="5.6" distance="10" k1="-0.4972" k2="0.3393" k3="-0.1683"/>
++            <vignetting model="pa" focal="31" aperture="5.6" distance="1000" k1="-0.4972" k2="0.3393" k3="-0.1683"/>
++            <vignetting model="pa" focal="31" aperture="6.3" distance="10" k1="-0.5530" k2="0.4559" k3="-0.2438"/>
++            <vignetting model="pa" focal="31" aperture="6.3" distance="1000" k1="-0.5530" k2="0.4559" k3="-0.2438"/>
++            <vignetting model="pa" focal="31" aperture="7.1" distance="10" k1="-0.5660" k2="0.4708" k3="-0.2366"/>
++            <vignetting model="pa" focal="31" aperture="7.1" distance="1000" k1="-0.5660" k2="0.4708" k3="-0.2366"/>
++            <vignetting model="pa" focal="31" aperture="8" distance="10" k1="-0.2948" k2="-0.0669" k3="0.0932"/>
++            <vignetting model="pa" focal="31" aperture="8" distance="1000" k1="-0.2948" k2="-0.0669" k3="0.0932"/>
++            <vignetting model="pa" focal="31" aperture="9" distance="10" k1="-0.3206" k2="-0.0077" k3="0.0468"/>
++            <vignetting model="pa" focal="31" aperture="9" distance="1000" k1="-0.3206" k2="-0.0077" k3="0.0468"/>
++            <vignetting model="pa" focal="31" aperture="10" distance="10" k1="-0.5802" k2="0.5036" k3="-0.2581"/>
++            <vignetting model="pa" focal="31" aperture="10" distance="1000" k1="-0.5802" k2="0.5036" k3="-0.2581"/>
++            <vignetting model="pa" focal="31" aperture="11" distance="10" k1="-0.2687" k2="-0.1205" k3="0.1297"/>
++            <vignetting model="pa" focal="31" aperture="11" distance="1000" k1="-0.2687" k2="-0.1205" k3="0.1297"/>
++            <vignetting model="pa" focal="31" aperture="13" distance="10" k1="-0.7903" k2="0.9435" k3="-0.5628"/>
++            <vignetting model="pa" focal="31" aperture="13" distance="1000" k1="-0.7903" k2="0.9435" k3="-0.5628"/>
++            <vignetting model="pa" focal="31" aperture="14" distance="10" k1="-0.8053" k2="0.9830" k3="-0.5877"/>
++            <vignetting model="pa" focal="31" aperture="14" distance="1000" k1="-0.8053" k2="0.9830" k3="-0.5877"/>
++            <vignetting model="pa" focal="31" aperture="16" distance="10" k1="-0.4440" k2="0.2324" k3="-0.0922"/>
++            <vignetting model="pa" focal="31" aperture="16" distance="1000" k1="-0.4440" k2="0.2324" k3="-0.0922"/>
++            <vignetting model="pa" focal="31" aperture="18" distance="10" k1="-0.5060" k2="0.3660" k3="-0.1836"/>
++            <vignetting model="pa" focal="31" aperture="18" distance="1000" k1="-0.5060" k2="0.3660" k3="-0.1836"/>
++            <vignetting model="pa" focal="31" aperture="20" distance="10" k1="-0.6712" k2="0.7078" k3="-0.4131"/>
++            <vignetting model="pa" focal="31" aperture="20" distance="1000" k1="-0.6712" k2="0.7078" k3="-0.4131"/>
++            <vignetting model="pa" focal="31" aperture="22" distance="10" k1="-0.6138" k2="0.5839" k3="-0.3204"/>
++            <vignetting model="pa" focal="31" aperture="22" distance="1000" k1="-0.6138" k2="0.5839" k3="-0.3204"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 50mm f/1.8</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 II s -->
++            <distortion model="poly3" focal="50" k1="-0.00214"/>
++            <tca model="poly3" focal="50" vr="0.9999693" vb="1.0000394"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>HD Pentax-DA 20-40mm f/2.8-4 ED Limited DC WR</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="ptlens" focal="20" a="0.00595" b="-0.02518" c="0.00497"/>
++            <distortion model="ptlens" focal="30" a="0" b="-0.00484" c="0"/>
++            <distortion model="ptlens" focal="40" a="0" b="-0.00281" c="0"/>
++            <tca model="poly3" focal="20" br="0.0000248" vr="1.0001884" bb="-0.0000041" vb="1.0003045"/>
++            <tca model="poly3" focal="26" br="0.0000193" vr="1.0002246" bb="0.0000465" vb="1.0001908"/>
++            <tca model="poly3" focal="30" br="0.0000226" vr="1.0001588" bb="-0.0000522" vb="1.0002823"/>
++            <tca model="poly3" focal="36" br="-0.0000002" vr="1.0001903" bb="-0.0000449" vb="1.0002319"/>
++            <tca model="poly3" focal="40" br="0.0000118" vr="1.0001864" bb="-0.0000041" vb="1.0001781"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-M Macro 1:4 50mm</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <distortion model="poly3" focal="50" k1="-0.00105"/>
++            <tca model="poly3" focal="50" vr="0.9999922" vb="1.0000026"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-M Macro 1:4 100mm</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K10D -->
++            <!-- Really no measurable distortion -->
++            <distortion model="poly3" focal="100" k1="0"/>
++            <tca model="poly3" focal="100" vr="0.9998701" vb="1.0000849"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA L 18-50mm f/4-5.6 DC WR RE</model>
++        <mount>Pentax KAF3</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-S2 -->
++            <distortion model="ptlens" focal="18" a="0.00982" b="-0.03805" c="0.01695"/>
++            <distortion model="ptlens" focal="24" a="0.00488" b="-0.02037" c="0.01274"/>
++            <distortion model="ptlens" focal="34" a="0" b="0.0009" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00297" c="0"/>
++            <tca model="poly3" focal="18" vr="1.0005357" vb="1.0000769"/>
++            <tca model="poly3" focal="24" vr="1.0003696" vb="1.0000405"/>
++            <tca model="poly3" focal="34" vr="1.0001627" vb="1.0000371"/>
++            <tca model="poly3" focal="50" vr="1.0000870" vb="1.0000095"/>
++            <!-- Taken with Pentax K20 -->
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.1711" k2="-0.9527" k3="0.5945"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.1711" k2="-0.9527" k3="0.5945"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.0563" k2="-0.5835" k3="0.1701"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.0563" k2="-0.5835" k3="0.1701"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2812" k2="0.2809" k3="-0.3809"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2812" k2="0.2809" k3="-0.3809"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3233" k2="0.3157" k3="-0.2672"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3233" k2="0.3157" k3="-0.2672"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2513" k2="-0.0017" k3="0.0500"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2513" k2="-0.0017" k3="0.0500"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.0623" k2="-0.9608" k3="0.5561"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.0623" k2="-0.9608" k3="0.5561"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.1184" k2="-0.1416" k3="-0.0579"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.1184" k2="-0.1416" k3="-0.0579"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2333" k2="0.1738" k3="-0.1239"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2333" k2="0.1738" k3="-0.1239"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2046" k2="0.0233" k3="0.0363"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2046" k2="0.0233" k3="0.0363"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.2095" k2="0.0317" k3="0.0322"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2095" k2="0.0317" k3="0.0322"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.6655" k2="0.4679" k3="-0.1657"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.6655" k2="0.4679" k3="-0.1657"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.1549" k2="-0.3719" k3="0.2863"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.1549" k2="-0.3719" k3="0.2863"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.1223" k2="-0.0198" k3="0.0589"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1223" k2="-0.0198" k3="0.0589"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.1237" k2="-0.0396" k3="0.0843"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1237" k2="-0.0396" k3="0.0843"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.1258" k2="-0.0556" k3="0.1032"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.1258" k2="-0.0556" k3="0.1032"/>
++            <vignetting model="pa" focal="43" aperture="5.6" distance="10" k1="-0.7965" k2="0.7042" k3="-0.2677"/>
++            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.7965" k2="0.7042" k3="-0.2677"/>
++            <vignetting model="pa" focal="43" aperture="8" distance="10" k1="-0.0475" k2="-0.2120" k3="0.0921"/>
++            <vignetting model="pa" focal="43" aperture="8" distance="1000" k1="-0.0475" k2="-0.2120" k3="0.0921"/>
++            <vignetting model="pa" focal="43" aperture="11" distance="10" k1="-0.1185" k2="0.0018" k3="0.0462"/>
++            <vignetting model="pa" focal="43" aperture="11" distance="1000" k1="-0.1185" k2="0.0018" k3="0.0462"/>
++            <vignetting model="pa" focal="43" aperture="22" distance="10" k1="-0.1113" k2="-0.0213" k3="0.0536"/>
++            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.1113" k2="-0.0213" k3="0.0536"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.8485" k2="0.8254" k3="-0.3390"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.8485" k2="0.8254" k3="-0.3390"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0474" k2="-0.5397" k3="0.3555"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0474" k2="-0.5397" k3="0.3555"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1252" k2="0.0568" k3="-0.0007"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1252" k2="0.0568" k3="-0.0007"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1280" k2="0.0673" k3="-0.0116"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1280" k2="0.0673" k3="-0.0116"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>HD Pentax-DA 18-50mm f/4-5.6 DC WR RE</model>
++        <mount>Pentax KAF3</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-01 -->
++            <distortion model="ptlens" focal="18" a="0.009" b="-0.038" c="0.012"/>
++            <distortion model="ptlens" focal="24" a="0.009" b="-0.029" c="0.015"/>
++            <distortion model="ptlens" focal="28" a="0.005" b="-0.018" c="0.009"/>
++            <distortion model="ptlens" focal="34" a="-0.004" b="0.015" c="-0.014"/>
++            <distortion model="ptlens" focal="39" a="-0.003" b="0.011" c="-0.011"/>
++            <distortion model="ptlens" focal="50" a="-0.001" b="0.008" c="-0.006"/>
++            <tca model="poly3" focal="18" br="-0.0000502" vr="1.0007080" bb="0.0001151" vb="0.9998641"/>
++            <tca model="poly3" focal="24" br="0.0000207" vr="1.0004073" bb="0.0000589" vb="0.9999810"/>
++            <tca model="poly3" focal="28" br="0.0000493" vr="1.0002679" bb="0.0000333" vb="1.0000153"/>
++            <tca model="poly3" focal="34" br="0.0000464" vr="1.0001667" bb="-0.0000007" vb="1.0000157"/>
++            <tca model="poly3" focal="39" br="0.0000331" vr="1.0001270" bb="-0.0000211" vb="1.0000165"/>
++            <tca model="poly3" focal="50" br="0.0000176" vr="1.0000996" bb="-0.0000086" vb="0.9999487"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2288" k2="-0.8383" k3="0.5234"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2288" k2="-0.8383" k3="0.5234"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.0713" k2="-0.7014" k3="0.3079"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.0713" k2="-0.7014" k3="0.3079"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2615" k2="0.1221" k3="-0.2680"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2615" k2="0.1221" k3="-0.2680"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3349" k2="0.3364" k3="-0.3111"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3349" k2="0.3364" k3="-0.3111"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2702" k2="0.0679" k3="-0.0405"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2702" k2="0.0679" k3="-0.0405"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.1075" k2="-0.8812" k3="0.4966"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.1075" k2="-0.8812" k3="0.4966"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.2387" k2="0.2308" k3="-0.2498"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.2387" k2="0.2308" k3="-0.2498"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.2415" k2="0.1215" k3="-0.0748"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.2415" k2="0.1215" k3="-0.0748"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.2059" k2="0.0818" k3="-0.0589"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.2059" k2="0.0818" k3="-0.0589"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="10" k1="-0.2225" k2="0.0706" k3="-0.0367"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.2225" k2="0.0706" k3="-0.0367"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.3274" k2="-0.2786" k3="0.1611"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.3274" k2="-0.2786" k3="0.1611"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="10" k1="-0.2275" k2="0.2020" k3="-0.1458"/>
++            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.2275" k2="0.2020" k3="-0.1458"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.1796" k2="0.0805" k3="-0.0461"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.1796" k2="0.0805" k3="-0.0461"/>
++            <vignetting model="pa" focal="28" aperture="13" distance="10" k1="-0.1985" k2="0.0916" k3="-0.0406"/>
++            <vignetting model="pa" focal="28" aperture="13" distance="1000" k1="-0.1985" k2="0.0916" k3="-0.0406"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.1928" k2="0.0815" k3="-0.0349"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.1928" k2="0.0815" k3="-0.0349"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.7288" k2="0.6086" k3="-0.2772"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.7288" k2="0.6086" k3="-0.2772"/>
++            <vignetting model="pa" focal="34" aperture="6.3" distance="10" k1="-0.0910" k2="-0.1269" k3="0.0093"/>
++            <vignetting model="pa" focal="34" aperture="6.3" distance="1000" k1="-0.0910" k2="-0.1269" k3="0.0093"/>
++            <vignetting model="pa" focal="34" aperture="9" distance="10" k1="-0.1748" k2="0.1496" k3="-0.1001"/>
++            <vignetting model="pa" focal="34" aperture="9" distance="1000" k1="-0.1748" k2="0.1496" k3="-0.1001"/>
++            <vignetting model="pa" focal="34" aperture="13" distance="10" k1="-0.1586" k2="0.0908" k3="-0.0469"/>
++            <vignetting model="pa" focal="34" aperture="13" distance="1000" k1="-0.1586" k2="0.0908" k3="-0.0469"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="10" k1="-0.1674" k2="0.1067" k3="-0.0559"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1674" k2="0.1067" k3="-0.0559"/>
++            <vignetting model="pa" focal="39" aperture="4.5" distance="10" k1="-0.8357" k2="0.7791" k3="-0.3391"/>
++            <vignetting model="pa" focal="39" aperture="4.5" distance="1000" k1="-0.8357" k2="0.7791" k3="-0.3391"/>
++            <vignetting model="pa" focal="39" aperture="6.3" distance="10" k1="-0.0552" k2="-0.5400" k3="0.3269"/>
++            <vignetting model="pa" focal="39" aperture="6.3" distance="1000" k1="-0.0552" k2="-0.5400" k3="0.3269"/>
++            <vignetting model="pa" focal="39" aperture="9" distance="10" k1="-0.1535" k2="0.1276" k3="-0.1080"/>
++            <vignetting model="pa" focal="39" aperture="9" distance="1000" k1="-0.1535" k2="0.1276" k3="-0.1080"/>
++            <vignetting model="pa" focal="39" aperture="13" distance="10" k1="-0.1557" k2="0.1146" k3="-0.0672"/>
++            <vignetting model="pa" focal="39" aperture="13" distance="1000" k1="-0.1557" k2="0.1146" k3="-0.0672"/>
++            <vignetting model="pa" focal="39" aperture="29" distance="10" k1="-0.1298" k2="0.0037" k3="0.0171"/>
++            <vignetting model="pa" focal="39" aperture="29" distance="1000" k1="-0.1298" k2="0.0037" k3="0.0171"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.9176" k2="0.9620" k3="-0.4457"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.9176" k2="0.9620" k3="-0.4457"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0159" k2="-0.4878" k3="0.2492"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0159" k2="-0.4878" k3="0.2492"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1623" k2="0.1730" k3="-0.1327"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1623" k2="0.1730" k3="-0.1327"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1512" k2="0.1031" k3="-0.0551"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1512" k2="0.1031" k3="-0.0551"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.1348" k2="0.0672" k3="-0.0349"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.1348" k2="0.0672" k3="-0.0349"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA L 50-200mm f/4-5.6 ED WR</model>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-S2 -->
++            <distortion model="poly3" focal="50" k1="-0.00627"/>
++            <distortion model="poly3" focal="57.5" k1="-0.00403"/>
++            <distortion model="poly3" focal="80" k1="0.0038"/>
++            <distortion model="poly3" focal="105" k1="0.00915"/>
++            <distortion model="poly3" focal="137.5" k1="0.00709"/>
++            <distortion model="poly3" focal="200" k1="0.00746"/>
++            <tca model="poly3" focal="50" vr="0.9999539" vb="1.0001903"/>
++            <tca model="poly3" focal="57.5" vr="0.9999462" vb="1.0001701"/>
++            <tca model="poly3" focal="80" vr="0.9998231" vb="1.0001614"/>
++            <tca model="poly3" focal="105" vr="0.9998754" vb="1.0000401"/>
++            <tca model="poly3" focal="137.5" vr="0.9998983" vb="0.9999943"/>
++            <tca model="poly3" focal="200" vr="0.9999243" vb="0.9999551"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Pentax</maker>
++        <model>smc Pentax-DA 17-70mm f/4 AL [IF] SDM</model>
++        <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of Pentax APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="17" a="-0.01067" b="0.03945" c="-0.07039"/>
++            <distortion model="ptlens" focal="19" a="-0.00170" b="0.01164" c="-0.02842"/>
++            <distortion model="ptlens" focal="23" a="-0.01072" b="0.03889" c="-0.04282"/>
++            <distortion model="ptlens" focal="28" a="-0.0133" b="0.05266" c="-0.05293"/>
++            <distortion model="ptlens" focal="33" a="0.00167" b="0.00049" c="0.00827"/>
++            <distortion model="ptlens" focal="39" a="-0.00545" b="0.02304" c="-0.01654"/>
++            <distortion model="ptlens" focal="48" a="-0.00577" b="0.02136" c="-0.00938"/>
++            <distortion model="ptlens" focal="58" a="-0.00833" b="0.0294" c="-0.01728"/>
++            <distortion model="ptlens" focal="70" a="0.00129" b="-0.00754" c="0.02604"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This lens is actually from Asahi.  But
++             https://sourceforge.net/p/lensfun/features/77/ suggests to call it
++             a Pentax lens. -->
++        <maker>Pentax</maker>
++        <model>Super-Takumar 55mm f/1.8</model>
++        <mount>M42</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony SLT-A58 -->
++            <distortion model="ptlens" focal="55" a="0" b="-0.00012" c="0"/>
++            <tca model="poly3" focal="55" br="-0.0000267" vr="1.0000445" bb="0.0000021" vb="0.9999832"/>
++            <vignetting model="pa" focal="55" aperture="1.8" distance="10" k1="-0.6803" k2="0.5250" k3="-0.2020"/>
++            <vignetting model="pa" focal="55" aperture="1.8" distance="1000" k1="-0.6803" k2="0.5250" k3="-0.2020"/>
++            <vignetting model="pa" focal="55" aperture="2.8" distance="10" k1="-0.2143" k2="0.1688" k3="-0.0836"/>
++            <vignetting model="pa" focal="55" aperture="2.8" distance="1000" k1="-0.2143" k2="0.1688" k3="-0.0836"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.2404" k2="0.2739" k3="-0.1533"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.2404" k2="0.2739" k3="-0.1533"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1623" k2="0.0872" k3="-0.0380"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1623" k2="0.0872" k3="-0.0380"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0924" k2="-0.1354" k3="0.1294"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0924" k2="-0.1354" k3="0.1294"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1800" k2="0.0518" k3="0.0326"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1800" k2="0.0518" k3="0.0326"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2170" k2="0.1550" k3="-0.0377"/>
++            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2170" k2="0.1550" k3="-0.0377"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This lens is actually from Asahi.  But
++             https://sourceforge.net/p/lensfun/features/77/ suggests to call it
++             a Pentax lens. -->
++        <maker>Pentax</maker>
++        <model>Super-Takumar 50mm f/1.4</model>
++        <mount>M42</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7R II -->
++            <distortion model="poly3" focal="50" k1="-0.0055"/>
++            <tca model="poly3" focal="50" vr="1.0001502" vb="0.9998892"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-ricoh.xml b/data/db/slr-ricoh.xml
+--- a/data/db/slr-ricoh.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/slr-ricoh.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,37 @@
++<lensdatabase>
++    <lens>
++        <maker>Ricoh</maker>
++        <model>Ricoh XR Rikenon 1:1.4 50mm</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-r -->
++            <distortion model="poly3" focal="50" k1="-0.00302"/>
++            <tca model="poly3" focal="50" br="-0.0000276" vr="1.0001338" bb="0.0000254" vb="0.9998300"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Ricoh</maker>
++        <model>Ricoh 50mm 1:2.0</model>
++        <mount>Pentax K</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A7 -->
++            <distortion model="poly3" focal="50" k1="-0.00408"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-1.2841" k2="1.3206" k3="-0.5942"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-1.2841" k2="1.3206" k3="-0.5942"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.0367" k2="-0.8533" k3="0.4734"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0367" k2="-0.8533" k3="0.4734"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2554" k2="0.3092" k3="-0.3180"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2554" k2="0.3092" k3="-0.3180"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2064" k2="0.0696" k3="-0.0244"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2064" k2="0.0696" k3="-0.0244"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1932" k2="0.0325" k3="0.0055"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1932" k2="0.0325" k3="0.0055"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1940" k2="0.0296" k3="0.0103"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1940" k2="0.0296" k3="0.0103"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1951" k2="0.0241" k3="0.0171"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1951" k2="0.0241" k3="0.0171"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/slr-samsung.xml b/data/db/slr-samsung.xml
+--- a/data/db/slr-samsung.xml	2010-02-18 20:34:13.000000000 +0100
++++ b/data/db/slr-samsung.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,30 +1,26 @@
+ <lensdatabase>
+-
+     <camera>
+-        <maker>SAMSUNG TECHWIN Co.</maker>
++        <maker>Samsung Techwin Co.</maker>
+         <maker lang="en">Samsung</maker>
+         <model>SAMSUNG GX10</model>
+         <model lang="en">GX10</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG TECHWIN Co.</maker>
++        <maker>Samsung Techwin Co.</maker>
+         <maker lang="en">Samsung</maker>
+         <model>GX20</model>
+         <model lang="en">GX20</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SAMSUNG TECHWIN</maker>
++        <maker>Samsung Techwin</maker>
+         <maker lang="en">Samsung</maker>
+         <model>GX-1S</model>
+         <model lang="en">GX-1S</model>
+         <mount>Pentax KAF2</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-samyang.xml b/data/db/slr-samyang.xml
+--- a/data/db/slr-samyang.xml	2013-10-11 23:54:02.000000000 +0200
++++ b/data/db/slr-samyang.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,31 +1,208 @@
+ <lensdatabase>
+-
+     <lens>
+         <maker>Samyang</maker>
+-        <model>Samyang 14mm f/2.8 ED AS IF UMC</model>
++        <model>Samyang 8mm f/3.5 Fish-Eye CS</model>
++        <model lang="de">Samyang 8mm f/3.5 Fischauge CS</model>
++        <mount>Pentax KAF</mount>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <mount>Nikon F AI</mount>
++        <mount>Fujifilm X</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Sony E</mount>
++        <mount>4/3 System</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Samsung NX</mount>
++        <type>stereographic</type>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.04015" b="-0.07043" c="-0.05466" />
+-            <tca model="poly3" focal="14" br="0.0000198" vr="0.9999690" bb="-0.0001334" vb="1.0003226" />
++            <!-- Taken with some APS-C Pentax probably. -->
++            <tca model="poly3" focal="8" br="-0.0007764" cr="0.0013798" vr="1.0000228" bb="-0.0002711" cb="0.0008531" vb="0.9998496"/>
++            <!-- Taken with Nikon D7100 -->
++            <distortion model="ptlens" focal="8" a="0.04098" b="-0.15413" c="0.11977"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <!-- The "AE" is actually only on the Nikon variant.  It should be
++             added as an alias rather than a merged lens model name. -->
++        <model>Samyang 14mm f/2.8 AE ED AS IF UMC</model>
++        <mount>Pentax KAF</mount>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AI</mount>
++        <mount>Fujifilm X</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Sony E</mount>
++        <mount>4/3 System</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Samsung NX</mount>
++        <mount>Nikon CX</mount>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="14" a="0.04015" b="-0.07043" c="-0.05466"/>
++            <tca model="poly3" focal="14" br="0.0000198" vr="0.9999690" bb="-0.0001334" vb="1.0003226"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <!-- The "AE" is actually only on the Nikon variant.  It should be
++             added as an alias rather than a merged lens model name. -->
++        <model>Samyang 14mm f/2.8 AE ED AS IF UMC</model>
++        <mount>Pentax KAF</mount>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AI</mount>
++        <mount>Fujifilm X</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Sony E</mount>
++        <mount>4/3 System</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Samsung NX</mount>
++        <mount>Nikon CX</mount>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A77 -->
++            <distortion model="ptlens" focal="14" a="0.01031" b="-0.02759" c="-0.0351"/>
++            <tca model="poly3" focal="14" br="0.0000642" vr="0.9999130" bb="-0.0001012" vb="1.0003675"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-1.1454" k2="1.0122" k3="-0.4352"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.1454" k2="1.0122" k3="-0.4352"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.2347" k2="-0.0941" k3="-0.0002"/>
++            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.2347" k2="-0.0941" k3="-0.0002"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.2615" k2="0.0072" k3="0.0062"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2615" k2="0.0072" k3="0.0062"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.2733" k2="0.0338" k3="-0.0093"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.2733" k2="0.0338" k3="-0.0093"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 16mm f/2.0 ED AS UMC CS</model>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF</mount>
++        <mount>Fujifilm X</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Samsung NX</mount>
++        <mount>Canon EF-M</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- taken with Nikon D5500 -->
++            <distortion model="poly3" focal="16" k1="-0.006111"/>
++            <tca model="poly3" focal="16" vr="1.0002000" vb="1.0003000"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Samyang</maker>
+         <model>Samyang 500mm f/6.3 MC IF Mirror Lens</model>
++        <model lang="de">Samyang 500mm f/6.3 MC IF Spiegelobjektiv</model>
+         <mount>T2</mount>
+-        <focal value="500" />
+-        <aperture value="6.3" />
+-        <!-- FixMe: Actually cropfactor 1.534 -->
++        <focal value="500"/>
++        <aperture value="6.3"/>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with NEX-7 -->
+-            <distortion model="poly3" focal="500" k1="0" />
+-            <tca model="linear" focal="500" kr="1" kb="1" />
+-            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-0.7756" k2="0.8291" k3="-0.3723" />
+-            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-0.7756" k2="0.8291" k3="-0.3723" />
++            <distortion model="poly3" focal="500" k1="0"/>
++            <tca model="linear" focal="500" kr="1" kb="1"/>
++            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-0.7756" k2="0.8291" k3="-0.3723"/>
++            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-0.7756" k2="0.8291" k3="-0.3723"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 35mm f/1.4 AS UMC</model>
++        <!-- This model is really only available for Nikon.  For the other
++             brands, the 35/1.4 may have different characteristics. -->
++        <mount>Nikon F AI</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="35" a="0.00331" b="-0.0171" c="0.00274"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang T-S 24mm f/3.5 ED AS UMC</model>
++        <mount>Nikon F AI</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Sony E</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with D800 -->
++            <!-- No shift, no tilt. -->
++            <distortion model="ptlens" focal="24" a="-0.004" b="0.007" c="-0.02"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 12mm f/2.8 Fish-Eye ED AS NCS</model>
++        <model lang="de">Samyang 12mm f/2.8 Fischauge ED AS NCS</model>
++        <mount>Nikon F AI</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony E</mount>
++        <type>stereographic</type>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with D800 -->
++            <distortion model="ptlens" focal="12" a="-0.000331804" b="-0.00911417" c="-0.044237"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.90717" k2="0.58477" k3="-0.2198"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.90717" k2="0.58477" k3="-0.2198"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.17101" k2="-0.54574" k3="0.3056"/>
++            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.17101" k2="-0.54574" k3="0.3056"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1978" k2="-0.03729" k3="-0.11743"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1978" k2="-0.03729" k3="-0.11743"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-0.18295" k2="-0.09272" k3="0.03547"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.18295" k2="-0.09272" k3="0.03547"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 35mm T1.5 Cine Lens</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 7D -->
++            <distortion model="poly3" focal="35" k1="-0.00449"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 135mm f/2 ED UMC</model>
++        <mount>Nikon F</mount>
++        <mount>Canon EF</mount>
++        <mount>Pentax KAF</mount>
++        <mount>Micro 4/3 System</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Sony E</mount>
++        <mount>Fujifilm X</mount>
++        <mount>Samsung NX</mount>
++        <aperture min="2" max="22"/>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="135" a="0.00072" b="-0.001" c="0.00215"/>
++            <vignetting model="pa" focal="135" aperture="2.0" distance="0.8" k1="-0.22656" k2="0.16959" k3="-0.07317"/>
++            <vignetting model="pa" focal="135" aperture="2.0" distance="3" k1="-0.53456" k2="0.29892" k3="-0.15499"/>
++            <vignetting model="pa" focal="135" aperture="2.0" distance="100" k1="-1.01068" k2="0.99239" k3="-0.53442"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="0.8" k1="-0.10264" k2="-0.00365" k3="0.03305"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="3" k1="-0.08784" k2="0.06134" k3="-0.08"/>
++            <vignetting model="pa" focal="135" aperture="2.8" distance="100" k1="0.02813" k2="-0.92096" k3="0.59655"/>
++            <vignetting model="pa" focal="135" aperture="4.0" distance="3" k1="-0.085" k2="0" k3="0"/>
++            <vignetting model="pa" focal="135" aperture="4.0" distance="100" k1="-0.069" k2="-0.16" k3="-0.06"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="100" k1="-0.14" k2="0.11" k3="-0.15"/>
++            <vignetting model="pa" focal="135" aperture="8.0" distance="100" k1="-0.11" k2="0" k3="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Samyang</maker>
++        <model>Samyang 35mm f/1.4 AS UMC</model>
++        <mount>Canon EF-S</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 7D Mark II -->
++            <distortion model="ptlens" focal="35" a="-0.00182" b="0.00936" c="-0.02772"/>
++            <tca model="poly3" focal="35" vr="1.0002038" vb="1.0000399"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-schneider.xml b/data/db/slr-schneider.xml
+--- a/data/db/slr-schneider.xml	2007-12-12 21:49:44.000000000 +0100
++++ b/data/db/slr-schneider.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,45 +1,54 @@
+ <lensdatabase>
+-
+     <lens>
+         <maker>Schneider</maker>
+         <model>Schneider 28mm f/2.8 PC</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AI-S</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.009514" b="-0.027901" c="0" />
++            <distortion model="ptlens" focal="28" a="0.009514" b="-0.027901" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Schneider-KREUZNACH</maker>
+-        <model>D-XENON 1:3.5-5.6 18-55mm AL</model>
++        <maker>Schneider</maker>
++        <model>D-Xenon 1:3.5-5.6 18-55mm AL</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.004593" b="-0.021008" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.00371" b="-0.014625" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="-0.004166" c="0" />
+-            <distortion model="ptlens" focal="33" a="0" b="0.000528" c="0" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.003215" c="0" />
++            <distortion model="ptlens" focal="18" a="0.004593" b="-0.021008" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.00371" b="-0.014625" c="0"/>
++            <distortion model="ptlens" focal="24" a="0" b="-0.004166" c="0"/>
++            <distortion model="ptlens" focal="33" a="0" b="0.000528" c="0"/>
++            <distortion model="ptlens" focal="55" a="0" b="0.003215" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-        <maker>Schneider-KREUZNACH</maker>
+-        <model>D-XENON 1:4-5.6 50-200mm AL</model>
++        <maker>Schneider</maker>
++        <model>D-Xenon 1:4-5.6 50-200mm AL</model>
+         <mount>Pentax KAF2</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.004038" c="0" />
+-            <distortion model="ptlens" focal="63" a="0" b="0.001607" c="0" />
+-            <distortion model="ptlens" focal="95" a="0" b="0.007697" c="0" />
+-            <distortion model="ptlens" focal="125" a="0" b="0.007991" c="0" />
+-            <distortion model="ptlens" focal="138" a="0" b="0.008036" c="0" />
+-            <distortion model="ptlens" focal="160" a="0" b="0.007909" c="0" />
+-            <distortion model="ptlens" focal="180" a="0" b="0.009293" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.007685" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.004038"/>
++            <distortion model="poly3" focal="63" k1="0.001607"/>
++            <distortion model="poly3" focal="95" k1="0.007697"/>
++            <distortion model="poly3" focal="125" k1="0.007991"/>
++            <distortion model="poly3" focal="138" k1="0.008036"/>
++            <distortion model="poly3" focal="160" k1="0.007909"/>
++            <distortion model="poly3" focal="180" k1="0.009293"/>
++            <distortion model="poly3" focal="200" k1="0.007685"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Schneider</maker>
++        <model>Schneider Retina-Curtagon 1:4/28mm</model>
++        <mount>DKL</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <distortion model="ptlens" focal="28" a="0.00591" b="-0.01953" c="0.00935"/>
++            <tca model="poly3" focal="28" vr="1.0004290" vb="0.9997397"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-sigma.xml b/data/db/slr-sigma.xml
+--- a/data/db/slr-sigma.xml	2013-10-16 20:48:25.000000000 +0200
++++ b/data/db/slr-sigma.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,242 +1,516 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Sigma SA</name>
++        <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
++        <compat>T2</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA SD1</model>
++        <maker>Sigma</maker>
++        <model>Sigma SD1</model>
+         <model lang="en">SD1</model>
+         <mount>Sigma SA</mount>
+-        <cropfactor>1.5</cropfactor>
++        <cropfactor>1.500</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA SD1 Merrill</model>
++        <maker>Sigma</maker>
++        <model>Sigma SD1 Merrill</model>
+         <model lang="en">SD1 Merrill</model>
+         <mount>Sigma SA</mount>
+-        <cropfactor>1.5</cropfactor>
++        <cropfactor>1.500</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA SD9</model>
++        <maker>Sigma</maker>
++        <model>Sigma SD9</model>
+         <model lang="en">SD9</model>
+         <mount>Sigma SA</mount>
+-        <cropfactor>1.7</cropfactor>
++        <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA SD10</model>
++        <maker>Sigma</maker>
++        <model>Sigma SD10</model>
+         <model lang="en">SD10</model>
+         <mount>Sigma SA</mount>
+-        <cropfactor>1.7</cropfactor>
++        <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA SD14</model>
++        <maker>Sigma</maker>
++        <model>Sigma SD14</model>
+         <model lang="en">SD14</model>
+         <mount>Sigma SA</mount>
+-        <cropfactor>1.7</cropfactor>
++        <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SIGMA</maker>
+-        <maker lang="en">Sigma</maker>
+-        <model>SIGMA SD15</model>
++        <maker>Sigma</maker>
++        <model>Sigma SD15</model>
+         <model lang="en">SD15</model>
+         <mount>Sigma SA</mount>
+-        <cropfactor>1.7</cropfactor>
++        <cropfactor>1.739</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 10-20mm f/4-5.6 EX DC</model>
+-        <mount>Sigma SA</mount>
+-        <mount>Canon EF-S</mount>
++        <model>Sigma 10-20mm f/4-5.6 EX DC HSM</model>
++        <!-- HSM is not available for Sony and Pentax, so don't display it for
++             avoiding confusion. -->
++        <model lang="en">Sigma 10-20mm f/4-5.6 EX DC</model>
+         <mount>Nikon F AF</mount>
+-        <mount>Pentax KAF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Sony Alpha</mount>
+         <mount>4/3 System</mount>
++        <focal min="10" max="20"/>
++        <aperture min="4" max="32"/>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="10" a="-0.017985" b="0.026145" c="0" />
+-            <distortion model="ptlens" focal="12" a="-0.008171" b="0.018035" c="0" />
+-            <distortion model="ptlens" focal="14" a="0" b="0.005868" c="0" />
+-            <distortion model="ptlens" focal="17" a="0" b="0.006362" c="0" />
+-            <distortion model="ptlens" focal="20" a="0" b="0.005077" c="0" />
++            <distortion focal="10" model="ptlens" a="-0.0284207" b="0.0674528" c="-0.0484386"/>
++            <distortion focal="12" model="ptlens" a="-0.0230294" b="0.0734247" c="-0.0568826"/>
++            <distortion focal="14" model="ptlens" a="-0.000939631" b="0.0208626" c="-0.0198823"/>
++            <distortion focal="17" model="ptlens" a="0.0034078" b="0.00203584" c="-0.00781656"/>
++            <distortion focal="20" model="ptlens" a="0.000314791" b="0.0120508" c="-0.0128173"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="0.24" k1="-1.6197" k2="1.7397" k3="-0.9699"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="0.4" k1="-1.6057" k2="1.6328" k3="-0.7646"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="0.89" k1="-1.6213" k2="1.6181" k3="-0.7122"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-1.5643" k2="1.4810" k3="-0.6303"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="0.24" k1="-0.8114" k2="0.2854" k3="-0.2038"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="0.4" k1="-0.6870" k2="-0.1406" k3="0.1812"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="0.89" k1="-0.7512" k2="0.0000" k3="0.1040"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.6854" k2="-0.1364" k3="0.1778"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="0.24" k1="-0.9094" k2="0.6895" k3="-0.4041"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="0.4" k1="-0.8413" k2="0.4933" k3="-0.2457"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="0.89" k1="-0.8993" k2="0.6179" k3="-0.3158"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.8344" k2="0.4782" k3="-0.2365"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="0.24" k1="-0.8793" k2="0.5210" k3="-0.1862"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="0.4" k1="-0.8327" k2="0.4117" k3="-0.1157"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="0.89" k1="-0.8950" k2="0.5517" k3="-0.1944"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.8272" k2="0.4028" k3="-0.1093"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="0.24" k1="-0.8389" k2="0.3842" k3="-0.0714"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="0.4" k1="-0.7984" k2="0.3017" k3="-0.0274"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="0.89" k1="-0.8599" k2="0.4385" k3="-0.1027"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.7923" k2="0.2879" k3="-0.0154"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="0.24" k1="-1.6821" k2="1.7055" k3="-0.7163"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="0.4" k1="-1.6575" k2="1.6614" k3="-0.6953"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="0.89" k1="-1.6656" k2="1.6771" k3="-0.7020"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.6563" k2="1.6669" k3="-0.7004"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="0.24" k1="-0.8319" k2="-0.0859" k3="0.2929"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="0.4" k1="-0.7649" k2="-0.1949" k3="0.3405"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="0.89" k1="-0.7875" k2="-0.1559" k3="0.3239"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.7590" k2="-0.1982" k3="0.3400"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="0.24" k1="-0.7036" k2="0.1261" k3="0.0102"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="0.4" k1="-0.6869" k2="0.1319" k3="-0.0064"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="0.89" k1="-0.7050" k2="0.1755" k3="-0.0288"/>
++            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.6771" k2="0.1167" k3="0.0009"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="0.24" k1="-0.7799" k2="0.3685" k3="-0.0868"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="0.4" k1="-0.7531" k2="0.3350" k3="-0.0787"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="0.89" k1="-0.7646" k2="0.3496" k3="-0.0813"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.7527" k2="0.3523" k3="-0.0956"/>
++            <vignetting model="pa" focal="12" aperture="25" distance="0.24" k1="-0.7521" k2="0.2830" k3="-0.0191"/>
++            <vignetting model="pa" focal="12" aperture="25" distance="0.4" k1="-0.7227" k2="0.2398" k3="-0.0025"/>
++            <vignetting model="pa" focal="12" aperture="25" distance="0.89" k1="-0.7343" k2="0.2556" k3="-0.0066"/>
++            <vignetting model="pa" focal="12" aperture="25" distance="1000" k1="-0.7175" k2="0.2394" k3="-0.0041"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="0.24" k1="-1.6349" k2="1.6451" k3="-0.6916"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="0.4" k1="-1.6138" k2="1.6118" k3="-0.6763"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="0.89" k1="-1.6242" k2="1.6261" k3="-0.6820"/>
++            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-1.6244" k2="1.6455" k3="-0.7002"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.24" k1="-1.0354" k2="0.3250" k3="0.0742"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.8342" k2="-0.0776" k3="0.2910"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="0.89" k1="-0.8634" k2="-0.0254" k3="0.2654"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.8643" k2="-0.0006" k3="0.2431"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.24" k1="-0.4946" k2="-0.3809" k3="0.3050"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4709" k2="-0.3843" k3="0.2924"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="0.89" k1="-0.4895" k2="-0.3388" k3="0.2652"/>
++            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4869" k2="-0.3453" k3="0.2675"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.24" k1="-0.6637" k2="0.3256" k3="-0.1634"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.4" k1="-0.6293" k2="0.2711" k3="-0.1445"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="0.89" k1="-0.6421" k2="0.2830" k3="-0.1461"/>
++            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.6437" k2="0.3149" k3="-0.1752"/>
++            <vignetting model="pa" focal="14" aperture="29" distance="0.24" k1="-0.6257" k2="0.1583" k3="0.0265"/>
++            <vignetting model="pa" focal="14" aperture="29" distance="0.4" k1="-0.5964" k2="0.1154" k3="0.0488"/>
++            <vignetting model="pa" focal="14" aperture="29" distance="0.89" k1="-0.6101" k2="0.1302" k3="0.0439"/>
++            <vignetting model="pa" focal="14" aperture="29" distance="1000" k1="-0.6142" k2="0.1672" k3="0.0135"/>
++            <vignetting model="pa" focal="18" aperture="5.3" distance="0.24" k1="-1.5309" k2="1.5359" k3="-0.6560"/>
++            <vignetting model="pa" focal="18" aperture="5.3" distance="0.4" k1="-1.5295" k2="1.5343" k3="-0.6555"/>
++            <vignetting model="pa" focal="18" aperture="5.3" distance="0.89" k1="-1.5348" k2="1.5411" k3="-0.6582"/>
++            <vignetting model="pa" focal="18" aperture="5.3" distance="1000" k1="-1.5403" k2="1.5756" k3="-0.6846"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.24" k1="-1.3201" k2="1.0865" k3="-0.3944"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-1.2860" k2="1.0068" k3="-0.3474"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.89" k1="-1.2730" k2="0.9731" k3="-0.3262"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-1.3002" k2="1.0581" k3="-0.3826"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.24" k1="-0.3366" k2="-0.8234" k3="0.6028"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.3746" k2="-0.7961" k3="0.6081"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.89" k1="-0.3330" k2="-0.8200" k3="0.5970"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3448" k2="-0.7735" k3="0.5655"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.24" k1="-0.3860" k2="-0.1833" k3="0.0676"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.4105" k2="-0.0843" k3="0.0006"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="0.89" k1="-0.4132" k2="-0.0863" k3="0.0043"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4189" k2="-0.0543" k3="-0.0214"/>
++            <vignetting model="pa" focal="18" aperture="32" distance="0.24" k1="-0.4528" k2="-0.0053" k3="0.0887"/>
++            <vignetting model="pa" focal="18" aperture="32" distance="0.4" k1="-0.4503" k2="-0.0074" k3="0.0892"/>
++            <vignetting model="pa" focal="18" aperture="32" distance="0.89" k1="-0.4553" k2="-0.0028" k3="0.0884"/>
++            <vignetting model="pa" focal="18" aperture="32" distance="1000" k1="-0.4685" k2="0.0592" k3="0.0437"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.24" k1="-1.4777" k2="1.5040" k3="-0.6564"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.4" k1="-1.4748" k2="1.4912" k3="-0.6470"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.89" k1="-1.5090" k2="1.5523" k3="-0.6782"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.4883" k2="1.5344" k3="-0.6753"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.24" k1="-0.2801" k2="-0.8946" k3="0.6361"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.4" k1="-0.2771" k2="-0.9041" k3="0.6437"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.89" k1="-0.3166" k2="-0.8392" k3="0.6123"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.2885" k2="-0.8563" k3="0.6096"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.24" k1="-0.3069" k2="-0.2277" k3="0.0577"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.4" k1="-0.3034" k2="-0.2361" k3="0.0643"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.89" k1="-0.3461" k2="-0.1642" k3="0.0299"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.3303" k2="-0.1438" k3="0.0041"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.24" k1="-0.4507" k2="0.2503" k3="-0.1935"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.4436" k2="0.2273" k3="-0.1775"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.89" k1="-0.4819" k2="0.2816" k3="-0.1986"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4596" k2="0.2783" k3="-0.2106"/>
++            <vignetting model="pa" focal="20" aperture="32" distance="0.24" k1="-0.3808" k2="-0.0286" k3="0.0797"/>
++            <vignetting model="pa" focal="20" aperture="32" distance="0.4" k1="-0.3724" k2="-0.0533" k3="0.0963"/>
++            <vignetting model="pa" focal="20" aperture="32" distance="0.89" k1="-0.4091" k2="-0.0021" k3="0.0756"/>
++            <vignetting model="pa" focal="20" aperture="32" distance="1000" k1="-0.3893" k2="-0.0011" k3="0.0642"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Sigma</maker>
+-	    <model>Sigma 10-20mm F4-5.6 EX DC HSM</model>
+-	    <focal min="10" max="20" />
+-	    <aperture min="4" max="32" />
+-	    <mount>Nikon F AF</mount>
++        <maker>Sigma</maker>
++        <model>Sigma 10-20mm f/4-5.6 EX DC HSM</model>
++        <!-- HSM is not available for Sony and Pentax, so don't display it for
++             avoiding confusion. -->
++        <model lang="en">Sigma 10-20mm f/4-5.6 EX DC</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>Sony Alpha</mount>
+         <mount>4/3 System</mount>
+-	    <cropfactor>1.5</cropfactor>
+-	    <calibration>
+-	        <distortion focal="10" model="ptlens" a="-0.0284207" b="0.0674528" c="-0.0484386" />
+-	        <distortion focal="12" model="ptlens" a="-0.0230294" b="0.0734247" c="-0.0568826" />
+-	        <distortion focal="14" model="ptlens" a="-0.000939631" b="0.0208626" c="-0.0198823" />
+-	        <distortion focal="17" model="ptlens" a="0.0034078" b="0.00203584" c="-0.00781656" />
+-	        <distortion focal="20" model="ptlens" a="0.000314791" b="0.0120508" c="-0.0128173" />
+-	        <vignetting model="pa" focal="10" aperture="4" distance="0.24" k1="-1.6197" k2="1.7397" k3="-0.9699" />
+-            <vignetting model="pa" focal="10" aperture="4" distance="0.4" k1="-1.6057" k2="1.6328" k3="-0.7646" />
+-            <vignetting model="pa" focal="10" aperture="4" distance="0.89" k1="-1.6213" k2="1.6181" k3="-0.7122" />
+-            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-1.5643" k2="1.4810" k3="-0.6303" />
+-            <vignetting model="pa" focal="10" aperture="5.6" distance="0.24" k1="-0.8114" k2="0.2854" k3="-0.2038" />
+-            <vignetting model="pa" focal="10" aperture="5.6" distance="0.4" k1="-0.6870" k2="-0.1406" k3="0.1812" />
+-            <vignetting model="pa" focal="10" aperture="5.6" distance="0.89" k1="-0.7512" k2="0.0000" k3="0.1040" />
+-            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.6854" k2="-0.1364" k3="0.1778" />
+-            <vignetting model="pa" focal="10" aperture="8" distance="0.24" k1="-0.9094" k2="0.6895" k3="-0.4041" />
+-            <vignetting model="pa" focal="10" aperture="8" distance="0.4" k1="-0.8413" k2="0.4933" k3="-0.2457" />
+-            <vignetting model="pa" focal="10" aperture="8" distance="0.89" k1="-0.8993" k2="0.6179" k3="-0.3158" />
+-            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.8344" k2="0.4782" k3="-0.2365" />
+-            <vignetting model="pa" focal="10" aperture="11" distance="0.24" k1="-0.8793" k2="0.5210" k3="-0.1862" />
+-            <vignetting model="pa" focal="10" aperture="11" distance="0.4" k1="-0.8327" k2="0.4117" k3="-0.1157" />
+-            <vignetting model="pa" focal="10" aperture="11" distance="0.89" k1="-0.8950" k2="0.5517" k3="-0.1944" />
+-            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.8272" k2="0.4028" k3="-0.1093" />
+-            <vignetting model="pa" focal="10" aperture="22" distance="0.24" k1="-0.8389" k2="0.3842" k3="-0.0714" />
+-            <vignetting model="pa" focal="10" aperture="22" distance="0.4" k1="-0.7984" k2="0.3017" k3="-0.0274" />
+-            <vignetting model="pa" focal="10" aperture="22" distance="0.89" k1="-0.8599" k2="0.4385" k3="-0.1027" />
+-            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.7923" k2="0.2879" k3="-0.0154" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="0.24" k1="-1.6821" k2="1.7055" k3="-0.7163" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="0.4" k1="-1.6575" k2="1.6614" k3="-0.6953" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="0.89" k1="-1.6656" k2="1.6771" k3="-0.7020" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.6563" k2="1.6669" k3="-0.7004" />
+-            <vignetting model="pa" focal="12" aperture="5.6" distance="0.24" k1="-0.8319" k2="-0.0859" k3="0.2929" />
+-            <vignetting model="pa" focal="12" aperture="5.6" distance="0.4" k1="-0.7649" k2="-0.1949" k3="0.3405" />
+-            <vignetting model="pa" focal="12" aperture="5.6" distance="0.89" k1="-0.7875" k2="-0.1559" k3="0.3239" />
+-            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.7590" k2="-0.1982" k3="0.3400" />
+-            <vignetting model="pa" focal="12" aperture="8" distance="0.24" k1="-0.7036" k2="0.1261" k3="0.0102" />
+-            <vignetting model="pa" focal="12" aperture="8" distance="0.4" k1="-0.6869" k2="0.1319" k3="-0.0064" />
+-            <vignetting model="pa" focal="12" aperture="8" distance="0.89" k1="-0.7050" k2="0.1755" k3="-0.0288" />
+-            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.6771" k2="0.1167" k3="0.0009" />
+-            <vignetting model="pa" focal="12" aperture="11" distance="0.24" k1="-0.7799" k2="0.3685" k3="-0.0868" />
+-            <vignetting model="pa" focal="12" aperture="11" distance="0.4" k1="-0.7531" k2="0.3350" k3="-0.0787" />
+-            <vignetting model="pa" focal="12" aperture="11" distance="0.89" k1="-0.7646" k2="0.3496" k3="-0.0813" />
+-            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.7527" k2="0.3523" k3="-0.0956" />
+-            <vignetting model="pa" focal="12" aperture="25" distance="0.24" k1="-0.7521" k2="0.2830" k3="-0.0191" />
+-            <vignetting model="pa" focal="12" aperture="25" distance="0.4" k1="-0.7227" k2="0.2398" k3="-0.0025" />
+-            <vignetting model="pa" focal="12" aperture="25" distance="0.89" k1="-0.7343" k2="0.2556" k3="-0.0066" />
+-            <vignetting model="pa" focal="12" aperture="25" distance="1000" k1="-0.7175" k2="0.2394" k3="-0.0041" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="0.24" k1="-1.6349" k2="1.6451" k3="-0.6916" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="0.4" k1="-1.6138" k2="1.6118" k3="-0.6763" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="0.89" k1="-1.6242" k2="1.6261" k3="-0.6820" />
+-            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-1.6244" k2="1.6455" k3="-0.7002" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.24" k1="-1.0354" k2="0.3250" k3="0.0742" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.8342" k2="-0.0776" k3="0.2910" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="0.89" k1="-0.8634" k2="-0.0254" k3="0.2654" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.8643" k2="-0.0006" k3="0.2431" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.24" k1="-0.4946" k2="-0.3809" k3="0.3050" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4709" k2="-0.3843" k3="0.2924" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="0.89" k1="-0.4895" k2="-0.3388" k3="0.2652" />
+-            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4869" k2="-0.3453" k3="0.2675" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.24" k1="-0.6637" k2="0.3256" k3="-0.1634" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.4" k1="-0.6293" k2="0.2711" k3="-0.1445" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="0.89" k1="-0.6421" k2="0.2830" k3="-0.1461" />
+-            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.6437" k2="0.3149" k3="-0.1752" />
+-            <vignetting model="pa" focal="14" aperture="29" distance="0.24" k1="-0.6257" k2="0.1583" k3="0.0265" />
+-            <vignetting model="pa" focal="14" aperture="29" distance="0.4" k1="-0.5964" k2="0.1154" k3="0.0488" />
+-            <vignetting model="pa" focal="14" aperture="29" distance="0.89" k1="-0.6101" k2="0.1302" k3="0.0439" />
+-            <vignetting model="pa" focal="14" aperture="29" distance="1000" k1="-0.6142" k2="0.1672" k3="0.0135" />
+-            <vignetting model="pa" focal="18" aperture="5.3" distance="0.24" k1="-1.5309" k2="1.5359" k3="-0.6560" />
+-            <vignetting model="pa" focal="18" aperture="5.3" distance="0.4" k1="-1.5295" k2="1.5343" k3="-0.6555" />
+-            <vignetting model="pa" focal="18" aperture="5.3" distance="0.89" k1="-1.5348" k2="1.5411" k3="-0.6582" />
+-            <vignetting model="pa" focal="18" aperture="5.3" distance="1000" k1="-1.5403" k2="1.5756" k3="-0.6846" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.24" k1="-1.3201" k2="1.0865" k3="-0.3944" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-1.2860" k2="1.0068" k3="-0.3474" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.89" k1="-1.2730" k2="0.9731" k3="-0.3262" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-1.3002" k2="1.0581" k3="-0.3826" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.24" k1="-0.3366" k2="-0.8234" k3="0.6028" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.3746" k2="-0.7961" k3="0.6081" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.89" k1="-0.3330" k2="-0.8200" k3="0.5970" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3448" k2="-0.7735" k3="0.5655" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.24" k1="-0.3860" k2="-0.1833" k3="0.0676" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.4105" k2="-0.0843" k3="0.0006" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="0.89" k1="-0.4132" k2="-0.0863" k3="0.0043" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4189" k2="-0.0543" k3="-0.0214" />
+-            <vignetting model="pa" focal="18" aperture="32" distance="0.24" k1="-0.4528" k2="-0.0053" k3="0.0887" />
+-            <vignetting model="pa" focal="18" aperture="32" distance="0.4" k1="-0.4503" k2="-0.0074" k3="0.0892" />
+-            <vignetting model="pa" focal="18" aperture="32" distance="0.89" k1="-0.4553" k2="-0.0028" k3="0.0884" />
+-            <vignetting model="pa" focal="18" aperture="32" distance="1000" k1="-0.4685" k2="0.0592" k3="0.0437" />
+-            <vignetting model="pa" focal="20" aperture="5.6" distance="0.24" k1="-1.4777" k2="1.5040" k3="-0.6564" />
+-            <vignetting model="pa" focal="20" aperture="5.6" distance="0.4" k1="-1.4748" k2="1.4912" k3="-0.6470" />
+-            <vignetting model="pa" focal="20" aperture="5.6" distance="0.89" k1="-1.5090" k2="1.5523" k3="-0.6782" />
+-            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.4883" k2="1.5344" k3="-0.6753" />
+-            <vignetting model="pa" focal="20" aperture="8" distance="0.24" k1="-0.2801" k2="-0.8946" k3="0.6361" />
+-            <vignetting model="pa" focal="20" aperture="8" distance="0.4" k1="-0.2771" k2="-0.9041" k3="0.6437" />
+-            <vignetting model="pa" focal="20" aperture="8" distance="0.89" k1="-0.3166" k2="-0.8392" k3="0.6123" />
+-            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.2885" k2="-0.8563" k3="0.6096" />
+-            <vignetting model="pa" focal="20" aperture="11" distance="0.24" k1="-0.3069" k2="-0.2277" k3="0.0577" />
+-            <vignetting model="pa" focal="20" aperture="11" distance="0.4" k1="-0.3034" k2="-0.2361" k3="0.0643" />
+-            <vignetting model="pa" focal="20" aperture="11" distance="0.89" k1="-0.3461" k2="-0.1642" k3="0.0299" />
+-            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.3303" k2="-0.1438" k3="0.0041" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="0.24" k1="-0.4507" k2="0.2503" k3="-0.1935" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.4436" k2="0.2273" k3="-0.1775" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="0.89" k1="-0.4819" k2="0.2816" k3="-0.1986" />
+-            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4596" k2="0.2783" k3="-0.2106" />
+-            <vignetting model="pa" focal="20" aperture="32" distance="0.24" k1="-0.3808" k2="-0.0286" k3="0.0797" />
+-            <vignetting model="pa" focal="20" aperture="32" distance="0.4" k1="-0.3724" k2="-0.0533" k3="0.0963" />
+-            <vignetting model="pa" focal="20" aperture="32" distance="0.89" k1="-0.4091" k2="-0.0021" k3="0.0756" />
+-            <vignetting model="pa" focal="20" aperture="32" distance="1000" k1="-0.3893" k2="-0.0011" k3="0.0642" />
+-    	</calibration>
++        <focal min="10" max="20"/>
++        <aperture min="4" max="32"/>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 60D -->
++            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-1.3352" k2="1.3068" k3="-0.5982"/>
++            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-1.3352" k2="1.3068" k3="-0.5982"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="10" k1="-0.5343" k2="-0.2354" k3="0.2091"/>
++            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.5343" k2="-0.2354" k3="0.2091"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.6191" k2="0.3599" k3="-0.2475"/>
++            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.6191" k2="0.3599" k3="-0.2475"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.6621" k2="0.4182" k3="-0.1863"/>
++            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.6621" k2="0.4182" k3="-0.1863"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.6518" k2="0.3303" k3="-0.0927"/>
++            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.6518" k2="0.3303" k3="-0.0927"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-1.4611" k2="1.4600" k3="-0.6255"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.4611" k2="1.4600" k3="-0.6255"/>
++            <vignetting model="pa" focal="12" aperture="6.3" distance="10" k1="-0.6030" k2="-0.2819" k3="0.3354"/>
++            <vignetting model="pa" focal="12" aperture="6.3" distance="1000" k1="-0.6030" k2="-0.2819" k3="0.3354"/>
++            <vignetting model="pa" focal="12" aperture="9" distance="10" k1="-0.5229" k2="0.0523" k3="-0.0155"/>
++            <vignetting model="pa" focal="12" aperture="9" distance="1000" k1="-0.5229" k2="0.0523" k3="-0.0155"/>
++            <vignetting model="pa" focal="12" aperture="13" distance="10" k1="-0.6189" k2="0.3259" k3="-0.1147"/>
++            <vignetting model="pa" focal="12" aperture="13" distance="1000" k1="-0.6189" k2="0.3259" k3="-0.1147"/>
++            <vignetting model="pa" focal="12" aperture="18" distance="10" k1="-0.6114" k2="0.2735" k3="-0.0606"/>
++            <vignetting model="pa" focal="12" aperture="18" distance="1000" k1="-0.6114" k2="0.2735" k3="-0.0606"/>
++            <vignetting model="pa" focal="14" aperture="5" distance="10" k1="-1.4582" k2="1.4606" k3="-0.6283"/>
++            <vignetting model="pa" focal="14" aperture="5" distance="1000" k1="-1.4582" k2="1.4606" k3="-0.6283"/>
++            <vignetting model="pa" focal="14" aperture="7.1" distance="10" k1="-0.5729" k2="-0.3661" k3="0.3857"/>
++            <vignetting model="pa" focal="14" aperture="7.1" distance="1000" k1="-0.5729" k2="-0.3661" k3="0.3857"/>
++            <vignetting model="pa" focal="14" aperture="10" distance="10" k1="-0.4233" k2="-0.1688" k3="0.0986"/>
++            <vignetting model="pa" focal="14" aperture="10" distance="1000" k1="-0.4233" k2="-0.1688" k3="0.0986"/>
++            <vignetting model="pa" focal="14" aperture="14" distance="10" k1="-0.5856" k2="0.3839" k3="-0.2071"/>
++            <vignetting model="pa" focal="14" aperture="14" distance="1000" k1="-0.5856" k2="0.3839" k3="-0.2071"/>
++            <vignetting model="pa" focal="14" aperture="29" distance="10" k1="-0.5679" k2="0.2524" k3="-0.0598"/>
++            <vignetting model="pa" focal="14" aperture="29" distance="1000" k1="-0.5679" k2="0.2524" k3="-0.0598"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-1.4173" k2="1.4522" k3="-0.6412"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.4173" k2="1.4522" k3="-0.6412"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.4292" k2="-0.5749" k3="0.4766"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4292" k2="-0.5749" k3="0.4766"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.3301" k2="-0.1767" k3="0.0477"/>
++            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.3301" k2="-0.1767" k3="0.0477"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.4989" k2="0.3791" k3="-0.2538"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.4989" k2="0.3791" k3="-0.2538"/>
++            <vignetting model="pa" focal="16" aperture="29" distance="10" k1="-0.4706" k2="0.2002" k3="-0.0546"/>
++            <vignetting model="pa" focal="16" aperture="29" distance="1000" k1="-0.4706" k2="0.2002" k3="-0.0546"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-1.3803" k2="1.4302" k3="-0.6394"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.3803" k2="1.4302" k3="-0.6394"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.4838" k2="-0.4581" k3="0.4203"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.4838" k2="-0.4581" k3="0.4203"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.2273" k2="-0.4276" k3="0.2002"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.2273" k2="-0.4276" k3="0.2002"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="10" k1="-0.4460" k2="0.3797" k3="-0.2999"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4460" k2="0.3797" k3="-0.2999"/>
++            <vignetting model="pa" focal="20" aperture="32" distance="10" k1="-0.4186" k2="0.1837" k3="-0.0586"/>
++            <vignetting model="pa" focal="20" aperture="32" distance="1000" k1="-0.4186" k2="0.1837" k3="-0.0586"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 12-24mm f/4.5-5.6 EX DG</model>
++        <model>Sigma 12-24mm f/4.5-5.6 EX DG HSM</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="12" a="0.004893" b="-0.019407" c="0" />
+-            <distortion model="ptlens" focal="15" a="0.005113" b="-0.014337" c="0" />
+-            <distortion model="ptlens" focal="17" a="0.005379" b="-0.013087" c="0" />
+-            <distortion model="ptlens" focal="19" a="0.006028" b="-0.012828" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.00375" b="-0.007426" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.002951" b="-0.004156" c="0" />
++            <distortion model="ptlens" focal="12" a="0.004893" b="-0.019407" c="0"/>
++            <distortion model="ptlens" focal="15" a="0.005113" b="-0.014337" c="0"/>
++            <distortion model="ptlens" focal="17" a="0.005379" b="-0.013087" c="0"/>
++            <distortion model="ptlens" focal="19" a="0.006028" b="-0.012828" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.00375" b="-0.007426" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.002951" b="-0.004156" c="0"/>
++            <!-- Taken with Canon 5D Mark II -->
++            <vignetting model="pa" focal="12" aperture="4.5" distance="0.25" k1="-1.7694" k2="1.5716" k3="-0.7196"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.7694" k2="1.5716" k3="-0.7196"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="0.25" k1="-1.0867" k2="0.1360" k3="0.0322"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-1.0867" k2="0.1360" k3="0.0322"/>
++            <vignetting model="pa" focal="12" aperture="7.1" distance="0.25" k1="-0.8460" k2="-0.0734" k3="0.0356"/>
++            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.8460" k2="-0.0734" k3="0.0356"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="0.25" k1="-1.0405" k2="0.9223" k3="-0.6610"/>
++            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-1.0405" k2="0.9223" k3="-0.6610"/>
++            <vignetting model="pa" focal="12" aperture="14" distance="0.25" k1="-1.0605" k2="0.9463" k3="-0.6128"/>
++            <vignetting model="pa" focal="12" aperture="14" distance="1000" k1="-1.0605" k2="0.9463" k3="-0.6128"/>
++            <vignetting model="pa" focal="12" aperture="18" distance="0.25" k1="-1.0168" k2="0.7322" k3="-0.3758"/>
++            <vignetting model="pa" focal="12" aperture="18" distance="1000" k1="-1.0168" k2="0.7322" k3="-0.3758"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="0.25" k1="-0.9658" k2="0.5245" k3="-0.1826"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.9658" k2="0.5245" k3="-0.1826"/>
++            <vignetting model="pa" focal="13" aperture="5" distance="0.25" k1="-1.8732" k2="1.9204" k3="-0.8997"/>
++            <vignetting model="pa" focal="13" aperture="5" distance="1000" k1="-1.8732" k2="1.9204" k3="-0.8997"/>
++            <vignetting model="pa" focal="13" aperture="5.6" distance="0.25" k1="-1.3386" k2="0.7388" k3="-0.1948"/>
++            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-1.3386" k2="0.7388" k3="-0.1948"/>
++            <vignetting model="pa" focal="13" aperture="6.3" distance="0.25" k1="-1.0557" k2="0.1379" k3="0.1563"/>
++            <vignetting model="pa" focal="13" aperture="6.3" distance="1000" k1="-1.0557" k2="0.1379" k3="0.1563"/>
++            <vignetting model="pa" focal="13" aperture="7.1" distance="0.25" k1="-0.8943" k2="-0.1434" k3="0.2998"/>
++            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.8943" k2="-0.1434" k3="0.2998"/>
++            <vignetting model="pa" focal="13" aperture="8" distance="0.25" k1="-0.8087" k2="-0.2016" k3="0.2927"/>
++            <vignetting model="pa" focal="13" aperture="8" distance="1000" k1="-0.8087" k2="-0.2016" k3="0.2927"/>
++            <vignetting model="pa" focal="13" aperture="9" distance="0.25" k1="-0.8063" k2="-0.0668" k3="0.1663"/>
++            <vignetting model="pa" focal="13" aperture="9" distance="1000" k1="-0.8063" k2="-0.0668" k3="0.1663"/>
++            <vignetting model="pa" focal="13" aperture="10" distance="0.25" k1="-0.8556" k2="0.1723" k3="-0.0112"/>
++            <vignetting model="pa" focal="13" aperture="10" distance="1000" k1="-0.8556" k2="0.1723" k3="-0.0112"/>
++            <vignetting model="pa" focal="13" aperture="11" distance="0.25" k1="-0.9047" k2="0.3641" k3="-0.1396"/>
++            <vignetting model="pa" focal="13" aperture="11" distance="1000" k1="-0.9047" k2="0.3641" k3="-0.1396"/>
++            <vignetting model="pa" focal="13" aperture="13" distance="0.25" k1="-0.9431" k2="0.4912" k3="-0.2116"/>
++            <vignetting model="pa" focal="13" aperture="13" distance="1000" k1="-0.9431" k2="0.4912" k3="-0.2116"/>
++            <vignetting model="pa" focal="13" aperture="16" distance="0.25" k1="-0.9697" k2="0.5450" k3="-0.2054"/>
++            <vignetting model="pa" focal="13" aperture="16" distance="1000" k1="-0.9697" k2="0.5450" k3="-0.2054"/>
++            <vignetting model="pa" focal="13" aperture="18" distance="0.25" k1="-0.9599" k2="0.4957" k3="-0.1502"/>
++            <vignetting model="pa" focal="13" aperture="18" distance="1000" k1="-0.9599" k2="0.4957" k3="-0.1502"/>
++            <vignetting model="pa" focal="13" aperture="20" distance="0.25" k1="-0.9570" k2="0.4624" k3="-0.1098"/>
++            <vignetting model="pa" focal="13" aperture="20" distance="1000" k1="-0.9570" k2="0.4624" k3="-0.1098"/>
++            <vignetting model="pa" focal="13" aperture="22" distance="0.25" k1="-0.9376" k2="0.3915" k3="-0.0465"/>
++            <vignetting model="pa" focal="13" aperture="22" distance="1000" k1="-0.9376" k2="0.3915" k3="-0.0465"/>
++            <vignetting model="pa" focal="15" aperture="5" distance="0.25" k1="-1.7717" k2="1.7622" k3="-0.7345"/>
++            <vignetting model="pa" focal="15" aperture="5" distance="1000" k1="-1.7717" k2="1.7622" k3="-0.7345"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="0.25" k1="-1.4583" k2="1.0383" k3="-0.3027"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-1.4583" k2="1.0383" k3="-0.3027"/>
++            <vignetting model="pa" focal="15" aperture="6.3" distance="0.25" k1="-1.0236" k2="0.0966" k3="0.2259"/>
++            <vignetting model="pa" focal="15" aperture="6.3" distance="1000" k1="-1.0236" k2="0.0966" k3="0.2259"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="0.25" k1="-0.8817" k2="-0.1458" k3="0.3330"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.8817" k2="-0.1458" k3="0.3330"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="0.25" k1="-0.7884" k2="-0.2057" k3="0.3108"/>
++            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.7884" k2="-0.2057" k3="0.3108"/>
++            <vignetting model="pa" focal="15" aperture="9" distance="0.25" k1="-0.7746" k2="-0.0312" k3="0.1358"/>
++            <vignetting model="pa" focal="15" aperture="9" distance="1000" k1="-0.7746" k2="-0.0312" k3="0.1358"/>
++            <vignetting model="pa" focal="15" aperture="10" distance="0.25" k1="-0.8058" k2="0.1344" k3="0.0115"/>
++            <vignetting model="pa" focal="15" aperture="10" distance="1000" k1="-0.8058" k2="0.1344" k3="0.0115"/>
++            <vignetting model="pa" focal="15" aperture="11" distance="0.25" k1="-0.8523" k2="0.3381" k3="-0.1321"/>
++            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.8523" k2="0.3381" k3="-0.1321"/>
++            <vignetting model="pa" focal="15" aperture="13" distance="0.25" k1="-0.8964" k2="0.4876" k3="-0.2132"/>
++            <vignetting model="pa" focal="15" aperture="13" distance="1000" k1="-0.8964" k2="0.4876" k3="-0.2132"/>
++            <vignetting model="pa" focal="15" aperture="14" distance="0.25" k1="-0.9079" k2="0.5223" k3="-0.2247"/>
++            <vignetting model="pa" focal="15" aperture="14" distance="1000" k1="-0.9079" k2="0.5223" k3="-0.2247"/>
++            <vignetting model="pa" focal="15" aperture="16" distance="0.25" k1="-0.9061" k2="0.4892" k3="-0.1722"/>
++            <vignetting model="pa" focal="15" aperture="16" distance="1000" k1="-0.9061" k2="0.4892" k3="-0.1722"/>
++            <vignetting model="pa" focal="15" aperture="18" distance="0.25" k1="-0.8957" k2="0.4399" k3="-0.1161"/>
++            <vignetting model="pa" focal="15" aperture="18" distance="1000" k1="-0.8957" k2="0.4399" k3="-0.1161"/>
++            <vignetting model="pa" focal="15" aperture="20" distance="0.25" k1="-0.8873" k2="0.3937" k3="-0.0669"/>
++            <vignetting model="pa" focal="15" aperture="20" distance="1000" k1="-0.8873" k2="0.3937" k3="-0.0669"/>
++            <vignetting model="pa" focal="15" aperture="25" distance="0.25" k1="-0.8735" k2="0.3279" k3="-0.0060"/>
++            <vignetting model="pa" focal="15" aperture="25" distance="1000" k1="-0.8735" k2="0.3279" k3="-0.0060"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="0.25" k1="-1.6712" k2="1.6519" k3="-0.6913"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-1.6712" k2="1.6519" k3="-0.6913"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="0.25" k1="-1.4814" k2="1.2252" k3="-0.4385"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-1.4814" k2="1.2252" k3="-0.4385"/>
++            <vignetting model="pa" focal="17" aperture="6.3" distance="0.25" k1="-1.0361" k2="0.2284" k3="0.1350"/>
++            <vignetting model="pa" focal="17" aperture="6.3" distance="1000" k1="-1.0361" k2="0.2284" k3="0.1350"/>
++            <vignetting model="pa" focal="17" aperture="7.1" distance="0.25" k1="-0.9199" k2="0.0243" k3="0.2302"/>
++            <vignetting model="pa" focal="17" aperture="7.1" distance="1000" k1="-0.9199" k2="0.0243" k3="0.2302"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="0.25" k1="-0.7710" k2="-0.1279" k3="0.2503"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.7710" k2="-0.1279" k3="0.2503"/>
++            <vignetting model="pa" focal="17" aperture="9" distance="0.25" k1="-0.7777" k2="0.0951" k3="0.0495"/>
++            <vignetting model="pa" focal="17" aperture="9" distance="1000" k1="-0.7777" k2="0.0951" k3="0.0495"/>
++            <vignetting model="pa" focal="17" aperture="10" distance="0.25" k1="-0.7702" k2="0.1267" k3="0.0172"/>
++            <vignetting model="pa" focal="17" aperture="10" distance="1000" k1="-0.7702" k2="0.1267" k3="0.0172"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="0.25" k1="-0.8448" k2="0.4349" k3="-0.1953"/>
++            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-0.8448" k2="0.4349" k3="-0.1953"/>
++            <vignetting model="pa" focal="17" aperture="13" distance="0.25" k1="-0.8777" k2="0.5346" k3="-0.2351"/>
++            <vignetting model="pa" focal="17" aperture="13" distance="1000" k1="-0.8777" k2="0.5346" k3="-0.2351"/>
++            <vignetting model="pa" focal="17" aperture="14" distance="0.25" k1="-0.8704" k2="0.5218" k3="-0.2172"/>
++            <vignetting model="pa" focal="17" aperture="14" distance="1000" k1="-0.8704" k2="0.5218" k3="-0.2172"/>
++            <vignetting model="pa" focal="17" aperture="16" distance="0.25" k1="-0.8619" k2="0.4560" k3="-0.1415"/>
++            <vignetting model="pa" focal="17" aperture="16" distance="1000" k1="-0.8619" k2="0.4560" k3="-0.1415"/>
++            <vignetting model="pa" focal="17" aperture="18" distance="0.25" k1="-0.8612" k2="0.4356" k3="-0.1049"/>
++            <vignetting model="pa" focal="17" aperture="18" distance="1000" k1="-0.8612" k2="0.4356" k3="-0.1049"/>
++            <vignetting model="pa" focal="17" aperture="20" distance="0.25" k1="-0.8368" k2="0.3479" k3="-0.0387"/>
++            <vignetting model="pa" focal="17" aperture="20" distance="1000" k1="-0.8368" k2="0.3479" k3="-0.0387"/>
++            <vignetting model="pa" focal="17" aperture="25" distance="0.25" k1="-0.8429" k2="0.3566" k3="-0.0403"/>
++            <vignetting model="pa" focal="17" aperture="25" distance="1000" k1="-0.8429" k2="0.3566" k3="-0.0403"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="0.25" k1="-1.4876" k2="1.3747" k3="-0.5536"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.4876" k2="1.3747" k3="-0.5536"/>
++            <vignetting model="pa" focal="20" aperture="6.3" distance="0.25" k1="-1.0422" k2="0.3609" k3="0.0439"/>
++            <vignetting model="pa" focal="20" aperture="6.3" distance="1000" k1="-1.0422" k2="0.3609" k3="0.0439"/>
++            <vignetting model="pa" focal="20" aperture="7.1" distance="0.25" k1="-0.8406" k2="-0.0396" k3="0.2540"/>
++            <vignetting model="pa" focal="20" aperture="7.1" distance="1000" k1="-0.8406" k2="-0.0396" k3="0.2540"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="0.25" k1="-0.7194" k2="-0.1188" k3="0.2317"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.7194" k2="-0.1188" k3="0.2317"/>
++            <vignetting model="pa" focal="20" aperture="9" distance="0.25" k1="-0.7023" k2="0.0091" k3="0.1014"/>
++            <vignetting model="pa" focal="20" aperture="9" distance="1000" k1="-0.7023" k2="0.0091" k3="0.1014"/>
++            <vignetting model="pa" focal="20" aperture="10" distance="0.25" k1="-0.7472" k2="0.2153" k3="-0.0471"/>
++            <vignetting model="pa" focal="20" aperture="10" distance="1000" k1="-0.7472" k2="0.2153" k3="-0.0471"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="0.25" k1="-0.7991" k2="0.4256" k3="-0.1818"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.7991" k2="0.4256" k3="-0.1818"/>
++            <vignetting model="pa" focal="20" aperture="13" distance="0.25" k1="-0.8241" k2="0.4983" k3="-0.2086"/>
++            <vignetting model="pa" focal="20" aperture="13" distance="1000" k1="-0.8241" k2="0.4983" k3="-0.2086"/>
++            <vignetting model="pa" focal="20" aperture="14" distance="0.25" k1="-0.8094" k2="0.4441" k3="-0.1537"/>
++            <vignetting model="pa" focal="20" aperture="14" distance="1000" k1="-0.8094" k2="0.4441" k3="-0.1537"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="0.25" k1="-0.7928" k2="0.3822" k3="-0.0872"/>
++            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.7928" k2="0.3822" k3="-0.0872"/>
++            <vignetting model="pa" focal="20" aperture="18" distance="0.25" k1="-0.7822" k2="0.3323" k3="-0.0442"/>
++            <vignetting model="pa" focal="20" aperture="18" distance="1000" k1="-0.7822" k2="0.3323" k3="-0.0442"/>
++            <vignetting model="pa" focal="20" aperture="20" distance="0.25" k1="-0.7919" k2="0.3651" k3="-0.0639"/>
++            <vignetting model="pa" focal="20" aperture="20" distance="1000" k1="-0.7919" k2="0.3651" k3="-0.0639"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="0.25" k1="-0.7887" k2="0.3400" k3="-0.0470"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.7887" k2="0.3400" k3="-0.0470"/>
++            <vignetting model="pa" focal="20" aperture="25" distance="0.25" k1="-0.8056" k2="0.3845" k3="-0.0731"/>
++            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.8056" k2="0.3845" k3="-0.0731"/>
++            <vignetting model="pa" focal="20" aperture="29" distance="0.25" k1="-0.7907" k2="0.3370" k3="-0.0456"/>
++            <vignetting model="pa" focal="20" aperture="29" distance="1000" k1="-0.7907" k2="0.3370" k3="-0.0456"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.25" k1="-1.3321" k2="1.1361" k3="-0.4297"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-1.3321" k2="1.1361" k3="-0.4297"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="0.25" k1="-1.1956" k2="0.8120" k3="-0.2352"/>
++            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-1.1956" k2="0.8120" k3="-0.2352"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="0.25" k1="-0.8522" k2="0.0699" k3="0.1837"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.8522" k2="0.0699" k3="0.1837"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.25" k1="-0.7048" k2="-0.1125" k3="0.2381"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.7048" k2="-0.1125" k3="0.2381"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="0.25" k1="-0.6788" k2="-0.0057" k3="0.1216"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6788" k2="-0.0057" k3="0.1216"/>
++            <vignetting model="pa" focal="24" aperture="10" distance="0.25" k1="-0.7379" k2="0.2645" k3="-0.0728"/>
++            <vignetting model="pa" focal="24" aperture="10" distance="1000" k1="-0.7379" k2="0.2645" k3="-0.0728"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="0.25" k1="-0.7776" k2="0.4425" k3="-0.1865"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7776" k2="0.4425" k3="-0.1865"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="0.25" k1="-0.8024" k2="0.4952" k3="-0.1942"/>
++            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.8024" k2="0.4952" k3="-0.1942"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="0.25" k1="-0.7824" k2="0.4222" k3="-0.1222"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.7824" k2="0.4222" k3="-0.1222"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="0.25" k1="-0.7849" k2="0.4025" k3="-0.0908"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.7849" k2="0.4025" k3="-0.0908"/>
++            <vignetting model="pa" focal="24" aperture="18" distance="0.25" k1="-0.7711" k2="0.3708" k3="-0.0715"/>
++            <vignetting model="pa" focal="24" aperture="18" distance="1000" k1="-0.7711" k2="0.3708" k3="-0.0715"/>
++            <vignetting model="pa" focal="24" aperture="20" distance="0.25" k1="-0.7837" k2="0.3962" k3="-0.0845"/>
++            <vignetting model="pa" focal="24" aperture="20" distance="1000" k1="-0.7837" k2="0.3962" k3="-0.0845"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.25" k1="-0.7804" k2="0.3907" k3="-0.0832"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7804" k2="0.3907" k3="-0.0832"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="0.25" k1="-0.7893" k2="0.4084" k3="-0.0928"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.7893" k2="0.4084" k3="-0.0928"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="0.25" k1="-0.7691" k2="0.3742" k3="-0.0778"/>
++            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.7691" k2="0.3742" k3="-0.0778"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 15-30mm f/3.5-4.5 EX DG</model>
++        <model>Sigma 15-30mm f/3.5-4.5 EX DG Aspherical</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Minolta AF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <distortion model="ptlens" focal="15" a="0.02055" b="-0.04027" c="-0.02834"/>
++            <distortion model="ptlens" focal="17" a="0.02167" b="-0.04381" c="-0.01554"/>
++            <distortion model="ptlens" focal="20" a="0.0205" b="-0.0443" c="0.00636"/>
++            <distortion model="ptlens" focal="25" a="0.0146" b="-0.02831" c="0.00891"/>
++            <distortion model="ptlens" focal="30" a="0.0126" b="-0.02092" c="0.00975"/>
++            <tca model="poly3" focal="15" br="0.0000133" vr="1.0001606" bb="0.0000095" vb="1.0003035"/>
++            <tca model="poly3" focal="17" br="0.0000619" vr="1.0000477" bb="-0.0000246" vb="1.0004165"/>
++            <tca model="poly3" focal="20" br="0.0000381" vr="0.9999911" bb="-0.0000435" vb="1.0005025"/>
++            <tca model="poly3" focal="25" br="0.0000555" vr="0.9999010" bb="-0.0000298" vb="1.0005290"/>
++            <tca model="poly3" focal="30" br="0.0000225" vr="0.9999106" bb="-0.0000018" vb="1.0005002"/>
++            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-2.3053" k2="2.6815" k3="-1.2003"/>
++            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-2.3053" k2="2.6815" k3="-1.2003"/>
++            <vignetting model="pa" focal="15" aperture="5" distance="10" k1="-0.9739" k2="-0.0556" k3="0.2982"/>
++            <vignetting model="pa" focal="15" aperture="5" distance="1000" k1="-0.9739" k2="-0.0556" k3="0.2982"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.9322" k2="0.7749" k3="-0.4471"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.9322" k2="0.7749" k3="-0.4471"/>
++            <vignetting model="pa" focal="15" aperture="10" distance="10" k1="-0.8190" k2="0.3867" k3="-0.0946"/>
++            <vignetting model="pa" focal="15" aperture="10" distance="1000" k1="-0.8190" k2="0.3867" k3="-0.0946"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.8255" k2="0.2899" k3="0.0298"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.8255" k2="0.2899" k3="0.0298"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="10" k1="-2.1980" k2="2.5062" k3="-1.1151"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="1000" k1="-2.1980" k2="2.5062" k3="-1.1151"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="10" k1="-1.0095" k2="-0.0682" k3="0.3577"/>
++            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-1.0095" k2="-0.0682" k3="0.3577"/>
++            <vignetting model="pa" focal="17" aperture="7.1" distance="10" k1="-0.6982" k2="0.1134" k3="0.0158"/>
++            <vignetting model="pa" focal="17" aperture="7.1" distance="1000" k1="-0.6982" k2="0.1134" k3="0.0158"/>
++            <vignetting model="pa" focal="17" aperture="10" distance="10" k1="-0.7328" k2="0.2436" k3="-0.0100"/>
++            <vignetting model="pa" focal="17" aperture="10" distance="1000" k1="-0.7328" k2="0.2436" k3="-0.0100"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.7611" k2="0.3010" k3="-0.0458"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.7611" k2="0.3010" k3="-0.0458"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-1.9625" k2="2.0629" k3="-0.8657"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-1.9625" k2="2.0629" k3="-0.8657"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.6358" k2="-0.3533" k3="0.3837"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.6358" k2="-0.3533" k3="0.3837"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.6878" k2="0.1780" k3="-0.0202"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.6878" k2="0.1780" k3="-0.0202"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.6951" k2="0.1735" k3="0.0501"/>
++            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.6951" k2="0.1735" k3="0.0501"/>
++            <vignetting model="pa" focal="20" aperture="25" distance="10" k1="-0.7462" k2="0.2192" k3="0.0423"/>
++            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.7462" k2="0.2192" k3="0.0423"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="10" k1="-1.5852" k2="1.2563" k3="-0.4023"/>
++            <vignetting model="pa" focal="25" aperture="4.5" distance="1000" k1="-1.5852" k2="1.2563" k3="-0.4023"/>
++            <vignetting model="pa" focal="25" aperture="6.3" distance="10" k1="-0.6276" k2="-0.5102" k3="0.5213"/>
++            <vignetting model="pa" focal="25" aperture="6.3" distance="1000" k1="-0.6276" k2="-0.5102" k3="0.5213"/>
++            <vignetting model="pa" focal="25" aperture="9" distance="10" k1="-0.6349" k2="0.0050" k3="0.0614"/>
++            <vignetting model="pa" focal="25" aperture="9" distance="1000" k1="-0.6349" k2="0.0050" k3="0.0614"/>
++            <vignetting model="pa" focal="25" aperture="13" distance="10" k1="-0.7127" k2="0.2527" k3="-0.0429"/>
++            <vignetting model="pa" focal="25" aperture="13" distance="1000" k1="-0.7127" k2="0.2527" k3="-0.0429"/>
++            <vignetting model="pa" focal="25" aperture="29" distance="10" k1="-0.6612" k2="0.0878" k3="0.0986"/>
++            <vignetting model="pa" focal="25" aperture="29" distance="1000" k1="-0.6612" k2="0.0878" k3="0.0986"/>
++            <vignetting model="pa" focal="30" aperture="4.5" distance="10" k1="-1.2491" k2="0.6445" k3="-0.0825"/>
++            <vignetting model="pa" focal="30" aperture="4.5" distance="1000" k1="-1.2491" k2="0.6445" k3="-0.0825"/>
++            <vignetting model="pa" focal="30" aperture="6.3" distance="10" k1="-0.6421" k2="-0.5574" k3="0.5667"/>
++            <vignetting model="pa" focal="30" aperture="6.3" distance="1000" k1="-0.6421" k2="-0.5574" k3="0.5667"/>
++            <vignetting model="pa" focal="30" aperture="9" distance="10" k1="-0.5351" k2="-0.3070" k3="0.2430"/>
++            <vignetting model="pa" focal="30" aperture="9" distance="1000" k1="-0.5351" k2="-0.3070" k3="0.2430"/>
++            <vignetting model="pa" focal="30" aperture="13" distance="10" k1="-0.7173" k2="0.3428" k3="-0.1687"/>
++            <vignetting model="pa" focal="30" aperture="13" distance="1000" k1="-0.7173" k2="0.3428" k3="-0.1687"/>
++            <vignetting model="pa" focal="30" aperture="29" distance="10" k1="-0.6824" k2="0.1567" k3="0.0547"/>
++            <vignetting model="pa" focal="30" aperture="29" distance="1000" k1="-0.6824" k2="0.1567" k3="0.0547"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 15-30mm f/3.5-4.5 EX DG Aspherical</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="15" a="0.009928" b="-0.033322" c="0" />
+-            <distortion model="ptlens" focal="17" a="0.006714" b="-0.023166" c="0" />
+-            <distortion model="ptlens" focal="18" a="0.00878" b="-0.025329" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.010135" b="-0.026175" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.007144" b="-0.018882" c="0" />
+-            <distortion model="ptlens" focal="25" a="0.009469" b="-0.02075" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.008222" b="-0.017584" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.006456" b="-0.012099" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.004942" b="-0.008935" c="0" />
++            <distortion model="ptlens" focal="15" a="0.009928" b="-0.033322" c="0"/>
++            <distortion model="ptlens" focal="17" a="0.006714" b="-0.023166" c="0"/>
++            <distortion model="ptlens" focal="18" a="0.00878" b="-0.025329" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.010135" b="-0.026175" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.007144" b="-0.018882" c="0"/>
++            <distortion model="ptlens" focal="25" a="0.009469" b="-0.02075" c="0"/>
++            <distortion model="ptlens" focal="26" a="0.008222" b="-0.017584" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.006456" b="-0.012099" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.004942" b="-0.008935" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 17-35mm f/2.8-4 EX DG</model>
+@@ -245,16 +519,16 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.007263" b="-0.02454" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.006421" b="-0.021536" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.008849" b="-0.023843" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="-0.004158" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.002715" c="0" />
++            <distortion model="ptlens" focal="17" a="0.007263" b="-0.02454" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.006421" b="-0.021536" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.008849" b="-0.023843" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="-0.004158" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="-0.002715" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 17-70mm f/2.8-4.5 DC Macro</model>
+@@ -263,19 +537,53 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.019088" b="-0.048894" c="0" />
+-            <distortion model="ptlens" focal="19" a="0.010938" b="-0.030356" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.01063" b="-0.026746" c="0" />
+-            <distortion model="ptlens" focal="25" a="0.001877" b="-0.005367" c="0" />
+-            <distortion model="ptlens" focal="30" a="-0.001844" b="0.003931" c="0" />
+-            <distortion model="ptlens" focal="40" a="-0.002705" b="0.008106" c="0" />
+-            <distortion model="ptlens" focal="53" a="0" b="0.003542" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.003858" c="0" />
++            <distortion model="ptlens" focal="17" a="0.019088" b="-0.048894" c="0"/>
++            <distortion model="ptlens" focal="19" a="0.010938" b="-0.030356" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.01063" b="-0.026746" c="0"/>
++            <distortion model="ptlens" focal="25" a="0.001877" b="-0.005367" c="0"/>
++            <distortion model="ptlens" focal="30" a="-0.001844" b="0.003931" c="0"/>
++            <distortion model="ptlens" focal="40" a="-0.002705" b="0.008106" c="0"/>
++            <distortion model="ptlens" focal="53" a="0" b="0.003542" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.003858" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 17-70mm f/2.8-4.5 DC Macro</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Minolta AF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <focal min="17" max="70"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A200 -->
++            <distortion model="ptlens" focal="17" a="0.031263" b="-0.089484" c="0.047399"/>
++            <distortion model="ptlens" focal="18" a="0.017675" b="-0.048197" c="0.014054"/>
++            <distortion model="ptlens" focal="20" a="0.014725" b="-0.040264" c="0.012628"/>
++            <distortion model="ptlens" focal="24" a="0.008501" b="-0.023096" c="0.009412"/>
++            <distortion model="ptlens" focal="28" a="0.003668" b="-0.010545" c="0.008709"/>
++            <distortion model="ptlens" focal="35" a="-0.001997" b="0.009906" c="-0.008335"/>
++            <distortion model="ptlens" focal="40" a="0.003405" b="-0.008959" c="0.014824"/>
++            <distortion model="ptlens" focal="55" a="0.004657" b="-0.013650" c="0.019375"/>
++            <distortion model="ptlens" focal="60" a="0.004897" b="-0.014984" c="0.021181"/>
++            <distortion model="ptlens" focal="70" a="0.002967" b="-0.006018" c="0.010103"/>
++            <tca model="poly3" focal="17" br="-0.0000294" vr="1.0004094" bb="0.0000336" vb="1.0001121"/>
++            <tca model="poly3" focal="18" br="-0.0000591" vr="1.0004470" bb="-0.0000243" vb="1.0001583"/>
++            <tca model="poly3" focal="20" br="-0.0000266" vr="1.0003825" bb="-0.0000132" vb="1.0001103"/>
++            <tca model="poly3" focal="24" br="-0.0000426" vr="1.0003567" bb="-0.0000248" vb="1.0001072"/>
++            <tca model="poly3" focal="28" br="-0.0000137" vr="1.0002523" bb="-0.0000325" vb="1.0000912"/>
++            <tca model="poly3" focal="35" br="-0.0000249" vr="1.0001652" bb="-0.0000519" vb="1.0000952"/>
++            <tca model="poly3" focal="40" br="0.0000041" vr="1.0000439" bb="-0.0000461" vb="1.0000461"/>
++            <tca model="poly3" focal="55" br="0.0000086" vr="0.9999241" bb="-0.0000332" vb="1.0000037"/>
++            <tca model="poly3" focal="60" br="0.0000021" vr="0.9998370" bb="-0.0000442" vb="1.0000019"/>
++            <tca model="poly3" focal="70" br="-0.0000229" vr="0.9997803" bb="-0.0000332" vb="0.9999803"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 18-50mm f/2.8 EX DC</model>
+@@ -283,16 +591,16 @@
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.012979" b="-0.036394" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.007147" b="-0.017687" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="34" a="0" b="0.001032" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.002512" c="0" />
++            <distortion model="ptlens" focal="18" a="0.012979" b="-0.036394" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.007147" b="-0.017687" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="34" a="0" b="0.001032" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.002512" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 18-50mm f/2.8 EX DC</model>
+@@ -300,18 +608,18 @@
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.011366" b="-0.034328" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.006142" b="-0.017401" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.0048" b="-0.013589" c="0" />
+-            <distortion model="ptlens" focal="28" a="0" b="0" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0.002094" c="0" />
+-            <distortion model="ptlens" focal="43" a="0" b="0.002878" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.003021" c="0" />
++            <distortion model="ptlens" focal="18" a="0.011366" b="-0.034328" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.006142" b="-0.017401" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.0048" b="-0.013589" c="0"/>
++            <distortion model="ptlens" focal="28" a="0" b="0" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.002094" c="0"/>
++            <distortion model="ptlens" focal="43" a="0" b="0.002878" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.003021" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 18-50mm f/3.5-5.6 DC</model>
+@@ -320,260 +628,234 @@
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.018244" b="-0.048901" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.013163" b="-0.038177" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.008797" b="-0.028701" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.004579" b="-0.017014" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.002405" b="-0.011562" c="0" />
+-            <distortion model="ptlens" focal="34" a="0.002363" b="-0.00852" c="0" />
+-            <distortion model="ptlens" focal="39" a="0" b="-0.002352" c="0" />
+-            <distortion model="ptlens" focal="44" a="0" b="-0.002108" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="-0.00147" c="0" />
++            <distortion model="ptlens" focal="18" a="0.018244" b="-0.048901" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.013163" b="-0.038177" c="0"/>
++            <distortion model="ptlens" focal="22" a="0.008797" b="-0.028701" c="0"/>
++            <distortion model="ptlens" focal="26" a="0.004579" b="-0.017014" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.002405" b="-0.011562" c="0"/>
++            <distortion model="ptlens" focal="34" a="0.002363" b="-0.00852" c="0"/>
++            <distortion model="ptlens" focal="39" a="0" b="-0.002352" c="0"/>
++            <distortion model="ptlens" focal="44" a="0" b="-0.002108" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="-0.00147" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 18-125mm f/3.5-5.6 (3.3-5.6) DC</model>
++        <model>Sigma 18-125mm f/3.5-5.6 DC</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.028249" b="-0.061326" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.008998" b="-0.008014" c="0" />
+-            <distortion model="ptlens" focal="38" a="0.004437" b="0.005654" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.011257" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.011071" c="0" />
+-            <distortion model="ptlens" focal="125" a="0" b="0.010822" c="0" />
++            <distortion model="ptlens" focal="18" a="0.028249" b="-0.061326" c="0"/>
++            <distortion model="ptlens" focal="26" a="0.008998" b="-0.008014" c="0"/>
++            <distortion model="ptlens" focal="38" a="0.004437" b="0.005654" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.011257" c="0"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.011071" c="0"/>
++            <distortion model="ptlens" focal="125" a="0" b="0.010822" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 18-125mm f/3.5-5.6 (3.3-5.6) DC</model>
++        <model>Sigma 18-125mm f/3.5-5.6 DC</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.02211" b="-0.050462" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.016565" b="-0.027307" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.011429" b="-0.013359" c="0" />
+-            <distortion model="ptlens" focal="38" a="0" b="0.012386" c="0" />
+-            <distortion model="ptlens" focal="51" a="0" b="0.013262" c="0" />
+-            <distortion model="ptlens" focal="67" a="0" b="0.011758" c="0" />
+-            <distortion model="ptlens" focal="87" a="0" b="0.011008" c="0" />
+-            <distortion model="ptlens" focal="109" a="0" b="0.01145" c="0" />
+-            <distortion model="ptlens" focal="125" a="0" b="0.009078" c="0" />
++            <distortion model="ptlens" focal="18" a="0.02211" b="-0.050462" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.016565" b="-0.027307" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.011429" b="-0.013359" c="0"/>
++            <distortion model="ptlens" focal="38" a="0" b="0.012386" c="0"/>
++            <distortion model="ptlens" focal="51" a="0" b="0.013262" c="0"/>
++            <distortion model="ptlens" focal="67" a="0" b="0.011758" c="0"/>
++            <distortion model="ptlens" focal="87" a="0" b="0.011008" c="0"/>
++            <distortion model="ptlens" focal="109" a="0" b="0.01145" c="0"/>
++            <distortion model="ptlens" focal="125" a="0" b="0.009078" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 18-200mm f/3.5-6.3 DC</model>
+         <mount>Sigma SA</mount>
+-        <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+-        <mount>Pentax KAF</mount>
+-        <cropfactor>1.5</cropfactor>
+-        <calibration>
+-            <distortion model="ptlens" focal="18" a="0.027521" b="-0.063244" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.016154" b="-0.029806" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.014824" b="-0.025689" c="0" />
+-            <distortion model="ptlens" focal="34" a="0.011421" b="-0.011743" c="0" />
+-            <distortion model="ptlens" focal="46" a="0" b="0.014338" c="0" />
+-            <distortion model="ptlens" focal="78" a="0" b="0.009621" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.012591" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.011133" c="0" />
+-        </calibration>
+-    </lens>
+-
+-    <lens>
+-	    <maker>Sigma</maker>
+-	    <model>Sigma 18-200mm f/3.5-6.3 DC</model>
+-	    <focal min="18" max="200" />
+-	    <aperture min="3.5" max="40" />
+-	    <mount>Nikon F AF</mount>
+         <mount>Canon EF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>Sony Alpha</mount>
+-	    <cropfactor>1.5</cropfactor>
+-	    <calibration>
+-	        <distortion focal="18" model="ptlens" a="0.0228732" b="-0.0665251" c="0.0172122" />
+-	        <distortion focal="26" model="ptlens" a="0.018288" b="-0.0421043" c="0.0335132" />
+-	        <distortion focal="34" model="ptlens" a="0.00457497" b="-0.000870647" c="-0.00027649" />
+-	        <distortion focal="53" model="ptlens" a="0.00342257" b="0.00447765" c="0.00439016" />
+-	        <distortion focal="93" model="ptlens" a="0.00259922" b="0.00679448" c="0.00154937" />
+-	        <distortion focal="133" model="ptlens" a="0.00133032" b="0.00707209" c="0.000924872" />
+-	        <distortion focal="200" model="ptlens" a="0.00197842" b="0.00390761" c="0.00418497" />
+-	        <tca model="poly3" focal="18" br="-0.0002192" vr="1.0007559" bb="-0.0000088" vb="1.0000705" />
+-            <tca model="poly3" focal="26" br="-0.0000847" vr="1.0004325" bb="-0.0000104" vb="1.0001260" />
+-            <tca model="poly3" focal="34" br="-0.0000453" vr="1.0002166" bb="-0.0000439" vb="1.0001923" />
+-            <tca model="poly3" focal="53" br="0.0000053" vr="0.9999933" bb="-0.0000536" vb="1.0001744" />
+-            <tca model="poly3" focal="75" br="0.0000586" vr="0.9996912" bb="-0.0000887" vb="1.0000717" />
+-            <tca model="poly3" focal="133" br="0.0000512" vr="0.9993431" bb="-0.0000351" vb="0.9996725" />
+-            <tca model="poly3" focal="200" br="0.0000367" vr="0.9991985" bb="-0.0000586" vb="0.9994523" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="0.45" k1="0.0561" k2="-1.7452" k3="1.0091" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1" k1="-0.0289" k2="-1.5905" k3="0.9372" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="4" k1="0.0715" k2="-1.7309" k3="1.0149" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="0.0139" k2="-1.5954" k3="0.9392" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="0.45" k1="0.0638" k2="-1.3743" k3="0.6728" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="1" k1="0.0830" k2="-1.3802" k3="0.6739" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="4" k1="0.0689" k2="-1.2806" k3="0.6209" />
+-            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="0.0358" k2="-1.2033" k3="0.5857" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="0.45" k1="-0.2548" k2="0.0222" k3="-0.2917" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2558" k2="-0.0178" k3="-0.2407" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="4" k1="-0.2443" k2="-0.0219" k3="-0.2048" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3025" k2="0.1080" k3="-0.2641" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="0.45" k1="-0.4403" k2="0.3847" k3="-0.3988" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.3258" k2="0.1392" k3="-0.2400" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="4" k1="-0.2540" k2="-0.0500" k3="-0.0623" />
+-            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3135" k2="0.0499" k3="-0.1005" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="0.45" k1="-0.3463" k2="0.0187" k3="-0.0572" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2446" k2="-0.1733" k3="0.0484" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="4" k1="-0.2416" k2="-0.1530" k3="0.0550" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2901" k2="-0.0814" k3="0.0170" />
+-            <vignetting model="pa" focal="26" aperture="4" distance="0.45" k1="-0.0498" k2="-0.8013" k3="0.3860" />
+-            <vignetting model="pa" focal="26" aperture="4" distance="1" k1="-0.0792" k2="-0.7385" k3="0.3605" />
+-            <vignetting model="pa" focal="26" aperture="4" distance="4" k1="-0.0106" k2="-0.8766" k3="0.4325" />
+-            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.0406" k2="-0.7830" k3="0.3862" />
+-            <vignetting model="pa" focal="26" aperture="5.6" distance="0.45" k1="-0.2453" k2="-0.0120" k3="-0.0498" />
+-            <vignetting model="pa" focal="26" aperture="5.6" distance="1" k1="-0.2147" k2="-0.0769" k3="0.0047" />
+-            <vignetting model="pa" focal="26" aperture="5.6" distance="4" k1="-0.2064" k2="-0.0631" k3="-0.0176" />
+-            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.2121" k2="-0.0436" k3="-0.0109" />
+-            <vignetting model="pa" focal="26" aperture="8" distance="0.45" k1="-0.2529" k2="-0.0676" k3="0.0486" />
+-            <vignetting model="pa" focal="26" aperture="8" distance="1" k1="-0.1997" k2="-0.1499" k3="0.0966" />
+-            <vignetting model="pa" focal="26" aperture="8" distance="4" k1="-0.1940" k2="-0.1444" k3="0.0846" />
+-            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.2108" k2="-0.0983" k3="0.0690" />
+-            <vignetting model="pa" focal="26" aperture="11" distance="0.45" k1="-0.2910" k2="0.0107" k3="0.0014" />
+-            <vignetting model="pa" focal="26" aperture="11" distance="1" k1="-0.2091" k2="-0.1210" k3="0.0778" />
+-            <vignetting model="pa" focal="26" aperture="11" distance="4" k1="-0.2125" k2="-0.1136" k3="0.0704" />
+-            <vignetting model="pa" focal="26" aperture="29" distance="0.45" k1="-0.2680" k2="-0.0298" k3="0.0224" />
+-            <vignetting model="pa" focal="26" aperture="29" distance="1" k1="-0.2006" k2="-0.1373" k3="0.0859" />
+-            <vignetting model="pa" focal="26" aperture="29" distance="4" k1="-0.2043" k2="-0.1184" k3="0.0709" />
+-            <vignetting model="pa" focal="26" aperture="29" distance="1000" k1="-0.2036" k2="-0.1019" k3="0.0675" />
+-            <vignetting model="pa" focal="34" aperture="4.5" distance="0.45" k1="-0.1521" k2="-0.1067" k3="0.0261" />
+-            <vignetting model="pa" focal="34" aperture="4.5" distance="1" k1="-0.0856" k2="-0.1734" k3="0.0577" />
+-            <vignetting model="pa" focal="34" aperture="4.5" distance="4" k1="-0.1080" k2="-0.1250" k3="0.0219" />
+-            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.1317" k2="-0.0758" k3="-0.0125" />
+-            <vignetting model="pa" focal="34" aperture="5.6" distance="0.45" k1="-0.1255" k2="-0.1221" k3="0.0843" />
+-            <vignetting model="pa" focal="34" aperture="5.6" distance="1" k1="-0.0767" k2="-0.1656" k3="0.1097" />
+-            <vignetting model="pa" focal="34" aperture="5.6" distance="4" k1="-0.0794" k2="-0.1560" k3="0.0993" />
+-            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.0933" k2="-0.1307" k3="0.0866" />
+-            <vignetting model="pa" focal="34" aperture="8" distance="0.45" k1="-0.1304" k2="-0.1192" k3="0.0905" />
+-            <vignetting model="pa" focal="34" aperture="8" distance="1" k1="-0.0914" k2="-0.1484" k3="0.1039" />
+-            <vignetting model="pa" focal="34" aperture="8" distance="4" k1="-0.0908" k2="-0.1404" k3="0.1016" />
+-            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1366" k2="-0.0578" k3="0.0561" />
+-            <vignetting model="pa" focal="34" aperture="11" distance="0.45" k1="-0.1539" k2="-0.0612" k3="0.0496" />
+-            <vignetting model="pa" focal="34" aperture="11" distance="1" k1="-0.0945" k2="-0.1265" k3="0.0801" />
+-            <vignetting model="pa" focal="34" aperture="11" distance="4" k1="-0.0925" k2="-0.1242" k3="0.0850" />
+-            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1393" k2="-0.0444" k3="0.0411" />
+-            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.2219" k2="-0.0700" k3="0.0495" />
+-            <vignetting model="pa" focal="34" aperture="29" distance="0.45" k1="-0.1594" k2="-0.0507" k3="0.0416" />
+-            <vignetting model="pa" focal="34" aperture="29" distance="1" k1="-0.1102" k2="-0.0951" k3="0.0620" />
+-            <vignetting model="pa" focal="34" aperture="29" distance="4" k1="-0.0773" k2="-0.1457" k3="0.0952" />
+-            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1253" k2="-0.0646" k3="0.0530" />
+-            <vignetting model="pa" focal="53" aperture="4.5" distance="0.45" k1="-0.1613" k2="0.1467" k3="-0.1679" />
+-            <vignetting model="pa" focal="53" aperture="4.5" distance="1" k1="-0.1950" k2="0.3214" k3="-0.3494" />
+-            <vignetting model="pa" focal="53" aperture="4.5" distance="4" k1="-0.2448" k2="0.4748" k3="-0.4793" />
+-            <vignetting model="pa" focal="53" aperture="4.5" distance="1000" k1="-0.2396" k2="0.4808" k3="-0.4952" />
+-            <vignetting model="pa" focal="53" aperture="5.6" distance="0.45" k1="-0.1155" k2="0.0449" k3="-0.0848" />
+-            <vignetting model="pa" focal="53" aperture="5.6" distance="1" k1="-0.1759" k2="0.2645" k3="-0.2855" />
+-            <vignetting model="pa" focal="53" aperture="5.6" distance="4" k1="-0.1905" k2="0.3421" k3="-0.3569" />
+-            <vignetting model="pa" focal="53" aperture="5.6" distance="1000" k1="-0.2099" k2="0.4113" k3="-0.4280" />
+-            <vignetting model="pa" focal="53" aperture="8" distance="0.45" k1="-0.0637" k2="-0.1283" k3="0.0959" />
+-            <vignetting model="pa" focal="53" aperture="8" distance="1" k1="-0.0361" k2="-0.1636" k3="0.1054" />
+-            <vignetting model="pa" focal="53" aperture="8" distance="4" k1="-0.1037" k2="-0.0084" k3="0.0112" />
+-            <vignetting model="pa" focal="53" aperture="8" distance="1000" k1="-0.0727" k2="-0.0649" k3="0.0334" />
+-            <vignetting model="pa" focal="53" aperture="11" distance="0.45" k1="-0.1006" k2="-0.0635" k3="0.0547" />
+-            <vignetting model="pa" focal="53" aperture="11" distance="1" k1="-0.0886" k2="-0.0670" k3="0.0537" />
+-            <vignetting model="pa" focal="53" aperture="11" distance="4" k1="-0.1109" k2="-0.0054" k3="0.0251" />
+-            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.0814" k2="-0.0586" k3="0.0369" />
+-            <vignetting model="pa" focal="53" aperture="32" distance="0.45" k1="-0.0917" k2="-0.0796" k3="0.0647" />
+-            <vignetting model="pa" focal="53" aperture="32" distance="1" k1="-0.1384" k2="0.0327" k3="-0.0111" />
+-            <vignetting model="pa" focal="53" aperture="32" distance="4" k1="-0.0953" k2="-0.0356" k3="0.0352" />
+-            <vignetting model="pa" focal="53" aperture="32" distance="1000" k1="-0.0811" k2="-0.0663" k3="0.0465" />
+-            <vignetting model="pa" focal="75" aperture="5.6" distance="0.45" k1="-0.3058" k2="0.9778" k3="-1.0037" />
+-            <vignetting model="pa" focal="75" aperture="5.6" distance="1" k1="-0.2130" k2="0.6270" k3="-0.7830" />
+-            <vignetting model="pa" focal="75" aperture="5.6" distance="4" k1="-0.1325" k2="0.4262" k3="-0.6604" />
+-            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.1053" k2="0.2541" k3="-0.5259" />
+-            <vignetting model="pa" focal="75" aperture="8" distance="0.45" k1="-0.2084" k2="0.6863" k3="-0.6819" />
+-            <vignetting model="pa" focal="75" aperture="8" distance="1" k1="-0.2381" k2="0.6803" k3="-0.6722" />
+-            <vignetting model="pa" focal="75" aperture="8" distance="4" k1="-0.1854" k2="0.6112" k3="-0.6342" />
+-            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1816" k2="0.5441" k3="-0.5800" />
+-            <vignetting model="pa" focal="75" aperture="11" distance="0.45" k1="-0.0931" k2="0.1812" k3="-0.1995" />
+-            <vignetting model="pa" focal="75" aperture="11" distance="1" k1="-0.1372" k2="0.2263" k3="-0.2030" />
+-            <vignetting model="pa" focal="75" aperture="11" distance="4" k1="-0.0932" k2="0.1592" k3="-0.1629" />
+-            <vignetting model="pa" focal="75" aperture="11" distance="1000" k1="-0.1029" k2="0.1502" k3="-0.1544" />
+-            <vignetting model="pa" focal="75" aperture="16" distance="0.45" k1="-0.0184" k2="-0.0771" k3="0.0287" />
+-            <vignetting model="pa" focal="75" aperture="16" distance="1" k1="-0.0864" k2="0.0063" k3="0.0161" />
+-            <vignetting model="pa" focal="75" aperture="16" distance="4" k1="-0.0288" k2="-0.0848" k3="0.0566" />
+-            <vignetting model="pa" focal="75" aperture="16" distance="1000" k1="-0.0529" k2="-0.0619" k3="0.0445" />
+-            <vignetting model="pa" focal="75" aperture="32" distance="0.45" k1="0.0032" k2="-0.1516" k3="0.0901" />
+-            <vignetting model="pa" focal="75" aperture="32" distance="1" k1="-0.0706" k2="-0.0341" k3="0.0431" />
+-            <vignetting model="pa" focal="75" aperture="32" distance="4" k1="-0.0321" k2="-0.0891" k3="0.0636" />
+-            <vignetting model="pa" focal="75" aperture="32" distance="1000" k1="-0.0623" k2="-0.0494" k3="0.0401" />
+-            <vignetting model="pa" focal="133" aperture="5.6" distance="0.45" k1="-0.3444" k2="1.2741" k3="-1.4204" />
+-            <vignetting model="pa" focal="133" aperture="5.6" distance="1" k1="0.0389" k2="-0.1257" k3="-0.3641" />
+-            <vignetting model="pa" focal="133" aperture="5.6" distance="4" k1="0.2459" k2="-0.9960" k3="0.3105" />
+-            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="0.2527" k2="-1.3451" k3="0.6534" />
+-            <vignetting model="pa" focal="133" aperture="8" distance="0.45" k1="-0.3808" k2="1.4551" k3="-1.4593" />
+-            <vignetting model="pa" focal="133" aperture="8" distance="1" k1="-0.2045" k2="0.7616" k3="-0.8815" />
+-            <vignetting model="pa" focal="133" aperture="8" distance="4" k1="0.0064" k2="0.0581" k3="-0.3979" />
+-            <vignetting model="pa" focal="133" aperture="8" distance="1000" k1="0.0437" k2="-0.1861" k3="-0.1812" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="0.45" k1="-0.4039" k2="1.4018" k3="-1.3022" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="1" k1="-0.2672" k2="0.8241" k3="-0.7684" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="4" k1="-0.1997" k2="0.5964" k3="-0.5871" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.1886" k2="0.4848" k3="-0.4867" />
+-            <vignetting model="pa" focal="133" aperture="16" distance="0.45" k1="-0.2997" k2="1.0220" k3="-0.9494" />
+-            <vignetting model="pa" focal="133" aperture="16" distance="1" k1="-0.1542" k2="0.3239" k3="-0.2737" />
+-            <vignetting model="pa" focal="133" aperture="16" distance="4" k1="-0.1178" k2="0.1968" k3="-0.1668" />
+-            <vignetting model="pa" focal="133" aperture="16" distance="1000" k1="-0.0878" k2="0.0416" k3="-0.0316" />
+-            <vignetting model="pa" focal="133" aperture="40" distance="0.45" k1="-0.2190" k2="0.6797" k3="-0.6345" />
+-            <vignetting model="pa" focal="133" aperture="40" distance="1" k1="-0.0797" k2="0.0199" k3="0.0041" />
+-            <vignetting model="pa" focal="133" aperture="40" distance="4" k1="-0.0644" k2="-0.0116" k3="0.0198" />
+-            <vignetting model="pa" focal="133" aperture="40" distance="1000" k1="-0.0949" k2="0.0287" k3="-0.0072" />
+-            <vignetting model="pa" focal="170" aperture="6.3" distance="0.45" k1="-0.3387" k2="1.2022" k3="-1.3019" />
+-            <vignetting model="pa" focal="170" aperture="6.3" distance="1" k1="0.0272" k2="-0.1576" k3="-0.3054" />
+-            <vignetting model="pa" focal="170" aperture="6.3" distance="4" k1="0.2076" k2="-1.0558" k3="0.4218" />
+-            <vignetting model="pa" focal="170" aperture="6.3" distance="1000" k1="0.0154" k2="-1.1798" k3="0.7404" />
+-            <vignetting model="pa" focal="200" aperture="6.7" distance="0.45" k1="-0.3149" k2="1.1537" k3="-1.2549" />
+-            <vignetting model="pa" focal="200" aperture="6.7" distance="1" k1="0.0545" k2="-0.2118" k3="-0.2621" />
+-            <vignetting model="pa" focal="200" aperture="6.7" distance="4" k1="0.2390" k2="-1.1473" k3="0.4895" />
+-            <vignetting model="pa" focal="200" aperture="6.7" distance="1000" k1="-0.0572" k2="-1.0925" k3="0.7256" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="0.45" k1="-0.3109" k2="1.1656" k3="-1.1653" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="1" k1="-0.0715" k2="0.3291" k3="-0.5879" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="4" k1="0.1187" k2="-0.4118" k3="-0.0379" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1998" k2="-1.1568" k3="0.6299" />
+-            <vignetting model="pa" focal="200" aperture="11" distance="0.45" k1="-0.2823" k2="0.9536" k3="-0.8912" />
+-            <vignetting model="pa" focal="200" aperture="11" distance="1" k1="-0.2255" k2="0.6911" k3="-0.6578" />
+-            <vignetting model="pa" focal="200" aperture="11" distance="4" k1="-0.1710" k2="0.4856" k3="-0.5108" />
+-            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0806" k2="0.1720" k3="-0.2760" />
+-            <vignetting model="pa" focal="200" aperture="16" distance="0.45" k1="-0.1484" k2="0.4327" k3="-0.4165" />
+-            <vignetting model="pa" focal="200" aperture="16" distance="1" k1="-0.1046" k2="0.1561" k3="-0.1258" />
+-            <vignetting model="pa" focal="200" aperture="16" distance="4" k1="-0.0793" k2="0.0578" k3="-0.0515" />
+-            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0668" k2="-0.0059" k3="0.0022" />
+-            <vignetting model="pa" focal="200" aperture="40" distance="0.45" k1="0.0102" k2="-0.0920" k3="0.0335" />
+-            <vignetting model="pa" focal="200" aperture="40" distance="1" k1="-0.0499" k2="-0.0351" k3="0.0417" />
+-            <vignetting model="pa" focal="200" aperture="40" distance="4" k1="-0.0623" k2="-0.0135" k3="0.0199" />
+-            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0744" k2="-0.0079" k3="0.0190" />
+-	        <field_of_view focal="18" fov="67.3129" />
+-	        <field_of_view focal="26" fov="49.4948" />
+-	        <field_of_view focal="34" fov="38.8343" />
+-	        <field_of_view focal="53" fov="25.6397" />
+-	        <field_of_view focal="93" fov="14.7385" />
+-	        <field_of_view focal="133" fov="10.3239" />
+-	        <field_of_view focal="200" fov="6.85855" />
+-	    </calibration>
++        <focal min="18" max="200"/>
++        <aperture min="3.5" max="40"/>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion focal="18" model="ptlens" a="0.0228732" b="-0.0665251" c="0.0172122"/>
++            <distortion focal="26" model="ptlens" a="0.018288" b="-0.0421043" c="0.0335132"/>
++            <distortion focal="34" model="ptlens" a="0.00457497" b="-0.000870647" c="-0.00027649"/>
++            <distortion focal="53" model="ptlens" a="0.00342257" b="0.00447765" c="0.00439016"/>
++            <distortion focal="93" model="ptlens" a="0.00259922" b="0.00679448" c="0.00154937"/>
++            <distortion focal="133" model="ptlens" a="0.00133032" b="0.00707209" c="0.000924872"/>
++            <distortion focal="200" model="ptlens" a="0.00197842" b="0.00390761" c="0.00418497"/>
++            <tca model="poly3" focal="18" br="-0.0002192" vr="1.0007559" bb="-0.0000088" vb="1.0000705"/>
++            <tca model="poly3" focal="26" br="-0.0000847" vr="1.0004325" bb="-0.0000104" vb="1.0001260"/>
++            <tca model="poly3" focal="34" br="-0.0000453" vr="1.0002166" bb="-0.0000439" vb="1.0001923"/>
++            <tca model="poly3" focal="53" br="0.0000053" vr="0.9999933" bb="-0.0000536" vb="1.0001744"/>
++            <tca model="poly3" focal="75" br="0.0000586" vr="0.9996912" bb="-0.0000887" vb="1.0000717"/>
++            <tca model="poly3" focal="133" br="0.0000512" vr="0.9993431" bb="-0.0000351" vb="0.9996725"/>
++            <tca model="poly3" focal="200" br="0.0000367" vr="0.9991985" bb="-0.0000586" vb="0.9994523"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="0.45" k1="0.0561" k2="-1.7452" k3="1.0091"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1" k1="-0.0289" k2="-1.5905" k3="0.9372"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="4" k1="0.0715" k2="-1.7309" k3="1.0149"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="0.0139" k2="-1.5954" k3="0.9392"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="0.45" k1="0.0638" k2="-1.3743" k3="0.6728"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1" k1="0.0830" k2="-1.3802" k3="0.6739"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="4" k1="0.0689" k2="-1.2806" k3="0.6209"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="0.0358" k2="-1.2033" k3="0.5857"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="0.45" k1="-0.2548" k2="0.0222" k3="-0.2917"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2558" k2="-0.0178" k3="-0.2407"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="4" k1="-0.2443" k2="-0.0219" k3="-0.2048"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3025" k2="0.1080" k3="-0.2641"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="0.45" k1="-0.4403" k2="0.3847" k3="-0.3988"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.3258" k2="0.1392" k3="-0.2400"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="4" k1="-0.2540" k2="-0.0500" k3="-0.0623"/>
++            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3135" k2="0.0499" k3="-0.1005"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="0.45" k1="-0.3463" k2="0.0187" k3="-0.0572"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2446" k2="-0.1733" k3="0.0484"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="4" k1="-0.2416" k2="-0.1530" k3="0.0550"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2901" k2="-0.0814" k3="0.0170"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="0.45" k1="-0.0498" k2="-0.8013" k3="0.3860"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="1" k1="-0.0792" k2="-0.7385" k3="0.3605"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="4" k1="-0.0106" k2="-0.8766" k3="0.4325"/>
++            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.0406" k2="-0.7830" k3="0.3862"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="0.45" k1="-0.2453" k2="-0.0120" k3="-0.0498"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1" k1="-0.2147" k2="-0.0769" k3="0.0047"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="4" k1="-0.2064" k2="-0.0631" k3="-0.0176"/>
++            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.2121" k2="-0.0436" k3="-0.0109"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="0.45" k1="-0.2529" k2="-0.0676" k3="0.0486"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1" k1="-0.1997" k2="-0.1499" k3="0.0966"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="4" k1="-0.1940" k2="-0.1444" k3="0.0846"/>
++            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.2108" k2="-0.0983" k3="0.0690"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="0.45" k1="-0.2910" k2="0.0107" k3="0.0014"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="1" k1="-0.2091" k2="-0.1210" k3="0.0778"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="4" k1="-0.2125" k2="-0.1136" k3="0.0704"/>
++            <vignetting model="pa" focal="26" aperture="29" distance="0.45" k1="-0.2680" k2="-0.0298" k3="0.0224"/>
++            <vignetting model="pa" focal="26" aperture="29" distance="1" k1="-0.2006" k2="-0.1373" k3="0.0859"/>
++            <vignetting model="pa" focal="26" aperture="29" distance="4" k1="-0.2043" k2="-0.1184" k3="0.0709"/>
++            <vignetting model="pa" focal="26" aperture="29" distance="1000" k1="-0.2036" k2="-0.1019" k3="0.0675"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="0.45" k1="-0.1521" k2="-0.1067" k3="0.0261"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1" k1="-0.0856" k2="-0.1734" k3="0.0577"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="4" k1="-0.1080" k2="-0.1250" k3="0.0219"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.1317" k2="-0.0758" k3="-0.0125"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="0.45" k1="-0.1255" k2="-0.1221" k3="0.0843"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1" k1="-0.0767" k2="-0.1656" k3="0.1097"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="4" k1="-0.0794" k2="-0.1560" k3="0.0993"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.0933" k2="-0.1307" k3="0.0866"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="0.45" k1="-0.1304" k2="-0.1192" k3="0.0905"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1" k1="-0.0914" k2="-0.1484" k3="0.1039"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="4" k1="-0.0908" k2="-0.1404" k3="0.1016"/>
++            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1366" k2="-0.0578" k3="0.0561"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="0.45" k1="-0.1539" k2="-0.0612" k3="0.0496"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1" k1="-0.0945" k2="-0.1265" k3="0.0801"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="4" k1="-0.0925" k2="-0.1242" k3="0.0850"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1393" k2="-0.0444" k3="0.0411"/>
++            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.2219" k2="-0.0700" k3="0.0495"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="0.45" k1="-0.1594" k2="-0.0507" k3="0.0416"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="1" k1="-0.1102" k2="-0.0951" k3="0.0620"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="4" k1="-0.0773" k2="-0.1457" k3="0.0952"/>
++            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1253" k2="-0.0646" k3="0.0530"/>
++            <vignetting model="pa" focal="53" aperture="4.5" distance="0.45" k1="-0.1613" k2="0.1467" k3="-0.1679"/>
++            <vignetting model="pa" focal="53" aperture="4.5" distance="1" k1="-0.1950" k2="0.3214" k3="-0.3494"/>
++            <vignetting model="pa" focal="53" aperture="4.5" distance="4" k1="-0.2448" k2="0.4748" k3="-0.4793"/>
++            <vignetting model="pa" focal="53" aperture="4.5" distance="1000" k1="-0.2396" k2="0.4808" k3="-0.4952"/>
++            <vignetting model="pa" focal="53" aperture="5.6" distance="0.45" k1="-0.1155" k2="0.0449" k3="-0.0848"/>
++            <vignetting model="pa" focal="53" aperture="5.6" distance="1" k1="-0.1759" k2="0.2645" k3="-0.2855"/>
++            <vignetting model="pa" focal="53" aperture="5.6" distance="4" k1="-0.1905" k2="0.3421" k3="-0.3569"/>
++            <vignetting model="pa" focal="53" aperture="5.6" distance="1000" k1="-0.2099" k2="0.4113" k3="-0.4280"/>
++            <vignetting model="pa" focal="53" aperture="8" distance="0.45" k1="-0.0637" k2="-0.1283" k3="0.0959"/>
++            <vignetting model="pa" focal="53" aperture="8" distance="1" k1="-0.0361" k2="-0.1636" k3="0.1054"/>
++            <vignetting model="pa" focal="53" aperture="8" distance="4" k1="-0.1037" k2="-0.0084" k3="0.0112"/>
++            <vignetting model="pa" focal="53" aperture="8" distance="1000" k1="-0.0727" k2="-0.0649" k3="0.0334"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="0.45" k1="-0.1006" k2="-0.0635" k3="0.0547"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="1" k1="-0.0886" k2="-0.0670" k3="0.0537"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="4" k1="-0.1109" k2="-0.0054" k3="0.0251"/>
++            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.0814" k2="-0.0586" k3="0.0369"/>
++            <vignetting model="pa" focal="53" aperture="32" distance="0.45" k1="-0.0917" k2="-0.0796" k3="0.0647"/>
++            <vignetting model="pa" focal="53" aperture="32" distance="1" k1="-0.1384" k2="0.0327" k3="-0.0111"/>
++            <vignetting model="pa" focal="53" aperture="32" distance="4" k1="-0.0953" k2="-0.0356" k3="0.0352"/>
++            <vignetting model="pa" focal="53" aperture="32" distance="1000" k1="-0.0811" k2="-0.0663" k3="0.0465"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="0.45" k1="-0.3058" k2="0.9778" k3="-1.0037"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="1" k1="-0.2130" k2="0.6270" k3="-0.7830"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="4" k1="-0.1325" k2="0.4262" k3="-0.6604"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.1053" k2="0.2541" k3="-0.5259"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="0.45" k1="-0.2084" k2="0.6863" k3="-0.6819"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="1" k1="-0.2381" k2="0.6803" k3="-0.6722"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="4" k1="-0.1854" k2="0.6112" k3="-0.6342"/>
++            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1816" k2="0.5441" k3="-0.5800"/>
++            <vignetting model="pa" focal="75" aperture="11" distance="0.45" k1="-0.0931" k2="0.1812" k3="-0.1995"/>
++            <vignetting model="pa" focal="75" aperture="11" distance="1" k1="-0.1372" k2="0.2263" k3="-0.2030"/>
++            <vignetting model="pa" focal="75" aperture="11" distance="4" k1="-0.0932" k2="0.1592" k3="-0.1629"/>
++            <vignetting model="pa" focal="75" aperture="11" distance="1000" k1="-0.1029" k2="0.1502" k3="-0.1544"/>
++            <vignetting model="pa" focal="75" aperture="16" distance="0.45" k1="-0.0184" k2="-0.0771" k3="0.0287"/>
++            <vignetting model="pa" focal="75" aperture="16" distance="1" k1="-0.0864" k2="0.0063" k3="0.0161"/>
++            <vignetting model="pa" focal="75" aperture="16" distance="4" k1="-0.0288" k2="-0.0848" k3="0.0566"/>
++            <vignetting model="pa" focal="75" aperture="16" distance="1000" k1="-0.0529" k2="-0.0619" k3="0.0445"/>
++            <vignetting model="pa" focal="75" aperture="32" distance="0.45" k1="0.0032" k2="-0.1516" k3="0.0901"/>
++            <vignetting model="pa" focal="75" aperture="32" distance="1" k1="-0.0706" k2="-0.0341" k3="0.0431"/>
++            <vignetting model="pa" focal="75" aperture="32" distance="4" k1="-0.0321" k2="-0.0891" k3="0.0636"/>
++            <vignetting model="pa" focal="75" aperture="32" distance="1000" k1="-0.0623" k2="-0.0494" k3="0.0401"/>
++            <vignetting model="pa" focal="133" aperture="5.6" distance="0.45" k1="-0.3444" k2="1.2741" k3="-1.4204"/>
++            <vignetting model="pa" focal="133" aperture="5.6" distance="1" k1="0.0389" k2="-0.1257" k3="-0.3641"/>
++            <vignetting model="pa" focal="133" aperture="5.6" distance="4" k1="0.2459" k2="-0.9960" k3="0.3105"/>
++            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="0.2527" k2="-1.3451" k3="0.6534"/>
++            <vignetting model="pa" focal="133" aperture="8" distance="0.45" k1="-0.3808" k2="1.4551" k3="-1.4593"/>
++            <vignetting model="pa" focal="133" aperture="8" distance="1" k1="-0.2045" k2="0.7616" k3="-0.8815"/>
++            <vignetting model="pa" focal="133" aperture="8" distance="4" k1="0.0064" k2="0.0581" k3="-0.3979"/>
++            <vignetting model="pa" focal="133" aperture="8" distance="1000" k1="0.0437" k2="-0.1861" k3="-0.1812"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="0.45" k1="-0.4039" k2="1.4018" k3="-1.3022"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="1" k1="-0.2672" k2="0.8241" k3="-0.7684"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="4" k1="-0.1997" k2="0.5964" k3="-0.5871"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.1886" k2="0.4848" k3="-0.4867"/>
++            <vignetting model="pa" focal="133" aperture="16" distance="0.45" k1="-0.2997" k2="1.0220" k3="-0.9494"/>
++            <vignetting model="pa" focal="133" aperture="16" distance="1" k1="-0.1542" k2="0.3239" k3="-0.2737"/>
++            <vignetting model="pa" focal="133" aperture="16" distance="4" k1="-0.1178" k2="0.1968" k3="-0.1668"/>
++            <vignetting model="pa" focal="133" aperture="16" distance="1000" k1="-0.0878" k2="0.0416" k3="-0.0316"/>
++            <vignetting model="pa" focal="133" aperture="40" distance="0.45" k1="-0.2190" k2="0.6797" k3="-0.6345"/>
++            <vignetting model="pa" focal="133" aperture="40" distance="1" k1="-0.0797" k2="0.0199" k3="0.0041"/>
++            <vignetting model="pa" focal="133" aperture="40" distance="4" k1="-0.0644" k2="-0.0116" k3="0.0198"/>
++            <vignetting model="pa" focal="133" aperture="40" distance="1000" k1="-0.0949" k2="0.0287" k3="-0.0072"/>
++            <vignetting model="pa" focal="170" aperture="6.3" distance="0.45" k1="-0.3387" k2="1.2022" k3="-1.3019"/>
++            <vignetting model="pa" focal="170" aperture="6.3" distance="1" k1="0.0272" k2="-0.1576" k3="-0.3054"/>
++            <vignetting model="pa" focal="170" aperture="6.3" distance="4" k1="0.2076" k2="-1.0558" k3="0.4218"/>
++            <vignetting model="pa" focal="170" aperture="6.3" distance="1000" k1="0.0154" k2="-1.1798" k3="0.7404"/>
++            <vignetting model="pa" focal="200" aperture="6.7" distance="0.45" k1="-0.3149" k2="1.1537" k3="-1.2549"/>
++            <vignetting model="pa" focal="200" aperture="6.7" distance="1" k1="0.0545" k2="-0.2118" k3="-0.2621"/>
++            <vignetting model="pa" focal="200" aperture="6.7" distance="4" k1="0.2390" k2="-1.1473" k3="0.4895"/>
++            <vignetting model="pa" focal="200" aperture="6.7" distance="1000" k1="-0.0572" k2="-1.0925" k3="0.7256"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="0.45" k1="-0.3109" k2="1.1656" k3="-1.1653"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1" k1="-0.0715" k2="0.3291" k3="-0.5879"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="4" k1="0.1187" k2="-0.4118" k3="-0.0379"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1998" k2="-1.1568" k3="0.6299"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="0.45" k1="-0.2823" k2="0.9536" k3="-0.8912"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1" k1="-0.2255" k2="0.6911" k3="-0.6578"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="4" k1="-0.1710" k2="0.4856" k3="-0.5108"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0806" k2="0.1720" k3="-0.2760"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="0.45" k1="-0.1484" k2="0.4327" k3="-0.4165"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1" k1="-0.1046" k2="0.1561" k3="-0.1258"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="4" k1="-0.0793" k2="0.0578" k3="-0.0515"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0668" k2="-0.0059" k3="0.0022"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="0.45" k1="0.0102" k2="-0.0920" k3="0.0335"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="1" k1="-0.0499" k2="-0.0351" k3="0.0417"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="4" k1="-0.0623" k2="-0.0135" k3="0.0199"/>
++            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0744" k2="-0.0079" k3="0.0190"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 18-200mm f/3.5-6.3 II DC OS HSM</model>
+@@ -581,41 +863,16 @@
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.00427" b="-0.0189" c="0.0199" />
+-            <distortion model="ptlens" focal="29" a="-0.00878" b="0.04582" c="-0.04997" />
+-            <distortion model="ptlens" focal="33" a="-0.015" b="0.0433" c="-0.02646" />
+-            <distortion model="ptlens" focal="53" a="0.004" b="0.01572" c="-0.01989" />
+-            <distortion model="ptlens" focal="73" a="-0.002" b="0.00731" c="0.00191" />
+-            <distortion model="ptlens" focal="120" a="0.00862" b="-0.0111" c="0.01151" />
+-            <distortion model="ptlens" focal="200" a="-0.00027" b="0.01069" c="-0.0044" />
+-            <tca model="poly3" focal="18" br="-0.0005080" vr="1.0000355" bb="0.0007723" vb="1.0003445" />
+-            <tca model="poly3" focal="29" br="-0.0001485" vr="1.0000892" bb="-0.0001011" vb="1.0000511" />
+-            <tca model="poly3" focal="33" br="-0.0012735" vr="0.9996817" bb="-0.0015426" vb="0.9995056" />
+-            <tca model="poly3" focal="53" br="-0.0007872" vr="0.9997973" bb="-0.0023220" vb="0.9992620" />
+-            <tca model="poly3" focal="73" br="0.0005988" vr="1.0002021" bb="-0.0029494" vb="0.9990878" />
+-            <tca model="poly3" focal="140" br="0.0016138" vr="1.0003730" bb="-0.0011673" vb="0.9997042" />
+-            <tca model="poly3" focal="200" br="0.0013865" vr="1.0003137" bb="-0.0000482" vb="0.9999454" />
+-        </calibration>
+-    </lens>
+-
+-    <!-- new profile above is said to be more accurate. below one may be removed in future. -->
+-    <!--lens>
+-        <maker>Sigma</maker>
+-        <model>Sigma 18-200mm f/3.5-6.3 II DC OS HSM</model>
+-        <mount>Sigma SA</mount>
+-        <mount>Canon EF</mount>
+-        <mount>Nikon F AF</mount>
+-        <cropfactor>1.6</cropfactor>
+-        <calibration>
+-            <distortion model="ptlens" focal="18" a="0.02199" b="-0.06697" c="0.0302"/>
+-            <distortion model="ptlens" focal="29" a="0.02095" b="-0.05013" c="0.03415"/>
+-            <distortion model="ptlens" focal="33" a="0.00943" b="-0.01445" c="0.01804"/>
+-            <distortion model="ptlens" focal="45" a="0.01436" b="-0.02979" c="0.03583"/>
+-            <distortion model="ptlens" focal="73" a="0.00248" b="0.00171" c="0.00877"/>
+-            <distortion model="ptlens" focal="120" a="0.00678" b="-0.0146" c="0.0234"/>
+-            <distortion model="ptlens" focal="200" a="-0.00193" b="0.01252" c="-0.00228"/>
++            <distortion model="ptlens" focal="18" a="0.00427" b="-0.0189" c="0.0199"/>
++            <distortion model="ptlens" focal="29" a="-0.00878" b="0.04582" c="-0.04997"/>
++            <distortion model="ptlens" focal="33" a="-0.015" b="0.0433" c="-0.02646"/>
++            <distortion model="ptlens" focal="53" a="0.004" b="0.01572" c="-0.01989"/>
++            <distortion model="ptlens" focal="73" a="-0.002" b="0.00731" c="0.00191"/>
++            <distortion model="ptlens" focal="120" a="0.00862" b="-0.0111" c="0.01151"/>
++            <distortion model="ptlens" focal="200" a="-0.00027" b="0.01069" c="-0.0044"/>
+             <tca model="poly3" focal="18" br="0.0001235" vr="1.0001382" bb="-0.0000306" vb="1.0001851"/>
+             <tca model="poly3" focal="29" br="-0.0000458" vr="1.0002713" bb="-0.0000635" vb="1.0003369"/>
+             <tca model="poly3" focal="33" br="-0.0000240" vr="1.0001460" bb="-0.0000599" vb="1.0002709"/>
+@@ -625,154 +882,183 @@
+             <tca model="poly3" focal="120" br="-0.0001589" vr="0.9997609" bb="0.0001706" vb="1.0003043"/>
+             <tca model="poly3" focal="200" br="-0.0002666" vr="0.9997012" bb="0.0002502" vb="1.0001707"/>
+         </calibration>
+-    </lens-->
+-
++    </lens>
+     <lens>
+-	    <maker>Sigma</maker>
+-	    <model>Sigma 24-60mm F2.8 EX DG</model>
+-	    <focal min="24" max="60" />
+-	    <aperture min="2.8" max="22"/>
+-	    <mount>Nikon F AF</mount>
++        <maker>Sigma</maker>
++        <model>Sigma 18-200mm f/3.5-6.3 DC Macro OS HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF-S</mount>
++        <mount>Pentax KAF</mount>
++        <mount>Minolta AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5100 -->
++            <distortion model="ptlens" focal="18" a="0.0339" b="-0.09259" c="0.0422"/>
++            <distortion model="ptlens" focal="29" a="0.01507" b="-0.0127" c="-0.00968"/>
++            <distortion model="ptlens" focal="40" a="0.01561" b="-0.02938" c="0.03695"/>
++            <distortion model="ptlens" focal="46" a="0.0041" b="0.01011" c="-0.00717"/>
++            <distortion model="ptlens" focal="55" a="0.00528" b="0.00855" c="-0.00916"/>
++            <distortion model="ptlens" focal="75" a="0.00358" b="0.00249" c="0.00666"/>
++            <distortion model="ptlens" focal="150" a="-0.003" b="0.0208" c="-0.01599"/>
++            <distortion model="ptlens" focal="200" a="0.00829" b="-0.03221" c="0.05916"/>
++            <tca model="poly3" focal="18" vr="1.00057005" vb="1.0000905"/>
++            <tca model="poly3" focal="29" vr="1.00035965" vb="1.0001179"/>
++            <tca model="poly3" focal="40" vr="1.0002583" vb="1.00010395"/>
++            <tca model="poly3" focal="46" vr="1.0002037" vb="1.0000894"/>
++            <tca model="poly3" focal="55" vr="1.0001795" vb="1.0000672"/>
++            <tca model="poly3" focal="75" vr="1.00004435" vb="1.0000036"/>
++            <tca model="poly3" focal="150" vr="0.99996925" vb="0.99983965"/>
++            <tca model="poly3" focal="200" vr="0.99993265" vb="0.99964265"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 24-60mm f/2.8 EX DG</model>
++        <mount>Nikon F AF</mount>
+         <mount>Canon EF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>Sony Alpha</mount>
+-	    <cropfactor>1.5</cropfactor>
+-	    <calibration>
+-	        <distortion focal="24" model="ptlens" a="0.00598105" b="-0.0230051" c="0.00638311" />
+-	        <distortion focal="28" model="ptlens" a="0.00558326" b="-0.0188843" c="0.00805504" />
+-	        <distortion focal="35" model="ptlens" a="0.00105679" b="-0.00290772" c="-0.000127626" />
+-	        <distortion focal="40" model="ptlens" a="0.00194388" b="-0.00479192" c="0.00409093" />
+-	        <distortion focal="50" model="ptlens" a="-0.00101476" b="0.00591386" c="-0.00390913" />
+-	        <distortion focal="60" model="ptlens" a="-0.00252993" b="0.0114386" c="-0.00867133" />
+-            <tca model="poly3" focal="24" br="0.0000518" vr="1.0003617" bb="0.0000124" vb="0.9999809" />
+-            <tca model="poly3" focal="28" br="-0.0000000" vr="1.0003475" bb="-0.0000079" vb="1.0000145" />
+-            <tca model="poly3" focal="35" br="-0.0000090" vr="1.0002416" bb="-0.0000040" vb="1.0000203" />
+-            <tca model="poly3" focal="40" br="0.0000073" vr="1.0001672" bb="0.0000042" vb="1.0000001" />
+-            <tca model="poly3" focal="50" br="0.0000065" vr="1.0000559" bb="-0.0000058" vb="0.9999767" />
+-            <tca model="poly3" focal="60" br="-0.0000066" vr="0.9999967" bb="-0.0000024" vb="0.9999388" />
+-            <vignetting model="pa" focal="24" aperture="2.8" distance="0.4" k1="-0.1361" k2="-0.6538" k3="0.3496" />
+-            <vignetting model="pa" focal="24" aperture="2.8" distance="0.71" k1="-0.1631" k2="-0.6204" k3="0.3510" />
+-            <vignetting model="pa" focal="24" aperture="2.8" distance="2.37" k1="-0.2077" k2="-0.5294" k3="0.3000" />
+-            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.1500" k2="-0.6219" k3="0.3524" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.2524" k2="-0.0660" k3="0.0738" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="0.71" k1="-0.2644" k2="-0.0574" k3="0.0781" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.2995" k2="0.0159" k3="0.0343" />
+-            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2568" k2="-0.0201" k3="0.0444" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.2465" k2="-0.0720" k3="0.0698" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="0.71" k1="-0.2578" k2="-0.0640" k3="0.0736" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.3116" k2="0.0406" k3="0.0168" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2549" k2="-0.0155" k3="0.0331" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2491" k2="-0.0620" k3="0.0592" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="0.71" k1="-0.2612" k2="-0.0530" k3="0.0629" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.3051" k2="0.0309" k3="0.0196" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2582" k2="-0.0005" k3="0.0184" />
+-            <vignetting model="pa" focal="24" aperture="22" distance="0.4" k1="-0.2571" k2="-0.0464" k3="0.0503" />
+-            <vignetting model="pa" focal="24" aperture="22" distance="0.71" k1="-0.2750" k2="-0.0211" k3="0.0424" />
+-            <vignetting model="pa" focal="24" aperture="22" distance="2.37" k1="-0.3113" k2="0.0422" k3="0.0137" />
+-            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2691" k2="0.0232" k3="0.0032" />
+-            <vignetting model="pa" focal="28" aperture="2.8" distance="0.4" k1="-0.2227" k2="-0.4306" k3="0.2609" />
+-            <vignetting model="pa" focal="28" aperture="2.8" distance="0.71" k1="-0.2137" k2="-0.4799" k3="0.3189" />
+-            <vignetting model="pa" focal="28" aperture="2.8" distance="2.37" k1="-0.1944" k2="-0.4724" k3="0.2980" />
+-            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.1887" k2="-0.4920" k3="0.3118" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="0.4" k1="-0.2339" k2="-0.0596" k3="0.0757" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="0.71" k1="-0.2211" k2="-0.0911" k3="0.1047" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="2.37" k1="-0.2015" k2="-0.0586" k3="0.0635" />
+-            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2144" k2="-0.0501" k3="0.0653" />
+-            <vignetting model="pa" focal="28" aperture="5.6" distance="0.4" k1="-0.2233" k2="-0.0717" k3="0.0749" />
+-            <vignetting model="pa" focal="28" aperture="5.6" distance="0.71" k1="-0.2085" k2="-0.1077" k3="0.1053" />
+-            <vignetting model="pa" focal="28" aperture="5.6" distance="2.37" k1="-0.1960" k2="-0.0585" k3="0.0547" />
+-            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2171" k2="-0.0340" k3="0.0461" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="0.4" k1="-0.2324" k2="-0.0511" k3="0.0575" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="0.71" k1="-0.2231" k2="-0.0773" k3="0.0821" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="2.37" k1="-0.2045" k2="-0.0398" k3="0.0400" />
+-            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2267" k2="-0.0112" k3="0.0266" />
+-            <vignetting model="pa" focal="28" aperture="22" distance="0.4" k1="-0.2345" k2="-0.0487" k3="0.0550" />
+-            <vignetting model="pa" focal="28" aperture="22" distance="0.71" k1="-0.2270" k2="-0.0732" k3="0.0796" />
+-            <vignetting model="pa" focal="28" aperture="22" distance="2.37" k1="-0.2123" k2="-0.0264" k3="0.0310" />
+-            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2284" k2="-0.0089" k3="0.0234" />
+-            <vignetting model="pa" focal="35" aperture="2.8" distance="0.4" k1="-0.4223" k2="0.0256" k3="0.0438" />
+-            <vignetting model="pa" focal="35" aperture="2.8" distance="0.71" k1="-0.3763" k2="-0.1180" k3="0.1505" />
+-            <vignetting model="pa" focal="35" aperture="2.8" distance="2.37" k1="-0.3812" k2="-0.0910" k3="0.1298" />
+-            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3829" k2="-0.0904" k3="0.1334" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="0.4" k1="-0.2043" k2="-0.0235" k3="0.0527" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="0.71" k1="-0.1698" k2="-0.1130" k3="0.1160" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="2.37" k1="-0.1630" k2="-0.0732" k3="0.0788" />
+-            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1548" k2="-0.0665" k3="0.0696" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1970" k2="-0.0279" k3="0.0462" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="0.71" k1="-0.1593" k2="-0.1253" k3="0.1129" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1509" k2="-0.0857" k3="0.0751" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1547" k2="-0.0558" k3="0.0526" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2065" k2="-0.0071" k3="0.0294" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="0.71" k1="-0.1680" k2="-0.1083" k3="0.0988" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1597" k2="-0.0674" k3="0.0608" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1644" k2="-0.0312" k3="0.0318" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2132" k2="0.0065" k3="0.0187" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="0.71" k1="-0.1691" k2="-0.1081" k3="0.0966" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="2.37" k1="-0.1657" k2="-0.0557" k3="0.0511" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1671" k2="-0.0271" k3="0.0267" />
+-            <vignetting model="pa" focal="40" aperture="2.8" distance="0.4" k1="-0.4394" k2="0.1536" k3="-0.0391" />
+-            <vignetting model="pa" focal="40" aperture="2.8" distance="0.71" k1="-0.3938" k2="0.0372" k3="0.0369" />
+-            <vignetting model="pa" focal="40" aperture="2.8" distance="2.37" k1="-0.3876" k2="0.0135" k3="0.0584" />
+-            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.3921" k2="-0.0071" k3="0.0815" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="0.4" k1="-0.1883" k2="0.0055" k3="0.0245" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="0.71" k1="-0.1447" k2="-0.0484" k3="0.0505" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="2.37" k1="-0.1446" k2="-0.0237" k3="0.0318" />
+-            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1429" k2="-0.0352" k3="0.0415" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="0.4" k1="-0.1956" k2="0.0180" k3="0.0134" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="0.71" k1="-0.1499" k2="-0.0358" k3="0.0369" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="2.37" k1="-0.1531" k2="0.0001" k3="0.0095" />
+-            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1294" k2="-0.0441" k3="0.0345" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="0.4" k1="-0.1905" k2="0.0111" k3="0.0146" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="0.71" k1="-0.1451" k2="-0.0396" k3="0.0350" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="2.37" k1="-0.1472" k2="-0.0065" k3="0.0097" />
+-            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1270" k2="-0.0418" k3="0.0289" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="0.4" k1="-0.1949" k2="0.0190" k3="0.0080" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="0.71" k1="-0.1438" k2="-0.0453" k3="0.0381" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="2.37" k1="-0.1510" k2="0.0019" k3="0.0030" />
+-            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1283" k2="-0.0419" k3="0.0283" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.4062" k2="0.1858" k3="-0.0587" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="0.71" k1="-0.3679" k2="0.0649" k3="0.0244" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="2.37" k1="-0.4101" k2="0.1125" k3="0.0141" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4730" k2="0.2005" k3="-0.0227" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="0.4" k1="-0.1285" k2="-0.0402" k3="0.0234" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="0.71" k1="-0.0886" k2="-0.0798" k3="0.0375" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="2.37" k1="-0.0861" k2="-0.0953" k3="0.0431" />
+-            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1119" k2="-0.0506" k3="0.0295" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.1384" k2="-0.0264" k3="0.0345" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="0.71" k1="-0.1006" k2="-0.0480" k3="0.0333" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.1142" k2="-0.0145" k3="0.0141" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1140" k2="-0.0548" k3="0.0473" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1381" k2="-0.0241" k3="0.0294" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="0.71" k1="-0.1010" k2="-0.0425" k3="0.0261" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1154" k2="-0.0058" k3="0.0045" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1131" k2="-0.0546" k3="0.0437" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.1335" k2="-0.0337" k3="0.0331" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="0.71" k1="-0.0960" k2="-0.0519" k3="0.0290" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="2.37" k1="-0.1176" k2="0.0014" k3="-0.0023" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1087" k2="-0.0641" k3="0.0465" />
+-            <vignetting model="pa" focal="60" aperture="2.8" distance="0.4" k1="-0.3724" k2="0.1542" k3="-0.0365" />
+-            <vignetting model="pa" focal="60" aperture="2.8" distance="0.71" k1="-0.3570" k2="0.0595" k3="0.0388" />
+-            <vignetting model="pa" focal="60" aperture="2.8" distance="2.37" k1="-0.4564" k2="0.2348" k3="-0.0511" />
+-            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.4297" k2="0.2083" k3="-0.0366" />
+-            <vignetting model="pa" focal="60" aperture="4" distance="0.4" k1="-0.0915" k2="-0.2215" k3="0.1498" />
+-            <vignetting model="pa" focal="60" aperture="4" distance="0.71" k1="-0.0525" k2="-0.2704" k3="0.1695" />
+-            <vignetting model="pa" focal="60" aperture="4" distance="2.37" k1="-0.0448" k2="-0.2233" k3="0.1273" />
+-            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.0602" k2="-0.2663" k3="0.1689" />
+-            <vignetting model="pa" focal="60" aperture="5.6" distance="0.4" k1="-0.1207" k2="-0.0347" k3="0.0400" />
+-            <vignetting model="pa" focal="60" aperture="5.6" distance="0.71" k1="-0.0801" k2="-0.0559" k3="0.0365" />
+-            <vignetting model="pa" focal="60" aperture="5.6" distance="2.37" k1="-0.0757" k2="-0.0722" k3="0.0489" />
+-            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0756" k2="-0.0576" k3="0.0387" />
+-            <vignetting model="pa" focal="60" aperture="8" distance="0.4" k1="-0.1227" k2="-0.0299" k3="0.0338" />
+-            <vignetting model="pa" focal="60" aperture="8" distance="0.71" k1="-0.0783" k2="-0.0548" k3="0.0314" />
+-            <vignetting model="pa" focal="60" aperture="8" distance="2.37" k1="-0.0773" k2="-0.0628" k3="0.0377" />
+-            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.0850" k2="-0.0339" k3="0.0199" />
+-            <vignetting model="pa" focal="60" aperture="22" distance="0.4" k1="-0.1199" k2="-0.0400" k3="0.0385" />
+-            <vignetting model="pa" focal="60" aperture="22" distance="0.71" k1="-0.0780" k2="-0.0556" k3="0.0290" />
+-            <vignetting model="pa" focal="60" aperture="22" distance="2.37" k1="-0.0760" k2="-0.0649" k3="0.0356" />
+-            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="-0.0908" k2="-0.0174" k3="0.0055" />
+-	    </calibration>
++        <focal min="24" max="60"/>
++        <aperture min="2.8" max="22"/>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion focal="24" model="ptlens" a="0.00598105" b="-0.0230051" c="0.00638311"/>
++            <distortion focal="28" model="ptlens" a="0.00558326" b="-0.0188843" c="0.00805504"/>
++            <distortion focal="35" model="ptlens" a="0.00105679" b="-0.00290772" c="-0.000127626"/>
++            <distortion focal="40" model="ptlens" a="0.00194388" b="-0.00479192" c="0.00409093"/>
++            <distortion focal="50" model="ptlens" a="-0.00101476" b="0.00591386" c="-0.00390913"/>
++            <distortion focal="60" model="ptlens" a="-0.00252993" b="0.0114386" c="-0.00867133"/>
++            <tca model="poly3" focal="24" br="0.0000518" vr="1.0003617" bb="0.0000124" vb="0.9999809"/>
++            <tca model="poly3" focal="28" br="-0.0000000" vr="1.0003475" bb="-0.0000079" vb="1.0000145"/>
++            <tca model="poly3" focal="35" br="-0.0000090" vr="1.0002416" bb="-0.0000040" vb="1.0000203"/>
++            <tca model="poly3" focal="40" br="0.0000073" vr="1.0001672" bb="0.0000042" vb="1.0000001"/>
++            <tca model="poly3" focal="50" br="0.0000065" vr="1.0000559" bb="-0.0000058" vb="0.9999767"/>
++            <tca model="poly3" focal="60" br="-0.0000066" vr="0.9999967" bb="-0.0000024" vb="0.9999388"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="0.4" k1="-0.1361" k2="-0.6538" k3="0.3496"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="0.71" k1="-0.1631" k2="-0.6204" k3="0.3510"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="2.37" k1="-0.2077" k2="-0.5294" k3="0.3000"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.1500" k2="-0.6219" k3="0.3524"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.2524" k2="-0.0660" k3="0.0738"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="0.71" k1="-0.2644" k2="-0.0574" k3="0.0781"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.2995" k2="0.0159" k3="0.0343"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2568" k2="-0.0201" k3="0.0444"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.2465" k2="-0.0720" k3="0.0698"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="0.71" k1="-0.2578" k2="-0.0640" k3="0.0736"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.3116" k2="0.0406" k3="0.0168"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2549" k2="-0.0155" k3="0.0331"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2491" k2="-0.0620" k3="0.0592"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="0.71" k1="-0.2612" k2="-0.0530" k3="0.0629"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.3051" k2="0.0309" k3="0.0196"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2582" k2="-0.0005" k3="0.0184"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.4" k1="-0.2571" k2="-0.0464" k3="0.0503"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="0.71" k1="-0.2750" k2="-0.0211" k3="0.0424"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="2.37" k1="-0.3113" k2="0.0422" k3="0.0137"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2691" k2="0.0232" k3="0.0032"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="0.4" k1="-0.2227" k2="-0.4306" k3="0.2609"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="0.71" k1="-0.2137" k2="-0.4799" k3="0.3189"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="2.37" k1="-0.1944" k2="-0.4724" k3="0.2980"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.1887" k2="-0.4920" k3="0.3118"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.4" k1="-0.2339" k2="-0.0596" k3="0.0757"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="0.71" k1="-0.2211" k2="-0.0911" k3="0.1047"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="2.37" k1="-0.2015" k2="-0.0586" k3="0.0635"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2144" k2="-0.0501" k3="0.0653"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.4" k1="-0.2233" k2="-0.0717" k3="0.0749"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="0.71" k1="-0.2085" k2="-0.1077" k3="0.1053"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="2.37" k1="-0.1960" k2="-0.0585" k3="0.0547"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2171" k2="-0.0340" k3="0.0461"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.4" k1="-0.2324" k2="-0.0511" k3="0.0575"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="0.71" k1="-0.2231" k2="-0.0773" k3="0.0821"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="2.37" k1="-0.2045" k2="-0.0398" k3="0.0400"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2267" k2="-0.0112" k3="0.0266"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.4" k1="-0.2345" k2="-0.0487" k3="0.0550"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="0.71" k1="-0.2270" k2="-0.0732" k3="0.0796"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="2.37" k1="-0.2123" k2="-0.0264" k3="0.0310"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2284" k2="-0.0089" k3="0.0234"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.4" k1="-0.4223" k2="0.0256" k3="0.0438"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="0.71" k1="-0.3763" k2="-0.1180" k3="0.1505"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="2.37" k1="-0.3812" k2="-0.0910" k3="0.1298"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3829" k2="-0.0904" k3="0.1334"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.4" k1="-0.2043" k2="-0.0235" k3="0.0527"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="0.71" k1="-0.1698" k2="-0.1130" k3="0.1160"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="2.37" k1="-0.1630" k2="-0.0732" k3="0.0788"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1548" k2="-0.0665" k3="0.0696"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1970" k2="-0.0279" k3="0.0462"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="0.71" k1="-0.1593" k2="-0.1253" k3="0.1129"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1509" k2="-0.0857" k3="0.0751"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1547" k2="-0.0558" k3="0.0526"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2065" k2="-0.0071" k3="0.0294"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="0.71" k1="-0.1680" k2="-0.1083" k3="0.0988"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1597" k2="-0.0674" k3="0.0608"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1644" k2="-0.0312" k3="0.0318"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2132" k2="0.0065" k3="0.0187"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="0.71" k1="-0.1691" k2="-0.1081" k3="0.0966"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="2.37" k1="-0.1657" k2="-0.0557" k3="0.0511"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1671" k2="-0.0271" k3="0.0267"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="0.4" k1="-0.4394" k2="0.1536" k3="-0.0391"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="0.71" k1="-0.3938" k2="0.0372" k3="0.0369"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="2.37" k1="-0.3876" k2="0.0135" k3="0.0584"/>
++            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.3921" k2="-0.0071" k3="0.0815"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="0.4" k1="-0.1883" k2="0.0055" k3="0.0245"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="0.71" k1="-0.1447" k2="-0.0484" k3="0.0505"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="2.37" k1="-0.1446" k2="-0.0237" k3="0.0318"/>
++            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1429" k2="-0.0352" k3="0.0415"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="0.4" k1="-0.1956" k2="0.0180" k3="0.0134"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="0.71" k1="-0.1499" k2="-0.0358" k3="0.0369"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="2.37" k1="-0.1531" k2="0.0001" k3="0.0095"/>
++            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1294" k2="-0.0441" k3="0.0345"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="0.4" k1="-0.1905" k2="0.0111" k3="0.0146"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="0.71" k1="-0.1451" k2="-0.0396" k3="0.0350"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="2.37" k1="-0.1472" k2="-0.0065" k3="0.0097"/>
++            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1270" k2="-0.0418" k3="0.0289"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="0.4" k1="-0.1949" k2="0.0190" k3="0.0080"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="0.71" k1="-0.1438" k2="-0.0453" k3="0.0381"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="2.37" k1="-0.1510" k2="0.0019" k3="0.0030"/>
++            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1283" k2="-0.0419" k3="0.0283"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.4062" k2="0.1858" k3="-0.0587"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="0.71" k1="-0.3679" k2="0.0649" k3="0.0244"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="2.37" k1="-0.4101" k2="0.1125" k3="0.0141"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4730" k2="0.2005" k3="-0.0227"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.4" k1="-0.1285" k2="-0.0402" k3="0.0234"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="0.71" k1="-0.0886" k2="-0.0798" k3="0.0375"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="2.37" k1="-0.0861" k2="-0.0953" k3="0.0431"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1119" k2="-0.0506" k3="0.0295"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.1384" k2="-0.0264" k3="0.0345"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="0.71" k1="-0.1006" k2="-0.0480" k3="0.0333"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.1142" k2="-0.0145" k3="0.0141"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1140" k2="-0.0548" k3="0.0473"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1381" k2="-0.0241" k3="0.0294"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="0.71" k1="-0.1010" k2="-0.0425" k3="0.0261"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1154" k2="-0.0058" k3="0.0045"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1131" k2="-0.0546" k3="0.0437"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.1335" k2="-0.0337" k3="0.0331"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="0.71" k1="-0.0960" k2="-0.0519" k3="0.0290"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="2.37" k1="-0.1176" k2="0.0014" k3="-0.0023"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1087" k2="-0.0641" k3="0.0465"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="0.4" k1="-0.3724" k2="0.1542" k3="-0.0365"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="0.71" k1="-0.3570" k2="0.0595" k3="0.0388"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="2.37" k1="-0.4564" k2="0.2348" k3="-0.0511"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.4297" k2="0.2083" k3="-0.0366"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="0.4" k1="-0.0915" k2="-0.2215" k3="0.1498"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="0.71" k1="-0.0525" k2="-0.2704" k3="0.1695"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="2.37" k1="-0.0448" k2="-0.2233" k3="0.1273"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.0602" k2="-0.2663" k3="0.1689"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="0.4" k1="-0.1207" k2="-0.0347" k3="0.0400"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="0.71" k1="-0.0801" k2="-0.0559" k3="0.0365"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="2.37" k1="-0.0757" k2="-0.0722" k3="0.0489"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0756" k2="-0.0576" k3="0.0387"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="0.4" k1="-0.1227" k2="-0.0299" k3="0.0338"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="0.71" k1="-0.0783" k2="-0.0548" k3="0.0314"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="2.37" k1="-0.0773" k2="-0.0628" k3="0.0377"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.0850" k2="-0.0339" k3="0.0199"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="0.4" k1="-0.1199" k2="-0.0400" k3="0.0385"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="0.71" k1="-0.0780" k2="-0.0556" k3="0.0290"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="2.37" k1="-0.0760" k2="-0.0649" k3="0.0356"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="-0.0908" k2="-0.0174" k3="0.0055"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 24-70mm f/2.8 EX DG Macro</model>
+@@ -781,18 +1067,185 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0" b="-0.006096" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="-0.001546" c="0" />
+-            <distortion model="ptlens" focal="36" a="0" b="0.001392" c="0" />
+-            <distortion model="ptlens" focal="42" a="0" b="0.002318" c="0" />
+-            <distortion model="ptlens" focal="52" a="0" b="0.003994" c="0" />
+-            <distortion model="ptlens" focal="64" a="0" b="0.004329" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.006728" c="0" />
++            <distortion model="poly3" focal="24" k1="-0.006096"/>
++            <distortion model="poly3" focal="30" k1="-0.001546"/>
++            <distortion model="poly3" focal="36" k1="0.001392"/>
++            <distortion model="poly3" focal="42" k1="0.002318"/>
++            <distortion model="poly3" focal="52" k1="0.003994"/>
++            <distortion model="poly3" focal="64" k1="0.004329"/>
++            <distortion model="poly3" focal="70" k1="0.006728"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 24-70mm f/2.8 IF EX DG HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Minolta AF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-30 -->
++            <distortion model="ptlens" focal="24" a="-0.00125" b="-0.00574" c="-0.00426"/>
++            <distortion model="ptlens" focal="27" a="-0.00953" b="0.02092" c="-0.02295"/>
++            <distortion model="ptlens" focal="35" a="-0.0011" b="0.00117" c="-0.0029"/>
++            <distortion model="ptlens" focal="48" a="0.00383" b="-0.01224" c="0.01544"/>
++            <distortion model="ptlens" focal="70" a="-0.00141" b="0.00991" c="-0.00803"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 24-70mm f/2.8 IF EX DG HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="24" a="0.02883" b="-0.07661" c="0.03144"/>
++            <distortion model="ptlens" focal="28" a="0.01895" b="-0.05346" c="0.02209"/>
++            <distortion model="ptlens" focal="34" a="0.00955" b="-0.02443" c="0.01226"/>
++            <distortion model="ptlens" focal="48" a="0" b="0.00687" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.00904" c="0"/>
++            <tca model="poly3" focal="24" br="-0.0002369" vr="1.0005456" bb="0.0001640" vb="0.9998293"/>
++            <tca model="poly3" focal="24" br="-0.0002503" vr="1.0005584" bb="0.0002163" vb="0.9997724"/>
++            <tca model="poly3" focal="28" br="-0.0001219" vr="1.0003667" bb="0.0001085" vb="0.9998949"/>
++            <tca model="poly3" focal="28" br="-0.0001347" vr="1.0004106" bb="0.0001295" vb="0.9998750"/>
++            <tca model="poly3" focal="34" br="-0.0000910" vr="1.0002764" bb="0.0000816" vb="0.9999336"/>
++            <tca model="poly3" focal="34" br="-0.0001126" vr="1.0003192" bb="0.0000824" vb="0.9999361"/>
++            <tca model="poly3" focal="48" br="-0.0000551" vr="1.0000890" bb="0.0000440" vb="0.9999359"/>
++            <tca model="poly3" focal="48" br="-0.0000553" vr="1.0000899" bb="0.0000408" vb="0.9999434"/>
++            <tca model="poly3" focal="70" br="-0.0000226" vr="0.9999188" bb="0.0000333" vb="0.9998799"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="0.0646" k2="-2.1036" k3="1.2184"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="0.0646" k2="-2.1036" k3="1.2184"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.0810" k2="-1.1691" k3="0.4777"/>
++            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.0810" k2="-1.1691" k3="0.4777"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.2304" k2="-0.4946" k3="-0.0083"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.2304" k2="-0.4946" k3="-0.0083"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4112" k2="0.1995" k3="-0.5108"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4112" k2="0.1995" k3="-0.5108"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.5588" k2="0.7055" k3="-0.8533"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.5588" k2="0.7055" k3="-0.8533"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.6679" k2="1.0550" k3="-1.0732"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6679" k2="1.0550" k3="-1.0732"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.7181" k2="1.1926" k3="-1.1418"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7181" k2="1.1926" k3="-1.1418"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.7390" k2="1.2447" k3="-1.1574"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.7390" k2="1.2447" k3="-1.1574"/>
++            <vignetting model="pa" focal="24" aperture="18" distance="10" k1="-0.7537" k2="1.2634" k3="-1.1382"/>
++            <vignetting model="pa" focal="24" aperture="18" distance="1000" k1="-0.7537" k2="1.2634" k3="-1.1382"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.7364" k2="1.1806" k3="-1.0505"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7364" k2="1.1806" k3="-1.0505"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.0656" k2="-1.2461" k3="0.6569"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.0656" k2="-1.2461" k3="0.6569"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.3036" k2="-0.1197" k3="-0.1384"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.3036" k2="-0.1197" k3="-0.1384"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.4375" k2="0.2935" k3="-0.3221"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.4375" k2="0.2935" k3="-0.3221"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.4467" k2="0.2556" k3="-0.2046"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.4467" k2="0.2556" k3="-0.2046"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.3868" k2="0.0117" k3="0.0259"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.3868" k2="0.0117" k3="0.0259"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.3851" k2="0.0013" k3="0.0379"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.3851" k2="0.0013" k3="0.0379"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3893" k2="0.0091" k3="0.0349"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3893" k2="0.0091" k3="0.0349"/>
++            <vignetting model="pa" focal="28" aperture="14" distance="10" k1="-0.3917" k2="0.0150" k3="0.0306"/>
++            <vignetting model="pa" focal="28" aperture="14" distance="1000" k1="-0.3917" k2="0.0150" k3="0.0306"/>
++            <vignetting model="pa" focal="28" aperture="18" distance="10" k1="-0.3917" k2="0.0105" k3="0.0350"/>
++            <vignetting model="pa" focal="28" aperture="18" distance="1000" k1="-0.3917" k2="0.0105" k3="0.0350"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3952" k2="0.0099" k3="0.0391"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3952" k2="0.0099" k3="0.0391"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.2085" k2="-0.6108" k3="0.3248"/>
++            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.2085" k2="-0.6108" k3="0.3248"/>
++            <vignetting model="pa" focal="34" aperture="3.5" distance="10" k1="-0.3358" k2="0.1417" k3="-0.1656"/>
++            <vignetting model="pa" focal="34" aperture="3.5" distance="1000" k1="-0.3358" k2="0.1417" k3="-0.1656"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.3119" k2="-0.0065" k3="0.0432"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.3119" k2="-0.0065" k3="0.0432"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.3138" k2="-0.0047" k3="0.0434"/>
++            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.3138" k2="-0.0047" k3="0.0434"/>
++            <vignetting model="pa" focal="34" aperture="7.1" distance="10" k1="-0.3144" k2="-0.0036" k3="0.0431"/>
++            <vignetting model="pa" focal="34" aperture="7.1" distance="1000" k1="-0.3144" k2="-0.0036" k3="0.0431"/>
++            <vignetting model="pa" focal="34" aperture="9" distance="10" k1="-0.3156" k2="-0.0013" k3="0.0419"/>
++            <vignetting model="pa" focal="34" aperture="9" distance="1000" k1="-0.3156" k2="-0.0013" k3="0.0419"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.3220" k2="0.0122" k3="0.0341"/>
++            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.3220" k2="0.0122" k3="0.0341"/>
++            <vignetting model="pa" focal="34" aperture="14" distance="10" k1="-0.3284" k2="0.0330" k3="0.0176"/>
++            <vignetting model="pa" focal="34" aperture="14" distance="1000" k1="-0.3284" k2="0.0330" k3="0.0176"/>
++            <vignetting model="pa" focal="34" aperture="18" distance="10" k1="-0.3340" k2="0.0435" k3="0.0127"/>
++            <vignetting model="pa" focal="34" aperture="18" distance="1000" k1="-0.3340" k2="0.0435" k3="0.0127"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.3324" k2="0.0336" k3="0.0213"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.3324" k2="0.0336" k3="0.0213"/>
++            <vignetting model="pa" focal="45" aperture="3.5" distance="10" k1="-0.2403" k2="-0.0584" k3="0.0123"/>
++            <vignetting model="pa" focal="45" aperture="3.5" distance="1000" k1="-0.2403" k2="-0.0584" k3="0.0123"/>
++            <vignetting model="pa" focal="45" aperture="4.5" distance="10" k1="-0.2811" k2="0.0573" k3="-0.0052"/>
++            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.2811" k2="0.0573" k3="-0.0052"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.2807" k2="0.0502" k3="0.0018"/>
++            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.2807" k2="0.0502" k3="0.0018"/>
++            <vignetting model="pa" focal="45" aperture="7.1" distance="10" k1="-0.2828" k2="0.0508" k3="0.0013"/>
++            <vignetting model="pa" focal="45" aperture="7.1" distance="1000" k1="-0.2828" k2="0.0508" k3="0.0013"/>
++            <vignetting model="pa" focal="45" aperture="9" distance="10" k1="-0.2834" k2="0.0482" k3="0.0043"/>
++            <vignetting model="pa" focal="45" aperture="9" distance="1000" k1="-0.2834" k2="0.0482" k3="0.0043"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.2872" k2="0.0542" k3="0.0018"/>
++            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.2872" k2="0.0542" k3="0.0018"/>
++            <vignetting model="pa" focal="45" aperture="14" distance="10" k1="-0.2938" k2="0.0699" k3="-0.0089"/>
++            <vignetting model="pa" focal="45" aperture="14" distance="1000" k1="-0.2938" k2="0.0699" k3="-0.0089"/>
++            <vignetting model="pa" focal="45" aperture="18" distance="10" k1="-0.2996" k2="0.0800" k3="-0.0144"/>
++            <vignetting model="pa" focal="45" aperture="18" distance="1000" k1="-0.2996" k2="0.0800" k3="-0.0144"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.3056" k2="0.0908" k3="-0.0203"/>
++            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.3056" k2="0.0908" k3="-0.0203"/>
++            <vignetting model="pa" focal="48" aperture="2.8" distance="10" k1="-0.4855" k2="0.0016" k3="0.0381"/>
++            <vignetting model="pa" focal="48" aperture="2.8" distance="1000" k1="-0.4855" k2="0.0016" k3="0.0381"/>
++            <vignetting model="pa" focal="51" aperture="2.8" distance="10" k1="-0.4918" k2="0.0490" k3="-0.0009"/>
++            <vignetting model="pa" focal="51" aperture="2.8" distance="1000" k1="-0.4918" k2="0.0490" k3="-0.0009"/>
++            <vignetting model="pa" focal="51" aperture="3.5" distance="10" k1="-0.2297" k2="-0.0875" k3="0.0209"/>
++            <vignetting model="pa" focal="51" aperture="3.5" distance="1000" k1="-0.2297" k2="-0.0875" k3="0.0209"/>
++            <vignetting model="pa" focal="51" aperture="4.5" distance="10" k1="-0.2547" k2="0.0146" k3="0.0224"/>
++            <vignetting model="pa" focal="51" aperture="4.5" distance="1000" k1="-0.2547" k2="0.0146" k3="0.0224"/>
++            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="-0.2544" k2="0.0080" k3="0.0297"/>
++            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="-0.2544" k2="0.0080" k3="0.0297"/>
++            <vignetting model="pa" focal="51" aperture="7.1" distance="10" k1="-0.2579" k2="0.0128" k3="0.0286"/>
++            <vignetting model="pa" focal="51" aperture="7.1" distance="1000" k1="-0.2579" k2="0.0128" k3="0.0286"/>
++            <vignetting model="pa" focal="51" aperture="9" distance="10" k1="-0.2589" k2="0.0106" k3="0.0315"/>
++            <vignetting model="pa" focal="51" aperture="9" distance="1000" k1="-0.2589" k2="0.0106" k3="0.0315"/>
++            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.2462" k2="-0.0152" k3="0.0448"/>
++            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.2462" k2="-0.0152" k3="0.0448"/>
++            <vignetting model="pa" focal="51" aperture="14" distance="10" k1="-0.2507" k2="-0.0113" k3="0.0454"/>
++            <vignetting model="pa" focal="51" aperture="14" distance="1000" k1="-0.2507" k2="-0.0113" k3="0.0454"/>
++            <vignetting model="pa" focal="51" aperture="18" distance="10" k1="-0.2552" k2="-0.0031" k3="0.0424"/>
++            <vignetting model="pa" focal="51" aperture="18" distance="1000" k1="-0.2552" k2="-0.0031" k3="0.0424"/>
++            <vignetting model="pa" focal="51" aperture="22" distance="10" k1="-0.2550" k2="-0.0173" k3="0.0571"/>
++            <vignetting model="pa" focal="51" aperture="22" distance="1000" k1="-0.2550" k2="-0.0173" k3="0.0571"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.7389" k2="0.9939" k3="-0.9924"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.7389" k2="0.9939" k3="-0.9924"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="10" k1="-0.3384" k2="0.6024" k3="-0.8949"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="-0.3384" k2="0.6024" k3="-0.8949"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.4280" k2="1.0287" k3="-1.1764"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.4280" k2="1.0287" k3="-1.1764"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.5249" k2="1.2842" k3="-1.2411"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.5249" k2="1.2842" k3="-1.2411"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.5409" k2="1.2755" k3="-1.1641"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.5409" k2="1.2755" k3="-1.1641"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.5157" k2="1.1507" k3="-1.0198"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.5157" k2="1.1507" k3="-1.0198"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.4541" k2="0.8984" k3="-0.7784"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.4541" k2="0.8984" k3="-0.7784"/>
++            <vignetting model="pa" focal="70" aperture="13" distance="10" k1="-0.3805" k2="0.5998" k3="-0.5029"/>
++            <vignetting model="pa" focal="70" aperture="13" distance="1000" k1="-0.3805" k2="0.5998" k3="-0.5029"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.3053" k2="0.2966" k3="-0.2304"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.3053" k2="0.2966" k3="-0.2304"/>
++            <vignetting model="pa" focal="70" aperture="20" distance="10" k1="-0.2914" k2="0.2132" k3="-0.1456"/>
++            <vignetting model="pa" focal="70" aperture="20" distance="1000" k1="-0.2914" k2="0.2132" k3="-0.1456"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2798" k2="0.1557" k3="-0.0906"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2798" k2="0.1557" k3="-0.0906"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 28-70mm f/2.8 EX DG</model>
+@@ -800,19 +1253,18 @@
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.01508" b="-0.036446" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.01328" b="-0.02956" c="0" />
+-            <distortion model="ptlens" focal="34" a="0.001964" b="-0.003604" c="0" />
+-            <distortion model="ptlens" focal="40" a="0.006628" b="-0.009598" c="0" />
+-            <distortion model="ptlens" focal="45" a="0.004477" b="-0.003544" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.006595" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.0078" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.008656" c="0" />
++            <distortion model="ptlens" focal="28" a="0.01508" b="-0.036446" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.01328" b="-0.02956" c="0"/>
++            <distortion model="ptlens" focal="34" a="0.001964" b="-0.003604" c="0"/>
++            <distortion model="ptlens" focal="40" a="0.006628" b="-0.009598" c="0"/>
++            <distortion model="ptlens" focal="45" a="0.004477" b="-0.003544" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.006595" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.0078" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.008656" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 28-300mm f/3.5-6.3 Macro ASP IF</model>
+@@ -821,19 +1273,19 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="-0.009837" c="-0.008234" />
+-            <distortion model="ptlens" focal="34" a="0" b="-0.004678" c="0.000517" />
+-            <distortion model="ptlens" focal="55" a="0" b="0.005687" c="-0.005159" />
+-            <distortion model="ptlens" focal="75" a="0" b="0.008223" c="-0.004279" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.005137" c="0.00146" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.00675" c="-0.000965" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.007188" c="-0.003544" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.00471" c="8.5e-05" />
++            <distortion model="ptlens" focal="28" a="0" b="-0.009837" c="-0.008234"/>
++            <distortion model="ptlens" focal="34" a="0" b="-0.004678" c="0.000517"/>
++            <distortion model="ptlens" focal="55" a="0" b="0.005687" c="-0.005159"/>
++            <distortion model="ptlens" focal="75" a="0" b="0.008223" c="-0.004279"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.005137" c="0.00146"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.00675" c="-0.000965"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.007188" c="-0.003544"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00471" c="8.5e-05"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 50-500mm f/4-6.3 EX DG HSM</model>
+@@ -843,41 +1295,40 @@
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.00059" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.004149" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.005115" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.005001" c="0" />
+-            <distortion model="ptlens" focal="195" a="0" b="0.004957" c="0" />
+-            <distortion model="ptlens" focal="270" a="0" b="0.004639" c="0" />
+-            <distortion model="ptlens" focal="320" a="0" b="0.005982" c="0" />
+-            <distortion model="ptlens" focal="420" a="0" b="0.005397" c="0" />
+-            <distortion model="ptlens" focal="500" a="0" b="0.004857" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.00059"/>
++            <distortion model="poly3" focal="72" k1="0.004149"/>
++            <distortion model="poly3" focal="100" k1="0.005115"/>
++            <distortion model="poly3" focal="135" k1="0.005001"/>
++            <distortion model="poly3" focal="195" k1="0.004957"/>
++            <distortion model="poly3" focal="270" k1="0.004639"/>
++            <distortion model="poly3" focal="320" k1="0.005982"/>
++            <distortion model="poly3" focal="420" k1="0.005397"/>
++            <distortion model="poly3" focal="500" k1="0.004857"/>
+         </calibration>
+     </lens>
+-    
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 50-500mm F/4.5-6.3 DG OS HSM</model>
++        <model>Sigma 50-500mm f/4.5-6.3 APO DG OS HSM</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0" b="-0.00525" c="0" />
+-            <distortion model="ptlens" focal="78" a="0" b="0.00114" c="0" />
+-            <distortion model="ptlens" focal="95" a="0" b="0.00552" c="0" />
+-            <distortion model="ptlens" focal="140" a="0" b="0.0067" c="0" />
+-            <distortion model="ptlens" focal="210" a="0" b="0.00701" c="0" />
+-            <distortion model="ptlens" focal="290" a="0" b="0.00686" c="0" />
+-            <distortion model="ptlens" focal="420" a="0" b="0.00731" c="0" />
+-            <distortion model="ptlens" focal="500" a="0" b="0.00766" c="0" />
++            <distortion model="poly3" focal="50" k1="-0.00525"/>
++            <distortion model="poly3" focal="78" k1="0.00114"/>
++            <distortion model="poly3" focal="95" k1="0.00552"/>
++            <distortion model="poly3" focal="140" k1="0.0067"/>
++            <distortion model="poly3" focal="210" k1="0.00701"/>
++            <distortion model="poly3" focal="290" k1="0.00686"/>
++            <distortion model="poly3" focal="420" k1="0.00731"/>
++            <distortion model="poly3" focal="500" k1="0.00766"/>
+         </calibration>
+-    </lens>    
+-
++    </lens>
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 55-200mm f/4-5.6 DC</model>
+@@ -885,20 +1336,18 @@
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>4/3 System</mount>
+-        <!-- FixMe: Actually cropfactor 1.531 -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Pentax *ist DL -->
+-            <distortion model="poly3" focal="55" k1="-0.00341" />
+-            <distortion model="poly3" focal="73" k1="0.00308" />
+-            <distortion model="poly3" focal="85" k1="0.00606" />
+-            <distortion model="poly3" focal="103" k1="0.00766" />
+-            <distortion model="poly3" focal="123" k1="0.0072" />
+-            <distortion model="poly3" focal="160" k1="0.00643" />
+-            <distortion model="poly3" focal="200" k1="0.00594" />
++            <distortion model="poly3" focal="55" k1="-0.00341"/>
++            <distortion model="poly3" focal="73" k1="0.00308"/>
++            <distortion model="poly3" focal="85" k1="0.00606"/>
++            <distortion model="poly3" focal="103" k1="0.00766"/>
++            <distortion model="poly3" focal="123" k1="0.0072"/>
++            <distortion model="poly3" focal="160" k1="0.00643"/>
++            <distortion model="poly3" focal="200" k1="0.00594"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 70-300mm f/4-5.6 APO Macro Super II</model>
+@@ -907,98 +1356,174 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0.002522" b="-0.005913" c="0" />
+-            <distortion model="ptlens" focal="81" a="-0.000431" b="0.003404" c="0" />
+-            <distortion model="ptlens" focal="92" a="-0.001379" b="0.006159" c="0" />
+-            <distortion model="ptlens" focal="100" a="-0.001226" b="0.006912" c="0" />
+-            <distortion model="ptlens" focal="119" a="0.001445" b="0.002936" c="0" />
+-            <distortion model="ptlens" focal="133" a="0.000359" b="0.005212" c="0" />
+-            <distortion model="ptlens" focal="149" a="0.000193" b="0.005672" c="0" />
+-            <distortion model="ptlens" focal="168" a="0.000533" b="0.005172" c="0" />
+-            <distortion model="ptlens" focal="190" a="0.000317" b="0.005522" c="0" />
+-            <distortion model="ptlens" focal="214" a="-4.9e-05" b="0.005661" c="0" />
+-            <distortion model="ptlens" focal="238" a="-0.000247" b="0.005706" c="0" />
+-            <distortion model="ptlens" focal="263" a="0.000491" b="0.003667" c="0" />
+-            <distortion model="ptlens" focal="300" a="0.001061" b="0.001597" c="0" />
++            <distortion model="ptlens" focal="70" a="0.002522" b="-0.005913" c="0"/>
++            <distortion model="ptlens" focal="81" a="-0.000431" b="0.003404" c="0"/>
++            <distortion model="ptlens" focal="92" a="-0.001379" b="0.006159" c="0"/>
++            <distortion model="ptlens" focal="100" a="-0.001226" b="0.006912" c="0"/>
++            <distortion model="ptlens" focal="119" a="0.001445" b="0.002936" c="0"/>
++            <distortion model="ptlens" focal="133" a="0.000359" b="0.005212" c="0"/>
++            <distortion model="ptlens" focal="149" a="0.000193" b="0.005672" c="0"/>
++            <distortion model="ptlens" focal="168" a="0.000533" b="0.005172" c="0"/>
++            <distortion model="ptlens" focal="190" a="0.000317" b="0.005522" c="0"/>
++            <distortion model="ptlens" focal="214" a="-4.9e-05" b="0.005661" c="0"/>
++            <distortion model="ptlens" focal="238" a="-0.000247" b="0.005706" c="0"/>
++            <distortion model="ptlens" focal="263" a="0.000491" b="0.003667" c="0"/>
++            <distortion model="ptlens" focal="300" a="0.001061" b="0.001597" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This is an alias of Sigma 70-300mm f/4-5.6 DL Macro.
++             According to da...@corr.eu.org, they are optically equivalent. -->
+         <maker>Sigma</maker>
+-        <model>Sigma 70-300mm F4-5.6 DL Macro</model>
++        <model>Sigma 70-300mm f/4-5.6 DG OS</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="-0.00291" b="0.00834" c="-0.00971" />
+-            <distortion model="ptlens" focal="100" a="-0.00296" b="0.0116" c="-0.00449" />
+-            <distortion model="ptlens" focal="135" a="-0.0029" b="0.01687" c="-0.01545" />
+-            <distortion model="ptlens" focal="200" a="-0.00219" b="0.01513" c="-0.01147" />
+-            <distortion model="ptlens" focal="300" a="-0.00382" b="0.02103" c="-0.01538" />
+-            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5339" k2="0.2603" k3="-0.0804" />
+-            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5339" k2="0.2603" k3="-0.0804" />
+-            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1134" k2="-0.0711" k3="-0.0220" />
+-            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1134" k2="-0.0711" k3="-0.0220" />
+-            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2059" k2="0.1615" k3="-0.1053" />
+-            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2059" k2="0.1615" k3="-0.1053" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2160" k2="0.1671" k3="-0.1054" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2160" k2="0.1671" k3="-0.1054" />
+-            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2393" k2="0.2034" k3="-0.1265" />
+-            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2393" k2="0.2034" k3="-0.1265" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2449" k2="0.2257" k3="-0.1361" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2449" k2="0.2257" k3="-0.1361" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.5418" k2="0.2964" k3="-0.0942" />
+-            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.5418" k2="0.2964" k3="-0.0942" />
+-            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.1245" k2="-0.2661" k3="0.1532" />
+-            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.1245" k2="-0.2661" k3="0.1532" />
+-            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.1789" k2="0.1612" k3="-0.1008" />
+-            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.1789" k2="0.1612" k3="-0.1008" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1974" k2="0.1709" k3="-0.0983" />
+-            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1974" k2="0.1709" k3="-0.0983" />
+-            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.2196" k2="0.2274" k3="-0.1269" />
+-            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.2196" k2="0.2274" k3="-0.1269" />
+-            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.5472" k2="0.4149" k3="-0.1968" />
+-            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.5472" k2="0.4149" k3="-0.1968" />
+-            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1663" k2="0.2056" k3="-0.1957" />
+-            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1663" k2="0.2056" k3="-0.1957" />
+-            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1665" k2="0.1322" k3="-0.0744" />
+-            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1665" k2="0.1322" k3="-0.0744" />
+-            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1736" k2="0.1411" k3="-0.0754" />
+-            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1736" k2="0.1411" k3="-0.0754" />
+-            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.2012" k2="0.1940" k3="-0.0998" />
+-            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2012" k2="0.1940" k3="-0.0998" />
+-            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.4230" k2="0.0406" k3="0.0298" />
+-            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.4230" k2="0.0406" k3="0.0298" />
+-            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0624" k2="-0.0794" k3="-0.0365" />
+-            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0624" k2="-0.0794" k3="-0.0365" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1161" k2="0.0689" k3="-0.0492" />
+-            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1161" k2="0.0689" k3="-0.0492" />
+-            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.1115" k2="0.0722" k3="-0.0388" />
+-            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1115" k2="0.0722" k3="-0.0388" />
+-            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1098" k2="0.0615" k3="-0.0289" />
+-            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1098" k2="0.0615" k3="-0.0289" />
+-            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.1194" k2="0.0752" k3="-0.0242" />
+-            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.1194" k2="0.0752" k3="-0.0242" />
+-            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.7348" k2="0.6441" k3="-0.2653" />
+-            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.7348" k2="0.6441" k3="-0.2653" />
+-            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.0752" k2="-0.3913" k3="0.2445" />
+-            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.0752" k2="-0.3913" k3="0.2445" />
+-            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0770" k2="0.0718" k3="-0.0707" />
+-            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0770" k2="0.0718" k3="-0.0707" />
+-            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0799" k2="0.0542" k3="-0.0297" />
+-            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0799" k2="0.0542" k3="-0.0297" />
+-            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.0885" k2="0.0597" k3="-0.0282" />
+-            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.0885" k2="0.0597" k3="-0.0282" />
+-            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.0889" k2="0.0432" k3="0.0027" />
+-            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.0889" k2="0.0432" k3="0.0027" />
++            <distortion model="ptlens" focal="70" a="-0.00291" b="0.00834" c="-0.00971"/>
++            <distortion model="ptlens" focal="100" a="-0.00296" b="0.0116" c="-0.00449"/>
++            <distortion model="ptlens" focal="135" a="-0.0029" b="0.01687" c="-0.01545"/>
++            <distortion model="ptlens" focal="200" a="-0.00219" b="0.01513" c="-0.01147"/>
++            <distortion model="ptlens" focal="300" a="-0.00382" b="0.02103" c="-0.01538"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5339" k2="0.2603" k3="-0.0804"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5339" k2="0.2603" k3="-0.0804"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1134" k2="-0.0711" k3="-0.0220"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1134" k2="-0.0711" k3="-0.0220"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2059" k2="0.1615" k3="-0.1053"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2059" k2="0.1615" k3="-0.1053"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2160" k2="0.1671" k3="-0.1054"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2160" k2="0.1671" k3="-0.1054"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2393" k2="0.2034" k3="-0.1265"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2393" k2="0.2034" k3="-0.1265"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2449" k2="0.2257" k3="-0.1361"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2449" k2="0.2257" k3="-0.1361"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.5418" k2="0.2964" k3="-0.0942"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.5418" k2="0.2964" k3="-0.0942"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.1245" k2="-0.2661" k3="0.1532"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.1245" k2="-0.2661" k3="0.1532"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.1789" k2="0.1612" k3="-0.1008"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.1789" k2="0.1612" k3="-0.1008"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1974" k2="0.1709" k3="-0.0983"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1974" k2="0.1709" k3="-0.0983"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.2196" k2="0.2274" k3="-0.1269"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.2196" k2="0.2274" k3="-0.1269"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.5472" k2="0.4149" k3="-0.1968"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.5472" k2="0.4149" k3="-0.1968"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1663" k2="0.2056" k3="-0.1957"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1663" k2="0.2056" k3="-0.1957"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1665" k2="0.1322" k3="-0.0744"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1665" k2="0.1322" k3="-0.0744"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1736" k2="0.1411" k3="-0.0754"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1736" k2="0.1411" k3="-0.0754"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.2012" k2="0.1940" k3="-0.0998"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2012" k2="0.1940" k3="-0.0998"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.4230" k2="0.0406" k3="0.0298"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.4230" k2="0.0406" k3="0.0298"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0624" k2="-0.0794" k3="-0.0365"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0624" k2="-0.0794" k3="-0.0365"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1161" k2="0.0689" k3="-0.0492"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1161" k2="0.0689" k3="-0.0492"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.1115" k2="0.0722" k3="-0.0388"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1115" k2="0.0722" k3="-0.0388"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1098" k2="0.0615" k3="-0.0289"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1098" k2="0.0615" k3="-0.0289"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.1194" k2="0.0752" k3="-0.0242"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.1194" k2="0.0752" k3="-0.0242"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.7348" k2="0.6441" k3="-0.2653"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.7348" k2="0.6441" k3="-0.2653"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.0752" k2="-0.3913" k3="0.2445"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.0752" k2="-0.3913" k3="0.2445"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0770" k2="0.0718" k3="-0.0707"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0770" k2="0.0718" k3="-0.0707"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0799" k2="0.0542" k3="-0.0297"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0799" k2="0.0542" k3="-0.0297"/>
++            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.0885" k2="0.0597" k3="-0.0282"/>
++            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.0885" k2="0.0597" k3="-0.0282"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.0889" k2="0.0432" k3="0.0027"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.0889" k2="0.0432" k3="0.0027"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 70-300mm f/4-5.6 DL Macro</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Minolta AF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="70" a="-0.00291" b="0.00834" c="-0.00971"/>
++            <distortion model="ptlens" focal="100" a="-0.00296" b="0.0116" c="-0.00449"/>
++            <distortion model="ptlens" focal="135" a="-0.0029" b="0.01687" c="-0.01545"/>
++            <distortion model="ptlens" focal="200" a="-0.00219" b="0.01513" c="-0.01147"/>
++            <distortion model="ptlens" focal="300" a="-0.00382" b="0.02103" c="-0.01538"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5339" k2="0.2603" k3="-0.0804"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5339" k2="0.2603" k3="-0.0804"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1134" k2="-0.0711" k3="-0.0220"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1134" k2="-0.0711" k3="-0.0220"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2059" k2="0.1615" k3="-0.1053"/>
++            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2059" k2="0.1615" k3="-0.1053"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2160" k2="0.1671" k3="-0.1054"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2160" k2="0.1671" k3="-0.1054"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2393" k2="0.2034" k3="-0.1265"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2393" k2="0.2034" k3="-0.1265"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2449" k2="0.2257" k3="-0.1361"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2449" k2="0.2257" k3="-0.1361"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.5418" k2="0.2964" k3="-0.0942"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.5418" k2="0.2964" k3="-0.0942"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.1245" k2="-0.2661" k3="0.1532"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.1245" k2="-0.2661" k3="0.1532"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.1789" k2="0.1612" k3="-0.1008"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.1789" k2="0.1612" k3="-0.1008"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1974" k2="0.1709" k3="-0.0983"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1974" k2="0.1709" k3="-0.0983"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.2196" k2="0.2274" k3="-0.1269"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.2196" k2="0.2274" k3="-0.1269"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.5472" k2="0.4149" k3="-0.1968"/>
++            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.5472" k2="0.4149" k3="-0.1968"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1663" k2="0.2056" k3="-0.1957"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1663" k2="0.2056" k3="-0.1957"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1665" k2="0.1322" k3="-0.0744"/>
++            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1665" k2="0.1322" k3="-0.0744"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1736" k2="0.1411" k3="-0.0754"/>
++            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1736" k2="0.1411" k3="-0.0754"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.2012" k2="0.1940" k3="-0.0998"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2012" k2="0.1940" k3="-0.0998"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.4230" k2="0.0406" k3="0.0298"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.4230" k2="0.0406" k3="0.0298"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0624" k2="-0.0794" k3="-0.0365"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0624" k2="-0.0794" k3="-0.0365"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1161" k2="0.0689" k3="-0.0492"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1161" k2="0.0689" k3="-0.0492"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.1115" k2="0.0722" k3="-0.0388"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1115" k2="0.0722" k3="-0.0388"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1098" k2="0.0615" k3="-0.0289"/>
++            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1098" k2="0.0615" k3="-0.0289"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.1194" k2="0.0752" k3="-0.0242"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.1194" k2="0.0752" k3="-0.0242"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.7348" k2="0.6441" k3="-0.2653"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.7348" k2="0.6441" k3="-0.2653"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.0752" k2="-0.3913" k3="0.2445"/>
++            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.0752" k2="-0.3913" k3="0.2445"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0770" k2="0.0718" k3="-0.0707"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0770" k2="0.0718" k3="-0.0707"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0799" k2="0.0542" k3="-0.0297"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0799" k2="0.0542" k3="-0.0297"/>
++            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.0885" k2="0.0597" k3="-0.0282"/>
++            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.0885" k2="0.0597" k3="-0.0282"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.0889" k2="0.0432" k3="0.0027"/>
++            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.0889" k2="0.0432" k3="0.0027"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 150-500mm f/5-6.3 APO DG OS HSM</model>
+@@ -1007,87 +1532,86 @@
+         <mount>Canon EF</mount>
+         <mount>Sony Alpha</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="150" a="0.06903" b="-0.2138" c="0.22959" />
+-            <distortion model="ptlens" focal="198" a="0" b="0.00332" c="0" />
+-            <distortion model="ptlens" focal="247" a="0.00059" b="0.00686" c="-0.01012" />
+-            <distortion model="ptlens" focal="289" a="-0.00051" b="0.00293" c="0.00733" />
+-            <distortion model="ptlens" focal="403" a="-0.00065" b="0.0073" c="-0.00406" />
+-            <distortion model="ptlens" focal="500" a="-0.00143" b="0.02062" c="-0.03175" />
+-            <tca model="poly3" focal="150" br="0.0000564" vr="0.9998528" bb="-0.0000710" vb="1.0001432" />
+-            <tca model="poly3" focal="174" br="0.0000566" vr="0.9998422" bb="-0.0000673" vb="1.0001337" />
+-            <tca model="poly3" focal="198" br="0.0000745" vr="0.9997846" bb="-0.0000750" vb="1.0001414" />
+-            <tca model="poly3" focal="229" br="0.0000482" vr="0.9998259" bb="-0.0000559" vb="1.0000967" />
+-            <tca model="poly3" focal="247" br="0.0000492" vr="0.9997920" bb="-0.0000667" vb="1.0001128" />
+-            <tca model="poly3" focal="289" br="0.0000477" vr="0.9997628" bb="-0.0000512" vb="1.0000808" />
+-            <tca model="poly3" focal="403" br="-0.0000402" vr="0.9997650" bb="-0.0000248" vb="1.0000442" />
+-            <tca model="poly3" focal="500" br="0.0000144" vr="0.9997674" bb="-0.0000066" vb="1.0000035" />
+-            <vignetting model="pa" focal="150" aperture="5" distance="10" k1="-0.1304" k2="-0.7223" k3="0.2681" />
+-            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.1304" k2="-0.7223" k3="0.2681" />
+-            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0813" k2="0.3026" k3="-0.5990" />
+-            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0813" k2="0.3026" k3="-0.5990" />
+-            <vignetting model="pa" focal="150" aperture="10" distance="10" k1="-0.2643" k2="0.8388" k3="-0.8724" />
+-            <vignetting model="pa" focal="150" aperture="10" distance="1000" k1="-0.2643" k2="0.8388" k3="-0.8724" />
+-            <vignetting model="pa" focal="150" aperture="14" distance="10" k1="-0.2703" k2="0.6179" k3="-0.5882" />
+-            <vignetting model="pa" focal="150" aperture="14" distance="1000" k1="-0.2703" k2="0.6179" k3="-0.5882" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.1359" k2="0.1046" k3="-0.0893" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.1359" k2="0.1046" k3="-0.0893" />
+-            <vignetting model="pa" focal="198" aperture="5.6" distance="10" k1="0.1740" k2="-1.4906" k3="0.7154" />
+-            <vignetting model="pa" focal="198" aperture="5.6" distance="1000" k1="0.1740" k2="-1.4906" k3="0.7154" />
+-            <vignetting model="pa" focal="198" aperture="8" distance="10" k1="0.1009" k2="-0.2197" k3="-0.3024" />
+-            <vignetting model="pa" focal="198" aperture="8" distance="1000" k1="0.1009" k2="-0.2197" k3="-0.3024" />
+-            <vignetting model="pa" focal="198" aperture="11" distance="10" k1="-0.2110" k2="0.8249" k3="-0.9775" />
+-            <vignetting model="pa" focal="198" aperture="11" distance="1000" k1="-0.2110" k2="0.8249" k3="-0.9775" />
+-            <vignetting model="pa" focal="198" aperture="16" distance="10" k1="-0.3274" k2="1.1119" k3="-1.0611" />
+-            <vignetting model="pa" focal="198" aperture="16" distance="1000" k1="-0.3274" k2="1.1119" k3="-1.0611" />
+-            <vignetting model="pa" focal="198" aperture="22" distance="10" k1="-0.2913" k2="0.8743" k3="-0.7632" />
+-            <vignetting model="pa" focal="198" aperture="22" distance="1000" k1="-0.2913" k2="0.8743" k3="-0.7632" />
+-            <vignetting model="pa" focal="198" aperture="25" distance="10" k1="-0.2552" k2="0.7230" k3="-0.6192" />
+-            <vignetting model="pa" focal="198" aperture="25" distance="1000" k1="-0.2552" k2="0.7230" k3="-0.6192" />
+-            <vignetting model="pa" focal="247" aperture="5.6" distance="10" k1="0.2984" k2="-2.0448" k3="1.1619" />
+-            <vignetting model="pa" focal="247" aperture="5.6" distance="1000" k1="0.2984" k2="-2.0448" k3="1.1619" />
+-            <vignetting model="pa" focal="247" aperture="8" distance="10" k1="0.3270" k2="-1.1767" k3="0.4107" />
+-            <vignetting model="pa" focal="247" aperture="8" distance="1000" k1="0.3270" k2="-1.1767" k3="0.4107" />
+-            <vignetting model="pa" focal="247" aperture="11" distance="10" k1="0.0028" k2="0.1215" k3="-0.5231" />
+-            <vignetting model="pa" focal="247" aperture="11" distance="1000" k1="0.0028" k2="0.1215" k3="-0.5231" />
+-            <vignetting model="pa" focal="247" aperture="16" distance="10" k1="-0.2433" k2="0.9021" k3="-0.9782" />
+-            <vignetting model="pa" focal="247" aperture="16" distance="1000" k1="-0.2433" k2="0.9021" k3="-0.9782" />
+-            <vignetting model="pa" focal="247" aperture="29" distance="10" k1="-0.2601" k2="0.7628" k3="-0.6651" />
+-            <vignetting model="pa" focal="247" aperture="29" distance="1000" k1="-0.2601" k2="0.7628" k3="-0.6651" />
+-            <vignetting model="pa" focal="313" aperture="6.3" distance="10" k1="0.1026" k2="-1.7999" k3="1.1249" />
+-            <vignetting model="pa" focal="313" aperture="6.3" distance="1000" k1="0.1026" k2="-1.7999" k3="1.1249" />
+-            <vignetting model="pa" focal="313" aperture="9" distance="10" k1="0.3396" k2="-1.2808" k3="0.5093" />
+-            <vignetting model="pa" focal="313" aperture="9" distance="1000" k1="0.3396" k2="-1.2808" k3="0.5093" />
+-            <vignetting model="pa" focal="313" aperture="13" distance="10" k1="0.0166" k2="0.0599" k3="-0.4619" />
+-            <vignetting model="pa" focal="313" aperture="13" distance="1000" k1="0.0166" k2="0.0599" k3="-0.4619" />
+-            <vignetting model="pa" focal="313" aperture="18" distance="10" k1="-0.2351" k2="0.8566" k3="-0.9204" />
+-            <vignetting model="pa" focal="313" aperture="18" distance="1000" k1="-0.2351" k2="0.8566" k3="-0.9204" />
+-            <vignetting model="pa" focal="313" aperture="29" distance="10" k1="-0.2432" k2="0.7067" k3="-0.6224" />
+-            <vignetting model="pa" focal="313" aperture="29" distance="1000" k1="-0.2432" k2="0.7067" k3="-0.6224" />
+-            <vignetting model="pa" focal="403" aperture="6.3" distance="10" k1="-0.7060" k2="-0.0781" k3="0.1993" />
+-            <vignetting model="pa" focal="403" aperture="6.3" distance="1000" k1="-0.7060" k2="-0.0781" k3="0.1993" />
+-            <vignetting model="pa" focal="403" aperture="9" distance="10" k1="0.3267" k2="-1.7838" k3="1.0013" />
+-            <vignetting model="pa" focal="403" aperture="9" distance="1000" k1="0.3267" k2="-1.7838" k3="1.0013" />
+-            <vignetting model="pa" focal="403" aperture="13" distance="10" k1="0.2276" k2="-0.7672" k3="0.1200" />
+-            <vignetting model="pa" focal="403" aperture="13" distance="1000" k1="0.2276" k2="-0.7672" k3="0.1200" />
+-            <vignetting model="pa" focal="403" aperture="18" distance="10" k1="-0.1027" k2="0.4638" k3="-0.7137" />
+-            <vignetting model="pa" focal="403" aperture="18" distance="1000" k1="-0.1027" k2="0.4638" k3="-0.7137" />
+-            <vignetting model="pa" focal="403" aperture="29" distance="10" k1="-0.2507" k2="0.8024" k3="-0.7660" />
+-            <vignetting model="pa" focal="403" aperture="29" distance="1000" k1="-0.2507" k2="0.8024" k3="-0.7660" />
+-            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-1.3351" k2="1.4459" k3="-0.7008" />
+-            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-1.3351" k2="1.4459" k3="-0.7008" />
+-            <vignetting model="pa" focal="500" aperture="9" distance="10" k1="0.0423" k2="-1.5433" k3="1.0126" />
+-            <vignetting model="pa" focal="500" aperture="9" distance="1000" k1="0.0423" k2="-1.5433" k3="1.0126" />
+-            <vignetting model="pa" focal="500" aperture="13" distance="10" k1="0.3681" k2="-1.5087" k3="0.6907" />
+-            <vignetting model="pa" focal="500" aperture="13" distance="1000" k1="0.3681" k2="-1.5087" k3="0.6907" />
+-            <vignetting model="pa" focal="500" aperture="18" distance="10" k1="0.0717" k2="-0.1175" k3="-0.3541" />
+-            <vignetting model="pa" focal="500" aperture="18" distance="1000" k1="0.0717" k2="-0.1175" k3="-0.3541" />
+-            <vignetting model="pa" focal="500" aperture="29" distance="10" k1="-0.2368" k2="0.8641" k3="-0.9183" />
+-            <vignetting model="pa" focal="500" aperture="29" distance="1000" k1="-0.2368" k2="0.8641" k3="-0.9183" />
++            <distortion model="ptlens" focal="150" a="0.06903" b="-0.2138" c="0.22959"/>
++            <distortion model="ptlens" focal="198" a="0" b="0.00332" c="0"/>
++            <distortion model="ptlens" focal="247" a="0.00059" b="0.00686" c="-0.01012"/>
++            <distortion model="ptlens" focal="289" a="-0.00051" b="0.00293" c="0.00733"/>
++            <distortion model="ptlens" focal="403" a="-0.00065" b="0.0073" c="-0.00406"/>
++            <distortion model="ptlens" focal="500" a="-0.00143" b="0.02062" c="-0.03175"/>
++            <tca model="poly3" focal="150" br="0.0000564" vr="0.9998528" bb="-0.0000710" vb="1.0001432"/>
++            <tca model="poly3" focal="174" br="0.0000566" vr="0.9998422" bb="-0.0000673" vb="1.0001337"/>
++            <tca model="poly3" focal="198" br="0.0000745" vr="0.9997846" bb="-0.0000750" vb="1.0001414"/>
++            <tca model="poly3" focal="229" br="0.0000482" vr="0.9998259" bb="-0.0000559" vb="1.0000967"/>
++            <tca model="poly3" focal="247" br="0.0000492" vr="0.9997920" bb="-0.0000667" vb="1.0001128"/>
++            <tca model="poly3" focal="289" br="0.0000477" vr="0.9997628" bb="-0.0000512" vb="1.0000808"/>
++            <tca model="poly3" focal="403" br="-0.0000402" vr="0.9997650" bb="-0.0000248" vb="1.0000442"/>
++            <tca model="poly3" focal="500" br="0.0000144" vr="0.9997674" bb="-0.0000066" vb="1.0000035"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="10" k1="-0.1304" k2="-0.7223" k3="0.2681"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.1304" k2="-0.7223" k3="0.2681"/>
++            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0813" k2="0.3026" k3="-0.5990"/>
++            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0813" k2="0.3026" k3="-0.5990"/>
++            <vignetting model="pa" focal="150" aperture="10" distance="10" k1="-0.2643" k2="0.8388" k3="-0.8724"/>
++            <vignetting model="pa" focal="150" aperture="10" distance="1000" k1="-0.2643" k2="0.8388" k3="-0.8724"/>
++            <vignetting model="pa" focal="150" aperture="14" distance="10" k1="-0.2703" k2="0.6179" k3="-0.5882"/>
++            <vignetting model="pa" focal="150" aperture="14" distance="1000" k1="-0.2703" k2="0.6179" k3="-0.5882"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.1359" k2="0.1046" k3="-0.0893"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.1359" k2="0.1046" k3="-0.0893"/>
++            <vignetting model="pa" focal="198" aperture="5.6" distance="10" k1="0.1740" k2="-1.4906" k3="0.7154"/>
++            <vignetting model="pa" focal="198" aperture="5.6" distance="1000" k1="0.1740" k2="-1.4906" k3="0.7154"/>
++            <vignetting model="pa" focal="198" aperture="8" distance="10" k1="0.1009" k2="-0.2197" k3="-0.3024"/>
++            <vignetting model="pa" focal="198" aperture="8" distance="1000" k1="0.1009" k2="-0.2197" k3="-0.3024"/>
++            <vignetting model="pa" focal="198" aperture="11" distance="10" k1="-0.2110" k2="0.8249" k3="-0.9775"/>
++            <vignetting model="pa" focal="198" aperture="11" distance="1000" k1="-0.2110" k2="0.8249" k3="-0.9775"/>
++            <vignetting model="pa" focal="198" aperture="16" distance="10" k1="-0.3274" k2="1.1119" k3="-1.0611"/>
++            <vignetting model="pa" focal="198" aperture="16" distance="1000" k1="-0.3274" k2="1.1119" k3="-1.0611"/>
++            <vignetting model="pa" focal="198" aperture="22" distance="10" k1="-0.2913" k2="0.8743" k3="-0.7632"/>
++            <vignetting model="pa" focal="198" aperture="22" distance="1000" k1="-0.2913" k2="0.8743" k3="-0.7632"/>
++            <vignetting model="pa" focal="198" aperture="25" distance="10" k1="-0.2552" k2="0.7230" k3="-0.6192"/>
++            <vignetting model="pa" focal="198" aperture="25" distance="1000" k1="-0.2552" k2="0.7230" k3="-0.6192"/>
++            <vignetting model="pa" focal="247" aperture="5.6" distance="10" k1="0.2984" k2="-2.0448" k3="1.1619"/>
++            <vignetting model="pa" focal="247" aperture="5.6" distance="1000" k1="0.2984" k2="-2.0448" k3="1.1619"/>
++            <vignetting model="pa" focal="247" aperture="8" distance="10" k1="0.3270" k2="-1.1767" k3="0.4107"/>
++            <vignetting model="pa" focal="247" aperture="8" distance="1000" k1="0.3270" k2="-1.1767" k3="0.4107"/>
++            <vignetting model="pa" focal="247" aperture="11" distance="10" k1="0.0028" k2="0.1215" k3="-0.5231"/>
++            <vignetting model="pa" focal="247" aperture="11" distance="1000" k1="0.0028" k2="0.1215" k3="-0.5231"/>
++            <vignetting model="pa" focal="247" aperture="16" distance="10" k1="-0.2433" k2="0.9021" k3="-0.9782"/>
++            <vignetting model="pa" focal="247" aperture="16" distance="1000" k1="-0.2433" k2="0.9021" k3="-0.9782"/>
++            <vignetting model="pa" focal="247" aperture="29" distance="10" k1="-0.2601" k2="0.7628" k3="-0.6651"/>
++            <vignetting model="pa" focal="247" aperture="29" distance="1000" k1="-0.2601" k2="0.7628" k3="-0.6651"/>
++            <vignetting model="pa" focal="313" aperture="6.3" distance="10" k1="0.1026" k2="-1.7999" k3="1.1249"/>
++            <vignetting model="pa" focal="313" aperture="6.3" distance="1000" k1="0.1026" k2="-1.7999" k3="1.1249"/>
++            <vignetting model="pa" focal="313" aperture="9" distance="10" k1="0.3396" k2="-1.2808" k3="0.5093"/>
++            <vignetting model="pa" focal="313" aperture="9" distance="1000" k1="0.3396" k2="-1.2808" k3="0.5093"/>
++            <vignetting model="pa" focal="313" aperture="13" distance="10" k1="0.0166" k2="0.0599" k3="-0.4619"/>
++            <vignetting model="pa" focal="313" aperture="13" distance="1000" k1="0.0166" k2="0.0599" k3="-0.4619"/>
++            <vignetting model="pa" focal="313" aperture="18" distance="10" k1="-0.2351" k2="0.8566" k3="-0.9204"/>
++            <vignetting model="pa" focal="313" aperture="18" distance="1000" k1="-0.2351" k2="0.8566" k3="-0.9204"/>
++            <vignetting model="pa" focal="313" aperture="29" distance="10" k1="-0.2432" k2="0.7067" k3="-0.6224"/>
++            <vignetting model="pa" focal="313" aperture="29" distance="1000" k1="-0.2432" k2="0.7067" k3="-0.6224"/>
++            <vignetting model="pa" focal="403" aperture="6.3" distance="10" k1="-0.7060" k2="-0.0781" k3="0.1993"/>
++            <vignetting model="pa" focal="403" aperture="6.3" distance="1000" k1="-0.7060" k2="-0.0781" k3="0.1993"/>
++            <vignetting model="pa" focal="403" aperture="9" distance="10" k1="0.3267" k2="-1.7838" k3="1.0013"/>
++            <vignetting model="pa" focal="403" aperture="9" distance="1000" k1="0.3267" k2="-1.7838" k3="1.0013"/>
++            <vignetting model="pa" focal="403" aperture="13" distance="10" k1="0.2276" k2="-0.7672" k3="0.1200"/>
++            <vignetting model="pa" focal="403" aperture="13" distance="1000" k1="0.2276" k2="-0.7672" k3="0.1200"/>
++            <vignetting model="pa" focal="403" aperture="18" distance="10" k1="-0.1027" k2="0.4638" k3="-0.7137"/>
++            <vignetting model="pa" focal="403" aperture="18" distance="1000" k1="-0.1027" k2="0.4638" k3="-0.7137"/>
++            <vignetting model="pa" focal="403" aperture="29" distance="10" k1="-0.2507" k2="0.8024" k3="-0.7660"/>
++            <vignetting model="pa" focal="403" aperture="29" distance="1000" k1="-0.2507" k2="0.8024" k3="-0.7660"/>
++            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-1.3351" k2="1.4459" k3="-0.7008"/>
++            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-1.3351" k2="1.4459" k3="-0.7008"/>
++            <vignetting model="pa" focal="500" aperture="9" distance="10" k1="0.0423" k2="-1.5433" k3="1.0126"/>
++            <vignetting model="pa" focal="500" aperture="9" distance="1000" k1="0.0423" k2="-1.5433" k3="1.0126"/>
++            <vignetting model="pa" focal="500" aperture="13" distance="10" k1="0.3681" k2="-1.5087" k3="0.6907"/>
++            <vignetting model="pa" focal="500" aperture="13" distance="1000" k1="0.3681" k2="-1.5087" k3="0.6907"/>
++            <vignetting model="pa" focal="500" aperture="18" distance="10" k1="0.0717" k2="-0.1175" k3="-0.3541"/>
++            <vignetting model="pa" focal="500" aperture="18" distance="1000" k1="0.0717" k2="-0.1175" k3="-0.3541"/>
++            <vignetting model="pa" focal="500" aperture="29" distance="10" k1="-0.2368" k2="0.8641" k3="-0.9183"/>
++            <vignetting model="pa" focal="500" aperture="29" distance="1000" k1="-0.2368" k2="0.8641" k3="-0.9183"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 14mm f/2.8 EX</model>
+@@ -1096,12 +1620,11 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.031106" b="-0.059086" c="0" />
++            <distortion model="ptlens" focal="14" a="0.031106" b="-0.059086" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 14mm f/3.5 EX</model>
+@@ -1110,12 +1633,12 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0" />
++            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 20mm f/1.8 EX DG</model>
+@@ -1124,12 +1647,11 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="20" a="0.034347" b="-0.066549" c="0" />
++            <distortion model="ptlens" focal="20" a="0.034347" b="-0.066549" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 28mm f/1.8 EX DG</model>
+@@ -1138,12 +1660,12 @@
+         <mount>Minolta AF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.002854" b="-0.010067" c="0" />
++            <distortion model="ptlens" focal="28" a="0.002854" b="-0.010067" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 30mm f/1.4 EX DC HSM</model>
+@@ -1153,13 +1675,38 @@
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="30" a="0.003926" b="-0.013819" c="0" />
+-            <tca model="poly3" focal="30" br="-0.0000193" vr="1.0004990" bb="0.0000694" vb="0.9998978" />
++            <distortion model="ptlens" focal="30" a="0.003926" b="-0.013819" c="0"/>
++            <tca model="poly3" focal="30" br="-0.0000193" vr="1.0004990" bb="0.0000694" vb="0.9998978"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 30mm f/1.4 EX DC HSM</model>
++        <mount>Canon EF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 60D -->
++            <vignetting model="pa" focal="30" aperture="1.4" distance="10" k1="-0.9623" k2="1.0182" k3="-0.5874"/>
++            <vignetting model="pa" focal="30" aperture="1.4" distance="1000" k1="-0.9623" k2="1.0182" k3="-0.5874"/>
++            <vignetting model="pa" focal="30" aperture="2" distance="10" k1="-0.3314" k2="-0.3310" k3="0.1852"/>
++            <vignetting model="pa" focal="30" aperture="2" distance="1000" k1="-0.3314" k2="-0.3310" k3="0.1852"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.1365" k2="-0.2132" k3="-0.0798"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.1365" k2="-0.2132" k3="-0.0798"/>
++            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.2736" k2="0.4235" k3="-0.4892"/>
++            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.2736" k2="0.4235" k3="-0.4892"/>
++            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.2277" k2="0.1873" k3="-0.1811"/>
++            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.2277" k2="0.1873" k3="-0.1811"/>
++            <vignetting model="pa" focal="30" aperture="16" distance="10" k1="-0.1794" k2="-0.0665" k3="0.0549"/>
++            <vignetting model="pa" focal="30" aperture="16" distance="1000" k1="-0.1794" k2="-0.0665" k3="0.0549"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 50mm f/1.4 EX DG HSM</model>
+@@ -1167,97 +1714,222 @@
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="-0.008" b="0.012" c="-0.002" />
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <distortion model="ptlens" focal="50" a="0.00772" b="-0.02395" c="0.00956"/>
++            <tca model="poly3" focal="50" br="-0.0001133" vr="1.0002913" bb="0.0002133" vb="0.9998273"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.1384" k2="0.9834" k3="-0.4448"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.1384" k2="0.9834" k3="-0.4448"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.2557" k2="-0.4501" k3="0.2767"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.2557" k2="-0.4501" k3="0.2767"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1774" k2="0.0340" k3="-0.1780"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1774" k2="0.0340" k3="-0.1780"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2435" k2="0.2137" k3="-0.1663"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2435" k2="0.2137" k3="-0.1663"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2363" k2="0.1055" k3="-0.0520"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2363" k2="0.1055" k3="-0.0520"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 50mm F1.4 EX DG HSM</model>
++        <model>Sigma 50mm f/1.4 EX DG HSM</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
+         <mount>4/3 System</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="50" a="0.00055" b="-0.00799" c="0.00993" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.5491" k2="0.2293" k3="-0.0540" />
+-            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.5491" k2="0.2293" k3="-0.0540" />
+-            <vignetting model="pa" focal="50" aperture="1.7" distance="10" k1="-0.0950" k2="-0.3674" k3="0.1974" />
+-            <vignetting model="pa" focal="50" aperture="1.7" distance="1000" k1="-0.0950" k2="-0.3674" k3="0.1974" />
+-            <vignetting model="pa" focal="50" aperture="2.2" distance="10" k1="-0.1370" k2="0.0074" k3="0.0052" />
+-            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="-0.1370" k2="0.0074" k3="0.0052" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1324" k2="-0.0046" k3="0.0190" />
+-            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1324" k2="-0.0046" k3="0.0190" />
+-            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1303" k2="-0.0097" k3="0.0256" />
+-            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1303" k2="-0.0097" k3="0.0256" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1414" k2="0.0090" k3="0.0253" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1414" k2="0.0090" k3="0.0253" />
++            <distortion model="ptlens" focal="50" a="0.00055" b="-0.00799" c="0.00993"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.5491" k2="0.2293" k3="-0.0540"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.5491" k2="0.2293" k3="-0.0540"/>
++            <vignetting model="pa" focal="50" aperture="1.7" distance="10" k1="-0.0950" k2="-0.3674" k3="0.1974"/>
++            <vignetting model="pa" focal="50" aperture="1.7" distance="1000" k1="-0.0950" k2="-0.3674" k3="0.1974"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="10" k1="-0.1370" k2="0.0074" k3="0.0052"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="-0.1370" k2="0.0074" k3="0.0052"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1324" k2="-0.0046" k3="0.0190"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1324" k2="-0.0046" k3="0.0190"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1303" k2="-0.0097" k3="0.0256"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1303" k2="-0.0097" k3="0.0256"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1414" k2="0.0090" k3="0.0253"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1414" k2="0.0090" k3="0.0253"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Sigma</maker>
+-	    <model>SIGMA 150mm F2.8 MACRO HSM</model>
+-	    <focal value="150" />
+-	    <aperture min="2.8" max="22" />
++        <maker>Sigma</maker>
++        <model>Sigma 70mm f/2.8 EX DG Macro</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7200 -->
++            <tca model="poly3" focal="70" vr="1.0002393" vb="0.9998053"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 85mm f/1.4 EX DG HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7200 -->
++            <distortion model="poly3" focal="85" k1="0.00017"/>
++            <tca model="poly3" focal="85" br="-0.0000282" vr="0.9997791" bb="-0.0000002" vb="0.9999363"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 150mm f/2.8 EX DG APO HSM Macro</model>
+         <mount>4/3 System</mount>
+-	    <cropfactor>2</cropfactor>
+-	    <calibration>
+-	        <distortion focal="150" model="ptlens" a="-0.00472839" b="0.0149475" c="-0.0142996" />
+-            <tca model="poly3" focal="150" br="-0.0000907" vr="1.0002304" bb="-0.0000342" vb="0.9999827" />
+-	        <vignetting model="pa" focal="150" aperture="2.8" distance="0.38" k1="-0.0056" k2="-0.1198" k3="0.0358" />
+-            <vignetting model="pa" focal="150" aperture="2.8" distance="0.7" k1="-0.1310" k2="-0.1905" k3="0.1496" />
+-            <vignetting model="pa" focal="150" aperture="2.8" distance="2" k1="-0.5020" k2="0.4247" k3="-0.1839" />
+-            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.4838" k2="0.3738" k3="-0.1584" />
+-            <vignetting model="pa" focal="150" aperture="4" distance="0.38" k1="-0.0487" k2="0.0384" k3="-0.0292" />
+-            <vignetting model="pa" focal="150" aperture="4" distance="0.7" k1="-0.0352" k2="0.0438" k3="-0.0358" />
+-            <vignetting model="pa" focal="150" aperture="4" distance="2" k1="-0.0247" k2="0.0366" k3="-0.0823" />
+-            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="0.0485" k2="-0.2792" k3="0.1142" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="0.38" k1="-0.0600" k2="0.0608" k3="-0.0440" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="0.7" k1="-0.0385" k2="0.0515" k3="-0.0384" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="2" k1="-0.0307" k2="0.0334" k3="-0.0251" />
+-            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.0314" k2="0.0251" k3="-0.0182" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="0.38" k1="-0.0684" k2="0.0714" k3="-0.0493" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="0.7" k1="-0.0439" k2="0.0702" k3="-0.0532" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="2" k1="-0.0368" k2="0.0535" k3="-0.0399" />
+-            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0340" k2="0.0338" k3="-0.0251" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="0.38" k1="-0.0755" k2="0.0678" k3="-0.0464" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="0.7" k1="-0.0346" k2="0.0554" k3="-0.0481" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="2" k1="-0.0400" k2="0.0672" k3="-0.0514" />
+-            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0357" k2="0.0411" k3="-0.0325" />
+-	    </calibration>
++        <focal value="150"/>
++        <aperture min="2.8" max="22"/>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <distortion focal="150" model="ptlens" a="-0.00472839" b="0.0149475" c="-0.0142996"/>
++            <tca model="poly3" focal="150" br="-0.0000907" vr="1.0002304" bb="-0.0000342" vb="0.9999827"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="0.38" k1="-0.0056" k2="-0.1198" k3="0.0358"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="0.7" k1="-0.1310" k2="-0.1905" k3="0.1496"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="2" k1="-0.5020" k2="0.4247" k3="-0.1839"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.4838" k2="0.3738" k3="-0.1584"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="0.38" k1="-0.0487" k2="0.0384" k3="-0.0292"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="0.7" k1="-0.0352" k2="0.0438" k3="-0.0358"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="2" k1="-0.0247" k2="0.0366" k3="-0.0823"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="0.0485" k2="-0.2792" k3="0.1142"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="0.38" k1="-0.0600" k2="0.0608" k3="-0.0440"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="0.7" k1="-0.0385" k2="0.0515" k3="-0.0384"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="2" k1="-0.0307" k2="0.0334" k3="-0.0251"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.0314" k2="0.0251" k3="-0.0182"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="0.38" k1="-0.0684" k2="0.0714" k3="-0.0493"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="0.7" k1="-0.0439" k2="0.0702" k3="-0.0532"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="2" k1="-0.0368" k2="0.0535" k3="-0.0399"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0340" k2="0.0338" k3="-0.0251"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="0.38" k1="-0.0755" k2="0.0678" k3="-0.0464"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="0.7" k1="-0.0346" k2="0.0554" k3="-0.0481"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="2" k1="-0.0400" k2="0.0672" k3="-0.0514"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0357" k2="0.0411" k3="-0.0325"/>
++        </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 17-50mm F2.8 EX DC OS HSM</model>
++        <model>Sigma 150mm f/2.8 EX DG APO HSM Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- This lens really has no reliably measurable distortion. -->
++            <distortion model="poly3" focal="150" k1="0"/>
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <vignetting model="pa" focal="150" aperture="2.8" distance="10" k1="-1.3884" k2="1.3762" k3="-0.6260"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-1.3884" k2="1.3762" k3="-0.6260"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="10" k1="-0.3044" k2="-0.7273" k3="0.5442"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="-0.3044" k2="-0.7273" k3="0.5442"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="0.2119" k2="-1.2276" k3="0.5732"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.2119" k2="-1.2276" k3="0.5732"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="10" k1="-0.0564" k2="0.0325" k3="-0.3802"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0564" k2="0.0325" k3="-0.3802"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.2709" k2="0.4731" k3="-0.3333"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.2709" k2="0.4731" k3="-0.3333"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 17-50mm f/2.8 EX DC OS HSM</model>
+         <mount>Sigma SA</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Canon EF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>Sony Alpha</mount>
+-        <!-- FixMe: Must be 1.523 instead -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon D7000 -->
+-            <distortion model="ptlens" focal="17" a="0.03046" b="-0.085" c="0.04461" />
+-            <distortion model="ptlens" focal="20" a="0.01724" b="-0.04004" c="0.01079" />
+-            <distortion model="ptlens" focal="24" a="0.01936" b="-0.05404" c="0.04106" />
+-            <distortion model="ptlens" focal="38" a="0.00479" b="-0.00681" c="0.00866" />
+-            <distortion model="ptlens" focal="50" a="0.00161" b="0.00176" c="0.00235" />
+-            <tca model="poly3" focal="17" br="-0.0000069" vr="1.0005013" bb="-0.0000010" vb="1.0000428" />
+-            <tca model="poly3" focal="20" br="-0.0001173" vr="1.0005459" bb="-0.0000000" vb="1.0000432" />
+-            <tca model="poly3" focal="24" br="-0.0000116" vr="1.0003051" bb="0.0000272" vb="1.0000239" />
+-            <tca model="poly3" focal="38" br="-0.0000502" vr="1.0001111" bb="-0.0000002" vb="1.0000809" />
+-            <tca model="poly3" focal="50" br="-0.0000123" vr="0.9999535" bb="-0.0000053" vb="1.0000740" />
++            <distortion model="ptlens" focal="17" a="0.03046" b="-0.085" c="0.04461"/>
++            <distortion model="ptlens" focal="20" a="0.01724" b="-0.04004" c="0.01079"/>
++            <distortion model="ptlens" focal="24" a="0.01936" b="-0.05404" c="0.04106"/>
++            <distortion model="ptlens" focal="38" a="0.00479" b="-0.00681" c="0.00866"/>
++            <distortion model="ptlens" focal="50" a="0.00161" b="0.00176" c="0.00235"/>
++            <tca model="poly3" focal="17" br="-0.0000069" vr="1.0005013" bb="-0.0000010" vb="1.0000428"/>
++            <tca model="poly3" focal="20" br="-0.0001173" vr="1.0005459" bb="-0.0000000" vb="1.0000432"/>
++            <tca model="poly3" focal="24" br="-0.0000116" vr="1.0003051" bb="0.0000272" vb="1.0000239"/>
++            <tca model="poly3" focal="38" br="-0.0000502" vr="1.0001111" bb="-0.0000002" vb="1.0000809"/>
++            <tca model="poly3" focal="50" br="-0.0000123" vr="0.9999535" bb="-0.0000053" vb="1.0000740"/>
++            <!-- Taken with Canon 550D -->
++            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2563" k2="-0.2256" k3="-0.0574"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2563" k2="-0.2256" k3="-0.0574"/>
++            <vignetting model="pa" focal="17" aperture="3.2" distance="10" k1="-0.3403" k2="0.2047" k3="-0.3241"/>
++            <vignetting model="pa" focal="17" aperture="3.2" distance="1000" k1="-0.3403" k2="0.2047" k3="-0.3241"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="10" k1="-0.3521" k2="0.2734" k3="-0.3402"/>
++            <vignetting model="pa" focal="17" aperture="3.5" distance="1000" k1="-0.3521" k2="0.2734" k3="-0.3402"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3535" k2="0.2196" k3="-0.2071"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3535" k2="0.2196" k3="-0.2071"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.3338" k2="0.0389" k3="-0.0052"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.3338" k2="0.0389" k3="-0.0052"/>
++            <vignetting model="pa" focal="21" aperture="2.8" distance="10" k1="-0.2191" k2="-0.2445" k3="0.0755"/>
++            <vignetting model="pa" focal="21" aperture="2.8" distance="1000" k1="-0.2191" k2="-0.2445" k3="0.0755"/>
++            <vignetting model="pa" focal="21" aperture="3.2" distance="10" k1="-0.2087" k2="-0.1093" k3="-0.0078"/>
++            <vignetting model="pa" focal="21" aperture="3.2" distance="1000" k1="-0.2087" k2="-0.1093" k3="-0.0078"/>
++            <vignetting model="pa" focal="21" aperture="3.5" distance="10" k1="-0.2437" k2="0.0136" k3="-0.0781"/>
++            <vignetting model="pa" focal="21" aperture="3.5" distance="1000" k1="-0.2437" k2="0.0136" k3="-0.0781"/>
++            <vignetting model="pa" focal="21" aperture="4" distance="10" k1="-0.2737" k2="0.0921" k3="-0.0840"/>
++            <vignetting model="pa" focal="21" aperture="4" distance="1000" k1="-0.2737" k2="0.0921" k3="-0.0840"/>
++            <vignetting model="pa" focal="21" aperture="22" distance="10" k1="-0.2815" k2="0.0322" k3="-0.0015"/>
++            <vignetting model="pa" focal="21" aperture="22" distance="1000" k1="-0.2815" k2="0.0322" k3="-0.0015"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.1868" k2="-0.3125" k3="0.1893"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.1868" k2="-0.3125" k3="0.1893"/>
++            <vignetting model="pa" focal="28" aperture="3.2" distance="10" k1="-0.1265" k2="-0.2237" k3="0.0808"/>
++            <vignetting model="pa" focal="28" aperture="3.2" distance="1000" k1="-0.1265" k2="-0.2237" k3="0.0808"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.1592" k2="-0.0766" k3="-0.0175"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.1592" k2="-0.0766" k3="-0.0175"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.1989" k2="0.0706" k3="-0.0759"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.1989" k2="0.0706" k3="-0.0759"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2140" k2="0.0338" k3="-0.0083"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2140" k2="0.0338" k3="-0.0083"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4512" k2="0.3298" k3="-0.2143"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4512" k2="0.3298" k3="-0.2143"/>
++            <vignetting model="pa" focal="35" aperture="3.2" distance="10" k1="-0.1104" k2="-0.2574" k3="0.1153"/>
++            <vignetting model="pa" focal="35" aperture="3.2" distance="1000" k1="-0.1104" k2="-0.2574" k3="0.1153"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.1185" k2="-0.1299" k3="0.0203"/>
++            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.1185" k2="-0.1299" k3="0.0203"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.1675" k2="0.0716" k3="-0.0787"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1675" k2="0.0716" k3="-0.0787"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1780" k2="0.0312" k3="-0.0092"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1780" k2="0.0312" k3="-0.0092"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.6768" k2="1.0342" k3="-0.8034"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.6768" k2="1.0342" k3="-0.8034"/>
++            <vignetting model="pa" focal="50" aperture="3.2" distance="10" k1="-0.3589" k2="0.3936" k3="-0.3936"/>
++            <vignetting model="pa" focal="50" aperture="3.2" distance="1000" k1="-0.3589" k2="0.3936" k3="-0.3936"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1904" k2="0.1252" k3="-0.2321"/>
++            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1904" k2="0.1252" k3="-0.2321"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1627" k2="0.2136" k3="-0.2345"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1627" k2="0.2136" k3="-0.2345"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 24mm f/1.4 DG HSM [A]</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D810 -->
++            <distortion model="poly3" focal="24" k1="-0.000508073"/>
++            <tca model="poly3" focal="24" vr="1.0002000" vb="1.0000500"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 35mm f/1.4 DG HSM</model>
+@@ -1266,74 +1938,1443 @@
+         <mount>Canon EF</mount>
+         <mount>Sony Alpha</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon D800 -->
+-            <distortion model="ptlens" focal="35" a="0.00542" b="-0.01856" c="0.017" />
+-            <tca model="poly3" focal="35" br="-0.0000475" vr="1.0001547" bb="0.0000608" vb="0.9999185" />
++            <distortion model="ptlens" focal="35" a="0.00542" b="-0.01856" c="0.017"/>
++            <tca model="poly3" focal="35" br="-0.0000475" vr="1.0001547" bb="0.0000608" vb="0.9999185"/>
++            <!-- Taken with Canon 6D -->
++            <vignetting model="pa" focal="35" aperture="1.4" distance="10" k1="-2.1367" k2="2.3253" k3="-1.0155"/>
++            <vignetting model="pa" focal="35" aperture="1.4" distance="1000" k1="-2.1367" k2="2.3253" k3="-1.0155"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="10" k1="-0.2772" k2="-1.1942" k3="0.8120"/>
++            <vignetting model="pa" focal="35" aperture="2" distance="1000" k1="-0.2772" k2="-1.1942" k3="0.8120"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.5975" k2="0.2676" k3="-0.2046"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.5975" k2="0.2676" k3="-0.2046"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.5539" k2="0.2873" k3="-0.1231"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.5539" k2="0.2873" k3="-0.1231"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.5513" k2="0.1752" k3="0.0213"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.5513" k2="0.1752" k3="0.0213"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.5912" k2="0.2608" k3="-0.0360"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5912" k2="0.2608" k3="-0.0360"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.5909" k2="0.2573" k3="-0.0330"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5909" k2="0.2573" k3="-0.0330"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.6089" k2="0.2932" k3="-0.0565"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.6089" k2="0.2932" k3="-0.0565"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+         <model>Sigma 8mm f/3.5 EX DG Circular</model>
++        <model lang="en">Sigma 8mm f/3.5 EX DG circular fisheye</model>
++        <model lang="de">Sigma 8mm f/3.5 EX DG zirkulares Fischauge</model>
+         <mount>Nikon F AF</mount>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+-        <!-- FixMe: Must be 1.523 instead -->
+-        <cropfactor>1.5</cropfactor>
+         <type>equisolid</type>
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Nikon D5100 -->
+-            <distortion model="ptlens" focal="8" a="-0.18485" b="0.5218" c="-0.42534" />
+-            <tca model="linear" focal="8" kr="1.0006" kb="1.0004" />
++            <distortion model="ptlens" focal="8" a="-0.18485" b="0.5218" c="-0.42534"/>
++            <tca model="linear" focal="8" kr="1.0006" kb="1.0004"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 8-16mm f/4.5-5.6mm DC HSM</model>
++        <model>Sigma 8mm f/3.5 EX DG Circular</model>
++        <model lang="en">Sigma 8mm f/3.5 EX DG circular fisheye</model>
++        <model lang="de">Sigma 8mm f/3.5 EX DG zirkulares Fischauge</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <type>equisolid</type>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 7D -->
++            <distortion model="poly3" focal="8" k1="0.00553"/>
++            <tca model="poly3" focal="8" br="-0.0000454" vr="1.0003735" bb="-0.0000002" vb="1.0001634"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 8mm f/3.5 EX DG Circular</model>
++        <model lang="en">Sigma 8mm f/3.5 EX DG circular fisheye</model>
++        <model lang="de">Sigma 8mm f/3.5 EX DG zirkulares Fischauge</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <type>equisolid</type>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <!-- Measured with 360° panorama -->
++            <distortion model="ptlens" focal="8" a="-0.08165" b="-0.09515" c="0.28621"/>
++            <tca model="poly3" focal="8" br="-0.0000252" vr="1.0005234" bb="0.0003099" vb="1.0001467"/>
++            <!-- Measured with 360° panorama in Hugin -->
++            <vignetting model="pa" focal="8" aperture="3.5" distance="0.135" k1="-2.06639" k2="4.6395" k3="-11.25983"/>
++            <vignetting model="pa" focal="8" aperture="3.5" distance="0.3" k1="-2.03723" k2="4.24517" k3="-11.51688"/>
++            <vignetting model="pa" focal="8" aperture="3.5" distance="1000" k1="-2.55411" k2="9.10148" k3="-23.34727"/>
++            <vignetting model="pa" focal="8" aperture="4" distance="0.135" k1="-0.62851" k2="-1.7506" k3="-1.93559"/>
++            <vignetting model="pa" focal="8" aperture="4" distance="0.5" k1="-0.82165" k2="-0.52554" k3="-5.83513"/>
++            <vignetting model="pa" focal="8" aperture="4" distance="1000" k1="-0.96382" k2="1.34283" k3="-10.93141"/>
++            <vignetting model="pa" focal="8" aperture="5.6" distance="0.135" k1="-0.6275941" k2="4.042223" k3="-16.52534"/>
++            <vignetting model="pa" focal="8" aperture="5.6" distance="0.5" k1="-0.3513" k2="2.12019" k3="-15.07874"/>
++            <vignetting model="pa" focal="8" aperture="5.6" distance="1000" k1="-0.68014" k2="6.25943" k3="-25.73073"/>
++            <vignetting model="pa" focal="8" aperture="8" distance="0.135" k1="-1.110118" k2="7.2120167" k3="-21.19665"/>
++            <vignetting model="pa" focal="8" aperture="8" distance="0.5" k1="-0.47062799" k2="2.034975" k3="-10.22632"/>
++            <vignetting model="pa" focal="8" aperture="8" distance="1000" k1="-0.74838" k2="5.52904" k3="-20.08166"/>
++            <vignetting model="pa" focal="8" aperture="11" distance="0.135" k1="-0.6633932" k2="3.5276" k3="-12.61028"/>
++            <vignetting model="pa" focal="8" aperture="11" distance="0.5" k1="-0.7216194" k2="4.24935" k3="-16.064766"/>
++            <vignetting model="pa" focal="8" aperture="11" distance="1000" k1="-0.70390" k2="5.56987" k3="-22.17712"/>
++            <vignetting model="pa" focal="8" aperture="16" distance="0.135" k1="-0.398477" k2="1.7415422" k3="-8.945511"/>
++            <vignetting model="pa" focal="8" aperture="16" distance="0.5" k1="-1.172114" k2="8.385246" k3="-26.267674"/>
++            <vignetting model="pa" focal="8" aperture="16" distance="1000" k1="-0.47509" k2="3.09074" k3="-14.00044"/>
++            <vignetting model="pa" focal="8" aperture="22" distance="0.135" k1="-0.333753" k2="0.7417004" k3="-6.758181"/>
++            <vignetting model="pa" focal="8" aperture="22" distance="0.5" k1="-0.688855" k2="3.6348324" k3="-14.01661"/>
++            <vignetting model="pa" focal="8" aperture="22" distance="1000" k1="-0.67013" k2="4.20115" k3="-16.00076"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 8-16mm f/4.5-5.6 DC HSM</model>
+         <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
+-        <!-- FixMe: Actually cropfactor 1.613 -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+             <!-- Taken with Canon 50D -->
+-            <distortion model="ptlens" focal="8" a="0.02364" b="-0.13856" c="0.19092" />
+-            <distortion model="ptlens" focal="10" a="-0.00766" b="0.00319" c="0.00208" />
+-            <distortion model="ptlens" focal="12" a="-0.00826" b="-0.00321" c="0.04216" />
+-            <distortion model="ptlens" focal="13" a="-0.00831" b="0.02128" c="-0.00924" />
+-            <distortion model="ptlens" focal="16" b="0.0033" />
+-            <tca model="poly3" focal="8" br="0.0000456" vr="1.0000029" bb="-0.0000656" vb="1.0001880" />
+-            <tca model="poly3" focal="10" vr="1.0002" vb="1" />
+-            <tca model="poly3" focal="12" vr="1.0002" vb="1" />
+-            <tca model="poly3" focal="13" br="0.0000404" vr="1.0000986" bb="-0.0000936" vb="1.0001406" />
+-            <tca model="poly3" focal="16" br="0.0000285" vr="1.0001326" bb="-0.0000943" vb="1.0001116" />
++            <distortion model="ptlens" focal="8" a="0.02364" b="-0.13856" c="0.19092"/>
++            <distortion model="ptlens" focal="10" a="-0.00766" b="0.00319" c="0.00208"/>
++            <distortion model="ptlens" focal="12" a="-0.00826" b="-0.00321" c="0.04216"/>
++            <distortion model="ptlens" focal="13" a="-0.00831" b="0.02128" c="-0.00924"/>
++            <distortion model="ptlens" focal="16" b="0.0033"/>
++            <tca model="poly3" focal="8" br="0.0000456" vr="1.0000029" bb="-0.0000656" vb="1.0001880"/>
++            <tca model="poly3" focal="10" vr="1.0002" vb="1"/>
++            <tca model="poly3" focal="12" vr="1.0002" vb="1"/>
++            <tca model="poly3" focal="13" br="0.0000404" vr="1.0000986" bb="-0.0000936" vb="1.0001406"/>
++            <tca model="poly3" focal="16" br="0.0000285" vr="1.0001326" bb="-0.0000943" vb="1.0001116"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sigma</maker>
+-        <model>Sigma 10-20mm f/3.5 EX DC HSM</model>
++        <model>Sigma 8-16mm f/4.5-5.6 DC HSM</model>
++        <mount>Sigma SA</mount>
+         <mount>Canon EF</mount>
+-        <!-- FixMe: Actually cropfactor 1.613 -->
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7100 -->
++            <distortion model="ptlens" focal="8" a="0.00985" b="-0.07668" c="0.09452"/>
++            <distortion model="ptlens" focal="9" a="-0.0073" b="-0.00074" c="-0.00329"/>
++            <distortion model="ptlens" focal="10" a="-0.00608" b="-0.00881" c="0.02021"/>
++            <distortion model="ptlens" focal="12" a="-0.02662" b="0.07817" c="-0.08027"/>
++            <distortion model="ptlens" focal="14" a="-0.01289" b="0.0306" c="-0.01315"/>
++            <distortion model="ptlens" focal="16" a="-0.0184" b="0.05749" c="-0.04454"/>
++            <tca model="poly3" focal="8" br="-0.0000141" vr="1.0001963" bb="-0.0000573" vb="1.0001735"/>
++            <tca model="poly3" focal="9" br="0.0000277" vr="1.0000937" bb="-0.0000535" vb="1.0002340"/>
++            <tca model="poly3" focal="10" br="0.0000257" vr="1.0000862" bb="-0.0000679" vb="1.0002823"/>
++            <tca model="poly3" focal="12" br="0.0000717" vr="1.0000453" bb="-0.0000847" vb="1.0002906"/>
++            <tca model="poly3" focal="14" br="0.0001034" vr="1.0000726" bb="-0.0000992" vb="1.0002334"/>
++            <tca model="poly3" focal="16" br="0.0001132" vr="1.0001441" bb="-0.0001015" vb="1.0001906"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 10-20mm f/3.5 EX DC HSM</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF-S</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+             <!-- Taken with Canon 7D -->
+-            <distortion model="ptlens" focal="10" a="0.02278" b="-0.0794" c="0.05484" />
+-            <distortion model="ptlens" focal="12" a="0" b="-0.00643" c="0" />
+-            <distortion model="ptlens" focal="15" a="0" b="0.00016" c="0" />
+-            <distortion model="ptlens" focal="17" a="0.00645" b="-0.01179" c="0.00284" />
+-            <distortion model="ptlens" focal="20" a="0" b="0.00321" c="0" />
+-            <tca model="poly3" focal="10" br="0.0002606" vr="1.0001530" bb="-0.0001349" vb="1.0002823" />
+-            <tca model="poly3" focal="12" br="0.0001459" vr="0.9999845" bb="-0.0001436" vb="1.0004044" />
+-            <tca model="poly3" focal="15" br="0.0000907" vr="0.9999725" bb="-0.0001845" vb="1.0005339" />
+-            <tca model="poly3" focal="17" br="0.0000683" vr="1.0000128" bb="-0.0001434" vb="1.0003791" />
+-            <tca model="poly3" focal="20" br="0.0001555" vr="0.9999808" bb="-0.0001463" vb="1.0003311" />
++            <!-- Real focal length measured with a 360° panorama -->
++            <distortion model="ptlens" focal="10" a="0.02278" b="-0.0794" c="0.05484"/>
++            <distortion model="ptlens" focal="12" a="0" b="-0.00643" c="0"/>
++            <distortion model="ptlens" focal="15" a="0" b="0.00016" c="0"/>
++            <distortion model="ptlens" focal="17" a="0.00645" b="-0.01179" c="0.00284"/>
++            <distortion model="ptlens" focal="20" a="0" b="0.00321" c="0"/>
++            <tca model="poly3" focal="10" br="0.0002606" vr="1.0001530" bb="-0.0001349" vb="1.0002823"/>
++            <tca model="poly3" focal="12" br="0.0001459" vr="0.9999845" bb="-0.0001436" vb="1.0004044"/>
++            <tca model="poly3" focal="15" br="0.0000907" vr="0.9999725" bb="-0.0001845" vb="1.0005339"/>
++            <tca model="poly3" focal="17" br="0.0000683" vr="1.0000128" bb="-0.0001434" vb="1.0003791"/>
++            <tca model="poly3" focal="20" br="0.0001555" vr="0.9999808" bb="-0.0001463" vb="1.0003311"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 10-20mm f/3.5 EX DC HSM</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF-S</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5300 -->
++            <distortion model="ptlens" focal="10" a="0.02808" b="-0.08735" c="0.04973"/>
++            <distortion model="ptlens" focal="12" a="0.00373" b="-0.01794" c="0.00897"/>
++            <distortion model="ptlens" focal="15" a="0" b="0.00152" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.00402" b="-0.00924" c="0.01313"/>
++            <tca model="poly3" focal="10" br="0.0002913" vr="1.0002670" bb="-0.0001825" vb="1.0003122"/>
++            <tca model="poly3" focal="12" br="0.0002742" vr="0.9999810" bb="-0.0001957" vb="1.0005030"/>
++            <tca model="poly3" focal="15" br="0.0001903" vr="0.9999240" bb="-0.0002265" vb="1.0006545"/>
++            <tca model="poly3" focal="20" br="0.0002157" vr="1.0000313" bb="-0.0001685" vb="1.0003235"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 17-70mm f/2.8-4 DC Macro OS HSM</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D90 -->
++            <distortion model="ptlens" focal="17" a="0.01587" b="-0.03928" c="-0.00282"/>
++            <distortion model="ptlens" focal="19" a="0.02927" b="-0.09256" c="0.08464"/>
++            <distortion model="ptlens" focal="21" a="0.03571" b="-0.10663" c="0.09304"/>
++            <distortion model="ptlens" focal="24" a="0.02701" b="-0.09229" c="0.10835"/>
++            <distortion model="ptlens" focal="28" a="0.01642" b="-0.0481" c="0.05279"/>
++            <!-- lens was decentred -->
++            <distortion model="ptlens" focal="35" a="-0.00095" b="0.01248" c="-0.00171"/>
++            <!-- lens was decentred -->
++            <distortion model="ptlens" focal="50" a="0.0082" b="-0.01866" c="0.02391"/>
++            <distortion model="ptlens" focal="70" a="-0.01251" b="0.05374" c="-0.05675"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 70-200mm f/2.8 EX DG Macro HSM II</model>
++        <mount>4/3 System</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-5 -->
++            <distortion model="poly3" focal="70" k1="-0.00323"/>
++            <distortion model="poly3" focal="88" k1="-0.00161"/>
++            <distortion model="poly3" focal="105" k1="-0.00007"/>
++            <distortion model="poly3" focal="135" k1="0.00284"/>
++            <distortion model="poly3" focal="200" k1="0.00517"/>
++            <tca model="poly3" focal="70" br="-0.0000200" vr="1.0001748" bb="0.0000049" vb="0.9999277"/>
++            <tca model="poly3" focal="88" br="-0.0000162" vr="1.0000776" bb="-0.0000001" vb="0.9999852"/>
++            <tca model="poly3" focal="105" br="-0.0000043" vr="0.9999509" bb="-0.0000005" vb="1.0000260"/>
++            <tca model="poly3" focal="135" br="-0.0000038" vr="0.9997666" bb="-0.0000237" vb="1.0000597"/>
++            <tca model="poly3" focal="200" br="-0.0000467" vr="0.9996960" bb="-0.0000021" vb="0.9999433"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <!-- FixMe: The "APO" is reported by exiv2 but it's superfluous. -->
++        <model>Sigma 70-200mm f/2.8 EX DG APO OS HSM</model>
++        <model lang="en">Sigma 70-200mm f/2.8 EX DG OS HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="70" a="0.00236" b="-0.00978" c="-0.00264"/>
++            <distortion model="ptlens" focal="104" a="0.00563" b="-0.01131" c="0.00589"/>
++            <distortion model="ptlens" focal="137" a="0" b="0.00701" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.00897" c="0"/>
++            <tca model="poly3" focal="70" br="-0.0000025" vr="1.0000793" bb="-0.0000580" vb="1.0001293"/>
++            <tca model="poly3" focal="86" br="0.0000437" vr="0.9999629" bb="-0.0000657" vb="1.0001863"/>
++            <tca model="poly3" focal="104" br="0.0000566" vr="0.9998860" bb="-0.0001032" vb="1.0002729"/>
++            <tca model="poly3" focal="137" br="0.0000700" vr="0.9998057" bb="-0.0001210" vb="1.0002555"/>
++            <tca model="poly3" focal="200" br="0.0000883" vr="0.9997431" bb="-0.0000989" vb="1.0001402"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.8893" k2="0.5873" k3="-0.3046"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.8893" k2="0.5873" k3="-0.3046"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="10" k1="0.1910" k2="-1.0670" k3="0.4327"/>
++            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="0.1910" k2="-1.0670" k3="0.4327"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="0.0101" k2="-0.0154" k3="-0.2987"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="0.0101" k2="-0.0154" k3="-0.2987"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1511" k2="0.4913" k3="-0.5698"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1511" k2="0.4913" k3="-0.5698"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.2194" k2="0.6371" k3="-0.5789"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.2194" k2="0.6371" k3="-0.5789"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.1515" k2="0.3243" k3="-0.2431"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.1515" k2="0.3243" k3="-0.2431"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.0928" k2="0.1002" k3="-0.0402"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0928" k2="0.1002" k3="-0.0402"/>
++            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.1342" k2="0.1769" k3="-0.0882"/>
++            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.1342" k2="0.1769" k3="-0.0882"/>
++            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.1435" k2="0.2049" k3="-0.1052"/>
++            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.1435" k2="0.2049" k3="-0.1052"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1564" k2="0.2277" k3="-0.1180"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1564" k2="0.2277" k3="-0.1180"/>
++            <vignetting model="pa" focal="86" aperture="2.8" distance="10" k1="-0.8011" k2="0.5025" k3="-0.2612"/>
++            <vignetting model="pa" focal="86" aperture="2.8" distance="1000" k1="-0.8011" k2="0.5025" k3="-0.2612"/>
++            <vignetting model="pa" focal="86" aperture="3.5" distance="10" k1="0.1776" k2="-0.9126" k3="0.3512"/>
++            <vignetting model="pa" focal="86" aperture="3.5" distance="1000" k1="0.1776" k2="-0.9126" k3="0.3512"/>
++            <vignetting model="pa" focal="86" aperture="4.5" distance="10" k1="-0.0393" k2="0.1320" k3="-0.3081"/>
++            <vignetting model="pa" focal="86" aperture="4.5" distance="1000" k1="-0.0393" k2="0.1320" k3="-0.3081"/>
++            <vignetting model="pa" focal="86" aperture="5.6" distance="10" k1="-0.1638" k2="0.4441" k3="-0.4174"/>
++            <vignetting model="pa" focal="86" aperture="5.6" distance="1000" k1="-0.1638" k2="0.4441" k3="-0.4174"/>
++            <vignetting model="pa" focal="86" aperture="7.1" distance="10" k1="-0.1406" k2="0.3009" k3="-0.2317"/>
++            <vignetting model="pa" focal="86" aperture="7.1" distance="1000" k1="-0.1406" k2="0.3009" k3="-0.2317"/>
++            <vignetting model="pa" focal="86" aperture="9" distance="10" k1="-0.1155" k2="0.1293" k3="-0.0459"/>
++            <vignetting model="pa" focal="86" aperture="9" distance="1000" k1="-0.1155" k2="0.1293" k3="-0.0459"/>
++            <vignetting model="pa" focal="86" aperture="11" distance="10" k1="-0.1311" k2="0.1670" k3="-0.0687"/>
++            <vignetting model="pa" focal="86" aperture="11" distance="1000" k1="-0.1311" k2="0.1670" k3="-0.0687"/>
++            <vignetting model="pa" focal="86" aperture="14" distance="10" k1="-0.1456" k2="0.1985" k3="-0.0901"/>
++            <vignetting model="pa" focal="86" aperture="14" distance="1000" k1="-0.1456" k2="0.1985" k3="-0.0901"/>
++            <vignetting model="pa" focal="86" aperture="18" distance="10" k1="-0.1509" k2="0.1907" k3="-0.0739"/>
++            <vignetting model="pa" focal="86" aperture="18" distance="1000" k1="-0.1509" k2="0.1907" k3="-0.0739"/>
++            <vignetting model="pa" focal="86" aperture="22" distance="10" k1="-0.1606" k2="0.1984" k3="-0.0743"/>
++            <vignetting model="pa" focal="86" aperture="22" distance="1000" k1="-0.1606" k2="0.1984" k3="-0.0743"/>
++            <vignetting model="pa" focal="97" aperture="2.8" distance="10" k1="-0.7082" k2="0.3921" k3="-0.2121"/>
++            <vignetting model="pa" focal="97" aperture="2.8" distance="1000" k1="-0.7082" k2="0.3921" k3="-0.2121"/>
++            <vignetting model="pa" focal="97" aperture="3.5" distance="10" k1="0.1054" k2="-0.6036" k3="0.1442"/>
++            <vignetting model="pa" focal="97" aperture="3.5" distance="1000" k1="0.1054" k2="-0.6036" k3="0.1442"/>
++            <vignetting model="pa" focal="97" aperture="4.5" distance="10" k1="-0.1859" k2="0.5307" k3="-0.5384"/>
++            <vignetting model="pa" focal="97" aperture="4.5" distance="1000" k1="-0.1859" k2="0.5307" k3="-0.5384"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="-0.2082" k2="0.5533" k3="-0.4619"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.2082" k2="0.5533" k3="-0.4619"/>
++            <vignetting model="pa" focal="97" aperture="7.1" distance="10" k1="-0.1958" k2="0.3997" k3="-0.2706"/>
++            <vignetting model="pa" focal="97" aperture="7.1" distance="1000" k1="-0.1958" k2="0.3997" k3="-0.2706"/>
++            <vignetting model="pa" focal="97" aperture="9" distance="10" k1="-0.1295" k2="0.1548" k3="-0.0488"/>
++            <vignetting model="pa" focal="97" aperture="9" distance="1000" k1="-0.1295" k2="0.1548" k3="-0.0488"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="10" k1="-0.1362" k2="0.1907" k3="-0.0838"/>
++            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.1362" k2="0.1907" k3="-0.0838"/>
++            <vignetting model="pa" focal="97" aperture="14" distance="10" k1="-0.1610" k2="0.2426" k3="-0.1136"/>
++            <vignetting model="pa" focal="97" aperture="14" distance="1000" k1="-0.1610" k2="0.2426" k3="-0.1136"/>
++            <vignetting model="pa" focal="97" aperture="18" distance="10" k1="-0.1805" k2="0.2798" k3="-0.1360"/>
++            <vignetting model="pa" focal="97" aperture="18" distance="1000" k1="-0.1805" k2="0.2798" k3="-0.1360"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="10" k1="-0.1315" k2="0.1363" k3="-0.0377"/>
++            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.1315" k2="0.1363" k3="-0.0377"/>
++            <vignetting model="pa" focal="137" aperture="2.8" distance="10" k1="-0.5045" k2="-0.3905" k3="0.2920"/>
++            <vignetting model="pa" focal="137" aperture="2.8" distance="1000" k1="-0.5045" k2="-0.3905" k3="0.2920"/>
++            <vignetting model="pa" focal="137" aperture="3.5" distance="10" k1="0.3406" k2="-1.5303" k3="0.7480"/>
++            <vignetting model="pa" focal="137" aperture="3.5" distance="1000" k1="0.3406" k2="-1.5303" k3="0.7480"/>
++            <vignetting model="pa" focal="137" aperture="4.5" distance="10" k1="0.1278" k2="-0.3796" k3="-0.0585"/>
++            <vignetting model="pa" focal="137" aperture="4.5" distance="1000" k1="0.1278" k2="-0.3796" k3="-0.0585"/>
++            <vignetting model="pa" focal="137" aperture="5.6" distance="10" k1="-0.0195" k2="0.2068" k3="-0.4238"/>
++            <vignetting model="pa" focal="137" aperture="5.6" distance="1000" k1="-0.0195" k2="0.2068" k3="-0.4238"/>
++            <vignetting model="pa" focal="137" aperture="7.1" distance="10" k1="-0.1590" k2="0.5504" k3="-0.5706"/>
++            <vignetting model="pa" focal="137" aperture="7.1" distance="1000" k1="-0.1590" k2="0.5504" k3="-0.5706"/>
++            <vignetting model="pa" focal="137" aperture="9" distance="10" k1="-0.0900" k2="0.2635" k3="-0.2454"/>
++            <vignetting model="pa" focal="137" aperture="9" distance="1000" k1="-0.0900" k2="0.2635" k3="-0.2454"/>
++            <vignetting model="pa" focal="137" aperture="11" distance="10" k1="-0.0517" k2="0.0631" k3="-0.0405"/>
++            <vignetting model="pa" focal="137" aperture="11" distance="1000" k1="-0.0517" k2="0.0631" k3="-0.0405"/>
++            <vignetting model="pa" focal="137" aperture="14" distance="10" k1="-0.1061" k2="0.1023" k3="-0.0230"/>
++            <vignetting model="pa" focal="137" aperture="14" distance="1000" k1="-0.1061" k2="0.1023" k3="-0.0230"/>
++            <vignetting model="pa" focal="137" aperture="18" distance="10" k1="-0.0420" k2="-0.0207" k3="0.0466"/>
++            <vignetting model="pa" focal="137" aperture="18" distance="1000" k1="-0.0420" k2="-0.0207" k3="0.0466"/>
++            <vignetting model="pa" focal="137" aperture="22" distance="10" k1="-0.1358" k2="0.1564" k3="-0.0558"/>
++            <vignetting model="pa" focal="137" aperture="22" distance="1000" k1="-0.1358" k2="0.1564" k3="-0.0558"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.5224" k2="1.5956" k3="-0.7242"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.5224" k2="1.5956" k3="-0.7242"/>
++            <vignetting model="pa" focal="200" aperture="3.5" distance="10" k1="-0.5668" k2="-0.0975" k3="0.1528"/>
++            <vignetting model="pa" focal="200" aperture="3.5" distance="1000" k1="-0.5668" k2="-0.0975" k3="0.1528"/>
++            <vignetting model="pa" focal="200" aperture="4.5" distance="10" k1="0.1827" k2="-1.2545" k3="0.7181"/>
++            <vignetting model="pa" focal="200" aperture="4.5" distance="1000" k1="0.1827" k2="-1.2545" k3="0.7181"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.1489" k2="-0.6608" k3="0.2103"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.1489" k2="-0.6608" k3="0.2103"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="-0.0572" k2="0.1043" k3="-0.3017"/>
++            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.0572" k2="0.1043" k3="-0.3017"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.1676" k2="0.4836" k3="-0.4597"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.1676" k2="0.4836" k3="-0.4597"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.2300" k2="0.4703" k3="-0.3146"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2300" k2="0.4703" k3="-0.3146"/>
++            <vignetting model="pa" focal="200" aperture="14" distance="10" k1="-0.1525" k2="0.2350" k3="-0.1212"/>
++            <vignetting model="pa" focal="200" aperture="14" distance="1000" k1="-0.1525" k2="0.2350" k3="-0.1212"/>
++            <vignetting model="pa" focal="200" aperture="18" distance="10" k1="-0.1198" k2="0.1299" k3="-0.0465"/>
++            <vignetting model="pa" focal="200" aperture="18" distance="1000" k1="-0.1198" k2="0.1299" k3="-0.0465"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1574" k2="0.2245" k3="-0.1121"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1574" k2="0.2245" k3="-0.1121"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <!-- FixMe: The "APO" is reported by exiv2 but it's superfluous. -->
++        <model>Sigma 70-200mm f/2.8 EX DG APO OS HSM</model>
++        <model lang="en">Sigma 70-200mm f/2.8 EX DG OS HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="poly3" focal="70" k1="-0.0033"/>
++            <distortion model="poly3" focal="90" k1="-0.00167"/>
++            <distortion model="poly3" focal="100" k1="0.00038"/>
++            <distortion model="poly3" focal="140" k1="0.00244"/>
++            <distortion model="poly3" focal="200" k1="0.00398"/>
++            <tca model="poly3" focal="70" br="0.0000023" vr="1.0001291" bb="-0.0000306" vb="1.0001155"/>
++            <tca model="poly3" focal="90" br="0.0000195" vr="1.0000261" bb="-0.0000404" vb="1.0002499"/>
++            <tca model="poly3" focal="100" br="0.0000209" vr="0.9999191" bb="-0.0000173" vb="1.0002320"/>
++            <tca model="poly3" focal="140" br="0.0000188" vr="0.9998127" bb="-0.0000376" vb="1.0002433"/>
++            <tca model="poly3" focal="200" br="0.0000436" vr="0.9997250" bb="-0.0000510" vb="1.0001268"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.4490" k2="0.1998" k3="-0.0468"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.4490" k2="0.1998" k3="-0.0468"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0717" k2="0.0543" k3="-0.0356"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0717" k2="0.0543" k3="-0.0356"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0690" k2="0.0409" k3="-0.0230"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0690" k2="0.0409" k3="-0.0230"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0668" k2="0.0475" k3="-0.0336"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0668" k2="0.0475" k3="-0.0336"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.0838" k2="0.0809" k3="-0.0500"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0838" k2="0.0809" k3="-0.0500"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="10" k1="-0.4213" k2="0.2233" k3="-0.0717"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.4213" k2="0.2233" k3="-0.0717"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="10" k1="-0.0749" k2="0.0528" k3="-0.0278"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.0749" k2="0.0528" k3="-0.0278"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="10" k1="-0.0735" k2="0.0512" k3="-0.0296"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="-0.0735" k2="0.0512" k3="-0.0296"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="10" k1="-0.0742" k2="0.0548" k3="-0.0351"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.0742" k2="0.0548" k3="-0.0351"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="10" k1="-0.0850" k2="0.0836" k3="-0.0531"/>
++            <vignetting model="pa" focal="90" aperture="22" distance="1000" k1="-0.0850" k2="0.0836" k3="-0.0531"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.4097" k2="0.2601" k3="-0.1040"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.4097" k2="0.2601" k3="-0.1040"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.0819" k2="0.0704" k3="-0.0371"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0819" k2="0.0704" k3="-0.0371"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.0717" k2="0.0386" k3="-0.0176"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0717" k2="0.0386" k3="-0.0176"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.0639" k2="0.0322" k3="-0.0203"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0639" k2="0.0322" k3="-0.0203"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.0780" k2="0.0693" k3="-0.0450"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0780" k2="0.0693" k3="-0.0450"/>
++            <vignetting model="pa" focal="140" aperture="2.8" distance="10" k1="-0.3524" k2="0.2271" k3="-0.1535"/>
++            <vignetting model="pa" focal="140" aperture="2.8" distance="1000" k1="-0.3524" k2="0.2271" k3="-0.1535"/>
++            <vignetting model="pa" focal="140" aperture="4" distance="10" k1="-0.1104" k2="0.1910" k3="-0.1561"/>
++            <vignetting model="pa" focal="140" aperture="4" distance="1000" k1="-0.1104" k2="0.1910" k3="-0.1561"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="-0.0927" k2="0.0899" k3="-0.0485"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="-0.0927" k2="0.0899" k3="-0.0485"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="-0.0735" k2="0.0438" k3="-0.0231"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="-0.0735" k2="0.0438" k3="-0.0231"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="10" k1="-0.0734" k2="0.0626" k3="-0.0425"/>
++            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0734" k2="0.0626" k3="-0.0425"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.8337" k2="0.7718" k3="-0.3477"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.8337" k2="0.7718" k3="-0.3477"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="0.0480" k2="-0.5987" k3="0.3456"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="0.0480" k2="-0.5987" k3="0.3456"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.1135" k2="0.1709" k3="-0.1291"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.1135" k2="0.1709" k3="-0.1291"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0999" k2="0.0943" k3="-0.0509"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0999" k2="0.0943" k3="-0.0509"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0900" k2="0.0904" k3="-0.0554"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0900" k2="0.0904" k3="-0.0554"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 10mm f/2.8 EX DC Fisheye HSM</model>
++        <model lang="de">Sigma 10mm f/2.8 EX DC Fischauge HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <type>equisolid</type>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 450D -->
++            <distortion model="ptlens" focal="10" a="0.01165" b="-0.04879" c="0.09652"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 10mm f/2.8 EX DC Fisheye HSM</model>
++        <model lang="de">Sigma 10mm f/2.8 EX DC Fischauge HSM</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <type>fisheye</type>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D200 -->
++            <distortion model="ptlens" focal="10" a="0.00057" b="-0.02738" c="0.00014"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 100-300mm f/4 APO EX DG HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D200 -->
++            <distortion model="ptlens" focal="100" a="0.00007" b="-0.0008" c="-0.00001"/>
++            <distortion model="ptlens" focal="137" a="-0.00066" b="0.00279" c="-0.00217"/>
++            <distortion model="ptlens" focal="196" a="-0.00028" b="0.00292" c="-0.0011"/>
++            <distortion model="ptlens" focal="254" a="-0.00029" b="0.00366" c="-0.00198"/>
++            <distortion model="ptlens" focal="300" a="0.00081" b="0.0001" c="0.002"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="100" k1="-0.3155" k2="0.2954" k3="-0.15596"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="100" k1="0.16981" k2="-0.60469" k3="0.37843"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="100" k1="0.01921" k2="-0.01703" k3="0.00141"/>
++            <vignetting model="pa" focal="137" aperture="4" distance="100" k1="-0.24029" k2="0.21036" k3="-0.11008"/>
++            <vignetting model="pa" focal="137" aperture="5.6" distance="100" k1="0.02429" k2="-0.13049" k3="0.05237"/>
++            <vignetting model="pa" focal="137" aperture="8" distance="100" k1="0.03889" k2="-0.09327" k3="0.06447"/>
++            <vignetting model="pa" focal="196" aperture="4" distance="100" k1="-0.19474" k2="0.15132" k3="-0.08183"/>
++            <vignetting model="pa" focal="196" aperture="5.6" distance="100" k1="-0.02985" k2="0.08378" k3="-0.10544"/>
++            <vignetting model="pa" focal="196" aperture="8" distance="100" k1="-0.0340" k2="0.04936" k3="-0.03488"/>
++            <vignetting model="pa" focal="254" aperture="4" distance="100" k1="-0.1021" k2="-0.1678" k3="0.09927"/>
++            <vignetting model="pa" focal="254" aperture="5.6" distance="100" k1="0.10468" k2="-0.39925" k3="0.18583"/>
++            <vignetting model="pa" focal="254" aperture="8" distance="100" k1="-0.13138" k2="0.34017" k3="-0.27443"/>
++            <vignetting model="pa" focal="300" aperture="4" distance="100" k1="-0.20833" k2="-0.21414" k3="0.26428"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="100" k1="-0.03272" k2="-0.35374" k3="0.22915"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="100" k1="-0.0888" k2="0.13017" k3="-0.06867"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 100-300mm f/4 APO EX DG HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="100" a="0.00075" b="-0.00524" c="0.00291"/>
++            <distortion model="ptlens" focal="135" a="0.00285" b="-0.00904" c="0.00967"/>
++            <distortion model="ptlens" focal="210" a="-0.00012" b="0.00449" c="-0.0018"/>
++            <distortion model="ptlens" focal="250" a="0.00444" b="-0.01026" c="0.01586"/>
++            <distortion model="ptlens" focal="300" a="-0.00125" b="0.00932" c="-0.00324"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.63946" k2="0.78525" k3="-0.51379"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.63946" k2="0.78525" k3="-0.51379"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.2506" k2="0.04868" k3="-0.06119"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.2506" k2="0.04868" k3="-0.06119"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.04002" k2="0.07529" k3="-0.21472"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.04002" k2="0.07529" k3="-0.21472"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.02681" k2="0.03459" k3="-0.05438"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.02681" k2="0.03459" k3="-0.05438"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.49673" k2="0.50408" k3="-0.29663"/>
++            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.49673" k2="0.50408" k3="-0.29663"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.16118" k2="-0.03828" k3="-0.01797"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.16118" k2="-0.03828" k3="-0.01797"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.02714" k2="0.03486" k3="-0.10248"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.02714" k2="0.03486" k3="-0.10248"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="0" k2="0" k3="0"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="0" k2="0" k3="0"/>
++            <vignetting model="pa" focal="210" aperture="4" distance="10" k1="-0.19135" k2="-0.12367" k3="-0.02862"/>
++            <vignetting model="pa" focal="210" aperture="4" distance="1000" k1="-0.19135" k2="-0.12367" k3="-0.02862"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="10" k1="0.00159" k2="-0.35824" k3="0.05758"/>
++            <vignetting model="pa" focal="210" aperture="5.6" distance="1000" k1="0.00159" k2="-0.35824" k3="0.05758"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="-0.19166" k2="0.45016" k3="-0.49235"/>
++            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="-0.19166" k2="0.45016" k3="-0.49235"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="10" k1="-0.0865" k2="0.08241" k3="-0.05934"/>
++            <vignetting model="pa" focal="210" aperture="11" distance="1000" k1="-0.0865" k2="0.08241" k3="-0.05934"/>
++            <vignetting model="pa" focal="250" aperture="4" distance="10" k1="-0.45098" k2="0.11093" k3="-0.03267"/>
++            <vignetting model="pa" focal="250" aperture="4" distance="1000" k1="-0.45098" k2="0.11093" k3="-0.03267"/>
++            <vignetting model="pa" focal="250" aperture="5.6" distance="10" k1="-0.0752" k2="-0.60368" k3="0.40668"/>
++            <vignetting model="pa" focal="250" aperture="5.6" distance="1000" k1="-0.0752" k2="-0.60368" k3="0.40668"/>
++            <vignetting model="pa" focal="250" aperture="8" distance="10" k1="-0.03932" k2="-0.17476" k3="-0.04248"/>
++            <vignetting model="pa" focal="250" aperture="8" distance="1000" k1="-0.03932" k2="-0.17476" k3="-0.04248"/>
++            <vignetting model="pa" focal="250" aperture="11" distance="10" k1="-0.05962" k2="0.04753" k3="-0.10372"/>
++            <vignetting model="pa" focal="250" aperture="11" distance="1000" k1="-0.05962" k2="0.04753" k3="-0.10372"/>
++            <vignetting model="pa" focal="300" aperture="4" distance="10" k1="-0.00125" k2="0.00932" k3="-0.00324"/>
++            <vignetting model="pa" focal="300" aperture="4" distance="1000" k1="-0.00125" k2="0.00932" k3="-0.00324"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.51532" k2="0.33078" k3="-0.17934"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.51532" k2="0.33078" k3="-0.17934"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="0.02277" k2="-0.69185" k3="0.43795"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.02277" k2="-0.69185" k3="0.43795"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.16967" k2="0.33179" k3="-0.35087"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.16967" k2="0.33179" k3="-0.35087"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 100-300mm f/4 APO EX DG HSM + Kenko Teleplus PRO 300 AF 1.4x DGX extender</model>
++        <model lang="en">Sigma 100-300mm f/4 APO EX DG HSM + Kenko Teleplus PRO 300 AF 1.4× DGX ext.</model>
++        <model lang="de">Sigma 100-300mm f/4 APO EX DG HSM + Kenko Teleplus PRO 300 AF 1.4× DGX Konv.</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800 -->
++            <distortion model="ptlens" focal="140" a="-0.00597" b="0.00974" c="-0.00848"/>
++            <distortion model="ptlens" focal="190" a="-0.00562" b="0.01101" c="-0.00757"/>
++            <distortion model="ptlens" focal="270" a="-0.00335" b="0.00606" c="-0.00089"/>
++            <distortion model="ptlens" focal="290" a="-0.00426" b="0.00942" c="-0.0042"/>
++            <distortion model="ptlens" focal="350" a="-0.00427" b="0.01015" c="-0.00509"/>
++            <distortion model="ptlens" focal="420" a="-0.00677" b="0.01777" c="-0.01176"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="-0.39578" k2="0.57099" k3="-0.45125"/>
++            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="-0.39578" k2="0.57099" k3="-0.45125"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="-0.10561" k2="0.03059" k3="-0.10984"/>
++            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="-0.10561" k2="0.03059" k3="-0.10984"/>
++            <vignetting model="pa" focal="190" aperture="5.6" distance="10" k1="-0.39271" k2="0.70381" k3="-0.5887"/>
++            <vignetting model="pa" focal="190" aperture="5.6" distance="1000" k1="-0.39271" k2="0.70381" k3="-0.5887"/>
++            <vignetting model="pa" focal="190" aperture="8" distance="10" k1="-0.18611" k2="0.38611" k3="-0.37591"/>
++            <vignetting model="pa" focal="190" aperture="8" distance="1000" k1="-0.18611" k2="0.38611" k3="-0.37591"/>
++            <vignetting model="pa" focal="270" aperture="5.6" distance="10" k1="-0.38544" k2="0.71939" k3="-0.60858"/>
++            <vignetting model="pa" focal="270" aperture="5.6" distance="1000" k1="-0.38544" k2="0.71939" k3="-0.60858"/>
++            <vignetting model="pa" focal="290" aperture="8" distance="10" k1="-0.13135" k2="0.32962" k3="-0.37561"/>
++            <vignetting model="pa" focal="290" aperture="8" distance="1000" k1="-0.13135" k2="0.32962" k3="-0.37561"/>
++            <vignetting model="pa" focal="350" aperture="5.6" distance="10" k1="-0.31466" k2="0.37507" k3="-0.34992"/>
++            <vignetting model="pa" focal="350" aperture="5.6" distance="1000" k1="-0.31466" k2="0.37507" k3="-0.34992"/>
++            <vignetting model="pa" focal="350" aperture="8" distance="10" k1="-0.05521" k2="-0.0198" k3="-0.14089"/>
++            <vignetting model="pa" focal="350" aperture="8" distance="1000" k1="-0.05521" k2="-0.0198" k3="-0.14089"/>
++            <vignetting model="pa" focal="420" aperture="5.6" distance="10" k1="-0.53536" k2="0.69771" k3="-0.49273"/>
++            <vignetting model="pa" focal="420" aperture="5.6" distance="1000" k1="-0.53536" k2="0.69771" k3="-0.49273"/>
++            <vignetting model="pa" focal="420" aperture="8" distance="10" k1="-0.32735" k2="0.2811" k3="-0.2171"/>
++            <vignetting model="pa" focal="420" aperture="8" distance="1000" k1="-0.32735" k2="0.2811" k3="-0.2171"/>
++            <vignetting model="pa" focal="420" aperture="11" distance="10" k1="-0.02513" k2="-0.07048" k3="-0.01458"/>
++            <vignetting model="pa" focal="420" aperture="11" distance="1000" k1="-0.02513" k2="-0.07048" k3="-0.01458"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 50-150mm f/2.8 APO EX DC HSM II</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D200 -->
++            <distortion model="ptlens" focal="50" a="0.00143" b="-0.0113" c="0.00788"/>
++            <distortion model="ptlens" focal="75" a="0.00207" b="-0.00519" c="0.0052"/>
++            <distortion model="ptlens" focal="105" a="0.00115" b="0.00265" c="0.00031"/>
++            <distortion model="ptlens" focal="150" a="0.00072" b="0.00631" c="-0.00073"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="100" k1="-0.3469" k2="0.34748" k3="-0.2902"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="100" k1="-0.0702" k2="0.38516" k3="-0.44561"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="100" k1="-0.07583" k2="0.32289" k3="-0.27317"/>
++            <vignetting model="pa" focal="75" aperture="2.8" distance="100" k1="-0.2858" k2="0.29719" k3="-0.25336"/>
++            <vignetting model="pa" focal="75" aperture="4" distance="100" k1="-0.01767" k2="0.21834" k3="-0.25478"/>
++            <vignetting model="pa" focal="75" aperture="5.6" distance="100" k1="0.02044" k2="-0.01582" k3="0.00834"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="100" k1="-0.10172" k2="-0.3325" k3="0.10147"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="100" k1="0.06624" k2="-0.05579" k3="-0.20602"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="100" k1="-0.0853" k2="0.40954" k3="-0.44304"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="100" k1="-0.65999" k2="0.58565" k3="-0.31284"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="100" k1="0.10953" k2="-0.77165" k3="0.45448"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="100" k1="-0.0087" k2="0.12197" k3="-0.29994"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="100" k1="-0.0864" k2="0.39283" k3="-0.41541"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 50-150mm f/2.8 APO EX DC HSM II</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 60D -->
++            <distortion model="poly3" focal="50" k1="-0.00415"/>
++            <distortion model="poly3" focal="72" k1="0.00184"/>
++            <distortion model="poly3" focal="89" k1="0.00472"/>
++            <distortion model="poly3" focal="103" k1="0.00552"/>
++            <distortion model="poly3" focal="121" k1="0.00617"/>
++            <distortion model="poly3" focal="150" k1="0.007"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 50-150mm f/2.8 APO EX DC OS HSM</model>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7100 -->
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.8835" k2="0.8004" k3="-0.3800"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.8835" k2="0.8004" k3="-0.3800"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="0.0261" k2="-0.4498" k3="0.2086"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="0.0261" k2="-0.4498" k3="0.2086"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1495" k2="0.2558" k3="-0.1906"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1495" k2="0.2558" k3="-0.1906"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1144" k2="0.0877" k3="-0.0050"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1144" k2="0.0877" k3="-0.0050"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1511" k2="0.1616" k3="-0.0430"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1511" k2="0.1616" k3="-0.0430"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.7369" k2="0.6745" k3="-0.3250"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.7369" k2="0.6745" k3="-0.3250"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0574" k2="-0.0668" k3="-0.0096"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0574" k2="-0.0668" k3="-0.0096"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1020" k2="0.0382" k3="0.0347"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1020" k2="0.0382" k3="0.0347"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1181" k2="0.0875" k3="0.0048"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1181" k2="0.0875" k3="0.0048"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1650" k2="0.2250" k3="-0.0943"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1650" k2="0.2250" k3="-0.0943"/>
++            <vignetting model="pa" focal="98" aperture="2.8" distance="10" k1="-0.6455" k2="0.7361" k3="-0.5267"/>
++            <vignetting model="pa" focal="98" aperture="2.8" distance="1000" k1="-0.6455" k2="0.7361" k3="-0.5267"/>
++            <vignetting model="pa" focal="98" aperture="4" distance="10" k1="-0.1400" k2="0.3700" k3="-0.4613"/>
++            <vignetting model="pa" focal="98" aperture="4" distance="1000" k1="-0.1400" k2="0.3700" k3="-0.4613"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="10" k1="-0.1784" k2="0.3640" k3="-0.2851"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.1784" k2="0.3640" k3="-0.2851"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="10" k1="-0.1073" k2="0.0515" k3="0.0330"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.1073" k2="0.0515" k3="0.0330"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="10" k1="-0.1660" k2="0.2371" k3="-0.1039"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.1660" k2="0.2371" k3="-0.1039"/>
++            <vignetting model="pa" focal="130" aperture="2.8" distance="10" k1="-0.4459" k2="-0.0096" k3="-0.0431"/>
++            <vignetting model="pa" focal="130" aperture="2.8" distance="1000" k1="-0.4459" k2="-0.0096" k3="-0.0431"/>
++            <vignetting model="pa" focal="130" aperture="4" distance="10" k1="0.0900" k2="-0.4760" k3="0.0787"/>
++            <vignetting model="pa" focal="130" aperture="4" distance="1000" k1="0.0900" k2="-0.4760" k3="0.0787"/>
++            <vignetting model="pa" focal="130" aperture="5.6" distance="10" k1="-0.1668" k2="0.4178" k3="-0.4417"/>
++            <vignetting model="pa" focal="130" aperture="5.6" distance="1000" k1="-0.1668" k2="0.4178" k3="-0.4417"/>
++            <vignetting model="pa" focal="130" aperture="8" distance="10" k1="-0.1529" k2="0.2377" k3="-0.1452"/>
++            <vignetting model="pa" focal="130" aperture="8" distance="1000" k1="-0.1529" k2="0.2377" k3="-0.1452"/>
++            <vignetting model="pa" focal="130" aperture="22" distance="10" k1="-0.1597" k2="0.2169" k3="-0.0881"/>
++            <vignetting model="pa" focal="130" aperture="22" distance="1000" k1="-0.1597" k2="0.2169" k3="-0.0881"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="10" k1="-0.7113" k2="0.2236" k3="-0.0584"/>
++            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.7113" k2="0.2236" k3="-0.0584"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="10" k1="0.1357" k2="-0.9865" k3="0.4973"/>
++            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="0.1357" k2="-0.9865" k3="0.4973"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="-0.0681" k2="0.1370" k3="-0.3250"/>
++            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.0681" k2="0.1370" k3="-0.3250"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="10" k1="-0.2089" k2="0.4913" k3="-0.4125"/>
++            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.2089" k2="0.4913" k3="-0.4125"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.1511" k2="0.1851" k3="-0.0612"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.1511" k2="0.1851" k3="-0.0612"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 105mm f/2.8 EX DG OS HSM Macro</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7000 -->
++            <distortion model="poly3" focal="105" k1="-0.00027"/>
++            <!-- There isn't really any -->
++            <tca model="poly3" focal="105"/>
++            <!-- Taken with Nikon D7100 -->
++            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-0.9250" k2="0.9151" k3="-0.4197"/>
++            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-0.9250" k2="0.9151" k3="-0.4197"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="0.0419" k2="-0.4258" k3="0.1698"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="0.0419" k2="-0.4258" k3="0.1698"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0656" k2="0.0250" k3="-0.0148"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0656" k2="0.0250" k3="-0.0148"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0620" k2="0.0076" k3="-0.0034"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0620" k2="0.0076" k3="-0.0034"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.1506" k2="0.1615" k3="-0.0732"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.1506" k2="0.1615" k3="-0.0732"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 105mm f/2.8 EX DG OS HSM Macro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D610 -->
++            <distortion model="poly3" focal="105" k1="-0.00055"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 80-400mm f/4.5-5.6 EX DG OS</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <vignetting model="pa" focal="80" aperture="4.5" distance="10" k1="-0.1063" k2="-0.9663" k3="0.4644"/>
++            <vignetting model="pa" focal="80" aperture="4.5" distance="1000" k1="-0.1063" k2="-0.9663" k3="0.4644"/>
++            <vignetting model="pa" focal="80" aperture="6.3" distance="10" k1="-0.0421" k2="-0.0532" k3="-0.3293"/>
++            <vignetting model="pa" focal="80" aperture="6.3" distance="1000" k1="-0.0421" k2="-0.0532" k3="-0.3293"/>
++            <vignetting model="pa" focal="80" aperture="9" distance="10" k1="-0.1976" k2="0.4278" k3="-0.5083"/>
++            <vignetting model="pa" focal="80" aperture="9" distance="1000" k1="-0.1976" k2="0.4278" k3="-0.5083"/>
++            <vignetting model="pa" focal="80" aperture="13" distance="10" k1="-0.1713" k2="0.2305" k3="-0.2271"/>
++            <vignetting model="pa" focal="80" aperture="13" distance="1000" k1="-0.1713" k2="0.2305" k3="-0.2271"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="10" k1="-0.0951" k2="-0.1184" k3="0.1129"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.0951" k2="-0.1184" k3="0.1129"/>
++            <vignetting model="pa" focal="128" aperture="5" distance="10" k1="-0.2341" k2="-0.3492" k3="0.0958"/>
++            <vignetting model="pa" focal="128" aperture="5" distance="1000" k1="-0.2341" k2="-0.3492" k3="0.0958"/>
++            <vignetting model="pa" focal="128" aperture="7.1" distance="10" k1="-0.2059" k2="0.4177" k3="-0.4996"/>
++            <vignetting model="pa" focal="128" aperture="7.1" distance="1000" k1="-0.2059" k2="0.4177" k3="-0.4996"/>
++            <vignetting model="pa" focal="128" aperture="10" distance="10" k1="-0.1857" k2="0.2513" k3="-0.2311"/>
++            <vignetting model="pa" focal="128" aperture="10" distance="1000" k1="-0.1857" k2="0.2513" k3="-0.2311"/>
++            <vignetting model="pa" focal="128" aperture="14" distance="10" k1="-0.0990" k2="-0.0864" k3="0.0815"/>
++            <vignetting model="pa" focal="128" aperture="14" distance="1000" k1="-0.0990" k2="-0.0864" k3="0.0815"/>
++            <vignetting model="pa" focal="128" aperture="36" distance="10" k1="-0.1045" k2="-0.0884" k3="0.0890"/>
++            <vignetting model="pa" focal="128" aperture="36" distance="1000" k1="-0.1045" k2="-0.0884" k3="0.0890"/>
++            <vignetting model="pa" focal="199" aperture="5.6" distance="10" k1="0.0113" k2="-1.1181" k3="0.5769"/>
++            <vignetting model="pa" focal="199" aperture="5.6" distance="1000" k1="0.0113" k2="-1.1181" k3="0.5769"/>
++            <vignetting model="pa" focal="199" aperture="8" distance="10" k1="0.0355" k2="-0.3309" k3="-0.0910"/>
++            <vignetting model="pa" focal="199" aperture="8" distance="1000" k1="0.0355" k2="-0.3309" k3="-0.0910"/>
++            <vignetting model="pa" focal="199" aperture="11" distance="10" k1="-0.2075" k2="0.5056" k3="-0.5866"/>
++            <vignetting model="pa" focal="199" aperture="11" distance="1000" k1="-0.2075" k2="0.5056" k3="-0.5866"/>
++            <vignetting model="pa" focal="199" aperture="16" distance="10" k1="-0.1956" k2="0.3443" k3="-0.3236"/>
++            <vignetting model="pa" focal="199" aperture="16" distance="1000" k1="-0.1956" k2="0.3443" k3="-0.3236"/>
++            <vignetting model="pa" focal="199" aperture="40" distance="10" k1="-0.0961" k2="-0.0802" k3="0.0820"/>
++            <vignetting model="pa" focal="199" aperture="40" distance="1000" k1="-0.0961" k2="-0.0802" k3="0.0820"/>
++            <vignetting model="pa" focal="315" aperture="5.6" distance="10" k1="-0.5488" k2="-0.5040" k3="0.4889"/>
++            <vignetting model="pa" focal="315" aperture="5.6" distance="1000" k1="-0.5488" k2="-0.5040" k3="0.4889"/>
++            <vignetting model="pa" focal="315" aperture="8" distance="10" k1="0.2021" k2="-1.6294" k3="0.9609"/>
++            <vignetting model="pa" focal="315" aperture="8" distance="1000" k1="0.2021" k2="-1.6294" k3="0.9609"/>
++            <vignetting model="pa" focal="315" aperture="11" distance="10" k1="0.1347" k2="-0.7127" k3="0.1503"/>
++            <vignetting model="pa" focal="315" aperture="11" distance="1000" k1="0.1347" k2="-0.7127" k3="0.1503"/>
++            <vignetting model="pa" focal="315" aperture="16" distance="10" k1="-0.1791" k2="0.4427" k3="-0.6240"/>
++            <vignetting model="pa" focal="315" aperture="16" distance="1000" k1="-0.1791" k2="0.4427" k3="-0.6240"/>
++            <vignetting model="pa" focal="315" aperture="40" distance="10" k1="-0.1726" k2="0.1452" k3="-0.0829"/>
++            <vignetting model="pa" focal="315" aperture="40" distance="1000" k1="-0.1726" k2="0.1452" k3="-0.0829"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="10" k1="-1.3915" k2="1.3667" k3="-0.5801"/>
++            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-1.3915" k2="1.3667" k3="-0.5801"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="10" k1="-0.2573" k2="-1.0117" k3="0.7555"/>
++            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="-0.2573" k2="-1.0117" k3="0.7555"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="10" k1="0.2871" k2="-1.6324" k3="0.8728"/>
++            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="0.2871" k2="-1.6324" k3="0.8728"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="10" k1="0.0539" k2="-0.3728" k3="-0.1296"/>
++            <vignetting model="pa" focal="400" aperture="16" distance="1000" k1="0.0539" k2="-0.3728" k3="-0.1296"/>
++            <vignetting model="pa" focal="400" aperture="40" distance="10" k1="-0.3365" k2="0.7705" k3="-0.6509"/>
++            <vignetting model="pa" focal="400" aperture="40" distance="1000" k1="-0.3365" k2="0.7705" k3="-0.6509"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 24-105mm f/4.0 DG OS HSM [A]</model>
++        <mount>Canon EF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="ptlens" focal="24" a="0.03625" b="-0.10075" c="0.0477"/>
++            <distortion model="ptlens" focal="35" a="0.01363" b="-0.02727" c="0.02717"/>
++            <distortion model="ptlens" focal="51" a="0.01362" b="-0.02646" c="0.03176"/>
++            <distortion model="ptlens" focal="74" a="0.00566" b="-0.00631" c="0.02062"/>
++            <distortion model="ptlens" focal="105" a="-0.00092" b="0.01302" c="0.00266"/>
++            <tca model="poly3" focal="24" br="0.0000857" vr="1.0002262" bb="-0.0001073" vb="1.0002404"/>
++            <tca model="poly3" focal="35" br="0.0000557" vr="1.0000960" bb="-0.0001257" vb="1.0002773"/>
++            <tca model="poly3" focal="51" br="0.0000334" vr="0.9999950" bb="-0.0000808" vb="1.0001953"/>
++            <tca model="poly3" focal="74" br="0.0000248" vr="0.9998621" bb="-0.0000925" vb="1.0001385"/>
++            <tca model="poly3" focal="80" br="0.0000289" vr="0.9997985" bb="-0.0000621" vb="1.0000619"/>
++            <tca model="poly3" focal="105" br="-0.0000212" vr="0.9997116" bb="-0.0000741" vb="1.0000136"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.7952" k2="-0.0227" k3="0.0344"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.7952" k2="-0.0227" k3="0.0344"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-1.0003" k2="0.7650" k3="-0.4391"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-1.0003" k2="0.7650" k3="-0.4391"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.9989" k2="0.6206" k3="-0.2134"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.9989" k2="0.6206" k3="-0.2134"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.9639" k2="0.4965" k3="-0.1062"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.9639" k2="0.4965" k3="-0.1062"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.9767" k2="0.5221" k3="-0.1214"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.9767" k2="0.5221" k3="-0.1214"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.9843" k2="0.5370" k3="-0.1298"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.9843" k2="0.5370" k3="-0.1298"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.6938" k2="0.1952" k3="-0.1031"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6938" k2="0.1952" k3="-0.1031"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.7041" k2="0.4146" k3="-0.2013"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.7041" k2="0.4146" k3="-0.2013"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.6272" k2="0.1414" k3="0.0545"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.6272" k2="0.1414" k3="0.0545"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.6394" k2="0.1639" k3="0.0421"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.6394" k2="0.1639" k3="0.0421"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.6518" k2="0.1866" k3="0.0301"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.6518" k2="0.1866" k3="0.0301"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.6580" k2="0.1954" k3="0.0264"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.6580" k2="0.1954" k3="0.0264"/>
++            <vignetting model="pa" focal="51" aperture="4" distance="10" k1="-0.6459" k2="0.3214" k3="-0.2888"/>
++            <vignetting model="pa" focal="51" aperture="4" distance="1000" k1="-0.6459" k2="0.3214" k3="-0.2888"/>
++            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="-0.4831" k2="0.3633" k3="-0.3193"/>
++            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="-0.4831" k2="0.3633" k3="-0.3193"/>
++            <vignetting model="pa" focal="51" aperture="8" distance="10" k1="-0.4481" k2="0.0970" k3="0.0132"/>
++            <vignetting model="pa" focal="51" aperture="8" distance="1000" k1="-0.4481" k2="0.0970" k3="0.0132"/>
++            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.4181" k2="0.0013" k3="0.0938"/>
++            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.4181" k2="0.0013" k3="0.0938"/>
++            <vignetting model="pa" focal="51" aperture="16" distance="10" k1="-0.4299" k2="0.0228" k3="0.0829"/>
++            <vignetting model="pa" focal="51" aperture="16" distance="1000" k1="-0.4299" k2="0.0228" k3="0.0829"/>
++            <vignetting model="pa" focal="51" aperture="22" distance="10" k1="-0.4434" k2="0.0473" k3="0.0694"/>
++            <vignetting model="pa" focal="51" aperture="22" distance="1000" k1="-0.4434" k2="0.0473" k3="0.0694"/>
++            <vignetting model="pa" focal="74" aperture="4" distance="10" k1="-0.6943" k2="0.4314" k3="-0.4353"/>
++            <vignetting model="pa" focal="74" aperture="4" distance="1000" k1="-0.6943" k2="0.4314" k3="-0.4353"/>
++            <vignetting model="pa" focal="74" aperture="5.6" distance="10" k1="-0.3981" k2="0.4844" k3="-0.5866"/>
++            <vignetting model="pa" focal="74" aperture="5.6" distance="1000" k1="-0.3981" k2="0.4844" k3="-0.5866"/>
++            <vignetting model="pa" focal="74" aperture="8" distance="10" k1="-0.4029" k2="0.4017" k3="-0.3221"/>
++            <vignetting model="pa" focal="74" aperture="8" distance="1000" k1="-0.4029" k2="0.4017" k3="-0.3221"/>
++            <vignetting model="pa" focal="74" aperture="11" distance="10" k1="-0.3032" k2="-0.0103" k3="0.0612"/>
++            <vignetting model="pa" focal="74" aperture="11" distance="1000" k1="-0.3032" k2="-0.0103" k3="0.0612"/>
++            <vignetting model="pa" focal="74" aperture="16" distance="10" k1="-0.3039" k2="-0.0377" k3="0.0951"/>
++            <vignetting model="pa" focal="74" aperture="16" distance="1000" k1="-0.3039" k2="-0.0377" k3="0.0951"/>
++            <vignetting model="pa" focal="74" aperture="22" distance="10" k1="-0.3180" k2="-0.0115" k3="0.0808"/>
++            <vignetting model="pa" focal="74" aperture="22" distance="1000" k1="-0.3180" k2="-0.0115" k3="0.0808"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.6405" k2="0.2169" k3="-0.2852"/>
++            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.6405" k2="0.2169" k3="-0.2852"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.3369" k2="0.3345" k3="-0.5157"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.3369" k2="0.3345" k3="-0.5157"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.4047" k2="0.4919" k3="-0.4128"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.4047" k2="0.4919" k3="-0.4128"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.2916" k2="0.0324" k3="0.0210"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.2916" k2="0.0324" k3="0.0210"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.2708" k2="-0.0547" k3="0.1020"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.2708" k2="-0.0547" k3="0.1020"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.2834" k2="-0.0305" k3="0.0891"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.2834" k2="-0.0305" k3="0.0891"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.5261" k2="-0.2292" k3="0.0645"/>
++            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.5261" k2="-0.2292" k3="0.0645"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.2002" k2="-0.0926" k3="-0.2170"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.2002" k2="-0.0926" k3="-0.2170"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.3480" k2="0.4109" k3="-0.3495"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.3480" k2="0.4109" k3="-0.3495"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="10" k1="-0.2363" k2="-0.0353" k3="0.0732"/>
++            <vignetting model="pa" focal="105" aperture="11" distance="1000" k1="-0.2363" k2="-0.0353" k3="0.0732"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="10" k1="-0.2343" k2="-0.0623" k3="0.1032"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="1000" k1="-0.2343" k2="-0.0623" k3="0.1032"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.2375" k2="-0.0594" k3="0.1056"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.2375" k2="-0.0594" k3="0.1056"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 18-250mm f/3.5-6.3 DC OS Macro HSM</model>
++        <mount>Canon EF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 55V -->
++            <distortion model="ptlens" focal="18" a="0.03419" b="-0.09116" c="0.04125"/>
++            <distortion model="ptlens" focal="22" a="0.02775" b="-0.06342" c="0.04051"/>
++            <distortion model="ptlens" focal="26" a="0.02884" b="-0.05966" c="0.03629"/>
++            <distortion model="ptlens" focal="35" a="0.00054" b="0.03391" c="-0.04229"/>
++            <distortion model="ptlens" focal="135" a="0.00826" b="-0.02182" c="0.04344"/>
++            <distortion model="ptlens" focal="180" a="0.01526" b="-0.04617" c="0.06437"/>
++            <distortion model="ptlens" focal="250" a="0.01692" b="-0.05498" c="0.07496"/>
++            <tca model="poly3" focal="18" br="0.0000694" vr="1.0004727" bb="-0.0000955" vb="1.0002783"/>
++            <tca model="poly3" focal="22" br="0.0000250" vr="1.0004101" bb="-0.0000327" vb="1.0002243"/>
++            <tca model="poly3" focal="26" br="-0.0000025" vr="1.0003871" bb="-0.0000482" vb="1.0002292"/>
++            <tca model="poly3" focal="30" br="-0.0000027" vr="1.0002919" bb="-0.0000523" vb="1.0002181"/>
++            <tca model="poly3" focal="35" br="-0.0000256" vr="1.0002410" bb="-0.0000116" vb="1.0000706"/>
++            <tca model="poly3" focal="50" br="-0.0000453" vr="1.0001936" bb="-0.0000183" vb="1.0000476"/>
++            <tca model="poly3" focal="75" br="-0.0000103" vr="1.0000727" bb="-0.0000364" vb="1.0000054"/>
++            <tca model="poly3" focal="135" br="-0.0000020" vr="0.9999291" bb="-0.0000215" vb="0.9999288"/>
++            <tca model="poly3" focal="180" br="-0.0000950" vr="0.9999136" bb="-0.0000108" vb="0.9995579"/>
++            <tca model="poly3" focal="250" br="-0.0000950" vr="0.9999277" bb="0.0000332" vb="0.9994025"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 18-35mm f/1.8 DC HSM [A]</model>
++        <mount>Canon EF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5100 -->
++            <distortion model="ptlens" focal="18" a="0.01397" b="-0.03966" c="0.01675"/>
++            <distortion model="ptlens" focal="20" a="0.00937" b="-0.02454" c="0.0113"/>
++            <distortion model="ptlens" focal="25" a="0.00428" b="-0.00372" c="-0.0014"/>
++            <distortion model="ptlens" focal="28" a="0" b="0.0075" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.00261" b="0.00264" c="-0.0006"/>
++            <tca model="poly3" focal="18" br="0.0000193" vr="1.0002528" bb="0.0000063" vb="1.0001295"/>
++            <tca model="poly3" focal="20" br="0.0000054" vr="1.0001763" bb="-0.0000260" vb="1.0002051"/>
++            <tca model="poly3" focal="25" br="-0.0000016" vr="1.0000617" bb="-0.0000462" vb="1.0002598"/>
++            <tca model="poly3" focal="28" br="0.0000097" vr="0.9999973" bb="-0.0000374" vb="1.0001820"/>
++            <tca model="poly3" focal="35" br="0.0000296" vr="0.9999868" bb="-0.0000595" vb="1.0000178"/>
++            <vignetting model="pa" focal="18" aperture="1.8" distance="10" k1="-0.7344" k2="0.6606" k3="-0.5296"/>
++            <vignetting model="pa" focal="18" aperture="1.8" distance="1000" k1="-0.7344" k2="0.6606" k3="-0.5296"/>
++            <vignetting model="pa" focal="18" aperture="2.2" distance="10" k1="-0.2097" k2="-0.2092" k3="-0.0406"/>
++            <vignetting model="pa" focal="18" aperture="2.2" distance="1000" k1="-0.2097" k2="-0.2092" k3="-0.0406"/>
++            <vignetting model="pa" focal="18" aperture="2.8" distance="10" k1="-0.2287" k2="0.2088" k3="-0.2744"/>
++            <vignetting model="pa" focal="18" aperture="2.8" distance="1000" k1="-0.2287" k2="0.2088" k3="-0.2744"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2432" k2="0.1840" k3="-0.1181"/>
++            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2432" k2="0.1840" k3="-0.1181"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.2688" k2="0.2081" k3="-0.1063"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.2688" k2="0.2081" k3="-0.1063"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2187" k2="0.0824" k3="-0.0247"/>
++            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2187" k2="0.0824" k3="-0.0247"/>
++            <vignetting model="pa" focal="22" aperture="1.8" distance="10" k1="-0.6328" k2="0.1391" k3="-0.0766"/>
++            <vignetting model="pa" focal="22" aperture="1.8" distance="1000" k1="-0.6328" k2="0.1391" k3="-0.0766"/>
++            <vignetting model="pa" focal="22" aperture="2.2" distance="10" k1="-0.1223" k2="-0.4260" k3="0.1500"/>
++            <vignetting model="pa" focal="22" aperture="2.2" distance="1000" k1="-0.1223" k2="-0.4260" k3="0.1500"/>
++            <vignetting model="pa" focal="22" aperture="2.8" distance="10" k1="-0.2219" k2="0.1741" k3="-0.2095"/>
++            <vignetting model="pa" focal="22" aperture="2.8" distance="1000" k1="-0.2219" k2="0.1741" k3="-0.2095"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="10" k1="-0.2672" k2="0.2367" k3="-0.1312"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="1000" k1="-0.2672" k2="0.2367" k3="-0.1312"/>
++            <vignetting model="pa" focal="22" aperture="5" distance="10" k1="-0.1916" k2="0.0805" k3="-0.0306"/>
++            <vignetting model="pa" focal="22" aperture="5" distance="1000" k1="-0.1916" k2="0.0805" k3="-0.0306"/>
++            <vignetting model="pa" focal="22" aperture="16" distance="10" k1="-0.2050" k2="0.0837" k3="-0.0269"/>
++            <vignetting model="pa" focal="22" aperture="16" distance="1000" k1="-0.2050" k2="0.0837" k3="-0.0269"/>
++            <vignetting model="pa" focal="25" aperture="1.8" distance="10" k1="-0.6543" k2="-0.1606" k3="0.2104"/>
++            <vignetting model="pa" focal="25" aperture="1.8" distance="1000" k1="-0.6543" k2="-0.1606" k3="0.2104"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="10" k1="0.0004" k2="-0.7863" k3="0.3456"/>
++            <vignetting model="pa" focal="25" aperture="2.2" distance="1000" k1="0.0004" k2="-0.7863" k3="0.3456"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="10" k1="-0.2204" k2="0.2840" k3="-0.3007"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.2204" k2="0.2840" k3="-0.3007"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="10" k1="-0.1590" k2="0.0331" k3="-0.0083"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.1590" k2="0.0331" k3="-0.0083"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="10" k1="-0.2231" k2="0.1846" k3="-0.1028"/>
++            <vignetting model="pa" focal="25" aperture="5" distance="1000" k1="-0.2231" k2="0.1846" k3="-0.1028"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.1826" k2="0.0654" k3="-0.0185"/>
++            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.1826" k2="0.0654" k3="-0.0185"/>
++            <vignetting model="pa" focal="28" aperture="1.8" distance="10" k1="-1.1397" k2="0.7144" k3="-0.2108"/>
++            <vignetting model="pa" focal="28" aperture="1.8" distance="1000" k1="-1.1397" k2="0.7144" k3="-0.2108"/>
++            <vignetting model="pa" focal="28" aperture="2.2" distance="10" k1="-0.0649" k2="-1.2012" k3="0.7605"/>
++            <vignetting model="pa" focal="28" aperture="2.2" distance="1000" k1="-0.0649" k2="-1.2012" k3="0.7605"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.0345" k2="-0.3492" k3="0.0325"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.0345" k2="-0.3492" k3="0.0325"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2158" k2="0.2900" k3="-0.2318"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2158" k2="0.2900" k3="-0.2318"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.1668" k2="0.1017" k3="-0.0521"/>
++            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.1668" k2="0.1017" k3="-0.0521"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.2146" k2="0.2124" k3="-0.1242"/>
++            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.2146" k2="0.2124" k3="-0.1242"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-1.3778" k2="1.4172" k3="-0.6407"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-1.3778" k2="1.4172" k3="-0.6407"/>
++            <vignetting model="pa" focal="35" aperture="2.2" distance="10" k1="-0.7312" k2="0.2131" k3="-0.0003"/>
++            <vignetting model="pa" focal="35" aperture="2.2" distance="1000" k1="-0.7312" k2="0.2131" k3="-0.0003"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.1290" k2="-0.8157" k3="0.5467"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.1290" k2="-0.8157" k3="0.5467"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.0446" k2="-0.2877" k3="0.0271"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.0446" k2="-0.2877" k3="0.0271"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.2508" k2="0.4293" k3="-0.3716"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.2508" k2="0.4293" k3="-0.3716"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.2095" k2="0.1924" k3="-0.1006"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.2095" k2="0.1924" k3="-0.1006"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 180mm f/2.8 EX DG OS HSM APO Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with D800 -->
++            <distortion model="ptlens" focal="180" a="-0.00333" b="0.00918" c="-0.00596"/>
++            <vignetting model="pa" focal="180" aperture="2.8" distance="100" k1="-0.99298" k2="0.89434" k3="-0.47337"/>
++            <vignetting model="pa" focal="180" aperture="4" distance="100" k1="-0.16527" k2="-0.60898" k3="0.37435"/>
++            <vignetting model="pa" focal="180" aperture="5.6" distance="100" k1="0.19506" k2="-0.92214" k3="0.39933"/>
++            <vignetting model="pa" focal="180" aperture="8" distance="100" k1="-0.12653" k2="0.27362" k3="-0.49691"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 50mm f/1.4 DG HSM [A]</model>
++        <mount>Canon EF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="poly3" focal="50" k1="0"/>
++            <tca model="poly3" focal="50" br="-0.0000685" vr="1.0001549" bb="0.0000708" vb="0.9998455"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.7584" k2="1.8503" k3="-0.8208"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.7584" k2="1.8503" k3="-0.8208"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.2253" k2="-0.5403" k3="0.3434"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.2253" k2="-0.5403" k3="0.3434"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.3100" k2="-0.1997" k3="0.2306"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3100" k2="-0.1997" k3="0.2306"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.4812" k2="0.1346" k3="0.0260"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.4812" k2="0.1346" k3="0.0260"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3879" k2="-0.0701" k3="0.1637"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3879" k2="-0.0701" k3="0.1637"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.3931" k2="-0.0627" k3="0.1598"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3931" k2="-0.0627" k3="0.1598"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.4106" k2="-0.0318" k3="0.1402"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4106" k2="-0.0318" k3="0.1402"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.3843" k2="-0.0946" k3="0.1829"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3843" k2="-0.0946" k3="0.1829"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 180mm f/5.6 APO Macro</model>
++        <mount>Sony Alpha</mount>
++        <mount>Olympus OM</mount>
++        <mount>Canon FD</mount>
++        <mount>Pentax K</mount>
++        <mount>Nikon F</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 77 -->
++            <distortion model="poly3" focal="180" k1="0.00106"/>
++            <tca model="poly3" focal="180" vr="0.9997" vb="1.0002"/>
++            <vignetting model="pa" focal="180" aperture="5.6" distance="10" k1="-0.3350" k2="0.3070" k3="-0.1518"/>
++            <vignetting model="pa" focal="180" aperture="5.6" distance="1000" k1="-0.3350" k2="0.3070" k3="-0.1518"/>
++            <vignetting model="pa" focal="180" aperture="8" distance="10" k1="-0.1484" k2="0.1991" k3="-0.1089"/>
++            <vignetting model="pa" focal="180" aperture="8" distance="1000" k1="-0.1484" k2="0.1991" k3="-0.1089"/>
++            <vignetting model="pa" focal="180" aperture="11" distance="10" k1="-0.1768" k2="0.2532" k3="-0.1409"/>
++            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.1768" k2="0.2532" k3="-0.1409"/>
++            <vignetting model="pa" focal="180" aperture="22" distance="10" k1="-0.2178" k2="0.3124" k3="-0.1716"/>
++            <vignetting model="pa" focal="180" aperture="22" distance="1000" k1="-0.2178" k2="0.3124" k3="-0.1716"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 70-300mm f/4-5.6 DG Macro</model>
++        <mount>Sony Alpha</mount>
++        <mount>Sigma SA</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D610 -->
++            <distortion model="ptlens" focal="70" a="-0.00361" b="-0.00079" c="0.00665"/>
++            <distortion model="ptlens" focal="90" a="-0.00146" b="-0.00111" c="0.01353"/>
++            <distortion model="ptlens" focal="102" a="0.00417" b="-0.01327" c="0.02682"/>
++            <distortion model="ptlens" focal="135" a="0.00681" b="-0.01051" c="0.01656"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00905" c="0"/>
++            <tca model="poly3" focal="70" br="0.0000707" vr="1.0000548" bb="-0.0000728" vb="1.0000550"/>
++            <tca model="poly3" focal="90" br="0.0000178" vr="1.0000676" bb="-0.0000335" vb="0.9999981"/>
++            <tca model="poly3" focal="102" br="0.0000021" vr="1.0000526" bb="-0.0000060" vb="0.9999382"/>
++            <tca model="poly3" focal="135" br="-0.0000271" vr="1.0000352" bb="0.0000214" vb="0.9998037"/>
++            <tca model="poly3" focal="220" br="-0.0000298" vr="0.9999532" bb="0.0000435" vb="0.9996860"/>
++            <tca model="poly3" focal="300" br="-0.0000555" vr="0.9998700" bb="0.0000869" vb="0.9996162"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 4.5mm f/2.8 EX DC HSM circular fisheye</model>
++        <model lang="de">Sigma 4.5mm f/2.8 EX DC HSM Zirkular-Fischauge</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <mount>Sigma SA</mount>
++        <type>fisheye</type>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K-3 -->
++            <!-- Measured with 360° panorama -->
++            <distortion model="ptlens" focal="4.5" a="-0.21693" b="-0.44076" c="-0.47357"/>
++            <tca model="poly3" focal="4.5" br="-0.0011015" vr="1.0008801" bb="-0.0002284" vb="1.0005327"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 50-100mm f/1.8 DC HSM Art</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F</mount>
++        <mount>Sigma SA</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7200 -->
++            <distortion model="poly3" focal="50" k1="-0.00448"/>
++            <distortion model="poly3" focal="52" k1="-0.00349"/>
++            <distortion model="poly3" focal="60" k1="-0.0008"/>
++            <distortion model="poly3" focal="70" k1="0.00243"/>
++            <distortion model="poly3" focal="85" k1="0.00539"/>
++            <distortion model="poly3" focal="100" k1="0.00679"/>
++            <tca model="poly3" focal="50" br="-0.0000253" vr="1.0006888" bb="0.0000730" vb="0.9999195"/>
++            <tca model="poly3" focal="52" br="-0.0000241" vr="1.0006917" bb="0.0000901" vb="0.9999048"/>
++            <tca model="poly3" focal="55" br="-0.0000029" vr="1.0006391" bb="0.0000682" vb="0.9999260"/>
++            <tca model="poly3" focal="60" br="0.0000102" vr="1.0005849" bb="0.0000702" vb="0.9999362"/>
++            <tca model="poly3" focal="70" br="0.0000447" vr="1.0004367" bb="0.0000381" vb="0.9999805"/>
++            <tca model="poly3" focal="85" br="0.0000310" vr="1.0003197" bb="0.0000184" vb="0.9999978"/>
++            <tca model="poly3" focal="100" br="0.0000106" vr="1.0002518" bb="0.0000064" vb="1.0000197"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-0.6722" k2="0.3712" k3="-0.2237"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.6722" k2="0.3712" k3="-0.2237"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="0.1832" k2="-0.3861" k3="-0.0678"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="0.1832" k2="-0.3861" k3="-0.0678"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="0.0279" k2="-0.1184" k3="0.0765"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="0.0279" k2="-0.1184" k3="0.0765"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.0169" k2="-0.0516" k3="0.0283"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0169" k2="-0.0516" k3="0.0283"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0510" k2="-0.0051" k3="-0.0090"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0510" k2="-0.0051" k3="-0.0090"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1497" k2="0.1591" k3="-0.1012"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1497" k2="0.1591" k3="-0.1012"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1610" k2="0.1805" k3="-0.1167"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1610" k2="0.1805" k3="-0.1167"/>
++            <vignetting model="pa" focal="60" aperture="1.8" distance="10" k1="-0.6491" k2="0.3220" k3="-0.1687"/>
++            <vignetting model="pa" focal="60" aperture="1.8" distance="1000" k1="-0.6491" k2="0.3220" k3="-0.1687"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="10" k1="-0.0425" k2="0.3064" k3="-0.3738"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.0425" k2="0.3064" k3="-0.3738"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="10" k1="-0.0083" k2="-0.0273" k3="0.0091"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.0083" k2="-0.0273" k3="0.0091"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="10" k1="-0.0521" k2="-0.0063" k3="0.0061"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0521" k2="-0.0063" k3="0.0061"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.0693" k2="0.0232" k3="-0.0247"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.0693" k2="0.0232" k3="-0.0247"/>
++            <vignetting model="pa" focal="60" aperture="11" distance="10" k1="-0.1554" k2="0.1582" k3="-0.0980"/>
++            <vignetting model="pa" focal="60" aperture="11" distance="1000" k1="-0.1554" k2="0.1582" k3="-0.0980"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="-0.1430" k2="0.1123" k3="-0.0686"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="-0.1430" k2="0.1123" k3="-0.0686"/>
++            <vignetting model="pa" focal="70" aperture="1.8" distance="10" k1="-0.6759" k2="0.4692" k3="-0.3116"/>
++            <vignetting model="pa" focal="70" aperture="1.8" distance="1000" k1="-0.6759" k2="0.4692" k3="-0.3116"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.0917" k2="0.4946" k3="-0.5614"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.0917" k2="0.4946" k3="-0.5614"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0476" k2="0.0969" k3="-0.0990"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0476" k2="0.0969" k3="-0.0990"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0519" k2="-0.0068" k3="0.0039"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0519" k2="-0.0068" k3="0.0039"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0788" k2="0.0294" k3="-0.0236"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0788" k2="0.0294" k3="-0.0236"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1363" k2="0.1179" k3="-0.0723"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1363" k2="0.1179" k3="-0.0723"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.1758" k2="0.2037" k3="-0.1277"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.1758" k2="0.2037" k3="-0.1277"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="10" k1="-0.8125" k2="0.5640" k3="-0.3143"/>
++            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-0.8125" k2="0.5640" k3="-0.3143"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="10" k1="-0.0144" k2="0.2032" k3="-0.3840"/>
++            <vignetting model="pa" focal="85" aperture="2.8" distance="1000" k1="-0.0144" k2="0.2032" k3="-0.3840"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="10" k1="-0.0907" k2="0.2445" k3="-0.2322"/>
++            <vignetting model="pa" focal="85" aperture="4" distance="1000" k1="-0.0907" k2="0.2445" k3="-0.2322"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="-0.0710" k2="0.0573" k3="-0.0413"/>
++            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.0710" k2="0.0573" k3="-0.0413"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="10" k1="-0.1041" k2="0.1039" k3="-0.0738"/>
++            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.1041" k2="0.1039" k3="-0.0738"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="10" k1="-0.1310" k2="0.1212" k3="-0.0789"/>
++            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.1310" k2="0.1212" k3="-0.0789"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="10" k1="-0.1999" k2="0.2492" k3="-0.1527"/>
++            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.1999" k2="0.2492" k3="-0.1527"/>
++            <vignetting model="pa" focal="100" aperture="1.8" distance="10" k1="-1.0107" k2="0.9031" k3="-0.4717"/>
++            <vignetting model="pa" focal="100" aperture="1.8" distance="1000" k1="-1.0107" k2="0.9031" k3="-0.4717"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="0.0502" k2="-0.0656" k3="-0.1927"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="0.0502" k2="-0.0656" k3="-0.1927"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.0906" k2="0.2365" k3="-0.2354"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0906" k2="0.2365" k3="-0.2354"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.0649" k2="0.0227" k3="-0.0159"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0649" k2="0.0227" k3="-0.0159"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.0903" k2="0.0657" k3="-0.0474"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0903" k2="0.0657" k3="-0.0474"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.1517" k2="0.1580" k3="-0.0975"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1517" k2="0.1580" k3="-0.0975"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.1877" k2="0.2290" k3="-0.1346"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1877" k2="0.2290" k3="-0.1346"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 17-70mm f/2.8-4 DC MACRO OS HSM Contemporary</model>
++        <model lang="en">Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C</model>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5500 -->
++            <distortion model="ptlens" focal="17" a="0.040576" b="-0.127959" c="0.10121"/>
++            <distortion model="ptlens" focal="26" a="0.019128" b="-0.055429" c="0.058149"/>
++            <distortion model="ptlens" focal="28" a="0.023321" b="-0.072098" c="0.084479"/>
++            <distortion model="ptlens" focal="38" a="0.021812" b="-0.076706" c="0.107533"/>
++            <distortion model="ptlens" focal="52" a="0.002694" b="0.001095" c="0.000357"/>
++            <distortion model="ptlens" focal="70" a="-0.000357" b="0.010895" c="-0.010202"/>
++            <tca model="poly3" focal="17" br="0.0000318" vr="1.0004569" bb="-0.0000359" vb="1.0000930"/>
++            <tca model="poly3" focal="26" br="-0.0000359" vr="1.0003278" bb="0.0000149" vb="1.0000534"/>
++            <tca model="poly3" focal="28" br="-0.0000573" vr="1.0002842" bb="0.0000121" vb="1.0000285"/>
++            <tca model="poly3" focal="38" br="-0.0000506" vr="1.0002011" bb="0.0000024" vb="1.0000138"/>
++            <tca model="poly3" focal="52" br="-0.0000377" vr="1.0000416" bb="0.0000070" vb="0.9999498"/>
++            <tca model="poly3" focal="70" br="-0.0000462" vr="0.9999136" bb="0.0000171" vb="0.9999032"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.6617" k2="0.0575" k3="-0.0040"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.6617" k2="0.0575" k3="-0.0040"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.2288" k2="-0.5570" k3="0.3040"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.2288" k2="-0.5570" k3="0.3040"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.3581" k2="0.0558" k3="-0.0845"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.3581" k2="0.0558" k3="-0.0845"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.3346" k2="-0.0755" k3="0.0583"/>
++            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.3346" k2="-0.0755" k3="0.0583"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.3632" k2="-0.0242" k3="0.0325"/>
++            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.3632" k2="-0.0242" k3="0.0325"/>
++            <vignetting model="pa" focal="26" aperture="3.2" distance="10" k1="-0.7618" k2="0.8700" k3="-0.6601"/>
++            <vignetting model="pa" focal="26" aperture="3.2" distance="1000" k1="-0.7618" k2="0.8700" k3="-0.6601"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="-0.2930" k2="0.1520" k3="-0.2646"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="-0.2930" k2="0.1520" k3="-0.2646"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="10" k1="-0.2816" k2="0.0799" k3="-0.0678"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="1000" k1="-0.2816" k2="0.0799" k3="-0.0678"/>
++            <vignetting model="pa" focal="26" aperture="9" distance="10" k1="-0.2510" k2="-0.0456" k3="0.0409"/>
++            <vignetting model="pa" focal="26" aperture="9" distance="1000" k1="-0.2510" k2="-0.0456" k3="0.0409"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.2751" k2="-0.0103" k3="0.0265"/>
++            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.2751" k2="-0.0103" k3="0.0265"/>
++            <vignetting model="pa" focal="34" aperture="3.3" distance="10" k1="-0.7579" k2="1.0756" k3="-0.8260"/>
++            <vignetting model="pa" focal="34" aperture="3.3" distance="1000" k1="-0.7579" k2="1.0756" k3="-0.8260"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.2877" k2="0.2747" k3="-0.3850"/>
++            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.2877" k2="0.2747" k3="-0.3850"/>
++            <vignetting model="pa" focal="34" aperture="6.3" distance="10" k1="-0.2470" k2="0.2214" k3="-0.1982"/>
++            <vignetting model="pa" focal="34" aperture="6.3" distance="1000" k1="-0.2470" k2="0.2214" k3="-0.1982"/>
++            <vignetting model="pa" focal="34" aperture="9" distance="10" k1="-0.2025" k2="0.0239" k3="-0.0147"/>
++            <vignetting model="pa" focal="34" aperture="9" distance="1000" k1="-0.2025" k2="0.0239" k3="-0.0147"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.2354" k2="0.0766" k3="-0.0398"/>
++            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.2354" k2="0.0766" k3="-0.0398"/>
++            <vignetting model="pa" focal="52" aperture="3.8" distance="10" k1="-0.7196" k2="1.1314" k3="-0.9399"/>
++            <vignetting model="pa" focal="52" aperture="3.8" distance="1000" k1="-0.7196" k2="1.1314" k3="-0.9399"/>
++            <vignetting model="pa" focal="52" aperture="5" distance="10" k1="-0.2492" k2="0.4733" k3="-0.5806"/>
++            <vignetting model="pa" focal="52" aperture="5" distance="1000" k1="-0.2492" k2="0.4733" k3="-0.5806"/>
++            <vignetting model="pa" focal="52" aperture="7.1" distance="10" k1="-0.2197" k2="0.3035" k3="-0.2691"/>
++            <vignetting model="pa" focal="52" aperture="7.1" distance="1000" k1="-0.2197" k2="0.3035" k3="-0.2691"/>
++            <vignetting model="pa" focal="52" aperture="10" distance="10" k1="-0.1588" k2="0.0508" k3="-0.0355"/>
++            <vignetting model="pa" focal="52" aperture="10" distance="1000" k1="-0.1588" k2="0.0508" k3="-0.0355"/>
++            <vignetting model="pa" focal="52" aperture="22" distance="10" k1="-0.1920" k2="0.1094" k3="-0.0655"/>
++            <vignetting model="pa" focal="52" aperture="22" distance="1000" k1="-0.1920" k2="0.1094" k3="-0.0655"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5271" k2="0.6349" k3="-0.6264"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5271" k2="0.6349" k3="-0.6264"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2699" k2="0.6582" k3="-0.6639"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2699" k2="0.6582" k3="-0.6639"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1966" k2="0.2831" k3="-0.2366"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1966" k2="0.2831" k3="-0.2366"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1501" k2="0.0901" k3="-0.0588"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1501" k2="0.0901" k3="-0.0588"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1712" k2="0.1244" k3="-0.0783"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1712" k2="0.1244" k3="-0.0783"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 24mm f/2.8 Super Wide II</model>
++        <mount>Minolta AF</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony SLT-A58 -->
++            <distortion model="ptlens" focal="24" a="0" b="-0.0085" c="0"/>
++            <tca model="poly3" focal="24" br="-0.0000150" vr="1.0004690" bb="0.0000578" vb="0.9998126"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.4802" k2="0.0226" k3="0.0796"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.4802" k2="0.0226" k3="0.0796"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.2279" k2="0.1426" k3="-0.1368"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2279" k2="0.1426" k3="-0.1368"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2030" k2="-0.0007" k3="0.0504"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2030" k2="-0.0007" k3="0.0504"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2408" k2="-0.0286" k3="0.1041"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2408" k2="-0.0286" k3="0.1041"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2906" k2="0.1036" k3="0.0015"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2906" k2="0.1036" k3="0.0015"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.2988" k2="0.1251" k3="-0.0185"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.2988" k2="0.1251" k3="-0.0185"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.3216" k2="0.1949" k3="-0.0724"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.3216" k2="0.1949" k3="-0.0724"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 20mm f/1.4 DG HSM | Art 015</model>
++        <model lang="en">Sigma 20mm f/1.4 DG HSM | A</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 5D Mark III -->
++            <distortion model="ptlens" focal="20" a="0.007" b="-0.03037" c="0.03089"/>
++            <tca model="poly3" focal="20" vr="1.0001889" vb="0.9999547"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma 150-600mm f/5-6.3 DG OS HSM | C</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 80D -->
++            <distortion model="ptlens" focal="150" a="-0.002" b="0.016" c="-0.029"/>
++            <distortion model="ptlens" focal="180" a="-0.004" b="0.02" c="-0.029"/>
++            <distortion model="ptlens" focal="200" a="-0.004" b="0.016" c="-0.021"/>
++            <distortion model="ptlens" focal="244" a="-0.003" b="0.012" c="-0.015"/>
++            <distortion model="ptlens" focal="302" a="-0.006" b="0.026" c="-0.03"/>
++            <distortion model="ptlens" focal="403" a="-0.005" b="0.021" c="-0.026"/>
++            <distortion model="ptlens" focal="500" a="-0.017" b="0.065" c="-0.074"/>
++            <distortion model="ptlens" focal="600" a="-0.018" b="0.069" c="-0.077"/>
++            <tca model="poly3" focal="150" br="0.0000029" vr="1.0000947" bb="-0.0000151" vb="1.0000720"/>
++            <tca model="poly3" focal="180" br="-0.0000211" vr="1.0000991" bb="-0.0000253" vb="1.0000689"/>
++            <tca model="poly3" focal="200" br="-0.0000021" vr="1.0000604" bb="-0.0000214" vb="1.0000592"/>
++            <tca model="poly3" focal="244" br="0.0000079" vr="0.9999888" bb="-0.0000174" vb="1.0000418"/>
++            <tca model="poly3" focal="302" br="0.0000142" vr="0.9999407" bb="-0.0000026" vb="1.0000031"/>
++            <tca model="poly3" focal="403" br="0.0000333" vr="0.9998496" bb="0.0000002" vb="1.0000038"/>
++            <tca model="poly3" focal="500" br="0.0000186" vr="0.9998762" bb="-0.0000092" vb="1.0000056"/>
++            <tca model="poly3" focal="600" br="0.0000285" vr="0.9998382" bb="-0.0000057" vb="0.9999989"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="10" k1="-0.1999" k2="-0.1882" k3="0.1607"/>
++            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.1999" k2="-0.1882" k3="0.1607"/>
++            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0476" k2="0.0372" k3="-0.0308"/>
++            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0476" k2="0.0372" k3="-0.0308"/>
++            <vignetting model="pa" focal="150" aperture="10" distance="10" k1="-0.0050" k2="-0.0193" k3="-0.0073"/>
++            <vignetting model="pa" focal="150" aperture="10" distance="1000" k1="-0.0050" k2="-0.0193" k3="-0.0073"/>
++            <vignetting model="pa" focal="150" aperture="14" distance="10" k1="0.0042" k2="-0.0161" k3="-0.0200"/>
++            <vignetting model="pa" focal="150" aperture="14" distance="1000" k1="0.0042" k2="-0.0161" k3="-0.0200"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.0032" k2="0.0270" k3="-0.0559"/>
++            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0032" k2="0.0270" k3="-0.0559"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.1436" k2="-0.1502" k3="0.1089"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.1436" k2="-0.1502" k3="0.1089"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0735" k2="0.0820" k3="-0.0571"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0735" k2="0.0820" k3="-0.0571"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.0083" k2="-0.0252" k3="0.0000"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0083" k2="-0.0252" k3="0.0000"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="0.0111" k2="-0.0332" k3="-0.0084"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="0.0111" k2="-0.0332" k3="-0.0084"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="0.0186" k2="-0.0291" k3="-0.0203"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="0.0186" k2="-0.0291" k3="-0.0203"/>
++            <vignetting model="pa" focal="302" aperture="5.6" distance="10" k1="-0.1474" k2="0.0030" k3="-0.0495"/>
++            <vignetting model="pa" focal="302" aperture="5.6" distance="1000" k1="-0.1474" k2="0.0030" k3="-0.0495"/>
++            <vignetting model="pa" focal="302" aperture="8" distance="10" k1="-0.0768" k2="0.0509" k3="-0.0550"/>
++            <vignetting model="pa" focal="302" aperture="8" distance="1000" k1="-0.0768" k2="0.0509" k3="-0.0550"/>
++            <vignetting model="pa" focal="302" aperture="11" distance="10" k1="-0.0705" k2="0.0798" k3="-0.0700"/>
++            <vignetting model="pa" focal="302" aperture="11" distance="1000" k1="-0.0705" k2="0.0798" k3="-0.0700"/>
++            <vignetting model="pa" focal="302" aperture="16" distance="10" k1="-0.0187" k2="-0.0286" k3="0.0031"/>
++            <vignetting model="pa" focal="302" aperture="16" distance="1000" k1="-0.0187" k2="-0.0286" k3="0.0031"/>
++            <vignetting model="pa" focal="302" aperture="29" distance="10" k1="0.0264" k2="-0.0763" k3="0.0108"/>
++            <vignetting model="pa" focal="302" aperture="29" distance="1000" k1="0.0264" k2="-0.0763" k3="0.0108"/>
++            <vignetting model="pa" focal="435" aperture="6.3" distance="10" k1="-0.0997" k2="-0.3803" k3="0.2208"/>
++            <vignetting model="pa" focal="435" aperture="6.3" distance="1000" k1="-0.0997" k2="-0.3803" k3="0.2208"/>
++            <vignetting model="pa" focal="435" aperture="9" distance="10" k1="-0.0573" k2="0.0311" k3="-0.0650"/>
++            <vignetting model="pa" focal="435" aperture="9" distance="1000" k1="-0.0573" k2="0.0311" k3="-0.0650"/>
++            <vignetting model="pa" focal="435" aperture="13" distance="10" k1="-0.0338" k2="-0.0256" k3="-0.0067"/>
++            <vignetting model="pa" focal="435" aperture="13" distance="1000" k1="-0.0338" k2="-0.0256" k3="-0.0067"/>
++            <vignetting model="pa" focal="435" aperture="18" distance="10" k1="-0.0355" k2="0.0083" k3="-0.0224"/>
++            <vignetting model="pa" focal="435" aperture="18" distance="1000" k1="-0.0355" k2="0.0083" k3="-0.0224"/>
++            <vignetting model="pa" focal="435" aperture="29" distance="10" k1="0.0103" k2="-0.0587" k3="0.0140"/>
++            <vignetting model="pa" focal="435" aperture="29" distance="1000" k1="0.0103" k2="-0.0587" k3="0.0140"/>
++            <vignetting model="pa" focal="600" aperture="6.3" distance="10" k1="-0.5809" k2="0.5986" k3="-0.3001"/>
++            <vignetting model="pa" focal="600" aperture="6.3" distance="1000" k1="-0.5809" k2="0.5986" k3="-0.3001"/>
++            <vignetting model="pa" focal="600" aperture="9" distance="10" k1="-0.0391" k2="-0.0093" k3="-0.0741"/>
++            <vignetting model="pa" focal="600" aperture="9" distance="1000" k1="-0.0391" k2="-0.0093" k3="-0.0741"/>
++            <vignetting model="pa" focal="600" aperture="13" distance="10" k1="-0.0166" k2="-0.0624" k3="0.0138"/>
++            <vignetting model="pa" focal="600" aperture="13" distance="1000" k1="-0.0166" k2="-0.0624" k3="0.0138"/>
++            <vignetting model="pa" focal="600" aperture="18" distance="10" k1="-0.0151" k2="-0.0503" k3="0.0132"/>
++            <vignetting model="pa" focal="600" aperture="18" distance="1000" k1="-0.0151" k2="-0.0503" k3="0.0132"/>
++            <vignetting model="pa" focal="600" aperture="29" distance="10" k1="-0.0011" k2="-0.0380" k3="0.0060"/>
++            <vignetting model="pa" focal="600" aperture="29" distance="1000" k1="-0.0011" k2="-0.0380" k3="0.0060"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sigma</maker>
++        <model>Sigma DT 18-300mm f/3.5-6.3 DC Macro</model>
++        <mount>Sony Alpha</mount>
++        <mount>Canon EF-S</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sigma SA</mount>
++        <mount>Pentax KAF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A77V -->
++            <distortion model="ptlens" focal="18" a="0.04288" b="-0.11689" c="0.06181"/>
++            <distortion model="ptlens" focal="24" a="0.03568" b="-0.09156" c="0.0758"/>
++            <distortion model="ptlens" focal="28" a="0.02554" b="-0.05083" c="0.0415"/>
++            <distortion model="ptlens" focal="35" a="0.0084" b="0.01399" c="-0.03436"/>
++            <distortion model="ptlens" focal="55" a="-0.00445" b="0.05235" c="-0.07144"/>
++            <distortion model="ptlens" focal="90" a="0" b="0.01236" c="0"/>
++            <distortion model="ptlens" focal="210" a="0" b="0.00509" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00662" c="0"/>
++            <tca model="poly3" focal="18" vr="1.0005829" vb="1.0000237"/>
++            <tca model="poly3" focal="24" vr="1.0004884" vb="1.0000201"/>
++            <tca model="poly3" focal="28" vr="1.0004243" vb="1.0000124"/>
++            <tca model="poly3" focal="35" vr="1.0002965" vb="1.0000111"/>
++            <tca model="poly3" focal="55" vr="1.0002048" vb="1.0000052"/>
++            <tca model="poly3" focal="90" vr="1.0000398" vb="1.0000027"/>
++            <tca model="poly3" focal="210" vr="0.9999862" vb="0.9999853"/>
++            <tca model="poly3" focal="300" vr="0.9999898" vb="0.9999770"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-soligor.xml b/data/db/slr-soligor.xml
+--- a/data/db/slr-soligor.xml	2013-09-11 22:18:41.000000000 +0200
++++ b/data/db/slr-soligor.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,16 +1,13 @@
+ <lensdatabase>
+-
+     <lens>
+         <maker>Soligor</maker>
+-        <model>MC SOLIGOR C/D WIDE-AUTO 1:2.8 f=24mm</model>
++        <model>MC Soligor C/D Wide-Auto 1:2.8 f=24mm</model>
+         <mount>Pentax KAF2</mount>
+-        <!-- FixMe: Actually cropfactor 1.531 -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+             <!-- Taken with Pentax K100D -->
+-            <distortion model="ptlens" focal="24" a="0.00094" b="-0.00031" c="-0.02187" />
+-            <tca model="poly3" focal="24" br="-0.0001490" vr="1.0007959" bb="0.0001683" vb="0.9994169" />
++            <distortion model="ptlens" focal="24" a="0.00094" b="-0.00031" c="-0.02187"/>
++            <tca model="poly3" focal="24" br="-0.0001490" vr="1.0007959" bb="0.0001683" vb="0.9994169"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-sony.xml b/data/db/slr-sony.xml
+--- a/data/db/slr-sony.xml	2013-10-11 23:54:00.000000000 +0200
++++ b/data/db/slr-sony.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,550 +1,880 @@
+ <lensdatabase>
+-
+     <mount>
+         <name>Sony Alpha</name>
++        <compat>Minolta AF</compat>
+         <compat>M42</compat>
++        <compat>M39/1</compat>
++        <compat>DKL</compat>
+         <compat>T2</compat>
+-        <compat>Minolta AF</compat>
++        <compat>Tamron Adaptall</compat>
+         <compat>Generic</compat>
+     </mount>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A33</model>
+         <model lang="en">Alpha 33</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A35</model>
+         <model lang="en">Alpha 35</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A37</model>
+         <model lang="en">Alpha 37</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A55V</model>
+         <model lang="en">Alpha 55</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A57</model>
+         <model lang="en">Alpha 57</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A58</model>
+         <model lang="en">Alpha 58</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>SLT-A65V</model>
+         <model lang="en">Alpha 65</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
++        <model>ILCA-68</model>
++        <model lang="en">Alpha 68</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
+         <model>SLT-A77V</model>
+         <model lang="en">Alpha 77</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
++        <model>ILCA-77M2</model>
++        <model lang="en">Alpha 77 II</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
+         <model>SLT-A99</model>
+         <model lang="en">Alpha 99</model>
+         <mount>Sony Alpha</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1.005</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
++        <model>SLT-A99V</model>
++        <model lang="en">Alpha 99V</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.005</cropfactor>
++    </camera>
++    <camera>
++        <maker>Sony</maker>
+         <model>DSLR-A100</model>
+         <model lang="en">Alpha 100</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A200</model>
+         <model lang="en">Alpha 200</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A230</model>
+         <model lang="en">Alpha 230</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A290</model>
+         <model lang="en">Alpha 290</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A300</model>
+         <model lang="en">Alpha 300</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A330</model>
+         <model lang="en">Alpha 330</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A350</model>
+         <model lang="en">Alpha 350</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A380</model>
+         <model lang="en">Alpha 380</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A390</model>
+         <model lang="en">Alpha 390</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A450</model>
+         <model lang="en">Alpha 450</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A500</model>
+         <model lang="en">Alpha 500</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A550</model>
+         <model lang="en">Alpha 550</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A560</model>
+         <model lang="en">Alpha 560</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A580</model>
+         <model lang="en">Alpha 580</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A700</model>
+         <model lang="en">Alpha 700</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A850</model>
+         <model lang="en">Alpha 850</model>
+         <mount>Sony Alpha</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+-        <maker>SONY</maker>
+-        <maker lang="en">Sony</maker>
++        <maker>Sony</maker>
+         <model>DSLR-A900</model>
+         <model lang="en">Alpha 900</model>
+         <mount>Sony Alpha</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>Sony AF DT 16-105 mm F3.5-5.6</model>
++        <model>Sony AF DT 16-105mm f/3.5-5.6</model>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of Sony APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <tca model="poly3" focal="16" br="0.0000849" vr="1.0002242" bb="0.0002099" vb="1.0007851" />
+-            <tca model="poly3" focal="24" br="0.0001033" vr="1.0002142" bb="-0.0001268" vb="1.0003659" />
+-            <tca model="poly3" focal="35" br="0.0000673" vr="1.0001269" bb="-0.0001984" vb="1.0001409" />
+-            <tca model="poly3" focal="50" br="-0.0000401" vr="0.9998721" bb="-0.0001637" vb="1.0001459" />
+-            <tca model="poly3" focal="75" br="0.0000190" vr="0.9997211" bb="-0.0002164" vb="1.0000605" />
+-            <tca model="poly3" focal="105" br="0.0001368" vr="0.9992983" bb="-0.0002385" vb="1.0001643" />
+-
+-            <!-- distortion poly3 with hugin -->
+-            <!-- distortion model="poly3" focal="16" k1="-0.025" / -->
+-            <!-- distortion model="poly3" focal="22" k1="-0.005" / -->
+-            <!-- distortion model="poly3" focal="35" k1="-0.007" / -->
+-            <!-- distortion model="poly3" focal="50" k1="-0.008" / -->
+-            <!-- distortion model="poly3" focal="70" k1="0.007" / -->
+-
+-            <!-- distortion ptlens with hugin -->
+-            <!-- distortion model="ptlens" focal="16" a="0.030" b="-0.080" c="0.026" / -->
+-            <!-- distortion model="ptlens" focal="22" a="0.011" b="-0.024" c="0.009" / -->
+-            <!-- distortion model="ptlens" focal="35" a="0.006" b="-0.003" c="-0.002" / -->
+-            <!-- distortion model="ptlens" focal="50" a="0.003" b="-0.003" c="0.010" / -->
+-            <!-- distortion model="ptlens" focal="70" a="0.002" b="0.003" c="0.003" / -->
+-            <!-- distortion model="ptlens" focal="105" a="-0.001" b="0.010" c="-0.004" / -->
+-
+-            <!-- distortion with OpenCV -->
+-            <distortion model="poly5" focal="16" k1="-0.032364"  k2="0.004780" />
+-            <distortion model="poly5" focal="24" k1="-0.009351"  k2="0.002502" />
+-            <distortion model="poly5" focal="35" k1="0.000617"  k2="0.001124" />
+-            <distortion model="poly5" focal="50" k1="0.004351"  k2="0.000318" />        
+-            <distortion model="poly5" focal="70" k1="0.006456"  k2="0.000162" />
+-            <distortion model="poly5" focal="105" k1="0.006115"  k2="0.000015" />
+-
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="5" k1="-0.288470" k2="0.374699" k3="-0.523764" />
+-            <vignetting model="pa" focal="16" aperture="4" distance="5" k1="-0.330235" k2="0.497285" k3="-0.583721" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="5" k1="-0.336407" k2="0.552643" k3="-0.575818" />
+-            <vignetting model="pa" focal="16" aperture="5" distance="5" k1="-0.353798" k2="0.602097" k3="-0.578792" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="5" k1="-0.312894" k2="0.427975" k3="-0.374015" />
+-            <vignetting model="pa" focal="16" aperture="8" distance="5" k1="-0.228501" k2="0.134331" k3="-0.103199" />
+-            <vignetting model="pa" focal="16" aperture="16" distance="5" k1="-0.202748" k2="0.056228" k3="-0.049107" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="5" k1="-0.201659" k2="0.060327" k3="-0.049851" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="5" k1="-0.308582" k2="0.589818" k3="-0.521015" />
+-            <vignetting model="pa" focal="24" aperture="5" distance="5" k1="-0.274235" k2="0.476290" k3="-0.393271" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="5" k1="-0.229792" k2="0.330459" k3="-0.263460" />
+-            <vignetting model="pa" focal="24" aperture="8" distance="5" k1="-0.186426" k2="0.164882" k3="-0.107059" />
+-            <vignetting model="pa" focal="24" aperture="16" distance="5" k1="-0.154042" k2="0.076936" k3="-0.033692" />
+-            <vignetting model="pa" focal="24" aperture="22" distance="5" k1="-0.114423" k2="-0.002908" k3="0.015035" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="5" k1="-0.124935" k2="-0.005534" k3="0.024066" />
+-            <vignetting model="pa" focal="35" aperture="5" distance="5" k1="-0.287485" k2="0.650777" k3="-0.550081" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="5" k1="-0.260832" k2="0.554374" k3="-0.457173" />
+-            <vignetting model="pa" focal="35" aperture="8" distance="5" k1="-0.182410" k2="0.293890" k3="-0.226888" />
+-            <vignetting model="pa" focal="35" aperture="16" distance="5" k1="-0.133782" k2="0.163862" k3="-0.120876" />
+-            <vignetting model="pa" focal="35" aperture="22" distance="5" k1="-0.120685" k2="0.122561" k3="-0.089933" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="5" k1="-0.105005" k2="0.097940" k3="-0.083067" />
+-            <vignetting model="pa" focal="50" aperture="5" distance="5" k1="-0.258488" k2="0.647112" k3="-0.571874" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="5" k1="-0.241527" k2="0.610572" k3="-0.549893" />
+-            <vignetting model="pa" focal="50" aperture="8" distance="5" k1="-0.204291" k2="0.428393" k3="-0.337452" />
+-            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.131377" k2="0.216608" k3="-0.160456" />
+-            <vignetting model="pa" focal="50" aperture="22" distance="5" k1="-0.139891" k2="0.251957" k3="-0.188303" />
+-            <vignetting model="pa" focal="50" aperture="32" distance="5" k1="-0.131371" k2="0.232205" k3="-0.179864" />
+-            <vignetting model="pa" focal="55" aperture="5.6" distance="5" k1="-0.254949" k2="0.648429" k3="-0.575154" />
+-            <vignetting model="pa" focal="55" aperture="8" distance="5" k1="-0.211558" k2="0.458632" k3="-0.357524" />
+-            <vignetting model="pa" focal="55" aperture="22" distance="5" k1="-0.135846" k2="0.253241" k3="-0.185327" />
+-            <vignetting model="pa" focal="55" aperture="32" distance="5" k1="-0.145348" k2="0.292481" k3="-0.221538" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.240167" k2="0.681320" k3="-0.676884" />
+-            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.260742" k2="0.701911" k3="-0.610079" />
+-            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.145886" k2="0.281155" k3="-0.204221" />
+-            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.129192" k2="0.255130" k3="-0.188194" />
+-            <vignetting model="pa" focal="70" aperture="32" distance="5" k1="-0.139201" k2="0.293529" k3="-0.223242" />
+-            <vignetting model="pa" focal="80" aperture="5.6" distance="5" k1="-0.210133" k2="0.592325" k3="-0.609250" />
+-            <vignetting model="pa" focal="80" aperture="8" distance="5" k1="-0.238492" k2="0.624078" k3="-0.538598" />
+-            <vignetting model="pa" focal="80" aperture="16" distance="5" k1="-0.132754" k2="0.243649" k3="-0.169231" />
+-            <vignetting model="pa" focal="80" aperture="22" distance="5" k1="-0.120105" k2="0.212296" k3="-0.146781" />
+-            <vignetting model="pa" focal="80" aperture="32" distance="5" k1="-0.134805" k2="0.284222" k3="-0.209818" />
+-            <vignetting model="pa" focal="80" aperture="36" distance="5" k1="-0.139841" k2="0.297199" k3="-0.219408" />
+-            <vignetting model="pa" focal="105" aperture="5.6" distance="5" k1="-0.175601" k2="0.457244" k3="-0.494756" />
+-            <vignetting model="pa" focal="105" aperture="8" distance="5" k1="-0.216160" k2="0.548847" k3="-0.471725" />
+-            <vignetting model="pa" focal="105" aperture="16" distance="5" k1="-0.125322" k2="0.199554" k3="-0.120266" />
+-            <vignetting model="pa" focal="105" aperture="22" distance="5" k1="-0.108959" k2="0.161971" k3="-0.093471" />
+-            <vignetting model="pa" focal="105" aperture="32" distance="5" k1="-0.133615" k2="0.270073" k3="-0.183446" />
+-            <vignetting model="pa" focal="105" aperture="36" distance="5" k1="-0.150555" k2="0.308926" k3="-0.206299" />
++            <tca model="poly3" focal="16" br="0.0000849" vr="1.0002242" bb="0.0002099" vb="1.0007851"/>
++            <tca model="poly3" focal="24" br="0.0001033" vr="1.0002142" bb="-0.0001268" vb="1.0003659"/>
++            <tca model="poly3" focal="35" br="0.0000673" vr="1.0001269" bb="-0.0001984" vb="1.0001409"/>
++            <tca model="poly3" focal="50" br="-0.0000401" vr="0.9998721" bb="-0.0001637" vb="1.0001459"/>
++            <tca model="poly3" focal="75" br="0.0000190" vr="0.9997211" bb="-0.0002164" vb="1.0000605"/>
++            <tca model="poly3" focal="105" br="0.0001368" vr="0.9992983" bb="-0.0002385" vb="1.0001643"/>
++            <distortion model="ptlens" focal="16" a="0.030" b="-0.080" c="0.026"/>
++            <distortion model="ptlens" focal="22" a="0.011" b="-0.024" c="0.009"/>
++            <distortion model="ptlens" focal="35" a="0.006" b="-0.003" c="-0.002"/>
++            <distortion model="ptlens" focal="50" a="0.003" b="-0.003" c="0.010"/>
++            <distortion model="ptlens" focal="70" a="0.002" b="0.003" c="0.003"/>
++            <distortion model="ptlens" focal="105" a="-0.001" b="0.010" c="-0.004"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="5" k1="-0.288470" k2="0.374699" k3="-0.523764"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="5" k1="-0.330235" k2="0.497285" k3="-0.583721"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="5" k1="-0.336407" k2="0.552643" k3="-0.575818"/>
++            <vignetting model="pa" focal="16" aperture="5" distance="5" k1="-0.353798" k2="0.602097" k3="-0.578792"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="5" k1="-0.312894" k2="0.427975" k3="-0.374015"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="5" k1="-0.228501" k2="0.134331" k3="-0.103199"/>
++            <vignetting model="pa" focal="16" aperture="16" distance="5" k1="-0.202748" k2="0.056228" k3="-0.049107"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="5" k1="-0.201659" k2="0.060327" k3="-0.049851"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="5" k1="-0.308582" k2="0.589818" k3="-0.521015"/>
++            <vignetting model="pa" focal="24" aperture="5" distance="5" k1="-0.274235" k2="0.476290" k3="-0.393271"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="5" k1="-0.229792" k2="0.330459" k3="-0.263460"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="5" k1="-0.186426" k2="0.164882" k3="-0.107059"/>
++            <vignetting model="pa" focal="24" aperture="16" distance="5" k1="-0.154042" k2="0.076936" k3="-0.033692"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="5" k1="-0.114423" k2="-0.002908" k3="0.015035"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="5" k1="-0.124935" k2="-0.005534" k3="0.024066"/>
++            <vignetting model="pa" focal="35" aperture="5" distance="5" k1="-0.287485" k2="0.650777" k3="-0.550081"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="5" k1="-0.260832" k2="0.554374" k3="-0.457173"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="5" k1="-0.182410" k2="0.293890" k3="-0.226888"/>
++            <vignetting model="pa" focal="35" aperture="16" distance="5" k1="-0.133782" k2="0.163862" k3="-0.120876"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="5" k1="-0.120685" k2="0.122561" k3="-0.089933"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="5" k1="-0.105005" k2="0.097940" k3="-0.083067"/>
++            <vignetting model="pa" focal="50" aperture="5" distance="5" k1="-0.258488" k2="0.647112" k3="-0.571874"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="5" k1="-0.241527" k2="0.610572" k3="-0.549893"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="5" k1="-0.204291" k2="0.428393" k3="-0.337452"/>
++            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.131377" k2="0.216608" k3="-0.160456"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="5" k1="-0.139891" k2="0.251957" k3="-0.188303"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="5" k1="-0.131371" k2="0.232205" k3="-0.179864"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="5" k1="-0.254949" k2="0.648429" k3="-0.575154"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="5" k1="-0.211558" k2="0.458632" k3="-0.357524"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="5" k1="-0.135846" k2="0.253241" k3="-0.185327"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="5" k1="-0.145348" k2="0.292481" k3="-0.221538"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.240167" k2="0.681320" k3="-0.676884"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.260742" k2="0.701911" k3="-0.610079"/>
++            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.145886" k2="0.281155" k3="-0.204221"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.129192" k2="0.255130" k3="-0.188194"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="5" k1="-0.139201" k2="0.293529" k3="-0.223242"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="5" k1="-0.210133" k2="0.592325" k3="-0.609250"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="5" k1="-0.238492" k2="0.624078" k3="-0.538598"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="5" k1="-0.132754" k2="0.243649" k3="-0.169231"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="5" k1="-0.120105" k2="0.212296" k3="-0.146781"/>
++            <vignetting model="pa" focal="80" aperture="32" distance="5" k1="-0.134805" k2="0.284222" k3="-0.209818"/>
++            <vignetting model="pa" focal="80" aperture="36" distance="5" k1="-0.139841" k2="0.297199" k3="-0.219408"/>
++            <vignetting model="pa" focal="105" aperture="5.6" distance="5" k1="-0.175601" k2="0.457244" k3="-0.494756"/>
++            <vignetting model="pa" focal="105" aperture="8" distance="5" k1="-0.216160" k2="0.548847" k3="-0.471725"/>
++            <vignetting model="pa" focal="105" aperture="16" distance="5" k1="-0.125322" k2="0.199554" k3="-0.120266"/>
++            <vignetting model="pa" focal="105" aperture="22" distance="5" k1="-0.108959" k2="0.161971" k3="-0.093471"/>
++            <vignetting model="pa" focal="105" aperture="32" distance="5" k1="-0.133615" k2="0.270073" k3="-0.183446"/>
++            <vignetting model="pa" focal="105" aperture="36" distance="5" k1="-0.150555" k2="0.308926" k3="-0.206299"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Sony</maker>
+-        <model>Sony DT 16-50mm F2.8 SSM</model>
++        <model>Sony DT 16-50mm f/2.8 SSM (SAL1650)</model>
++        <model lang="en">Sony DT 16-50mm f/2.8 SSM</model>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of Sony APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="16" a="0.0313950" b="-0.0812810" c="0.0164699" />
+-            <distortion model="ptlens" focal="17" a="0.0264456" b="-0.0659419" c="0.0065271" />
+-            <distortion model="ptlens" focal="18" a="0.0269712" b="-0.0687339" c="0.0198162" />
+-            <distortion model="ptlens" focal="20" a="0.0226641" b="-0.0556216" c="0.0106769" />
+-            <distortion model="ptlens" focal="22" a="0.0132067" b="-0.0314146" c="0.0071973" />
+-            <distortion model="ptlens" focal="24" a="0.0056959" b="-0.0077006" c="0.0122191" />
+-            <distortion model="ptlens" focal="26" a="0.0055174" b="-0.0074034" c="-0.0107297" />
+-            <distortion model="ptlens" focal="28" a="0.0058777" b="-0.0106156" c="-0.0023575" />
+-            <distortion model="ptlens" focal="30" a="0.0021962" b="0.0003911" c="-0.0113694" />
+-            <distortion model="ptlens" focal="35" a="-0.0029164" b="0.0102165" c="-0.0138367" />
+-            <distortion model="ptlens" focal="40" a="-0.0022428" b="-0.0097886" c="-0.0112101" />
+-            <distortion model="ptlens" focal="45" a="-0.0042728" b="0.0196205" c="-0.0251080" />
+-            <distortion model="ptlens" focal="50" a="-0.0036411" b="0.0132272" c="-0.0130181" />
++            <distortion model="ptlens" focal="16" a="0.0313950" b="-0.0812810" c="0.0164699"/>
++            <distortion model="ptlens" focal="17" a="0.0264456" b="-0.0659419" c="0.0065271"/>
++            <distortion model="ptlens" focal="18" a="0.0269712" b="-0.0687339" c="0.0198162"/>
++            <distortion model="ptlens" focal="20" a="0.0226641" b="-0.0556216" c="0.0106769"/>
++            <distortion model="ptlens" focal="22" a="0.0132067" b="-0.0314146" c="0.0071973"/>
++            <distortion model="ptlens" focal="24" a="0.0056959" b="-0.0077006" c="0.0122191"/>
++            <distortion model="ptlens" focal="26" a="0.0055174" b="-0.0074034" c="-0.0107297"/>
++            <distortion model="ptlens" focal="28" a="0.0058777" b="-0.0106156" c="-0.0023575"/>
++            <distortion model="ptlens" focal="30" a="0.0021962" b="0.0003911" c="-0.0113694"/>
++            <distortion model="ptlens" focal="35" a="-0.0029164" b="0.0102165" c="-0.0138367"/>
++            <distortion model="ptlens" focal="40" a="-0.0022428" b="-0.0097886" c="-0.0112101"/>
++            <distortion model="ptlens" focal="45" a="-0.0042728" b="0.0196205" c="-0.0251080"/>
++            <distortion model="ptlens" focal="50" a="-0.0036411" b="0.0132272" c="-0.0130181"/>
++            <!-- Taken with Sony Alpha 77II -->
++            <tca model="poly3" focal="16" br="0.0000214" vr="1.0005348" bb="-0.0000256" vb="1.0000420"/>
++            <tca model="poly3" focal="20" br="-0.0000020" vr="1.0005625" bb="-0.0000295" vb="0.9999531"/>
++            <tca model="poly3" focal="26" br="0.0000032" vr="1.0005516" bb="-0.0000294" vb="0.9998124"/>
++            <tca model="poly3" focal="30" br="0.0000172" vr="1.0004103" bb="-0.0000284" vb="0.9997872"/>
++            <tca model="poly3" focal="40" br="0.0000128" vr="1.0002373" bb="-0.0000274" vb="0.9998257"/>
++            <tca model="poly3" focal="50" br="-0.0000137" vr="0.9999984" bb="0.0000025" vb="0.9999610"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5400" k2="0.3424" k3="-0.1866"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5400" k2="0.3424" k3="-0.1866"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.3682" k2="0.0089" k3="-0.0511"/>
++            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.3682" k2="0.0089" k3="-0.0511"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.2326" k2="-0.0400" k3="-0.0749"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.2326" k2="-0.0400" k3="-0.0749"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.4791" k2="0.3114" k3="-0.0987"/>
++            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4791" k2="0.3114" k3="-0.0987"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.4166" k2="0.0410" k3="-0.0097"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.4166" k2="0.0410" k3="-0.0097"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-0.5282" k2="0.6752" k3="-0.6306"/>
++            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.5282" k2="0.6752" k3="-0.6306"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.4513" k2="0.3808" k3="-0.1392"/>
++            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4513" k2="0.3808" k3="-0.1392"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.3287" k2="0.0167" k3="0.0429"/>
++            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.3287" k2="0.0167" k3="0.0429"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.3316" k2="0.0630" k3="-0.0391"/>
++            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.3316" k2="0.0630" k3="-0.0391"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.3297" k2="0.0521" k3="-0.0265"/>
++            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.3297" k2="0.0521" k3="-0.0265"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.2960" k2="0.3705" k3="-0.4955"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.2960" k2="0.3705" k3="-0.4955"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3438" k2="0.4442" k3="-0.3828"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3438" k2="0.4442" k3="-0.3828"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2644" k2="0.0964" k3="-0.0625"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2644" k2="0.0964" k3="-0.0625"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2686" k2="0.0941" k3="-0.0723"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2686" k2="0.0941" k3="-0.0723"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2681" k2="0.0814" k3="-0.0549"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2681" k2="0.0814" k3="-0.0549"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.3121" k2="0.2852" k3="-0.2396"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3121" k2="0.2852" k3="-0.2396"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3786" k2="0.6256" k3="-0.4873"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3786" k2="0.6256" k3="-0.4873"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2362" k2="0.1200" k3="-0.0931"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2362" k2="0.1200" k3="-0.0931"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2338" k2="0.1090" k3="-0.0835"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2338" k2="0.1090" k3="-0.0835"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2350" k2="0.1067" k3="-0.0780"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2350" k2="0.1067" k3="-0.0780"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.3433" k2="0.1236" k3="-0.0869"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3433" k2="0.1236" k3="-0.0869"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2016" k2="0.4882" k3="-0.5190"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2016" k2="0.4882" k3="-0.5190"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2915" k2="0.4416" k3="-0.3872"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2915" k2="0.4416" k3="-0.3872"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2084" k2="0.1124" k3="-0.0904"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2084" k2="0.1124" k3="-0.0904"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2043" k2="0.0941" k3="-0.0697"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2043" k2="0.0941" k3="-0.0697"/>
+         </calibration>
+     </lens>
+-
+-    <!--can be removed in future releases as it is superseded by a probably better profile below. 
+-        just keeping this as a backup for a while  -->
+-    <!--lens>        
++    <lens>
+         <maker>Sony</maker>
+-        <model>Sony DT 18-55mm F3.5-5.6 SAM SAL 1855</model>
+-    	<mount>Sony Alpha</mount>
+-	    <type>rectilinear</type>
+-    	<focal min="18" max="55" />
++        <model>Sony DT 18-55mm f/3.5-5.6 SAM (SAL1855)</model>
++        <model lang="en">Sony DT 18-55mm f/3.5-5.6 SAM</model>
++        <mount>Sony Alpha</mount>
++        <focal min="18" max="55"/>
++        <!-- Average crop factor of Sony APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="18" k1="-0.01644" />
+-            <distortion model="poly3" focal="24" k1="-0.00711" />
+-            <distortion model="poly3" focal="35" k1="-0.00156" />
+-	        <distortion model="poly3" focal="55" k1="0.00022" />
+-            <tca model="poly3" focal="18" br="0,0002383" cr="-0,0002026" vr="1,000005" bb="-0,0000326" cb="-0,0002833" vb="1,0005781" />
+-            <tca model="poly3" focal="24" br="0,0001333" cr="-0,0000849" vr="0,9999687" bb="-0,0002544" cb="0,0002858" vb="1,0002966" />
+-            <tca model="poly3" focal="28" br="0,0000818" cr="-0,0000641" vr="0,999984" bb="-0,0002708" cb="0,0004174" vb="1,0001424" />
+-            <tca model="poly3" focal="35" br="0,0000722" cr="-0,0001022" vr="1,000016" bb="-0,0001064" cb="0,0000633" vb="1,000208" />
+-            <tca model="poly3" focal="55" br="0,0000018" cr="0,000005" vr="1,0000062" bb="-0,0000538" cb="0,0001139" vb="1,000009" />
+-	        <vignetting model="pa" focal="18" aperture="3.5" distance="8" k1="-0.07471" k2="-1.06505" k3="0.49526" />
+-	        <vignetting model="pa" focal="18" aperture="4.5" distance="8" k1="-0.047204" k2="-0.3346" k3="-0.31317" />
+-	        <vignetting model="pa" focal="18" aperture="5.6" distance="8" k1="-0.27732" k2="0.18407" k3="0.60019" />
+-	        <vignetting model="pa" focal="24" aperture="4"   distance="8" k1="-0.34756" k2="-2.15042" k3="0.29237" />
+-	        <vignetting model="pa" focal="24" aperture="5.6" distance="8" k1="-0.48086" k2="-0.2996" k3="-0.25975" />
++            <distortion model="poly3" focal="18" k1="-0.01644"/>
++            <distortion model="poly3" focal="24" k1="-0.00711"/>
++            <distortion model="poly3" focal="35" k1="-0.00156"/>
++            <distortion model="poly3" focal="55" k1="0.00022"/>
++            <tca model="poly3" focal="18" br="0.0004103" cr="-0.0005073" vr="1.0001516" bb="-0.0001287" cb="-0.000226" vb="1.0007798"/>
++            <tca model="poly3" focal="24" br="0.0001554" cr="-0.0001725" vr="1.0000343" bb="-0.000046" cb="-0.0002381" vb="1.000655"/>
++            <tca model="poly3" focal="28" br="0.0001039" cr="-0.0000794" vr="0.9999764" bb="0.0000066" cb="-0.0003685" vb="1.0006678"/>
++            <tca model="poly3" focal="35" br="0.0000526" cr="-0.0000497" vr="0.9999977" bb="0.0000094" cb="-0.0002178" vb="1.0004108"/>
++            <tca model="poly3" focal="40" br="0.0000877" cr="-0.0000872" vr="1.0000064" bb="0.0000676" cb="-0.0003308" vb="1.0004211"/>
++            <tca model="poly3" focal="50" br="0.0000768" cr="-0.000147" vr="1.0000969" bb="-0.0000479" cb="-0.0000054" vb="1.0002261"/>
++            <tca model="poly3" focal="55" br="0.0000843" cr="-0.0001494" vr="1.0001189" bb="-0.0000056" cb="-0.0000362" vb="1.0001643"/>
++            <!-- Taken with Sony A77 -->
++            <!-- Actually, the vignetting data was taken with the version II of
++                 this lens.  But they are probably optically compatible.  Only
++                 mechanics and coating are changed according to an internet
++                 source. -->
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.4116" k2="-0.3091" k3="0.2332"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4116" k2="-0.3091" k3="0.2332"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.3600" k2="0.0701" k3="-0.0216"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.3600" k2="0.0701" k3="-0.0216"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3503" k2="0.0590" k3="-0.0148"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3503" k2="0.0590" k3="-0.0148"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3462" k2="0.0454" k3="-0.0056"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3462" k2="0.0454" k3="-0.0056"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="10" k1="-0.2848" k2="-0.3513" k3="0.2412"/>
++            <vignetting model="pa" focal="22" aperture="4" distance="1000" k1="-0.2848" k2="-0.3513" k3="0.2412"/>
++            <vignetting model="pa" focal="22" aperture="5.6" distance="10" k1="-0.2838" k2="0.0869" k3="-0.0309"/>
++            <vignetting model="pa" focal="22" aperture="5.6" distance="1000" k1="-0.2838" k2="0.0869" k3="-0.0309"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="10" k1="-0.2791" k2="0.0798" k3="-0.0257"/>
++            <vignetting model="pa" focal="22" aperture="8" distance="1000" k1="-0.2791" k2="0.0798" k3="-0.0257"/>
++            <vignetting model="pa" focal="22" aperture="25" distance="10" k1="-0.2866" k2="0.0679" k3="-0.0162"/>
++            <vignetting model="pa" focal="22" aperture="25" distance="1000" k1="-0.2866" k2="0.0679" k3="-0.0162"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="-0.2692" k2="-0.3260" k3="0.2314"/>
++            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="-0.2692" k2="-0.3260" k3="0.2314"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="10" k1="-0.2440" k2="0.0764" k3="-0.0273"/>
++            <vignetting model="pa" focal="26" aperture="6.3" distance="1000" k1="-0.2440" k2="0.0764" k3="-0.0273"/>
++            <vignetting model="pa" focal="26" aperture="9" distance="10" k1="-0.2407" k2="0.0722" k3="-0.0261"/>
++            <vignetting model="pa" focal="26" aperture="9" distance="1000" k1="-0.2407" k2="0.0722" k3="-0.0261"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="10" k1="-0.2378" k2="0.0588" k3="-0.0167"/>
++            <vignetting model="pa" focal="26" aperture="25" distance="1000" k1="-0.2378" k2="0.0588" k3="-0.0167"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.1171" k2="-0.3559" k3="0.1995"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.1171" k2="-0.3559" k3="0.1995"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.1917" k2="0.0658" k3="-0.0277"/>
++            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1917" k2="0.0658" k3="-0.0277"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.1884" k2="0.0621" k3="-0.0253"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.1884" k2="0.0621" k3="-0.0253"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.1883" k2="0.0584" k3="-0.0249"/>
++            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1883" k2="0.0584" k3="-0.0249"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.3512" k2="0.0792" k3="0.0124"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3512" k2="0.0792" k3="0.0124"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0973" k2="0.0202" k3="-0.0132"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0973" k2="0.0202" k3="-0.0132"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0957" k2="0.0116" k3="-0.0079"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0957" k2="0.0116" k3="-0.0079"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.0951" k2="0.0034" k3="-0.0009"/>
++            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.0951" k2="0.0034" k3="-0.0009"/>
+         </calibration>
+-    </lens-->
+-
++    </lens>
+     <lens>
+         <maker>Sony</maker>
+-        <model>Sony DT 18-55mm F3.5-5.6 SAM SAL 1855</model>
++        <model>Minolta/Sony AF DT 18-70mm f/3.5-5.6 (D)</model>
++        <mount>Sony Alpha</mount>
++        <!-- Average crop factor of Sony APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="18" a="0.02852" b="-0.07655" c="0.0228"/>
++            <distortion model="ptlens" focal="24" a="0.02014" b="-0.06395" c="0.04007"/>
++            <distortion model="ptlens" focal="28" a="0.01124" b="-0.03682" c="0.02204"/>
++            <distortion model="ptlens" focal="35" a="0.00317" b="-0.01195" c="0.00656"/>
++            <distortion model="ptlens" focal="50" a="0.00171" b="-0.00519" c="0.00528"/>
++            <distortion model="ptlens" focal="70" a="0.00358" b="-0.01139" c="0.0151"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2822" k2="-0.2773" k3="0.0297"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2822" k2="-0.2773" k3="0.0297"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2289" k2="-0.0997" k3="-0.0906"/>
++            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2289" k2="-0.0997" k3="-0.0906"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2305" k2="-0.1379" k3="0.0322"/>
++            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2305" k2="-0.1379" k3="0.0322"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.1860" k2="-0.3038" k3="0.1837"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.1860" k2="-0.3038" k3="0.1837"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="10" k1="-0.1604" k2="-0.3944" k3="0.2621"/>
++            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.1604" k2="-0.3944" k3="0.2621"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1670" k2="-0.3905" k3="0.2690"/>
++            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1670" k2="-0.3905" k3="0.2690"/>
++            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.1725" k2="-0.3784" k3="0.2645"/>
++            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.1725" k2="-0.3784" k3="0.2645"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1985" k2="-0.3162" k3="0.2314"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1985" k2="-0.3162" k3="0.2314"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.2179" k2="-0.2480" k3="0.1111"/>
++            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.2179" k2="-0.2480" k3="0.1111"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2536" k2="-0.0726" k3="0.0699"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2536" k2="-0.0726" k3="0.0699"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.2592" k2="-0.0670" k3="0.0751"/>
++            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.2592" k2="-0.0670" k3="0.0751"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.2415" k2="-0.1082" k3="0.1079"/>
++            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.2415" k2="-0.1082" k3="0.1079"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2423" k2="-0.1100" k3="0.1118"/>
++            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2423" k2="-0.1100" k3="0.1118"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.2377" k2="-0.1193" k3="0.1173"/>
++            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.2377" k2="-0.1193" k3="0.1173"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2359" k2="-0.1308" k3="0.1339"/>
++            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2359" k2="-0.1308" k3="0.1339"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.2914" k2="0.1261" k3="-0.1133"/>
++            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.2914" k2="0.1261" k3="-0.1133"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3071" k2="0.1114" k3="-0.0344"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3071" k2="0.1114" k3="-0.0344"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.2692" k2="0.0268" k3="0.0214"/>
++            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.2692" k2="0.0268" k3="0.0214"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.2515" k2="-0.0085" k3="0.0425"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.2515" k2="-0.0085" k3="0.0425"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.2650" k2="0.0177" k3="0.0288"/>
++            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.2650" k2="0.0177" k3="0.0288"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.2150" k2="-0.1039" k3="0.1132"/>
++            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.2150" k2="-0.1039" k3="0.1132"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2008" k2="-0.0221" k3="0.0260"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2008" k2="-0.0221" k3="0.0260"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1970" k2="-0.0447" k3="0.0576"/>
++            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1970" k2="-0.0447" k3="0.0576"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.2133" k2="-0.0090" k3="0.0372"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.2133" k2="-0.0090" k3="0.0372"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2114" k2="-0.0169" k3="0.0432"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2114" k2="-0.0169" k3="0.0432"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.2097" k2="-0.0214" k3="0.0473"/>
++            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.2097" k2="-0.0214" k3="0.0473"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.1763" k2="-0.1044" k3="0.1101"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1763" k2="-0.1044" k3="0.1101"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2141" k2="0.0700" k3="-0.0254"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2141" k2="0.0700" k3="-0.0254"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.2764" k2="0.2208" k3="-0.0960"/>
++            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.2764" k2="0.2208" k3="-0.0960"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.2859" k2="0.2510" k3="-0.1211"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2859" k2="0.2510" k3="-0.1211"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2178" k2="0.0931" k3="-0.0212"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2178" k2="0.0931" k3="-0.0212"/>
++            <vignetting model="pa" focal="50" aperture="14" distance="10" k1="-0.2282" k2="0.1222" k3="-0.0444"/>
++            <vignetting model="pa" focal="50" aperture="14" distance="1000" k1="-0.2282" k2="0.1222" k3="-0.0444"/>
++            <vignetting model="pa" focal="50" aperture="18" distance="10" k1="-0.2090" k2="0.0720" k3="-0.0109"/>
++            <vignetting model="pa" focal="50" aperture="18" distance="1000" k1="-0.2090" k2="0.0720" k3="-0.0109"/>
++            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2278" k2="0.1031" k3="-0.0098"/>
++            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2278" k2="0.1031" k3="-0.0098"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.3260" k2="0.1512" k3="-0.0255"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3260" k2="0.1512" k3="-0.0255"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.0046" k2="-0.3102" k3="0.1909"/>
++            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.0046" k2="-0.3102" k3="0.1909"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.0376" k2="-0.1603" k3="0.1161"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.0376" k2="-0.1603" k3="0.1161"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.0405" k2="-0.1670" k3="0.1305"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0405" k2="-0.1670" k3="0.1305"/>
++            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.0582" k2="-0.1240" k3="0.1025"/>
++            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.0582" k2="-0.1240" k3="0.1025"/>
++            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.0581" k2="-0.1168" k3="0.0938"/>
++            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.0581" k2="-0.1168" k3="0.0938"/>
++            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.0088" k2="-0.2440" k3="0.1877"/>
++            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.0088" k2="-0.2440" k3="0.1877"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony AF DT 55-200mm f/4-5.6 SAM (SAL55200-2)</model>
++        <model lang="en">Sony AF DT 55-200mm f/4-5.6 SAM</model>
+         <mount>Sony Alpha</mount>
++        <focal min="55" max="200"/>
+         <type>rectilinear</type>
+-        <focal min="18" max="55" />
++        <!-- Average crop factor of Sony APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="18" k1="-0.01644" />
+-            <distortion model="poly3" focal="24" k1="-0.00711" />
+-            <distortion model="poly3" focal="35" k1="-0.00156" />
+-	        <distortion model="poly3" focal="55" k1="0.00022" />
+-            <tca model="poly3" focal="18" br="0.0004103" cr="-0.0005073" vr="1.0001516" bb="-0.0001287" cb="-0.000226" vb="1.0007798" />
+-            <tca model="poly3" focal="24" br="0.0001554" cr="-0.0001725" vr="1.0000343" bb="-0.000046" cb="-0.0002381" vb="1.000655" />
+-            <tca model="poly3" focal="28" br="0.0001039" cr="-0.0000794" vr="0.9999764" bb="0.0000066" cb="-0.0003685" vb="1.0006678" />
+-            <tca model="poly3" focal="35" br="0.0000526" cr="-0.0000497" vr="0.9999977" bb="0.0000094" cb="-0.0002178" vb="1.0004108" />
+-            <tca model="poly3" focal="40" br="0.0000877" cr="-0.0000872" vr="1.0000064" bb="0.0000676" cb="-0.0003308" vb="1.0004211" />
+-            <tca model="poly3" focal="50" br="0.0000768" cr="-0.000147" vr="1.0000969" bb="-0.0000479" cb="-0.0000054" vb="1.0002261" />
+-            <tca model="poly3" focal="55" br="0.0000843" cr="-0.0001494" vr="1.0001189" bb="-0.0000056" cb="-0.0000362" vb="1.0001643" />
+-	        <vignetting model="pa" focal="18" aperture="3.5" distance="8" k1="-0.07471" k2="-1.06505" k3="0.49526" />
+-	        <vignetting model="pa" focal="18" aperture="4.5" distance="8" k1="-0.047204" k2="-0.3346" k3="-0.31317" />
+-	        <vignetting model="pa" focal="18" aperture="5.6" distance="8" k1="-0.27732" k2="0.18407" k3="0.60019" />
+-	        <vignetting model="pa" focal="24" aperture="4"   distance="8" k1="-0.34756" k2="-2.15042" k3="0.29237" />
+-	        <vignetting model="pa" focal="24" aperture="5.6" distance="8" k1="-0.48086" k2="-0.2996" k3="-0.25975" />
++            <distortion model="poly3" focal="55" k1="-0.00346"/>
++            <distortion model="poly3" focal="70" k1="0.00586"/>
++            <distortion model="poly3" focal="100" k1="0.01073"/>
++            <distortion model="poly3" focal="135" k1="0.00952"/>
++            <distortion model="poly3" focal="200" k1="0.00871"/>
++            <tca model="poly3" focal="55" br="0.0000101" vr="1.0001643" bb="0.0001108" vb="0.9999451"/>
++            <tca model="poly3" focal="70" br="-0.0000150" vr="1.0001222" bb="0.0000510" vb="0.9998586"/>
++            <tca model="poly3" focal="100" br="-0.0000128" vr="0.9998724" bb="-0.0000023" vb="0.9997716"/>
++            <tca model="poly3" focal="135" br="-0.0000979" vr="0.9998131" bb="-0.0001018" vb="0.9997999"/>
++            <tca model="poly3" focal="200" br="-0.0001877" vr="0.9997167" bb="-0.0000221" vb="0.9996858"/>
++            <!-- Taken with Sony Alpha 77 -->
++            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.1376" k2="-0.7425" k3="0.4487"/>
++            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.1376" k2="-0.7425" k3="0.4487"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1970" k2="0.1789" k3="-0.2175"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1970" k2="0.1789" k3="-0.2175"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1859" k2="0.0706" k3="-0.0337"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1859" k2="0.0706" k3="-0.0337"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="10" k1="-0.1766" k2="0.0300" k3="-0.0140"/>
++            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.1766" k2="0.0300" k3="-0.0140"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.1956" k2="-0.6565" k3="0.4253"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1956" k2="-0.6565" k3="0.4253"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1976" k2="0.1705" k3="-0.1812"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1976" k2="0.1705" k3="-0.1812"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1811" k2="0.0677" k3="-0.0323"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1811" k2="0.0677" k3="-0.0323"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.1725" k2="0.0230" k3="-0.0078"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.1725" k2="0.0230" k3="-0.0078"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="10" k1="-0.2828" k2="-0.4656" k3="0.3377"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.2828" k2="-0.4656" k3="0.3377"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="10" k1="-0.1814" k2="0.1380" k3="-0.1553"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="-0.1814" k2="0.1380" k3="-0.1553"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="10" k1="-0.1714" k2="0.0645" k3="-0.0306"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.1714" k2="0.0645" k3="-0.0306"/>
++            <vignetting model="pa" focal="90" aperture="32" distance="10" k1="-0.1680" k2="0.0254" k3="-0.0074"/>
++            <vignetting model="pa" focal="90" aperture="32" distance="1000" k1="-0.1680" k2="0.0254" k3="-0.0074"/>
++            <vignetting model="pa" focal="140" aperture="4.5" distance="10" k1="-0.5641" k2="0.2131" k3="-0.0950"/>
++            <vignetting model="pa" focal="140" aperture="4.5" distance="1000" k1="-0.5641" k2="0.2131" k3="-0.0950"/>
++            <vignetting model="pa" focal="140" aperture="6.3" distance="10" k1="-0.0958" k2="-0.0493" k3="-0.0833"/>
++            <vignetting model="pa" focal="140" aperture="6.3" distance="1000" k1="-0.0958" k2="-0.0493" k3="-0.0833"/>
++            <vignetting model="pa" focal="140" aperture="9" distance="10" k1="-0.1464" k2="0.0544" k3="-0.0264"/>
++            <vignetting model="pa" focal="140" aperture="9" distance="1000" k1="-0.1464" k2="0.0544" k3="-0.0264"/>
++            <vignetting model="pa" focal="140" aperture="32" distance="10" k1="-0.1509" k2="0.0429" k3="-0.0244"/>
++            <vignetting model="pa" focal="140" aperture="32" distance="1000" k1="-0.1509" k2="0.0429" k3="-0.0244"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0263" k2="-0.6612" k3="0.3784"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0263" k2="-0.6612" k3="0.3784"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0725" k2="-0.0939" k3="-0.0171"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0725" k2="-0.0939" k3="-0.0171"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1274" k2="0.0477" k3="-0.0235"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1274" k2="0.0477" k3="-0.0235"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.1259" k2="0.0395" k3="-0.0237"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1259" k2="0.0395" k3="-0.0237"/>
+         </calibration>
+     </lens>
+-
++    <!-- This is a full-frame lens. -->
+     <lens>
+         <maker>Sony</maker>
+-        <model>Minolta/Sony AF DT 18-70mm F3.5-5.6 (D)</model>
++        <model>Sony 50mm f/1.4 (SAL50F14)</model>
++        <model lang="en">Sony 50mm f/1.4</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.02852" b="-0.07655" c="0.0228" />
+-            <distortion model="ptlens" focal="24" a="0.02014" b="-0.06395" c="0.04007" />
+-            <distortion model="ptlens" focal="28" a="0.01124" b="-0.03682" c="0.02204" />
+-            <distortion model="ptlens" focal="35" a="0.00317" b="-0.01195" c="0.00656" />
+-            <distortion model="ptlens" focal="50" a="0.00171" b="-0.00519" c="0.00528" />
+-            <distortion model="ptlens" focal="70" a="0.00358" b="-0.01139" c="0.0151" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2822" k2="-0.2773" k3="0.0297" />
+-            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2822" k2="-0.2773" k3="0.0297" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2289" k2="-0.0997" k3="-0.0906" />
+-            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2289" k2="-0.0997" k3="-0.0906" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2305" k2="-0.1379" k3="0.0322" />
+-            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2305" k2="-0.1379" k3="0.0322" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.1860" k2="-0.3038" k3="0.1837" />
+-            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.1860" k2="-0.3038" k3="0.1837" />
+-            <vignetting model="pa" focal="18" aperture="9" distance="10" k1="-0.1604" k2="-0.3944" k3="0.2621" />
+-            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.1604" k2="-0.3944" k3="0.2621" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1670" k2="-0.3905" k3="0.2690" />
+-            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1670" k2="-0.3905" k3="0.2690" />
+-            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.1725" k2="-0.3784" k3="0.2645" />
+-            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.1725" k2="-0.3784" k3="0.2645" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1985" k2="-0.3162" k3="0.2314" />
+-            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1985" k2="-0.3162" k3="0.2314" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.2179" k2="-0.2480" k3="0.1111" />
+-            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.2179" k2="-0.2480" k3="0.1111" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2536" k2="-0.0726" k3="0.0699" />
+-            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2536" k2="-0.0726" k3="0.0699" />
+-            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.2592" k2="-0.0670" k3="0.0751" />
+-            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.2592" k2="-0.0670" k3="0.0751" />
+-            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.2415" k2="-0.1082" k3="0.1079" />
+-            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.2415" k2="-0.1082" k3="0.1079" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2423" k2="-0.1100" k3="0.1118" />
+-            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2423" k2="-0.1100" k3="0.1118" />
+-            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.2377" k2="-0.1193" k3="0.1173" />
+-            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.2377" k2="-0.1193" k3="0.1173" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2359" k2="-0.1308" k3="0.1339" />
+-            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2359" k2="-0.1308" k3="0.1339" />
+-            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.2914" k2="0.1261" k3="-0.1133" />
+-            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.2914" k2="0.1261" k3="-0.1133" />
+-            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3071" k2="0.1114" k3="-0.0344" />
+-            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3071" k2="0.1114" k3="-0.0344" />
+-            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.2692" k2="0.0268" k3="0.0214" />
+-            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.2692" k2="0.0268" k3="0.0214" />
+-            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.2515" k2="-0.0085" k3="0.0425" />
+-            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.2515" k2="-0.0085" k3="0.0425" />
+-            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.2650" k2="0.0177" k3="0.0288" />
+-            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.2650" k2="0.0177" k3="0.0288" />
+-            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.2150" k2="-0.1039" k3="0.1132" />
+-            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.2150" k2="-0.1039" k3="0.1132" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2008" k2="-0.0221" k3="0.0260" />
+-            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2008" k2="-0.0221" k3="0.0260" />
+-            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1970" k2="-0.0447" k3="0.0576" />
+-            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1970" k2="-0.0447" k3="0.0576" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.2133" k2="-0.0090" k3="0.0372" />
+-            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.2133" k2="-0.0090" k3="0.0372" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2114" k2="-0.0169" k3="0.0432" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2114" k2="-0.0169" k3="0.0432" />
+-            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.2097" k2="-0.0214" k3="0.0473" />
+-            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.2097" k2="-0.0214" k3="0.0473" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.1763" k2="-0.1044" k3="0.1101" />
+-            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1763" k2="-0.1044" k3="0.1101" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2141" k2="0.0700" k3="-0.0254" />
+-            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2141" k2="0.0700" k3="-0.0254" />
+-            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.2764" k2="0.2208" k3="-0.0960" />
+-            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.2764" k2="0.2208" k3="-0.0960" />
+-            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.2859" k2="0.2510" k3="-0.1211" />
+-            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2859" k2="0.2510" k3="-0.1211" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2178" k2="0.0931" k3="-0.0212" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2178" k2="0.0931" k3="-0.0212" />
+-            <vignetting model="pa" focal="50" aperture="14" distance="10" k1="-0.2282" k2="0.1222" k3="-0.0444" />
+-            <vignetting model="pa" focal="50" aperture="14" distance="1000" k1="-0.2282" k2="0.1222" k3="-0.0444" />
+-            <vignetting model="pa" focal="50" aperture="18" distance="10" k1="-0.2090" k2="0.0720" k3="-0.0109" />
+-            <vignetting model="pa" focal="50" aperture="18" distance="1000" k1="-0.2090" k2="0.0720" k3="-0.0109" />
+-            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2278" k2="0.1031" k3="-0.0098" />
+-            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2278" k2="0.1031" k3="-0.0098" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.3260" k2="0.1512" k3="-0.0255" />
+-            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3260" k2="0.1512" k3="-0.0255" />
+-            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.0046" k2="-0.3102" k3="0.1909" />
+-            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.0046" k2="-0.3102" k3="0.1909" />
+-            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.0376" k2="-0.1603" k3="0.1161" />
+-            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.0376" k2="-0.1603" k3="0.1161" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.0405" k2="-0.1670" k3="0.1305" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0405" k2="-0.1670" k3="0.1305" />
+-            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.0582" k2="-0.1240" k3="0.1025" />
+-            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.0582" k2="-0.1240" k3="0.1025" />
+-            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.0581" k2="-0.1168" k3="0.0938" />
+-            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.0581" k2="-0.1168" k3="0.0938" />
+-            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.0088" k2="-0.2440" k3="0.1877" />
+-            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.0088" k2="-0.2440" k3="0.1877" />
++            <!-- Taken with Sony NEX-7 -->
++            <distortion model="poly3" focal="50" k1="-0.00336"/>
++            <tca model="poly3" focal="50" br="-0.0000281" vr="1.0001987" bb="0.0000235" vb="0.9997216"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.8087" k2="0.6472" k3="-0.3195"/>
++            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.8087" k2="0.6472" k3="-0.3195"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.1702" k2="0.2045" k3="-0.2438"/>
++            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1702" k2="0.2045" k3="-0.2438"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1589" k2="0.1037" k3="-0.0584"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1589" k2="0.1037" k3="-0.0584"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1578" k2="0.0843" k3="-0.0396"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1578" k2="0.0843" k3="-0.0396"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1586" k2="0.0847" k3="-0.0395"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1586" k2="0.0847" k3="-0.0395"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1667" k2="0.0726" k3="-0.0261"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1667" k2="0.0726" k3="-0.0261"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1778" k2="0.1007" k3="-0.0437"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1778" k2="0.1007" k3="-0.0437"/>
+         </calibration>
+     </lens>
+-
+-
+     <lens>
+-      <maker>Sony</maker>
+-        <model>Sony AF DT 55-200mm F4-5.6 SAM</model>
+-	    <mount>Sony Alpha</mount>
+-	    <type>rectilinear</type>
+-	    <focal min="55" max="200" />
++        <maker>Sony</maker>
++        <model>Sony DT 35mm f/1.8 SAM (SAL35F18)</model>
++        <model lang="en">Sony DT 35mm f/1.8 SAM</model>
++        <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="55" k1="-0.00346" />
+-            <distortion model="poly3" focal="70" k1="0.00586" />
+-            <distortion model="poly3" focal="100" k1="0.01073" />
+-            <distortion model="poly3" focal="135" k1="0.00952" />
+-            <distortion model="poly3" focal="200" k1="0.00871" />
+-	        <tca model="poly3" focal="55" br="0.0000101" vr="1.0001643" bb="0.0001108" vb="0.9999451" />
+-	        <tca model="poly3" focal="70" br="-0.0000150" vr="1.0001222" bb="0.0000510" vb="0.9998586" />
+-	        <tca model="poly3" focal="100" br="-0.0000128" vr="0.9998724" bb="-0.0000023" vb="0.9997716" />
+-	        <tca model="poly3" focal="135" br="-0.0000979" vr="0.9998131" bb="-0.0001018" vb="0.9997999" />
+-	        <tca model="poly3" focal="200" br="-0.0001877" vr="0.9997167" bb="-0.0000221" vb="0.9996858" />
++            <!-- Taken with Sony Alpha 77 -->
++            <distortion model="poly3" focal="35" k1="-0.00624"/>
++            <tca model="poly3" focal="35" br="-0.0000274" vr="1.0002920" bb="0.0000485" vb="0.9999332"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-1.2721" k2="1.1267" k3="-0.4883"/>
++            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-1.2721" k2="1.1267" k3="-0.4883"/>
++            <vignetting model="pa" focal="35" aperture="2.2" distance="10" k1="-0.0465" k2="-1.0308" k3="0.5989"/>
++            <vignetting model="pa" focal="35" aperture="2.2" distance="1000" k1="-0.0465" k2="-1.0308" k3="0.5989"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.0290" k2="-0.3515" k3="0.0347"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.0290" k2="-0.3515" k3="0.0347"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.1841" k2="0.2115" k3="-0.1480"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1841" k2="0.2115" k3="-0.1480"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2740" k2="0.1185" k3="-0.0422"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2740" k2="0.1185" k3="-0.0422"/>
+         </calibration>
+     </lens>
+-
+-
+-    <!-- That one is done on a cropi 1.5 cam. It should be replaced by a calibration with full format -->
+     <lens>
+         <maker>Sony</maker>
+-        <model>Sony 50 mm F1.4 SAL 50F14</model>
++        <model>Sony DT 50mm f/1.8 SAM</model>
+         <mount>Sony Alpha</mount>
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly5" focal="50" k1="-0.003782"  k2="-0.000003" />
+-
+-            <tca model="poly3" focal="50" br="-0.0000170" vr="1.0002353" bb="0.0000836" vb="0.9996309" />
+-
+-            <vignetting model="pa" focal="50.000000" aperture="1.400000" distance="5.000000" k1="-0.301317" k2="0.131668" k3="-0.068295" />
+-            <vignetting model="pa" focal="50.000000" aperture="2.000000" distance="5.000000" k1="-0.094064" k2="0.183463" k3="-0.160173" />
+-            <vignetting model="pa" focal="50.000000" aperture="2.800000" distance="5.000000" k1="-0.046364" k2="0.024316" k3="-0.014513" />
+-            <vignetting model="pa" focal="50.000000" aperture="3.500000" distance="5.000000" k1="-0.062148" k2="0.049874" k3="-0.019353" />
+-            <vignetting model="pa" focal="50.000000" aperture="5.000000" distance="5.000000" k1="-0.070057" k2="0.065284" k3="-0.036651" />
+-            <vignetting model="pa" focal="50.000000" aperture="8.000000" distance="5.000000" k1="-0.059283" k2="0.024786" k3="-0.003931" />
+-            <vignetting model="pa" focal="50.000000" aperture="16.000000" distance="5.000000" k1="-0.072308" k2="0.080953" k3="-0.051882" />
+-            <vignetting model="pa" focal="50.000000" aperture="22.000000" distance="5.000000" k1="-0.080270" k2="0.101158" k3="-0.067876" />
++            <!-- Taken with Sony Alpha 77 -->
++            <distortion model="poly3" focal="50" k1="-0.00262"/>
++            <tca model="poly3" focal="50" br="-0.0000475" vr="1.0000804" bb="0.0000925" vb="0.9999390"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-1.1487" k2="0.9842" k3="-0.4195"/>
++            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-1.1487" k2="0.9842" k3="-0.4195"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="10" k1="-0.0212" k2="-0.8743" k3="0.4832"/>
++            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="-0.0212" k2="-0.8743" k3="0.4832"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1494" k2="0.1179" k3="-0.1835"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1494" k2="0.1179" k3="-0.1835"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1584" k2="0.0881" k3="-0.0433"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1584" k2="0.0881" k3="-0.0433"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2234" k2="0.0495" k3="-0.0088"/>
++            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2234" k2="0.0495" k3="-0.0088"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony DT 55-300mm f/4.5-5.6 SAM (SAL55300)</model>
++        <model lang="en">Sony DT 55-300mm f/4.5-5.6 SAM</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 77 -->
++            <distortion model="poly3" focal="55" k1="-0.00707"/>
++            <distortion model="poly3" focal="60" k1="-0.00225"/>
++            <distortion model="poly3" focal="75" k1="0.00407"/>
++            <distortion model="poly3" focal="100" k1="0.00813"/>
++            <distortion model="poly3" focal="140" k1="0.00988"/>
++            <distortion model="poly3" focal="200" k1="0.0087"/>
++            <distortion model="poly3" focal="300" k1="0.0057"/>
++            <tca model="poly3" focal="55" br="0.0000000" vr="1.0002120" bb="0.0000000" vb="1.0000383"/>
++            <tca model="poly3" focal="70" br="0.0000000" vr="1.0001006" bb="0.0000000" vb="0.9999609"/>
++            <tca model="poly3" focal="100" br="0.0000000" vr="0.9999804" bb="0.0000000" vb="0.9999263"/>
++            <tca model="poly3" focal="140" br="0.0000000" vr="0.9998774" bb="0.0000000" vb="0.9999169"/>
++            <tca model="poly3" focal="200" br="0.0000000" vr="0.9997727" bb="0.0000000" vb="0.9998248"/>
++            <tca model="poly3" focal="300" br="0.0000000" vr="0.9997229" bb="0.0000000" vb="0.9997788"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.1228" k2="-0.5012" k3="0.2728"/>
++            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.1228" k2="-0.5012" k3="0.2728"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0864" k2="-0.0933" k3="-0.0554"/>
++            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0864" k2="-0.0933" k3="-0.0554"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1458" k2="0.0605" k3="-0.0349"/>
++            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1458" k2="0.0605" k3="-0.0349"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1391" k2="0.0420" k3="-0.0201"/>
++            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1391" k2="0.0420" k3="-0.0201"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1301" k2="0.0181" k3="-0.0115"/>
++            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1301" k2="0.0181" k3="-0.0115"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.1071" k2="-0.5190" k3="0.2749"/>
++            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.1071" k2="-0.5190" k3="0.2749"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1079" k2="-0.0096" k3="-0.1078"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1079" k2="-0.0096" k3="-0.1078"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1508" k2="0.0770" k3="-0.0439"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1508" k2="0.0770" k3="-0.0439"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1439" k2="0.0565" k3="-0.0267"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1439" k2="0.0565" k3="-0.0267"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1339" k2="0.0286" k3="-0.0146"/>
++            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1339" k2="0.0286" k3="-0.0146"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="10" k1="-0.0926" k2="-0.3928" k3="0.0363"/>
++            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-0.0926" k2="-0.3928" k3="0.0363"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1492" k2="0.2022" k3="-0.3418"/>
++            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1492" k2="0.2022" k3="-0.3418"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1382" k2="0.0594" k3="-0.0271"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1382" k2="0.0594" k3="-0.0271"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.1398" k2="0.0654" k3="-0.0315"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1398" k2="0.0654" k3="-0.0315"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.1322" k2="0.0470" k3="-0.0290"/>
++            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.1322" k2="0.0470" k3="-0.0290"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.0824" k2="-0.8883" k3="0.5455"/>
++            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.0824" k2="-0.8883" k3="0.5455"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0534" k2="-0.0266" k3="-0.1483"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0534" k2="-0.0266" k3="-0.1483"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1114" k2="0.0902" k3="-0.0688"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1114" k2="0.0902" k3="-0.0688"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1028" k2="0.0472" k3="-0.0259"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1028" k2="0.0472" k3="-0.0259"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.0996" k2="0.0250" k3="-0.0150"/>
++            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.0996" k2="0.0250" k3="-0.0150"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-1.0205" k2="0.9895" k3="-0.4365"/>
++            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.0205" k2="0.9895" k3="-0.4365"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.1049" k2="0.1613" k3="-0.1630"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.1049" k2="0.1613" k3="-0.1630"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0891" k2="0.0469" k3="-0.0291"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0891" k2="0.0469" k3="-0.0291"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="10" k1="-0.0927" k2="0.0510" k3="-0.0304"/>
++            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0927" k2="0.0510" k3="-0.0304"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="10" k1="-0.0935" k2="0.0531" k3="-0.0323"/>
++            <vignetting model="pa" focal="300" aperture="29" distance="1000" k1="-0.0935" k2="0.0531" k3="-0.0323"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony DT 18-135mm f/3.5-5.6 SAM</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 77 -->
++            <distortion model="ptlens" focal="18" a="0.03774" b="-0.1046" c="0.03514"/>
++            <distortion model="ptlens" focal="24" a="0.03357" b="-0.07882" c="0.04264"/>
++            <distortion model="ptlens" focal="35" a="0.02255" b="-0.05451" c="0.05276"/>
++            <distortion model="ptlens" focal="50" a="0.00289" b="0.00135" c="0.00994"/>
++            <distortion model="ptlens" focal="135" a="0.00317" b="-0.00593" c="0.01615"/>
++            <tca model="poly3" focal="18" br="-0.0000720" vr="1.0007184" bb="0.0000457" vb="0.9999007"/>
++            <tca model="poly3" focal="24" br="-0.0000226" vr="1.0005173" bb="-0.0000464" vb="0.9999834"/>
++            <tca model="poly3" focal="35" br="-0.0000321" vr="1.0002826" bb="-0.0000117" vb="0.9999902"/>
++            <tca model="poly3" focal="50" br="-0.0000027" vr="1.0000720" bb="-0.0000285" vb="0.9999756"/>
++            <tca model="poly3" focal="70" br="0.0000131" vr="0.9999129" bb="-0.0000779" vb="0.9999934"/>
++            <tca model="poly3" focal="100" br="-0.0000281" vr="0.9997815" bb="-0.0000172" vb="0.9999202"/>
++            <tca model="poly3" focal="135" br="-0.0000507" vr="0.9994918" bb="-0.0000277" vb="0.9999325"/>
++            <tca model="poly3" focal="135" br="-0.0000844" vr="0.9995450" bb="-0.0000238" vb="0.9998508"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2340" k2="-0.5060" k3="0.0926"/>
++            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2340" k2="-0.5060" k3="0.0926"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.3560" k2="0.4672" k3="-0.5736"/>
++            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.3560" k2="0.4672" k3="-0.5736"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3139" k2="0.2152" k3="-0.2452"/>
++            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3139" k2="0.2152" k3="-0.2452"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2423" k2="-0.1083" k3="0.0426"/>
++            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2423" k2="-0.1083" k3="0.0426"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.6728" k2="1.0448" k3="-0.9737"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6728" k2="1.0448" k3="-0.9737"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4339" k2="0.8624" k3="-0.8051"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4339" k2="0.8624" k3="-0.8051"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.3343" k2="0.4614" k3="-0.4237"/>
++            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3343" k2="0.4614" k3="-0.4237"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.2475" k2="0.0888" k3="-0.0873"/>
++            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2475" k2="0.0888" k3="-0.0873"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.3819" k2="0.6878" k3="-0.8625"/>
++            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.3819" k2="0.6878" k3="-0.8625"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.4027" k2="1.0244" k3="-1.0033"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.4027" k2="1.0244" k3="-1.0033"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3595" k2="0.8017" k3="-0.7397"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3595" k2="0.8017" k3="-0.7397"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1882" k2="0.1195" k3="-0.1177"/>
++            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1882" k2="0.1195" k3="-0.1177"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1802" k2="0.3482" k3="-0.4547"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1802" k2="0.3482" k3="-0.4547"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1350" k2="0.1520" k3="-0.1303"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1350" k2="0.1520" k3="-0.1303"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1029" k2="0.0329" k3="-0.0217"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1029" k2="0.0329" k3="-0.0217"/>
++            <vignetting model="pa" focal="75" aperture="22" distance="10" k1="-0.1037" k2="0.0387" k3="-0.0296"/>
++            <vignetting model="pa" focal="75" aperture="22" distance="1000" k1="-0.1037" k2="0.0387" k3="-0.0296"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="0.0882" k2="-0.5296" k3="0.1561"/>
++            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0882" k2="-0.5296" k3="0.1561"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1395" k2="0.2934" k3="-0.3020"/>
++            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1395" k2="0.2934" k3="-0.3020"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.0898" k2="0.0582" k3="-0.0402"/>
++            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.0898" k2="0.0582" k3="-0.0402"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.0950" k2="0.0536" k3="-0.0355"/>
++            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.0950" k2="0.0536" k3="-0.0355"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony AF DT 30mm f/2.8 SAM Macro (SAL30M28)</model>
++        <model lang="en">Sony AF DT 30mm f/2.8 SAM Macro</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 65 -->
++            <distortion model="ptlens" focal="30" a="0.00472" b="-0.02284" c="0.02137"/>
++            <tca model="poly3" focal="30" br="-0.0000159" vr="1.0003480" bb="0.0000940" vb="0.9996574"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-1.8670" k2="2.1179" k3="-0.9856"/>
++            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-1.8670" k2="2.1179" k3="-0.9856"/>
++            <vignetting model="pa" focal="30" aperture="3.5" distance="10" k1="-1.3206" k2="0.9184" k3="-0.2916"/>
++            <vignetting model="pa" focal="30" aperture="3.5" distance="1000" k1="-1.3206" k2="0.9184" k3="-0.2916"/>
++            <vignetting model="pa" focal="30" aperture="4.5" distance="10" k1="-0.5181" k2="-0.2225" k3="0.1860"/>
++            <vignetting model="pa" focal="30" aperture="4.5" distance="1000" k1="-0.5181" k2="-0.2225" k3="0.1860"/>
++            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.5288" k2="0.2552" k3="-0.1913"/>
++            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.5288" k2="0.2552" k3="-0.1913"/>
++            <vignetting model="pa" focal="30" aperture="7.1" distance="10" k1="-0.6083" k2="0.5202" k3="-0.3191"/>
++            <vignetting model="pa" focal="30" aperture="7.1" distance="1000" k1="-0.6083" k2="0.5202" k3="-0.3191"/>
++            <vignetting model="pa" focal="30" aperture="22" distance="10" k1="-0.8122" k2="0.5752" k3="-0.2326"/>
++            <vignetting model="pa" focal="30" aperture="22" distance="1000" k1="-0.8122" k2="0.5752" k3="-0.2326"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Sony AF DT 18-250mm f/3.5-6.3 (SAL18250)</model>
++        <model lang="en">Sony AF DT 18-250mm f/3.5-6.3</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 65 -->
++            <distortion model="ptlens" focal="18" a="0.01887" b="-0.05832" c="0.00708"/>
++            <distortion model="ptlens" focal="30" a="0.04068" b="-0.12525" c="0.13898"/>
++            <distortion model="ptlens" focal="40" a="0.01444" b="-0.03561" c="0.04514"/>
++            <distortion model="ptlens" focal="55" a="0.00014" b="0.01095" c="0.00508"/>
++            <distortion model="ptlens" focal="75" a="0.00283" b="-0.00043" c="0.01781"/>
++            <distortion model="ptlens" focal="130" a="-0.00506" b="0.04556" c="-0.07297"/>
++            <distortion model="ptlens" focal="250" a="-0.00828" b="0.02298" c="-0.005"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Minolta/Sony AF 500mm F8 Reflex</model>
++        <model lang="en">Sony AF 500mm F8 Reflex</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 850 -->
++            <distortion model="ptlens" focal="500" a="0.00847" b="-0.02444" c="0.03796"/>
++            <vignetting model="pa" focal="500" aperture="8" distance="10" k1="-1.6969" k2="1.9089" k3="-0.8470"/>
++            <vignetting model="pa" focal="500" aperture="8" distance="1000" k1="-1.6969" k2="1.9089" k3="-0.8470"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Sony</maker>
++        <model>Minolta/Sony AF 100mm F2.8 Macro (D)</model>
++        <model lang="en">Sony AF 100mm F2.8 Macro</model>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 850 -->
++            <distortion model="ptlens" focal="100" a="0" b="0.00185" c="0"/>
++            <tca model="poly3" focal="100" vr="0.9999809" vb="0.9999706"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.4740" k2="-0.3542" k3="0.1846"/>
++            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.4740" k2="-0.3542" k3="0.1846"/>
++            <vignetting model="pa" focal="100" aperture="3.2" distance="10" k1="-0.0322" k2="-1.0545" k3="0.5042"/>
++            <vignetting model="pa" focal="100" aperture="3.2" distance="1000" k1="-0.0322" k2="-1.0545" k3="0.5042"/>
++            <vignetting model="pa" focal="100" aperture="3.5" distance="10" k1="0.1671" k2="-1.1228" k3="0.4358"/>
++            <vignetting model="pa" focal="100" aperture="3.5" distance="1000" k1="0.1671" k2="-1.1228" k3="0.4358"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="0.0521" k2="-0.2357" k3="-0.2361"/>
++            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0521" k2="-0.2357" k3="-0.2361"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.2049" k2="0.5998" k3="-0.6548"/>
++            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.2049" k2="0.5998" k3="-0.6548"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.2753" k2="0.5974" k3="-0.5031"/>
++            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.2753" k2="0.5974" k3="-0.5031"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1544" k2="0.1559" k3="-0.1031"/>
++            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1544" k2="0.1559" k3="-0.1031"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.1292" k2="0.0701" k3="-0.0314"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1292" k2="0.0701" k3="-0.0314"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.1260" k2="0.0558" k3="-0.0187"/>
++            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1260" k2="0.0558" k3="-0.0187"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-tamron.xml b/data/db/slr-tamron.xml
+--- a/data/db/slr-tamron.xml	2013-10-16 20:48:25.000000000 +0200
++++ b/data/db/slr-tamron.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,364 +1,1014 @@
+ <lensdatabase>
+-
++    <mount>
++        <name>Tamron Adaptall</name>
++        <compat>Generic</compat>
++    </mount>
+     <lens>
+         <maker>Tamron</maker>
+-	    <model>Tamron SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical IF</model>
+-	    <mount>Canon EF</mount>
++        <model>Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF)</model>
++        <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="10" k1="-0.02452" />
+-            <distortion model="poly3" focal="12" k1="-0.03732" />
+-            <distortion model="poly3" focal="15" k1="-0.023" />
+-            <distortion model="poly3" focal="17" k1="-0.01204" />
+-            <distortion model="poly3" focal="24" k1="-0.00673" />
+-            <tca model="poly3" focal="10" br="-0.0010404" cr="0.0020275" vr="0.9995749" bb="0.0009303" cb="-0.0018018" vb="1.0010352" />
+-            <tca model="poly3" focal="12" br="-0.0007314" cr="0.002109" vr="0.9993352" bb="0.0004953" cb="-0.0011687" vb="1.0007539" />
+-            <tca model="poly3" focal="15" br="-0.0001484" cr="0.000925" vr="0.9997811" bb="0.0001986" cb="-0.0006209" vb="1.0005421" />
+-            <tca model="poly3" focal="17" br="0.0005667" cr="-0.0006233" vr="1.0004042" bb="0.0000267" cb="-0.000269" vb="1.0004302" />
+-            <tca model="poly3" focal="18" br="0.0002315" cr="-0.0001694" vr="1.0002462" bb="-0.0000242" cb="-0.0001424" vb="1.000351" />
+-            <tca model="poly3" focal="24" br="0.00027" cr="-0.0002972" vr="1.0002846" bb="-0.0000645" cb="-0.0000806" vb="1.0003365" />
++            <distortion model="poly3" focal="10" k1="-0.02452"/>
++            <distortion model="poly3" focal="12" k1="-0.03732"/>
++            <distortion model="poly3" focal="15" k1="-0.023"/>
++            <distortion model="poly3" focal="17" k1="-0.01204"/>
++            <distortion model="poly3" focal="24" k1="-0.00673"/>
++            <tca model="poly3" focal="10" br="-0.0010404" cr="0.0020275" vr="0.9995749" bb="0.0009303" cb="-0.0018018" vb="1.0010352"/>
++            <tca model="poly3" focal="12" br="-0.0007314" cr="0.002109" vr="0.9993352" bb="0.0004953" cb="-0.0011687" vb="1.0007539"/>
++            <tca model="poly3" focal="15" br="-0.0001484" cr="0.000925" vr="0.9997811" bb="0.0001986" cb="-0.0006209" vb="1.0005421"/>
++            <tca model="poly3" focal="17" br="0.0005667" cr="-0.0006233" vr="1.0004042" bb="0.0000267" cb="-0.000269" vb="1.0004302"/>
++            <tca model="poly3" focal="18" br="0.0002315" cr="-0.0001694" vr="1.0002462" bb="-0.0000242" cb="-0.0001424" vb="1.000351"/>
++            <tca model="poly3" focal="24" br="0.00027" cr="-0.0002972" vr="1.0002846" bb="-0.0000645" cb="-0.0000806" vb="1.0003365"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 17-35mm f/2.8-4 Di LD</model>
++        <model>Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical (IF)</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.023029" b="-0.056393" c="0" />
+-            <distortion model="ptlens" focal="18" a="0.021257" b="-0.051504" c="0" />
+-            <distortion model="ptlens" focal="19" a="0.018234" b="-0.043262" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.017656" b="-0.040559" c="0" />
+-            <distortion model="ptlens" focal="21" a="0.015106" b="-0.033986" c="0" />
+-            <distortion model="ptlens" focal="22" a="0.014043" b="-0.030629" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.014764" b="-0.030599" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.012702" b="-0.025685" c="0" />
+-            <distortion model="ptlens" focal="26" a="0.010132" b="-0.019341" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.003497" b="-0.003995" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.002043" b="0" c="0" />
+-            <distortion model="ptlens" focal="32" a="0.002246" b="0" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.002673" b="0" c="0" />
++            <distortion model="ptlens" focal="17" a="0.023029" b="-0.056393" c="0"/>
++            <distortion model="ptlens" focal="18" a="0.021257" b="-0.051504" c="0"/>
++            <distortion model="ptlens" focal="19" a="0.018234" b="-0.043262" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.017656" b="-0.040559" c="0"/>
++            <distortion model="ptlens" focal="21" a="0.015106" b="-0.033986" c="0"/>
++            <distortion model="ptlens" focal="22" a="0.014043" b="-0.030629" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.014764" b="-0.030599" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.012702" b="-0.025685" c="0"/>
++            <distortion model="ptlens" focal="26" a="0.010132" b="-0.019341" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.003497" b="-0.003995" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.002043" b="0" c="0"/>
++            <distortion model="ptlens" focal="32" a="0.002246" b="0" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.002673" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This is an alias of Tamron SP AF 17-50mm f/2.8 XR Di II LD
++             Aspherical (IF).  According to da...@corr.eu.org, they are
++             optically equivalent. -->
+         <maker>Tamron</maker>
+-        <model>Tamron 17-50mm f/2.8 XR Di II LD</model>
++        <model>Tamron AF 17-50mm f/2.8 XR Di-II LD (Model A16)</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0.02667" b="-0.07161" c="0.02012" />
+-            <distortion model="ptlens" focal="24" a="0.02791" b="-0.08057" c="0.07132" />
+-            <distortion model="ptlens" focal="35" a="-0.01098" b="0.0448" c="-0.04755" />
+-            <distortion model="ptlens" focal="50" a="-0.00372" b="0.01796" c="-0.01334" />
+-            <tca model="poly3" focal="17" br="0.0000205" vr="1.0005975" bb="-0.0001325" vb="1.0008428" />
+-            <tca model="poly3" focal="24" br="-0.0000073" vr="1.0004585" bb="-0.0000382" vb="1.0004269" />
+-            <tca model="poly3" focal="35" br="-0.0000351" vr="1.0002419" bb="-0.0000228" vb="1.0001575" />
+-            <tca model="poly3" focal="50" br="-0.0000294" vr="1.0000100" bb="-0.0000149" vb="0.9999915" />
++            <distortion model="ptlens" focal="17" a="0.02667" b="-0.07161" c="0.02012"/>
++            <distortion model="ptlens" focal="24" a="0.02791" b="-0.08057" c="0.07132"/>
++            <distortion model="ptlens" focal="35" a="-0.01098" b="0.0448" c="-0.04755"/>
++            <distortion model="ptlens" focal="50" a="-0.00372" b="0.01796" c="-0.01334"/>
++            <tca model="poly3" focal="17" br="0.0000205" vr="1.0005975" bb="-0.0001325" vb="1.0008428"/>
++            <tca model="poly3" focal="24" br="-0.0000073" vr="1.0004585" bb="-0.0000382" vb="1.0004269"/>
++            <tca model="poly3" focal="35" br="-0.0000351" vr="1.0002419" bb="-0.0000228" vb="1.0001575"/>
++            <tca model="poly3" focal="50" br="-0.0000294" vr="1.0000100" bb="-0.0000149" vb="0.9999915"/>
++            <!-- Taken with Sony Alpha 77 -->
++            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2015" k2="-0.5991" k3="0.2021"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2015" k2="-0.5991" k3="0.2021"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3924" k2="0.1323" k3="-0.1185"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3924" k2="0.1323" k3="-0.1185"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.3503" k2="-0.0386" k3="0.0456"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.3503" k2="-0.0386" k3="0.0456"/>
++            <vignetting model="pa" focal="17" aperture="32" distance="10" k1="-0.4127" k2="0.0918" k3="-0.0471"/>
++            <vignetting model="pa" focal="17" aperture="32" distance="1000" k1="-0.4127" k2="0.0918" k3="-0.0471"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.2976" k2="0.0425" k3="-0.2040"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.2976" k2="0.0425" k3="-0.2040"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.2861" k2="0.0804" k3="-0.0491"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2861" k2="0.0804" k3="-0.0491"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2603" k2="-0.0123" k3="0.0309"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2603" k2="-0.0123" k3="0.0309"/>
++            <vignetting model="pa" focal="24" aperture="32" distance="10" k1="-0.3228" k2="0.1211" k3="-0.0654"/>
++            <vignetting model="pa" focal="24" aperture="32" distance="1000" k1="-0.3228" k2="0.1211" k3="-0.0654"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.3567" k2="0.2365" k3="-0.3538"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.3567" k2="0.2365" k3="-0.3538"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2659" k2="0.1765" k3="-0.1376"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2659" k2="0.1765" k3="-0.1376"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2206" k2="0.0051" k3="0.0147"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2206" k2="0.0051" k3="0.0147"/>
++            <vignetting model="pa" focal="28" aperture="32" distance="10" k1="-0.2776" k2="0.1262" k3="-0.0790"/>
++            <vignetting model="pa" focal="28" aperture="32" distance="1000" k1="-0.2776" k2="0.1262" k3="-0.0790"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4103" k2="0.3490" k3="-0.4316"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4103" k2="0.3490" k3="-0.4316"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2610" k2="0.2866" k3="-0.2427"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2610" k2="0.2866" k3="-0.2427"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1945" k2="0.0220" k3="-0.0015"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1945" k2="0.0220" k3="-0.0015"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.2517" k2="0.1336" k3="-0.1043"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2517" k2="0.1336" k3="-0.1043"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.4909" k2="0.4324" k3="-0.4813"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4909" k2="0.4324" k3="-0.4813"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2722" k2="0.4692" k3="-0.4292"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2722" k2="0.4692" k3="-0.4292"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1685" k2="0.0381" k3="-0.0172"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1685" k2="0.0381" k3="-0.0172"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.2221" k2="0.1291" k3="-0.1026"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.2221" k2="0.1291" k3="-0.1026"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 18-200mm f/3.5-6.3 XR Di II LD</model>
++        <model>Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF)</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.01364" b="-0.042157" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.010678" b="-0.016742" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.009558" b="-0.008863" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.011197" c="0" />
+-            <distortion model="ptlens" focal="72" a="0" b="0.010552" c="0" />
+-            <distortion model="ptlens" focal="102" a="0" b="0.007166" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.007026" c="0" />
+-            <distortion model="ptlens" focal="150" a="0" b="0.006778" c="0" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.006016" c="0" />
++            <distortion model="ptlens" focal="17" a="0.02667" b="-0.07161" c="0.02012"/>
++            <distortion model="ptlens" focal="24" a="0.02791" b="-0.08057" c="0.07132"/>
++            <distortion model="ptlens" focal="35" a="-0.01098" b="0.0448" c="-0.04755"/>
++            <distortion model="ptlens" focal="50" a="-0.00372" b="0.01796" c="-0.01334"/>
++            <tca model="poly3" focal="17" br="0.0000205" vr="1.0005975" bb="-0.0001325" vb="1.0008428"/>
++            <tca model="poly3" focal="24" br="-0.0000073" vr="1.0004585" bb="-0.0000382" vb="1.0004269"/>
++            <tca model="poly3" focal="35" br="-0.0000351" vr="1.0002419" bb="-0.0000228" vb="1.0001575"/>
++            <tca model="poly3" focal="50" br="-0.0000294" vr="1.0000100" bb="-0.0000149" vb="0.9999915"/>
++            <!-- Taken with Sony Alpha 77 -->
++            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2015" k2="-0.5991" k3="0.2021"/>
++            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2015" k2="-0.5991" k3="0.2021"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3924" k2="0.1323" k3="-0.1185"/>
++            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3924" k2="0.1323" k3="-0.1185"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.3503" k2="-0.0386" k3="0.0456"/>
++            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.3503" k2="-0.0386" k3="0.0456"/>
++            <vignetting model="pa" focal="17" aperture="32" distance="10" k1="-0.4127" k2="0.0918" k3="-0.0471"/>
++            <vignetting model="pa" focal="17" aperture="32" distance="1000" k1="-0.4127" k2="0.0918" k3="-0.0471"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.2976" k2="0.0425" k3="-0.2040"/>
++            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.2976" k2="0.0425" k3="-0.2040"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.2861" k2="0.0804" k3="-0.0491"/>
++            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2861" k2="0.0804" k3="-0.0491"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2603" k2="-0.0123" k3="0.0309"/>
++            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2603" k2="-0.0123" k3="0.0309"/>
++            <vignetting model="pa" focal="24" aperture="32" distance="10" k1="-0.3228" k2="0.1211" k3="-0.0654"/>
++            <vignetting model="pa" focal="24" aperture="32" distance="1000" k1="-0.3228" k2="0.1211" k3="-0.0654"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.3567" k2="0.2365" k3="-0.3538"/>
++            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.3567" k2="0.2365" k3="-0.3538"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2659" k2="0.1765" k3="-0.1376"/>
++            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2659" k2="0.1765" k3="-0.1376"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2206" k2="0.0051" k3="0.0147"/>
++            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2206" k2="0.0051" k3="0.0147"/>
++            <vignetting model="pa" focal="28" aperture="32" distance="10" k1="-0.2776" k2="0.1262" k3="-0.0790"/>
++            <vignetting model="pa" focal="28" aperture="32" distance="1000" k1="-0.2776" k2="0.1262" k3="-0.0790"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4103" k2="0.3490" k3="-0.4316"/>
++            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4103" k2="0.3490" k3="-0.4316"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2610" k2="0.2866" k3="-0.2427"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2610" k2="0.2866" k3="-0.2427"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1945" k2="0.0220" k3="-0.0015"/>
++            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1945" k2="0.0220" k3="-0.0015"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.2517" k2="0.1336" k3="-0.1043"/>
++            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2517" k2="0.1336" k3="-0.1043"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.4909" k2="0.4324" k3="-0.4813"/>
++            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4909" k2="0.4324" k3="-0.4813"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2722" k2="0.4692" k3="-0.4292"/>
++            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2722" k2="0.4692" k3="-0.4292"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1685" k2="0.0381" k3="-0.0172"/>
++            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1685" k2="0.0381" k3="-0.0172"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.2221" k2="0.1291" k3="-0.1026"/>
++            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.2221" k2="0.1291" k3="-0.1026"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF] MACRO</model>
++        <model>Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical (IF)</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 700D -->
++            <distortion model="ptlens" focal="17" a="0.01062" b="-0.02795" c="-0.01852"/>
++            <distortion model="ptlens" focal="21" a="0.00662" b="-0.01583" c="-0.01217"/>
++            <distortion model="ptlens" focal="25" a="0.00546" b="-0.0092" c="-0.01406"/>
++            <distortion model="ptlens" focal="29" a="0" b="-0.00072" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.0008" c="0"/>
++            <distortion model="ptlens" focal="42" a="0" b="0.00127" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00192" c="0"/>
++            <tca model="poly3" focal="17" br="0.0000899" vr="1.0002901" bb="-0.0000249" vb="1.0000373"/>
++            <tca model="poly3" focal="21" br="0.0000810" vr="1.0002483" bb="-0.0000293" vb="0.9999965"/>
++            <tca model="poly3" focal="25" br="0.0000611" vr="1.0002142" bb="-0.0000485" vb="1.0000065"/>
++            <tca model="poly3" focal="29" br="0.0000039" vr="1.0002061" bb="-0.0000300" vb="0.9999764"/>
++            <tca model="poly3" focal="35" br="-0.0000217" vr="1.0001788" bb="-0.0000244" vb="0.9999476"/>
++            <tca model="poly3" focal="42" br="-0.0000020" vr="1.0000794" bb="-0.0000250" vb="0.9999412"/>
++            <tca model="poly3" focal="50" br="0.0000015" vr="1.0000160" bb="-0.0000400" vb="0.9999559"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro A14</model>
++        <model lang="en">Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="18" a="0.020360" b="-0.059050" c="0" />
+-            <distortion model="ptlens" focal="20" a="0.020770" b="-0.052400" c="0" />
+-            <distortion model="ptlens" focal="23" a="0.016230" b="-0.032540" c="0" />
+-            <distortion model="ptlens" focal="29" a="0.012160" b="-0.015480" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="0.037550" c="-0" />
+-            <distortion model="ptlens" focal="47" a="0" b="0.033220" c="-0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.017510" c="-0.014350" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.018700" c="-0.018810" />
+-            <distortion model="ptlens" focal="120" a="0" b="0.018400" c="-0.019970" />
+-            <distortion model="ptlens" focal="155" a="0" b="0.009580" c="-0.002450" />
+-            <distortion model="ptlens" focal="200" a="0" b="0.001230" c="0.013960" />
+-            <distortion model="ptlens" focal="250" a="0" b="-0.000110" c="0.008560" />
+-            <tca model="poly3" focal="18" br="0.0000455" cr="0.0001324" vr="1.0003247" bb="-0.0002737" cb="0.0006098" vb="1.0000266" />
+-            <tca model="poly3" focal="23.1" br="-0.0000830" cr="0.0002635" vr="1.0002333" bb="-0.0001797" cb="0.0007033" vb="0.9999820" />
+-            <tca model="poly3" focal="26.9" br="-0.0003871" cr="0.0008622" vr="0.9999533" bb="-0.0001398" cb="0.0006987" vb="0.9999226" />
+-            <tca model="poly3" focal="29.4" br="-0.0003218" cr="0.0007089" vr="0.9999775" bb="0.0001630" cb="-0.0000255" vb="1.0003434" />
+-            <tca model="poly3" focal="35" br="-0.0001337" cr="0.0002671" vr="1.0000620" bb="-0.0000737" cb="0.0004179" vb="1.0001761" />
+-            <tca model="poly3" focal="55" br="-0.0000006" cr="-0.0000747" vr="1.0000795" bb="-0.0000202" cb="0.0002275" vb="1.0002342" />
+-            <tca model="poly3" focal="70" br="-0.0000020" cr="-0.0000449" vr="0.9999473" bb="-0.0002686" cb="0.0006367" vb="1.0000025" />
+-            <tca model="poly3" focal="100" br="0.0000928" cr="-0.0002755" vr="0.9998440" bb="-0.0001632" cb="0.0002535" vb="1.0000525" />
+-            <tca model="poly3" focal="142.5" br="0.0001761" cr="-0.0004582" vr="0.9996290" bb="-0.0003233" cb="0.0005660" vb="0.9996693" />
+-            <tca model="poly3" focal="220" br="0.0001387" cr="-0.0004467" vr="0.9993390" bb="0.0000952" cb="-0.0001185" vb="0.9997363" />
+-            <tca model="poly3" focal="250" br="0.0005417" cr="-0.0013082" vr="0.9997014" bb="-0.0007442" cb="0.0015463" vb="0.9988026" />
++            <distortion model="ptlens" focal="18" a="0.01364" b="-0.042157" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.010678" b="-0.016742" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.009558" b="-0.008863" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.011197" c="0"/>
++            <distortion model="ptlens" focal="72" a="0" b="0.010552" c="0"/>
++            <distortion model="ptlens" focal="102" a="0" b="0.007166" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.007026" c="0"/>
++            <distortion model="ptlens" focal="150" a="0" b="0.006778" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.006016" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 19-35mm f/3.5-4.5</model>
++        <model>AF 18-200mm f/3.5-6.3 Di II VC</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3100 -->
++            <distortion model="ptlens" focal="18" a="0.0298292" b="-0.0940382" c="0.0506931"/>
++            <distortion model="ptlens" focal="22" a="0.0149817" b="-0.0355325" c="0.000773928"/>
++            <distortion model="ptlens" focal="24" a="0.0200663" b="-0.0558794" c="0.0398833"/>
++            <distortion model="ptlens" focal="34" a="0.00628528" b="-0.00786548" c="0.00859007"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.00994697" c="0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.0103828" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.00576273" c="0"/>
++            <tca model="poly3" focal="18" br="0.0000508" vr="1.0002554" bb="-0.0000059" vb="1.0000861"/>
++            <tca model="poly3" focal="22" br="0.0000208" vr="1.0002333" bb="0.0000146" vb="1.0000145"/>
++            <tca model="poly3" focal="24" br="0.0000015" vr="1.0002557" bb="0.0000169" vb="0.9999944"/>
++            <tca model="poly3" focal="34" br="-0.0000434" vr="1.0002636" bb="0.0000028" vb="1.0000406"/>
++            <tca model="poly3" focal="50" br="-0.0000503" vr="1.0001624" bb="-0.0000313" vb="1.0001154"/>
++            <tca model="poly3" focal="70" br="-0.0000034" vr="0.9999576" bb="-0.0000581" vb="1.0001889"/>
++            <tca model="poly3" focal="200" br="-0.0000280" vr="0.9995631" bb="0.0000112" vb="0.9998334"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <mount>Sony Alpha</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="19" a="0.013926" b="-0.041094" c="0" />
+-            <distortion model="ptlens" focal="24" a="0.005657" b="-0.020982" c="0" />
+-            <distortion model="ptlens" focal="27" a="0.003315" b="-0.014095" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.004475" b="-0.013489" c="0" />
++            <distortion model="ptlens" focal="18" a="0.01757" b="-0.052885" c="0"/>
++            <distortion model="ptlens" focal="25" a="0.007578" b="-0.014077" c="0"/>
++            <distortion model="ptlens" focal="31" a="0.004963" b="-0.001934" c="0"/>
++            <distortion model="ptlens" focal="38" a="0" b="0.010127" c="0"/>
++            <distortion model="ptlens" focal="54" a="0" b="0.010971" c="0"/>
++            <distortion model="ptlens" focal="73" a="0" b="0.010296" c="0"/>
++            <distortion model="ptlens" focal="102" a="0" b="0.008059" c="0"/>
++            <distortion model="ptlens" focal="125" a="0" b="0.007314" c="0"/>
++            <distortion model="ptlens" focal="149" a="0" b="0.007285" c="0"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.005942" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron SP 24-70mm F/2.8 Di VC USD</model>
++        <model>Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <mount>Pentax KAF</mount>
++        <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.03519" b="-0.10395" c="0.06092" />
+-            <distortion model="ptlens" focal="35" a="0.01436" b="-0.0404" c="0.03983" />
+-            <distortion model="ptlens" focal="50" a="0.01112" b="-0.02223" c="0.02177" />
+-            <distortion model="ptlens" focal="70" a="0.00625" b="-0.00862" c="0.00987" />
+-            <tca model="poly3" focal="24" br="-0.0000913" vr="1.0008446" bb="0.0000181" vb="0.9998653" />
+-            <tca model="poly3" focal="35" br="0.0000457" vr="1.0004519" bb="-0.0000735" vb="0.9998598" />
+-            <tca model="poly3" focal="50" br="0.0000118" vr="1.0000938" bb="-0.0000862" vb="0.9998401" />
+-            <tca model="poly3" focal="70" br="-0.0000161" vr="0.9997567" bb="-0.0000354" vb="0.9997991" />
++            <distortion model="ptlens" focal="18" a="0.020360" b="-0.059050" c="0"/>
++            <distortion model="ptlens" focal="20" a="0.020770" b="-0.052400" c="0"/>
++            <distortion model="ptlens" focal="23" a="0.016230" b="-0.032540" c="0"/>
++            <distortion model="ptlens" focal="29" a="0.012160" b="-0.015480" c="0"/>
++            <distortion model="ptlens" focal="35" a="0" b="0.037550" c="-0"/>
++            <distortion model="ptlens" focal="47" a="0" b="0.033220" c="-0"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.017510" c="-0.014350"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.018700" c="-0.018810"/>
++            <distortion model="ptlens" focal="120" a="0" b="0.018400" c="-0.019970"/>
++            <distortion model="ptlens" focal="155" a="0" b="0.009580" c="-0.002450"/>
++            <distortion model="ptlens" focal="200" a="0" b="0.001230" c="0.013960"/>
++            <distortion model="ptlens" focal="250" a="0" b="-0.000110" c="0.008560"/>
++            <tca model="poly3" focal="18" br="0.0000455" cr="0.0001324" vr="1.0003247" bb="-0.0002737" cb="0.0006098" vb="1.0000266"/>
++            <tca model="poly3" focal="23.1" br="-0.0000830" cr="0.0002635" vr="1.0002333" bb="-0.0001797" cb="0.0007033" vb="0.9999820"/>
++            <tca model="poly3" focal="26.9" br="-0.0003871" cr="0.0008622" vr="0.9999533" bb="-0.0001398" cb="0.0006987" vb="0.9999226"/>
++            <tca model="poly3" focal="29.4" br="-0.0003218" cr="0.0007089" vr="0.9999775" bb="0.0001630" cb="-0.0000255" vb="1.0003434"/>
++            <tca model="poly3" focal="35" br="-0.0001337" cr="0.0002671" vr="1.0000620" bb="-0.0000737" cb="0.0004179" vb="1.0001761"/>
++            <tca model="poly3" focal="55" br="-0.0000006" cr="-0.0000747" vr="1.0000795" bb="-0.0000202" cb="0.0002275" vb="1.0002342"/>
++            <tca model="poly3" focal="70" br="-0.0000020" cr="-0.0000449" vr="0.9999473" bb="-0.0002686" cb="0.0006367" vb="1.0000025"/>
++            <tca model="poly3" focal="100" br="0.0000928" cr="-0.0002755" vr="0.9998440" bb="-0.0001632" cb="0.0002535" vb="1.0000525"/>
++            <tca model="poly3" focal="142.5" br="0.0001761" cr="-0.0004582" vr="0.9996290" bb="-0.0003233" cb="0.0005660" vb="0.9996693"/>
++            <tca model="poly3" focal="220" br="0.0001387" cr="-0.0004467" vr="0.9993390" bb="0.0000952" cb="-0.0001185" vb="0.9997363"/>
++            <tca model="poly3" focal="250" br="0.0005417" cr="-0.0013082" vr="0.9997014" bb="-0.0007442" cb="0.0015463" vb="0.9988026"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 24-135mm f/3.5-5.6 SP AD</model>
++        <model>Tamron AF 19-35mm f/3.5-4.5</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="24" a="0.004951" b="-0.019509" c="0" />
+-            <distortion model="ptlens" focal="28" a="0.002141" b="-0.010335" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.001649" b="-0.003387" c="0" />
+-            <distortion model="ptlens" focal="41" a="0" b="0.002775" c="0" />
+-            <distortion model="ptlens" focal="52" a="0" b="0.00443" c="0" />
+-            <distortion model="ptlens" focal="62" a="0" b="0.004818" c="0" />
+-            <distortion model="ptlens" focal="74" a="0" b="0.004729" c="0" />
+-            <distortion model="ptlens" focal="85" a="0" b="0.00486" c="0" />
+-            <distortion model="ptlens" focal="99" a="0" b="0.005128" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.004635" c="0" />
++            <distortion model="ptlens" focal="19" a="0.013926" b="-0.041094" c="0"/>
++            <distortion model="ptlens" focal="24" a="0.005657" b="-0.020982" c="0"/>
++            <distortion model="ptlens" focal="27" a="0.003315" b="-0.014095" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.004475" b="-0.013489" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 28-75mm f/2.8 XR Di</model>
++        <model>Tamron SP 24-70mm f/2.8 Di VC USD</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="24" a="0.03519" b="-0.10395" c="0.06092"/>
++            <distortion model="ptlens" focal="35" a="0.01436" b="-0.0404" c="0.03983"/>
++            <distortion model="ptlens" focal="50" a="0.01112" b="-0.02223" c="0.02177"/>
++            <distortion model="ptlens" focal="70" a="0.00625" b="-0.00862" c="0.00987"/>
++            <tca model="poly3" focal="24" br="-0.0000913" vr="1.0008446" bb="0.0000181" vb="0.9998653"/>
++            <tca model="poly3" focal="35" br="0.0000457" vr="1.0004519" bb="-0.0000735" vb="0.9998598"/>
++            <tca model="poly3" focal="50" br="0.0000118" vr="1.0000938" bb="-0.0000862" vb="0.9998401"/>
++            <tca model="poly3" focal="70" br="-0.0000161" vr="0.9997567" bb="-0.0000354" vb="0.9997991"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="24" a="0.004951" b="-0.019509" c="0"/>
++            <distortion model="ptlens" focal="28" a="0.002141" b="-0.010335" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.001649" b="-0.003387" c="0"/>
++            <distortion model="ptlens" focal="41" a="0" b="0.002775" c="0"/>
++            <distortion model="ptlens" focal="52" a="0" b="0.00443" c="0"/>
++            <distortion model="ptlens" focal="62" a="0" b="0.004818" c="0"/>
++            <distortion model="ptlens" focal="74" a="0" b="0.004729" c="0"/>
++            <distortion model="ptlens" focal="85" a="0" b="0.00486" c="0"/>
++            <distortion model="ptlens" focal="99" a="0" b="0.005128" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.004635" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09)</model>
++        <model lang="en">Tamron SP AF 28-75mm f/2.8 XR Di</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.01469" b="-0.034774" c="0" />
+-            <distortion model="ptlens" focal="30" a="0.012441" b="-0.026997" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.009958" b="-0.018577" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.005421" c="0" />
+-            <distortion model="ptlens" focal="60" a="0" b="0.00752" c="0" />
+-            <distortion model="ptlens" focal="75" a="0" b="0.007321" c="0" />
++            <distortion model="ptlens" focal="28" a="0.01469" b="-0.034774" c="0"/>
++            <distortion model="ptlens" focal="30" a="0.012441" b="-0.026997" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.009958" b="-0.018577" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.005421" c="0"/>
++            <distortion model="ptlens" focal="60" a="0" b="0.00752" c="0"/>
++            <distortion model="ptlens" focal="75" a="0" b="0.007321" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 28-105mm f/2.8 SP LD IF</model>
++        <model>Tamron SP AF 28-105mm f/2.8 LD Aspherical IF</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0.020983" b="-0.054749" c="0" />
+-            <distortion model="ptlens" focal="32" a="0.018015" b="-0.042871" c="0" />
+-            <distortion model="ptlens" focal="35" a="0.01094" b="-0.02352" c="0" />
+-            <distortion model="ptlens" focal="39" a="0.010993" b="-0.016341" c="0" />
+-            <distortion model="ptlens" focal="44" a="0.007493" b="-0.007606" c="0" />
+-            <distortion model="ptlens" focal="63" a="0.002757" b="0.006995" c="0" />
+-            <distortion model="ptlens" focal="75" a="0" b="0.012653" c="0" />
+-            <distortion model="ptlens" focal="93" a="0" b="0.011546" c="0" />
+-            <distortion model="ptlens" focal="105" a="0" b="0.012148" c="0" />
++            <distortion model="ptlens" focal="28" a="0.020983" b="-0.054749" c="0"/>
++            <distortion model="ptlens" focal="32" a="0.018015" b="-0.042871" c="0"/>
++            <distortion model="ptlens" focal="35" a="0.01094" b="-0.02352" c="0"/>
++            <distortion model="ptlens" focal="39" a="0.010993" b="-0.016341" c="0"/>
++            <distortion model="ptlens" focal="44" a="0.007493" b="-0.007606" c="0"/>
++            <distortion model="ptlens" focal="63" a="0.002757" b="0.006995" c="0"/>
++            <distortion model="ptlens" focal="75" a="0" b="0.012653" c="0"/>
++            <distortion model="ptlens" focal="93" a="0" b="0.011546" c="0"/>
++            <distortion model="ptlens" focal="105" a="0" b="0.012148" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 28-300mm f/3.5-6.3 XR Di LD</model>
++        <model>Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical (IF)</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="30" a="-0.00171" b="-0.003088" c="0" />
+-            <distortion model="ptlens" focal="38" a="0" b="-0.000956" c="0" />
+-            <distortion model="ptlens" focal="50" a="0" b="0.003328" c="0" />
+-            <distortion model="ptlens" focal="78" a="0" b="0.005468" c="0" />
+-            <distortion model="ptlens" focal="100" a="0" b="0.004829" c="0" />
+-            <distortion model="ptlens" focal="135" a="0" b="0.005605" c="0" />
+-            <distortion model="ptlens" focal="220" a="0" b="0.006124" c="0" />
+-            <distortion model="ptlens" focal="300" a="0" b="0.006507" c="0" />
++            <distortion model="ptlens" focal="30" a="-0.00171" b="-0.003088" c="0"/>
++            <distortion model="ptlens" focal="38" a="0" b="-0.000956" c="0"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.003328" c="0"/>
++            <distortion model="ptlens" focal="78" a="0" b="0.005468" c="0"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.004829" c="0"/>
++            <distortion model="ptlens" focal="135" a="0" b="0.005605" c="0"/>
++            <distortion model="ptlens" focal="220" a="0" b="0.006124" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.006507" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron 35-70mm F/3.5 CF MACRO</model>
++        <model>Tamron 28-300mm f/3.5-6.3 Di VC PZD A010</model>
++        <model lang="en">Tamron 28-300mm f/3.5-6.3 Di VC PZD</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 6D -->
++            <distortion model="ptlens" focal="28" a="0.0324178" b="-0.0946795" c="0.0297184"/>
++            <distortion model="ptlens" focal="35" a="0.0179732" b="-0.0290612" c="-0.012803"/>
++            <distortion model="ptlens" focal="50" a="0.0120714" b="-0.0130309" c="0.00336402"/>
++            <distortion model="ptlens" focal="70" a="0.0096825" b="-0.0142811" c="0.0252535"/>
++            <distortion model="ptlens" focal="97" a="-0.000852845" b="0.0228922" c="-0.0196526"/>
++            <distortion model="ptlens" focal="188" a="0.00531574" b="-0.0085828" c="0.0203936"/>
++            <distortion model="ptlens" focal="300" a="0.00604573" b="-0.0126656" c="0.0245787"/>
++            <tca model="poly3" focal="28" br="-0.0001708" vr="1.0004967" bb="0.0001592" vb="0.9998905"/>
++            <tca model="poly3" focal="35" br="-0.0001060" vr="1.0003000" bb="0.0000964" vb="1.0002000"/>
++            <tca model="poly3" focal="50" br="-0.0000689" vr="1.0002181" bb="0.0000498" vb="0.9998929"/>
++            <tca model="poly3" focal="70" br="-0.0000049" vr="1.0001289" bb="-0.0000115" vb="0.9999376"/>
++            <tca model="poly3" focal="97" br="-0.0000401" vr="1.0002000" bb="0.0000123" vb="0.9996000"/>
++            <tca model="poly3" focal="188" br="0.0000306" vr="0.9999000" bb="0.0000334" vb="0.9993000"/>
++            <tca model="poly3" focal="300" br="0.0000202" vr="0.9998000" bb="-0.0002713" vb="0.9990000"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.6575" k2="-0.2614" k3="0.2136"/>
++            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.6575" k2="-0.2614" k3="0.2136"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.5813" k2="0.2621" k3="-0.1000"/>
++            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.5813" k2="0.2621" k3="-0.1000"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.5775" k2="0.2492" k3="-0.0880"/>
++            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.5775" k2="0.2492" k3="-0.0880"/>
++            <vignetting model="pa" focal="28" aperture="10" distance="10" k1="-0.5734" k2="0.2366" k3="-0.0777"/>
++            <vignetting model="pa" focal="28" aperture="10" distance="1000" k1="-0.5734" k2="0.2366" k3="-0.0777"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.5675" k2="0.2170" k3="-0.0603"/>
++            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.5675" k2="0.2170" k3="-0.0603"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.6512" k2="0.1063" k3="-0.0305"/>
++            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6512" k2="0.1063" k3="-0.0305"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.5090" k2="0.2487" k3="-0.0916"/>
++            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5090" k2="0.2487" k3="-0.0916"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.5059" k2="0.2419" k3="-0.0864"/>
++            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.5059" k2="0.2419" k3="-0.0864"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.5067" k2="0.2405" k3="-0.0839"/>
++            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.5067" k2="0.2405" k3="-0.0839"/>
++            <vignetting model="pa" focal="35" aperture="25" distance="10" k1="-0.5004" k2="0.2277" k3="-0.0760"/>
++            <vignetting model="pa" focal="35" aperture="25" distance="1000" k1="-0.5004" k2="0.2277" k3="-0.0760"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.6235" k2="0.6028" k3="-0.4465"/>
++            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.6235" k2="0.6028" k3="-0.4465"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.3861" k2="0.2098" k3="-0.0891"/>
++            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3861" k2="0.2098" k3="-0.0891"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.3813" k2="0.1855" k3="-0.0654"/>
++            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.3813" k2="0.1855" k3="-0.0654"/>
++            <vignetting model="pa" focal="50" aperture="10" distance="10" k1="-0.3807" k2="0.1826" k3="-0.0624"/>
++            <vignetting model="pa" focal="50" aperture="10" distance="1000" k1="-0.3807" k2="0.1826" k3="-0.0624"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="10" k1="-0.3717" k2="0.1758" k3="-0.0614"/>
++            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.3717" k2="0.1758" k3="-0.0614"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.5410" k2="0.7390" k3="-0.6880"/>
++            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.5410" k2="0.7390" k3="-0.6880"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.3593" k2="0.3780" k3="-0.2660"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3593" k2="0.3780" k3="-0.2660"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.3198" k2="0.2237" k3="-0.1245"/>
++            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.3198" k2="0.2237" k3="-0.1245"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.3054" k2="0.1637" k3="-0.0675"/>
++            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.3054" k2="0.1637" k3="-0.0675"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.3004" k2="0.1653" k3="-0.0678"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.3004" k2="0.1653" k3="-0.0678"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="-0.1901" k2="-0.1314" k3="-0.2080"/>
++            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.1901" k2="-0.1314" k3="-0.2080"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="10" k1="-0.3508" k2="0.7872" k3="-0.7709"/>
++            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.3508" k2="0.7872" k3="-0.7709"/>
++            <vignetting model="pa" focal="97" aperture="9" distance="10" k1="-0.3605" k2="0.7826" k3="-0.7079"/>
++            <vignetting model="pa" focal="97" aperture="9" distance="1000" k1="-0.3605" k2="0.7826" k3="-0.7079"/>
++            <vignetting model="pa" focal="97" aperture="10" distance="10" k1="-0.3510" k2="0.7304" k3="-0.6393"/>
++            <vignetting model="pa" focal="97" aperture="10" distance="1000" k1="-0.3510" k2="0.7304" k3="-0.6393"/>
++            <vignetting model="pa" focal="97" aperture="36" distance="10" k1="-0.2108" k2="0.1593" k3="-0.0891"/>
++            <vignetting model="pa" focal="97" aperture="36" distance="1000" k1="-0.2108" k2="0.1593" k3="-0.0891"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0711" k2="-1.3334" k3="0.8639"/>
++            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0711" k2="-1.3334" k3="0.8639"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.1318" k2="-0.9775" k3="0.4330"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1318" k2="-0.9775" k3="0.4330"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="0.0210" k2="-0.3899" k3="-0.0073"/>
++            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="0.0210" k2="-0.3899" k3="-0.0073"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.0737" k2="-0.0057" k3="-0.2692"/>
++            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.0737" k2="-0.0057" k3="-0.2692"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-1.0385" k2="0.7010" k3="-0.2139"/>
++            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-1.0385" k2="0.7010" k3="-0.2139"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.0826" k2="-0.9449" k3="0.6342"/>
++            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.0826" k2="-0.9449" k3="0.6342"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="0.0862" k2="-0.9600" k3="0.5268"/>
++            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="0.0862" k2="-0.9600" k3="0.5268"/>
++            <vignetting model="pa" focal="300" aperture="10" distance="10" k1="0.0651" k2="-0.6653" k3="0.2827"/>
++            <vignetting model="pa" focal="300" aperture="10" distance="1000" k1="0.0651" k2="-0.6653" k3="0.2827"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="10" k1="-0.1581" k2="0.1260" k3="-0.0431"/>
++            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.1581" k2="0.1260" k3="-0.0431"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <!-- Very old manual lens, so don't look for real EXIF names. -->
++        <model>Tamron 35-70mm f/3.5 CF Macro</model>
+         <mount>Nikon F</mount>
+         <mount>Pentax K</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="poly3" focal="35" k1="-0.00768" />
+-            <distortion model="ptlens" focal="40" a="0.0012" b="-0.00676" c="0.00204" />
+-            <distortion model="ptlens" focal="50" a="-0.00143" b="0.00459" c="-0.00465" />
+-            <distortion model="poly3" focal="70" k1="0.00233" />
+-	        <tca model="poly3" focal="35" br="-0.00004" vr="1.00018" bb="0.00007" vb="0.999835" />
+-	        <tca model="poly3" focal="40" br="-0.00003" vr="1.00011" bb="0.000021" vb="0.999909" />
+-            <tca model="poly3" focal="50" br="-0.0000088" vr="1.0000432" bb="0.0000117" vb="0.9999312" />
+-            <tca model="poly3" focal="70" br="-0.0000079" vr="1.0000614" bb="-0.0000911" vb="1.000192" />
+-            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.11121" k2="0.08366" k3="-0.10313" />
+-            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.07601" k2="0.00922" k3="-0.04755" />
+-	        <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.25218" k2="0.278" k3="-0.15618" />
+-            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.21197" k2="-0.08795" k3="0.07518" />
++            <distortion model="poly3" focal="35" k1="-0.00768"/>
++            <distortion model="ptlens" focal="40" a="0.0012" b="-0.00676" c="0.00204"/>
++            <distortion model="ptlens" focal="50" a="-0.00143" b="0.00459" c="-0.00465"/>
++            <distortion model="poly3" focal="70" k1="0.00233"/>
++            <tca model="poly3" focal="35" br="-0.00004" vr="1.00018" bb="0.00007" vb="0.999835"/>
++            <tca model="poly3" focal="40" br="-0.00003" vr="1.00011" bb="0.000021" vb="0.999909"/>
++            <tca model="poly3" focal="50" br="-0.0000088" vr="1.0000432" bb="0.0000117" vb="0.9999312"/>
++            <tca model="poly3" focal="70" br="-0.0000079" vr="1.0000614" bb="-0.0000911" vb="1.000192"/>
++            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.11121" k2="0.08366" k3="-0.10313"/>
++            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.07601" k2="0.00922" k3="-0.04755"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.25218" k2="0.278" k3="-0.15618"/>
++            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.21197" k2="-0.08795" k3="0.07518"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron AF70-300mm F/4-5.6 LD MACRO</model>
++        <model>Tamron AF 70-300mm f/4-5.6 LD Macro 1:2</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-	        <distortion model="ptlens" focal="70" a="0.00168" b="-0.00649" c="0.0021" />
+- 	        <distortion model="ptlens" focal="100" a="-0.00287" b="0.01075" c="-0.00716" />
+-	        <distortion model="ptlens" focal="133" a="0.00404" b="-0.0061" c="0.00845" />
+-	        <distortion model="ptlens" focal="180" a="0.0" b="0.00388" c="0.0" />
+-	        <distortion model="ptlens" focal="300" a="0.0" b="0.00442" c="0.0" />
+-            <tca model="poly3" focal="70" br="-0.0000487" vr="1.0002053" bb="0.0000352" vb="0.9998612" />
+-            <tca model="poly3" focal="100" br="-0.0000402" vr="1.0000889" bb="0.0000026" vb="0.9998133" />
+-            <tca model="poly3" focal="133" br="-0.0000210" vr="0.9999776" bb="0.0000067" vb="0.9998469" />
+-            <tca model="poly3" focal="180" br="-0.0000139" vr="0.9998566" bb="0.0000295" vb="0.999785" />
+-            <tca model="poly3" focal="300" br="-0.000011" vr="0.9996417" bb="0.000022" vb="0.9998125" />
+-            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.05486" k2="0.04427" k3="-0.01908" />
+-            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.07719" k2="0.13209" k3="-0.09579" />
+-            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.05807" k2="0.07773" k3="-0.05601" />
+-            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.03723" k2="0.02431" k3="-0.02236" />
+-            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.03866" k2="0.05966" k3="-0.04464" />
++            <distortion model="ptlens" focal="70" a="0.00168" b="-0.00649" c="0.0021"/>
++            <distortion model="ptlens" focal="100" a="-0.00287" b="0.01075" c="-0.00716"/>
++            <distortion model="ptlens" focal="133" a="0.00404" b="-0.0061" c="0.00845"/>
++            <distortion model="ptlens" focal="180" a="0" b="0.00388" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00442" c="0"/>
++            <tca model="poly3" focal="70" br="-0.0000487" vr="1.0002053" bb="0.0000352" vb="0.9998612"/>
++            <tca model="poly3" focal="100" br="-0.0000402" vr="1.0000889" bb="0.0000026" vb="0.9998133"/>
++            <tca model="poly3" focal="133" br="-0.0000210" vr="0.9999776" bb="0.0000067" vb="0.9998469"/>
++            <tca model="poly3" focal="180" br="-0.0000139" vr="0.9998566" bb="0.0000295" vb="0.999785"/>
++            <tca model="poly3" focal="300" br="-0.000011" vr="0.9996417" bb="0.000022" vb="0.9998125"/>
++            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.05486" k2="0.04427" k3="-0.01908"/>
++            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.07719" k2="0.13209" k3="-0.09579"/>
++            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.05807" k2="0.07773" k3="-0.05601"/>
++            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.03723" k2="0.02431" k3="-0.02236"/>
++            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.03866" k2="0.05966" k3="-0.04464"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+-        <model>Tamron SP 70-300mm F4-5.6 Di VC USD</model>
++        <model>Tamron SP 70-300mm f/4.0-5.6 Di VC USD (A005)</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Sony Alpha</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="70" a="0" b="-0.006" c="0.002" />
+-            <distortion model="ptlens" focal="85" a="-0.006" b="0.009" c="-0.001" />
+-            <distortion model="ptlens" focal="100" a="0.018" b="-0.042" c="0.037" />
+-            <distortion model="ptlens" focal="170" a="-0.008" b="0.022" c="0.017" />
+-            <distortion model="ptlens" focal="250" a="-0.002" b="0.013" c="-0.004" />
+-            <distortion model="ptlens" focal="300" a="0.002" b="0.001" c="0.007" />
++            <distortion model="ptlens" focal="70" a="0" b="-0.006" c="0.002"/>
++            <distortion model="ptlens" focal="85" a="-0.006" b="0.009" c="-0.001"/>
++            <distortion model="ptlens" focal="100" a="0.018" b="-0.042" c="0.037"/>
++            <distortion model="ptlens" focal="170" a="-0.008" b="0.022" c="0.017"/>
++            <distortion model="ptlens" focal="250" a="-0.002" b="0.013" c="-0.004"/>
++            <distortion model="ptlens" focal="300" a="0.002" b="0.001" c="0.007"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tamron</maker>
+         <model>Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Sony Alpha</mount>
+-        <!-- FixMe: Actually cropfactor 1.613 -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+             <!-- Taken with Canon EOS 550D -->
+-            <distortion model="ptlens" focal="18" a="0.01861" b="-0.05313" c="-0.00391" />
+-            <distortion model="ptlens" focal="25" a="0.01981" b="-0.05231" c="0.03436" />
+-            <distortion model="ptlens" focal="33" a="0.01589" b="-0.03236" c="0.03109" />
+-            <distortion model="ptlens" focal="35" a="0.01503" b="-0.02899" c="0.03321" />
+-            <distortion model="ptlens" focal="46" a="0.00509" b="0.00394" c="0.00394" />
+-            <distortion model="ptlens" focal="76" a="0.00322" b="0.00008" c="0.01944" />
+-            <distortion model="ptlens" focal="85" a="0.01472" b="-0.04063" c="0.0667" />
+-            <distortion model="ptlens" focal="142" a="0.00302" b="0.01586" c="-0.03011" />
+-            <distortion model="ptlens" focal="270" a="-0.00126" b="0.02251" c="-0.0319" />
++            <distortion model="ptlens" focal="18" a="0.01861" b="-0.05313" c="-0.00391"/>
++            <distortion model="ptlens" focal="25" a="0.01981" b="-0.05231" c="0.03436"/>
++            <distortion model="ptlens" focal="33" a="0.01589" b="-0.03236" c="0.03109"/>
++            <distortion model="ptlens" focal="35" a="0.01503" b="-0.02899" c="0.03321"/>
++            <distortion model="ptlens" focal="46" a="0.00509" b="0.00394" c="0.00394"/>
++            <distortion model="ptlens" focal="76" a="0.00322" b="0.00008" c="0.01944"/>
++            <distortion model="ptlens" focal="85" a="0.01472" b="-0.04063" c="0.0667"/>
++            <distortion model="ptlens" focal="142" a="0.00302" b="0.01586" c="-0.03011"/>
++            <distortion model="ptlens" focal="270" a="-0.00126" b="0.02251" c="-0.0319"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+-	    <maker>Tamron</maker>
+-	    <model>TAMRON SP AF 90mm f/2.8 (172E)</model>
+-	    <focal value="90" />
+-	    <aperture value="2.8" />
+-	    <aperture>2.8-32</aperture>
+-	    <mount>Nikon F AF</mount>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 90mm f/2.8 Di Macro 1:1</model>
++        <mount>Nikon F AF</mount>
+         <mount>Canon EF</mount>
+         <mount>Pentax KAF2</mount>
+         <mount>Sony Alpha</mount>
+-	    <cropfactor>1.5</cropfactor>
+-	    <calibration>
+-	        <distortion focal="90" model="ptlens" a="-0.00126953" b="0.00404399" c="-0.0027782" />
+-            <tca model="poly3" focal="90" br="-0.0000152" vr="1.0000471" bb="-0.0000061" vb="0.9998509" />
+-            <vignetting model="pa" focal="90" aperture="2.8" distance="0.29" k1="0.0414" k2="-0.1677" k3="0.1199" />
+-            <vignetting model="pa" focal="90" aperture="2.8" distance="0.6" k1="-0.0576" k2="-0.2887" k3="0.2065" />
+-            <vignetting model="pa" focal="90" aperture="2.8" distance="1.5" k1="-0.2170" k2="-0.0857" k3="0.1121" />
+-            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.2146" k2="-0.1791" k3="0.1820" />
+-            <vignetting model="pa" focal="90" aperture="4" distance="0.29" k1="-0.0298" k2="-0.0754" k3="0.0582" />
+-            <vignetting model="pa" focal="90" aperture="4" distance="0.6" k1="-0.0172" k2="-0.2229" k3="0.1321" />
+-            <vignetting model="pa" focal="90" aperture="4" distance="1.5" k1="-0.1334" k2="-0.1854" k3="0.1342" />
+-            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.1590" k2="-0.2373" k3="0.1870" />
+-            <vignetting model="pa" focal="90" aperture="5.6" distance="0.29" k1="-0.0117" k2="-0.0517" k3="0.0491" />
+-            <vignetting model="pa" focal="90" aperture="5.6" distance="0.6" k1="0.0148" k2="-0.1274" k3="0.0910" />
+-            <vignetting model="pa" focal="90" aperture="5.6" distance="1.5" k1="0.0117" k2="-0.1416" k3="0.0988" />
+-            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="0.0290" k2="-0.1878" k3="0.1275" />
+-            <vignetting model="pa" focal="90" aperture="8" distance="0.29" k1="-0.0197" k2="-0.0350" k3="0.0395" />
+-            <vignetting model="pa" focal="90" aperture="8" distance="0.6" k1="-0.0280" k2="-0.0312" k3="0.0299" />
+-            <vignetting model="pa" focal="90" aperture="8" distance="1.5" k1="-0.0190" k2="-0.0579" k3="0.0448" />
+-            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.0084" k2="-0.0916" k3="0.0666" />
+-            <vignetting model="pa" focal="90" aperture="32" distance="0.29" k1="-0.0394" k2="0.0075" k3="0.0130" />
+-            <vignetting model="pa" focal="90" aperture="32" distance="0.6" k1="-0.1223" k2="0.1561" k3="-0.0806" />
+-            <vignetting model="pa" focal="90" aperture="32" distance="1.5" k1="-0.0777" k2="0.0766" k3="-0.0380" />
+-            <vignetting model="pa" focal="90" aperture="32" distance="1000" k1="-0.0557" k2="0.0276" k3="-0.0118" />
+-	        <field_of_view focal="90" fov="15.1702" />
+-	    </calibration>
++        <focal value="90"/>
++        <aperture min="2.8" max="32"/>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion focal="90" model="ptlens" a="-0.00126953" b="0.00404399" c="-0.0027782"/>
++            <tca model="poly3" focal="90" br="-0.0000152" vr="1.0000471" bb="-0.0000061" vb="0.9998509"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="0.29" k1="0.0414" k2="-0.1677" k3="0.1199"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="0.6" k1="-0.0576" k2="-0.2887" k3="0.2065"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="1.5" k1="-0.2170" k2="-0.0857" k3="0.1121"/>
++            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.2146" k2="-0.1791" k3="0.1820"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="0.29" k1="-0.0298" k2="-0.0754" k3="0.0582"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="0.6" k1="-0.0172" k2="-0.2229" k3="0.1321"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="1.5" k1="-0.1334" k2="-0.1854" k3="0.1342"/>
++            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.1590" k2="-0.2373" k3="0.1870"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="0.29" k1="-0.0117" k2="-0.0517" k3="0.0491"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="0.6" k1="0.0148" k2="-0.1274" k3="0.0910"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="1.5" k1="0.0117" k2="-0.1416" k3="0.0988"/>
++            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="0.0290" k2="-0.1878" k3="0.1275"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="0.29" k1="-0.0197" k2="-0.0350" k3="0.0395"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="0.6" k1="-0.0280" k2="-0.0312" k3="0.0299"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1.5" k1="-0.0190" k2="-0.0579" k3="0.0448"/>
++            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.0084" k2="-0.0916" k3="0.0666"/>
++            <vignetting model="pa" focal="90" aperture="32" distance="0.29" k1="-0.0394" k2="0.0075" k3="0.0130"/>
++            <vignetting model="pa" focal="90" aperture="32" distance="0.6" k1="-0.1223" k2="0.1561" k3="-0.0806"/>
++            <vignetting model="pa" focal="90" aperture="32" distance="1.5" k1="-0.0777" k2="0.0766" k3="-0.0380"/>
++            <vignetting model="pa" focal="90" aperture="32" distance="1000" k1="-0.0557" k2="0.0276" k3="-0.0118"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 11-18mm f/4.5-5.6 Di-II LD Aspherical (IF)</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 7D -->
++            <distortion model="ptlens" focal="11" a="-0.01251" b="0.06318" c="-0.12889"/>
++            <distortion model="ptlens" focal="12" a="0.00174" b="0.02168" c="-0.094"/>
++            <distortion model="ptlens" focal="13" a="0.00177" b="0.02035" c="-0.08444"/>
++            <distortion model="ptlens" focal="15" a="0.00793" b="-0.00895" c="-0.03469"/>
++            <distortion model="ptlens" focal="18" a="0.00432" b="-0.00223" c="-0.02884"/>
++            <tca model="poly3" focal="11" br="0.0003262" vr="1.0002776" bb="-0.0001060" vb="1.0000957"/>
++            <tca model="poly3" focal="12" br="0.0002765" vr="1.0001904" bb="-0.0001172" vb="1.0001615"/>
++            <tca model="poly3" focal="13" br="0.0002045" vr="1.0000647" bb="-0.0001133" vb="1.0002291"/>
++            <tca model="poly3" focal="15" br="0.0001933" vr="1.0000948" bb="-0.0001079" vb="1.0002024"/>
++            <tca model="poly3" focal="18" br="0.0002596" vr="1.0001649" bb="-0.0001312" vb="1.0000839"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro</model>
++        <model lang="en">Tamron 16-300mm f/3.5-6.3 Di II VC PZD</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 600D -->
++            <distortion model="ptlens" focal="16" a="0.02076" b="-0.07067" c="0.03778"/>
++            <distortion model="ptlens" focal="18" a="0.01927" b="-0.05763" c="0.03858"/>
++            <distortion model="ptlens" focal="20" a="0.02175" b="-0.06239" c="0.04904"/>
++            <distortion model="ptlens" focal="22" a="0.01762" b="-0.0406" c="0.02777"/>
++            <distortion model="ptlens" focal="35" a="0.00542" b="-0.00291" c="0.01265"/>
++            <distortion model="ptlens" focal="50" a="0" b="0.01525" c="0"/>
++            <distortion model="ptlens" focal="100" a="0" b="0.01213" c="0"/>
++            <distortion model="ptlens" focal="211" a="0" b="0.0076" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.00642" c="0"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro</model>
++        <model lang="en">Tamron 16-300mm f/3.5-6.3 Di II VC PZD</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5200 -->
++            <distortion model="ptlens" focal="16" a="0.02569" b="-0.0757" c="0.01928"/>
++            <distortion model="ptlens" focal="18" a="0.02657" b="-0.07396" c="0.04944"/>
++            <distortion model="ptlens" focal="22" a="0.01778" b="-0.03909" c="0.02957"/>
++            <distortion model="ptlens" focal="26" a="0.01338" b="-0.0211" c="0.01513"/>
++            <distortion model="ptlens" focal="31" a="0.00908" b="-0.00334" c="-0.00376"/>
++            <distortion model="ptlens" focal="50" a="0.00992" b="-0.01139" c="0.02269"/>
++            <distortion model="ptlens" focal="70" a="0" b="0.01566" c="0"/>
++            <distortion model="ptlens" focal="150" a="0" b="0.00959" c="0"/>
++            <distortion model="ptlens" focal="300" a="0" b="0.0062" c="0"/>
++            <tca model="poly3" focal="16" br="-0.0000074" vr="1.0006557" bb="0.0000419" vb="1.0001881"/>
++            <tca model="poly3" focal="18" br="0.0000541" vr="1.0004807" bb="0.0000147" vb="1.0000854"/>
++            <tca model="poly3" focal="22" br="-0.0000022" vr="1.0004633" bb="0.0000035" vb="1.0001122"/>
++            <tca model="poly3" focal="26" br="-0.0000038" vr="1.0004575" bb="0.0000126" vb="1.0000604"/>
++            <tca model="poly3" focal="31" br="-0.0000148" vr="1.0004258" bb="-0.0000085" vb="1.0001555"/>
++            <tca model="poly3" focal="50" br="0.0000099" vr="1.0001272" bb="-0.0000159" vb="1.0000252"/>
++            <tca model="poly3" focal="70" br="-0.0000024" vr="1.0001413" bb="-0.0000606" vb="0.9998388"/>
++            <tca model="poly3" focal="150" br="-0.0000344" vr="0.9999047" bb="-0.0001974" vb="0.9996163"/>
++            <tca model="poly3" focal="300" br="0.0001277" vr="0.9985891" bb="-0.0000268" vb="0.9999028"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 150-600mm f/5-6.3 Di VC USD (A011)</model>
++        <model lang="en">Tamron SP 150-600mm f/5-6.3 Di VC USD</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7100 -->
++            <distortion model="poly3" focal="150" k1="0.0029"/>
++            <distortion model="poly3" focal="210" k1="0.00378"/>
++            <distortion model="poly3" focal="300" k1="0.00338"/>
++            <distortion model="poly3" focal="400" k1="0.00319"/>
++            <distortion model="poly3" focal="500" k1="0.0027"/>
++            <distortion model="poly3" focal="600" k1="0.00277"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 60mm f/2 Di II LD (IF) Macro 1:1</model>
++        <model lang="en">Tamron SP AF 60mm f/2 Di II LD (IF) Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5100 -->
++            <distortion model="ptlens" focal="60" a="0.01029" b="-0.0342" c="0.02936"/>
++            <tca model="poly3" focal="60" br="-0.0000412" vr="1.0003372" bb="0.0000534" vb="0.9999002"/>
++            <vignetting model="pa" focal="60" aperture="2" distance="10" k1="-0.8996" k2="0.5615" k3="-0.2074"/>
++            <vignetting model="pa" focal="60" aperture="2" distance="1000" k1="-0.8996" k2="0.5615" k3="-0.2074"/>
++            <vignetting model="pa" focal="60" aperture="2.2" distance="10" k1="-0.2344" k2="-0.5402" k3="0.3303"/>
++            <vignetting model="pa" focal="60" aperture="2.2" distance="1000" k1="-0.2344" k2="-0.5402" k3="0.3303"/>
++            <vignetting model="pa" focal="60" aperture="2.5" distance="10" k1="-0.0574" k2="-0.7523" k3="0.4045"/>
++            <vignetting model="pa" focal="60" aperture="2.5" distance="1000" k1="-0.0574" k2="-0.7523" k3="0.4045"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="10" k1="0.0697" k2="-0.6104" k3="0.2494"/>
++            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="0.0697" k2="-0.6104" k3="0.2494"/>
++            <vignetting model="pa" focal="60" aperture="3.2" distance="10" k1="0.0307" k2="-0.3043" k3="0.0165"/>
++            <vignetting model="pa" focal="60" aperture="3.2" distance="1000" k1="0.0307" k2="-0.3043" k3="0.0165"/>
++            <vignetting model="pa" focal="60" aperture="3.5" distance="10" k1="-0.0183" k2="-0.0873" k3="-0.1169"/>
++            <vignetting model="pa" focal="60" aperture="3.5" distance="1000" k1="-0.0183" k2="-0.0873" k3="-0.1169"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="10" k1="-0.1496" k2="0.3295" k3="-0.3467"/>
++            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.1496" k2="0.3295" k3="-0.3467"/>
++            <vignetting model="pa" focal="60" aperture="4.5" distance="10" k1="-0.1597" k2="0.3383" k3="-0.3110"/>
++            <vignetting model="pa" focal="60" aperture="4.5" distance="1000" k1="-0.1597" k2="0.3383" k3="-0.3110"/>
++            <vignetting model="pa" focal="60" aperture="5" distance="10" k1="-0.0764" k2="0.0456" k3="-0.0556"/>
++            <vignetting model="pa" focal="60" aperture="5" distance="1000" k1="-0.0764" k2="0.0456" k3="-0.0556"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="10" k1="-0.0203" k2="-0.1233" k3="0.0739"/>
++            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0203" k2="-0.1233" k3="0.0739"/>
++            <vignetting model="pa" focal="60" aperture="6.3" distance="10" k1="-0.0997" k2="0.0717" k3="-0.0351"/>
++            <vignetting model="pa" focal="60" aperture="6.3" distance="1000" k1="-0.0997" k2="0.0717" k3="-0.0351"/>
++            <vignetting model="pa" focal="60" aperture="7.1" distance="10" k1="0.0337" k2="-0.2405" k3="0.1533"/>
++            <vignetting model="pa" focal="60" aperture="7.1" distance="1000" k1="0.0337" k2="-0.2405" k3="0.1533"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.1016" k2="0.0700" k3="-0.0286"/>
++            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.1016" k2="0.0700" k3="-0.0286"/>
++            <vignetting model="pa" focal="60" aperture="9" distance="10" k1="-0.0942" k2="0.0443" k3="-0.0159"/>
++            <vignetting model="pa" focal="60" aperture="9" distance="1000" k1="-0.0942" k2="0.0443" k3="-0.0159"/>
++            <vignetting model="pa" focal="60" aperture="10" distance="10" k1="-0.0929" k2="0.0837" k3="-0.0504"/>
++            <vignetting model="pa" focal="60" aperture="10" distance="1000" k1="-0.0929" k2="0.0837" k3="-0.0504"/>
++            <vignetting model="pa" focal="60" aperture="11" distance="10" k1="-0.1096" k2="0.1064" k3="-0.0553"/>
++            <vignetting model="pa" focal="60" aperture="11" distance="1000" k1="-0.1096" k2="0.1064" k3="-0.0553"/>
++            <vignetting model="pa" focal="60" aperture="13" distance="10" k1="-0.1146" k2="0.1086" k3="-0.0564"/>
++            <vignetting model="pa" focal="60" aperture="13" distance="1000" k1="-0.1146" k2="0.1086" k3="-0.0564"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="0.0288" k2="-0.1655" k3="0.0842"/>
++            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="0.0288" k2="-0.1655" k3="0.0842"/>
++            <vignetting model="pa" focal="60" aperture="18" distance="10" k1="0.0020" k2="-0.1617" k3="0.1066"/>
++            <vignetting model="pa" focal="60" aperture="18" distance="1000" k1="0.0020" k2="-0.1617" k3="0.1066"/>
++            <vignetting model="pa" focal="60" aperture="20" distance="10" k1="-0.0697" k2="0.0190" k3="-0.0062"/>
++            <vignetting model="pa" focal="60" aperture="20" distance="1000" k1="-0.0697" k2="0.0190" k3="-0.0062"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="10" k1="0.0146" k2="-0.1510" k3="0.0879"/>
++            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="0.0146" k2="-0.1510" k3="0.0879"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D700 -->
++            <distortion model="poly3" focal="70" k1="-0.00915"/>
++            <distortion model="poly3" focal="92" k1="-0.00355"/>
++            <distortion model="poly3" focal="120" k1="0.00108"/>
++            <distortion model="poly3" focal="145" k1="0.00556"/>
++            <distortion model="poly3" focal="200" k1="0.00775"/>
++            <tca model="poly3" focal="70" vr="1.0003920" vb="0.9998959"/>
++            <tca model="poly3" focal="92" vr="1.0001709" vb="0.9999495"/>
++            <tca model="poly3" focal="120" vr="1.0000178" vb="0.9999875"/>
++            <tca model="poly3" focal="145" vr="0.9999155" vb="1.0000171"/>
++            <tca model="poly3" focal="200" vr="0.9998438" vb="0.9999326"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron AF 80-210mm f/4.5-5.6 280D</model>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Pentax KAF2</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon EOS 5D -->
++            <vignetting model="pa" focal="80" aperture="4.5" distance="10" k1="-0.9893" k2="0.4795" k3="-0.1237"/>
++            <vignetting model="pa" focal="80" aperture="4.5" distance="1000" k1="-0.9893" k2="0.4795" k3="-0.1237"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1480" k2="-1.1019" k3="0.7138"/>
++            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1480" k2="-1.1019" k3="0.7138"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0103" k2="-0.6796" k3="0.2077"/>
++            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0103" k2="-0.6796" k3="0.2077"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.2602" k2="0.2634" k3="-0.4153"/>
++            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.2602" k2="0.2634" k3="-0.4153"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.3332" k2="0.4018" k3="-0.3609"/>
++            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.3332" k2="0.4018" k3="-0.3609"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.2601" k2="0.0846" k3="-0.0508"/>
++            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.2601" k2="0.0846" k3="-0.0508"/>
++            <vignetting model="pa" focal="98" aperture="4.5" distance="10" k1="-0.8347" k2="0.3737" k3="-0.0886"/>
++            <vignetting model="pa" focal="98" aperture="4.5" distance="1000" k1="-0.8347" k2="0.3737" k3="-0.0886"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="10" k1="-0.0284" k2="-0.9184" k3="0.5332"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.0284" k2="-0.9184" k3="0.5332"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="10" k1="-0.2385" k2="0.1171" k3="-0.1871"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.2385" k2="0.1171" k3="-0.1871"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="10" k1="-0.2320" k2="0.0070" k3="0.0147"/>
++            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.2320" k2="0.0070" k3="0.0147"/>
++            <vignetting model="pa" focal="98" aperture="16" distance="10" k1="-0.2185" k2="-0.0539" k3="0.0689"/>
++            <vignetting model="pa" focal="98" aperture="16" distance="1000" k1="-0.2185" k2="-0.0539" k3="0.0689"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="10" k1="-0.2441" k2="-0.0039" k3="0.0423"/>
++            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.2441" k2="-0.0039" k3="0.0423"/>
++            <vignetting model="pa" focal="132" aperture="5" distance="10" k1="-0.3126" k2="-0.5928" k3="0.4105"/>
++            <vignetting model="pa" focal="132" aperture="5" distance="1000" k1="-0.3126" k2="-0.5928" k3="0.4105"/>
++            <vignetting model="pa" focal="132" aperture="5.6" distance="10" k1="-0.0934" k2="-0.4179" k3="0.1414"/>
++            <vignetting model="pa" focal="132" aperture="5.6" distance="1000" k1="-0.0934" k2="-0.4179" k3="0.1414"/>
++            <vignetting model="pa" focal="132" aperture="8" distance="10" k1="-0.2058" k2="-0.0185" k3="0.0354"/>
++            <vignetting model="pa" focal="132" aperture="8" distance="1000" k1="-0.2058" k2="-0.0185" k3="0.0354"/>
++            <vignetting model="pa" focal="132" aperture="11" distance="10" k1="-0.2133" k2="-0.0017" k3="0.0264"/>
++            <vignetting model="pa" focal="132" aperture="11" distance="1000" k1="-0.2133" k2="-0.0017" k3="0.0264"/>
++            <vignetting model="pa" focal="132" aperture="16" distance="10" k1="-0.2152" k2="-0.0032" k3="0.0296"/>
++            <vignetting model="pa" focal="132" aperture="16" distance="1000" k1="-0.2152" k2="-0.0032" k3="0.0296"/>
++            <vignetting model="pa" focal="132" aperture="22" distance="10" k1="-0.2165" k2="-0.0075" k3="0.0347"/>
++            <vignetting model="pa" focal="132" aperture="22" distance="1000" k1="-0.2165" k2="-0.0075" k3="0.0347"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-1.4705" k2="1.5209" k3="-0.6794"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-1.4705" k2="1.5209" k3="-0.6794"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0140" k2="-1.0473" k3="0.6308"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0140" k2="-1.0473" k3="0.6308"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1240" k2="-0.1095" k3="-0.1099"/>
++            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1240" k2="-0.1095" k3="-0.1099"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.2404" k2="0.2241" k3="-0.1996"/>
++            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2404" k2="0.2241" k3="-0.1996"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1891" k2="0.0003" k3="0.0180"/>
++            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1891" k2="0.0003" k3="0.0180"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP 70-200mm f/2.8 Di VC USD A009</model>
++        <model lang="en">Tamron SP 70-200mm f/2.8 Di VC USD</model>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.005</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 6D -->
++            <distortion model="poly3" focal="70" k1="-0.00107"/>
++            <distortion model="poly3" focal="100" k1="0.0043"/>
++            <distortion model="poly3" focal="134" k1="0.00472"/>
++            <distortion model="poly3" focal="167" k1="0.00808"/>
++            <distortion model="poly3" focal="200" k1="0.00838"/>
++            <tca model="poly3" focal="70" br="0.0000029" vr="1.0002132" bb="-0.0000057" vb="1.0000094"/>
++            <tca model="poly3" focal="100" br="-0.0000221" vr="1.0000652" bb="-0.0000658" vb="1.0001278"/>
++            <tca model="poly3" focal="134" br="0.0000229" vr="0.9999349" bb="-0.0000511" vb="1.0001457"/>
++            <tca model="poly3" focal="167" br="0.0000443" vr="0.9998583" bb="-0.0000448" vb="1.0001015"/>
++            <tca model="poly3" focal="200" br="0.0000116" vr="0.9998570" bb="-0.0000265" vb="1.0000494"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.6171" k2="0.0437" k3="-0.0332"/>
++            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.6171" k2="0.0437" k3="-0.0332"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="0.0040" k2="-0.3182" k3="-0.0755"/>
++            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="0.0040" k2="-0.3182" k3="-0.0755"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2547" k2="0.5826" k3="-0.6187"/>
++            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2547" k2="0.5826" k3="-0.6187"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2262" k2="0.4231" k3="-0.3675"/>
++            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2262" k2="0.4231" k3="-0.3675"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.1338" k2="-0.0139" k3="0.0515"/>
++            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.1338" k2="-0.0139" k3="0.0515"/>
++            <vignetting model="pa" focal="98" aperture="2.8" distance="10" k1="-0.6974" k2="0.5418" k3="-0.3783"/>
++            <vignetting model="pa" focal="98" aperture="2.8" distance="1000" k1="-0.6974" k2="0.5418" k3="-0.3783"/>
++            <vignetting model="pa" focal="98" aperture="4" distance="10" k1="-0.2254" k2="0.4093" k3="-0.4754"/>
++            <vignetting model="pa" focal="98" aperture="4" distance="1000" k1="-0.2254" k2="0.4093" k3="-0.4754"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="10" k1="-0.2580" k2="0.3968" k3="-0.3102"/>
++            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.2580" k2="0.3968" k3="-0.3102"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="10" k1="-0.1735" k2="0.0667" k3="0.0050"/>
++            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.1735" k2="0.0667" k3="0.0050"/>
++            <vignetting model="pa" focal="98" aperture="32" distance="10" k1="-0.1981" k2="0.0687" k3="0.0261"/>
++            <vignetting model="pa" focal="98" aperture="32" distance="1000" k1="-0.1981" k2="0.0687" k3="0.0261"/>
++            <vignetting model="pa" focal="129" aperture="2.8" distance="10" k1="-0.4629" k2="-0.4214" k3="0.2866"/>
++            <vignetting model="pa" focal="129" aperture="2.8" distance="1000" k1="-0.4629" k2="-0.4214" k3="0.2866"/>
++            <vignetting model="pa" focal="129" aperture="4" distance="10" k1="0.0147" k2="-0.4337" k3="0.0395"/>
++            <vignetting model="pa" focal="129" aperture="4" distance="1000" k1="0.0147" k2="-0.4337" k3="0.0395"/>
++            <vignetting model="pa" focal="129" aperture="5.6" distance="10" k1="-0.2557" k2="0.5165" k3="-0.5489"/>
++            <vignetting model="pa" focal="129" aperture="5.6" distance="1000" k1="-0.2557" k2="0.5165" k3="-0.5489"/>
++            <vignetting model="pa" focal="129" aperture="8" distance="10" k1="-0.2803" k2="0.4676" k3="-0.3578"/>
++            <vignetting model="pa" focal="129" aperture="8" distance="1000" k1="-0.2803" k2="0.4676" k3="-0.3578"/>
++            <vignetting model="pa" focal="129" aperture="32" distance="10" k1="-0.2125" k2="0.1084" k3="0.0036"/>
++            <vignetting model="pa" focal="129" aperture="32" distance="1000" k1="-0.2125" k2="0.1084" k3="0.0036"/>
++            <vignetting model="pa" focal="152" aperture="2.8" distance="10" k1="-0.6975" k2="-0.2219" k3="0.2987"/>
++            <vignetting model="pa" focal="152" aperture="2.8" distance="1000" k1="-0.6975" k2="-0.2219" k3="0.2987"/>
++            <vignetting model="pa" focal="152" aperture="4" distance="10" k1="0.1234" k2="-1.0053" k3="0.4797"/>
++            <vignetting model="pa" focal="152" aperture="4" distance="1000" k1="0.1234" k2="-1.0053" k3="0.4797"/>
++            <vignetting model="pa" focal="152" aperture="5.6" distance="10" k1="-0.1699" k2="0.2227" k3="-0.3827"/>
++            <vignetting model="pa" focal="152" aperture="5.6" distance="1000" k1="-0.1699" k2="0.2227" k3="-0.3827"/>
++            <vignetting model="pa" focal="152" aperture="8" distance="10" k1="-0.3105" k2="0.5837" k3="-0.4807"/>
++            <vignetting model="pa" focal="152" aperture="8" distance="1000" k1="-0.3105" k2="0.5837" k3="-0.4807"/>
++            <vignetting model="pa" focal="152" aperture="32" distance="10" k1="-0.2199" k2="0.1181" k3="-0.0014"/>
++            <vignetting model="pa" focal="152" aperture="32" distance="1000" k1="-0.2199" k2="0.1181" k3="-0.0014"/>
++            <vignetting model="pa" focal="172" aperture="2.8" distance="10" k1="-1.1271" k2="0.6670" k3="-0.1770"/>
++            <vignetting model="pa" focal="172" aperture="2.8" distance="1000" k1="-1.1271" k2="0.6670" k3="-0.1770"/>
++            <vignetting model="pa" focal="172" aperture="4" distance="10" k1="0.1035" k2="-1.2096" k3="0.7009"/>
++            <vignetting model="pa" focal="172" aperture="4" distance="1000" k1="0.1035" k2="-1.2096" k3="0.7009"/>
++            <vignetting model="pa" focal="172" aperture="5.6" distance="10" k1="-0.0904" k2="-0.0621" k3="-0.1824"/>
++            <vignetting model="pa" focal="172" aperture="5.6" distance="1000" k1="-0.0904" k2="-0.0621" k3="-0.1824"/>
++            <vignetting model="pa" focal="172" aperture="8" distance="10" k1="-0.2978" k2="0.5668" k3="-0.4911"/>
++            <vignetting model="pa" focal="172" aperture="8" distance="1000" k1="-0.2978" k2="0.5668" k3="-0.4911"/>
++            <vignetting model="pa" focal="172" aperture="32" distance="10" k1="-0.2479" k2="0.1925" k3="-0.0508"/>
++            <vignetting model="pa" focal="172" aperture="32" distance="1000" k1="-0.2479" k2="0.1925" k3="-0.0508"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.5497" k2="1.6732" k3="-0.7687"/>
++            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.5497" k2="1.6732" k3="-0.7687"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.0389" k2="-1.0804" k3="0.7106"/>
++            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.0389" k2="-1.0804" k3="0.7106"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.0026" k2="-0.4269" k3="0.0882"/>
++            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0026" k2="-0.4269" k3="0.0882"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.2709" k2="0.4909" k3="-0.4424"/>
++            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.2709" k2="0.4909" k3="-0.4424"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.2670" k2="0.2535" k3="-0.0952"/>
++            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.2670" k2="0.2535" k3="-0.0952"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F004</model>
++        <model lang="en">Tamron SP 90mm f/2.8 Di VC USD Macro 1:1</model>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1.6</cropfactor>
++        <calibration>
++            <!-- taken with Canon EOS 700D -->
++            <distortion model="poly3" focal="90" k1="-0.00085"/>
++            <tca model="poly3" focal="90" vr="1.0000890" vb="1.0000142"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7200 -->
++            <distortion model="ptlens" focal="18" a="0.02445" b="-0.07818" c="0.03054"/>
++            <distortion model="ptlens" focal="25" a="0.00579" b="-0.00644" c="-0.00982"/>
++            <distortion model="ptlens" focal="35" a="0.00865" b="-0.01285" c="0.0082"/>
++            <distortion model="ptlens" focal="50" a="0.00542" b="0.01072" c="-0.02489"/>
++            <distortion model="ptlens" focal="70" a="0.00396" b="-0.00473" c="0.02262"/>
++            <distortion model="ptlens" focal="100" a="-0.00576" b="0.03412" c="-0.0423"/>
++            <distortion model="ptlens" focal="140" a="0.00483" b="-0.01297" c="0.03075"/>
++            <distortion model="ptlens" focal="200" a="-0.00069" b="0.00867" c="-0.00672"/>
++            <distortion model="ptlens" focal="270" a="-0.00785" b="0.03486" c="-0.03572"/>
++            <tca model="poly3" focal="18" vr="1.0005251" vb="1.0000436"/>
++            <tca model="poly3" focal="25" vr="1.0002516" vb="0.9999854"/>
++            <tca model="poly3" focal="35" vr="1.0003318" vb="0.9999948"/>
++            <tca model="poly3" focal="50" vr="1.0001071" vb="0.9999909"/>
++            <tca model="poly3" focal="70" vr="1.0000046" vb="0.9999661"/>
++            <tca model="poly3" focal="100" vr="0.9999238" vb="0.9999483"/>
++            <tca model="poly3" focal="140" vr="0.9997563" vb="0.9997176"/>
++            <tca model="poly3" focal="200" vr="0.9999102" vb="0.9999149"/>
++            <tca model="poly3" focal="270" vr="0.9997811" vb="0.9998942"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron 200mm f/3.5 CT-200 BBAR</model>
++        <mount>Tamron Adaptall</mount>
++        <cropfactor>2</cropfactor>
++        <calibration>
++            <!-- Taken with Olympus E-PL7 -->
++            <distortion model="poly3" focal="200" k1="0.000003"/>
++            <tca model="poly3" focal="200" vr="0.9996500" vb="0.9999927"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tamron</maker>
++        <model>Tamron SP 15-30mm f/2.8 Di VC USD (A012)</model>
++        <model lang="en">Tamron SP 15-30mm f/2.8 Di VC USD</model>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D750 -->
++            <distortion model="ptlens" focal="15" a="0.00365" b="-0.0373" c="0.04147"/>
++            <distortion model="ptlens" focal="18" a="0.00298" b="-0.02252" c="0.03197"/>
++            <distortion model="ptlens" focal="20" a="0.00184" b="-0.00975" c="0.01751"/>
++            <distortion model="ptlens" focal="24" a="-0.00091" b="0.0071" c="0.00024"/>
++            <distortion model="ptlens" focal="30" a="0.00987" b="-0.02288" c="0.02592"/>
++            <tca model="poly3" focal="15" vr="1.0002123" vb="1.0000492"/>
++            <tca model="poly3" focal="18" vr="1.0001493" vb="1.0001207"/>
++            <tca model="poly3" focal="20" vr="1.0000941" vb="1.0001934"/>
++            <tca model="poly3" focal="24" vr="1.0000410" vb="1.0001929"/>
++            <tca model="poly3" focal="30" vr="1.0000710" vb="1.0000933"/>
++        </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-tokina.xml b/data/db/slr-tokina.xml
+--- a/data/db/slr-tokina.xml	2013-01-17 20:53:13.000000000 +0100
++++ b/data/db/slr-tokina.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,197 +1,358 @@
+ <lensdatabase>
+-
+     <lens>
++        <!-- Fixme: The versions I and II are optically equivalent.  At the
++             same time, exiv2 doesn't seem to be able to distinguish between
++             them (well, version II has ID 122 instead of 116), so I don't
++             create a second entry.  But once Lensfun has aliases, the II
++             version should be added as an alias. -->
+         <maker>Tokina</maker>
+-        <model>Tokina 11-16mm f/2.8 AT-X 116 AF PRO DX</model>
++        <model>Tokina 11-16mm f/2.8 AT-X 116 AF Pro DX</model>
++        <model lang="en">Tokina AF 11-16mm f/2.8 AT-X Pro DX</model>
++        <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+-        <cropfactor>1.0</cropfactor>
++        <mount>Sony Alpha</mount>
++        <aperture min="2.8" max="22"/>
++        <cropfactor>1</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="11" a="-0.024" b="-0.002" c="0.005" />
+-            <distortion model="ptlens" focal="12" a="0.000" b="-0.042" c="0.041" />
+-            <distortion model="ptlens" focal="13" a="-0.003" b="-0.023" c="0.018" />
+-            <distortion model="ptlens" focal="14" a="0.003" b="-0.033" c="0.033" />
+-            <distortion model="ptlens" focal="16" a="0.001" b="-0.023" c="0.021" />
++            <distortion model="ptlens" focal="11" a="-0.024" b="-0.002" c="0.005"/>
++            <distortion model="ptlens" focal="12" a="0.000" b="-0.042" c="0.041"/>
++            <distortion model="ptlens" focal="13" a="-0.003" b="-0.023" c="0.018"/>
++            <distortion model="ptlens" focal="14" a="0.003" b="-0.033" c="0.033"/>
++            <distortion model="ptlens" focal="16" a="0.001" b="-0.023" c="0.021"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- Fixme: The versions I and II are optically equivalent.  At the
++             same time, exiv2 doesn't seem to be able to distinguish between
++             them (well, version II has ID 122 instead of 116), so I don't
++             create a second entry.  But once Lensfun has aliases, the II
++             version should be added as an alias. -->
+         <maker>Tokina</maker>
+-        <model>Tokina AT-X Pro DX 11-16mm F2.8</model>
++        <model>Tokina 11-16mm f/2.8 AT-X 116 AF Pro DX</model>
++        <model lang="en">Tokina AF 11-16mm f/2.8 AT-X Pro DX</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Sony Alpha</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="11" a="-0.00574" b="-0.00115" c="0.0022" />
+-            <distortion model="ptlens" focal="12" a="-0.00494" b="-0.00187" c="0.00464" />
+-            <distortion model="ptlens" focal="13" a="-0.00597" b="0.00615" c="-0.0041" />
+-            <distortion model="ptlens" focal="14" a="-0.00852" b="0.01584" c="-0.01187" />
+-            <distortion model="ptlens" focal="15" a="-0.00318" b="-0.0002" c="0.00625" />
+-            <distortion model="ptlens" focal="16" a="-0.00972" b="0.0226" c="-0.01691" />
+-            <vignetting model="pa" focal="11" aperture="2.8" distance="10" k1="-0.0379" k2="-1.0821" k3="0.5311" />
+-            <vignetting model="pa" focal="11" aperture="2.8" distance="1000" k1="-0.0379" k2="-1.0821" k3="0.5311" />
+-            <vignetting model="pa" focal="11" aperture="3.5" distance="10" k1="-0.1331" k2="-0.1912" k3="-0.1581" />
+-            <vignetting model="pa" focal="11" aperture="3.5" distance="1000" k1="-0.1331" k2="-0.1912" k3="-0.1581" />
+-            <vignetting model="pa" focal="11" aperture="4.5" distance="10" k1="-0.2113" k2="0.0191" k3="-0.1865" />
+-            <vignetting model="pa" focal="11" aperture="4.5" distance="1000" k1="-0.2113" k2="0.0191" k3="-0.1865" />
+-            <vignetting model="pa" focal="11" aperture="5.6" distance="10" k1="-0.2007" k2="-0.1046" k3="-0.0229" />
+-            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.2007" k2="-0.1046" k3="-0.0229" />
+-            <vignetting model="pa" focal="11" aperture="7.1" distance="10" k1="-0.1672" k2="-0.2698" k3="0.1455" />
+-            <vignetting model="pa" focal="11" aperture="7.1" distance="1000" k1="-0.1672" k2="-0.2698" k3="0.1455" />
+-            <vignetting model="pa" focal="11" aperture="22" distance="10" k1="-0.2105" k2="-0.1988" k3="0.1335" />
+-            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.2105" k2="-0.1988" k3="0.1335" />
+-            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.1743" k2="-0.7147" k3="0.4041" />
+-            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.1743" k2="-0.7147" k3="0.4041" />
+-            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.1132" k2="-0.3528" k3="0.0961" />
+-            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.1132" k2="-0.3528" k3="0.0961" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.1374" k2="-0.3360" k3="0.2227" />
+-            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.1374" k2="-0.3360" k3="0.2227" />
+-            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1452" k2="-0.3187" k3="0.2177" />
+-            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1452" k2="-0.3187" k3="0.2177" />
+-            <vignetting model="pa" focal="12" aperture="7.1" distance="10" k1="-0.1536" k2="-0.2926" k3="0.2035" />
+-            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.1536" k2="-0.2926" k3="0.2035" />
+-            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.1984" k2="-0.2024" k3="0.1672" />
+-            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.1984" k2="-0.2024" k3="0.1672" />
+-            <vignetting model="pa" focal="13" aperture="2.8" distance="10" k1="-0.3366" k2="-0.3427" k3="0.2544" />
+-            <vignetting model="pa" focal="13" aperture="2.8" distance="1000" k1="-0.3366" k2="-0.3427" k3="0.2544" />
+-            <vignetting model="pa" focal="13" aperture="3.5" distance="10" k1="-0.0692" k2="-0.5208" k3="0.3049" />
+-            <vignetting model="pa" focal="13" aperture="3.5" distance="1000" k1="-0.0692" k2="-0.5208" k3="0.3049" />
+-            <vignetting model="pa" focal="13" aperture="4.5" distance="10" k1="-0.1239" k2="-0.3450" k3="0.2508" />
+-            <vignetting model="pa" focal="13" aperture="4.5" distance="1000" k1="-0.1239" k2="-0.3450" k3="0.2508" />
+-            <vignetting model="pa" focal="13" aperture="5.6" distance="10" k1="-0.1408" k2="-0.2910" k3="0.2162" />
+-            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-0.1408" k2="-0.2910" k3="0.2162" />
+-            <vignetting model="pa" focal="13" aperture="7.1" distance="10" k1="-0.1468" k2="-0.2659" k3="0.2002" />
+-            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.1468" k2="-0.2659" k3="0.2002" />
+-            <vignetting model="pa" focal="13" aperture="22" distance="10" k1="-0.1874" k2="-0.2040" k3="0.1839" />
+-            <vignetting model="pa" focal="13" aperture="22" distance="1000" k1="-0.1874" k2="-0.2040" k3="0.1839" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-0.4848" k2="-0.0258" k3="0.1050" />
+-            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-0.4848" k2="-0.0258" k3="0.1050" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.0747" k2="-0.6430" k3="0.4305" />
+-            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0747" k2="-0.6430" k3="0.4305" />
+-            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.1224" k2="-0.3113" k3="0.2312" />
+-            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.1224" k2="-0.3113" k3="0.2312" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2659" k3="0.2105" />
+-            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2659" k3="0.2105" />
+-            <vignetting model="pa" focal="14" aperture="7.1" distance="10" k1="-0.1566" k2="-0.2378" k3="0.1952" />
+-            <vignetting model="pa" focal="14" aperture="7.1" distance="1000" k1="-0.1566" k2="-0.2378" k3="0.1952" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.1747" k2="-0.2080" k3="0.1915" />
+-            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.1747" k2="-0.2080" k3="0.1915" />
+-            <vignetting model="pa" focal="15" aperture="2.8" distance="10" k1="-0.5189" k2="0.1125" k3="0.0317" />
+-            <vignetting model="pa" focal="15" aperture="2.8" distance="1000" k1="-0.5189" k2="0.1125" k3="0.0317" />
+-            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-0.1445" k2="-0.5302" k3="0.3909" />
+-            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-0.1445" k2="-0.5302" k3="0.3909" />
+-            <vignetting model="pa" focal="15" aperture="4.5" distance="10" k1="-0.1347" k2="-0.2554" k3="0.1935" />
+-            <vignetting model="pa" focal="15" aperture="4.5" distance="1000" k1="-0.1347" k2="-0.2554" k3="0.1935" />
+-            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2549" k3="0.2090" />
+-            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2549" k3="0.2090" />
+-            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.1645" k2="-0.2101" k3="0.1840" />
+-            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.1645" k2="-0.2101" k3="0.1840" />
+-            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.1766" k2="-0.2047" k3="0.1961" />
+-            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.1766" k2="-0.2047" k3="0.1961" />
+-            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5341" k2="0.1997" k3="-0.0140" />
+-            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5341" k2="0.1997" k3="-0.0140" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.3815" k2="-0.0743" k3="0.1491" />
+-            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.3815" k2="-0.0743" k3="0.1491" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.1299" k2="-0.2483" k3="0.1805" />
+-            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.1299" k2="-0.2483" k3="0.1805" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1361" k2="-0.2659" k3="0.2208" />
+-            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1361" k2="-0.2659" k3="0.2208" />
+-            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-0.1586" k2="-0.2196" k3="0.1951" />
+-            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-0.1586" k2="-0.2196" k3="0.1951" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.1690" k2="-0.2027" k3="0.1971" />
+-            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.1690" k2="-0.2027" k3="0.1971" />
++            <distortion model="ptlens" focal="11" a="-0.00574" b="-0.00115" c="0.0022"/>
++            <distortion model="ptlens" focal="12" a="-0.00494" b="-0.00187" c="0.00464"/>
++            <distortion model="ptlens" focal="13" a="-0.00597" b="0.00615" c="-0.0041"/>
++            <distortion model="ptlens" focal="14" a="-0.00852" b="0.01584" c="-0.01187"/>
++            <distortion model="ptlens" focal="15" a="-0.00318" b="-0.0002" c="0.00625"/>
++            <distortion model="ptlens" focal="16" a="-0.00972" b="0.0226" c="-0.01691"/>
++            <vignetting model="pa" focal="11" aperture="2.8" distance="10" k1="-0.0379" k2="-1.0821" k3="0.5311"/>
++            <vignetting model="pa" focal="11" aperture="2.8" distance="1000" k1="-0.0379" k2="-1.0821" k3="0.5311"/>
++            <vignetting model="pa" focal="11" aperture="3.5" distance="10" k1="-0.1331" k2="-0.1912" k3="-0.1581"/>
++            <vignetting model="pa" focal="11" aperture="3.5" distance="1000" k1="-0.1331" k2="-0.1912" k3="-0.1581"/>
++            <vignetting model="pa" focal="11" aperture="4.5" distance="10" k1="-0.2113" k2="0.0191" k3="-0.1865"/>
++            <vignetting model="pa" focal="11" aperture="4.5" distance="1000" k1="-0.2113" k2="0.0191" k3="-0.1865"/>
++            <vignetting model="pa" focal="11" aperture="5.6" distance="10" k1="-0.2007" k2="-0.1046" k3="-0.0229"/>
++            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.2007" k2="-0.1046" k3="-0.0229"/>
++            <vignetting model="pa" focal="11" aperture="7.1" distance="10" k1="-0.1672" k2="-0.2698" k3="0.1455"/>
++            <vignetting model="pa" focal="11" aperture="7.1" distance="1000" k1="-0.1672" k2="-0.2698" k3="0.1455"/>
++            <vignetting model="pa" focal="11" aperture="22" distance="10" k1="-0.2105" k2="-0.1988" k3="0.1335"/>
++            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.2105" k2="-0.1988" k3="0.1335"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.1743" k2="-0.7147" k3="0.4041"/>
++            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.1743" k2="-0.7147" k3="0.4041"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.1132" k2="-0.3528" k3="0.0961"/>
++            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.1132" k2="-0.3528" k3="0.0961"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.1374" k2="-0.3360" k3="0.2227"/>
++            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.1374" k2="-0.3360" k3="0.2227"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1452" k2="-0.3187" k3="0.2177"/>
++            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1452" k2="-0.3187" k3="0.2177"/>
++            <vignetting model="pa" focal="12" aperture="7.1" distance="10" k1="-0.1536" k2="-0.2926" k3="0.2035"/>
++            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.1536" k2="-0.2926" k3="0.2035"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.1984" k2="-0.2024" k3="0.1672"/>
++            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.1984" k2="-0.2024" k3="0.1672"/>
++            <vignetting model="pa" focal="13" aperture="2.8" distance="10" k1="-0.3366" k2="-0.3427" k3="0.2544"/>
++            <vignetting model="pa" focal="13" aperture="2.8" distance="1000" k1="-0.3366" k2="-0.3427" k3="0.2544"/>
++            <vignetting model="pa" focal="13" aperture="3.5" distance="10" k1="-0.0692" k2="-0.5208" k3="0.3049"/>
++            <vignetting model="pa" focal="13" aperture="3.5" distance="1000" k1="-0.0692" k2="-0.5208" k3="0.3049"/>
++            <vignetting model="pa" focal="13" aperture="4.5" distance="10" k1="-0.1239" k2="-0.3450" k3="0.2508"/>
++            <vignetting model="pa" focal="13" aperture="4.5" distance="1000" k1="-0.1239" k2="-0.3450" k3="0.2508"/>
++            <vignetting model="pa" focal="13" aperture="5.6" distance="10" k1="-0.1408" k2="-0.2910" k3="0.2162"/>
++            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-0.1408" k2="-0.2910" k3="0.2162"/>
++            <vignetting model="pa" focal="13" aperture="7.1" distance="10" k1="-0.1468" k2="-0.2659" k3="0.2002"/>
++            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.1468" k2="-0.2659" k3="0.2002"/>
++            <vignetting model="pa" focal="13" aperture="22" distance="10" k1="-0.1874" k2="-0.2040" k3="0.1839"/>
++            <vignetting model="pa" focal="13" aperture="22" distance="1000" k1="-0.1874" k2="-0.2040" k3="0.1839"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-0.4848" k2="-0.0258" k3="0.1050"/>
++            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-0.4848" k2="-0.0258" k3="0.1050"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.0747" k2="-0.6430" k3="0.4305"/>
++            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0747" k2="-0.6430" k3="0.4305"/>
++            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.1224" k2="-0.3113" k3="0.2312"/>
++            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.1224" k2="-0.3113" k3="0.2312"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2659" k3="0.2105"/>
++            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2659" k3="0.2105"/>
++            <vignetting model="pa" focal="14" aperture="7.1" distance="10" k1="-0.1566" k2="-0.2378" k3="0.1952"/>
++            <vignetting model="pa" focal="14" aperture="7.1" distance="1000" k1="-0.1566" k2="-0.2378" k3="0.1952"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.1747" k2="-0.2080" k3="0.1915"/>
++            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.1747" k2="-0.2080" k3="0.1915"/>
++            <vignetting model="pa" focal="15" aperture="2.8" distance="10" k1="-0.5189" k2="0.1125" k3="0.0317"/>
++            <vignetting model="pa" focal="15" aperture="2.8" distance="1000" k1="-0.5189" k2="0.1125" k3="0.0317"/>
++            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-0.1445" k2="-0.5302" k3="0.3909"/>
++            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-0.1445" k2="-0.5302" k3="0.3909"/>
++            <vignetting model="pa" focal="15" aperture="4.5" distance="10" k1="-0.1347" k2="-0.2554" k3="0.1935"/>
++            <vignetting model="pa" focal="15" aperture="4.5" distance="1000" k1="-0.1347" k2="-0.2554" k3="0.1935"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2549" k3="0.2090"/>
++            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2549" k3="0.2090"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.1645" k2="-0.2101" k3="0.1840"/>
++            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.1645" k2="-0.2101" k3="0.1840"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.1766" k2="-0.2047" k3="0.1961"/>
++            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.1766" k2="-0.2047" k3="0.1961"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5341" k2="0.1997" k3="-0.0140"/>
++            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5341" k2="0.1997" k3="-0.0140"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.3815" k2="-0.0743" k3="0.1491"/>
++            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.3815" k2="-0.0743" k3="0.1491"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.1299" k2="-0.2483" k3="0.1805"/>
++            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.1299" k2="-0.2483" k3="0.1805"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1361" k2="-0.2659" k3="0.2208"/>
++            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1361" k2="-0.2659" k3="0.2208"/>
++            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-0.1586" k2="-0.2196" k3="0.1951"/>
++            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-0.1586" k2="-0.2196" k3="0.1951"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.1690" k2="-0.2027" k3="0.1971"/>
++            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.1690" k2="-0.2027" k3="0.1971"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tokina</maker>
+-        <model>Tokina 12-24mm f/4 AT-X 124 AF PRO DX</model>
++        <model>Tokina 12-24mm f/4 AT-X 124 AF Pro DX</model>
++        <model lang="en">Tokina AF 12-24mm f/4 AT-X Pro DX</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="12" a="-0.005227" b="0.0018" c="0" />
+-            <distortion model="ptlens" focal="14" a="-0.003321" b="0.00043" c="0" />
+-            <distortion model="ptlens" focal="15" a="-0.002362" b="0.00112" c="0" />
+-            <distortion model="ptlens" focal="17" a="-0.001493" b="0.000502" c="0" />
+-            <distortion model="ptlens" focal="19" a="-0.000691" b="0.000121" c="0" />
+-            <distortion model="ptlens" focal="22" a="-0.000208" b="-0.000207" c="0" />
+-            <distortion model="ptlens" focal="24" a="0" b="0" c="0" />
++            <distortion model="ptlens" focal="12" a="-0.005227" b="0.0018" c="0"/>
++            <distortion model="ptlens" focal="14" a="-0.003321" b="0.00043" c="0"/>
++            <distortion model="ptlens" focal="15" a="-0.002362" b="0.00112" c="0"/>
++            <distortion model="ptlens" focal="17" a="-0.001493" b="0.000502" c="0"/>
++            <distortion model="ptlens" focal="19" a="-0.000691" b="0.000121" c="0"/>
++            <distortion model="ptlens" focal="22" a="-0.000208" b="-0.000207" c="0"/>
++            <distortion model="ptlens" focal="24" a="0" b="0" c="0"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tokina</maker>
+         <model>Tokina 19-35mm f/3.5-4.5 AF 193</model>
++        <model lang="en">Tokina AF 19-35mm f/3.5-4.5</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="19" a="0" b="-0.005476" c="-0.022162" />
+-            <distortion model="ptlens" focal="22" a="0" b="-0.003238" c="-0.017549" />
+-            <distortion model="ptlens" focal="24" a="0" b="-0.005132" c="-0.0082" />
+-            <distortion model="ptlens" focal="27" a="0" b="-0.004119" c="-0.006452" />
+-            <distortion model="ptlens" focal="29" a="0" b="-0.004177" c="-0.003541" />
+-            <distortion model="ptlens" focal="31" a="0" b="-0.002338" c="-0.006455" />
+-            <distortion model="ptlens" focal="33" a="0" b="-0.002642" c="-0.006101" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.000829" c="-0.007504" />
++            <distortion model="ptlens" focal="19" a="0" b="-0.005476" c="-0.022162"/>
++            <distortion model="ptlens" focal="22" a="0" b="-0.003238" c="-0.017549"/>
++            <distortion model="ptlens" focal="24" a="0" b="-0.005132" c="-0.0082"/>
++            <distortion model="ptlens" focal="27" a="0" b="-0.004119" c="-0.006452"/>
++            <distortion model="ptlens" focal="29" a="0" b="-0.004177" c="-0.003541"/>
++            <distortion model="ptlens" focal="31" a="0" b="-0.002338" c="-0.006455"/>
++            <distortion model="ptlens" focal="33" a="0" b="-0.002642" c="-0.006101"/>
++            <distortion model="ptlens" focal="35" a="0" b="-0.000829" c="-0.007504"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tokina</maker>
+-        <model>Tokina 28-70mm f/2.8 AT-X 287 PRO SV</model>
++        <model>Tokina 28-70mm f/2.8 AT-X 287 Pro SV</model>
++        <model lang="en">Tokina 28-70mm f/2.8 AT-X Pro SV</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="28" a="0" b="-0.006412" c="0" />
+-            <distortion model="ptlens" focal="30" a="0" b="-0.005104" c="0" />
+-            <distortion model="ptlens" focal="35" a="0" b="-0.00295" c="0" />
+-            <distortion model="ptlens" focal="42" a="0" b="0.000202" c="0" />
+-            <distortion model="ptlens" focal="56" a="0" b="0.002091" c="0" />
+-            <distortion model="ptlens" focal="70" a="0" b="0.003103" c="0" />
++            <distortion model="poly3" focal="28" k1="-0.006412"/>
++            <distortion model="poly3" focal="30" k1="-0.005104"/>
++            <distortion model="poly3" focal="35" k1="-0.00295"/>
++            <distortion model="poly3" focal="42" k1="0.000202"/>
++            <distortion model="poly3" focal="56" k1="0.002091"/>
++            <distortion model="poly3" focal="70" k1="0.003103"/>
+         </calibration>
+     </lens>
+-
+     <lens>
++        <!-- This is a pure manual lens with no EXIF footprint. -->
+         <maker>Tokina</maker>
+         <model>Tokina 80-200mm f/4.5-5.6 SZ-X</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
+         <mount>Pentax KAF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="80" a="-0.01761" b="0.06433" c="-0.07566" />
+-            <distortion model="ptlens" focal="110" a="-0.01579" b="0.05909" c="-0.06129" />
+-            <distortion model="ptlens" focal="200" a="-0.01328" b="0.04681" c="-0.03935" />
+-            <tca model="poly3" focal="80" br="0.0000351" vr="0.9998083" bb="-0.0000109" vb="0.9998991" />
+-            <tca model="poly3" focal="110" br="-0.0000155" vr="0.9999253" bb="-0.0000348" vb="0.9994977" />
+-            <tca model="poly3" focal="200" br="-0.0000075" vr="0.9993965" bb="-0.0000782" vb="0.9994524" />
++            <distortion model="ptlens" focal="80" a="-0.01761" b="0.06433" c="-0.07566"/>
++            <distortion model="ptlens" focal="110" a="-0.01579" b="0.05909" c="-0.06129"/>
++            <distortion model="ptlens" focal="200" a="-0.01328" b="0.04681" c="-0.03935"/>
++            <tca model="poly3" focal="80" br="0.0000351" vr="0.9998083" bb="-0.0000109" vb="0.9998991"/>
++            <tca model="poly3" focal="110" br="-0.0000155" vr="0.9999253" bb="-0.0000348" vb="0.9994977"/>
++            <tca model="poly3" focal="200" br="-0.0000075" vr="0.9993965" bb="-0.0000782" vb="0.9994524"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tokina</maker>
+-        <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
++        <model>Tokina 17mm f/3.5 AT-X 17 AF Pro</model>
++        <model lang="en">Tokina AF 17mm f/3.5 AT-X Pro</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
+         <cropfactor>1.5</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0" b="-0.012125" c="0" />
++            <distortion model="poly3" focal="17" k1="-0.012125"/>
+         </calibration>
+     </lens>
+-
+     <lens>
+         <maker>Tokina</maker>
+-        <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
++        <model>Tokina 17mm f/3.5 AT-X 17 AF Pro</model>
++        <model lang="en">Tokina AF 17mm f/3.5 AT-X Pro</model>
+         <mount>Canon EF</mount>
+         <mount>Nikon F AF</mount>
++        <!-- Average crop factor of Canon APS-C cameras -->
+         <cropfactor>1.6</cropfactor>
+         <calibration>
+-            <distortion model="ptlens" focal="17" a="0" b="-0.004083" c="-0.015672" />
++            <distortion model="ptlens" focal="17" a="0" b="-0.004083" c="-0.015672"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina 500mm f/8 RMC Mirror Lens</model>
++        <model lang="de">Tokina 500mm f/8 RMC Spiegelobjektiv</model>
++        <mount>Pentax K</mount>
++        <mount>Canon FD</mount>
++        <mount>Minolta M</mount>
++        <mount>Olympus OM</mount>
++        <mount>Nikon F AI</mount>
++        <focal value="500"/>
++        <aperture value="8"/>
++        <!-- Average crop factor of non-Canon APS-C cameras -->
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <tca model="poly3" focal="500" br="0.0000917" cr="-0.0001426" vr="0.9998064" bb="0.0002514" cb="-0.0004149" vb="0.9997489"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina AF 16-28mm f/2.8 AT-X Pro SD FX</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Canon 5D Mark III -->
++            <distortion model="poly3" focal="16" k1="-0.00888"/>
++            <distortion model="poly3" focal="18" k1="-0.00572"/>
++            <distortion model="poly3" focal="19" k1="-0.00426"/>
++            <distortion model="poly3" focal="21" k1="-0.00249"/>
++            <distortion model="poly3" focal="22" k1="-0.00113"/>
++            <distortion model="poly3" focal="25" k1="-0.00033"/>
++            <distortion model="poly3" focal="28" k1="0.00034"/>
++            <tca model="poly3" focal="16" br="0.0000409" vr="1.0000971" bb="0.0000302" vb="1.0000925"/>
++            <tca model="poly3" focal="18" br="0.0000510" vr="1.0000552" bb="-0.0000165" vb="1.0001691"/>
++            <tca model="poly3" focal="19" br="0.0000587" vr="1.0000284" bb="-0.0000346" vb="1.0001799"/>
++            <tca model="poly3" focal="21" br="0.0000502" vr="1.0000214" bb="-0.0000335" vb="1.0001829"/>
++            <tca model="poly3" focal="22" br="0.0000416" vr="1.0000146" bb="-0.0000435" vb="1.0002136"/>
++            <tca model="poly3" focal="25" br="0.0000520" vr="0.9999853" bb="-0.0000232" vb="1.0001969"/>
++            <tca model="poly3" focal="28" br="0.0000373" vr="0.9999960" bb="-0.0000421" vb="1.0002272"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina AF 12-28mm f/4 AT-X Pro DX</model>
++        <mount>Canon EF</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D5200 -->
++            <distortion model="ptlens" focal="12" a="-0.0155" b="0.02702" c="-0.01478"/>
++            <distortion model="ptlens" focal="16" a="-0.00587" b="0.01029" c="-0.00103"/>
++            <distortion model="ptlens" focal="20" a="-0.00615" b="0.01941" c="-0.01691"/>
++            <distortion model="ptlens" focal="28" a="0" b="0.00087" c="0"/>
++            <tca model="poly3" focal="12" br="0.0003226" vr="0.9997339" bb="-0.0002505" vb="1.0007854"/>
++            <tca model="poly3" focal="16" br="0.0002802" vr="0.9996491" bb="-0.0003635" vb="1.0011169"/>
++            <tca model="poly3" focal="20" br="0.0002331" vr="0.9996805" bb="-0.0002379" vb="1.0008884"/>
++            <tca model="poly3" focal="28" br="0.0001388" vr="0.9998978" bb="-0.0001242" vb="1.0005127"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina AT-X M100 100mm f/2.8 Pro D Macro AF</model>
++        <model lang="en">Tokina AF 100mm f/2.8 AT-X Pro D Macro</model>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7100 -->
++            <distortion model="poly3" focal="100" k1="0.00094"/>
++            <tca model="poly3" focal="100" vr="0.9998950" vb="0.9997397"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina AF 80-200mm f/2.8 AT-X 828 Pro</model>
++        <mount>Pentax KAF</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D610 -->
++            <distortion model="ptlens" focal="80" a="0.00084" b="-0.00992" c="0.00919"/>
++            <distortion model="ptlens" focal="100" a="0.00199" b="-0.00657" c="0.00742"/>
++            <distortion model="ptlens" focal="116" a="0.00629" b="-0.01689" c="0.01942"/>
++            <distortion model="ptlens" focal="135" a="0.00381" b="-0.00784" c="0.01505"/>
++            <distortion model="ptlens" focal="200" a="0.00471" b="-0.00806" c="0.02028"/>
++            <tca model="poly3" focal="80" vr="1.0001077" vb="0.9999569"/>
++            <tca model="poly3" focal="100" vr="1.0000161" vb="0.9999170"/>
++            <tca model="poly3" focal="116" vr="0.9999781" vb="0.9998856"/>
++            <tca model="poly3" focal="135" vr="0.9999332" vb="0.9998826"/>
++            <tca model="poly3" focal="200" vr="0.9998570" vb="0.9999823"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina AF 28-80mm f/2.8 AT-X 280 Pro</model>
++        <mount>Pentax KAF</mount>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D610 -->
++            <distortion model="ptlens" focal="28" a="0.01909" b="-0.06299" c="0.03342"/>
++            <distortion model="ptlens" focal="35" a="0.01371" b="-0.04183" c="0.03052"/>
++            <distortion model="ptlens" focal="40" a="0.01315" b="-0.03978" c="0.04334"/>
++            <distortion model="ptlens" focal="50" a="0.00739" b="-0.01269" c="0.01453"/>
++            <distortion model="ptlens" focal="62" a="0.00322" b="-0.00052" c="0.00963"/>
++            <distortion model="ptlens" focal="68" a="0.00235" b="0.00356" c="0.00562"/>
++            <distortion model="ptlens" focal="80" a="0.00884" b="-0.01771" c="0.02833"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Tokina</maker>
++        <model>Tokina AF 11-20mm f/2.8 AT-X Pro DX</model>
++        <mount>Nikon F AF</mount>
++        <mount>Canon EF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D7100 -->
++            <distortion model="ptlens" focal="11" a="0.0208245" b="-0.102661" c="0.119784"/>
++            <distortion model="ptlens" focal="12" a="0.0184073" b="-0.0959803" c="0.122961"/>
++            <distortion model="ptlens" focal="13" a="0.0105086" b="-0.0609049" c="0.0765821"/>
++            <distortion model="ptlens" focal="14" a="0.0136053" b="-0.0713775" c="0.0945721"/>
++            <distortion model="ptlens" focal="15" a="0.0117778" b="-0.0645345" c="0.0896602"/>
++            <distortion model="ptlens" focal="16" a="0.00946502" b="-0.0533771" c="0.0752513"/>
++            <distortion model="ptlens" focal="17" a="0.00429998" b="-0.0333455" c="0.0541844"/>
++            <distortion model="ptlens" focal="18" a="0.0113016" b="-0.0590116" c="0.085224"/>
++            <distortion model="ptlens" focal="19" a="0.012295" b="-0.0592084" c="0.08115"/>
++            <distortion model="ptlens" focal="20" a="0.00989974" b="-0.0490091" c="0.066505"/>
++            <tca model="poly3" focal="11" vr="0.9999717" vb="1.0006045"/>
++            <tca model="poly3" focal="12" vr="0.9999696" vb="1.0004258"/>
++            <tca model="poly3" focal="13" vr="0.9999683" vb="1.0003920"/>
++            <tca model="poly3" focal="14" vr="0.9999754" vb="1.0001797"/>
++            <tca model="poly3" focal="15" vr="0.9999905" vb="1.0002846"/>
++            <tca model="poly3" focal="16" vr="0.9999995" vb="1.0000997"/>
++            <tca model="poly3" focal="17" vr="1.0000301" vb="1.0001604"/>
++            <tca model="poly3" focal="18" vr="1.0000409" vb="1.0001612"/>
++            <tca model="poly3" focal="19" vr="1.0000531" vb="1.0001149"/>
++            <tca model="poly3" focal="20" vr="1.0000661" vb="1.0001206"/>
+         </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-ussr.xml b/data/db/slr-ussr.xml
+--- a/data/db/slr-ussr.xml	2007-11-04 00:41:29.000000000 +0100
++++ b/data/db/slr-ussr.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -1,85 +1,71 @@
+-<!--
+-    This file contains some of the cameras and lenses from:
+-    "Krasnogorsky zavod" JSC (http://www.zenit-foto.ru/english/index.htm)
+-    "Belarusian Optical and Mechanical Associtaion" (http://www.belomo.by/)
+--->
+ <lensdatabase>
+-
+     <camera>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>Zenit 122</model>
+         <model lang="ru">Зенит 122</model>
+         <mount>M42</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>Zenit 122K</model>
+         <model lang="ru">Зенит 122K</model>
+         <mount>Pentax K</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>Zenit 212K</model>
+         <model lang="ru">Зенит 212K</model>
+         <mount>Pentax K</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>Zenit 312K</model>
+         <model lang="ru">Зенит 312K</model>
+         <mount>Pentax K</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>Zenit 412LS</model>
+         <model lang="ru">Зенит 412LS</model>
+         <mount>M42</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <camera>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>Zenit KM</model>
+         <model lang="ru">Зенит KM</model>
+         <mount>Pentax K</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </camera>
+-
+     <lens>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>MC Mir-20M 3.5/20</model>
+         <model lang="ru">МС Мир-20М 3.5/20</model>
+         <mount>M42</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>MC Zenitar 2.8/16</model>
+         <model lang="ru">МС Зенитар 2.8/16</model>
+-        <type>fisheye</type>
+         <mount>M42</mount>
+         <mount>Pentax K</mount>
+         <mount>Nikon F</mount>
+-        <cropfactor>1.0</cropfactor>
++        <type>fisheye</type>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+@@ -87,38 +73,34 @@
+         <model lang="ru">МС Зенитар 2/50</model>
+         <mount>M42</mount>
+         <mount>Pentax K</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>MC APO Telezenitar 2.8/135</model>
+         <model lang="ru">МС АПО Телезенитар 2.8/135</model>
+         <mount>M42</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>MC APO Telezenitar 4.5/300</model>
+         <model lang="ru">МС АПО Телезенитар 4.5/300</model>
+         <mount>M42</mount>
+-        <cropfactor>1.0</cropfactor>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>KMZ</maker>
+         <maker lang="ru">КМЗ</maker>
+         <model>MC Variozenitar-K 2.8-3.5/25-45</model>
+         <model lang="ru">МС Вариозенитар-К 2.8-3.5/25-45</model>
+         <mount>M42</mount>
+-        <cropfactor>1.0</cropfactor>
+-        <aperture min="2.8" max="3.5" />
+-        <focal min="25" max="45" />
++        <focal min="25" max="45"/>
++        <aperture min="2.8"/>
++        <cropfactor>1</cropfactor>
+     </lens>
+-
+     <lens>
+         <maker>BelOMO</maker>
+         <maker lang="ru">БелОМО</maker>
+@@ -128,9 +110,79 @@
+         <mount>Pentax K</mount>
+         <mount>Nikon F</mount>
+         <mount>Canon EF</mount>
+-        <cropfactor>1.0</cropfactor>
+-        <aperture min="3.5" max="16" />
++        <aperture min="3.5" max="16"/>
+         <type>fisheye</type>
++        <cropfactor>1</cropfactor>
++    </lens>
++    <lens>
++        <maker>KMZ</maker>
++        <maker lang="ru">КМЗ</maker>
++        <model>MC MTO 11CA 10/1000</model>
++        <mount>M42</mount>
++        <focal value="1000"/>
++        <aperture value="10"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <distortion model="poly3" focal="1000" k1="0.00451"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>KMZ</maker>
++        <model>MC Helios-44M-4 58mm 1:2</model>
++        <mount>M42</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="poly3" focal="58" k1="0.00131"/>
++            <tca model="poly3" focal="58" vr="1.0000037" vb="0.9999377"/>
++            <vignetting model="pa" focal="58" aperture="2" distance="10" k1="-0.7541" k2="0.5658" k3="-0.2168"/>
++            <vignetting model="pa" focal="58" aperture="2" distance="1000" k1="-0.7541" k2="0.5658" k3="-0.2168"/>
++            <vignetting model="pa" focal="58" aperture="2.8" distance="10" k1="-0.1611" k2="0.0829" k3="-0.0613"/>
++            <vignetting model="pa" focal="58" aperture="2.8" distance="1000" k1="-0.1611" k2="0.0829" k3="-0.0613"/>
++            <vignetting model="pa" focal="58" aperture="4" distance="10" k1="-0.1624" k2="0.0504" k3="-0.0082"/>
++            <vignetting model="pa" focal="58" aperture="4" distance="1000" k1="-0.1624" k2="0.0504" k3="-0.0082"/>
++            <vignetting model="pa" focal="58" aperture="5.6" distance="10" k1="-0.1559" k2="0.0218" k3="0.0096"/>
++            <vignetting model="pa" focal="58" aperture="5.6" distance="1000" k1="-0.1559" k2="0.0218" k3="0.0096"/>
++            <vignetting model="pa" focal="58" aperture="8" distance="10" k1="-0.1870" k2="0.0627" k3="-0.0081"/>
++            <vignetting model="pa" focal="58" aperture="8" distance="1000" k1="-0.1870" k2="0.0627" k3="-0.0081"/>
++            <vignetting model="pa" focal="58" aperture="11" distance="10" k1="-0.2473" k2="0.1722" k3="-0.0667"/>
++            <vignetting model="pa" focal="58" aperture="11" distance="1000" k1="-0.2473" k2="0.1722" k3="-0.0667"/>
++            <vignetting model="pa" focal="58" aperture="16" distance="10" k1="-0.3149" k2="0.2956" k3="-0.1347"/>
++            <vignetting model="pa" focal="58" aperture="16" distance="1000" k1="-0.3149" k2="0.2956" k3="-0.1347"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>MTO</maker>
++        <model>MTO-500 500mm f/8 mirror lens</model>
++        <mount>M39/1</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Fujifilm X-M1 -->
++            <vignetting model="pa" focal="500" aperture="8" distance="10" k1="-1.0017" k2="1.0513" k3="-0.4818"/>
++            <vignetting model="pa" focal="500" aperture="8" distance="1000" k1="-1.0017" k2="1.0513" k3="-0.4818"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>KMZ</maker>
++        <model>MIR-1B 37mm f/2.8</model>
++        <mount>M42</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony SLT-A58 -->
++            <distortion model="ptlens" focal="37" a="0" b="-0.00255" c="0"/>
++            <tca model="poly3" focal="37" br="-0.0000478" vr="1.0001743" bb="0.0000122" vb="0.9999205"/>
++            <vignetting model="pa" focal="37" aperture="2.8" distance="10" k1="-0.8874" k2="0.7393" k3="-0.2944"/>
++            <vignetting model="pa" focal="37" aperture="2.8" distance="1000" k1="-0.8874" k2="0.7393" k3="-0.2944"/>
++            <vignetting model="pa" focal="37" aperture="4" distance="10" k1="-0.4144" k2="0.4004" k3="-0.2103"/>
++            <vignetting model="pa" focal="37" aperture="4" distance="1000" k1="-0.4144" k2="0.4004" k3="-0.2103"/>
++            <vignetting model="pa" focal="37" aperture="5.6" distance="10" k1="-0.4470" k2="0.4967" k3="-0.2583"/>
++            <vignetting model="pa" focal="37" aperture="5.6" distance="1000" k1="-0.4470" k2="0.4967" k3="-0.2583"/>
++            <vignetting model="pa" focal="37" aperture="8" distance="10" k1="-0.2922" k2="0.1496" k3="-0.0531"/>
++            <vignetting model="pa" focal="37" aperture="8" distance="1000" k1="-0.2922" k2="0.1496" k3="-0.0531"/>
++            <vignetting model="pa" focal="37" aperture="11" distance="10" k1="-0.3862" k2="0.2091" k3="-0.0361"/>
++            <vignetting model="pa" focal="37" aperture="11" distance="1000" k1="-0.3862" k2="0.2091" k3="-0.0361"/>
++            <vignetting model="pa" focal="37" aperture="16" distance="10" k1="-0.3301" k2="0.1592" k3="-0.0901"/>
++            <vignetting model="pa" focal="37" aperture="16" distance="1000" k1="-0.3301" k2="0.1592" k3="-0.0901"/>
++        </calibration>
+     </lens>
+-
+ </lensdatabase>
+diff -Nurpd a/data/db/slr-vivitar.xml b/data/db/slr-vivitar.xml
+--- a/data/db/slr-vivitar.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/slr-vivitar.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,48 @@
++<lensdatabase>
++    <lens>
++        <maker>Vivitar</maker>
++        <model>Vivitar 100mm f/3.5 AF Macro</model>
++        <mount>Canon EF</mount>
++        <mount>Sony Alpha</mount>
++        <mount>Nikon F AF</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony Alpha 55V -->
++            <distortion model="poly3" focal="100" k1="0.00072"/>
++            <!-- No measurable TCA -->
++            <tca model="poly3" focal="100"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- This lens is available in five variants, see
++             <http://www.robertstech.com/vivitar.htm>.  This web site suggests
++             that variants 4 and 5 are optically equivalent.  The other
++             versions must definitely be considered different from each
++             other. -->
++        <maker>Vivitar</maker>
++        <!-- FixMe: "One" should be "1" once
++             https://sourceforge.net/p/lensfun/bugs/35 is fixed. -->
++        <model>Vivitar Series One 70-210mm 1:3.5 SN 22...</model>
++        <model lang="en">Vivitar Series 1 70-210mm 1:3.5 SN 22…</model>
++        <mount>Nikon F</mount>
++        <mount>Pentax K</mount>
++        <mount>Canon FD</mount>
++        <mount>Canon FL</mount>
++        <mount>Olympus OM</mount>
++        <mount>M42</mount>
++        <focal min="70" max="210"/>
++        <aperture min="3.5" max="22"/>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Sony A6000 -->
++            <distortion model="poly3" focal="70" k1="-0.00183"/>
++            <distortion model="poly3" focal="85" k1="-0.00025"/>
++            <distortion model="poly3" focal="210" k1="0.00324"/>
++            <tca model="poly3" focal="70" vr="1.0001457" vb="0.9998911"/>
++            <tca model="poly3" focal="85" vr="1.0000626" vb="0.9999076"/>
++            <tca model="poly3" focal="135" vr="0.9998391" vb="0.9999724"/>
++            <tca model="poly3" focal="180" vr="0.9995820" vb="1.0000310"/>
++            <tca model="poly3" focal="210" vr="0.9994685" vb="1.0000417"/>
++        </calibration>
++    </lens>
++</lensdatabase>
+diff -Nurpd a/data/db/slr-zeiss.xml b/data/db/slr-zeiss.xml
+--- a/data/db/slr-zeiss.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/data/db/slr-zeiss.xml	2017-11-04 10:29:08.000000000 +0100
+@@ -0,0 +1,66 @@
++<lensdatabase>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>Carl Zeiss Distagon T* 2/35 ZF.2</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D3 -->
++            <distortion model="ptlens" focal="35" a="0.00786" b="-0.02862" c="0.01911"/>
++            <tca model="poly3" focal="35" vr="1.0001515" vb="1.0001430"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- Also update copy at "Carl Zeiss Distagon T* 2,8/21 ZE" below. -->
++        <maker>Zeiss</maker>
++        <model>Carl Zeiss Distagon T* 2,8/21 ZF.2</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D800E -->
++            <distortion model="ptlens" focal="21" a="0.03083" b="-0.0633" c="0.01093"/>
++            <tca model="linear" focal="21" kr="1.0001" kb="1.0001"/>
++        </calibration>
++    </lens>
++    <lens>
++        <!-- Also update copy at "Carl Zeiss Distagon T* 2,8/21 ZF.2" above. -->
++        <maker>Zeiss</maker>
++        <model>Carl Zeiss Distagon T* 2,8/21 ZE</model>
++        <mount>Canon EF</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <distortion model="ptlens" focal="21" a="0.03083" b="-0.0633" c="0.01093"/>
++            <tca model="linear" focal="21" kr="1.0001" kb="1.0001"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>Carl Zeiss Jena 1Q Biotar 1:2 f=58mm T</model>
++        <mount>M42</mount>
++        <cropfactor>1.5</cropfactor>
++        <calibration>
++            <!-- Taken with Pentax K20D -->
++            <distortion model="poly3" focal="58" k1="0.0017"/>
++            <tca model="poly3" focal="58" vr="0.9999881" vb="0.9999867"/>
++        </calibration>
++    </lens>
++    <lens>
++        <maker>Zeiss</maker>
++        <model>Zeiss Distagon T* 25mm f/2.8 ZF.2</model>
++        <mount>Nikon F AI-S</mount>
++        <cropfactor>1</cropfactor>
++        <calibration>
++            <!-- Taken with Nikon D810 -->
++            <vignetting model="pa" focal="25" aperture="2.8" distance="10" k1="-2.0722" k2="2.3741" k3="-1.0791"/>
++            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-2.0722" k2="2.3741" k3="-1.0791"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="10" k1="-0.4967" k2="-0.4770" k3="0.3717"/>
++            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.4967" k2="-0.4770" k3="0.3717"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.6803" k2="0.4196" k3="-0.1860"/>
++            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.6803" k2="0.4196" k3="-0.1860"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.6634" k2="0.3401" k3="-0.1020"/>
++            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.6634" k2="0.3401" k3="-0.1020"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.6497" k2="0.2995" k3="-0.0740"/>
++            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.6497" k2="0.2995" k3="-0.0740"/>
++        </calibration>
++    </lens>
++</lensdatabase>
diff -Nru lensfun-0.2.8/debian/patches/series lensfun-0.2.8/debian/patches/series
--- lensfun-0.2.8/debian/patches/series	2016-12-07 18:25:41.000000000 +0000
+++ lensfun-0.2.8/debian/patches/series	2017-12-04 18:30:10.000000000 +0000
@@ -1,2 +1,2 @@
 #build_docs.diff
-update_db_20161122.diff
+lens_db_20171104.diff
diff -Nru lensfun-0.2.8/debian/patches/update_db_20161122.diff lensfun-0.2.8/debian/patches/update_db_20161122.diff
--- lensfun-0.2.8/debian/patches/update_db_20161122.diff	2016-12-07 18:24:39.000000000 +0000
+++ lensfun-0.2.8/debian/patches/update_db_20161122.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,40366 +0,0 @@
-diff -Nurpd a/data/db/6x6.xml b/data/db/6x6.xml
---- a/data/db/6x6.xml	2007-12-12 21:49:44.000000000 +0100
-+++ b/data/db/6x6.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,90 +1,85 @@
- <lensdatabase>
--
-     <mount>
--        <name>rollei6x6</name>
-+        <name>Rollei 6x6</name>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
--        <name>mamiya645</name>
-+        <name>Mamiya 645</name>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>Mamiya 645</maker>
--        <model>All models</model>
--        <mount>mamiya645</mount>
--        <cropfactor>.577</cropfactor>
-+        <maker>Mamiya</maker>
-+        <model>Mamiya 645</model>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.577</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Mamiya</maker>
-+        <model>Mamiya ZD</model>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.721</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Phase One</maker>
-         <model>P 25</model>
--        <mount>mamiya645</mount>
--        <cropfactor>.577</cropfactor>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.577</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Rolleiflex</maker>
-         <model>2.8E</model>
--        <mount>rollei6x6</mount>
--        <cropfactor>.5</cropfactor>
-+        <mount>Rollei 6x6</mount>
-+        <cropfactor>0.510</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Schneider</maker>
-         <model>Schneider 28mm Digitar f/2.8</model>
--        <mount>mamiya645</mount>
--        <cropfactor>.577</cropfactor>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.577</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.027509" b="-0.054383" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.027509" b="-0.054383" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Mamiya</maker>
-         <model>Mamiya 35mm f/3.5</model>
--        <mount>mamiya645</mount>
--        <cropfactor>.577</cropfactor>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.577</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.025471" b="-0.05106" c="0" />
-+            <distortion model="ptlens" focal="35" a="0.025471" b="-0.05106" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Mamiya</maker>
-         <model>Mamiya 80mm f/2.8</model>
--        <mount>mamiya645</mount>
--        <cropfactor>.577</cropfactor>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.577</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="-0.008173" b="0.015478" c="0" />
-+            <distortion model="ptlens" focal="80" a="-0.008173" b="0.015478" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Mamiya</maker>
-         <model>Mamiya 55-110mm f/4.5</model>
--        <mount>mamiya645</mount>
--        <cropfactor>.577</cropfactor>
-+        <mount>Mamiya 645</mount>
-+        <cropfactor>0.577</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="55" a="-0.001633" b="-0.002243" c="0" />
--            <distortion model="ptlens" focal="65" a="-0.00477" b="0.008348" c="0" />
--            <distortion model="ptlens" focal="75" a="0" b="0.002136" c="0" />
--            <distortion model="ptlens" focal="83" a="-0.009877" b="0.021454" c="0" />
--            <distortion model="ptlens" focal="90" a="-0.007302" b="0.019618" c="0" />
--            <distortion model="ptlens" focal="100" a="-0.010183" b="0.025981" c="0" />
--            <distortion model="ptlens" focal="110" a="-0.012796" b="0.029683" c="0" />
-+            <distortion model="ptlens" focal="55" a="-0.001633" b="-0.002243" c="0"/>
-+            <distortion model="ptlens" focal="65" a="-0.00477" b="0.008348" c="0"/>
-+            <distortion model="ptlens" focal="75" a="0" b="0.002136" c="0"/>
-+            <distortion model="ptlens" focal="83" a="-0.009877" b="0.021454" c="0"/>
-+            <distortion model="ptlens" focal="90" a="-0.007302" b="0.019618" c="0"/>
-+            <distortion model="ptlens" focal="100" a="-0.010183" b="0.025981" c="0"/>
-+            <distortion model="ptlens" focal="110" a="-0.012796" b="0.029683" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Schneider</maker>
-         <model>Schneider 80mm Xenotar f/2.8</model>
--        <mount>rollei6x6</mount>
--        <cropfactor>.5</cropfactor>
-+        <mount>Rollei 6x6</mount>
-+        <cropfactor>0.510</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="0" b="-0.009721" c="0" />
-+            <distortion model="poly3" focal="80" k1="-0.009721"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/actioncams.xml b/data/db/actioncams.xml
---- a/data/db/actioncams.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/actioncams.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,138 @@
-+<lensdatabase>
-+    <camera>
-+        <maker>GoPro</maker>
-+        <model>HD2</model>
-+        <mount>goProHero</mount>
-+        <cropfactor>6.4</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>GoPro</maker>
-+        <model>Hero3+ black</model>
-+        <mount>goProHero3+</mount>
-+        <cropfactor>5.42</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>GoPro</maker>
-+        <model>HERO4 Silver</model>
-+        <mount>goProHero4</mount>
-+        <cropfactor>7.66</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>DJI</maker>
-+        <model>Phantom Vision FC200</model>
-+        <mount>dijPhantomVisionFC200</mount>
-+        <cropfactor>6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>DJI</maker>
-+        <model>Phantom 3 Pro FC300X</model>
-+        <mount>dijPhantom3ProFC300X</mount>
-+        <cropfactor>5.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <!-- This camera has been rebranded as Hama Action-Cam "Star-60",
-+             fantec BeastVision XHD and possibly others. -->
-+        <maker>AEE DV</maker>
-+        <maker lang="en">AEE</maker>
-+        <model>AEE DV</model>
-+        <model lang="en">AEE MagiCam SD19 &amp; compatibles</model>
-+        <mount>aeeDV</mount>
-+        <!-- The crop factor is only estimated from the 1/2.5" specs. -->
-+        <cropfactor>6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>GitUp</maker>
-+        <model>Git2</model>
-+        <mount>git2</mount>
-+        <cropfactor>5.57</cropfactor>
-+    </camera>
-+    <lens>
-+        <maker>GoPro</maker>
-+        <model>HD2 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>goProHero</mount>
-+        <type>fisheye</type>
-+        <cropfactor>6.4</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="2.5" a="-0.07664" b="0.21934" c="-0.10671"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>GoPro</maker>
-+        <model>GoPro Hero3+ black &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>goProHero3+</mount>
-+        <cropfactor>5.42</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="15" a="0.01049" b="0.01663" c="-0.40901"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>GoPro</maker>
-+        <model>HERO4</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>goProHero4</mount>
-+        <type>equisolid</type>
-+        <cropfactor>7.66</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="3" a="0.03183" b="-0.11592" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>DJI</maker>
-+        <model>Phantom Vision FC200 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>dijPhantomVisionFC200</mount>
-+        <type>equisolid</type>
-+        <cropfactor>6</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5" a="0.02707" b="-0.10021" c="-0.09787"/>
-+            <tca model="poly3" focal="5" vr="1.0002" vb="1.0007"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>AEE</maker>
-+        <model>AEE SD19 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>aeeDV</mount>
-+        <type>equisolid</type>
-+        <!-- The crop factor is only estimated from the 1/2.5" specs. -->
-+        <cropfactor>6</cropfactor>
-+        <calibration>
-+            <!-- Measured with 360° panorama -->
-+            <!--distortion model="ptlens" focal="5" a="0.0525" b="-0.1258" c="0.15228" real-focal="2.5" /-->
-+            <!-- Measured with a single image, assuming the same FOV as above -->
-+            <distortion model="ptlens" focal="5" a="0.05109" b="-0.12092" c="0.10955"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>DJI</maker>
-+        <model>Phantom 3 Pro</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>dijPhantom3ProFC300X</mount>
-+        <cropfactor>5.5</cropfactor>
-+        <calibration>
-+            <vignetting model="pa" focal="3.6" aperture="2.8" distance="10" k1="-0.9228" k2="0.5367" k3="-0.2985"/>
-+            <vignetting model="pa" focal="3.6" aperture="2.8" distance="1000" k1="-0.9228" k2="0.5367" k3="-0.2985"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>GitUp</maker>
-+        <model>Git2 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>git2</mount>
-+        <type>equisolid</type>
-+        <cropfactor>5.57</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="3" k1="0.01419"/>
-+            <tca model="poly3" focal="3" br="-0.0000201" vr="1.0001473" bb="-0.0001084" vb="1.0005537"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/compact-canon.xml b/data/db/compact-canon.xml
---- a/data/db/compact-canon.xml	2013-08-31 21:43:54.000000000 +0200
-+++ b/data/db/compact-canon.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,170 +1,4 @@
- <lensdatabase>
--
--    <mount>
--        <name>canonG3</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG2</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG7</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG9</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG10</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG11</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG12</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG1X</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonG15</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonA510</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonPro90</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonIxusI</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonIxusII</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonIxus400</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonS1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonS2</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonS5</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonA610</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonA70</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonS70</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonS30</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonPro1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonPro70</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonA80</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonSX1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonS90</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonSD200</name>
--        <compat>Generic</compat>
--    </mount>    
--    
--    <mount>
--        <name>canonSD500</name>
--        <compat>Generic</compat>
--    </mount>    
--
--    <mount>
--        <name>canonSD950</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonD2000C</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonA650IS</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>canonSX150IS</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot Pro1</model>
-@@ -172,7 +6,6 @@
-         <mount>canonPro1</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot Pro70</model>
-@@ -180,7 +13,6 @@
-         <mount>canonPro70</mount>
-         <cropfactor>5.47</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G6</model>
-@@ -188,7 +20,6 @@
-         <mount>canonG3</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G5</model>
-@@ -196,7 +27,6 @@
-         <mount>canonG3</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G3</model>
-@@ -204,7 +34,6 @@
-         <mount>canonG3</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G2</model>
-@@ -212,7 +41,6 @@
-         <mount>canonG2</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G1</model>
-@@ -220,7 +48,6 @@
-         <mount>canonG1</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G7</model>
-@@ -228,7 +55,27 @@
-         <mount>canonG7</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G7 X</model>
-+        <model lang="en">PowerShot G7 X (3:2)</model>
-+        <mount>canonG7X</mount>
-+        <cropfactor>2.72</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G7 X 4:3</model>
-+        <model lang="en">PowerShot G7 X (4:3)</model>
-+        <mount>canonG7X</mount>
-+        <cropfactor>2.94</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G7 X 16:9</model>
-+        <model lang="en">PowerShot G7 X (16:9)</model>
-+        <mount>canonG7X</mount>
-+        <cropfactor>2.85</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G9</model>
-@@ -236,7 +83,6 @@
-         <mount>canonG9</mount>
-         <cropfactor>4.605</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G10</model>
-@@ -244,7 +90,6 @@
-         <mount>canonG10</mount>
-         <cropfactor>4.605</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G11</model>
-@@ -252,7 +97,6 @@
-         <mount>canonG11</mount>
-         <cropfactor>4.554</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G12</model>
-@@ -260,15 +104,20 @@
-         <mount>canonG12</mount>
-         <cropfactor>4.63</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
--        <model>Canon PowerShot G1X</model>
--        <model lang="en">PowerShot G1X</model>
-+        <model>Canon PowerShot G1 X</model>
-+        <model lang="en">PowerShot G1 X</model>
-         <mount>canonG1X</mount>
-         <cropfactor>1.85</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G1 X Mark II</model>
-+        <model lang="en">PowerShot G1 X Mark II</model>
-+        <mount>canonG1X2</mount>
-+        <cropfactor>1.93</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot G15</model>
-@@ -276,7 +125,13 @@
-         <mount>canonG15</mount>
-         <cropfactor>4.65</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G16</model>
-+        <model lang="en">PowerShot G16</model>
-+        <mount>canonG16</mount>
-+        <cropfactor>4.67</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD550</model>
-@@ -284,15 +139,13 @@
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--        
--     <camera>
-+    <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD950 IS</model>
-         <model lang="en">PowerShot SD950 IS</model>
-         <mount>canonSD950</mount>
-         <cropfactor>4.7</cropfactor>
--    </camera>    
--
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 750</model>
-@@ -300,14 +153,12 @@
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>IXY Digital 700</model>
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD500</model>
-@@ -315,7 +166,6 @@
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 700</model>
-@@ -323,14 +173,12 @@
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>IXY Digital 600</model>
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD450</model>
-@@ -338,7 +186,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 55</model>
-@@ -346,7 +193,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD400</model>
-@@ -354,7 +200,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 55</model>
-@@ -362,7 +207,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 50</model>
-@@ -370,7 +214,13 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon DIGITAL IXUS 70</model>
-+        <model lang="en">IXUS 70</model>
-+        <mount>canonSD200</mount>
-+        <cropfactor>6.05</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD300</model>
-@@ -378,7 +228,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 50</model>
-@@ -386,7 +235,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 40</model>
-@@ -394,7 +242,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD200</model>
-@@ -402,7 +249,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 40</model>
-@@ -410,7 +256,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 30</model>
-@@ -418,7 +263,6 @@
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S200</model>
-@@ -426,7 +270,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS v2</model>
-@@ -434,7 +277,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 200a</model>
-@@ -442,7 +284,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD110</model>
-@@ -450,7 +291,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS II</model>
-@@ -458,7 +298,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 30</model>
-@@ -466,7 +305,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD100</model>
-@@ -474,7 +312,6 @@
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS i</model>
-@@ -482,7 +319,6 @@
-         <mount>canonIxusI</mount>
-         <cropfactor>6.144</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SD10</model>
-@@ -490,7 +326,6 @@
-         <mount>canonIxusI</mount>
-         <cropfactor>6.144</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S500</model>
-@@ -498,7 +333,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 500</model>
-@@ -506,7 +340,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 500</model>
-@@ -514,7 +347,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S410</model>
-@@ -522,7 +354,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 430</model>
-@@ -530,7 +361,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 450</model>
-@@ -538,7 +368,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S400</model>
-@@ -546,7 +375,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 400</model>
-@@ -554,7 +382,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon IXY DIGITAL 400</model>
-@@ -562,7 +389,6 @@
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S80</model>
-@@ -570,7 +396,6 @@
-         <mount>canonS70</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S70</model>
-@@ -578,7 +403,6 @@
-         <mount>canonS70</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S60</model>
-@@ -586,7 +410,6 @@
-         <mount>canonS70</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S50</model>
-@@ -594,7 +417,6 @@
-         <mount>canonS30</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S45</model>
-@@ -602,7 +424,6 @@
-         <mount>canonS30</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S40</model>
-@@ -610,7 +431,6 @@
-         <mount>canonS30</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S30</model>
-@@ -618,23 +438,20 @@
-         <mount>canonS30</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
--        <model>Canon PowerShot A620</model>
--        <model lang="en">PowerShot A620</model>
-+        <model>Canon PowerShot A610</model>
-+        <model lang="en">PowerShot A610</model>
-         <mount>canonA610</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
--        <model>Canon PowerShot A610</model>
--        <model lang="en">PowerShot A610</model>
-+        <model>Canon PowerShot A620</model>
-+        <model lang="en">PowerShot A620</model>
-         <mount>canonA610</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A520</model>
-@@ -642,7 +459,6 @@
-         <mount>canonA510</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A510</model>
-@@ -650,7 +466,6 @@
-         <mount>canonA510</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A95</model>
-@@ -658,7 +473,6 @@
-         <mount>canonA80</mount>
-         <cropfactor>4.85</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A80</model>
-@@ -666,7 +480,6 @@
-         <mount>canonA80</mount>
-         <cropfactor>4.85</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A85</model>
-@@ -674,7 +487,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A75</model>
-@@ -682,7 +494,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A70</model>
-@@ -690,7 +501,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A60</model>
-@@ -698,7 +508,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A40</model>
-@@ -706,7 +515,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A30</model>
-@@ -714,7 +522,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A20</model>
-@@ -722,7 +529,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A10</model>
-@@ -730,7 +536,6 @@
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S2 IS</model>
-@@ -738,7 +543,6 @@
-         <mount>canonS2</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S1 IS</model>
-@@ -746,7 +550,6 @@
-         <mount>canonS1</mount>
-         <cropfactor>6.56</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S5 IS</model>
-@@ -754,7 +557,6 @@
-         <mount>canonS5</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot Pro90 IS</model>
-@@ -762,39 +564,27 @@
-         <mount>canonPro90</mount>
-         <cropfactor>5.28</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon DIGITAL IXUS 80 IS</model>
--        <model lang="en">Canon DIGITAL IXUS 80 IS</model>
-+        <model lang="en">IXUS 80 IS</model>
-         <mount>canonIxus80IS</mount>
--        <cropfactor>6.1</cropfactor>
-+        <cropfactor>6.02</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SX1 IS</model>
--        <model lang="en">Canon PowerShot SX1 IS</model>
-+        <model lang="en">PowerShot SX1 IS</model>
-         <mount>canonSX1</mount>
-         <cropfactor>5.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot S90</model>
--        <model lang="en">Canon PowerShot S90</model>
-+        <model lang="en">PowerShot S90</model>
-         <mount>canonS90</mount>
--        <cropfactor>4.6</cropfactor>
--    </camera>
--
--    <camera>
--        <maker>Canon</maker>
--        <model>EOS D2000C</model>
--        <model lang="en">Canon EOS D2000C</model>
--        <mount>canonD2000C</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>4.67</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot A650 IS</model>
-@@ -802,7 +592,6 @@
-         <mount>canonA650IS</mount>
-         <cropfactor>4.67712</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon PowerShot SX150 IS</model>
-@@ -810,610 +599,2035 @@
-         <mount>canonSX150IS</mount>
-         <cropfactor>5.62</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX130 IS</model>
-+        <model lang="en">PowerShot SX130 IS</model>
-+        <mount>canonSX150IS</mount>
-+        <cropfactor>5.62</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX220 HS</model>
-+        <model lang="en">PowerShot SX220 HS</model>
-+        <mount>canonSX220HS</mount>
-+        <cropfactor>5.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX230 HS</model>
-+        <model lang="en">PowerShot SX230 HS</model>
-+        <mount>canonSX230HS</mount>
-+        <cropfactor>5.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A720 IS</model>
-+        <model lang="en">PowerShot A720 IS</model>
-+        <mount>canonA720IS</mount>
-+        <cropfactor>6.03</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S120</model>
-+        <model lang="en">PowerShot S120</model>
-+        <mount>canonS120</mount>
-+        <cropfactor>4.62</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A640</model>
-+        <model lang="en">PowerShot A640</model>
-+        <mount>canonA640</mount>
-+        <cropfactor>4.79</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX260 HS</model>
-+        <model lang="en">PowerShot SX260 HS</model>
-+        <mount>canonSX260HS</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon IXUS 220 HS</model>
-+        <model lang="en">IXUS 220 HS</model>
-+        <mount>canonIxus220HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S95</model>
-+        <model lang="en">PowerShot S95</model>
-+        <mount>canonS95</mount>
-+        <cropfactor>4.67</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S100</model>
-+        <model lang="en">PowerShot S100</model>
-+        <mount>canonS100</mount>
-+        <cropfactor>4.62</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A4000 IS</model>
-+        <model lang="en">PowerShot A4000 IS</model>
-+        <mount>canonA4000IS</mount>
-+        <cropfactor>5.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot ELPH 110 HS</model>
-+        <model lang="en">Powershot ELPH 110 HS</model>
-+        <mount>canonIxus125HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon IXUS 125 HS</model>
-+        <model lang="en">IXUS 125 HS</model>
-+        <mount>canonIxus125HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX510 HS</model>
-+        <model lang="en">PowerShot SX510 HS</model>
-+        <mount>canonSX510HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S110</model>
-+        <model lang="en">PowerShot S110</model>
-+        <mount>canonS110</mount>
-+        <cropfactor>4.62</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SD1100 IS</model>
-+        <model lang="en">PowerShot SD1100 IS</model>
-+        <mount>canonIxus80IS</mount>
-+        <cropfactor>6.02</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX160 IS</model>
-+        <model lang="en">PowerShot SX160 IS</model>
-+        <mount>canonSX160IS</mount>
-+        <cropfactor>5.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A495</model>
-+        <model lang="en">PowerShot A495</model>
-+        <mount>canonA495</mount>
-+        <cropfactor>5.39</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot Pro1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonPro1</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.188" a="0.01839" b="-0.04535" c="0" />
--            <distortion model="ptlens" focal="8.875" a="0.016286" b="-0.032262" c="0" />
--            <distortion model="ptlens" focal="10.125" a="0.005988" b="-0.010532" c="0" />
--            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="50.813" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="7.188" a="0.01839" b="-0.04535" c="0"/>
-+            <distortion model="ptlens" focal="8.875" a="0.016286" b="-0.032262" c="0"/>
-+            <distortion model="ptlens" focal="10.125" a="0.005988" b="-0.010532" c="0"/>
-+            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="50.813" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G3 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG3</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.188" a="0.013088" b="-0.036387" c="0" />
--            <distortion model="ptlens" focal="8" a="0.013092" b="-0.031149" c="0" />
--            <distortion model="ptlens" focal="9.094" a="0.009637" b="-0.019881" c="0" />
--            <distortion model="ptlens" focal="10.188" a="0.00983" b="-0.017385" c="0" />
--            <distortion model="ptlens" focal="11.188" a="0.005089" b="-0.006514" c="0" />
--            <distortion model="ptlens" focal="14.406" a="0.001788" b="0.00205" c="0" />
--            <distortion model="ptlens" focal="17.594" a="0.001189" b="0.002614" c="0" />
--            <distortion model="ptlens" focal="20.688" a="0.000468" b="0.003817" c="0" />
--            <distortion model="ptlens" focal="23" a="0.000298" b="0.00272" c="0" />
--            <distortion model="ptlens" focal="25.094" a="0.00274" b="-0.002048" c="0" />
--            <distortion model="ptlens" focal="28.813" a="-8.6e-05" b="0.005193" c="0" />
-+            <distortion model="ptlens" focal="7.188" a="0.013088" b="-0.036387" c="0"/>
-+            <distortion model="ptlens" focal="8" a="0.013092" b="-0.031149" c="0"/>
-+            <distortion model="ptlens" focal="9.094" a="0.009637" b="-0.019881" c="0"/>
-+            <distortion model="ptlens" focal="10.188" a="0.00983" b="-0.017385" c="0"/>
-+            <distortion model="ptlens" focal="11.188" a="0.005089" b="-0.006514" c="0"/>
-+            <distortion model="ptlens" focal="14.406" a="0.001788" b="0.00205" c="0"/>
-+            <distortion model="ptlens" focal="17.594" a="0.001189" b="0.002614" c="0"/>
-+            <distortion model="ptlens" focal="20.688" a="0.000468" b="0.003817" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.000298" b="0.00272" c="0"/>
-+            <distortion model="ptlens" focal="25.094" a="0.00274" b="-0.002048" c="0"/>
-+            <distortion model="ptlens" focal="28.813" a="-8.6e-05" b="0.005193" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>WC-DC58N</model>
-+        <model>Canon PowerShot G3 &amp; compatibles, with WC-DC58N</model>
-+        <model lang="en">fixed lens, with WC-DC58N</model>
-+        <model lang="de">festes Objektiv, mit WC-DC58N</model>
-         <mount>canonG3</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.19" a="0.016762" b="-0.065439" c="0" />
--            <distortion model="ptlens" focal="8" a="0.015048" b="-0.055117" c="0" />
--            <distortion model="ptlens" focal="9.09" a="0.013772" b="-0.045475" c="0" />
--            <distortion model="ptlens" focal="10.2" a="0.008903" b="-0.030862" c="0" />
-+            <distortion model="ptlens" focal="7.19" a="0.016762" b="-0.065439" c="0"/>
-+            <distortion model="ptlens" focal="8" a="0.015048" b="-0.055117" c="0"/>
-+            <distortion model="ptlens" focal="9.09" a="0.013772" b="-0.045475" c="0"/>
-+            <distortion model="ptlens" focal="10.2" a="0.008903" b="-0.030862" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G2 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG2</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.01966" b="-0.051543" c="0" />
--            <distortion model="ptlens" focal="7.5" a="0.01713" b="-0.044177" c="0" />
--            <distortion model="ptlens" focal="8.313" a="0.013359" b="-0.032611" c="0" />
--            <distortion model="ptlens" focal="9.313" a="0.00832" b="-0.020187" c="0" />
--            <distortion model="ptlens" focal="10.688" a="0.006918" b="-0.015168" c="0" />
--            <distortion model="ptlens" focal="12.5" a="0.002267" b="-0.005193" c="0" />
--            <distortion model="ptlens" focal="14.594" a="0.003567" b="-0.007044" c="0" />
--            <distortion model="ptlens" focal="16.813" a="0.000696" b="-0.001567" c="0" />
--            <distortion model="ptlens" focal="18.813" a="0.000325" b="-0.000456" c="0" />
--            <distortion model="ptlens" focal="20.313" a="0.0023" b="-0.003959" c="0" />
--            <distortion model="ptlens" focal="21" a="0.001324" b="-0.0012" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.01966" b="-0.051543" c="0"/>
-+            <distortion model="ptlens" focal="7.5" a="0.01713" b="-0.044177" c="0"/>
-+            <distortion model="ptlens" focal="8.313" a="0.013359" b="-0.032611" c="0"/>
-+            <distortion model="ptlens" focal="9.313" a="0.00832" b="-0.020187" c="0"/>
-+            <distortion model="ptlens" focal="10.688" a="0.006918" b="-0.015168" c="0"/>
-+            <distortion model="ptlens" focal="12.5" a="0.002267" b="-0.005193" c="0"/>
-+            <distortion model="ptlens" focal="14.594" a="0.003567" b="-0.007044" c="0"/>
-+            <distortion model="ptlens" focal="16.813" a="0.000696" b="-0.001567" c="0"/>
-+            <distortion model="ptlens" focal="18.813" a="0.000325" b="-0.000456" c="0"/>
-+            <distortion model="ptlens" focal="20.313" a="0.0023" b="-0.003959" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.001324" b="-0.0012" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Geobartic 0.5x Converter</model>
-+        <model>Canon PowerShot G2 &amp; compatibles, with Geobartic 0.5x converter</model>
-+        <model lang="en">fixed lens, with Geobartic 0.5x converter</model>
-+        <model lang="de">festes Objektiv, mit Geobartic 0.5x-Konverter</model>
-         <mount>canonG2</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0" b="-0.030599" c="-0.037374" />
--            <distortion model="ptlens" focal="7.5" a="0" b="-0.023359" c="-0.040861" />
--            <distortion model="ptlens" focal="8.313" a="0" b="-0.016976" c="-0.035516" />
--            <distortion model="ptlens" focal="10.688" a="0" b="-0.009919" c="-0.016346" />
--            <distortion model="ptlens" focal="12.5" a="0" b="-0.002436" c="-0.026822" />
-+            <distortion model="ptlens" focal="7" a="0" b="-0.030599" c="-0.037374"/>
-+            <distortion model="ptlens" focal="7.5" a="0" b="-0.023359" c="-0.040861"/>
-+            <distortion model="ptlens" focal="8.313" a="0" b="-0.016976" c="-0.035516"/>
-+            <distortion model="ptlens" focal="10.688" a="0" b="-0.009919" c="-0.016346"/>
-+            <distortion model="ptlens" focal="12.5" a="0" b="-0.002436" c="-0.026822"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG1</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.013759" b="-0.037638" c="0" />
--            <distortion model="ptlens" focal="9.344" a="0.006407" b="-0.013665" c="0" />
--            <distortion model="ptlens" focal="10.75" a="0" b="0.004427" c="-0.008376" />
--            <distortion model="ptlens" focal="12.5" a="0" b="0.001899" c="0" />
--            <distortion model="ptlens" focal="18.781" a="0" b="0.003174" c="0" />
--            <distortion model="ptlens" focal="21" a="0" b="0.003938" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.013759" b="-0.037638" c="0"/>
-+            <distortion model="ptlens" focal="9.344" a="0.006407" b="-0.013665" c="0"/>
-+            <distortion model="ptlens" focal="10.75" a="0" b="0.004427" c="-0.008376"/>
-+            <distortion model="ptlens" focal="12.5" a="0" b="0.001899" c="0"/>
-+            <distortion model="ptlens" focal="18.781" a="0" b="0.003174" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0" b="0.003938" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G12 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG12</mount>
-         <cropfactor>4.63</cropfactor>
-         <calibration>
--            <distortion model="poly5" focal="6.1" k1="-0.030571633" k2="0.004658548" />
--            <distortion model="poly5" focal="8.108" k1="-0.015375784" k2="0.001669650" />
--            <distortion model="poly5" focal="12.074" k1="-0.010041248" k2="-0.001118356" />
--            <distortion model="poly5" focal="18.098" k1="-0.002054377" k2="0.000011075" />
--            <distortion model="poly5" focal="30.5" k1="-0.000323237" k2="-0.000346917" />
--            <tca model="poly3" focal="6.1" br="-0.0002616" vr="1.0007448" bb="-0.0000455" vb="1.0003314" />
--            <tca model="poly3" focal="10.8" br="-0.0000003" vr="1.0004612" bb="0.0000253" vb="1.0001464" />
--            <tca model="poly3" focal="30.5" br="0.0000326" vr="0.9996400" bb="-0.0003242" vb="1.0008367" />
-+            <distortion model="poly5" focal="6.1" k1="-0.030571633" k2="0.004658548"/>
-+            <distortion model="poly5" focal="8.108" k1="-0.015375784" k2="0.001669650"/>
-+            <distortion model="poly5" focal="12.074" k1="-0.010041248" k2="-0.001118356"/>
-+            <distortion model="poly5" focal="18.098" k1="-0.002054377" k2="0.000011075"/>
-+            <distortion model="poly5" focal="30.5" k1="-0.000323237" k2="-0.000346917"/>
-+            <tca model="poly3" focal="6.1" br="-0.0002616" vr="1.0007448" bb="-0.0000455" vb="1.0003314"/>
-+            <tca model="poly3" focal="10.8" br="-0.0000003" vr="1.0004612" bb="0.0000253" vb="1.0001464"/>
-+            <tca model="poly3" focal="30.5" br="0.0000326" vr="0.9996400" bb="-0.0003242" vb="1.0008367"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G1X &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG1X</mount>
-         <cropfactor>1.85</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="15.1" a="0.02381" b="-0.08242" c="-0.01669" />
--            <distortion model="ptlens" focal="17.0" a="0.00081" b="-0.02913" c="-0.03657" />
--            <distortion model="ptlens" focal="19.56" a="0.01803" b="-0.06927" c="0.014" />
--            <distortion model="ptlens" focal="21.3" a="-0.001127" b="-0.001957" c="-0.005056" />
--            <distortion model="ptlens" focal="22.45" a="0.04317" b="-0.09935" c="0.03411" />
--            <distortion model="ptlens" focal="29.3" a="-0.01981" b="0.03978" c="-0.03657" />
--            <distortion model="ptlens" focal="31.92" a="-0.04093" b="0.10365" c="-0.08171" />
--            <distortion model="ptlens" focal="41.88" a="-0.01251" b="0.02732" c="-0.02112" />
--            <distortion model="ptlens" focal="51.33" a="-0.00187" b="-0.00664" c="0.01155" />
--            <distortion model="ptlens" focal="60.4" a="-0.00854" b="0.01168" c="-0.00657" />
--            <tca model="poly3" focal="15.1" br="-0.0001342" vr="1.0000807" bb="-0.0002196" vb="1.0003494" />
--            <tca model="poly3" focal="18.6" br="-0.0001530" vr="1.0002444" bb="0.0002246" vb="1.0000649" />
--            <tca model="poly3" focal="27.8" br="-0.0001638" vr="1.0003579" bb="-0.0000102" vb="1.0000196" />
--            <tca model="poly3" focal="39.1" br="-0.0001589" vr="1.0002615" bb="-0.0001130" vb="1.0000930" />
--            <tca model="poly3" focal="51.8" br="-0.0000189" vr="1.0000769" bb="-0.0002135" vb="1.0000094" />
--            <tca model="poly3" focal="60.4" br="0.0000465" vr="0.9998852" bb="-0.0002431" vb="0.9999720" />
-+            <distortion model="ptlens" focal="15.1" a="0.02381" b="-0.08242" c="-0.01669"/>
-+            <distortion model="ptlens" focal="17.0" a="0.00081" b="-0.02913" c="-0.03657"/>
-+            <distortion model="ptlens" focal="19.56" a="0.01803" b="-0.06927" c="0.014"/>
-+            <distortion model="ptlens" focal="21.3" a="-0.001127" b="-0.001957" c="-0.005056"/>
-+            <distortion model="ptlens" focal="22.45" a="0.04317" b="-0.09935" c="0.03411"/>
-+            <distortion model="ptlens" focal="29.3" a="-0.01981" b="0.03978" c="-0.03657"/>
-+            <distortion model="ptlens" focal="31.92" a="-0.04093" b="0.10365" c="-0.08171"/>
-+            <distortion model="ptlens" focal="41.88" a="-0.01251" b="0.02732" c="-0.02112"/>
-+            <distortion model="ptlens" focal="51.33" a="-0.00187" b="-0.00664" c="0.01155"/>
-+            <distortion model="ptlens" focal="60.4" a="-0.00854" b="0.01168" c="-0.00657"/>
-+            <tca model="poly3" focal="15.1" br="-0.0001342" vr="1.0000807" bb="-0.0002196" vb="1.0003494"/>
-+            <tca model="poly3" focal="18.6" br="-0.0001530" vr="1.0002444" bb="0.0002246" vb="1.0000649"/>
-+            <tca model="poly3" focal="27.8" br="-0.0001638" vr="1.0003579" bb="-0.0000102" vb="1.0000196"/>
-+            <tca model="poly3" focal="39.1" br="-0.0001589" vr="1.0002615" bb="-0.0001130" vb="1.0000930"/>
-+            <tca model="poly3" focal="51.8" br="-0.0000189" vr="1.0000769" bb="-0.0002135" vb="1.0000094"/>
-+            <tca model="poly3" focal="60.4" br="0.0000465" vr="0.9998852" bb="-0.0002431" vb="0.9999720"/>
-         </calibration>
-     </lens>
--
--   <lens>
-+    <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G15 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG15</mount>
-         <cropfactor>4.65</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.1" a="0.022578" b="-0.081031" c="0.011077" />
--            <distortion model="ptlens" focal="6.8" a="0.016019" b="-0.060546" c="0.008729" />
--            <distortion model="ptlens" focal="6.9" a="0.011908" b="-0.051294" c="0.003986" />
--            <distortion model="ptlens" focal="8.0" a="0.006519" b="-0.032045" c="0.003748" />
--            <distortion model="ptlens" focal="8.2" a="0.005826" b="-0.027978" c="0.001562" />
--            <distortion model="ptlens" focal="9.4" a="0.002976" b="-0.015660" c="0.000956" />
--            <distortion model="ptlens" focal="10.0" a="0.004576" b="-0.018882" c="0.006355" />
--            <distortion model="ptlens" focal="12.1" a="0.003211" b="-0.009651" c="0.004608" />
--            <distortion model="ptlens" focal="12.3" a="0.000000" b="-0.002265" c="0.000000" />
--            <distortion model="ptlens" focal="15.0" a="0.000553" b="-0.002150" c="0.002442" />
--            <distortion model="ptlens" focal="16.6" a="-0.000575" b="0.001992" c="-0.002180" />
--            <distortion model="ptlens" focal="19.7" a="-0.000420" b="0.001545" c="-0.001722" />
--            <distortion model="ptlens" focal="22.1" a="0.000308" b="-0.001009" c="0.000940" />
--            <distortion model="ptlens" focal="27.8" a="-0.000202" b="0.000728" c="-0.000847" />
--            <distortion model="ptlens" focal="30.5" a="0.000350" b="-0.001210" c="0.001200" />
-+            <distortion model="ptlens" focal="6.1" a="0.022578" b="-0.081031" c="0.011077"/>
-+            <distortion model="ptlens" focal="6.8" a="0.016019" b="-0.060546" c="0.008729"/>
-+            <distortion model="ptlens" focal="6.9" a="0.011908" b="-0.051294" c="0.003986"/>
-+            <distortion model="ptlens" focal="8.0" a="0.006519" b="-0.032045" c="0.003748"/>
-+            <distortion model="ptlens" focal="8.2" a="0.005826" b="-0.027978" c="0.001562"/>
-+            <distortion model="ptlens" focal="9.4" a="0.002976" b="-0.015660" c="0.000956"/>
-+            <distortion model="ptlens" focal="10.0" a="0.004576" b="-0.018882" c="0.006355"/>
-+            <distortion model="ptlens" focal="12.1" a="0.003211" b="-0.009651" c="0.004608"/>
-+            <distortion model="ptlens" focal="12.3" a="0.000000" b="-0.002265" c="0.000000"/>
-+            <distortion model="ptlens" focal="15.0" a="0.000553" b="-0.002150" c="0.002442"/>
-+            <distortion model="ptlens" focal="16.6" a="-0.000575" b="0.001992" c="-0.002180"/>
-+            <distortion model="ptlens" focal="19.7" a="-0.000420" b="0.001545" c="-0.001722"/>
-+            <distortion model="ptlens" focal="22.1" a="0.000308" b="-0.001009" c="0.000940"/>
-+            <distortion model="ptlens" focal="27.8" a="-0.000202" b="0.000728" c="-0.000847"/>
-+            <distortion model="ptlens" focal="30.5" a="0.000350" b="-0.001210" c="0.001200"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot SD500 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonSD500</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.7" a="0.006629" b="-0.024613" c="0" />
--            <distortion model="ptlens" focal="9.028" a="0.00359" b="-0.017262" c="0" />
--            <distortion model="ptlens" focal="10.487" a="0" b="-0.008536" c="0" />
--            <distortion model="ptlens" focal="12.523" a="0" b="-0.006646" c="0" />
--            <distortion model="ptlens" focal="15.599" a="0" b="-0.003511" c="0" />
--            <distortion model="ptlens" focal="18.776" a="0" b="-0.001002" c="0" />
--            <distortion model="ptlens" focal="23.1" a="0" b="0.000834" c="0" />
-+            <distortion model="ptlens" focal="7.7" a="0.006629" b="-0.024613" c="0"/>
-+            <distortion model="ptlens" focal="9.028" a="0.00359" b="-0.017262" c="0"/>
-+            <distortion model="ptlens" focal="10.487" a="0" b="-0.008536" c="0"/>
-+            <distortion model="ptlens" focal="12.523" a="0" b="-0.006646" c="0"/>
-+            <distortion model="ptlens" focal="15.599" a="0" b="-0.003511" c="0"/>
-+            <distortion model="ptlens" focal="18.776" a="0" b="-0.001002" c="0"/>
-+            <distortion model="ptlens" focal="23.1" a="0" b="0.000834" c="0"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot SD950 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonSD950</mount>
-         <cropfactor>4.7</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.7" a="0" b="-0.01427" c="0" />
--            <distortion model="ptlens" focal="11.45" a="0" b="-0.00828" c="0" />
--            <distortion model="ptlens" focal="13.68" a="0" b="-0.00693" c="0" />
--            <distortion model="ptlens" focal="19.55" a="0" b="-0.00304" c="0" />
--            <distortion model="ptlens" focal="28.5" a="0" b="-0.00073" c="0" />
-+            <distortion model="poly3" focal="7.7" k1="-0.01427"/>
-+            <distortion model="poly3" focal="11.45" k1="-0.00828"/>
-+            <distortion model="poly3" focal="13.68" k1="-0.00693"/>
-+            <distortion model="poly3" focal="19.55" k1="-0.00304"/>
-+            <distortion model="poly3" focal="28.5" k1="-0.00073"/>
-         </calibration>
--    </lens>    
--
-+    </lens>
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot SD200 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonSD200</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.009753" b="-0.025366" c="0" />
--            <distortion model="ptlens" focal="7.109" a="0" b="-0.008832" c="0" />
--            <distortion model="ptlens" focal="8.462" a="0" b="-0.007422" c="0" />
--            <distortion model="ptlens" focal="10.093" a="0" b="-0.006845" c="0" />
--            <distortion model="ptlens" focal="14.421" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0" b="0.001424" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.009753" b="-0.025366" c="0"/>
-+            <distortion model="ptlens" focal="7.109" a="0" b="-0.008832" c="0"/>
-+            <distortion model="ptlens" focal="8.462" a="0" b="-0.007422" c="0"/>
-+            <distortion model="ptlens" focal="10.093" a="0" b="-0.006845" c="0"/>
-+            <distortion model="ptlens" focal="14.421" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="0.001424" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon DIGITAL IXUS II &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonIxusII</mount>
-         <cropfactor>6.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.406" a="0" b="-0.009326" c="0" />
--            <distortion model="ptlens" focal="6.719" a="0" b="-0.005177" c="0" />
--            <distortion model="ptlens" focal="7.938" a="0" b="-0.005364" c="0" />
--            <distortion model="ptlens" focal="9.188" a="0" b="-0.004363" c="0" />
--            <distortion model="ptlens" focal="10.813" a="0" b="-0.003325" c="0" />
-+            <distortion model="poly3" focal="5.406" k1="-0.009326"/>
-+            <distortion model="poly3" focal="6.719" k1="-0.005177"/>
-+            <distortion model="poly3" focal="7.938" k1="-0.005364"/>
-+            <distortion model="poly3" focal="9.188" k1="-0.004363"/>
-+            <distortion model="poly3" focal="10.813" k1="-0.003325"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon DIGITAL IXUS i &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonIxusI</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.406" a="0" b="-0.007998" c="-0.009906" />
-+            <distortion model="ptlens" focal="6.406" a="0" b="-0.007998" c="-0.009906"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon DIGITAL IXUS 400 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.406" a="0.009324" b="-0.03174" c="0" />
--            <distortion model="ptlens" focal="9.094" a="0.00233" b="-0.016863" c="0" />
--            <distortion model="ptlens" focal="10.813" a="0.001054" b="-0.01068" c="0" />
--            <distortion model="ptlens" focal="12.875" a="-0.000662" b="-0.005582" c="0" />
--            <distortion model="ptlens" focal="15.438" a="-0.001583" b="-0.001308" c="0" />
--            <distortion model="ptlens" focal="18.344" a="-0.001857" b="-3.2e-05" c="0" />
--            <distortion model="ptlens" focal="22.219" a="0.00044" b="-0.003014" c="0" />
-+            <distortion model="ptlens" focal="7.406" a="0.009324" b="-0.03174" c="0"/>
-+            <distortion model="ptlens" focal="9.094" a="0.00233" b="-0.016863" c="0"/>
-+            <distortion model="ptlens" focal="10.813" a="0.001054" b="-0.01068" c="0"/>
-+            <distortion model="ptlens" focal="12.875" a="-0.000662" b="-0.005582" c="0"/>
-+            <distortion model="ptlens" focal="15.438" a="-0.001583" b="-0.001308" c="0"/>
-+            <distortion model="ptlens" focal="18.344" a="-0.001857" b="-3.2e-05" c="0"/>
-+            <distortion model="ptlens" focal="22.219" a="0.00044" b="-0.003014" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Tiffen MegaPlus 0.56 Converter</model>
-+        <model>Canon DIGITAL IXUS 400 &amp; compatibles, with Tiffen MegaPlus 0.56 converter</model>
-+        <model lang="en">fixed lens, with Tiffen MegaPlus 0.56 converter</model>
-+        <model lang="de">festes Objektiv, mit Tiffen MegaPlus 0.56-Konverter</model>
-         <mount>canonIxus400</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.406" a="0.020376" b="-0.071126" c="0" />
--            <distortion model="ptlens" focal="9.094" a="0.007209" b="-0.039397" c="0" />
--            <distortion model="ptlens" focal="10.813" a="0.011956" b="-0.043268" c="0" />
--            <distortion model="ptlens" focal="12.875" a="0.004586" b="-0.023343" c="0" />
--            <distortion model="ptlens" focal="15.438" a="-0.000285" b="-0.006557" c="0" />
--            <distortion model="ptlens" focal="18.344" a="-0.002035" b="-0.002635" c="0" />
--            <distortion model="ptlens" focal="22.219" a="0.005671" b="-0.017739" c="0" />
-+            <distortion model="ptlens" focal="7.406" a="0.020376" b="-0.071126" c="0"/>
-+            <distortion model="ptlens" focal="9.094" a="0.007209" b="-0.039397" c="0"/>
-+            <distortion model="ptlens" focal="10.813" a="0.011956" b="-0.043268" c="0"/>
-+            <distortion model="ptlens" focal="12.875" a="0.004586" b="-0.023343" c="0"/>
-+            <distortion model="ptlens" focal="15.438" a="-0.000285" b="-0.006557" c="0"/>
-+            <distortion model="ptlens" focal="18.344" a="-0.002035" b="-0.002635" c="0"/>
-+            <distortion model="ptlens" focal="22.219" a="0.005671" b="-0.017739" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot S70 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonS70</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.813" a="0.018497" b="-0.049501" c="0" />
--            <distortion model="ptlens" focal="7.281" a="0.009117" b="-0.029053" c="0" />
--            <distortion model="ptlens" focal="8.563" a="0.002901" b="-0.013311" c="0" />
--            <distortion model="ptlens" focal="9.906" a="0.001689" b="-0.008652" c="0" />
--            <distortion model="ptlens" focal="11.406" a="0" b="-0.00346" c="0" />
--            <distortion model="ptlens" focal="13.156" a="0" b="-0.001674" c="0" />
--            <distortion model="ptlens" focal="15.156" a="0" b="-0.001123" c="0" />
--            <distortion model="ptlens" focal="17.469" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="20.688" a="0" b="0.000898" c="0" />
-+            <distortion model="ptlens" focal="5.813" a="0.018497" b="-0.049501" c="0"/>
-+            <distortion model="ptlens" focal="7.281" a="0.009117" b="-0.029053" c="0"/>
-+            <distortion model="ptlens" focal="8.563" a="0.002901" b="-0.013311" c="0"/>
-+            <distortion model="ptlens" focal="9.906" a="0.001689" b="-0.008652" c="0"/>
-+            <distortion model="ptlens" focal="11.406" a="0" b="-0.00346" c="0"/>
-+            <distortion model="ptlens" focal="13.156" a="0" b="-0.001674" c="0"/>
-+            <distortion model="ptlens" focal="15.156" a="0" b="-0.001123" c="0"/>
-+            <distortion model="ptlens" focal="17.469" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="20.688" a="0" b="0.000898" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon TC-DC 10 2x Converter</model>
-+        <model>Canon PowerShot S70 &amp; compatibles, with TC-DC10 2x converter</model>
-+        <model lang="en">fixed lens, with TC-DC10 2× converter</model>
-+        <model lang="de">festes Objektiv, mit TC-DC10 2×-Konverter</model>
-         <mount>canonS70</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="13.156" a="0" b="0.002149" c="0" />
--            <distortion model="ptlens" focal="15.156" a="0" b="0.0023" c="0" />
--            <distortion model="ptlens" focal="17.469" a="0" b="0.002178" c="0" />
--            <distortion model="ptlens" focal="20.688" a="0" b="0.002601" c="0" />
-+            <distortion model="poly3" focal="13.156" k1="0.002149"/>
-+            <distortion model="poly3" focal="15.156" k1="0.0023"/>
-+            <distortion model="poly3" focal="17.469" k1="0.002178"/>
-+            <distortion model="poly3" focal="20.688" k1="0.002601"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot S30 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonS30</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.094" a="0.007715" b="-0.026731" c="0" />
--            <distortion model="ptlens" focal="8.625" a="0.002869" b="-0.017441" c="0" />
--            <distortion model="ptlens" focal="10.313" a="-0.002159" b="-0.005133" c="0" />
--            <distortion model="ptlens" focal="12.281" a="-0.000263" b="-0.008304" c="0" />
--            <distortion model="ptlens" focal="14.719" a="-0.000643" b="-0.004951" c="0" />
--            <distortion model="ptlens" focal="17.5" a="-0.000855" b="-0.00274" c="0" />
--            <distortion model="ptlens" focal="21.313" a="-0.001024" b="-0.001516" c="0" />
-+            <distortion model="ptlens" focal="7.094" a="0.007715" b="-0.026731" c="0"/>
-+            <distortion model="ptlens" focal="8.625" a="0.002869" b="-0.017441" c="0"/>
-+            <distortion model="ptlens" focal="10.313" a="-0.002159" b="-0.005133" c="0"/>
-+            <distortion model="ptlens" focal="12.281" a="-0.000263" b="-0.008304" c="0"/>
-+            <distortion model="ptlens" focal="14.719" a="-0.000643" b="-0.004951" c="0"/>
-+            <distortion model="ptlens" focal="17.5" a="-0.000855" b="-0.00274" c="0"/>
-+            <distortion model="ptlens" focal="21.313" a="-0.001024" b="-0.001516" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot A610 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonA610</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.3" a="0.013142" b="-0.038236" c="0" />
--            <distortion model="ptlens" focal="9.565" a="0.011837" b="-0.029698" c="0" />
--            <distortion model="ptlens" focal="12.565" a="0.003459" b="-0.005793" c="0" />
--            <distortion model="ptlens" focal="14.926" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="17.342" a="0" b="0.001577" c="0" />
--            <distortion model="ptlens" focal="21.709" a="0" b="0.001875" c="0" />
--            <distortion model="ptlens" focal="29.2" a="0" b="0.004818" c="0" />
-+            <distortion model="ptlens" focal="7.3" a="0.013142" b="-0.038236" c="0"/>
-+            <distortion model="ptlens" focal="9.565" a="0.011837" b="-0.029698" c="0"/>
-+            <distortion model="ptlens" focal="12.565" a="0.003459" b="-0.005793" c="0"/>
-+            <distortion model="ptlens" focal="14.926" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="17.342" a="0" b="0.001577" c="0"/>
-+            <distortion model="ptlens" focal="21.709" a="0" b="0.001875" c="0"/>
-+            <distortion model="ptlens" focal="29.2" a="0" b="0.004818" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot A610 &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonA610</mount>
-+        <cropfactor>4.8</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="7.3" a="0.006931" b="-0.02547" c="0.006226"/>
-+            <distortion model="ptlens" focal="8.5" a="0.007764" b="-0.02951" c="0.016444"/>
-+            <distortion model="ptlens" focal="9.6" a="0.007302" b="-0.023408" c="0.013186"/>
-+            <distortion model="ptlens" focal="10.8" a="-0.003107" b="0.009694" c="-0.011024"/>
-+            <distortion model="ptlens" focal="12.6" a="-0.003635" b="0.007541" c="-0.002584"/>
-+            <distortion model="ptlens" focal="14.9" a="-0.0013" b="0.002528" c="0"/>
-+            <distortion model="ptlens" focal="17.3" a="-0.001404" b="0.014591" c="-0.024707"/>
-+            <distortion model="ptlens" focal="21.7" a="0.000238" b="0.005374" c="-0.016188"/>
-+            <distortion model="ptlens" focal="29.2" a="-0.035658" b="0.101639" c="-0.087315"/>
-+            <tca model="poly3" focal="7.3" vr="1.0004523" vb="1.0001479"/>
-+            <tca model="poly3" focal="8.5" vr="1.0006219" vb="0.9999944"/>
-+            <tca model="poly3" focal="9.6" vr="1.0004274" vb="1.0000258"/>
-+            <tca model="poly3" focal="10.8" vr="1.0002813" vb="1.0001387"/>
-+            <tca model="poly3" focal="12.6" vr="1.0001260" vb="1.0001707"/>
-+            <tca model="poly3" focal="14.9" vr="1.0000493" vb="1.0002103"/>
-+            <tca model="poly3" focal="17.3" vr="0.9999945" vb="1.0002257"/>
-+            <tca model="poly3" focal="21.7" vr="1.0000291" vb="1.0001431"/>
-+            <tca model="poly3" focal="29.2" vr="1.0000026" vb="1.0000523"/>
-+            <vignetting model="pa" focal="7.3" aperture="2.8" distance="10" k1="-0.4086" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="7.3" aperture="2.8" distance="1000" k1="-0.4086" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="7.3" aperture="3.1" distance="10" k1="-0.4089" k2="1.5607" k3="-1.3926"/>
-+            <vignetting model="pa" focal="7.3" aperture="3.1" distance="1000" k1="-0.4089" k2="1.5607" k3="-1.3926"/>
-+            <vignetting model="pa" focal="7.3" aperture="3.5" distance="10" k1="-0.4089" k2="1.5606" k3="-1.3925"/>
-+            <vignetting model="pa" focal="7.3" aperture="3.5" distance="1000" k1="-0.4089" k2="1.5606" k3="-1.3925"/>
-+            <vignetting model="pa" focal="7.3" aperture="4" distance="10" k1="-0.4085" k2="1.5591" k3="-1.3911"/>
-+            <vignetting model="pa" focal="7.3" aperture="4" distance="1000" k1="-0.4085" k2="1.5591" k3="-1.3911"/>
-+            <vignetting model="pa" focal="7.3" aperture="4.4" distance="10" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
-+            <vignetting model="pa" focal="7.3" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
-+            <vignetting model="pa" focal="7.3" aperture="5" distance="10" k1="-0.4087" k2="1.5601" k3="-1.3920"/>
-+            <vignetting model="pa" focal="7.3" aperture="5" distance="1000" k1="-0.4087" k2="1.5601" k3="-1.3920"/>
-+            <vignetting model="pa" focal="7.3" aperture="5.6" distance="10" k1="-0.4088" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="7.3" aperture="5.6" distance="1000" k1="-0.4088" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="7.3" aperture="6.3" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
-+            <vignetting model="pa" focal="7.3" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
-+            <vignetting model="pa" focal="7.3" aperture="7.1" distance="10" k1="-0.4086" k2="1.5595" k3="-1.3915"/>
-+            <vignetting model="pa" focal="7.3" aperture="7.1" distance="1000" k1="-0.4086" k2="1.5595" k3="-1.3915"/>
-+            <vignetting model="pa" focal="7.3" aperture="8" distance="10" k1="-0.4087" k2="1.5600" k3="-1.3918"/>
-+            <vignetting model="pa" focal="7.3" aperture="8" distance="1000" k1="-0.4087" k2="1.5600" k3="-1.3918"/>
-+            <vignetting model="pa" focal="8.5" aperture="2.9" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
-+            <vignetting model="pa" focal="8.5" aperture="2.9" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.1" distance="10" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.1" distance="1000" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.5" distance="10" k1="-0.4087" k2="1.5598" k3="-1.3918"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.5" distance="1000" k1="-0.4087" k2="1.5598" k3="-1.3918"/>
-+            <vignetting model="pa" focal="8.5" aperture="4" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="8.5" aperture="4" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="8.5" aperture="4.4" distance="10" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="5" distance="10" k1="-0.4085" k2="1.5593" k3="-1.3912"/>
-+            <vignetting model="pa" focal="8.5" aperture="5" distance="1000" k1="-0.4085" k2="1.5593" k3="-1.3912"/>
-+            <vignetting model="pa" focal="8.5" aperture="5.6" distance="10" k1="-0.4086" k2="1.5598" k3="-1.3918"/>
-+            <vignetting model="pa" focal="8.5" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5598" k3="-1.3918"/>
-+            <vignetting model="pa" focal="8.5" aperture="6.3" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="8.5" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="8.5" aperture="7.1" distance="10" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="7.1" distance="1000" k1="-0.4088" k2="1.5603" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="8" distance="10" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="8.5" aperture="8" distance="1000" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="9.6" aperture="3" distance="10" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
-+            <vignetting model="pa" focal="9.6" aperture="3" distance="1000" k1="-0.4087" k2="1.5601" k3="-1.3921"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.1" distance="10" k1="-0.4085" k2="1.5593" k3="-1.3913"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.1" distance="1000" k1="-0.4085" k2="1.5593" k3="-1.3913"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.5" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.5" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="9.6" aperture="4" distance="10" k1="-0.4089" k2="1.5607" k3="-1.3925"/>
-+            <vignetting model="pa" focal="9.6" aperture="4" distance="1000" k1="-0.4089" k2="1.5607" k3="-1.3925"/>
-+            <vignetting model="pa" focal="9.6" aperture="4.4" distance="10" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="9.6" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5602" k3="-1.3921"/>
-+            <vignetting model="pa" focal="9.6" aperture="5" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3915"/>
-+            <vignetting model="pa" focal="9.6" aperture="5" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3915"/>
-+            <vignetting model="pa" focal="9.6" aperture="5.6" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
-+            <vignetting model="pa" focal="9.6" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
-+            <vignetting model="pa" focal="9.6" aperture="6.3" distance="10" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
-+            <vignetting model="pa" focal="9.6" aperture="6.3" distance="1000" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
-+            <vignetting model="pa" focal="9.6" aperture="7.1" distance="10" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
-+            <vignetting model="pa" focal="9.6" aperture="7.1" distance="1000" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
-+            <vignetting model="pa" focal="9.6" aperture="8" distance="10" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="9.6" aperture="8" distance="1000" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.1" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.1" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.5" distance="10" k1="-0.4083" k2="1.5587" k3="-1.3907"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.5" distance="1000" k1="-0.4083" k2="1.5587" k3="-1.3907"/>
-+            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.4087" k2="1.5600" k3="-1.3919"/>
-+            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.4087" k2="1.5600" k3="-1.3919"/>
-+            <vignetting model="pa" focal="10.8" aperture="4.4" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="10.8" aperture="4.4" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="10.8" aperture="5" distance="10" k1="-0.4085" k2="1.5595" k3="-1.3915"/>
-+            <vignetting model="pa" focal="10.8" aperture="5" distance="1000" k1="-0.4085" k2="1.5595" k3="-1.3915"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.6" distance="10" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
-+            <vignetting model="pa" focal="10.8" aperture="6.3" distance="10" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
-+            <vignetting model="pa" focal="10.8" aperture="6.3" distance="1000" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
-+            <vignetting model="pa" focal="10.8" aperture="7.1" distance="10" k1="-0.4084" k2="1.5589" k3="-1.3909"/>
-+            <vignetting model="pa" focal="10.8" aperture="7.1" distance="1000" k1="-0.4084" k2="1.5589" k3="-1.3909"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.4082" k2="1.5582" k3="-1.3903"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.4082" k2="1.5582" k3="-1.3903"/>
-+            <vignetting model="pa" focal="12.6" aperture="3.2" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="12.6" aperture="3.2" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="12.6" aperture="3.5" distance="10" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
-+            <vignetting model="pa" focal="12.6" aperture="3.5" distance="1000" k1="-0.4085" k2="1.5592" k3="-1.3911"/>
-+            <vignetting model="pa" focal="12.6" aperture="4" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="12.6" aperture="4" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="12.6" aperture="4.4" distance="10" k1="-0.4087" k2="1.5599" k3="-1.3919"/>
-+            <vignetting model="pa" focal="12.6" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5599" k3="-1.3919"/>
-+            <vignetting model="pa" focal="12.6" aperture="5" distance="10" k1="-0.4086" k2="1.5595" k3="-1.3914"/>
-+            <vignetting model="pa" focal="12.6" aperture="5" distance="1000" k1="-0.4086" k2="1.5595" k3="-1.3914"/>
-+            <vignetting model="pa" focal="12.6" aperture="5.6" distance="10" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
-+            <vignetting model="pa" focal="12.6" aperture="5.6" distance="1000" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
-+            <vignetting model="pa" focal="12.6" aperture="6.3" distance="10" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
-+            <vignetting model="pa" focal="12.6" aperture="6.3" distance="1000" k1="-0.4086" k2="1.5597" k3="-1.3917"/>
-+            <vignetting model="pa" focal="12.6" aperture="7.1" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
-+            <vignetting model="pa" focal="12.6" aperture="7.1" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3916"/>
-+            <vignetting model="pa" focal="12.6" aperture="8" distance="10" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
-+            <vignetting model="pa" focal="12.6" aperture="8" distance="1000" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.4" distance="10" k1="-0.4083" k2="1.5589" k3="-1.3909"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.4" distance="1000" k1="-0.4083" k2="1.5589" k3="-1.3909"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.5" distance="10" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.5" distance="1000" k1="-0.4084" k2="1.5590" k3="-1.3910"/>
-+            <vignetting model="pa" focal="14.9" aperture="4" distance="10" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
-+            <vignetting model="pa" focal="14.9" aperture="4" distance="1000" k1="-0.4083" k2="1.5588" k3="-1.3908"/>
-+            <vignetting model="pa" focal="14.9" aperture="4.4" distance="10" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
-+            <vignetting model="pa" focal="14.9" aperture="4.4" distance="1000" k1="-0.4084" k2="1.5591" k3="-1.3911"/>
-+            <vignetting model="pa" focal="14.9" aperture="5" distance="10" k1="-0.4084" k2="1.5591" k3="-1.3912"/>
-+            <vignetting model="pa" focal="14.9" aperture="5" distance="1000" k1="-0.4084" k2="1.5591" k3="-1.3912"/>
-+            <vignetting model="pa" focal="14.9" aperture="5.6" distance="10" k1="-0.4084" k2="1.5588" k3="-1.3909"/>
-+            <vignetting model="pa" focal="14.9" aperture="5.6" distance="1000" k1="-0.4084" k2="1.5588" k3="-1.3909"/>
-+            <vignetting model="pa" focal="14.9" aperture="6.3" distance="10" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="14.9" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5594" k3="-1.3914"/>
-+            <vignetting model="pa" focal="14.9" aperture="7.1" distance="10" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="14.9" aperture="7.1" distance="1000" k1="-0.4084" k2="1.5592" k3="-1.3912"/>
-+            <vignetting model="pa" focal="14.9" aperture="8" distance="10" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
-+            <vignetting model="pa" focal="14.9" aperture="8" distance="1000" k1="-0.4087" k2="1.5599" k3="-1.3918"/>
-+            <vignetting model="pa" focal="17.3" aperture="3.5" distance="10" k1="-0.4086" k2="1.5595" k3="-1.3913"/>
-+            <vignetting model="pa" focal="17.3" aperture="3.5" distance="1000" k1="-0.4086" k2="1.5595" k3="-1.3913"/>
-+            <vignetting model="pa" focal="17.3" aperture="4" distance="10" k1="-0.4087" k2="1.5600" k3="-1.3917"/>
-+            <vignetting model="pa" focal="17.3" aperture="4" distance="1000" k1="-0.4087" k2="1.5600" k3="-1.3917"/>
-+            <vignetting model="pa" focal="17.3" aperture="4.4" distance="10" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
-+            <vignetting model="pa" focal="17.3" aperture="4.4" distance="1000" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
-+            <vignetting model="pa" focal="17.3" aperture="5" distance="10" k1="-0.4089" k2="1.5602" k3="-1.3918"/>
-+            <vignetting model="pa" focal="17.3" aperture="5" distance="1000" k1="-0.4089" k2="1.5602" k3="-1.3918"/>
-+            <vignetting model="pa" focal="17.3" aperture="5.6" distance="10" k1="-0.4084" k2="1.5588" k3="-1.3907"/>
-+            <vignetting model="pa" focal="17.3" aperture="5.6" distance="1000" k1="-0.4084" k2="1.5588" k3="-1.3907"/>
-+            <vignetting model="pa" focal="17.3" aperture="6.3" distance="10" k1="-0.4085" k2="1.5590" k3="-1.3908"/>
-+            <vignetting model="pa" focal="17.3" aperture="6.3" distance="1000" k1="-0.4085" k2="1.5590" k3="-1.3908"/>
-+            <vignetting model="pa" focal="17.3" aperture="7.1" distance="10" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
-+            <vignetting model="pa" focal="17.3" aperture="7.1" distance="1000" k1="-0.4087" k2="1.5596" k3="-1.3914"/>
-+            <vignetting model="pa" focal="17.3" aperture="8" distance="10" k1="-0.4086" k2="1.5596" k3="-1.3913"/>
-+            <vignetting model="pa" focal="17.3" aperture="8" distance="1000" k1="-0.4086" k2="1.5596" k3="-1.3913"/>
-+            <vignetting model="pa" focal="21.7" aperture="3.8" distance="10" k1="-0.4089" k2="1.5591" k3="-1.3907"/>
-+            <vignetting model="pa" focal="21.7" aperture="3.8" distance="1000" k1="-0.4089" k2="1.5591" k3="-1.3907"/>
-+            <vignetting model="pa" focal="21.7" aperture="4" distance="10" k1="-0.4090" k2="1.5595" k3="-1.3911"/>
-+            <vignetting model="pa" focal="21.7" aperture="4" distance="1000" k1="-0.4090" k2="1.5595" k3="-1.3911"/>
-+            <vignetting model="pa" focal="21.7" aperture="4.4" distance="10" k1="-0.4085" k2="1.5582" k3="-1.3901"/>
-+            <vignetting model="pa" focal="21.7" aperture="4.4" distance="1000" k1="-0.4085" k2="1.5582" k3="-1.3901"/>
-+            <vignetting model="pa" focal="21.7" aperture="5" distance="10" k1="-0.4086" k2="1.5584" k3="-1.3902"/>
-+            <vignetting model="pa" focal="21.7" aperture="5" distance="1000" k1="-0.4086" k2="1.5584" k3="-1.3902"/>
-+            <vignetting model="pa" focal="21.7" aperture="5.6" distance="10" k1="-0.4086" k2="1.5585" k3="-1.3903"/>
-+            <vignetting model="pa" focal="21.7" aperture="5.6" distance="1000" k1="-0.4086" k2="1.5585" k3="-1.3903"/>
-+            <vignetting model="pa" focal="21.7" aperture="6.3" distance="10" k1="-0.4088" k2="1.5588" k3="-1.3905"/>
-+            <vignetting model="pa" focal="21.7" aperture="6.3" distance="1000" k1="-0.4088" k2="1.5588" k3="-1.3905"/>
-+            <vignetting model="pa" focal="21.7" aperture="7.1" distance="10" k1="-0.4089" k2="1.5591" k3="-1.3908"/>
-+            <vignetting model="pa" focal="21.7" aperture="7.1" distance="1000" k1="-0.4089" k2="1.5591" k3="-1.3908"/>
-+            <vignetting model="pa" focal="21.7" aperture="8" distance="10" k1="-0.4087" k2="1.5587" k3="-1.3905"/>
-+            <vignetting model="pa" focal="21.7" aperture="8" distance="1000" k1="-0.4087" k2="1.5587" k3="-1.3905"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.2" distance="10" k1="-0.4098" k2="1.5606" k3="-1.3914"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.2" distance="1000" k1="-0.4098" k2="1.5606" k3="-1.3914"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.4" distance="10" k1="-0.4099" k2="1.5607" k3="-1.3914"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.4" distance="1000" k1="-0.4099" k2="1.5607" k3="-1.3914"/>
-+            <vignetting model="pa" focal="29.2" aperture="5" distance="10" k1="-0.4099" k2="1.5613" k3="-1.3919"/>
-+            <vignetting model="pa" focal="29.2" aperture="5" distance="1000" k1="-0.4099" k2="1.5613" k3="-1.3919"/>
-+            <vignetting model="pa" focal="29.2" aperture="5.6" distance="10" k1="-0.4095" k2="1.5596" k3="-1.3906"/>
-+            <vignetting model="pa" focal="29.2" aperture="5.6" distance="1000" k1="-0.4095" k2="1.5596" k3="-1.3906"/>
-+            <vignetting model="pa" focal="29.2" aperture="6.3" distance="10" k1="-0.4096" k2="1.5602" k3="-1.3911"/>
-+            <vignetting model="pa" focal="29.2" aperture="6.3" distance="1000" k1="-0.4096" k2="1.5602" k3="-1.3911"/>
-+            <vignetting model="pa" focal="29.2" aperture="7.1" distance="10" k1="-0.4099" k2="1.5615" k3="-1.3922"/>
-+            <vignetting model="pa" focal="29.2" aperture="7.1" distance="1000" k1="-0.4099" k2="1.5615" k3="-1.3922"/>
-+            <vignetting model="pa" focal="29.2" aperture="8" distance="10" k1="-0.4094" k2="1.5597" k3="-1.3907"/>
-+            <vignetting model="pa" focal="29.2" aperture="8" distance="1000" k1="-0.4094" k2="1.5597" k3="-1.3907"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A510 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonA510</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.813" a="0.008099" b="-0.03097" c="0" />
--            <distortion model="ptlens" focal="7.813" a="0" b="-0.010876" c="0" />
--            <distortion model="ptlens" focal="9.813" a="0" b="-0.007821" c="0" />
--            <distortion model="ptlens" focal="11.813" a="0" b="-0.006082" c="0" />
--            <distortion model="ptlens" focal="13.813" a="0" b="-0.00366" c="0" />
--            <distortion model="ptlens" focal="16" a="0" b="-0.001945" c="0" />
--            <distortion model="ptlens" focal="18.688" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="23.188" a="0" b="0.001312" c="0" />
-+            <distortion model="ptlens" focal="5.813" a="0.008099" b="-0.03097" c="0"/>
-+            <distortion model="ptlens" focal="7.813" a="0" b="-0.010876" c="0"/>
-+            <distortion model="ptlens" focal="9.813" a="0" b="-0.007821" c="0"/>
-+            <distortion model="ptlens" focal="11.813" a="0" b="-0.006082" c="0"/>
-+            <distortion model="ptlens" focal="13.813" a="0" b="-0.00366" c="0"/>
-+            <distortion model="ptlens" focal="16" a="0" b="-0.001945" c="0"/>
-+            <distortion model="ptlens" focal="18.688" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="23.188" a="0" b="0.001312" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot A80 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonA80</mount>
-         <cropfactor>4.85</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.813" a="0.004902" b="-0.021392" c="0" />
--            <distortion model="ptlens" focal="9.625" a="0" b="-0.011" c="0" />
--            <distortion model="ptlens" focal="11.438" a="0" b="-0.008375" c="0" />
--            <distortion model="ptlens" focal="16.219" a="0" b="-0.004156" c="0" />
--            <distortion model="ptlens" focal="19.25" a="0" b="-0.002078" c="0" />
--            <distortion model="ptlens" focal="23.406" a="0" b="-0" c="0" />
-+            <distortion model="ptlens" focal="7.813" a="0.004902" b="-0.021392" c="0"/>
-+            <distortion model="ptlens" focal="9.625" a="0" b="-0.011" c="0"/>
-+            <distortion model="ptlens" focal="11.438" a="0" b="-0.008375" c="0"/>
-+            <distortion model="ptlens" focal="16.219" a="0" b="-0.004156" c="0"/>
-+            <distortion model="ptlens" focal="19.25" a="0" b="-0.002078" c="0"/>
-+            <distortion model="ptlens" focal="23.406" a="0" b="-0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Tiffen .56x converter</model>
-+        <model>Canon PowerShot A80 &amp; compatibles, with Tiffen .56x converter</model>
-+        <model lang="en">fixed lens, with Tiffen .56× converter</model>
-+        <model lang="de">festes Objektiv, mit Tiffen .56×-Konverter</model>
-         <mount>canonA80</mount>
-         <cropfactor>4.85</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.813" a="0.025867" b="-0.072267" c="0" />
--            <distortion model="ptlens" focal="9.625" a="0.012406" b="-0.044804" c="0" />
--            <distortion model="ptlens" focal="11.438" a="0.005944" b="-0.029328" c="0" />
--            <distortion model="ptlens" focal="13.594" a="0.005648" b="-0.024829" c="0" />
--            <distortion model="ptlens" focal="16.219" a="0" b="-0.010682" c="0" />
--            <distortion model="ptlens" focal="19.25" a="0" b="-0.006784" c="0" />
--            <distortion model="ptlens" focal="23.406" a="0" b="-0.004297" c="0" />
-+            <distortion model="ptlens" focal="7.813" a="0.025867" b="-0.072267" c="0"/>
-+            <distortion model="ptlens" focal="9.625" a="0.012406" b="-0.044804" c="0"/>
-+            <distortion model="ptlens" focal="11.438" a="0.005944" b="-0.029328" c="0"/>
-+            <distortion model="ptlens" focal="13.594" a="0.005648" b="-0.024829" c="0"/>
-+            <distortion model="ptlens" focal="16.219" a="0" b="-0.010682" c="0"/>
-+            <distortion model="ptlens" focal="19.25" a="0" b="-0.006784" c="0"/>
-+            <distortion model="ptlens" focal="23.406" a="0" b="-0.004297" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Tiffen 2x converter</model>
-+        <model>Canon PowerShot A80 &amp; compatibles, with Tiffen 2x converter</model>
-+        <model lang="en">fixed lens, with Tiffen 2× converter</model>
-+        <model lang="de">festes Objektiv, mit Tiffen 2×-Konverter</model>
-         <mount>canonA80</mount>
-         <cropfactor>4.85</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="11.438" a="0" b="0.010621" c="0" />
--            <distortion model="ptlens" focal="13.594" a="0" b="0.002913" c="0" />
--            <distortion model="ptlens" focal="16.219" a="0" b="0.000742" c="0" />
--            <distortion model="ptlens" focal="19.25" a="0" b="0.001395" c="0" />
--            <distortion model="ptlens" focal="23.406" a="0" b="0.001399" c="0" />
-+            <distortion model="poly3" focal="11.438" k1="0.010621"/>
-+            <distortion model="poly3" focal="13.594" k1="0.002913"/>
-+            <distortion model="poly3" focal="16.219" k1="0.000742"/>
-+            <distortion model="poly3" focal="19.25" k1="0.001395"/>
-+            <distortion model="poly3" focal="23.406" k1="0.001399"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot A70 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonA70</mount>
-         <cropfactor>6.500</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.406" a="0.007133" b="-0.026098" c="0" />
--            <distortion model="ptlens" focal="6.594" a="0.002986" b="-0.017472" c="0" />
--            <distortion model="ptlens" focal="7.844" a="0" b="-0.009721" c="0" />
--            <distortion model="ptlens" focal="9.406" a="0" b="-0.00769" c="0" />
--            <distortion model="ptlens" focal="11.313" a="0" b="-0.005908" c="0" />
--            <distortion model="ptlens" focal="13.438" a="0" b="-0.003555" c="0" />
--            <distortion model="ptlens" focal="16.219" a="0" b="-0.003735" c="0" />
-+            <distortion model="ptlens" focal="5.406" a="0.007133" b="-0.026098" c="0"/>
-+            <distortion model="ptlens" focal="6.594" a="0.002986" b="-0.017472" c="0"/>
-+            <distortion model="ptlens" focal="7.844" a="0" b="-0.009721" c="0"/>
-+            <distortion model="ptlens" focal="9.406" a="0" b="-0.00769" c="0"/>
-+            <distortion model="ptlens" focal="11.313" a="0" b="-0.005908" c="0"/>
-+            <distortion model="ptlens" focal="13.438" a="0" b="-0.003555" c="0"/>
-+            <distortion model="ptlens" focal="16.219" a="0" b="-0.003735" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot S2 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonS2</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0" />
--            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0" />
--            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0" />
--            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0" />
--            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0" />
--            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0" />
--            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0"/>
-+            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0"/>
-+            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0"/>
-+            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0"/>
-+            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0"/>
-+            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0"/>
-+            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>TC-DC58B</model>
-+        <model>Canon PowerShot S2 IS &amp; compatibles, with TC-DC58B</model>
-+        <model lang="en">fixed lens, with TC-DC58B</model>
-+        <model lang="de">festes Objektiv, mit TC-DC58B</model>
-         <mount>canonS2</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16.4" a="0" b="0.01755" c="0" />
--            <distortion model="ptlens" focal="20.7" a="0" b="0.01163" c="0" />
--            <distortion model="ptlens" focal="26.8" a="0" b="0.008009" c="0" />
--            <distortion model="ptlens" focal="34.3" a="0" b="0.005827" c="0" />
--            <distortion model="ptlens" focal="40.3" a="0" b="0.003938" c="0" />
--            <distortion model="ptlens" focal="51.8" a="0" b="0.003021" c="0" />
--            <distortion model="ptlens" focal="64.7" a="0" b="0.003778" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.003404" c="0" />
-+            <distortion model="poly3" focal="16.4" k1="0.01755"/>
-+            <distortion model="poly3" focal="20.7" k1="0.01163"/>
-+            <distortion model="poly3" focal="26.8" k1="0.008009"/>
-+            <distortion model="poly3" focal="34.3" k1="0.005827"/>
-+            <distortion model="poly3" focal="40.3" k1="0.003938"/>
-+            <distortion model="poly3" focal="51.8" k1="0.003021"/>
-+            <distortion model="poly3" focal="64.7" k1="0.003778"/>
-+            <distortion model="poly3" focal="72" k1="0.003404"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot S1 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonS1</mount>
-         <cropfactor>6.56</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.020538" b="-0.050896" c="0" />
--            <distortion model="ptlens" focal="7.334" a="0.012341" b="-0.02551" c="0" />
--            <distortion model="ptlens" focal="10.492" a="0.018784" b="-0.035873" c="0" />
--            <distortion model="ptlens" focal="12.5" a="0" b="0.003562" c="0" />
--            <distortion model="ptlens" focal="58" a="0" b="0.003236" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.020538" b="-0.050896" c="0"/>
-+            <distortion model="ptlens" focal="7.334" a="0.012341" b="-0.02551" c="0"/>
-+            <distortion model="ptlens" focal="10.492" a="0.018784" b="-0.035873" c="0"/>
-+            <distortion model="ptlens" focal="12.5" a="0" b="0.003562" c="0"/>
-+            <distortion model="ptlens" focal="58" a="0" b="0.003236" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot Pro90 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonPro90</mount>
-         <cropfactor>5.28</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.014317" b="-0.036991" c="0" />
--            <distortion model="ptlens" focal="8.7" a="0.007393" b="-0.012077" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="0.007132" c="0" />
--            <distortion model="ptlens" focal="12.6" a="0" b="0.00894" c="0" />
--            <distortion model="ptlens" focal="14.8" a="0" b="0.006866" c="0" />
--            <distortion model="ptlens" focal="18.7" a="0" b="0.004872" c="0" />
--            <distortion model="ptlens" focal="22.9" a="0" b="0.003074" c="0" />
--            <distortion model="ptlens" focal="50.5" a="0" b="0.000264" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.014317" b="-0.036991" c="0"/>
-+            <distortion model="ptlens" focal="8.7" a="0.007393" b="-0.012077" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0" b="0.007132" c="0"/>
-+            <distortion model="ptlens" focal="12.6" a="0" b="0.00894" c="0"/>
-+            <distortion model="ptlens" focal="14.8" a="0" b="0.006866" c="0"/>
-+            <distortion model="ptlens" focal="18.7" a="0" b="0.004872" c="0"/>
-+            <distortion model="ptlens" focal="22.9" a="0" b="0.003074" c="0"/>
-+            <distortion model="ptlens" focal="50.5" a="0" b="0.000264" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot S5 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonS5</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0" />
--            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0" />
--            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0" />
--            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0" />
--            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0" />
--            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0" />
--            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0"/>
-+            <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0"/>
-+            <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0"/>
-+            <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0"/>
-+            <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0"/>
-+            <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0"/>
-+            <distortion model="ptlens" focal="46.3" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>TC-DC58B</model>
-+        <model>Canon PowerShot S5 IS &amp; compatibles, with TC-DC58B</model>
-+        <model lang="en">fixed lens, with TC-DC58B</model>
-+        <model lang="de">festes Objektiv, mit TC-DC58B</model>
-         <mount>canonS5</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16.4" a="0" b="0.01755" c="0" />
--            <distortion model="ptlens" focal="20.7" a="0" b="0.01163" c="0" />
--            <distortion model="ptlens" focal="26.8" a="0" b="0.008009" c="0" />
--            <distortion model="ptlens" focal="34.3" a="0" b="0.005827" c="0" />
--            <distortion model="ptlens" focal="40.3" a="0" b="0.003938" c="0" />
--            <distortion model="ptlens" focal="51.8" a="0" b="0.003021" c="0" />
--            <distortion model="ptlens" focal="64.7" a="0" b="0.003778" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.003404" c="0" />
-+            <distortion model="poly3" focal="16.4" k1="0.01755"/>
-+            <distortion model="poly3" focal="20.7" k1="0.01163"/>
-+            <distortion model="poly3" focal="26.8" k1="0.008009"/>
-+            <distortion model="poly3" focal="34.3" k1="0.005827"/>
-+            <distortion model="poly3" focal="40.3" k1="0.003938"/>
-+            <distortion model="poly3" focal="51.8" k1="0.003021"/>
-+            <distortion model="poly3" focal="64.7" k1="0.003778"/>
-+            <distortion model="poly3" focal="72" k1="0.003404"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon DIGITAL IXUS 80 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonIxus80IS</mount>
--        <cropfactor>5.9</cropfactor>
-+        <cropfactor>6.02</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.2" a="-0.032" b="0.125" c="-0.188" />
--            <distortion model="ptlens" focal="7.2" a="0.047" b="-0.154" c="0.140" />
--            <distortion model="ptlens" focal="8.3" a="-0.340" b="1.135" c="-1.264" />
--            <distortion model="ptlens" focal="9.7" a="0.025" b="-0.087" c="0.085" />
--            <distortion model="ptlens" focal="11.6" a="0.099" b="-0.302" c="0.288" />
--            <distortion model="ptlens" focal="18.6" a="0.054" b="-0.169" c="0.179" />
-+            <distortion model="ptlens" focal="6.2" a="0.01576" b="-0.05512" c="0.01877"/>
-+            <distortion model="ptlens" focal="7.2" a="0.01258" b="-0.04518" c="0.01608"/>
-+            <distortion model="ptlens" focal="8.3" a="0.00121" b="-0.01475" c="-0.0003"/>
-+            <distortion model="ptlens" focal="9.7" a="-0.00339" b="0.00445" c="-0.0226"/>
-+            <distortion model="ptlens" focal="11.6" a="-0.00224" b="0.00479" c="-0.01497"/>
-+            <distortion model="ptlens" focal="14.3" a="0.00113" b="-0.00504" c="-0.0008"/>
-+            <distortion model="ptlens" focal="18.6" a="0.00169" b="-0.00608" c="0.00632"/>
-+            <tca model="poly3" focal="6.2" br="0.00011134" vr="0.99992608" bb="-0.00032684" vb="1.00078204"/>
-+            <tca model="poly3" focal="7.2" br="9.438e-05" vr="0.99995248" bb="-0.00024726" vb="1.00060098"/>
-+            <tca model="poly3" focal="8.3" br="6.66666666667e-05" vr="1.0000135" bb="-0.000196133333333" vb="1.00046133333"/>
-+            <tca model="poly3" focal="9.7" br="5.34333333333e-05" vr="1.00004393333" bb="-0.0001843" vb="1.00042996667"/>
-+            <tca model="poly3" focal="11.6" br="4.09333333333e-05" vr="1.00009023333" bb="-0.000115333333333" vb="1.00028556667"/>
-+            <tca model="poly3" focal="14.3" br="-9.9e-06" vr="1.0001817" bb="-7.975e-05" vb="1.00016265"/>
-+            <tca model="poly3" focal="18.6" br="-5.495e-05" vr="1.0003695" bb="4.15e-06" vb="0.99987525"/>
-+            <vignetting model="pa" focal="6.2" aperture="2.8" distance="10" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
-+            <vignetting model="pa" focal="6.2" aperture="2.8" distance="1000" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
-+            <vignetting model="pa" focal="6.2" aperture="8" distance="10" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
-+            <vignetting model="pa" focal="6.2" aperture="8" distance="1000" k1="-0.4093" k2="0.2020" k3="-0.1845"/>
-+            <vignetting model="pa" focal="7.2" aperture="3" distance="10" k1="-0.3531" k2="0.0549" k3="0.0001"/>
-+            <vignetting model="pa" focal="7.2" aperture="3" distance="1000" k1="-0.3531" k2="0.0549" k3="0.0001"/>
-+            <vignetting model="pa" focal="7.2" aperture="9" distance="10" k1="-0.3531" k2="0.0549" k3="0.0001"/>
-+            <vignetting model="pa" focal="7.2" aperture="9" distance="1000" k1="-0.3531" k2="0.0549" k3="0.0001"/>
-+            <vignetting model="pa" focal="8.3" aperture="3.2" distance="10" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
-+            <vignetting model="pa" focal="8.3" aperture="3.2" distance="1000" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
-+            <vignetting model="pa" focal="8.3" aperture="9" distance="10" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
-+            <vignetting model="pa" focal="8.3" aperture="9" distance="1000" k1="-0.3337" k2="0.0889" k3="-0.0116"/>
-+            <vignetting model="pa" focal="9.7" aperture="3.5" distance="10" k1="-0.2591" k2="0.0305" k3="0.0157"/>
-+            <vignetting model="pa" focal="9.7" aperture="3.5" distance="1000" k1="-0.2591" k2="0.0305" k3="0.0157"/>
-+            <vignetting model="pa" focal="9.7" aperture="10" distance="10" k1="-0.2591" k2="0.0305" k3="0.0157"/>
-+            <vignetting model="pa" focal="9.7" aperture="10" distance="1000" k1="-0.2591" k2="0.0305" k3="0.0157"/>
-+            <vignetting model="pa" focal="11.6" aperture="3.8" distance="10" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
-+            <vignetting model="pa" focal="11.6" aperture="3.8" distance="1000" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
-+            <vignetting model="pa" focal="11.6" aperture="11" distance="10" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
-+            <vignetting model="pa" focal="11.6" aperture="11" distance="1000" k1="-0.1900" k2="-0.0124" k3="0.0238"/>
-+            <vignetting model="pa" focal="14.3" aperture="4.3" distance="10" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
-+            <vignetting model="pa" focal="14.3" aperture="4.3" distance="1000" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
-+            <vignetting model="pa" focal="14.3" aperture="13" distance="10" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
-+            <vignetting model="pa" focal="14.3" aperture="13" distance="1000" k1="-0.1665" k2="-0.0175" k3="0.0210"/>
-+            <vignetting model="pa" focal="18.6" aperture="5" distance="10" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
-+            <vignetting model="pa" focal="18.6" aperture="5" distance="1000" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
-+            <vignetting model="pa" focal="18.6" aperture="14" distance="10" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
-+            <vignetting model="pa" focal="18.6" aperture="14" distance="1000" k1="-0.1571" k2="-0.0412" k3="0.0360"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot S90 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonS90</mount>
-+        <cropfactor>4.67</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6" a="0.01801" b="-0.09667" c="0.02041"/>
-+            <distortion model="ptlens" focal="7.5" a="0.00793" b="-0.0524" c="-0.00156"/>
-+            <distortion model="ptlens" focal="10.7" a="-0.01274" b="0.02428" c="-0.04366"/>
-+            <distortion model="ptlens" focal="18.2" a="0.02233" b="-0.0766" c="0.07502"/>
-+            <distortion model="ptlens" focal="22.5" a="-0.00256" b="0.01016" c="-0.01643"/>
-+            <tca model="poly3" focal="6" br="0.0004594" vr="0.9997919" bb="-0.0004823" vb="1.0009686"/>
-+            <tca model="poly3" focal="7.5" br="0.0002156" vr="0.9998923" bb="-0.0003540" vb="1.0009066"/>
-+            <tca model="poly3" focal="10.7" br="0.0000737" vr="1.0000337" bb="-0.0001950" vb="1.0005510"/>
-+            <tca model="poly3" focal="18.2" br="0.0000189" vr="1.0001247" bb="-0.0000461" vb="1.0001230"/>
-+            <tca model="poly3" focal="22.5" br="-0.0000520" vr="1.0003164" bb="-0.0000220" vb="1.0000067"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A650 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonA650IS</mount>
-         <cropfactor>4.67712</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.4" a="0.02" b="-0.06" c="0.021" />
--            <distortion model="ptlens" focal="9" a="0.021" b="-0.045" c="0.022" />
--            <distortion model="ptlens" focal="10.7" a="-0.013" b="0.036" c="-0.036" />
--            <distortion model="ptlens" focal="14.8" a="0.007" b="-0.012" c="0.003" />
--            <distortion model="ptlens" focal="18.9" a="-0.002" b="0.02" c="-0.027" />
--            <distortion model="ptlens" focal="25" a="-0.004" b="0.013" c="-0.009" />
--            <distortion model="ptlens" focal="44.4" a="0.002" b="0.008" c="-0.005" />
-+            <distortion model="ptlens" focal="7.4" a="0.02" b="-0.06" c="0.021"/>
-+            <distortion model="ptlens" focal="9" a="0.021" b="-0.045" c="0.022"/>
-+            <distortion model="ptlens" focal="10.7" a="-0.013" b="0.036" c="-0.036"/>
-+            <distortion model="ptlens" focal="14.8" a="0.007" b="-0.012" c="0.003"/>
-+            <distortion model="ptlens" focal="18.9" a="-0.002" b="0.02" c="-0.027"/>
-+            <distortion model="ptlens" focal="25" a="-0.004" b="0.013" c="-0.009"/>
-+            <distortion model="ptlens" focal="44.4" a="0.002" b="0.008" c="-0.005"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot G11 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonG11</mount>
-         <cropfactor>4.554</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.1" a="0.01606" b="-0.0393" c="-0.0167" />
--            <distortion model="ptlens" focal="6.8" a="0.01748" b="-0.04705" c="0.00205" />
--            <distortion model="ptlens" focal="7.4" a="0.01142" b="-0.03243" c="-0.00035" />
--            <distortion model="ptlens" focal="8.1" a="0.00543" b="-0.01716" c="-0.0055" />
--            <distortion model="ptlens" focal="8.9" a="0.02055" b="-0.07109" c="0.0607" />
--            <distortion model="ptlens" focal="9.8" a="0.00921" b="-0.03151" c="0.01933" />
--            <distortion model="ptlens" focal="10.8" a="0.01856" b="-0.06136" c="0.05221" />
--            <distortion model="ptlens" focal="12.1" a="0.00658" b="-0.01928" c="0.00538" />
--            <distortion model="ptlens" focal="13.8" a="0.00985" b="-0.03216" c="0.02499" />
--            <distortion model="ptlens" focal="18.1" a="-0.00766" b="-0.00228" c="0.03218" />
--            <distortion model="ptlens" focal="21.5" a="0.01669" b="-0.05429" c="0.04885" />
--            <distortion model="ptlens" focal="25" a="0.01337" b="-0.04578" c="0.04414" />
--            <distortion model="ptlens" focal="30.5" a="-0.00269" b="0.00762" c="-0.00738" />
-+            <distortion model="ptlens" focal="6.1" a="0.01606" b="-0.0393" c="-0.0167"/>
-+            <distortion model="ptlens" focal="6.8" a="0.01748" b="-0.04705" c="0.00205"/>
-+            <distortion model="ptlens" focal="7.4" a="0.01142" b="-0.03243" c="-0.00035"/>
-+            <distortion model="ptlens" focal="8.1" a="0.00543" b="-0.01716" c="-0.0055"/>
-+            <distortion model="ptlens" focal="8.9" a="0.02055" b="-0.07109" c="0.0607"/>
-+            <distortion model="ptlens" focal="9.8" a="0.00921" b="-0.03151" c="0.01933"/>
-+            <distortion model="ptlens" focal="10.8" a="0.01856" b="-0.06136" c="0.05221"/>
-+            <distortion model="ptlens" focal="12.1" a="0.00658" b="-0.01928" c="0.00538"/>
-+            <distortion model="ptlens" focal="13.8" a="0.00985" b="-0.03216" c="0.02499"/>
-+            <distortion model="ptlens" focal="18.1" a="-0.00766" b="-0.00228" c="0.03218"/>
-+            <distortion model="ptlens" focal="21.5" a="0.01669" b="-0.05429" c="0.04885"/>
-+            <distortion model="ptlens" focal="25" a="0.01337" b="-0.04578" c="0.04414"/>
-+            <distortion model="ptlens" focal="30.5" a="-0.00269" b="0.00762" c="-0.00738"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard</model>
-+        <model>Canon PowerShot SX150 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>canonSX150IS</mount>
-         <cropfactor>5.62</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5" a="0.00489" b="-0.0203" c="0.00662" />
--            <distortion model="ptlens" focal="5.4" a="0.00131" b="-0.00473" c="-0.0147" />
--            <distortion model="ptlens" focal="6.6" a="0.00482" b="-0.02275" c="0.00513" />
--            <distortion model="ptlens" focal="8.2" a="0.00464" b="-0.02242" c="0.00179" />
--            <distortion model="ptlens" focal="10.4" a="0.00692" b="-0.02854" c="0.01552" />
--            <distortion model="ptlens" focal="12" a="-0.00161" b="-0.00072" c="-0.00297" />
--            <distortion model="ptlens" focal="21.8" a="0.00766" b="-0.02324" c="0.02432" />
--            <distortion model="ptlens" focal="38.1" a="0" b="0.00149" c="0" />
--            <distortion model="ptlens" focal="47.4" a="0" b="0.00284" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.00312" c="0" />
-+            <distortion model="ptlens" focal="5" a="0.00489" b="-0.0203" c="0.00662"/>
-+            <distortion model="ptlens" focal="5.4" a="0.00131" b="-0.00473" c="-0.0147"/>
-+            <distortion model="ptlens" focal="6.6" a="0.00482" b="-0.02275" c="0.00513"/>
-+            <distortion model="ptlens" focal="8.2" a="0.00464" b="-0.02242" c="0.00179"/>
-+            <distortion model="ptlens" focal="10.4" a="0.00692" b="-0.02854" c="0.01552"/>
-+            <distortion model="ptlens" focal="12" a="-0.00161" b="-0.00072" c="-0.00297"/>
-+            <distortion model="ptlens" focal="21.8" a="0.00766" b="-0.02324" c="0.02432"/>
-+            <distortion model="ptlens" focal="38.1" a="0" b="0.00149" c="0"/>
-+            <distortion model="ptlens" focal="47.4" a="0" b="0.00284" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.00312" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Standard (CHDK's DNG)</model>
-+        <model>Canon PowerShot SX150 IS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-         <mount>canonSX150IS</mount>
-         <cropfactor>5.62</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5" a="0.02028" b="-0.08888" c="-0.01226" />
--            <distortion model="ptlens" focal="5.4" a="0.01979" b="-0.08316" c="-0.00808" />
--            <distortion model="ptlens" focal="6.6" a="0.01447" b="-0.06509" c="0.01205" />
--            <distortion model="ptlens" focal="8.2" a="0.00557" b="-0.03164" c="0.00251" />
--            <distortion model="ptlens" focal="10.4" a="0.00188" b="-0.01367" c="0.00334" />
--            <distortion model="ptlens" focal="12" a="0.00808" b="-0.03209" c="0.02894" />
--            <distortion model="ptlens" focal="21.8" a="0" b="0.00062" c="0" />
--            <distortion model="ptlens" focal="38.1" a="0" b="0.00309" c="0" />
--            <distortion model="ptlens" focal="47.4" a="0" b="0.00314" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.00298" c="0" />
--            <tca model="poly3" focal="5" br="-0.0000799" vr="1.0004457" bb="-0.0000680" vb="1.0003187" />
--            <tca model="poly3" focal="5.4" br="-0.0000744" vr="1.0004390" bb="-0.0000547" vb="1.0002936" />
--            <tca model="poly3" focal="6.6" br="-0.0001092" vr="1.0004490" bb="-0.0000238" vb="1.0002605" />
--            <tca model="poly3" focal="8.2" br="-0.0000718" vr="1.0003682" bb="0.0000340" vb="1.0001946" />
--            <tca model="poly3" focal="10.4" br="-0.0000597" vr="1.0002592" bb="0.0000078" vb="1.0002011" />
--            <tca model="poly3" focal="12" br="-0.0000367" vr="1.0001774" bb="0.0000003" vb="1.0001767" />
--            <tca model="poly3" focal="21.8" br="-0.0000233" vr="1.0000005" bb="-0.0000274" vb="1.0000798" />
--            <tca model="poly3" focal="38.1" br="-0.0000047" vr="0.9998767" bb="-0.0000423" vb="0.9999487" />
--            <tca model="poly3" focal="47.4" br="-0.0000220" vr="0.9998718" bb="-0.0000519" vb="0.9999109" />
--            <tca model="poly3" focal="60" br="-0.0000047" vr="0.9997923" bb="-0.0000699" vb="0.9998986" />
-+            <distortion model="ptlens" focal="5" a="0.02028" b="-0.08888" c="-0.01226"/>
-+            <distortion model="ptlens" focal="5.4" a="0.01979" b="-0.08316" c="-0.00808"/>
-+            <distortion model="ptlens" focal="6.6" a="0.01447" b="-0.06509" c="0.01205"/>
-+            <distortion model="ptlens" focal="8.2" a="0.00557" b="-0.03164" c="0.00251"/>
-+            <distortion model="ptlens" focal="10.4" a="0.00188" b="-0.01367" c="0.00334"/>
-+            <distortion model="ptlens" focal="12" a="0.00808" b="-0.03209" c="0.02894"/>
-+            <distortion model="ptlens" focal="21.8" a="0" b="0.00062" c="0"/>
-+            <distortion model="ptlens" focal="38.1" a="0" b="0.00309" c="0"/>
-+            <distortion model="ptlens" focal="47.4" a="0" b="0.00314" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.00298" c="0"/>
-+            <tca model="poly3" focal="5" br="-0.0000799" vr="1.0004457" bb="-0.0000680" vb="1.0003187"/>
-+            <tca model="poly3" focal="5.4" br="-0.0000744" vr="1.0004390" bb="-0.0000547" vb="1.0002936"/>
-+            <tca model="poly3" focal="6.6" br="-0.0001092" vr="1.0004490" bb="-0.0000238" vb="1.0002605"/>
-+            <tca model="poly3" focal="8.2" br="-0.0000718" vr="1.0003682" bb="0.0000340" vb="1.0001946"/>
-+            <tca model="poly3" focal="10.4" br="-0.0000597" vr="1.0002592" bb="0.0000078" vb="1.0002011"/>
-+            <tca model="poly3" focal="12" br="-0.0000367" vr="1.0001774" bb="0.0000003" vb="1.0001767"/>
-+            <tca model="poly3" focal="21.8" br="-0.0000233" vr="1.0000005" bb="-0.0000274" vb="1.0000798"/>
-+            <tca model="poly3" focal="38.1" br="-0.0000047" vr="0.9998767" bb="-0.0000423" vb="0.9999487"/>
-+            <tca model="poly3" focal="47.4" br="-0.0000220" vr="0.9998718" bb="-0.0000519" vb="0.9999109"/>
-+            <tca model="poly3" focal="60" br="-0.0000047" vr="0.9997923" bb="-0.0000699" vb="0.9998986"/>
-+            <vignetting model="pa" focal="5" aperture="3.7" distance="10" k1="-0.6199" k2="2.0448" k3="-2.2211"/>
-+            <vignetting model="pa" focal="5" aperture="3.7" distance="1000" k1="-0.6199" k2="2.0448" k3="-2.2211"/>
-+            <vignetting model="pa" focal="5" aperture="4.1" distance="10" k1="-0.6753" k2="2.2212" k3="-2.3289"/>
-+            <vignetting model="pa" focal="5" aperture="4.1" distance="1000" k1="-0.6753" k2="2.2212" k3="-2.3289"/>
-+            <vignetting model="pa" focal="5" aperture="5.9" distance="10" k1="-0.8781" k2="2.8833" k3="-2.7814"/>
-+            <vignetting model="pa" focal="5" aperture="5.9" distance="1000" k1="-0.8781" k2="2.8833" k3="-2.7814"/>
-+            <vignetting model="pa" focal="5" aperture="8" distance="10" k1="-0.9592" k2="3.1347" k3="-2.9511"/>
-+            <vignetting model="pa" focal="5" aperture="8" distance="1000" k1="-0.9592" k2="3.1347" k3="-2.9511"/>
-+            <vignetting model="pa" focal="6.6" aperture="3.6" distance="10" k1="-0.1295" k2="0.0227" k3="-0.1148"/>
-+            <vignetting model="pa" focal="6.6" aperture="3.6" distance="1000" k1="-0.1295" k2="0.0227" k3="-0.1148"/>
-+            <vignetting model="pa" focal="6.6" aperture="4" distance="10" k1="-0.1662" k2="0.1419" k3="-0.1471"/>
-+            <vignetting model="pa" focal="6.6" aperture="4" distance="1000" k1="-0.1662" k2="0.1419" k3="-0.1471"/>
-+            <vignetting model="pa" focal="6.6" aperture="5.6" distance="10" k1="-0.1450" k2="0.0529" k3="-0.0498"/>
-+            <vignetting model="pa" focal="6.6" aperture="5.6" distance="1000" k1="-0.1450" k2="0.0529" k3="-0.0498"/>
-+            <vignetting model="pa" focal="6.6" aperture="7.7" distance="10" k1="-0.1468" k2="0.0540" k3="-0.0494"/>
-+            <vignetting model="pa" focal="6.6" aperture="7.7" distance="1000" k1="-0.1468" k2="0.0540" k3="-0.0494"/>
-+            <vignetting model="pa" focal="8.2" aperture="3.9" distance="10" k1="-0.1364" k2="0.0861" k3="-0.1207"/>
-+            <vignetting model="pa" focal="8.2" aperture="3.9" distance="1000" k1="-0.1364" k2="0.0861" k3="-0.1207"/>
-+            <vignetting model="pa" focal="8.2" aperture="5.5" distance="10" k1="-0.1225" k2="0.0388" k3="-0.0368"/>
-+            <vignetting model="pa" focal="8.2" aperture="5.5" distance="1000" k1="-0.1225" k2="0.0388" k3="-0.0368"/>
-+            <vignetting model="pa" focal="8.2" aperture="7.9" distance="10" k1="-0.1250" k2="0.0450" k3="-0.0400"/>
-+            <vignetting model="pa" focal="8.2" aperture="7.9" distance="1000" k1="-0.1250" k2="0.0450" k3="-0.0400"/>
-+            <vignetting model="pa" focal="10.7" aperture="4" distance="10" k1="-0.0730" k2="-0.0719" k3="-0.0334"/>
-+            <vignetting model="pa" focal="10.7" aperture="4" distance="1000" k1="-0.0730" k2="-0.0719" k3="-0.0334"/>
-+            <vignetting model="pa" focal="10.7" aperture="5.7" distance="10" k1="-0.0971" k2="0.0327" k3="-0.0346"/>
-+            <vignetting model="pa" focal="10.7" aperture="5.7" distance="1000" k1="-0.0971" k2="0.0327" k3="-0.0346"/>
-+            <vignetting model="pa" focal="10.7" aperture="8" distance="10" k1="-0.0998" k2="0.0419" k3="-0.0396"/>
-+            <vignetting model="pa" focal="10.7" aperture="8" distance="1000" k1="-0.0998" k2="0.0419" k3="-0.0396"/>
-+            <vignetting model="pa" focal="17.8" aperture="4.6" distance="10" k1="-0.0843" k2="0.0140" k3="-0.0787"/>
-+            <vignetting model="pa" focal="17.8" aperture="4.6" distance="1000" k1="-0.0843" k2="0.0140" k3="-0.0787"/>
-+            <vignetting model="pa" focal="17.8" aperture="5.6" distance="10" k1="-0.0834" k2="0.0480" k3="-0.0480"/>
-+            <vignetting model="pa" focal="17.8" aperture="5.6" distance="1000" k1="-0.0834" k2="0.0480" k3="-0.0480"/>
-+            <vignetting model="pa" focal="17.8" aperture="8" distance="10" k1="-0.0780" k2="0.0458" k3="-0.0464"/>
-+            <vignetting model="pa" focal="17.8" aperture="8" distance="1000" k1="-0.0780" k2="0.0458" k3="-0.0464"/>
-+            <vignetting model="pa" focal="29.7" aperture="5.1" distance="10" k1="-0.1719" k2="0.5148" k3="-0.5598"/>
-+            <vignetting model="pa" focal="29.7" aperture="5.1" distance="1000" k1="-0.1719" k2="0.5148" k3="-0.5598"/>
-+            <vignetting model="pa" focal="29.7" aperture="5.8" distance="10" k1="-0.1549" k2="0.4257" k3="-0.4136"/>
-+            <vignetting model="pa" focal="29.7" aperture="5.8" distance="1000" k1="-0.1549" k2="0.4257" k3="-0.4136"/>
-+            <vignetting model="pa" focal="29.7" aperture="8" distance="10" k1="-0.0671" k2="0.0825" k3="-0.0785"/>
-+            <vignetting model="pa" focal="29.7" aperture="8" distance="1000" k1="-0.0671" k2="0.0825" k3="-0.0785"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.2" distance="10" k1="-0.0135" k2="0.1099" k3="-0.4321"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.2" distance="1000" k1="-0.0135" k2="0.1099" k3="-0.4321"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.8" distance="10" k1="-0.0802" k2="0.3473" k3="-0.5449"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.8" distance="1000" k1="-0.0802" k2="0.3473" k3="-0.5449"/>
-+            <vignetting model="pa" focal="40.2" aperture="8" distance="10" k1="-0.1508" k2="0.4995" k3="-0.4912"/>
-+            <vignetting model="pa" focal="40.2" aperture="8" distance="1000" k1="-0.1508" k2="0.4995" k3="-0.4912"/>
-+            <vignetting model="pa" focal="46.6" aperture="5.3" distance="10" k1="0.0949" k2="-0.3337" k3="-0.1263"/>
-+            <vignetting model="pa" focal="46.6" aperture="5.3" distance="1000" k1="0.0949" k2="-0.3337" k3="-0.1263"/>
-+            <vignetting model="pa" focal="46.6" aperture="5.8" distance="10" k1="0.0271" k2="-0.0224" k3="-0.3168"/>
-+            <vignetting model="pa" focal="46.6" aperture="5.8" distance="1000" k1="0.0271" k2="-0.0224" k3="-0.3168"/>
-+            <vignetting model="pa" focal="46.6" aperture="8" distance="10" k1="-0.1507" k2="0.5364" k3="-0.5678"/>
-+            <vignetting model="pa" focal="46.6" aperture="8" distance="1000" k1="-0.1507" k2="0.5364" k3="-0.5678"/>
-+            <vignetting model="pa" focal="49.9" aperture="5.9" distance="10" k1="0.0364" k2="-0.0850" k3="-0.2581"/>
-+            <vignetting model="pa" focal="49.9" aperture="5.9" distance="1000" k1="0.0364" k2="-0.0850" k3="-0.2581"/>
-+            <vignetting model="pa" focal="49.9" aperture="6.7" distance="10" k1="-0.0625" k2="0.2666" k3="-0.4673"/>
-+            <vignetting model="pa" focal="49.9" aperture="6.7" distance="1000" k1="-0.0625" k2="0.2666" k3="-0.4673"/>
-+            <vignetting model="pa" focal="49.9" aperture="7.5" distance="10" k1="-0.1259" k2="0.4597" k3="-0.5425"/>
-+            <vignetting model="pa" focal="49.9" aperture="7.5" distance="1000" k1="-0.1259" k2="0.4597" k3="-0.5425"/>
-+            <vignetting model="pa" focal="49.9" aperture="8" distance="10" k1="-0.1393" k2="0.4823" k3="-0.5259"/>
-+            <vignetting model="pa" focal="49.9" aperture="8" distance="1000" k1="-0.1393" k2="0.4823" k3="-0.5259"/>
-+            <vignetting model="pa" focal="53.5" aperture="5.6" distance="10" k1="0.0942" k2="-0.3878" k3="-0.0434"/>
-+            <vignetting model="pa" focal="53.5" aperture="5.6" distance="1000" k1="0.0942" k2="-0.3878" k3="-0.0434"/>
-+            <vignetting model="pa" focal="53.5" aperture="6.6" distance="10" k1="-0.0311" k2="0.1168" k3="-0.3565"/>
-+            <vignetting model="pa" focal="53.5" aperture="6.6" distance="1000" k1="-0.0311" k2="0.1168" k3="-0.3565"/>
-+            <vignetting model="pa" focal="53.5" aperture="7.4" distance="10" k1="-0.1189" k2="0.3956" k3="-0.4930"/>
-+            <vignetting model="pa" focal="53.5" aperture="7.4" distance="1000" k1="-0.1189" k2="0.3956" k3="-0.4930"/>
-+            <vignetting model="pa" focal="53.5" aperture="8" distance="10" k1="-0.1362" k2="0.4301" k3="-0.4730"/>
-+            <vignetting model="pa" focal="53.5" aperture="8" distance="1000" k1="-0.1362" k2="0.4301" k3="-0.4730"/>
-+            <vignetting model="pa" focal="60" aperture="5.7" distance="10" k1="0.0815" k2="-0.4384" k3="0.0211"/>
-+            <vignetting model="pa" focal="60" aperture="5.7" distance="1000" k1="0.0815" k2="-0.4384" k3="0.0211"/>
-+            <vignetting model="pa" focal="60" aperture="6.2" distance="10" k1="0.0320" k2="-0.1938" k3="-0.1355"/>
-+            <vignetting model="pa" focal="60" aperture="6.2" distance="1000" k1="0.0320" k2="-0.1938" k3="-0.1355"/>
-+            <vignetting model="pa" focal="60" aperture="6.9" distance="10" k1="-0.0590" k2="0.1369" k3="-0.3344"/>
-+            <vignetting model="pa" focal="60" aperture="6.9" distance="1000" k1="-0.0590" k2="0.1369" k3="-0.3344"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.1351" k2="0.3622" k3="-0.4197"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.1351" k2="0.3622" k3="-0.4197"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX220 HS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonSX220HS</mount>
-+        <mount>canonSX230HS</mount>
-+        <cropfactor>5.6</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5" a="0.02746" b="-0.1202" c="0.01599"/>
-+            <distortion model="ptlens" focal="5.6" a="0.02357" b="-0.10154" c="0.00125"/>
-+            <distortion model="ptlens" focal="6.1" a="0.01844" b="-0.08194" c="0.00145"/>
-+            <distortion model="ptlens" focal="7" a="0.01068" b="-0.05292" c="-0.00089"/>
-+            <distortion model="ptlens" focal="9.2" a="0.00078" b="-0.01168" c="-0.01592"/>
-+            <distortion model="ptlens" focal="11.5" a="0.00335" b="-0.01376" c="-0.00191"/>
-+            <distortion model="ptlens" focal="14.7" a="0.00628" b="-0.02587" c="0.02812"/>
-+            <distortion model="ptlens" focal="27.2" a="0.00104" b="-0.00722" c="0.01207"/>
-+            <distortion model="ptlens" focal="49.2" a="0.00194" b="-0.01058" c="0.01279"/>
-+            <distortion model="ptlens" focal="70" a="-0.00025" b="0.00848" c="-0.00985"/>
-+            <tca model="poly3" focal="5" vr="1.00035" vb="1.00052"/>
-+            <tca model="poly3" focal="5.6" vr="1.00044" vb="1.00053"/>
-+            <tca model="poly3" focal="6.1" vr="1.0003" vb="1.0003"/>
-+            <tca model="poly3" focal="7" vr="1.0005" vb="1.0005"/>
-+            <tca model="poly3" focal="9.2" vr="1.0005" vb="1.0004"/>
-+            <tca model="poly3" focal="11.5" vr="1.0005" vb="1.0002"/>
-+            <tca model="poly3" focal="14.7" vr="1.0005" vb="1.0001"/>
-+            <tca model="poly3" focal="27.2" vr="1.0003" vb="0.9996"/>
-+            <tca model="poly3" focal="49.2" vr="1.0000" vb="0.9990"/>
-+            <tca model="poly3" focal="70" vr="0.9996" vb="0.9986"/>
-+            <vignetting model="pa" focal="5" aperture="3.1" distance="10" k1="-0.4514" k2="1.5033" k3="-2.0306"/>
-+            <vignetting model="pa" focal="5" aperture="3.1" distance="1000" k1="-0.4514" k2="1.5033" k3="-2.0306"/>
-+            <vignetting model="pa" focal="5" aperture="3.9" distance="10" k1="-0.4059" k2="1.4383" k3="-2.0302"/>
-+            <vignetting model="pa" focal="5" aperture="3.9" distance="1000" k1="-0.4059" k2="1.4383" k3="-2.0302"/>
-+            <vignetting model="pa" focal="5" aperture="5.6" distance="10" k1="-0.4112" k2="1.5784" k3="-2.1670"/>
-+            <vignetting model="pa" focal="5" aperture="5.6" distance="1000" k1="-0.4112" k2="1.5784" k3="-2.1670"/>
-+            <vignetting model="pa" focal="5" aperture="7.9" distance="10" k1="-0.4473" k2="1.7002" k3="-2.2789"/>
-+            <vignetting model="pa" focal="5" aperture="7.9" distance="1000" k1="-0.4473" k2="1.7002" k3="-2.2789"/>
-+            <vignetting model="pa" focal="5.6" aperture="3.2" distance="10" k1="-0.6270" k2="2.0131" k3="-2.2359"/>
-+            <vignetting model="pa" focal="5.6" aperture="3.2" distance="1000" k1="-0.6270" k2="2.0131" k3="-2.2359"/>
-+            <vignetting model="pa" focal="5.6" aperture="4.1" distance="10" k1="-0.6633" k2="2.2167" k3="-2.4273"/>
-+            <vignetting model="pa" focal="5.6" aperture="4.1" distance="1000" k1="-0.6633" k2="2.2167" k3="-2.4273"/>
-+            <vignetting model="pa" focal="5.6" aperture="5.7" distance="10" k1="-0.8022" k2="2.7481" k3="-2.8641"/>
-+            <vignetting model="pa" focal="5.6" aperture="5.7" distance="1000" k1="-0.8022" k2="2.7481" k3="-2.8641"/>
-+            <vignetting model="pa" focal="5.6" aperture="8" distance="10" k1="-0.9367" k2="3.2100" k3="-3.1988"/>
-+            <vignetting model="pa" focal="5.6" aperture="8" distance="1000" k1="-0.9367" k2="3.2100" k3="-3.1988"/>
-+            <vignetting model="pa" focal="6.1" aperture="3.5" distance="10" k1="-0.4580" k2="1.2422" k3="-1.3381"/>
-+            <vignetting model="pa" focal="6.1" aperture="3.5" distance="1000" k1="-0.4580" k2="1.2422" k3="-1.3381"/>
-+            <vignetting model="pa" focal="6.1" aperture="4" distance="10" k1="-0.5216" k2="1.4862" k3="-1.4595"/>
-+            <vignetting model="pa" focal="6.1" aperture="4" distance="1000" k1="-0.5216" k2="1.4862" k3="-1.4595"/>
-+            <vignetting model="pa" focal="6.1" aperture="5.6" distance="10" k1="-0.5683" k2="1.6043" k3="-1.4711"/>
-+            <vignetting model="pa" focal="6.1" aperture="5.6" distance="1000" k1="-0.5683" k2="1.6043" k3="-1.4711"/>
-+            <vignetting model="pa" focal="6.1" aperture="7.9" distance="10" k1="-0.5347" k2="1.4654" k3="-1.3293"/>
-+            <vignetting model="pa" focal="6.1" aperture="7.9" distance="1000" k1="-0.5347" k2="1.4654" k3="-1.3293"/>
-+            <vignetting model="pa" focal="6.8" aperture="3.6" distance="10" k1="-0.2713" k2="0.4826" k3="-0.5024"/>
-+            <vignetting model="pa" focal="6.8" aperture="3.6" distance="1000" k1="-0.2713" k2="0.4826" k3="-0.5024"/>
-+            <vignetting model="pa" focal="6.8" aperture="4" distance="10" k1="-0.2603" k2="0.4582" k3="-0.4190"/>
-+            <vignetting model="pa" focal="6.8" aperture="4" distance="1000" k1="-0.2603" k2="0.4582" k3="-0.4190"/>
-+            <vignetting model="pa" focal="6.8" aperture="5.6" distance="10" k1="-0.1603" k2="0.0885" k3="-0.0782"/>
-+            <vignetting model="pa" focal="6.8" aperture="5.6" distance="1000" k1="-0.1603" k2="0.0885" k3="-0.0782"/>
-+            <vignetting model="pa" focal="6.8" aperture="8" distance="10" k1="-0.1379" k2="0.0139" k3="-0.0140"/>
-+            <vignetting model="pa" focal="6.8" aperture="8" distance="1000" k1="-0.1379" k2="0.0139" k3="-0.0140"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.7" distance="10" k1="-0.1295" k2="0.0408" k3="-0.0723"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.7" distance="1000" k1="-0.1295" k2="0.0408" k3="-0.0723"/>
-+            <vignetting model="pa" focal="8.5" aperture="4.1" distance="10" k1="-0.1337" k2="0.0637" k3="-0.0720"/>
-+            <vignetting model="pa" focal="8.5" aperture="4.1" distance="1000" k1="-0.1337" k2="0.0637" k3="-0.0720"/>
-+            <vignetting model="pa" focal="8.5" aperture="5.8" distance="10" k1="-0.1071" k2="-0.0178" k3="0.0224"/>
-+            <vignetting model="pa" focal="8.5" aperture="5.8" distance="1000" k1="-0.1071" k2="-0.0178" k3="0.0224"/>
-+            <vignetting model="pa" focal="8.5" aperture="8" distance="10" k1="-0.0988" k2="-0.0318" k3="0.0299"/>
-+            <vignetting model="pa" focal="8.5" aperture="8" distance="1000" k1="-0.0988" k2="-0.0318" k3="0.0299"/>
-+            <vignetting model="pa" focal="8.6" aperture="4" distance="10" k1="-0.1234" k2="0.0624" k3="-0.0726"/>
-+            <vignetting model="pa" focal="8.6" aperture="4" distance="1000" k1="-0.1234" k2="0.0624" k3="-0.0726"/>
-+            <vignetting model="pa" focal="8.6" aperture="5.8" distance="10" k1="-0.0956" k2="-0.0189" k3="0.0225"/>
-+            <vignetting model="pa" focal="8.6" aperture="5.8" distance="1000" k1="-0.0956" k2="-0.0189" k3="0.0225"/>
-+            <vignetting model="pa" focal="8.6" aperture="8" distance="10" k1="-0.0912" k2="-0.0215" k3="0.0212"/>
-+            <vignetting model="pa" focal="8.6" aperture="8" distance="1000" k1="-0.0912" k2="-0.0215" k3="0.0212"/>
-+            <vignetting model="pa" focal="12.2" aperture="4.2" distance="10" k1="-0.0962" k2="0.0722" k3="-0.0894"/>
-+            <vignetting model="pa" focal="12.2" aperture="4.2" distance="1000" k1="-0.0962" k2="0.0722" k3="-0.0894"/>
-+            <vignetting model="pa" focal="12.2" aperture="5.8" distance="10" k1="-0.0794" k2="0.0156" k3="-0.0009"/>
-+            <vignetting model="pa" focal="12.2" aperture="5.8" distance="1000" k1="-0.0794" k2="0.0156" k3="-0.0009"/>
-+            <vignetting model="pa" focal="12.2" aperture="8" distance="10" k1="-0.0732" k2="0.0110" k3="-0.0010"/>
-+            <vignetting model="pa" focal="12.2" aperture="8" distance="1000" k1="-0.0732" k2="0.0110" k3="-0.0010"/>
-+            <vignetting model="pa" focal="14.7" aperture="4.5" distance="10" k1="-0.0725" k2="0.0795" k3="-0.1002"/>
-+            <vignetting model="pa" focal="14.7" aperture="4.5" distance="1000" k1="-0.0725" k2="0.0795" k3="-0.1002"/>
-+            <vignetting model="pa" focal="14.7" aperture="5.7" distance="10" k1="-0.0616" k2="0.0306" k3="-0.0112"/>
-+            <vignetting model="pa" focal="14.7" aperture="5.7" distance="1000" k1="-0.0616" k2="0.0306" k3="-0.0112"/>
-+            <vignetting model="pa" focal="14.7" aperture="8" distance="10" k1="-0.0565" k2="0.0281" k3="-0.0118"/>
-+            <vignetting model="pa" focal="14.7" aperture="8" distance="1000" k1="-0.0565" k2="0.0281" k3="-0.0118"/>
-+            <vignetting model="pa" focal="18.8" aperture="4.7" distance="10" k1="-0.0712" k2="0.0961" k3="-0.0988"/>
-+            <vignetting model="pa" focal="18.8" aperture="4.7" distance="1000" k1="-0.0712" k2="0.0961" k3="-0.0988"/>
-+            <vignetting model="pa" focal="18.8" aperture="5.8" distance="10" k1="-0.0583" k2="0.0464" k3="-0.0230"/>
-+            <vignetting model="pa" focal="18.8" aperture="5.8" distance="1000" k1="-0.0583" k2="0.0464" k3="-0.0230"/>
-+            <vignetting model="pa" focal="18.8" aperture="8" distance="10" k1="-0.0531" k2="0.0420" k3="-0.0210"/>
-+            <vignetting model="pa" focal="18.8" aperture="8" distance="1000" k1="-0.0531" k2="0.0420" k3="-0.0210"/>
-+            <vignetting model="pa" focal="22.4" aperture="5.1" distance="10" k1="-0.0720" k2="0.1924" k3="-0.1811"/>
-+            <vignetting model="pa" focal="22.4" aperture="5.1" distance="1000" k1="-0.0720" k2="0.1924" k3="-0.1811"/>
-+            <vignetting model="pa" focal="22.4" aperture="5.7" distance="10" k1="-0.0466" k2="0.0950" k3="-0.0695"/>
-+            <vignetting model="pa" focal="22.4" aperture="5.7" distance="1000" k1="-0.0466" k2="0.0950" k3="-0.0695"/>
-+            <vignetting model="pa" focal="22.4" aperture="6.4" distance="10" k1="-0.0339" k2="0.0476" k3="-0.0239"/>
-+            <vignetting model="pa" focal="22.4" aperture="6.4" distance="1000" k1="-0.0339" k2="0.0476" k3="-0.0239"/>
-+            <vignetting model="pa" focal="22.4" aperture="8" distance="10" k1="-0.0296" k2="0.0411" k3="-0.0194"/>
-+            <vignetting model="pa" focal="22.4" aperture="8" distance="1000" k1="-0.0296" k2="0.0411" k3="-0.0194"/>
-+            <vignetting model="pa" focal="33" aperture="5.2" distance="10" k1="-0.0966" k2="0.5183" k3="-0.6242"/>
-+            <vignetting model="pa" focal="33" aperture="5.2" distance="1000" k1="-0.0966" k2="0.5183" k3="-0.6242"/>
-+            <vignetting model="pa" focal="33" aperture="5.8" distance="10" k1="-0.1067" k2="0.5290" k3="-0.5738"/>
-+            <vignetting model="pa" focal="33" aperture="5.8" distance="1000" k1="-0.1067" k2="0.5290" k3="-0.5738"/>
-+            <vignetting model="pa" focal="33" aperture="6.5" distance="10" k1="-0.1067" k2="0.4816" k3="-0.4699"/>
-+            <vignetting model="pa" focal="33" aperture="6.5" distance="1000" k1="-0.1067" k2="0.4816" k3="-0.4699"/>
-+            <vignetting model="pa" focal="33" aperture="8" distance="10" k1="-0.0698" k2="0.3120" k3="-0.2741"/>
-+            <vignetting model="pa" focal="33" aperture="8" distance="1000" k1="-0.0698" k2="0.3120" k3="-0.2741"/>
-+            <vignetting model="pa" focal="40.3" aperture="5.3" distance="10" k1="0.1238" k2="-0.1322" k3="-0.2918"/>
-+            <vignetting model="pa" focal="40.3" aperture="5.3" distance="1000" k1="0.1238" k2="-0.1322" k3="-0.2918"/>
-+            <vignetting model="pa" focal="40.3" aperture="5.8" distance="10" k1="0.0788" k2="0.0301" k3="-0.3739"/>
-+            <vignetting model="pa" focal="40.3" aperture="5.8" distance="1000" k1="0.0788" k2="0.0301" k3="-0.3739"/>
-+            <vignetting model="pa" focal="40.3" aperture="6.5" distance="10" k1="-0.0010" k2="0.3061" k3="-0.5212"/>
-+            <vignetting model="pa" focal="40.3" aperture="6.5" distance="1000" k1="-0.0010" k2="0.3061" k3="-0.5212"/>
-+            <vignetting model="pa" focal="40.3" aperture="8" distance="10" k1="-0.0839" k2="0.5579" k3="-0.6183"/>
-+            <vignetting model="pa" focal="40.3" aperture="8" distance="1000" k1="-0.0839" k2="0.5579" k3="-0.6183"/>
-+            <vignetting model="pa" focal="42.9" aperture="5.8" distance="10" k1="0.1483" k2="-0.2135" k3="-0.2300"/>
-+            <vignetting model="pa" focal="42.9" aperture="5.8" distance="1000" k1="0.1483" k2="-0.2135" k3="-0.2300"/>
-+            <vignetting model="pa" focal="42.9" aperture="6.6" distance="10" k1="0.0415" k2="0.1903" k3="-0.4785"/>
-+            <vignetting model="pa" focal="42.9" aperture="6.6" distance="1000" k1="0.0415" k2="0.1903" k3="-0.4785"/>
-+            <vignetting model="pa" focal="42.9" aperture="7.3" distance="10" k1="-0.0347" k2="0.4463" k3="-0.6207"/>
-+            <vignetting model="pa" focal="42.9" aperture="7.3" distance="1000" k1="-0.0347" k2="0.4463" k3="-0.6207"/>
-+            <vignetting model="pa" focal="42.9" aperture="8" distance="10" k1="-0.0742" k2="0.5689" k3="-0.6752"/>
-+            <vignetting model="pa" focal="42.9" aperture="8" distance="1000" k1="-0.0742" k2="0.5689" k3="-0.6752"/>
-+            <vignetting model="pa" focal="57.6" aperture="5.9" distance="10" k1="0.3294" k2="-1.2764" k3="0.5831"/>
-+            <vignetting model="pa" focal="57.6" aperture="5.9" distance="1000" k1="0.3294" k2="-1.2764" k3="0.5831"/>
-+            <vignetting model="pa" focal="57.6" aperture="6.7" distance="10" k1="0.2906" k2="-0.9020" k3="0.2822"/>
-+            <vignetting model="pa" focal="57.6" aperture="6.7" distance="1000" k1="0.2906" k2="-0.9020" k3="0.2822"/>
-+            <vignetting model="pa" focal="57.6" aperture="7.5" distance="10" k1="0.1840" k2="-0.3988" k3="-0.0835"/>
-+            <vignetting model="pa" focal="57.6" aperture="7.5" distance="1000" k1="0.1840" k2="-0.3988" k3="-0.0835"/>
-+            <vignetting model="pa" focal="57.6" aperture="8" distance="10" k1="0.1187" k2="-0.1355" k3="-0.2634"/>
-+            <vignetting model="pa" focal="57.6" aperture="8" distance="1000" k1="0.1187" k2="-0.1355" k3="-0.2634"/>
-+            <vignetting model="pa" focal="70" aperture="6.6" distance="10" k1="0.2333" k2="-1.1394" k3="0.5647"/>
-+            <vignetting model="pa" focal="70" aperture="6.6" distance="1000" k1="0.2333" k2="-1.1394" k3="0.5647"/>
-+            <vignetting model="pa" focal="70" aperture="7.4" distance="10" k1="0.1877" k2="-0.7321" k3="0.2385"/>
-+            <vignetting model="pa" focal="70" aperture="7.4" distance="1000" k1="0.1877" k2="-0.7321" k3="0.2385"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="0.1299" k2="-0.4542" k3="0.0414"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="0.1299" k2="-0.4542" k3="0.0414"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX220 HS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonSX220HS</mount>
-+        <cropfactor>5.6</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="5" k1="-0.00538"/>
-+            <distortion model="poly3" focal="5.6" k1="-0.01139"/>
-+            <distortion model="poly3" focal="6.1" k1="-0.01057"/>
-+            <distortion model="poly3" focal="8.5" k1="-0.00697"/>
-+            <distortion model="poly3" focal="17.3" k1="-0.00102"/>
-+            <distortion model="poly3" focal="27.2" k1="-0.00042"/>
-+            <distortion model="poly3" focal="49.2" k1="-0.00202"/>
-+            <distortion model="poly3" focal="70" k1="0.0042"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A720 IS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonA720IS</mount>
-+        <cropfactor>6.03</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5.8" a="0.02218" b="-0.07779" c="0.05524"/>
-+            <distortion model="ptlens" focal="6.4" a="0.01639" b="-0.0598" c="0.04786"/>
-+            <distortion model="ptlens" focal="7.1" a="0.01223" b="-0.04113" c="0.02913"/>
-+            <distortion model="ptlens" focal="11.5" a="0.0015" b="-0.00506" c="0.00807"/>
-+            <distortion model="ptlens" focal="26.7" a="-0.00758" b="0.02306" c="-0.02099"/>
-+            <distortion model="ptlens" focal="34.8" a="-0.00352" b="0.01759" c="-0.01439"/>
-+            <vignetting model="pa" focal="5.8" aperture="2.8" distance="10" k1="-0.1720" k2="0.2156" k3="-0.3874"/>
-+            <vignetting model="pa" focal="5.8" aperture="2.8" distance="1000" k1="-0.1720" k2="0.2156" k3="-0.3874"/>
-+            <vignetting model="pa" focal="5.8" aperture="3.9" distance="10" k1="-0.2631" k2="0.5089" k3="-0.4309"/>
-+            <vignetting model="pa" focal="5.8" aperture="3.9" distance="1000" k1="-0.2631" k2="0.5089" k3="-0.4309"/>
-+            <vignetting model="pa" focal="5.8" aperture="5.5" distance="10" k1="-0.2016" k2="0.2547" k3="-0.2347"/>
-+            <vignetting model="pa" focal="5.8" aperture="5.5" distance="1000" k1="-0.2016" k2="0.2547" k3="-0.2347"/>
-+            <vignetting model="pa" focal="5.8" aperture="7.5" distance="10" k1="-0.1389" k2="0.0163" k3="-0.0184"/>
-+            <vignetting model="pa" focal="5.8" aperture="7.5" distance="1000" k1="-0.1389" k2="0.0163" k3="-0.0184"/>
-+            <vignetting model="pa" focal="7.7" aperture="2.9" distance="10" k1="-0.2064" k2="0.3295" k3="-0.4093"/>
-+            <vignetting model="pa" focal="7.7" aperture="2.9" distance="1000" k1="-0.2064" k2="0.3295" k3="-0.4093"/>
-+            <vignetting model="pa" focal="7.7" aperture="4.2" distance="10" k1="-0.1875" k2="0.3053" k3="-0.2610"/>
-+            <vignetting model="pa" focal="7.7" aperture="4.2" distance="1000" k1="-0.1875" k2="0.3053" k3="-0.2610"/>
-+            <vignetting model="pa" focal="7.7" aperture="5.9" distance="10" k1="-0.1223" k2="0.0857" k3="-0.0666"/>
-+            <vignetting model="pa" focal="7.7" aperture="5.9" distance="1000" k1="-0.1223" k2="0.0857" k3="-0.0666"/>
-+            <vignetting model="pa" focal="7.7" aperture="8" distance="10" k1="-0.0991" k2="0.0023" k3="0.0045"/>
-+            <vignetting model="pa" focal="7.7" aperture="8" distance="1000" k1="-0.0991" k2="0.0023" k3="0.0045"/>
-+            <vignetting model="pa" focal="10" aperture="3.1" distance="10" k1="-0.1770" k2="0.3495" k3="-0.4393"/>
-+            <vignetting model="pa" focal="10" aperture="3.1" distance="1000" k1="-0.1770" k2="0.3495" k3="-0.4393"/>
-+            <vignetting model="pa" focal="10" aperture="3.8" distance="10" k1="-0.1951" k2="0.4568" k3="-0.4082"/>
-+            <vignetting model="pa" focal="10" aperture="3.8" distance="1000" k1="-0.1951" k2="0.4568" k3="-0.4082"/>
-+            <vignetting model="pa" focal="10" aperture="5.3" distance="10" k1="-0.1019" k2="0.1131" k3="-0.0868"/>
-+            <vignetting model="pa" focal="10" aperture="5.3" distance="1000" k1="-0.1019" k2="0.1131" k3="-0.0868"/>
-+            <vignetting model="pa" focal="10" aperture="7.5" distance="10" k1="-0.0613" k2="-0.0024" k3="0.0037"/>
-+            <vignetting model="pa" focal="10" aperture="7.5" distance="1000" k1="-0.0613" k2="-0.0024" k3="0.0037"/>
-+            <vignetting model="pa" focal="14.7" aperture="3.4" distance="10" k1="-0.1399" k2="0.3507" k3="-0.4171"/>
-+            <vignetting model="pa" focal="14.7" aperture="3.4" distance="1000" k1="-0.1399" k2="0.3507" k3="-0.4171"/>
-+            <vignetting model="pa" focal="14.7" aperture="3.8" distance="10" k1="-0.1610" k2="0.4957" k3="-0.4625"/>
-+            <vignetting model="pa" focal="14.7" aperture="3.8" distance="1000" k1="-0.1610" k2="0.4957" k3="-0.4625"/>
-+            <vignetting model="pa" focal="14.7" aperture="5.5" distance="10" k1="-0.0513" k2="0.0673" k3="-0.0453"/>
-+            <vignetting model="pa" focal="14.7" aperture="5.5" distance="1000" k1="-0.0513" k2="0.0673" k3="-0.0453"/>
-+            <vignetting model="pa" focal="14.7" aperture="7.8" distance="10" k1="-0.0317" k2="0.0205" k3="-0.0126"/>
-+            <vignetting model="pa" focal="14.7" aperture="7.8" distance="1000" k1="-0.0317" k2="0.0205" k3="-0.0126"/>
-+            <vignetting model="pa" focal="22.8" aperture="4" distance="10" k1="-0.0796" k2="0.1648" k3="-0.2315"/>
-+            <vignetting model="pa" focal="22.8" aperture="4" distance="1000" k1="-0.0796" k2="0.1648" k3="-0.2315"/>
-+            <vignetting model="pa" focal="22.8" aperture="5.6" distance="10" k1="-0.0215" k2="0.0048" k3="-0.0059"/>
-+            <vignetting model="pa" focal="22.8" aperture="5.6" distance="1000" k1="-0.0215" k2="0.0048" k3="-0.0059"/>
-+            <vignetting model="pa" focal="22.8" aperture="7.8" distance="10" k1="-0.0155" k2="-0.0143" k3="0.0078"/>
-+            <vignetting model="pa" focal="22.8" aperture="7.8" distance="1000" k1="-0.0155" k2="-0.0143" k3="0.0078"/>
-+            <vignetting model="pa" focal="34.8" aperture="4.9" distance="10" k1="-0.1268" k2="-0.0734" k3="-0.0007"/>
-+            <vignetting model="pa" focal="34.8" aperture="4.9" distance="1000" k1="-0.1268" k2="-0.0734" k3="-0.0007"/>
-+            <vignetting model="pa" focal="34.8" aperture="5.6" distance="10" k1="-0.1098" k2="-0.1022" k3="0.0460"/>
-+            <vignetting model="pa" focal="34.8" aperture="5.6" distance="1000" k1="-0.1098" k2="-0.1022" k3="0.0460"/>
-+            <vignetting model="pa" focal="34.8" aperture="7.9" distance="10" k1="-0.0949" k2="-0.1558" k3="0.0878"/>
-+            <vignetting model="pa" focal="34.8" aperture="7.9" distance="1000" k1="-0.0949" k2="-0.1558" k3="0.0878"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A640 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonA640</mount>
-+        <cropfactor>4.79</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="7.3" a="0.02127" b="-0.05684" c="0.0111"/>
-+            <distortion model="ptlens" focal="8.5" a="0.01234" b="-0.03216" c="-0.00418"/>
-+            <distortion model="ptlens" focal="9.6" a="0.00595" b="-0.01344" c="-0.01032"/>
-+            <distortion model="ptlens" focal="10.8" a="0.01574" b="-0.04867" c="0.03964"/>
-+            <distortion model="ptlens" focal="12.6" a="0" b="0.00126" c="0"/>
-+            <distortion model="ptlens" focal="29.2" a="0" b="0.00432" c="0"/>
-+            <vignetting model="pa" focal="7.3" aperture="2.9" distance="10" k1="-0.2680" k2="0.2617" k3="-0.4865"/>
-+            <vignetting model="pa" focal="7.3" aperture="2.9" distance="1000" k1="-0.2680" k2="0.2617" k3="-0.4865"/>
-+            <vignetting model="pa" focal="7.3" aperture="4.2" distance="10" k1="-0.4023" k2="0.6843" k3="-0.6517"/>
-+            <vignetting model="pa" focal="7.3" aperture="4.2" distance="1000" k1="-0.4023" k2="0.6843" k3="-0.6517"/>
-+            <vignetting model="pa" focal="7.3" aperture="5.8" distance="10" k1="-0.3638" k2="0.4933" k3="-0.4203"/>
-+            <vignetting model="pa" focal="7.3" aperture="5.8" distance="1000" k1="-0.3638" k2="0.4933" k3="-0.4203"/>
-+            <vignetting model="pa" focal="7.3" aperture="8" distance="10" k1="-0.2783" k2="0.1703" k3="-0.1221"/>
-+            <vignetting model="pa" focal="7.3" aperture="8" distance="1000" k1="-0.2783" k2="0.1703" k3="-0.1221"/>
-+            <vignetting model="pa" focal="8.5" aperture="2.9" distance="10" k1="-0.3603" k2="0.3063" k3="-0.2459"/>
-+            <vignetting model="pa" focal="8.5" aperture="2.9" distance="1000" k1="-0.3603" k2="0.3063" k3="-0.2459"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.9" distance="10" k1="-0.2402" k2="0.0817" k3="-0.0274"/>
-+            <vignetting model="pa" focal="8.5" aperture="3.9" distance="1000" k1="-0.2402" k2="0.0817" k3="-0.0274"/>
-+            <vignetting model="pa" focal="8.5" aperture="5.5" distance="10" k1="-0.2470" k2="0.1125" k3="-0.0481"/>
-+            <vignetting model="pa" focal="8.5" aperture="5.5" distance="1000" k1="-0.2470" k2="0.1125" k3="-0.0481"/>
-+            <vignetting model="pa" focal="8.5" aperture="7.8" distance="10" k1="-0.2472" k2="0.1190" k3="-0.0526"/>
-+            <vignetting model="pa" focal="8.5" aperture="7.8" distance="1000" k1="-0.2472" k2="0.1190" k3="-0.0526"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.1" distance="10" k1="-0.2337" k2="0.0955" k3="-0.0709"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.1" distance="1000" k1="-0.2337" k2="0.0955" k3="-0.0709"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.9" distance="10" k1="-0.2110" k2="0.0608" k3="-0.0086"/>
-+            <vignetting model="pa" focal="9.6" aperture="3.9" distance="1000" k1="-0.2110" k2="0.0608" k3="-0.0086"/>
-+            <vignetting model="pa" focal="9.6" aperture="5.3" distance="10" k1="-0.2204" k2="0.0976" k3="-0.0333"/>
-+            <vignetting model="pa" focal="9.6" aperture="5.3" distance="1000" k1="-0.2204" k2="0.0976" k3="-0.0333"/>
-+            <vignetting model="pa" focal="9.6" aperture="7.8" distance="10" k1="-0.2181" k2="0.0976" k3="-0.0318"/>
-+            <vignetting model="pa" focal="9.6" aperture="7.8" distance="1000" k1="-0.2181" k2="0.0976" k3="-0.0318"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.1" distance="10" k1="-0.2932" k2="0.2521" k3="-0.1823"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.1" distance="1000" k1="-0.2932" k2="0.2521" k3="-0.1823"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.9" distance="10" k1="-0.1899" k2="0.0732" k3="-0.0228"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.9" distance="1000" k1="-0.1899" k2="0.0732" k3="-0.0228"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.5" distance="10" k1="-0.1956" k2="0.0996" k3="-0.0386"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.5" distance="1000" k1="-0.1956" k2="0.0996" k3="-0.0386"/>
-+            <vignetting model="pa" focal="10.8" aperture="7.8" distance="10" k1="-0.1960" k2="0.0990" k3="-0.0354"/>
-+            <vignetting model="pa" focal="10.8" aperture="7.8" distance="1000" k1="-0.1960" k2="0.0990" k3="-0.0354"/>
-+            <vignetting model="pa" focal="12.6" aperture="3.4" distance="10" k1="-0.2295" k2="0.3265" k3="-0.2752"/>
-+            <vignetting model="pa" focal="12.6" aperture="3.4" distance="1000" k1="-0.2295" k2="0.3265" k3="-0.2752"/>
-+            <vignetting model="pa" focal="12.6" aperture="4.3" distance="10" k1="-0.1610" k2="0.0788" k3="-0.0313"/>
-+            <vignetting model="pa" focal="12.6" aperture="4.3" distance="1000" k1="-0.1610" k2="0.0788" k3="-0.0313"/>
-+            <vignetting model="pa" focal="12.6" aperture="5.9" distance="10" k1="-0.1724" k2="0.1119" k3="-0.0513"/>
-+            <vignetting model="pa" focal="12.6" aperture="5.9" distance="1000" k1="-0.1724" k2="0.1119" k3="-0.0513"/>
-+            <vignetting model="pa" focal="12.6" aperture="7.8" distance="10" k1="-0.1679" k2="0.1075" k3="-0.0493"/>
-+            <vignetting model="pa" focal="12.6" aperture="7.8" distance="1000" k1="-0.1679" k2="0.1075" k3="-0.0493"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.4" distance="10" k1="-0.3008" k2="0.4667" k3="-0.3934"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.4" distance="1000" k1="-0.3008" k2="0.4667" k3="-0.3934"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.9" distance="10" k1="-0.1616" k2="0.1845" k3="-0.1445"/>
-+            <vignetting model="pa" focal="14.9" aperture="3.9" distance="1000" k1="-0.1616" k2="0.1845" k3="-0.1445"/>
-+            <vignetting model="pa" focal="14.9" aperture="5.3" distance="10" k1="-0.1155" k2="0.0275" k3="-0.0039"/>
-+            <vignetting model="pa" focal="14.9" aperture="5.3" distance="1000" k1="-0.1155" k2="0.0275" k3="-0.0039"/>
-+            <vignetting model="pa" focal="14.9" aperture="7.8" distance="10" k1="-0.1101" k2="0.0214" k3="-0.0012"/>
-+            <vignetting model="pa" focal="14.9" aperture="7.8" distance="1000" k1="-0.1101" k2="0.0214" k3="-0.0012"/>
-+            <vignetting model="pa" focal="17.3" aperture="3.7" distance="10" k1="-0.1976" k2="0.3892" k3="-0.3529"/>
-+            <vignetting model="pa" focal="17.3" aperture="3.7" distance="1000" k1="-0.1976" k2="0.3892" k3="-0.3529"/>
-+            <vignetting model="pa" focal="17.3" aperture="4" distance="10" k1="-0.1543" k2="0.2125" k3="-0.1756"/>
-+            <vignetting model="pa" focal="17.3" aperture="4" distance="1000" k1="-0.1543" k2="0.2125" k3="-0.1756"/>
-+            <vignetting model="pa" focal="17.3" aperture="5.7" distance="10" k1="-0.1067" k2="0.0393" k3="-0.0183"/>
-+            <vignetting model="pa" focal="17.3" aperture="5.7" distance="1000" k1="-0.1067" k2="0.0393" k3="-0.0183"/>
-+            <vignetting model="pa" focal="17.3" aperture="7.8" distance="10" k1="-0.1103" k2="0.0556" k3="-0.0284"/>
-+            <vignetting model="pa" focal="17.3" aperture="7.8" distance="1000" k1="-0.1103" k2="0.0556" k3="-0.0284"/>
-+            <vignetting model="pa" focal="21.7" aperture="3.8" distance="10" k1="-0.2461" k2="0.4028" k3="-0.3947"/>
-+            <vignetting model="pa" focal="21.7" aperture="3.8" distance="1000" k1="-0.2461" k2="0.4028" k3="-0.3947"/>
-+            <vignetting model="pa" focal="21.7" aperture="3.9" distance="10" k1="-0.1864" k2="0.3345" k3="-0.3495"/>
-+            <vignetting model="pa" focal="21.7" aperture="3.9" distance="1000" k1="-0.1864" k2="0.3345" k3="-0.3495"/>
-+            <vignetting model="pa" focal="21.7" aperture="5.4" distance="10" k1="-0.0940" k2="-0.0208" k3="0.0074"/>
-+            <vignetting model="pa" focal="21.7" aperture="5.4" distance="1000" k1="-0.0940" k2="-0.0208" k3="0.0074"/>
-+            <vignetting model="pa" focal="21.7" aperture="7.8" distance="10" k1="-0.0995" k2="-0.0149" k3="0.0066"/>
-+            <vignetting model="pa" focal="21.7" aperture="7.8" distance="1000" k1="-0.0995" k2="-0.0149" k3="0.0066"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.2" distance="10" k1="-0.2987" k2="0.1795" k3="-0.2567"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.2" distance="1000" k1="-0.2987" k2="0.1795" k3="-0.2567"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.6" distance="10" k1="-0.2306" k2="0.0499" k3="-0.1285"/>
-+            <vignetting model="pa" focal="29.2" aperture="4.6" distance="1000" k1="-0.2306" k2="0.0499" k3="-0.1285"/>
-+            <vignetting model="pa" focal="29.2" aperture="5.9" distance="10" k1="-0.1686" k2="-0.2201" k3="0.1324"/>
-+            <vignetting model="pa" focal="29.2" aperture="5.9" distance="1000" k1="-0.1686" k2="-0.2201" k3="0.1324"/>
-+            <vignetting model="pa" focal="29.2" aperture="7.8" distance="10" k1="-0.1722" k2="-0.2226" k3="0.1348"/>
-+            <vignetting model="pa" focal="29.2" aperture="7.8" distance="1000" k1="-0.1722" k2="-0.2226" k3="0.1348"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S120 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonS120</mount>
-+        <cropfactor>4.62</cropfactor>
-+        <calibration>
-+            <!-- Refers to 4:3 RAW images. -->
-+            <distortion model="ptlens" focal="5.2" a="0.03458" b="-0.14652" c="-0.00567"/>
-+            <distortion model="ptlens" focal="6" a="0.02428" b="-0.11282" c="0.00044"/>
-+            <distortion model="ptlens" focal="7.5" a="0.00729" b="-0.05338" c="-0.00784"/>
-+            <distortion model="ptlens" focal="10.8" a="0" b="-0.01923" c="0"/>
-+            <distortion model="ptlens" focal="21.7" a="-0.00889" b="0.02672" c="-0.03212"/>
-+            <distortion model="ptlens" focal="26" a="0" b="-0.00284" c="0"/>
-+            <tca model="poly3" focal="5.2" vr="1.0006" vb="1.0005"/>
-+            <tca model="poly3" focal="6" br="0.0007064" vr="0.9997865" bb="-0.0009831" vb="1.0024057"/>
-+            <tca model="poly3" focal="7.5" br="0.0002859" vr="0.9999269" bb="-0.0007185" vb="1.0019609"/>
-+            <tca model="poly3" focal="10.8" br="0.0001012" vr="1.0000603" bb="0.0000902" vb="1.0003115"/>
-+            <tca model="poly3" focal="21.7" br="-0.0001198" vr="1.0005061" bb="-0.0000715" vb="1.0003314"/>
-+            <tca model="poly3" focal="26" br="0.0000121" vr="1.0005797" bb="0.0000653" vb="0.9999953"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX260 HS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonSX260HS</mount>
-+        <cropfactor>5.56</cropfactor>
-+        <!-- The following center point is correct for the camera I measured.
-+             I commented it out because I cannot tell whether this is typical
-+             for all specimen of this camera.  If commented in again, at least
-+             distortion parameters need to be re-calculated.  The parameters
-+             correspond to a shift of (-30px, +90px). -->
-+        <!--center x="-0.0198" y="0.0593276203032"/-->
-+        <calibration>
-+            <distortion model="ptlens" focal="4.5" a="0.06245" b="-0.20795" c="0.06699"/>
-+            <distortion model="ptlens" focal="6.5" a="-0.00555" b="0.01217" c="-0.07664"/>
-+            <distortion model="ptlens" focal="10.9" a="0" b="-0.0069" c="0"/>
-+            <distortion model="ptlens" focal="18.7" a="0" b="-0.00279" c="0"/>
-+            <distortion model="ptlens" focal="33.6" a="0" b="-0.00472" c="0"/>
-+            <distortion model="ptlens" focal="65.6" a="0" b="-0.00556" c="0"/>
-+            <distortion model="ptlens" focal="90" a="0" b="0.002" c="0"/>
-+            <!-- TCA could not be measured because the CHDK RAW generator seems
-+                 to shift the colour planes relatively to each other. -->
-+            <vignetting model="pa" focal="4.5" aperture="3.6" distance="10" k1="0.1268" k2="-0.0324" k3="-1.1226"/>
-+            <vignetting model="pa" focal="4.5" aperture="3.6" distance="1000" k1="0.1268" k2="-0.0324" k3="-1.1226"/>
-+            <vignetting model="pa" focal="4.5" aperture="4" distance="10" k1="0.0572" k2="0.2721" k3="-1.3648"/>
-+            <vignetting model="pa" focal="4.5" aperture="4" distance="1000" k1="0.0572" k2="0.2721" k3="-1.3648"/>
-+            <vignetting model="pa" focal="4.5" aperture="4.4" distance="10" k1="0.0147" k2="0.4460" k3="-1.5023"/>
-+            <vignetting model="pa" focal="4.5" aperture="4.4" distance="1000" k1="0.0147" k2="0.4460" k3="-1.5023"/>
-+            <vignetting model="pa" focal="4.5" aperture="5" distance="10" k1="-0.0505" k2="0.6998" k3="-1.6953"/>
-+            <vignetting model="pa" focal="4.5" aperture="5" distance="1000" k1="-0.0505" k2="0.6998" k3="-1.6953"/>
-+            <vignetting model="pa" focal="4.5" aperture="5.6" distance="10" k1="-0.0950" k2="0.8710" k3="-1.8243"/>
-+            <vignetting model="pa" focal="4.5" aperture="5.6" distance="1000" k1="-0.0950" k2="0.8710" k3="-1.8243"/>
-+            <vignetting model="pa" focal="4.5" aperture="6.3" distance="10" k1="-0.1449" k2="1.0515" k3="-1.9562"/>
-+            <vignetting model="pa" focal="4.5" aperture="6.3" distance="1000" k1="-0.1449" k2="1.0515" k3="-1.9562"/>
-+            <vignetting model="pa" focal="4.5" aperture="7.1" distance="10" k1="-0.1873" k2="1.2117" k3="-2.0752"/>
-+            <vignetting model="pa" focal="4.5" aperture="7.1" distance="1000" k1="-0.1873" k2="1.2117" k3="-2.0752"/>
-+            <vignetting model="pa" focal="4.5" aperture="8" distance="10" k1="-0.2203" k2="1.3289" k3="-2.1586"/>
-+            <vignetting model="pa" focal="4.5" aperture="8" distance="1000" k1="-0.2203" k2="1.3289" k3="-2.1586"/>
-+            <vignetting model="pa" focal="6.5" aperture="4" distance="10" k1="-0.0798" k2="0.2036" k3="-0.2248"/>
-+            <vignetting model="pa" focal="6.5" aperture="4" distance="1000" k1="-0.0798" k2="0.2036" k3="-0.2248"/>
-+            <vignetting model="pa" focal="6.5" aperture="4.4" distance="10" k1="-0.0749" k2="0.1766" k3="-0.1856"/>
-+            <vignetting model="pa" focal="6.5" aperture="4.4" distance="1000" k1="-0.0749" k2="0.1766" k3="-0.1856"/>
-+            <vignetting model="pa" focal="6.5" aperture="5" distance="10" k1="-0.0707" k2="0.1660" k3="-0.1772"/>
-+            <vignetting model="pa" focal="6.5" aperture="5" distance="1000" k1="-0.0707" k2="0.1660" k3="-0.1772"/>
-+            <vignetting model="pa" focal="6.5" aperture="5.6" distance="10" k1="-0.0700" k2="0.1642" k3="-0.1755"/>
-+            <vignetting model="pa" focal="6.5" aperture="5.6" distance="1000" k1="-0.0700" k2="0.1642" k3="-0.1755"/>
-+            <vignetting model="pa" focal="6.5" aperture="6.3" distance="10" k1="-0.0715" k2="0.1691" k3="-0.1785"/>
-+            <vignetting model="pa" focal="6.5" aperture="6.3" distance="1000" k1="-0.0715" k2="0.1691" k3="-0.1785"/>
-+            <vignetting model="pa" focal="6.5" aperture="7.1" distance="10" k1="-0.0401" k2="0.0339" k3="-0.0303"/>
-+            <vignetting model="pa" focal="6.5" aperture="7.1" distance="1000" k1="-0.0401" k2="0.0339" k3="-0.0303"/>
-+            <vignetting model="pa" focal="6.5" aperture="8" distance="10" k1="-0.0378" k2="0.0286" k3="-0.0266"/>
-+            <vignetting model="pa" focal="6.5" aperture="8" distance="1000" k1="-0.0378" k2="0.0286" k3="-0.0266"/>
-+            <vignetting model="pa" focal="10.9" aperture="4.4" distance="10" k1="-0.0308" k2="0.1240" k3="-0.1811"/>
-+            <vignetting model="pa" focal="10.9" aperture="4.4" distance="1000" k1="-0.0308" k2="0.1240" k3="-0.1811"/>
-+            <vignetting model="pa" focal="10.9" aperture="5" distance="10" k1="-0.0506" k2="0.1821" k3="-0.1820"/>
-+            <vignetting model="pa" focal="10.9" aperture="5" distance="1000" k1="-0.0506" k2="0.1821" k3="-0.1820"/>
-+            <vignetting model="pa" focal="10.9" aperture="5.6" distance="10" k1="-0.0485" k2="0.1761" k3="-0.1766"/>
-+            <vignetting model="pa" focal="10.9" aperture="5.6" distance="1000" k1="-0.0485" k2="0.1761" k3="-0.1766"/>
-+            <vignetting model="pa" focal="10.9" aperture="6.3" distance="10" k1="-0.0486" k2="0.1766" k3="-0.1771"/>
-+            <vignetting model="pa" focal="10.9" aperture="6.3" distance="1000" k1="-0.0486" k2="0.1766" k3="-0.1771"/>
-+            <vignetting model="pa" focal="10.9" aperture="7.1" distance="10" k1="-0.0341" k2="0.1112" k3="-0.1077"/>
-+            <vignetting model="pa" focal="10.9" aperture="7.1" distance="1000" k1="-0.0341" k2="0.1112" k3="-0.1077"/>
-+            <vignetting model="pa" focal="10.9" aperture="8" distance="10" k1="-0.0318" k2="0.1059" k3="-0.1043"/>
-+            <vignetting model="pa" focal="10.9" aperture="8" distance="1000" k1="-0.0318" k2="0.1059" k3="-0.1043"/>
-+            <vignetting model="pa" focal="18.7" aperture="5" distance="10" k1="-0.0235" k2="0.1808" k3="-0.2309"/>
-+            <vignetting model="pa" focal="18.7" aperture="5" distance="1000" k1="-0.0235" k2="0.1808" k3="-0.2309"/>
-+            <vignetting model="pa" focal="18.7" aperture="5.6" distance="10" k1="-0.0346" k2="0.2360" k3="-0.2244"/>
-+            <vignetting model="pa" focal="18.7" aperture="5.6" distance="1000" k1="-0.0346" k2="0.2360" k3="-0.2244"/>
-+            <vignetting model="pa" focal="18.7" aperture="6.3" distance="10" k1="-0.0280" k2="0.2087" k3="-0.1995"/>
-+            <vignetting model="pa" focal="18.7" aperture="6.3" distance="1000" k1="-0.0280" k2="0.2087" k3="-0.1995"/>
-+            <vignetting model="pa" focal="18.7" aperture="7.1" distance="10" k1="-0.0288" k2="0.2090" k3="-0.1989"/>
-+            <vignetting model="pa" focal="18.7" aperture="7.1" distance="1000" k1="-0.0288" k2="0.2090" k3="-0.1989"/>
-+            <vignetting model="pa" focal="18.7" aperture="8" distance="10" k1="-0.0281" k2="0.2043" k3="-0.1949"/>
-+            <vignetting model="pa" focal="18.7" aperture="8" distance="1000" k1="-0.0281" k2="0.2043" k3="-0.1949"/>
-+            <vignetting model="pa" focal="33.6" aperture="5.6" distance="10" k1="-0.0762" k2="0.6718" k3="-0.8158"/>
-+            <vignetting model="pa" focal="33.6" aperture="5.6" distance="1000" k1="-0.0762" k2="0.6718" k3="-0.8158"/>
-+            <vignetting model="pa" focal="33.6" aperture="6.3" distance="10" k1="-0.1297" k2="0.8456" k3="-0.8534"/>
-+            <vignetting model="pa" focal="33.6" aperture="6.3" distance="1000" k1="-0.1297" k2="0.8456" k3="-0.8534"/>
-+            <vignetting model="pa" focal="33.6" aperture="7.1" distance="10" k1="-0.1336" k2="0.8124" k3="-0.7759"/>
-+            <vignetting model="pa" focal="33.6" aperture="7.1" distance="1000" k1="-0.1336" k2="0.8124" k3="-0.7759"/>
-+            <vignetting model="pa" focal="33.6" aperture="8" distance="10" k1="-0.1073" k2="0.6860" k3="-0.6364"/>
-+            <vignetting model="pa" focal="33.6" aperture="8" distance="1000" k1="-0.1073" k2="0.6860" k3="-0.6364"/>
-+            <vignetting model="pa" focal="65.6" aperture="6.3" distance="10" k1="0.2398" k2="-0.6323" k3="0.0972"/>
-+            <vignetting model="pa" focal="65.6" aperture="6.3" distance="1000" k1="0.2398" k2="-0.6323" k3="0.0972"/>
-+            <vignetting model="pa" focal="65.6" aperture="7.1" distance="10" k1="0.1386" k2="-0.1479" k3="-0.2298"/>
-+            <vignetting model="pa" focal="65.6" aperture="7.1" distance="1000" k1="0.1386" k2="-0.1479" k3="-0.2298"/>
-+            <vignetting model="pa" focal="65.6" aperture="8" distance="10" k1="0.0349" k2="0.2419" k3="-0.4829"/>
-+            <vignetting model="pa" focal="65.6" aperture="8" distance="1000" k1="0.0349" k2="0.2419" k3="-0.4829"/>
-+            <vignetting model="pa" focal="90" aperture="7.1" distance="10" k1="-0.0583" k2="-0.4605" k3="0.1786"/>
-+            <vignetting model="pa" focal="90" aperture="7.1" distance="1000" k1="-0.0583" k2="-0.4605" k3="0.1786"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="10" k1="0.0380" k2="-0.1847" k3="-0.0881"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="0.0380" k2="-0.1847" k3="-0.0881"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S95 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonS95</mount>
-+        <cropfactor>4.67</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6" a="0.01786" b="-0.08833" c="0.00128"/>
-+            <distortion model="ptlens" focal="7.5" a="0.01778" b="-0.09282" c="0.05441"/>
-+            <distortion model="ptlens" focal="9.6" a="0.00629" b="-0.04712" c="0.0346"/>
-+            <distortion model="ptlens" focal="12.8" a="0" b="-0.01177" c="0"/>
-+            <distortion model="ptlens" focal="22.5" a="0" b="-0.0028" c="0"/>
-+            <tca model="poly3" focal="6" br="0.0001280" vr="0.9999715" bb="-0.0004378" vb="1.0008838"/>
-+            <tca model="poly3" focal="7.5" br="0.0000993" vr="0.9999354" bb="-0.0003050" vb="1.0007215"/>
-+            <tca model="poly3" focal="9.6" br="0.0000870" vr="0.9999529" bb="-0.0001707" vb="1.0005589"/>
-+            <tca model="poly3" focal="12.8" br="0.0000514" vr="0.9999909" bb="-0.0001475" vb="1.0004201"/>
-+            <tca model="poly3" focal="18.2" br="0.0000120" vr="1.0000810" bb="-0.0000387" vb="1.0001960"/>
-+            <tca model="poly3" focal="22.5" br="-0.0000057" vr="1.0001253" bb="0.0000043" vb="1.0000429"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon IXUS 220 HS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonIxus220HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.3" a="0.02693" b="-0.08681" c="-0.06074"/>
-+            <distortion model="ptlens" focal="7.8" a="0.00825" b="-0.03964" c="0.00656"/>
-+            <distortion model="ptlens" focal="11.7" a="0" b="-0.00228" c="0"/>
-+            <distortion model="ptlens" focal="17.5" a="0" b="0.00576" c="0"/>
-+            <distortion model="ptlens" focal="21.5" a="0" b="0.00674" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- This calibration works for 3:2 (crop 1.924) as well as for 4:3
-+             (crop 1.936) -->
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G1X Mark II &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonG1X2</mount>
-+        <cropfactor>1.93</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="12.5" a="0.05797" b="-0.1878" c="-0.00495"/>
-+            <distortion model="ptlens" focal="14.1" a="0.06523" b="-0.20887" c="0.04553"/>
-+            <distortion model="ptlens" focal="19.1" a="0.01625" b="-0.06262" c="-0.02229"/>
-+            <distortion model="ptlens" focal="25.4" a="0.00807" b="-0.03785" c="-0.01218"/>
-+            <distortion model="ptlens" focal="34.9" a="0.00387" b="-0.02733" c="0.00371"/>
-+            <distortion model="ptlens" focal="48.3" a="0" b="-0.00928" c="0"/>
-+            <distortion model="ptlens" focal="62.5" a="0" b="0.0002" c="0"/>
-+            <tca model="poly3" focal="12.5" br="-0.0002147" vr="1.0004482" bb="0.0001968" vb="0.9999579"/>
-+            <tca model="poly3" focal="16.4" br="-0.0001815" vr="1.0004752" bb="0.0001768" vb="0.9998345"/>
-+            <tca model="poly3" focal="30.8" br="0.0000359" vr="1.0002206" bb="0.0000003" vb="0.9998014"/>
-+            <tca model="poly3" focal="44.9" br="0.0000223" vr="1.0000700" bb="-0.0000771" vb="0.9998645"/>
-+            <tca model="poly3" focal="62.5" br="-0.0000494" vr="0.9998549" bb="0.0000108" vb="0.9999408"/>
-+            <vignetting model="pa" focal="12.5" aperture="2" distance="10" k1="-0.9531" k2="0.7634" k3="-0.7955"/>
-+            <vignetting model="pa" focal="12.5" aperture="2" distance="1000" k1="-0.9531" k2="0.7634" k3="-0.7955"/>
-+            <vignetting model="pa" focal="12.5" aperture="2.8" distance="10" k1="-0.3673" k2="0.9591" k3="-2.5313"/>
-+            <vignetting model="pa" focal="12.5" aperture="2.8" distance="1000" k1="-0.3673" k2="0.9591" k3="-2.5313"/>
-+            <vignetting model="pa" focal="12.5" aperture="4" distance="10" k1="-0.4086" k2="1.3336" k3="-2.5076"/>
-+            <vignetting model="pa" focal="12.5" aperture="4" distance="1000" k1="-0.4086" k2="1.3336" k3="-2.5076"/>
-+            <vignetting model="pa" focal="12.5" aperture="5.6" distance="10" k1="-0.3427" k2="0.8066" k3="-1.1632"/>
-+            <vignetting model="pa" focal="12.5" aperture="5.6" distance="1000" k1="-0.3427" k2="0.8066" k3="-1.1632"/>
-+            <vignetting model="pa" focal="12.5" aperture="16" distance="10" k1="-0.3297" k2="0.5187" k3="-0.7346"/>
-+            <vignetting model="pa" focal="12.5" aperture="16" distance="1000" k1="-0.3297" k2="0.5187" k3="-0.7346"/>
-+            <vignetting model="pa" focal="15.5" aperture="3.2" distance="10" k1="-0.6293" k2="2.7379" k3="-3.6045"/>
-+            <vignetting model="pa" focal="15.5" aperture="3.2" distance="1000" k1="-0.6293" k2="2.7379" k3="-3.6045"/>
-+            <vignetting model="pa" focal="15.5" aperture="4.5" distance="10" k1="-0.5561" k2="2.3704" k3="-3.0067"/>
-+            <vignetting model="pa" focal="15.5" aperture="4.5" distance="1000" k1="-0.5561" k2="2.3704" k3="-3.0067"/>
-+            <vignetting model="pa" focal="15.5" aperture="6.3" distance="10" k1="-0.4115" k2="1.5709" k3="-1.9334"/>
-+            <vignetting model="pa" focal="15.5" aperture="6.3" distance="1000" k1="-0.4115" k2="1.5709" k3="-1.9334"/>
-+            <vignetting model="pa" focal="15.5" aperture="9" distance="10" k1="-0.1658" k2="0.4121" k3="-0.5816"/>
-+            <vignetting model="pa" focal="15.5" aperture="9" distance="1000" k1="-0.1658" k2="0.4121" k3="-0.5816"/>
-+            <vignetting model="pa" focal="15.5" aperture="16" distance="10" k1="-0.3101" k2="0.7715" k3="-0.8110"/>
-+            <vignetting model="pa" focal="15.5" aperture="16" distance="1000" k1="-0.3101" k2="0.7715" k3="-0.8110"/>
-+            <vignetting model="pa" focal="22.8" aperture="3.5" distance="10" k1="-0.3207" k2="1.8672" k3="-2.2892"/>
-+            <vignetting model="pa" focal="22.8" aperture="3.5" distance="1000" k1="-0.3207" k2="1.8672" k3="-2.2892"/>
-+            <vignetting model="pa" focal="22.8" aperture="5" distance="10" k1="-0.2163" k2="1.1589" k3="-1.2452"/>
-+            <vignetting model="pa" focal="22.8" aperture="5" distance="1000" k1="-0.2163" k2="1.1589" k3="-1.2452"/>
-+            <vignetting model="pa" focal="22.8" aperture="7.1" distance="10" k1="-0.1127" k2="0.4963" k3="-0.3717"/>
-+            <vignetting model="pa" focal="22.8" aperture="7.1" distance="1000" k1="-0.1127" k2="0.4963" k3="-0.3717"/>
-+            <vignetting model="pa" focal="22.8" aperture="10" distance="10" k1="-0.1126" k2="0.5403" k3="-0.4332"/>
-+            <vignetting model="pa" focal="22.8" aperture="10" distance="1000" k1="-0.1126" k2="0.5403" k3="-0.4332"/>
-+            <vignetting model="pa" focal="22.8" aperture="16" distance="10" k1="-0.0259" k2="0.2870" k3="-0.2076"/>
-+            <vignetting model="pa" focal="22.8" aperture="16" distance="1000" k1="-0.0259" k2="0.2870" k3="-0.2076"/>
-+            <vignetting model="pa" focal="33.1" aperture="3.5" distance="10" k1="-0.1855" k2="1.7440" k3="-2.3172"/>
-+            <vignetting model="pa" focal="33.1" aperture="3.5" distance="1000" k1="-0.1855" k2="1.7440" k3="-2.3172"/>
-+            <vignetting model="pa" focal="33.1" aperture="5" distance="10" k1="-0.2138" k2="1.6075" k3="-1.8266"/>
-+            <vignetting model="pa" focal="33.1" aperture="5" distance="1000" k1="-0.2138" k2="1.6075" k3="-1.8266"/>
-+            <vignetting model="pa" focal="33.1" aperture="7.1" distance="10" k1="0.0150" k2="0.4054" k3="-0.3323"/>
-+            <vignetting model="pa" focal="33.1" aperture="7.1" distance="1000" k1="0.0150" k2="0.4054" k3="-0.3323"/>
-+            <vignetting model="pa" focal="33.1" aperture="10" distance="10" k1="-0.0619" k2="0.5726" k3="-0.4036"/>
-+            <vignetting model="pa" focal="33.1" aperture="10" distance="1000" k1="-0.0619" k2="0.5726" k3="-0.4036"/>
-+            <vignetting model="pa" focal="33.1" aperture="16" distance="10" k1="-0.0356" k2="0.4489" k3="-0.2885"/>
-+            <vignetting model="pa" focal="33.1" aperture="16" distance="1000" k1="-0.0356" k2="0.4489" k3="-0.2885"/>
-+            <vignetting model="pa" focal="62.5" aperture="3.9" distance="10" k1="0.2538" k2="-1.0627" k3="0.3821"/>
-+            <vignetting model="pa" focal="62.5" aperture="3.9" distance="1000" k1="0.2538" k2="-1.0627" k3="0.3821"/>
-+            <vignetting model="pa" focal="62.5" aperture="5.6" distance="10" k1="0.0640" k2="0.1181" k3="-0.5040"/>
-+            <vignetting model="pa" focal="62.5" aperture="5.6" distance="1000" k1="0.0640" k2="0.1181" k3="-0.5040"/>
-+            <vignetting model="pa" focal="62.5" aperture="8" distance="10" k1="-0.1957" k2="0.9094" k3="-0.9272"/>
-+            <vignetting model="pa" focal="62.5" aperture="8" distance="1000" k1="-0.1957" k2="0.9094" k3="-0.9272"/>
-+            <vignetting model="pa" focal="62.5" aperture="11" distance="10" k1="-0.1708" k2="0.6235" k3="-0.5459"/>
-+            <vignetting model="pa" focal="62.5" aperture="11" distance="1000" k1="-0.1708" k2="0.6235" k3="-0.5459"/>
-+            <vignetting model="pa" focal="62.5" aperture="16" distance="10" k1="-0.0073" k2="0.0746" k3="-0.0742"/>
-+            <vignetting model="pa" focal="62.5" aperture="16" distance="1000" k1="-0.0073" k2="0.0746" k3="-0.0742"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot A4000 IS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonA4000IS</mount>
-+        <cropfactor>5.6</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5" a="0.01814" b="-0.07704" c="-0.04865"/>
-+            <distortion model="ptlens" focal="6" a="0.01693" b="-0.06826" c="-0.02449"/>
-+            <distortion model="ptlens" focal="9.1" a="0.00385" b="-0.02753" c="0.00657"/>
-+            <distortion model="ptlens" focal="14.5" a="0" b="-0.00296" c="0"/>
-+            <distortion model="ptlens" focal="23.2" a="0" b="0.00351" c="0"/>
-+            <distortion model="ptlens" focal="30.3" a="0" b="0.00471" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.00466" c="0"/>
-+            <tca model="poly3" focal="5" vr="1.0006427" vb="0.9999543"/>
-+            <tca model="poly3" focal="6" vr="1.0005864" vb="0.9999365"/>
-+            <tca model="poly3" focal="9.1" vr="1.0004020" vb="0.9998541"/>
-+            <tca model="poly3" focal="14.5" vr="1.0002037" vb="0.9997161"/>
-+            <tca model="poly3" focal="23.2" vr="1.0000605" vb="0.9997287"/>
-+            <tca model="poly3" focal="30.3" vr="0.9999841" vb="0.9998124"/>
-+            <tca model="poly3" focal="40" vr="0.9999261" vb="0.9997613"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon G7 X &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonG7X</mount>
-+        <cropfactor>2.72</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="8.8" a="0.03872" b="-0.15563" c="0.02544"/>
-+            <distortion model="ptlens" focal="10.2" a="0.02069" b="-0.08948" c="-0.00758"/>
-+            <distortion model="ptlens" focal="12.8" a="0.00157" b="-0.01787" c="-0.04424"/>
-+            <distortion model="ptlens" focal="18.1" a="0" b="-0.01038" c="0"/>
-+            <distortion model="ptlens" focal="31" a="0" b="0.00302" c="0"/>
-+            <distortion model="ptlens" focal="36.8" a="0" b="0.00625" c="0"/>
-+            <tca model="poly3" focal="8.8" br="-0.0005162" vr="1.0016034" bb="0.0004383" vb="0.9993909"/>
-+            <tca model="poly3" focal="11.5" br="-0.0002728" vr="1.0011909" bb="0.0002069" vb="0.9996313"/>
-+            <tca model="poly3" focal="14.2" br="-0.0001588" vr="1.0008252" bb="0.0001122" vb="0.9998027"/>
-+            <tca model="poly3" focal="18.4" br="-0.0001077" vr="1.0004530" bb="0.0000610" vb="0.9999249"/>
-+            <tca model="poly3" focal="25.2" br="-0.0000678" vr="1.0001331" bb="0.0000333" vb="0.9999687"/>
-+            <tca model="poly3" focal="36.8" br="-0.0000631" vr="0.9998836" bb="0.0000158" vb="0.9999238"/>
-+            <vignetting model="pa" focal="8.8" aperture="1.8" distance="10" k1="-0.2553" k2="-0.1170" k3="-0.7056"/>
-+            <vignetting model="pa" focal="8.8" aperture="1.8" distance="1000" k1="-0.2553" k2="-0.1170" k3="-0.7056"/>
-+            <vignetting model="pa" focal="8.8" aperture="2.5" distance="10" k1="0.0116" k2="-0.3654" k3="-0.7260"/>
-+            <vignetting model="pa" focal="8.8" aperture="2.5" distance="1000" k1="0.0116" k2="-0.3654" k3="-0.7260"/>
-+            <vignetting model="pa" focal="8.8" aperture="3.5" distance="10" k1="-0.0396" k2="-0.0536" k3="-0.9917"/>
-+            <vignetting model="pa" focal="8.8" aperture="3.5" distance="1000" k1="-0.0396" k2="-0.0536" k3="-0.9917"/>
-+            <vignetting model="pa" focal="8.8" aperture="5" distance="10" k1="-0.2345" k2="0.8117" k3="-1.6607"/>
-+            <vignetting model="pa" focal="8.8" aperture="5" distance="1000" k1="-0.2345" k2="0.8117" k3="-1.6607"/>
-+            <vignetting model="pa" focal="8.8" aperture="11" distance="10" k1="-0.3502" k2="1.3201" k3="-2.0550"/>
-+            <vignetting model="pa" focal="8.8" aperture="11" distance="1000" k1="-0.3502" k2="1.3201" k3="-2.0550"/>
-+            <vignetting model="pa" focal="12.2" aperture="2.2" distance="10" k1="-0.9433" k2="1.5959" k3="-1.1783"/>
-+            <vignetting model="pa" focal="12.2" aperture="2.2" distance="1000" k1="-0.9433" k2="1.5959" k3="-1.1783"/>
-+            <vignetting model="pa" focal="12.2" aperture="3.2" distance="10" k1="-0.0705" k2="-0.0631" k3="-0.2402"/>
-+            <vignetting model="pa" focal="12.2" aperture="3.2" distance="1000" k1="-0.0705" k2="-0.0631" k3="-0.2402"/>
-+            <vignetting model="pa" focal="12.2" aperture="4.5" distance="10" k1="-0.3210" k2="0.6479" k3="-0.6690"/>
-+            <vignetting model="pa" focal="12.2" aperture="4.5" distance="1000" k1="-0.3210" k2="0.6479" k3="-0.6690"/>
-+            <vignetting model="pa" focal="12.2" aperture="6.3" distance="10" k1="-0.3130" k2="0.5326" k3="-0.4661"/>
-+            <vignetting model="pa" focal="12.2" aperture="6.3" distance="1000" k1="-0.3130" k2="0.5326" k3="-0.4661"/>
-+            <vignetting model="pa" focal="12.2" aperture="9" distance="10" k1="-0.2301" k2="0.2070" k3="-0.1677"/>
-+            <vignetting model="pa" focal="12.2" aperture="9" distance="1000" k1="-0.2301" k2="0.2070" k3="-0.1677"/>
-+            <vignetting model="pa" focal="12.2" aperture="11" distance="10" k1="-0.2130" k2="0.1342" k3="-0.0993"/>
-+            <vignetting model="pa" focal="12.2" aperture="11" distance="1000" k1="-0.2130" k2="0.1342" k3="-0.0993"/>
-+            <vignetting model="pa" focal="16.8" aperture="2.5" distance="10" k1="-0.5504" k2="0.5311" k3="-0.3166"/>
-+            <vignetting model="pa" focal="16.8" aperture="2.5" distance="1000" k1="-0.5504" k2="0.5311" k3="-0.3166"/>
-+            <vignetting model="pa" focal="16.8" aperture="3.5" distance="10" k1="-0.0703" k2="-0.1104" k3="-0.1004"/>
-+            <vignetting model="pa" focal="16.8" aperture="3.5" distance="1000" k1="-0.0703" k2="-0.1104" k3="-0.1004"/>
-+            <vignetting model="pa" focal="16.8" aperture="5" distance="10" k1="-0.2687" k2="0.5568" k3="-0.4949"/>
-+            <vignetting model="pa" focal="16.8" aperture="5" distance="1000" k1="-0.2687" k2="0.5568" k3="-0.4949"/>
-+            <vignetting model="pa" focal="16.8" aperture="7.1" distance="10" k1="-0.2001" k2="0.2552" k3="-0.1775"/>
-+            <vignetting model="pa" focal="16.8" aperture="7.1" distance="1000" k1="-0.2001" k2="0.2552" k3="-0.1775"/>
-+            <vignetting model="pa" focal="16.8" aperture="10" distance="10" k1="-0.1708" k2="0.1409" k3="-0.0725"/>
-+            <vignetting model="pa" focal="16.8" aperture="10" distance="1000" k1="-0.1708" k2="0.1409" k3="-0.0725"/>
-+            <vignetting model="pa" focal="16.8" aperture="11" distance="10" k1="-0.1797" k2="0.1623" k3="-0.0873"/>
-+            <vignetting model="pa" focal="16.8" aperture="11" distance="1000" k1="-0.1797" k2="0.1623" k3="-0.0873"/>
-+            <vignetting model="pa" focal="23.4" aperture="2.8" distance="10" k1="-0.3289" k2="0.9280" k3="-0.8241"/>
-+            <vignetting model="pa" focal="23.4" aperture="2.8" distance="1000" k1="-0.3289" k2="0.9280" k3="-0.8241"/>
-+            <vignetting model="pa" focal="23.4" aperture="4" distance="10" k1="-0.1598" k2="0.2689" k3="-0.2806"/>
-+            <vignetting model="pa" focal="23.4" aperture="4" distance="1000" k1="-0.1598" k2="0.2689" k3="-0.2806"/>
-+            <vignetting model="pa" focal="23.4" aperture="5.6" distance="10" k1="-0.1551" k2="0.1893" k3="-0.1145"/>
-+            <vignetting model="pa" focal="23.4" aperture="5.6" distance="1000" k1="-0.1551" k2="0.1893" k3="-0.1145"/>
-+            <vignetting model="pa" focal="23.4" aperture="8" distance="10" k1="-0.1492" k2="0.1581" k3="-0.0767"/>
-+            <vignetting model="pa" focal="23.4" aperture="8" distance="1000" k1="-0.1492" k2="0.1581" k3="-0.0767"/>
-+            <vignetting model="pa" focal="23.4" aperture="11" distance="10" k1="-0.1533" k2="0.1661" k3="-0.0794"/>
-+            <vignetting model="pa" focal="23.4" aperture="11" distance="1000" k1="-0.1533" k2="0.1661" k3="-0.0794"/>
-+            <vignetting model="pa" focal="36.8" aperture="2.8" distance="10" k1="-0.1704" k2="-0.2258" k3="0.0705"/>
-+            <vignetting model="pa" focal="36.8" aperture="2.8" distance="1000" k1="-0.1704" k2="-0.2258" k3="0.0705"/>
-+            <vignetting model="pa" focal="36.8" aperture="4" distance="10" k1="-0.1958" k2="0.4549" k3="-0.4959"/>
-+            <vignetting model="pa" focal="36.8" aperture="4" distance="1000" k1="-0.1958" k2="0.4549" k3="-0.4959"/>
-+            <vignetting model="pa" focal="36.8" aperture="5.6" distance="10" k1="-0.2475" k2="0.3334" k3="-0.2460"/>
-+            <vignetting model="pa" focal="36.8" aperture="5.6" distance="1000" k1="-0.2475" k2="0.3334" k3="-0.2460"/>
-+            <vignetting model="pa" focal="36.8" aperture="8" distance="10" k1="-0.1842" k2="0.0868" k3="-0.0198"/>
-+            <vignetting model="pa" focal="36.8" aperture="8" distance="1000" k1="-0.1842" k2="0.0868" k3="-0.0198"/>
-+            <vignetting model="pa" focal="36.8" aperture="11" distance="10" k1="-0.1869" k2="0.0890" k3="-0.0178"/>
-+            <vignetting model="pa" focal="36.8" aperture="11" distance="1000" k1="-0.1869" k2="0.0890" k3="-0.0178"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S100 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonS100</mount>
-+        <cropfactor>4.62</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5.2" a="0.02214" b="-0.10656" c="-0.01315"/>
-+            <distortion model="ptlens" focal="7" a="0.00303" b="-0.042" c="-0.00608"/>
-+            <distortion model="ptlens" focal="9.5" a="0" b="-0.0205" c="0"/>
-+            <distortion model="ptlens" focal="12.3" a="0" b="-0.01071" c="0"/>
-+            <distortion model="ptlens" focal="21.7" a="0" b="-0.00119" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0" b="-0.00143" c="0"/>
-+            <tca model="poly3" focal="5.2" br="0.0005532" vr="0.9997686" bb="-0.0005614" vb="1.0010464"/>
-+            <tca model="poly3" focal="7" br="0.0000637" vr="0.9999826" bb="-0.0002196" vb="1.0006293"/>
-+            <tca model="poly3" focal="9.5" br="0.0000138" vr="1.0000004" bb="-0.0001379" vb="1.0003524"/>
-+            <tca model="poly3" focal="12.3" br="-0.0000172" vr="1.0000424" bb="-0.0000860" vb="1.0002696"/>
-+            <tca model="poly3" focal="21.7" br="-0.0000362" vr="1.0000884" bb="-0.0000442" vb="1.0000962"/>
-+            <tca model="poly3" focal="26" br="0.0000709" vr="1.0000116" bb="-0.0000173" vb="1.0000555"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon IXUS 125 HS &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonIxus125HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.3" a="0.0414" b="-0.15308" c="0.04158"/>
-+            <distortion model="ptlens" focal="7.8" a="0" b="-0.01745" c="0"/>
-+            <distortion model="ptlens" focal="11.2" a="0" b="-0.00357" c="0"/>
-+            <distortion model="ptlens" focal="16.2" a="0" b="0.00377" c="0"/>
-+            <distortion model="ptlens" focal="21.5" a="0" b="0.00709" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX510 HS &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonSX510HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="4.3" k1="-0.00676"/>
-+            <distortion model="poly3" focal="7.3" k1="-0.00704"/>
-+            <distortion model="poly3" focal="13.5" k1="-0.00508"/>
-+            <distortion model="poly3" focal="38.02" k1="-0.0009"/>
-+            <distortion model="poly3" focal="129" k1="0.01651"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX510 HS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonSX510HS</mount>
-+        <cropfactor>5.58</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.3" a="0.09431" b="-0.30906" c="0.16325"/>
-+            <distortion model="ptlens" focal="7.3" a="-0.01391" b="0.04723" c="-0.1158"/>
-+            <distortion model="ptlens" focal="13.5" a="-0.00449" b="0.00424" c="-0.00131"/>
-+            <distortion model="ptlens" focal="38" a="0" b="-0.00112" c="0"/>
-+            <distortion model="ptlens" focal="129" a="0" b="0.00284" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot S110 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonS110</mount>
-+        <aperture min="2" max="8"/>
-+        <cropfactor>4.62</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5.2" a="0.02413" b="-0.13243" c="0.04812"/>
-+            <distortion model="ptlens" focal="7.3" a="0" b="-0.03409" c="0"/>
-+            <distortion model="ptlens" focal="11.6" a="0" b="-0.0117" c="0"/>
-+            <distortion model="ptlens" focal="15.1" a="0" b="-0.00591" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0" b="-0.00051" c="0"/>
-+            <tca model="poly3" focal="5.2" br="0.0005406" vr="0.9997708" bb="-0.0005534" vb="1.0010173"/>
-+            <tca model="poly3" focal="6" br="0.0003573" vr="0.9998093" bb="-0.0004156" vb="1.0008989"/>
-+            <tca model="poly3" focal="7.5" br="0.0001571" vr="0.9998835" bb="-0.0003592" vb="1.0010216"/>
-+            <tca model="poly3" focal="10.8" br="0.0000533" vr="0.9999270" bb="-0.0002132" vb="1.0006859"/>
-+            <tca model="poly3" focal="18.4" br="0.0000095" vr="1.0000614" bb="-0.0000490" vb="1.0002302"/>
-+            <tca model="poly3" focal="21.6" br="0.0000129" vr="1.0000749" bb="-0.0000119" vb="1.0000899"/>
-+            <tca model="poly3" focal="26" br="0.0000498" vr="1.0001549" bb="-0.0000029" vb="0.9999835"/>
-+            <vignetting model="pa" focal="5.2" aperture="2" distance="10" k1="-1.5437" k2="2.1484" k3="-1.3830"/>
-+            <vignetting model="pa" focal="5.2" aperture="2" distance="1000" k1="-1.5437" k2="2.1484" k3="-1.3830"/>
-+            <vignetting model="pa" focal="5.2" aperture="8" distance="10" k1="-0.8800" k2="0.7319" k3="-0.5745"/>
-+            <vignetting model="pa" focal="5.2" aperture="8" distance="1000" k1="-0.8800" k2="0.7319" k3="-0.5745"/>
-+            <vignetting model="pa" focal="6" aperture="2.2" distance="10" k1="-1.3579" k2="1.6044" k3="-0.8169"/>
-+            <vignetting model="pa" focal="6" aperture="2.2" distance="1000" k1="-1.3579" k2="1.6044" k3="-0.8169"/>
-+            <vignetting model="pa" focal="6" aperture="8" distance="10" k1="-0.7565" k2="0.7208" k3="-0.5473"/>
-+            <vignetting model="pa" focal="6" aperture="8" distance="1000" k1="-0.7565" k2="0.7208" k3="-0.5473"/>
-+            <vignetting model="pa" focal="7.5" aperture="2.8" distance="10" k1="-0.5935" k2="0.1245" k3="-0.0121"/>
-+            <vignetting model="pa" focal="7.5" aperture="2.8" distance="1000" k1="-0.5935" k2="0.1245" k3="-0.0121"/>
-+            <vignetting model="pa" focal="7.5" aperture="8" distance="10" k1="-0.5321" k2="0.4279" k3="-0.3660"/>
-+            <vignetting model="pa" focal="7.5" aperture="8" distance="1000" k1="-0.5321" k2="0.4279" k3="-0.3660"/>
-+            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.5609" k2="0.2939" k3="-0.1218"/>
-+            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.5609" k2="0.2939" k3="-0.1218"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.3058" k2="0.1651" k3="-0.1433"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.3058" k2="0.1651" k3="-0.1433"/>
-+            <vignetting model="pa" focal="18.4" aperture="5" distance="10" k1="-0.7490" k2="0.7164" k3="-0.3594"/>
-+            <vignetting model="pa" focal="18.4" aperture="5" distance="1000" k1="-0.7490" k2="0.7164" k3="-0.3594"/>
-+            <vignetting model="pa" focal="18.4" aperture="8" distance="10" k1="-0.1028" k2="-0.0527" k3="-0.0295"/>
-+            <vignetting model="pa" focal="18.4" aperture="8" distance="1000" k1="-0.1028" k2="-0.0527" k3="-0.0295"/>
-+            <vignetting model="pa" focal="21.6" aperture="5.6" distance="10" k1="-0.5749" k2="0.4969" k3="-0.2498"/>
-+            <vignetting model="pa" focal="21.6" aperture="5.6" distance="1000" k1="-0.5749" k2="0.4969" k3="-0.2498"/>
-+            <vignetting model="pa" focal="21.6" aperture="8" distance="10" k1="-0.1005" k2="-0.0963" k3="0.0222"/>
-+            <vignetting model="pa" focal="21.6" aperture="8" distance="1000" k1="-0.1005" k2="-0.0963" k3="0.0222"/>
-+            <vignetting model="pa" focal="26" aperture="5.9" distance="10" k1="-0.5277" k2="0.5043" k3="-0.2849"/>
-+            <vignetting model="pa" focal="26" aperture="5.9" distance="1000" k1="-0.5277" k2="0.5043" k3="-0.2849"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="10" k1="-0.0260" k2="-0.3116" k3="0.1489"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.0260" k2="-0.3116" k3="0.1489"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot SX160 IS &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonSX160IS</mount>
-+        <cropfactor>5.6</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5" a="0.0255" b="-0.1025" c="-0.00421"/>
-+            <distortion model="ptlens" focal="7.1" a="0.0084" b="-0.0439" c="-0.0017"/>
-+            <distortion model="ptlens" focal="10.8" a="0.0011" b="-0.0061" c="-0.0160"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="-0.0003" c="0"/>
-+            <distortion model="ptlens" focal="27.9" a="0" b="0.0007" c="0"/>
-+            <distortion model="ptlens" focal="40.9" a="0" b="0.0012" c="0"/>
-+            <distortion model="ptlens" focal="54.9" a="0" b="0.0001" c="0"/>
-+            <distortion model="ptlens" focal="69.9" a="0" b="0.0016" c="0"/>
-+            <distortion model="ptlens" focal="80" a="0" b="0.0008" c="0"/>
-+            <tca model="poly3" focal="5" br="-0.0000523" vr="1.0006404" bb="-0.0000974" vb="1.0002674"/>
-+            <tca model="poly3" focal="7.1" br="0.0002367" vr="1.0003713" bb="-0.0000596" vb="1.0001844"/>
-+            <tca model="poly3" focal="10.8" br="0.0001696" vr="1.0001994" bb="-0.0000226" vb="1.0001132"/>
-+            <tca model="poly3" focal="17.4" br="-0.0000184" vr="1.0001719" bb="-0.0000195" vb="1.0000951"/>
-+            <tca model="poly3" focal="27.9" br="-0.0000180" vr="1.0000102" bb="-0.0000229" vb="1.0000386"/>
-+            <tca model="poly3" focal="40.9" br="-0.0000046" vr="0.9999705" bb="0.0000079" vb="0.9998960"/>
-+            <tca model="poly3" focal="54.9" br="0.0000662" vr="0.9998481" bb="0.0000304" vb="0.9998485"/>
-+            <tca model="poly3" focal="69.9" br="0.0001013" vr="0.9997226" bb="0.0000740" vb="0.9997565"/>
-+            <tca model="poly3" focal="80" br="0.0000576" vr="0.9998020" bb="0.0000875" vb="0.9997326"/>
-+            <vignetting model="pa" focal="5" aperture="3.6" distance="10" k1="-0.5210" k2="1.2701" k3="-1.3864"/>
-+            <vignetting model="pa" focal="5" aperture="3.6" distance="1000" k1="-0.5210" k2="1.2701" k3="-1.3864"/>
-+            <vignetting model="pa" focal="5" aperture="4.1" distance="10" k1="-0.6445" k2="1.7156" k3="-1.6579"/>
-+            <vignetting model="pa" focal="5" aperture="4.1" distance="1000" k1="-0.6445" k2="1.7156" k3="-1.6579"/>
-+            <vignetting model="pa" focal="5" aperture="4.7" distance="10" k1="-0.6582" k2="1.7247" k3="-1.6191"/>
-+            <vignetting model="pa" focal="5" aperture="4.7" distance="1000" k1="-0.6582" k2="1.7247" k3="-1.6191"/>
-+            <vignetting model="pa" focal="5" aperture="5.2" distance="10" k1="-0.6937" k2="1.8245" k3="-1.6778"/>
-+            <vignetting model="pa" focal="5" aperture="5.2" distance="1000" k1="-0.6937" k2="1.8245" k3="-1.6778"/>
-+            <vignetting model="pa" focal="5" aperture="5.6" distance="10" k1="-0.6947" k2="1.8150" k3="-1.6527"/>
-+            <vignetting model="pa" focal="5" aperture="5.6" distance="1000" k1="-0.6947" k2="1.8150" k3="-1.6527"/>
-+            <vignetting model="pa" focal="5" aperture="6" distance="10" k1="-0.7102" k2="1.8686" k3="-1.6883"/>
-+            <vignetting model="pa" focal="5" aperture="6" distance="1000" k1="-0.7102" k2="1.8686" k3="-1.6883"/>
-+            <vignetting model="pa" focal="5" aperture="6.3" distance="10" k1="-0.7211" k2="1.8893" k3="-1.6911"/>
-+            <vignetting model="pa" focal="5" aperture="6.3" distance="1000" k1="-0.7211" k2="1.8893" k3="-1.6911"/>
-+            <vignetting model="pa" focal="5" aperture="7.1" distance="10" k1="-0.7360" k2="1.9351" k3="-1.7071"/>
-+            <vignetting model="pa" focal="5" aperture="7.1" distance="1000" k1="-0.7360" k2="1.9351" k3="-1.7071"/>
-+            <vignetting model="pa" focal="5" aperture="8" distance="10" k1="-0.7416" k2="1.9438" k3="-1.7032"/>
-+            <vignetting model="pa" focal="5" aperture="8" distance="1000" k1="-0.7416" k2="1.9438" k3="-1.7032"/>
-+            <vignetting model="pa" focal="7.1" aperture="3.8" distance="10" k1="-0.1774" k2="0.0002" k3="-0.0356"/>
-+            <vignetting model="pa" focal="7.1" aperture="3.8" distance="1000" k1="-0.1774" k2="0.0002" k3="-0.0356"/>
-+            <vignetting model="pa" focal="7.1" aperture="4.1" distance="10" k1="-0.1835" k2="0.1249" k3="-0.1335"/>
-+            <vignetting model="pa" focal="7.1" aperture="4.1" distance="1000" k1="-0.1835" k2="0.1249" k3="-0.1335"/>
-+            <vignetting model="pa" focal="7.1" aperture="4.7" distance="10" k1="-0.2082" k2="0.1922" k3="-0.1313"/>
-+            <vignetting model="pa" focal="7.1" aperture="4.7" distance="1000" k1="-0.2082" k2="0.1922" k3="-0.1313"/>
-+            <vignetting model="pa" focal="7.1" aperture="5.2" distance="10" k1="-0.1994" k2="0.1570" k3="-0.0978"/>
-+            <vignetting model="pa" focal="7.1" aperture="5.2" distance="1000" k1="-0.1994" k2="0.1570" k3="-0.0978"/>
-+            <vignetting model="pa" focal="7.1" aperture="5.6" distance="10" k1="-0.2040" k2="0.1553" k3="-0.0911"/>
-+            <vignetting model="pa" focal="7.1" aperture="5.6" distance="1000" k1="-0.2040" k2="0.1553" k3="-0.0911"/>
-+            <vignetting model="pa" focal="7.1" aperture="6" distance="10" k1="-0.2014" k2="0.1571" k3="-0.0962"/>
-+            <vignetting model="pa" focal="7.1" aperture="6" distance="1000" k1="-0.2014" k2="0.1571" k3="-0.0962"/>
-+            <vignetting model="pa" focal="7.1" aperture="6.3" distance="10" k1="-0.2037" k2="0.1613" k3="-0.0992"/>
-+            <vignetting model="pa" focal="7.1" aperture="6.3" distance="1000" k1="-0.2037" k2="0.1613" k3="-0.0992"/>
-+            <vignetting model="pa" focal="7.1" aperture="7.1" distance="10" k1="-0.1990" k2="0.1594" k3="-0.1003"/>
-+            <vignetting model="pa" focal="7.1" aperture="7.1" distance="1000" k1="-0.1990" k2="0.1594" k3="-0.1003"/>
-+            <vignetting model="pa" focal="7.1" aperture="8" distance="10" k1="-0.2025" k2="0.1611" k3="-0.0986"/>
-+            <vignetting model="pa" focal="7.1" aperture="8" distance="1000" k1="-0.2025" k2="0.1611" k3="-0.0986"/>
-+            <vignetting model="pa" focal="10.8" aperture="4.2" distance="10" k1="-0.1587" k2="0.0021" k3="-0.0350"/>
-+            <vignetting model="pa" focal="10.8" aperture="4.2" distance="1000" k1="-0.1587" k2="0.0021" k3="-0.0350"/>
-+            <vignetting model="pa" focal="10.8" aperture="4.7" distance="10" k1="-0.1967" k2="0.2501" k3="-0.2043"/>
-+            <vignetting model="pa" focal="10.8" aperture="4.7" distance="1000" k1="-0.1967" k2="0.2501" k3="-0.2043"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.2" distance="10" k1="-0.2017" k2="0.2469" k3="-0.1654"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.2" distance="1000" k1="-0.2017" k2="0.2469" k3="-0.1654"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.6" distance="10" k1="-0.1833" k2="0.2128" k3="-0.1439"/>
-+            <vignetting model="pa" focal="10.8" aperture="5.6" distance="1000" k1="-0.1833" k2="0.2128" k3="-0.1439"/>
-+            <vignetting model="pa" focal="10.8" aperture="6" distance="10" k1="-0.1934" k2="0.2253" k3="-0.1479"/>
-+            <vignetting model="pa" focal="10.8" aperture="6" distance="1000" k1="-0.1934" k2="0.2253" k3="-0.1479"/>
-+            <vignetting model="pa" focal="10.8" aperture="6.3" distance="10" k1="-0.1868" k2="0.2088" k3="-0.1370"/>
-+            <vignetting model="pa" focal="10.8" aperture="6.3" distance="1000" k1="-0.1868" k2="0.2088" k3="-0.1370"/>
-+            <vignetting model="pa" focal="10.8" aperture="7.1" distance="10" k1="-0.1898" k2="0.2107" k3="-0.1335"/>
-+            <vignetting model="pa" focal="10.8" aperture="7.1" distance="1000" k1="-0.1898" k2="0.2107" k3="-0.1335"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.2090" k2="0.2350" k3="-0.1475"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.2090" k2="0.2350" k3="-0.1475"/>
-+            <vignetting model="pa" focal="17.4" aperture="4.6" distance="10" k1="-0.1674" k2="0.0206" k3="-0.0326"/>
-+            <vignetting model="pa" focal="17.4" aperture="4.6" distance="1000" k1="-0.1674" k2="0.0206" k3="-0.0326"/>
-+            <vignetting model="pa" focal="17.4" aperture="4.7" distance="10" k1="-0.1802" k2="0.1413" k3="-0.1258"/>
-+            <vignetting model="pa" focal="17.4" aperture="4.7" distance="1000" k1="-0.1802" k2="0.1413" k3="-0.1258"/>
-+            <vignetting model="pa" focal="17.4" aperture="5.2" distance="10" k1="-0.2029" k2="0.3170" k3="-0.2385"/>
-+            <vignetting model="pa" focal="17.4" aperture="5.2" distance="1000" k1="-0.2029" k2="0.3170" k3="-0.2385"/>
-+            <vignetting model="pa" focal="17.4" aperture="5.6" distance="10" k1="-0.2162" k2="0.3364" k3="-0.2328"/>
-+            <vignetting model="pa" focal="17.4" aperture="5.6" distance="1000" k1="-0.2162" k2="0.3364" k3="-0.2328"/>
-+            <vignetting model="pa" focal="17.4" aperture="6" distance="10" k1="-0.2004" k2="0.2855" k3="-0.1949"/>
-+            <vignetting model="pa" focal="17.4" aperture="6" distance="1000" k1="-0.2004" k2="0.2855" k3="-0.1949"/>
-+            <vignetting model="pa" focal="17.4" aperture="6.3" distance="10" k1="-0.1938" k2="0.2764" k3="-0.1889"/>
-+            <vignetting model="pa" focal="17.4" aperture="6.3" distance="1000" k1="-0.1938" k2="0.2764" k3="-0.1889"/>
-+            <vignetting model="pa" focal="17.4" aperture="7.1" distance="10" k1="-0.1992" k2="0.2834" k3="-0.1903"/>
-+            <vignetting model="pa" focal="17.4" aperture="7.1" distance="1000" k1="-0.1992" k2="0.2834" k3="-0.1903"/>
-+            <vignetting model="pa" focal="17.4" aperture="8" distance="10" k1="-0.1844" k2="0.2544" k3="-0.1721"/>
-+            <vignetting model="pa" focal="17.4" aperture="8" distance="1000" k1="-0.1844" k2="0.2544" k3="-0.1721"/>
-+            <vignetting model="pa" focal="27.9" aperture="4.9" distance="10" k1="-0.2313" k2="0.3015" k3="-0.2820"/>
-+            <vignetting model="pa" focal="27.9" aperture="4.9" distance="1000" k1="-0.2313" k2="0.3015" k3="-0.2820"/>
-+            <vignetting model="pa" focal="27.9" aperture="5.2" distance="10" k1="-0.2349" k2="0.4133" k3="-0.3557"/>
-+            <vignetting model="pa" focal="27.9" aperture="5.2" distance="1000" k1="-0.2349" k2="0.4133" k3="-0.3557"/>
-+            <vignetting model="pa" focal="27.9" aperture="5.6" distance="10" k1="-0.2325" k2="0.4443" k3="-0.3418"/>
-+            <vignetting model="pa" focal="27.9" aperture="5.6" distance="1000" k1="-0.2325" k2="0.4443" k3="-0.3418"/>
-+            <vignetting model="pa" focal="27.9" aperture="6" distance="10" k1="-0.2004" k2="0.3306" k3="-0.2288"/>
-+            <vignetting model="pa" focal="27.9" aperture="6" distance="1000" k1="-0.2004" k2="0.3306" k3="-0.2288"/>
-+            <vignetting model="pa" focal="27.9" aperture="6.3" distance="10" k1="-0.1970" k2="0.3206" k3="-0.2180"/>
-+            <vignetting model="pa" focal="27.9" aperture="6.3" distance="1000" k1="-0.1970" k2="0.3206" k3="-0.2180"/>
-+            <vignetting model="pa" focal="27.9" aperture="7.1" distance="10" k1="-0.1962" k2="0.3168" k3="-0.2127"/>
-+            <vignetting model="pa" focal="27.9" aperture="7.1" distance="1000" k1="-0.1962" k2="0.3168" k3="-0.2127"/>
-+            <vignetting model="pa" focal="27.9" aperture="8" distance="10" k1="-0.1992" k2="0.3181" k3="-0.2152"/>
-+            <vignetting model="pa" focal="27.9" aperture="8" distance="1000" k1="-0.1992" k2="0.3181" k3="-0.2152"/>
-+            <vignetting model="pa" focal="40.9" aperture="5" distance="10" k1="-0.1321" k2="0.2134" k3="-0.4636"/>
-+            <vignetting model="pa" focal="40.9" aperture="5" distance="1000" k1="-0.1321" k2="0.2134" k3="-0.4636"/>
-+            <vignetting model="pa" focal="40.9" aperture="5.2" distance="10" k1="-0.1591" k2="0.3885" k3="-0.5863"/>
-+            <vignetting model="pa" focal="40.9" aperture="5.2" distance="1000" k1="-0.1591" k2="0.3885" k3="-0.5863"/>
-+            <vignetting model="pa" focal="40.9" aperture="5.6" distance="10" k1="-0.2385" k2="0.7011" k3="-0.7793"/>
-+            <vignetting model="pa" focal="40.9" aperture="5.6" distance="1000" k1="-0.2385" k2="0.7011" k3="-0.7793"/>
-+            <vignetting model="pa" focal="40.9" aperture="6" distance="10" k1="-0.2850" k2="0.8239" k3="-0.8053"/>
-+            <vignetting model="pa" focal="40.9" aperture="6" distance="1000" k1="-0.2850" k2="0.8239" k3="-0.8053"/>
-+            <vignetting model="pa" focal="40.9" aperture="6.3" distance="10" k1="-0.3062" k2="0.9034" k3="-0.8442"/>
-+            <vignetting model="pa" focal="40.9" aperture="6.3" distance="1000" k1="-0.3062" k2="0.9034" k3="-0.8442"/>
-+            <vignetting model="pa" focal="40.9" aperture="7.1" distance="10" k1="-0.3260" k2="0.9092" k3="-0.7925"/>
-+            <vignetting model="pa" focal="40.9" aperture="7.1" distance="1000" k1="-0.3260" k2="0.9092" k3="-0.7925"/>
-+            <vignetting model="pa" focal="40.9" aperture="8" distance="10" k1="-0.3224" k2="0.8446" k3="-0.6884"/>
-+            <vignetting model="pa" focal="40.9" aperture="8" distance="1000" k1="-0.3224" k2="0.8446" k3="-0.6884"/>
-+            <vignetting model="pa" focal="54.9" aperture="5.2" distance="10" k1="0.1045" k2="-0.7404" k3="0.2500"/>
-+            <vignetting model="pa" focal="54.9" aperture="5.2" distance="1000" k1="0.1045" k2="-0.7404" k3="0.2500"/>
-+            <vignetting model="pa" focal="54.9" aperture="5.6" distance="10" k1="0.0589" k2="-0.4842" k3="0.0332"/>
-+            <vignetting model="pa" focal="54.9" aperture="5.6" distance="1000" k1="0.0589" k2="-0.4842" k3="0.0332"/>
-+            <vignetting model="pa" focal="54.9" aperture="6" distance="10" k1="0.0276" k2="-0.2987" k3="-0.1235"/>
-+            <vignetting model="pa" focal="54.9" aperture="6" distance="1000" k1="0.0276" k2="-0.2987" k3="-0.1235"/>
-+            <vignetting model="pa" focal="54.9" aperture="6.3" distance="10" k1="-0.0343" k2="-0.0478" k3="-0.2891"/>
-+            <vignetting model="pa" focal="54.9" aperture="6.3" distance="1000" k1="-0.0343" k2="-0.0478" k3="-0.2891"/>
-+            <vignetting model="pa" focal="54.9" aperture="7.1" distance="10" k1="-0.1265" k2="0.3221" k3="-0.5603"/>
-+            <vignetting model="pa" focal="54.9" aperture="7.1" distance="1000" k1="-0.1265" k2="0.3221" k3="-0.5603"/>
-+            <vignetting model="pa" focal="54.9" aperture="8" distance="10" k1="-0.2444" k2="0.7164" k3="-0.8066"/>
-+            <vignetting model="pa" focal="54.9" aperture="8" distance="1000" k1="-0.2444" k2="0.7164" k3="-0.8066"/>
-+            <vignetting model="pa" focal="69.9" aperture="5.7" distance="10" k1="0.0375" k2="-0.7925" k3="0.4020"/>
-+            <vignetting model="pa" focal="69.9" aperture="5.7" distance="1000" k1="0.0375" k2="-0.7925" k3="0.4020"/>
-+            <vignetting model="pa" focal="69.9" aperture="6" distance="10" k1="0.0247" k2="-0.7167" k3="0.3104"/>
-+            <vignetting model="pa" focal="69.9" aperture="6" distance="1000" k1="0.0247" k2="-0.7167" k3="0.3104"/>
-+            <vignetting model="pa" focal="69.9" aperture="6.3" distance="10" k1="-0.0097" k2="-0.4681" k3="0.1359"/>
-+            <vignetting model="pa" focal="69.9" aperture="6.3" distance="1000" k1="-0.0097" k2="-0.4681" k3="0.1359"/>
-+            <vignetting model="pa" focal="69.9" aperture="7.1" distance="10" k1="-0.0778" k2="-0.0921" k3="-0.1703"/>
-+            <vignetting model="pa" focal="69.9" aperture="7.1" distance="1000" k1="-0.0778" k2="-0.0921" k3="-0.1703"/>
-+            <vignetting model="pa" focal="69.9" aperture="8" distance="10" k1="-0.2033" k2="0.3078" k3="-0.4295"/>
-+            <vignetting model="pa" focal="69.9" aperture="8" distance="1000" k1="-0.2033" k2="0.3078" k3="-0.4295"/>
-+            <vignetting model="pa" focal="80" aperture="6" distance="10" k1="0.0390" k2="-0.7304" k3="0.3437"/>
-+            <vignetting model="pa" focal="80" aperture="6" distance="1000" k1="0.0390" k2="-0.7304" k3="0.3437"/>
-+            <vignetting model="pa" focal="80" aperture="6.3" distance="10" k1="-0.0327" k2="-0.4345" k3="0.1550"/>
-+            <vignetting model="pa" focal="80" aperture="6.3" distance="1000" k1="-0.0327" k2="-0.4345" k3="0.1550"/>
-+            <vignetting model="pa" focal="80" aperture="7.1" distance="10" k1="-0.0925" k2="-0.1107" k3="-0.1209"/>
-+            <vignetting model="pa" focal="80" aperture="7.1" distance="1000" k1="-0.0925" k2="-0.1107" k3="-0.1209"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.2243" k2="0.3069" k3="-0.3503"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.2243" k2="0.3069" k3="-0.3503"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon Powershot A495 &amp; compatibles, with CHDK's DNG</model>
-+        <model lang="en">fixed lens, with CHDK's DNG</model>
-+        <model lang="de">festes Objektiv, mit CHDK-DNG</model>
-+        <mount>canonA495</mount>
-+        <cropfactor>5.39</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6.6" a="0.00718" b="-0.033603" c="0.028263"/>
-+            <distortion model="ptlens" focal="8.1" a="0.010729" b="-0.041438" c="0.033314"/>
-+            <distortion model="ptlens" focal="9.8" a="-0.000152" b="-0.006941" c="0.006815"/>
-+            <distortion model="ptlens" focal="12.1" a="-0.002237" b="-0.00272" c="0.011421"/>
-+            <distortion model="ptlens" focal="14.8" a="0.00785" b="-0.036605" c="0.053183"/>
-+            <distortion model="ptlens" focal="17.5" a="0.013399" b="-0.045269" c="0.048979"/>
-+            <distortion model="ptlens" focal="21.6" a="0.004399" b="-0.009577" c="0.002762"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon PowerShot G16 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>canonG16</mount>
-+        <cropfactor>4.67</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6.1" a="0.02662" b="-0.08597" c="0.00168"/>
-+            <distortion model="ptlens" focal="9.3" a="0.00732" b="-0.02562" c="-0.00453"/>
-+            <distortion model="ptlens" focal="12.5" a="-0.00131" b="0.00129" c="-0.00833"/>
-+            <distortion model="ptlens" focal="19.7" a="0.00083" b="-0.00329" c="0.00391"/>
-+            <distortion model="ptlens" focal="30.5" a="0.00382" b="0.00241" c="-0.01637"/>
-+            <tca model="poly3" focal="6.1" vr="1.0005845" vb="1.0000965"/>
-+            <tca model="poly3" focal="9.3" vr="1.0005620" vb="0.9999360"/>
-+            <tca model="poly3" focal="12.5" vr="1.0003889" vb="0.9998557"/>
-+            <tca model="poly3" focal="19.7" vr="1.0000832" vb="0.9997096"/>
-+            <tca model="poly3" focal="30.5" vr="0.9998091" vb="0.9998656"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-casio.xml b/data/db/compact-casio.xml
---- a/data/db/compact-casio.xml	2010-02-18 20:34:13.000000000 +0100
-+++ b/data/db/compact-casio.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,204 +1,172 @@
- <lensdatabase>
--
--    <mount>
--        <name>casioZ750</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>casioP600</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>casioQV3500</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>casioZ4</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>casioEX-FH20</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-Z750</model>
-         <mount>casioZ750</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-P700</model>
-         <mount>casioP600</mount>
-         <cropfactor>4.65</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-P600</model>
-         <mount>casioP600</mount>
-         <cropfactor>4.65</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-Z4</model>
-         <mount>casioZ4</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-Z3</model>
-         <mount>casioZ4</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-Z55</model>
-         <mount>casioZ4</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-Z40</model>
-         <mount>casioZ4</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD</maker>
-+        <maker>Casio Computer Co.,Ltd</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-Z30</model>
-         <mount>casioZ4</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO</maker>
-+        <maker>Casio</maker>
-         <maker lang="en">Casio</maker>
-         <model>QV-4000</model>
-         <mount>canonG2</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO</maker>
-+        <maker>Casio</maker>
-         <maker lang="en">Casio</maker>
-         <model>QV-3500EX</model>
-         <mount>casioQV3500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO</maker>
-+        <maker>Casio</maker>
-         <maker lang="en">Casio</maker>
-         <model>QV-3000EX</model>
-         <mount>casioQV3500</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>CASIO COMPUTER CO.,LTD.</maker>
-+        <maker>Casio Computer Co.,Ltd.</maker>
-         <maker lang="en">Casio</maker>
-         <model>EX-FH20</model>
-         <mount>casioEX-FH20</mount>
-         <cropfactor>5.68</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Casio</maker>
--        <model>Standard</model>
-+        <model>EX-Z750 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>casioZ750</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.9" a="0" b="-0.015843" c="0" />
--            <distortion model="ptlens" focal="9.5" a="0" b="-0.008169" c="0" />
--            <distortion model="ptlens" focal="11.8" a="0" b="-0.006286" c="0" />
--            <distortion model="ptlens" focal="14.2" a="0" b="-0.004511" c="0" />
--            <distortion model="ptlens" focal="16.6" a="0" b="-0.003361" c="0" />
--            <distortion model="ptlens" focal="19.7" a="0" b="-0.004139" c="0" />
--            <distortion model="ptlens" focal="23.7" a="0" b="-0.00471" c="0" />
-+            <distortion model="poly3" focal="7.9" k1="-0.015843"/>
-+            <distortion model="poly3" focal="9.5" k1="-0.008169"/>
-+            <distortion model="poly3" focal="11.8" k1="-0.006286"/>
-+            <distortion model="poly3" focal="14.2" k1="-0.004511"/>
-+            <distortion model="poly3" focal="16.6" k1="-0.003361"/>
-+            <distortion model="poly3" focal="19.7" k1="-0.004139"/>
-+            <distortion model="poly3" focal="23.7" k1="-0.00471"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Casio</maker>
--        <model>Standard</model>
-+        <model>EX-P600 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>casioP600</mount>
-         <cropfactor>4.65</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.020742" b="-0.051562" c="0" />
--            <distortion model="ptlens" focal="7.81" a="0.015463" b="-0.04079" c="0" />
--            <distortion model="ptlens" focal="9.2" a="0.009382" b="-0.022587" c="0" />
--            <distortion model="ptlens" focal="11.3" a="0" b="0.00109" c="0" />
--            <distortion model="ptlens" focal="14.2" a="0" b="0.003042" c="0" />
--            <distortion model="ptlens" focal="19.2" a="0" b="0.00582" c="0" />
--            <distortion model="ptlens" focal="23.4" a="0" b="0.005834" c="0" />
--            <distortion model="ptlens" focal="28.4" a="0" b="0.00818" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.020742" b="-0.051562" c="0"/>
-+            <distortion model="ptlens" focal="7.81" a="0.015463" b="-0.04079" c="0"/>
-+            <distortion model="ptlens" focal="9.2" a="0.009382" b="-0.022587" c="0"/>
-+            <distortion model="ptlens" focal="11.3" a="0" b="0.00109" c="0"/>
-+            <distortion model="ptlens" focal="14.2" a="0" b="0.003042" c="0"/>
-+            <distortion model="ptlens" focal="19.2" a="0" b="0.00582" c="0"/>
-+            <distortion model="ptlens" focal="23.4" a="0" b="0.005834" c="0"/>
-+            <distortion model="ptlens" focal="28.4" a="0" b="0.00818" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Casio</maker>
--        <model>WC-DC58A</model>
-+        <model>EX-P600 &amp; compatibles, with WC-DC58A</model>
-+        <model lang="en">fixed lens, with WC-DC58A</model>
-+        <model lang="de">festes Objektiv, mit WC-DC58A</model>
-         <mount>casioP600</mount>
-         <cropfactor>4.65</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.020587" b="-0.07417" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.020587" b="-0.07417" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Casio</maker>
--        <model>Standard</model>
-+        <model>EX-Z4 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>casioZ4</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.016943" b="-0.048353" c="0" />
--            <distortion model="ptlens" focal="6.8" a="0.01652" b="-0.044474" c="0" />
--            <distortion model="ptlens" focal="8.2" a="0.002124" b="-0.01133" c="0" />
--            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.016943" b="-0.048353" c="0"/>
-+            <distortion model="ptlens" focal="6.8" a="0.01652" b="-0.044474" c="0"/>
-+            <distortion model="ptlens" focal="8.2" a="0.002124" b="-0.01133" c="0"/>
-+            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Casio</maker>
--        <model>Standard</model>
-+        <model>QV-3500EX &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>casioQV3500</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.13" a="0.012733" b="-0.03693" c="0" />
--            <distortion model="ptlens" focal="9.82" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="14.22" a="0" b="0.003219" c="0" />
--            <distortion model="ptlens" focal="20.74" a="0" b="0.004435" c="0" />
-+            <distortion model="ptlens" focal="7.13" a="0.012733" b="-0.03693" c="0"/>
-+            <distortion model="ptlens" focal="9.82" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="14.22" a="0" b="0.003219" c="0"/>
-+            <distortion model="ptlens" focal="20.74" a="0" b="0.004435" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Casio</maker>
--        <model>Raynox 0.66x</model>
-+        <model>QV-3500EX &amp; compatibles, with Raynox 0.66x</model>
-+        <model lang="en">fixed lens, with Raynox 0.66×</model>
-+        <model lang="de">festes Objektiv, mit Raynox 0.66×</model>
-         <mount>casioQV3500</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.13" a="0" b="0.02562" c="-0.106136" />
-+            <distortion model="ptlens" focal="7.13" a="0" b="0.02562" c="-0.106136"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-fujifilm.xml b/data/db/compact-fujifilm.xml
---- a/data/db/compact-fujifilm.xml	2013-09-02 21:38:12.000000000 +0200
-+++ b/data/db/compact-fujifilm.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,698 +1,905 @@
- <lensdatabase>
--
--    <mount>
--        <name>fuji810</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fujiS9000</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fuji2800</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fujiF11</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fujiS5500</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fuji601</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fuji602</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fujiF200exr</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fujix100s</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>fujix10</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F11</model>
-         <mount>fujiF11</mount>
-         <cropfactor>4.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F10</model>
-         <mount>fujiF11</mount>
-         <cropfactor>4.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S9000</model>
-         <mount>fujiS9000</mount>
-         <cropfactor>4.48</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S9500</model>
-         <mount>fujiS9000</mount>
-         <cropfactor>4.48</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix S9600</model>
-+        <mount>fujiS9000</mount>
-+        <cropfactor>4.48</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S5500</model>
-         <mount>fujiS5500</mount>
-         <cropfactor>6.491</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S5100</model>
-         <mount>fujiS5500</mount>
-         <cropfactor>6.491</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S7000</model>
-         <mount>fuji602</mount>
-         <cropfactor>4.487</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S20Pro</model>
-         <mount>fuji602</mount>
-         <cropfactor>4.487</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S602 ZOOM</model>
-         <mount>fuji602</mount>
-         <cropfactor>4.487</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F601 ZOOM</model>
-         <mount>fuji601</mount>
-         <cropfactor>4.487</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F810</model>
-         <mount>fuji810</mount>
-         <cropfactor>4.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F810</model>
-         <variant>widescreen mode</variant>
-         <mount>fuji810</mount>
-         <cropfactor>4.9</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F710</model>
-         <mount>fuji810</mount>
-         <cropfactor>4.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix E550</model>
-         <mount>fuji810</mount>
-         <cropfactor>4.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix 3800</model>
-         <mount>fuji2800</mount>
-         <cropfactor>6.3333333</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S304</model>
-         <mount>fuji2800</mount>
-         <cropfactor>6.3333333</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S3000</model>
-         <mount>fuji2800</mount>
-         <cropfactor>6.3333333</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix2800ZOOM</model>
-         <mount>fuji2800</mount>
-         <cropfactor>6.3333333</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix F200EXR</model>
-         <mount>fujiF200exr</mount>
-         <cropfactor>4.341</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix X100</model>
-+        <mount>fujix100</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-         <model>X100S</model>
--        <mount>fujix100s</mount>
--        <cropfactor>1.523</cropfactor>
-+        <mount>fujix100</mount>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-+        <model>X100T</model>
-+        <mount>fujix100</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-         <model>X10</model>
-         <mount>fujix10</mount>
-         <cropfactor>3.93</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X20</model>
-+        <!-- Optically equivalent to X10, see
-+             https://secure.flickr.com/groups/darktable/discuss/72157646611511061/ and
-+             <http://www.photoreview.com.au/reviews/advanced-compact-cameras/fixed-lens/fujifilm-x20>. -->
-+        <mount>fujix10</mount>
-+        <cropfactor>3.93</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X30</model>
-+        <!-- Optically equivalent to X10, see
-+             http://www.heise.de/foto/artikel/Test-Edelkompakte-Fujifilm-X30-2444045.html
-+             (German). -->
-+        <mount>fujix10</mount>
-+        <cropfactor>3.93</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix HS20EXR</model>
-+        <mount>fujihs20exr</mount>
-+        <cropfactor>5.71</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F770EXR</model>
-+        <mount>fujif770exr</mount>
-+        <cropfactor>5.43</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix S5600</model>
-+        <mount>fujiS5600</mount>
-+        <cropfactor>6.03</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>XQ1</model>
-+        <mount>fujiXQ1</mount>
-+        <cropfactor>3.91</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix A370</model>
-+        <mount>fujiA370</mount>
-+        <cropfactor>6.03</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X-S1</model>
-+        <mount>fujiXS1</mount>
-+        <cropfactor>3.93</cropfactor>
-+    </camera>
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F11 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fujiF11</mount>
-         <cropfactor>4.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8" a="0" b="-0.00618" c="0" />
--            <distortion model="ptlens" focal="10.4" a="0" b="-0.005407" c="0" />
--            <distortion model="ptlens" focal="12.2" a="0" b="-0.005171" c="0" />
--            <distortion model="ptlens" focal="14.1" a="0" b="-0.004634" c="0" />
--            <distortion model="ptlens" focal="16.1" a="0" b="-0.001624" c="0" />
--            <distortion model="ptlens" focal="18.1" a="0" b="-0.001948" c="0" />
--            <distortion model="ptlens" focal="20.1" a="0" b="-0.000215" c="0" />
--            <distortion model="ptlens" focal="22.1" a="0" b="0.000376" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="0" c="0" />
-+            <distortion model="poly3" focal="8" k1="-0.00618"/>
-+            <distortion model="poly3" focal="10.4" k1="-0.005407"/>
-+            <distortion model="poly3" focal="12.2" k1="-0.005171"/>
-+            <distortion model="poly3" focal="14.1" k1="-0.004634"/>
-+            <distortion model="poly3" focal="16.1" k1="-0.001624"/>
-+            <distortion model="poly3" focal="18.1" k1="-0.001948"/>
-+            <distortion model="poly3" focal="20.1" k1="-0.000215"/>
-+            <distortion model="poly3" focal="22.1" k1="0.000376"/>
-+            <distortion model="poly3" focal="24" k1="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix S9000 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fujiS9000</mount>
-         <cropfactor>4.48</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.2" a="0.022449" b="-0.05488" c="0" />
--            <distortion model="ptlens" focal="7.2" a="0.014932" b="-0.036434" c="0" />
--            <distortion model="ptlens" focal="8.1" a="0.006337" b="-0.018767" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0.005262" b="-0.0146" c="0" />
--            <distortion model="ptlens" focal="10.8" a="0.005679" b="-0.011186" c="0" />
--            <distortion model="ptlens" focal="12.8" a="0.004792" b="-0.00467" c="0" />
--            <distortion model="ptlens" focal="17" a="0" b="0.004675" c="0" />
--            <distortion model="ptlens" focal="21.6" a="0" b="0.003203" c="0" />
--            <distortion model="ptlens" focal="42.6" a="0" b="0.002282" c="0" />
--            <distortion model="ptlens" focal="67" a="0" b="0.003859" c="0" />
-+            <distortion model="ptlens" focal="6.2" a="0.022449" b="-0.05488" c="0"/>
-+            <distortion model="ptlens" focal="7.2" a="0.014932" b="-0.036434" c="0"/>
-+            <distortion model="ptlens" focal="8.1" a="0.006337" b="-0.018767" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0.005262" b="-0.0146" c="0"/>
-+            <distortion model="ptlens" focal="10.8" a="0.005679" b="-0.011186" c="0"/>
-+            <distortion model="ptlens" focal="12.8" a="0.004792" b="-0.00467" c="0"/>
-+            <distortion model="ptlens" focal="17" a="0" b="0.004675" c="0"/>
-+            <distortion model="ptlens" focal="21.6" a="0" b="0.003203" c="0"/>
-+            <distortion model="ptlens" focal="42.6" a="0" b="0.002282" c="0"/>
-+            <distortion model="ptlens" focal="67" a="0" b="0.003859" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix S5500 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fujiS5500</mount>
-         <cropfactor>6.491</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.7" a="0.011881" b="-0.03472" c="0" />
--            <distortion model="ptlens" focal="6.7" a="0.009745" b="-0.023435" c="0" />
--            <distortion model="ptlens" focal="7.5" a="0.008247" b="-0.018865" c="0" />
--            <distortion model="ptlens" focal="8.4" a="0.006006" b="-0.010909" c="0" />
--            <distortion model="ptlens" focal="10.7" a="0" b="0.003268" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="0.002961" c="0" />
--            <distortion model="ptlens" focal="13.6" a="0" b="0.00352" c="0" />
--            <distortion model="ptlens" focal="17.2" a="0" b="0.002228" c="0" />
--            <distortion model="ptlens" focal="19.6" a="0" b="0.002639" c="0" />
--            <distortion model="ptlens" focal="25.1" a="0" b="0.003074" c="0" />
--            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="51.3" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="57" a="0" b="0.002197" c="0" />
-+            <distortion model="ptlens" focal="5.7" a="0.011881" b="-0.03472" c="0"/>
-+            <distortion model="ptlens" focal="6.7" a="0.009745" b="-0.023435" c="0"/>
-+            <distortion model="ptlens" focal="7.5" a="0.008247" b="-0.018865" c="0"/>
-+            <distortion model="ptlens" focal="8.4" a="0.006006" b="-0.010909" c="0"/>
-+            <distortion model="ptlens" focal="10.7" a="0" b="0.003268" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0" b="0.002961" c="0"/>
-+            <distortion model="ptlens" focal="13.6" a="0" b="0.00352" c="0"/>
-+            <distortion model="ptlens" focal="17.2" a="0" b="0.002228" c="0"/>
-+            <distortion model="ptlens" focal="19.6" a="0" b="0.002639" c="0"/>
-+            <distortion model="ptlens" focal="25.1" a="0" b="0.003074" c="0"/>
-+            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="51.3" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="57" a="0" b="0.002197" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix S602 ZOOM &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fuji602</mount>
-         <cropfactor>4.487</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.8" a="0.00554" b="-0.018984" c="0" />
--            <distortion model="ptlens" focal="10" a="0.011917" b="-0.024177" c="0" />
--            <distortion model="ptlens" focal="12" a="0.012384" b="-0.016734" c="0" />
--            <distortion model="ptlens" focal="14" a="0.009613" b="-0.007388" c="0" />
--            <distortion model="ptlens" focal="17" a="0.004389" b="0.003994" c="0" />
--            <distortion model="ptlens" focal="20" a="0.003743" b="0.004964" c="0" />
--            <distortion model="ptlens" focal="24" a="0.007011" b="-0.002673" c="0" />
--            <distortion model="ptlens" focal="29" a="0.009838" b="-0.008207" c="0" />
--            <distortion model="ptlens" focal="38" a="0.005981" b="0.000177" c="0" />
--            <distortion model="ptlens" focal="46.8" a="0.001412" b="0.009081" c="0" />
-+            <distortion model="ptlens" focal="7.8" a="0.00554" b="-0.018984" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0.011917" b="-0.024177" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0.012384" b="-0.016734" c="0"/>
-+            <distortion model="ptlens" focal="14" a="0.009613" b="-0.007388" c="0"/>
-+            <distortion model="ptlens" focal="17" a="0.004389" b="0.003994" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.003743" b="0.004964" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.007011" b="-0.002673" c="0"/>
-+            <distortion model="ptlens" focal="29" a="0.009838" b="-0.008207" c="0"/>
-+            <distortion model="ptlens" focal="38" a="0.005981" b="0.000177" c="0"/>
-+            <distortion model="ptlens" focal="46.8" a="0.001412" b="0.009081" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F601 ZOOM &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fuji601</mount>
-         <cropfactor>4.487</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.3" a="0" b="-0.024191" c="0" />
--            <distortion model="ptlens" focal="9.4" a="0" b="-0.018667" c="0" />
--            <distortion model="ptlens" focal="10.6" a="0" b="-0.017396" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="-0.014467" c="0" />
--            <distortion model="ptlens" focal="15.3" a="0" b="-0.01029" c="0" />
--            <distortion model="ptlens" focal="19.5" a="0" b="-0.008176" c="0" />
--            <distortion model="ptlens" focal="24.9" a="0" b="-0.005081" c="0" />
-+            <distortion model="poly3" focal="8.3" k1="-0.024191"/>
-+            <distortion model="poly3" focal="9.4" k1="-0.018667"/>
-+            <distortion model="poly3" focal="10.6" k1="-0.017396"/>
-+            <distortion model="poly3" focal="12" k1="-0.014467"/>
-+            <distortion model="poly3" focal="15.3" k1="-0.01029"/>
-+            <distortion model="poly3" focal="19.5" k1="-0.008176"/>
-+            <distortion model="poly3" focal="24.9" k1="-0.005081"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F810 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fuji810</mount>
-         <cropfactor>4.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.2" a="0.013263" b="-0.038383" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0" b="-0.011186" c="0" />
--            <distortion model="ptlens" focal="11.9" a="0" b="-0.00645" c="0" />
--            <distortion model="ptlens" focal="13.5" a="0" b="-0.003957" c="0" />
--            <distortion model="ptlens" focal="16.8" a="0" b="-0.002027" c="0" />
--            <distortion model="ptlens" focal="20.2" a="0" b="-0.001391" c="0" />
--            <distortion model="ptlens" focal="24.5" a="0" b="-0.000731" c="0" />
--            <distortion model="ptlens" focal="28.8" a="0" b="0.0005" c="0" />
-+            <distortion model="ptlens" focal="7.2" a="0.013263" b="-0.038383" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0" b="-0.011186" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="0" b="-0.00645" c="0"/>
-+            <distortion model="ptlens" focal="13.5" a="0" b="-0.003957" c="0"/>
-+            <distortion model="ptlens" focal="16.8" a="0" b="-0.002027" c="0"/>
-+            <distortion model="ptlens" focal="20.2" a="0" b="-0.001391" c="0"/>
-+            <distortion model="ptlens" focal="24.5" a="0" b="-0.000731" c="0"/>
-+            <distortion model="ptlens" focal="28.8" a="0" b="0.0005" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>WL-FXE01 (full wide)</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F810 &amp; compatibles, with WL-FXE01 (full wide)</model>
-+        <model lang="en">fixed lens, with WL-FXE01 (full wide)</model>
-+        <model lang="de">festes Objektiv, mit WL-FXE01 (kürzeste Brennw.)</model>
-         <mount>fuji810</mount>
-         <cropfactor>4.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.2" a="0.023137" b="-0.073048" c="0" />
-+            <distortion model="ptlens" focal="7.2" a="0.023137" b="-0.073048" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix 2800 ZOOM &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fuji2800</mount>
-         <cropfactor>6.3333333</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0" b="0" c="-0.035" />
--            <distortion model="ptlens" focal="6.1" a="0" b="0" c="-0.034364" />
--            <distortion model="ptlens" focal="6.2" a="0" b="0" c="-0.033709" />
--            <distortion model="ptlens" focal="6.3" a="0" b="0" c="-0.033016" />
--            <distortion model="ptlens" focal="6.4" a="0" b="0" c="-0.032258" />
--            <distortion model="ptlens" focal="6.5" a="0" b="0" c="-0.031404" />
--            <distortion model="ptlens" focal="6.6" a="0" b="0" c="-0.030404" />
--            <distortion model="ptlens" focal="6.7" a="0" b="0" c="-0.029175" />
--            <distortion model="ptlens" focal="6.8" a="0" b="0" c="-0.027545" />
--            <distortion model="ptlens" focal="6.9" a="0" b="0" c="-0.025" />
--            <distortion model="ptlens" focal="7" a="0" b="0" c="-0.020295" />
--            <distortion model="ptlens" focal="7.1" a="0" b="0" c="-0.016679" />
--            <distortion model="ptlens" focal="7.2" a="0" b="0" c="-0.014386" />
--            <distortion model="ptlens" focal="7.3" a="0" b="0" c="-0.012691" />
--            <distortion model="ptlens" focal="7.4" a="0" b="0" c="-0.011332" />
--            <distortion model="ptlens" focal="7.5" a="0" b="0" c="-0.010188" />
--            <distortion model="ptlens" focal="7.6" a="0" b="0" c="-0.009196" />
--            <distortion model="ptlens" focal="7.7" a="0" b="0" c="-0.00832" />
--            <distortion model="ptlens" focal="7.8" a="0" b="0" c="-0.007533" />
--            <distortion model="ptlens" focal="7.9" a="0" b="0" c="-0.006818" />
--            <distortion model="ptlens" focal="8" a="0" b="0" c="-0.006164" />
--            <distortion model="ptlens" focal="8.1" a="0" b="0" c="-0.00556" />
--            <distortion model="ptlens" focal="8.2" a="0" b="0" c="-0.005" />
--            <distortion model="ptlens" focal="8.3" a="0" b="0" c="-0.004477" />
--            <distortion model="ptlens" focal="8.4" a="0" b="0" c="-0.003986" />
--            <distortion model="ptlens" focal="8.5" a="0" b="0" c="-0.00352" />
--            <distortion model="ptlens" focal="8.6" a="0" b="0" c="-0.003077" />
--            <distortion model="ptlens" focal="8.7" a="0" b="0" c="-0.002652" />
--            <distortion model="ptlens" focal="8.8" a="0" b="0" c="-0.002245" />
--            <distortion model="ptlens" focal="8.9" a="0" b="0" c="-0.001852" />
--            <distortion model="ptlens" focal="9" a="0" b="0" c="-0.001473" />
--            <distortion model="ptlens" focal="9.1" a="0" b="0" c="-0.001106" />
--            <distortion model="ptlens" focal="9.2" a="0" b="0" c="-0.000749" />
--            <distortion model="ptlens" focal="9.3" a="0" b="0" c="-0.000403" />
--            <distortion model="ptlens" focal="9.4" a="0" b="0" c="-6.5e-05" />
--            <distortion model="ptlens" focal="9.5" a="0" b="0" c="0.000263" />
--            <distortion model="ptlens" focal="9.6" a="0" b="0" c="0.000585" />
--            <distortion model="ptlens" focal="9.7" a="0" b="0" c="0.000898" />
--            <distortion model="ptlens" focal="9.8" a="0" b="0" c="0.001206" />
--            <distortion model="ptlens" focal="9.9" a="0" b="0" c="0.001506" />
--            <distortion model="ptlens" focal="10" a="0" b="0" c="0.001801" />
--            <distortion model="ptlens" focal="10.1" a="0" b="0" c="0.00209" />
--            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0.002375" />
--            <distortion model="ptlens" focal="10.3" a="0" b="0" c="0.002654" />
--            <distortion model="ptlens" focal="10.4" a="0" b="0" c="0.002928" />
--            <distortion model="ptlens" focal="10.5" a="0" b="0" c="0.003198" />
--            <distortion model="ptlens" focal="10.6" a="0" b="0" c="0.003464" />
--            <distortion model="ptlens" focal="10.7" a="0" b="0" c="0.003725" />
--            <distortion model="ptlens" focal="10.8" a="0" b="0" c="0.003983" />
--            <distortion model="ptlens" focal="10.9" a="0" b="0" c="0.004237" />
--            <distortion model="ptlens" focal="11" a="0" b="0" c="0.004488" />
--            <distortion model="ptlens" focal="11.1" a="0" b="0" c="0.004736" />
--            <distortion model="ptlens" focal="11.2" a="0" b="0" c="0.00498" />
--            <distortion model="ptlens" focal="11.3" a="0" b="0" c="0.005221" />
--            <distortion model="ptlens" focal="11.4" a="0" b="0" c="0.00546" />
--            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0.005696" />
--            <distortion model="ptlens" focal="11.6" a="0" b="0" c="0.005929" />
--            <distortion model="ptlens" focal="11.7" a="0" b="0" c="0.006159" />
--            <distortion model="ptlens" focal="11.8" a="0" b="0" c="0.006387" />
--            <distortion model="ptlens" focal="11.9" a="0" b="0" c="0.006613" />
--            <distortion model="ptlens" focal="12" a="0" b="0" c="0.006837" />
--            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0.007059" />
--            <distortion model="ptlens" focal="12.2" a="0" b="0" c="0.007279" />
--            <distortion model="ptlens" focal="12.3" a="0" b="0" c="0.007498" />
--            <distortion model="ptlens" focal="12.4" a="0" b="0" c="0.007715" />
--            <distortion model="ptlens" focal="12.5" a="0" b="0" c="0.007931" />
--            <distortion model="ptlens" focal="12.6" a="0" b="0" c="0.008145" />
--            <distortion model="ptlens" focal="12.7" a="0" b="0" c="0.008359" />
--            <distortion model="ptlens" focal="12.8" a="0" b="0" c="0.008572" />
--            <distortion model="ptlens" focal="12.9" a="0" b="0" c="0.008786" />
--            <distortion model="ptlens" focal="13" a="0" b="0" c="0.009" />
--            <distortion model="ptlens" focal="13.1" a="0" b="0" c="0.009216" />
--            <distortion model="ptlens" focal="13.2" a="0" b="0" c="0.009434" />
--            <distortion model="ptlens" focal="13.3" a="0" b="0" c="0.009656" />
--            <distortion model="ptlens" focal="13.4" a="0" b="0" c="0.009882" />
--            <distortion model="ptlens" focal="13.5" a="0" b="0" c="0.010114" />
--            <distortion model="ptlens" focal="13.6" a="0" b="0" c="0.010357" />
--            <distortion model="ptlens" focal="13.7" a="0" b="0" c="0.01062" />
--            <distortion model="ptlens" focal="13.8" a="0" b="0" c="0.010921" />
--            <distortion model="ptlens" focal="13.9" a="0" b="0" c="0.011236" />
--            <distortion model="ptlens" focal="14" a="0" b="0" c="0.011512" />
--            <distortion model="ptlens" focal="14.1" a="0" b="0" c="0.011762" />
--            <distortion model="ptlens" focal="14.2" a="0" b="0" c="0.012" />
--            <distortion model="ptlens" focal="14.3" a="0" b="0" c="0.01223" />
--            <distortion model="ptlens" focal="14.4" a="0" b="0" c="0.012454" />
--            <distortion model="ptlens" focal="14.5" a="0" b="0" c="0.012673" />
--            <distortion model="ptlens" focal="14.6" a="0" b="0" c="0.012888" />
--            <distortion model="ptlens" focal="14.7" a="0" b="0" c="0.013098" />
--            <distortion model="ptlens" focal="14.8" a="0" b="0" c="0.013304" />
--            <distortion model="ptlens" focal="14.9" a="0" b="0" c="0.013507" />
--            <distortion model="ptlens" focal="15" a="0" b="0" c="0.013706" />
--            <distortion model="ptlens" focal="15.1" a="0" b="0" c="0.013902" />
--            <distortion model="ptlens" focal="15.2" a="0" b="0" c="0.014094" />
--            <distortion model="ptlens" focal="15.3" a="0" b="0" c="0.014283" />
--            <distortion model="ptlens" focal="15.4" a="0" b="0" c="0.014469" />
--            <distortion model="ptlens" focal="15.5" a="0" b="0" c="0.014652" />
--            <distortion model="ptlens" focal="15.6" a="0" b="0" c="0.014832" />
--            <distortion model="ptlens" focal="15.7" a="0" b="0" c="0.01501" />
--            <distortion model="ptlens" focal="15.8" a="0" b="0" c="0.015184" />
--            <distortion model="ptlens" focal="15.9" a="0" b="0" c="0.015355" />
--            <distortion model="ptlens" focal="16" a="0" b="0" c="0.015524" />
--            <distortion model="ptlens" focal="16.1" a="0" b="0" c="0.01569" />
--            <distortion model="ptlens" focal="16.2" a="0" b="0" c="0.015853" />
--            <distortion model="ptlens" focal="16.3" a="0" b="0" c="0.016014" />
--            <distortion model="ptlens" focal="16.4" a="0" b="0" c="0.016172" />
--            <distortion model="ptlens" focal="16.5" a="0" b="0" c="0.016327" />
--            <distortion model="ptlens" focal="16.6" a="0" b="0" c="0.016479" />
--            <distortion model="ptlens" focal="16.7" a="0" b="0" c="0.016629" />
--            <distortion model="ptlens" focal="16.8" a="0" b="0" c="0.016777" />
--            <distortion model="ptlens" focal="16.9" a="0" b="0" c="0.016922" />
--            <distortion model="ptlens" focal="17" a="0" b="0" c="0.017064" />
--            <distortion model="ptlens" focal="17.1" a="0" b="0" c="0.017204" />
--            <distortion model="ptlens" focal="17.2" a="0" b="0" c="0.017341" />
--            <distortion model="ptlens" focal="17.3" a="0" b="0" c="0.017476" />
--            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0.017608" />
--            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0.017738" />
--            <distortion model="ptlens" focal="17.6" a="0" b="0" c="0.017865" />
--            <distortion model="ptlens" focal="17.7" a="0" b="0" c="0.017989" />
--            <distortion model="ptlens" focal="17.8" a="0" b="0" c="0.018112" />
--            <distortion model="ptlens" focal="17.9" a="0" b="0" c="0.018231" />
--            <distortion model="ptlens" focal="18" a="0" b="0" c="0.018349" />
--            <distortion model="ptlens" focal="18.1" a="0" b="0" c="0.018463" />
--            <distortion model="ptlens" focal="18.2" a="0" b="0" c="0.018576" />
--            <distortion model="ptlens" focal="18.3" a="0" b="0" c="0.018685" />
--            <distortion model="ptlens" focal="18.4" a="0" b="0" c="0.018793" />
--            <distortion model="ptlens" focal="18.5" a="0" b="0" c="0.018898" />
--            <distortion model="ptlens" focal="18.6" a="0" b="0" c="0.019" />
--            <distortion model="ptlens" focal="18.7" a="0" b="0" c="0.0191" />
--            <distortion model="ptlens" focal="18.8" a="0" b="0" c="0.019197" />
--            <distortion model="ptlens" focal="18.9" a="0" b="0" c="0.019293" />
--            <distortion model="ptlens" focal="19" a="0" b="0" c="0.019386" />
--            <distortion model="ptlens" focal="19.1" a="0" b="0" c="0.019476" />
--            <distortion model="ptlens" focal="19.2" a="0" b="0" c="0.019565" />
--            <distortion model="ptlens" focal="19.3" a="0" b="0" c="0.019652" />
--            <distortion model="ptlens" focal="19.4" a="0" b="0" c="0.019737" />
--            <distortion model="ptlens" focal="19.5" a="0" b="0" c="0.019819" />
--            <distortion model="ptlens" focal="19.6" a="0" b="0" c="0.0199" />
--            <distortion model="ptlens" focal="19.7" a="0" b="0" c="0.019979" />
--            <distortion model="ptlens" focal="19.8" a="0" b="0" c="0.020057" />
--            <distortion model="ptlens" focal="19.9" a="0" b="0" c="0.020133" />
--            <distortion model="ptlens" focal="20" a="0" b="0" c="0.020207" />
--            <distortion model="ptlens" focal="20.1" a="0" b="0" c="0.020279" />
--            <distortion model="ptlens" focal="20.2" a="0" b="0" c="0.02035" />
--            <distortion model="ptlens" focal="20.3" a="0" b="0" c="0.02042" />
--            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0.020488" />
--            <distortion model="ptlens" focal="20.5" a="0" b="0" c="0.020554" />
--            <distortion model="ptlens" focal="20.6" a="0" b="0" c="0.02062" />
--            <distortion model="ptlens" focal="20.7" a="0" b="0" c="0.020684" />
--            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0.020746" />
--            <distortion model="ptlens" focal="20.9" a="0" b="0" c="0.020808" />
--            <distortion model="ptlens" focal="21" a="0" b="0" c="0.020868" />
--            <distortion model="ptlens" focal="21.1" a="0" b="0" c="0.020927" />
--            <distortion model="ptlens" focal="21.2" a="0" b="0" c="0.020985" />
--            <distortion model="ptlens" focal="21.3" a="0" b="0" c="0.021041" />
--            <distortion model="ptlens" focal="21.4" a="0" b="0" c="0.021097" />
--            <distortion model="ptlens" focal="21.5" a="0" b="0" c="0.021151" />
--            <distortion model="ptlens" focal="21.6" a="0" b="0" c="0.021205" />
--            <distortion model="ptlens" focal="21.7" a="0" b="0" c="0.021257" />
--            <distortion model="ptlens" focal="21.8" a="0" b="0" c="0.021309" />
--            <distortion model="ptlens" focal="21.9" a="0" b="0" c="0.021359" />
--            <distortion model="ptlens" focal="22" a="0" b="0" c="0.021409" />
--            <distortion model="ptlens" focal="22.1" a="0" b="0" c="0.021458" />
--            <distortion model="ptlens" focal="22.2" a="0" b="0" c="0.021505" />
--            <distortion model="ptlens" focal="22.3" a="0" b="0" c="0.021552" />
--            <distortion model="ptlens" focal="22.4" a="0" b="0" c="0.021599" />
--            <distortion model="ptlens" focal="22.5" a="0" b="0" c="0.021644" />
--            <distortion model="ptlens" focal="22.6" a="0" b="0" c="0.021688" />
--            <distortion model="ptlens" focal="22.7" a="0" b="0" c="0.021732" />
--            <distortion model="ptlens" focal="22.8" a="0" b="0" c="0.021775" />
--            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0.021818" />
--            <distortion model="ptlens" focal="23" a="0" b="0" c="0.021859" />
--            <distortion model="ptlens" focal="23.1" a="0" b="0" c="0.0219" />
--            <distortion model="ptlens" focal="23.2" a="0" b="0" c="0.02194" />
--            <distortion model="ptlens" focal="23.3" a="0" b="0" c="0.02198" />
--            <distortion model="ptlens" focal="23.4" a="0" b="0" c="0.022019" />
--            <distortion model="ptlens" focal="23.5" a="0" b="0" c="0.022057" />
--            <distortion model="ptlens" focal="23.6" a="0" b="0" c="0.022095" />
--            <distortion model="ptlens" focal="23.7" a="0" b="0" c="0.022132" />
--            <distortion model="ptlens" focal="23.8" a="0" b="0" c="0.022169" />
--            <distortion model="ptlens" focal="23.9" a="0" b="0" c="0.022205" />
--            <distortion model="ptlens" focal="24" a="0" b="0" c="0.022241" />
--            <distortion model="ptlens" focal="24.1" a="0" b="0" c="0.022276" />
--            <distortion model="ptlens" focal="24.2" a="0" b="0" c="0.02231" />
--            <distortion model="ptlens" focal="24.3" a="0" b="0" c="0.022344" />
--            <distortion model="ptlens" focal="24.4" a="0" b="0" c="0.022378" />
--            <distortion model="ptlens" focal="24.5" a="0" b="0" c="0.022411" />
--            <distortion model="ptlens" focal="24.6" a="0" b="0" c="0.022444" />
--            <distortion model="ptlens" focal="24.7" a="0" b="0" c="0.022476" />
--            <distortion model="ptlens" focal="24.8" a="0" b="0" c="0.022508" />
--            <distortion model="ptlens" focal="24.9" a="0" b="0" c="0.02254" />
--            <distortion model="ptlens" focal="25" a="0" b="0" c="0.022571" />
--            <distortion model="ptlens" focal="25.1" a="0" b="0" c="0.022602" />
--            <distortion model="ptlens" focal="25.2" a="0" b="0" c="0.022632" />
--            <distortion model="ptlens" focal="25.3" a="0" b="0" c="0.022662" />
--            <distortion model="ptlens" focal="25.4" a="0" b="0" c="0.022692" />
--            <distortion model="ptlens" focal="25.5" a="0" b="0" c="0.022721" />
--            <distortion model="ptlens" focal="25.6" a="0" b="0" c="0.02275" />
--            <distortion model="ptlens" focal="25.7" a="0" b="0" c="0.022779" />
--            <distortion model="ptlens" focal="25.8" a="0" b="0" c="0.022808" />
--            <distortion model="ptlens" focal="25.9" a="0" b="0" c="0.022836" />
--            <distortion model="ptlens" focal="26" a="0" b="0" c="0.022864" />
--            <distortion model="ptlens" focal="26.1" a="0" b="0" c="0.022891" />
--            <distortion model="ptlens" focal="26.2" a="0" b="0" c="0.022919" />
--            <distortion model="ptlens" focal="26.3" a="0" b="0" c="0.022946" />
--            <distortion model="ptlens" focal="26.4" a="0" b="0" c="0.022973" />
--            <distortion model="ptlens" focal="26.5" a="0" b="0" c="0.023" />
--            <distortion model="ptlens" focal="26.6" a="0" b="0" c="0.023027" />
--            <distortion model="ptlens" focal="26.7" a="0" b="0" c="0.023053" />
--            <distortion model="ptlens" focal="26.8" a="0" b="0" c="0.023079" />
--            <distortion model="ptlens" focal="26.9" a="0" b="0" c="0.023105" />
--            <distortion model="ptlens" focal="27" a="0" b="0" c="0.023131" />
--            <distortion model="ptlens" focal="27.1" a="0" b="0" c="0.023157" />
--            <distortion model="ptlens" focal="27.2" a="0" b="0" c="0.023182" />
--            <distortion model="ptlens" focal="27.3" a="0" b="0" c="0.023208" />
--            <distortion model="ptlens" focal="27.4" a="0" b="0" c="0.023233" />
--            <distortion model="ptlens" focal="27.5" a="0" b="0" c="0.023258" />
--            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0.023282" />
--            <distortion model="ptlens" focal="27.7" a="0" b="0" c="0.023307" />
--            <distortion model="ptlens" focal="27.8" a="0" b="0" c="0.023331" />
--            <distortion model="ptlens" focal="27.9" a="0" b="0" c="0.023356" />
--            <distortion model="ptlens" focal="28" a="0" b="0" c="0.02338" />
--            <distortion model="ptlens" focal="28.1" a="0" b="0" c="0.023404" />
--            <distortion model="ptlens" focal="28.2" a="0" b="0" c="0.023428" />
--            <distortion model="ptlens" focal="28.3" a="0" b="0" c="0.023451" />
--            <distortion model="ptlens" focal="28.4" a="0" b="0" c="0.023475" />
--            <distortion model="ptlens" focal="28.5" a="0" b="0" c="0.023498" />
--            <distortion model="ptlens" focal="28.6" a="0" b="0" c="0.023522" />
--            <distortion model="ptlens" focal="28.7" a="0" b="0" c="0.023545" />
--            <distortion model="ptlens" focal="28.8" a="0" b="0" c="0.023568" />
--            <distortion model="ptlens" focal="28.9" a="0" b="0" c="0.023591" />
--            <distortion model="ptlens" focal="29" a="0" b="0" c="0.023613" />
--            <distortion model="ptlens" focal="29.1" a="0" b="0" c="0.023636" />
--            <distortion model="ptlens" focal="29.2" a="0" b="0" c="0.023658" />
--            <distortion model="ptlens" focal="29.3" a="0" b="0" c="0.023681" />
--            <distortion model="ptlens" focal="29.4" a="0" b="0" c="0.023703" />
--            <distortion model="ptlens" focal="29.5" a="0" b="0" c="0.023725" />
--            <distortion model="ptlens" focal="29.6" a="0" b="0" c="0.023747" />
--            <distortion model="ptlens" focal="29.7" a="0" b="0" c="0.023769" />
--            <distortion model="ptlens" focal="29.8" a="0" b="0" c="0.02379" />
--            <distortion model="ptlens" focal="29.9" a="0" b="0" c="0.023812" />
--            <distortion model="ptlens" focal="30" a="0" b="0" c="0.023834" />
--            <distortion model="ptlens" focal="30.1" a="0" b="0" c="0.023855" />
--            <distortion model="ptlens" focal="30.2" a="0" b="0" c="0.023876" />
--            <distortion model="ptlens" focal="30.3" a="0" b="0" c="0.023898" />
--            <distortion model="ptlens" focal="30.4" a="0" b="0" c="0.023919" />
--            <distortion model="ptlens" focal="30.5" a="0" b="0" c="0.02394" />
--            <distortion model="ptlens" focal="30.6" a="0" b="0" c="0.023961" />
--            <distortion model="ptlens" focal="30.7" a="0" b="0" c="0.023981" />
--            <distortion model="ptlens" focal="30.8" a="0" b="0" c="0.024002" />
--            <distortion model="ptlens" focal="30.9" a="0" b="0" c="0.024023" />
--            <distortion model="ptlens" focal="31" a="0" b="0" c="0.024043" />
--            <distortion model="ptlens" focal="31.1" a="0" b="0" c="0.024064" />
--            <distortion model="ptlens" focal="31.2" a="0" b="0" c="0.024084" />
--            <distortion model="ptlens" focal="31.3" a="0" b="0" c="0.024105" />
--            <distortion model="ptlens" focal="31.4" a="0" b="0" c="0.024125" />
--            <distortion model="ptlens" focal="31.5" a="0" b="0" c="0.024145" />
--            <distortion model="ptlens" focal="31.6" a="0" b="0" c="0.024165" />
--            <distortion model="ptlens" focal="31.7" a="0" b="0" c="0.024185" />
--            <distortion model="ptlens" focal="31.8" a="0" b="0" c="0.024205" />
--            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0.024225" />
--            <distortion model="ptlens" focal="32" a="0" b="0" c="0.024245" />
--            <distortion model="ptlens" focal="32.1" a="0" b="0" c="0.024264" />
--            <distortion model="ptlens" focal="32.2" a="0" b="0" c="0.024284" />
--            <distortion model="ptlens" focal="32.3" a="0" b="0" c="0.024304" />
--            <distortion model="ptlens" focal="32.4" a="0" b="0" c="0.024323" />
--            <distortion model="ptlens" focal="32.5" a="0" b="0" c="0.024343" />
--            <distortion model="ptlens" focal="32.6" a="0" b="0" c="0.024362" />
--            <distortion model="ptlens" focal="32.7" a="0" b="0" c="0.024381" />
--            <distortion model="ptlens" focal="32.8" a="0" b="0" c="0.024401" />
--            <distortion model="ptlens" focal="32.9" a="0" b="0" c="0.02442" />
--            <distortion model="ptlens" focal="33" a="0" b="0" c="0.024439" />
--            <distortion model="ptlens" focal="33.1" a="0" b="0" c="0.024458" />
--            <distortion model="ptlens" focal="33.2" a="0" b="0" c="0.024477" />
--            <distortion model="ptlens" focal="33.3" a="0" b="0" c="0.024497" />
--            <distortion model="ptlens" focal="33.4" a="0" b="0" c="0.024516" />
--            <distortion model="ptlens" focal="33.5" a="0" b="0" c="0.024534" />
--            <distortion model="ptlens" focal="33.6" a="0" b="0" c="0.024553" />
--            <distortion model="ptlens" focal="33.7" a="0" b="0" c="0.024572" />
--            <distortion model="ptlens" focal="33.8" a="0" b="0" c="0.024591" />
--            <distortion model="ptlens" focal="33.9" a="0" b="0" c="0.02461" />
--            <distortion model="ptlens" focal="34" a="0" b="0" c="0.024629" />
--            <distortion model="ptlens" focal="34.1" a="0" b="0" c="0.024648" />
--            <distortion model="ptlens" focal="34.2" a="0" b="0" c="0.024666" />
--            <distortion model="ptlens" focal="34.3" a="0" b="0" c="0.024685" />
--            <distortion model="ptlens" focal="34.4" a="0" b="0" c="0.024704" />
--            <distortion model="ptlens" focal="34.5" a="0" b="0" c="0.024722" />
--            <distortion model="ptlens" focal="34.6" a="0" b="0" c="0.024741" />
--            <distortion model="ptlens" focal="34.7" a="0" b="0" c="0.02476" />
--            <distortion model="ptlens" focal="34.8" a="0" b="0" c="0.024778" />
--            <distortion model="ptlens" focal="34.9" a="0" b="0" c="0.024797" />
--            <distortion model="ptlens" focal="35" a="0" b="0" c="0.024815" />
--            <distortion model="ptlens" focal="35.1" a="0" b="0" c="0.024834" />
--            <distortion model="ptlens" focal="35.2" a="0" b="0" c="0.024852" />
--            <distortion model="ptlens" focal="35.3" a="0" b="0" c="0.024871" />
--            <distortion model="ptlens" focal="35.4" a="0" b="0" c="0.024889" />
--            <distortion model="ptlens" focal="35.5" a="0" b="0" c="0.024908" />
--            <distortion model="ptlens" focal="35.6" a="0" b="0" c="0.024926" />
--            <distortion model="ptlens" focal="35.7" a="0" b="0" c="0.024945" />
--            <distortion model="ptlens" focal="35.8" a="0" b="0" c="0.024963" />
--            <distortion model="ptlens" focal="35.9" a="0" b="0" c="0.024982" />
--            <distortion model="ptlens" focal="36" a="0" b="0" c="0.025" />
-+            <distortion model="ptlens" focal="6" a="0" b="0" c="-0.035"/>
-+            <distortion model="ptlens" focal="6.1" a="0" b="0" c="-0.034364"/>
-+            <distortion model="ptlens" focal="6.2" a="0" b="0" c="-0.033709"/>
-+            <distortion model="ptlens" focal="6.3" a="0" b="0" c="-0.033016"/>
-+            <distortion model="ptlens" focal="6.4" a="0" b="0" c="-0.032258"/>
-+            <distortion model="ptlens" focal="6.5" a="0" b="0" c="-0.031404"/>
-+            <distortion model="ptlens" focal="6.6" a="0" b="0" c="-0.030404"/>
-+            <distortion model="ptlens" focal="6.7" a="0" b="0" c="-0.029175"/>
-+            <distortion model="ptlens" focal="6.8" a="0" b="0" c="-0.027545"/>
-+            <distortion model="ptlens" focal="6.9" a="0" b="0" c="-0.025"/>
-+            <distortion model="ptlens" focal="7" a="0" b="0" c="-0.020295"/>
-+            <distortion model="ptlens" focal="7.1" a="0" b="0" c="-0.016679"/>
-+            <distortion model="ptlens" focal="7.2" a="0" b="0" c="-0.014386"/>
-+            <distortion model="ptlens" focal="7.3" a="0" b="0" c="-0.012691"/>
-+            <distortion model="ptlens" focal="7.4" a="0" b="0" c="-0.011332"/>
-+            <distortion model="ptlens" focal="7.5" a="0" b="0" c="-0.010188"/>
-+            <distortion model="ptlens" focal="7.6" a="0" b="0" c="-0.009196"/>
-+            <distortion model="ptlens" focal="7.7" a="0" b="0" c="-0.00832"/>
-+            <distortion model="ptlens" focal="7.8" a="0" b="0" c="-0.007533"/>
-+            <distortion model="ptlens" focal="7.9" a="0" b="0" c="-0.006818"/>
-+            <distortion model="ptlens" focal="8" a="0" b="0" c="-0.006164"/>
-+            <distortion model="ptlens" focal="8.1" a="0" b="0" c="-0.00556"/>
-+            <distortion model="ptlens" focal="8.2" a="0" b="0" c="-0.005"/>
-+            <distortion model="ptlens" focal="8.3" a="0" b="0" c="-0.004477"/>
-+            <distortion model="ptlens" focal="8.4" a="0" b="0" c="-0.003986"/>
-+            <distortion model="ptlens" focal="8.5" a="0" b="0" c="-0.00352"/>
-+            <distortion model="ptlens" focal="8.6" a="0" b="0" c="-0.003077"/>
-+            <distortion model="ptlens" focal="8.7" a="0" b="0" c="-0.002652"/>
-+            <distortion model="ptlens" focal="8.8" a="0" b="0" c="-0.002245"/>
-+            <distortion model="ptlens" focal="8.9" a="0" b="0" c="-0.001852"/>
-+            <distortion model="ptlens" focal="9" a="0" b="0" c="-0.001473"/>
-+            <distortion model="ptlens" focal="9.1" a="0" b="0" c="-0.001106"/>
-+            <distortion model="ptlens" focal="9.2" a="0" b="0" c="-0.000749"/>
-+            <distortion model="ptlens" focal="9.3" a="0" b="0" c="-0.000403"/>
-+            <distortion model="ptlens" focal="9.4" a="0" b="0" c="-6.5e-05"/>
-+            <distortion model="ptlens" focal="9.5" a="0" b="0" c="0.000263"/>
-+            <distortion model="ptlens" focal="9.6" a="0" b="0" c="0.000585"/>
-+            <distortion model="ptlens" focal="9.7" a="0" b="0" c="0.000898"/>
-+            <distortion model="ptlens" focal="9.8" a="0" b="0" c="0.001206"/>
-+            <distortion model="ptlens" focal="9.9" a="0" b="0" c="0.001506"/>
-+            <distortion model="ptlens" focal="10" a="0" b="0" c="0.001801"/>
-+            <distortion model="ptlens" focal="10.1" a="0" b="0" c="0.00209"/>
-+            <distortion model="ptlens" focal="10.2" a="0" b="0" c="0.002375"/>
-+            <distortion model="ptlens" focal="10.3" a="0" b="0" c="0.002654"/>
-+            <distortion model="ptlens" focal="10.4" a="0" b="0" c="0.002928"/>
-+            <distortion model="ptlens" focal="10.5" a="0" b="0" c="0.003198"/>
-+            <distortion model="ptlens" focal="10.6" a="0" b="0" c="0.003464"/>
-+            <distortion model="ptlens" focal="10.7" a="0" b="0" c="0.003725"/>
-+            <distortion model="ptlens" focal="10.8" a="0" b="0" c="0.003983"/>
-+            <distortion model="ptlens" focal="10.9" a="0" b="0" c="0.004237"/>
-+            <distortion model="ptlens" focal="11" a="0" b="0" c="0.004488"/>
-+            <distortion model="ptlens" focal="11.1" a="0" b="0" c="0.004736"/>
-+            <distortion model="ptlens" focal="11.2" a="0" b="0" c="0.00498"/>
-+            <distortion model="ptlens" focal="11.3" a="0" b="0" c="0.005221"/>
-+            <distortion model="ptlens" focal="11.4" a="0" b="0" c="0.00546"/>
-+            <distortion model="ptlens" focal="11.5" a="0" b="0" c="0.005696"/>
-+            <distortion model="ptlens" focal="11.6" a="0" b="0" c="0.005929"/>
-+            <distortion model="ptlens" focal="11.7" a="0" b="0" c="0.006159"/>
-+            <distortion model="ptlens" focal="11.8" a="0" b="0" c="0.006387"/>
-+            <distortion model="ptlens" focal="11.9" a="0" b="0" c="0.006613"/>
-+            <distortion model="ptlens" focal="12" a="0" b="0" c="0.006837"/>
-+            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0.007059"/>
-+            <distortion model="ptlens" focal="12.2" a="0" b="0" c="0.007279"/>
-+            <distortion model="ptlens" focal="12.3" a="0" b="0" c="0.007498"/>
-+            <distortion model="ptlens" focal="12.4" a="0" b="0" c="0.007715"/>
-+            <distortion model="ptlens" focal="12.5" a="0" b="0" c="0.007931"/>
-+            <distortion model="ptlens" focal="12.6" a="0" b="0" c="0.008145"/>
-+            <distortion model="ptlens" focal="12.7" a="0" b="0" c="0.008359"/>
-+            <distortion model="ptlens" focal="12.8" a="0" b="0" c="0.008572"/>
-+            <distortion model="ptlens" focal="12.9" a="0" b="0" c="0.008786"/>
-+            <distortion model="ptlens" focal="13" a="0" b="0" c="0.009"/>
-+            <distortion model="ptlens" focal="13.1" a="0" b="0" c="0.009216"/>
-+            <distortion model="ptlens" focal="13.2" a="0" b="0" c="0.009434"/>
-+            <distortion model="ptlens" focal="13.3" a="0" b="0" c="0.009656"/>
-+            <distortion model="ptlens" focal="13.4" a="0" b="0" c="0.009882"/>
-+            <distortion model="ptlens" focal="13.5" a="0" b="0" c="0.010114"/>
-+            <distortion model="ptlens" focal="13.6" a="0" b="0" c="0.010357"/>
-+            <distortion model="ptlens" focal="13.7" a="0" b="0" c="0.01062"/>
-+            <distortion model="ptlens" focal="13.8" a="0" b="0" c="0.010921"/>
-+            <distortion model="ptlens" focal="13.9" a="0" b="0" c="0.011236"/>
-+            <distortion model="ptlens" focal="14" a="0" b="0" c="0.011512"/>
-+            <distortion model="ptlens" focal="14.1" a="0" b="0" c="0.011762"/>
-+            <distortion model="ptlens" focal="14.2" a="0" b="0" c="0.012"/>
-+            <distortion model="ptlens" focal="14.3" a="0" b="0" c="0.01223"/>
-+            <distortion model="ptlens" focal="14.4" a="0" b="0" c="0.012454"/>
-+            <distortion model="ptlens" focal="14.5" a="0" b="0" c="0.012673"/>
-+            <distortion model="ptlens" focal="14.6" a="0" b="0" c="0.012888"/>
-+            <distortion model="ptlens" focal="14.7" a="0" b="0" c="0.013098"/>
-+            <distortion model="ptlens" focal="14.8" a="0" b="0" c="0.013304"/>
-+            <distortion model="ptlens" focal="14.9" a="0" b="0" c="0.013507"/>
-+            <distortion model="ptlens" focal="15" a="0" b="0" c="0.013706"/>
-+            <distortion model="ptlens" focal="15.1" a="0" b="0" c="0.013902"/>
-+            <distortion model="ptlens" focal="15.2" a="0" b="0" c="0.014094"/>
-+            <distortion model="ptlens" focal="15.3" a="0" b="0" c="0.014283"/>
-+            <distortion model="ptlens" focal="15.4" a="0" b="0" c="0.014469"/>
-+            <distortion model="ptlens" focal="15.5" a="0" b="0" c="0.014652"/>
-+            <distortion model="ptlens" focal="15.6" a="0" b="0" c="0.014832"/>
-+            <distortion model="ptlens" focal="15.7" a="0" b="0" c="0.01501"/>
-+            <distortion model="ptlens" focal="15.8" a="0" b="0" c="0.015184"/>
-+            <distortion model="ptlens" focal="15.9" a="0" b="0" c="0.015355"/>
-+            <distortion model="ptlens" focal="16" a="0" b="0" c="0.015524"/>
-+            <distortion model="ptlens" focal="16.1" a="0" b="0" c="0.01569"/>
-+            <distortion model="ptlens" focal="16.2" a="0" b="0" c="0.015853"/>
-+            <distortion model="ptlens" focal="16.3" a="0" b="0" c="0.016014"/>
-+            <distortion model="ptlens" focal="16.4" a="0" b="0" c="0.016172"/>
-+            <distortion model="ptlens" focal="16.5" a="0" b="0" c="0.016327"/>
-+            <distortion model="ptlens" focal="16.6" a="0" b="0" c="0.016479"/>
-+            <distortion model="ptlens" focal="16.7" a="0" b="0" c="0.016629"/>
-+            <distortion model="ptlens" focal="16.8" a="0" b="0" c="0.016777"/>
-+            <distortion model="ptlens" focal="16.9" a="0" b="0" c="0.016922"/>
-+            <distortion model="ptlens" focal="17" a="0" b="0" c="0.017064"/>
-+            <distortion model="ptlens" focal="17.1" a="0" b="0" c="0.017204"/>
-+            <distortion model="ptlens" focal="17.2" a="0" b="0" c="0.017341"/>
-+            <distortion model="ptlens" focal="17.3" a="0" b="0" c="0.017476"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="0" c="0.017608"/>
-+            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0.017738"/>
-+            <distortion model="ptlens" focal="17.6" a="0" b="0" c="0.017865"/>
-+            <distortion model="ptlens" focal="17.7" a="0" b="0" c="0.017989"/>
-+            <distortion model="ptlens" focal="17.8" a="0" b="0" c="0.018112"/>
-+            <distortion model="ptlens" focal="17.9" a="0" b="0" c="0.018231"/>
-+            <distortion model="ptlens" focal="18" a="0" b="0" c="0.018349"/>
-+            <distortion model="ptlens" focal="18.1" a="0" b="0" c="0.018463"/>
-+            <distortion model="ptlens" focal="18.2" a="0" b="0" c="0.018576"/>
-+            <distortion model="ptlens" focal="18.3" a="0" b="0" c="0.018685"/>
-+            <distortion model="ptlens" focal="18.4" a="0" b="0" c="0.018793"/>
-+            <distortion model="ptlens" focal="18.5" a="0" b="0" c="0.018898"/>
-+            <distortion model="ptlens" focal="18.6" a="0" b="0" c="0.019"/>
-+            <distortion model="ptlens" focal="18.7" a="0" b="0" c="0.0191"/>
-+            <distortion model="ptlens" focal="18.8" a="0" b="0" c="0.019197"/>
-+            <distortion model="ptlens" focal="18.9" a="0" b="0" c="0.019293"/>
-+            <distortion model="ptlens" focal="19" a="0" b="0" c="0.019386"/>
-+            <distortion model="ptlens" focal="19.1" a="0" b="0" c="0.019476"/>
-+            <distortion model="ptlens" focal="19.2" a="0" b="0" c="0.019565"/>
-+            <distortion model="ptlens" focal="19.3" a="0" b="0" c="0.019652"/>
-+            <distortion model="ptlens" focal="19.4" a="0" b="0" c="0.019737"/>
-+            <distortion model="ptlens" focal="19.5" a="0" b="0" c="0.019819"/>
-+            <distortion model="ptlens" focal="19.6" a="0" b="0" c="0.0199"/>
-+            <distortion model="ptlens" focal="19.7" a="0" b="0" c="0.019979"/>
-+            <distortion model="ptlens" focal="19.8" a="0" b="0" c="0.020057"/>
-+            <distortion model="ptlens" focal="19.9" a="0" b="0" c="0.020133"/>
-+            <distortion model="ptlens" focal="20" a="0" b="0" c="0.020207"/>
-+            <distortion model="ptlens" focal="20.1" a="0" b="0" c="0.020279"/>
-+            <distortion model="ptlens" focal="20.2" a="0" b="0" c="0.02035"/>
-+            <distortion model="ptlens" focal="20.3" a="0" b="0" c="0.02042"/>
-+            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0.020488"/>
-+            <distortion model="ptlens" focal="20.5" a="0" b="0" c="0.020554"/>
-+            <distortion model="ptlens" focal="20.6" a="0" b="0" c="0.02062"/>
-+            <distortion model="ptlens" focal="20.7" a="0" b="0" c="0.020684"/>
-+            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0.020746"/>
-+            <distortion model="ptlens" focal="20.9" a="0" b="0" c="0.020808"/>
-+            <distortion model="ptlens" focal="21" a="0" b="0" c="0.020868"/>
-+            <distortion model="ptlens" focal="21.1" a="0" b="0" c="0.020927"/>
-+            <distortion model="ptlens" focal="21.2" a="0" b="0" c="0.020985"/>
-+            <distortion model="ptlens" focal="21.3" a="0" b="0" c="0.021041"/>
-+            <distortion model="ptlens" focal="21.4" a="0" b="0" c="0.021097"/>
-+            <distortion model="ptlens" focal="21.5" a="0" b="0" c="0.021151"/>
-+            <distortion model="ptlens" focal="21.6" a="0" b="0" c="0.021205"/>
-+            <distortion model="ptlens" focal="21.7" a="0" b="0" c="0.021257"/>
-+            <distortion model="ptlens" focal="21.8" a="0" b="0" c="0.021309"/>
-+            <distortion model="ptlens" focal="21.9" a="0" b="0" c="0.021359"/>
-+            <distortion model="ptlens" focal="22" a="0" b="0" c="0.021409"/>
-+            <distortion model="ptlens" focal="22.1" a="0" b="0" c="0.021458"/>
-+            <distortion model="ptlens" focal="22.2" a="0" b="0" c="0.021505"/>
-+            <distortion model="ptlens" focal="22.3" a="0" b="0" c="0.021552"/>
-+            <distortion model="ptlens" focal="22.4" a="0" b="0" c="0.021599"/>
-+            <distortion model="ptlens" focal="22.5" a="0" b="0" c="0.021644"/>
-+            <distortion model="ptlens" focal="22.6" a="0" b="0" c="0.021688"/>
-+            <distortion model="ptlens" focal="22.7" a="0" b="0" c="0.021732"/>
-+            <distortion model="ptlens" focal="22.8" a="0" b="0" c="0.021775"/>
-+            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0.021818"/>
-+            <distortion model="ptlens" focal="23" a="0" b="0" c="0.021859"/>
-+            <distortion model="ptlens" focal="23.1" a="0" b="0" c="0.0219"/>
-+            <distortion model="ptlens" focal="23.2" a="0" b="0" c="0.02194"/>
-+            <distortion model="ptlens" focal="23.3" a="0" b="0" c="0.02198"/>
-+            <distortion model="ptlens" focal="23.4" a="0" b="0" c="0.022019"/>
-+            <distortion model="ptlens" focal="23.5" a="0" b="0" c="0.022057"/>
-+            <distortion model="ptlens" focal="23.6" a="0" b="0" c="0.022095"/>
-+            <distortion model="ptlens" focal="23.7" a="0" b="0" c="0.022132"/>
-+            <distortion model="ptlens" focal="23.8" a="0" b="0" c="0.022169"/>
-+            <distortion model="ptlens" focal="23.9" a="0" b="0" c="0.022205"/>
-+            <distortion model="ptlens" focal="24" a="0" b="0" c="0.022241"/>
-+            <distortion model="ptlens" focal="24.1" a="0" b="0" c="0.022276"/>
-+            <distortion model="ptlens" focal="24.2" a="0" b="0" c="0.02231"/>
-+            <distortion model="ptlens" focal="24.3" a="0" b="0" c="0.022344"/>
-+            <distortion model="ptlens" focal="24.4" a="0" b="0" c="0.022378"/>
-+            <distortion model="ptlens" focal="24.5" a="0" b="0" c="0.022411"/>
-+            <distortion model="ptlens" focal="24.6" a="0" b="0" c="0.022444"/>
-+            <distortion model="ptlens" focal="24.7" a="0" b="0" c="0.022476"/>
-+            <distortion model="ptlens" focal="24.8" a="0" b="0" c="0.022508"/>
-+            <distortion model="ptlens" focal="24.9" a="0" b="0" c="0.02254"/>
-+            <distortion model="ptlens" focal="25" a="0" b="0" c="0.022571"/>
-+            <distortion model="ptlens" focal="25.1" a="0" b="0" c="0.022602"/>
-+            <distortion model="ptlens" focal="25.2" a="0" b="0" c="0.022632"/>
-+            <distortion model="ptlens" focal="25.3" a="0" b="0" c="0.022662"/>
-+            <distortion model="ptlens" focal="25.4" a="0" b="0" c="0.022692"/>
-+            <distortion model="ptlens" focal="25.5" a="0" b="0" c="0.022721"/>
-+            <distortion model="ptlens" focal="25.6" a="0" b="0" c="0.02275"/>
-+            <distortion model="ptlens" focal="25.7" a="0" b="0" c="0.022779"/>
-+            <distortion model="ptlens" focal="25.8" a="0" b="0" c="0.022808"/>
-+            <distortion model="ptlens" focal="25.9" a="0" b="0" c="0.022836"/>
-+            <distortion model="ptlens" focal="26" a="0" b="0" c="0.022864"/>
-+            <distortion model="ptlens" focal="26.1" a="0" b="0" c="0.022891"/>
-+            <distortion model="ptlens" focal="26.2" a="0" b="0" c="0.022919"/>
-+            <distortion model="ptlens" focal="26.3" a="0" b="0" c="0.022946"/>
-+            <distortion model="ptlens" focal="26.4" a="0" b="0" c="0.022973"/>
-+            <distortion model="ptlens" focal="26.5" a="0" b="0" c="0.023"/>
-+            <distortion model="ptlens" focal="26.6" a="0" b="0" c="0.023027"/>
-+            <distortion model="ptlens" focal="26.7" a="0" b="0" c="0.023053"/>
-+            <distortion model="ptlens" focal="26.8" a="0" b="0" c="0.023079"/>
-+            <distortion model="ptlens" focal="26.9" a="0" b="0" c="0.023105"/>
-+            <distortion model="ptlens" focal="27" a="0" b="0" c="0.023131"/>
-+            <distortion model="ptlens" focal="27.1" a="0" b="0" c="0.023157"/>
-+            <distortion model="ptlens" focal="27.2" a="0" b="0" c="0.023182"/>
-+            <distortion model="ptlens" focal="27.3" a="0" b="0" c="0.023208"/>
-+            <distortion model="ptlens" focal="27.4" a="0" b="0" c="0.023233"/>
-+            <distortion model="ptlens" focal="27.5" a="0" b="0" c="0.023258"/>
-+            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0.023282"/>
-+            <distortion model="ptlens" focal="27.7" a="0" b="0" c="0.023307"/>
-+            <distortion model="ptlens" focal="27.8" a="0" b="0" c="0.023331"/>
-+            <distortion model="ptlens" focal="27.9" a="0" b="0" c="0.023356"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0" c="0.02338"/>
-+            <distortion model="ptlens" focal="28.1" a="0" b="0" c="0.023404"/>
-+            <distortion model="ptlens" focal="28.2" a="0" b="0" c="0.023428"/>
-+            <distortion model="ptlens" focal="28.3" a="0" b="0" c="0.023451"/>
-+            <distortion model="ptlens" focal="28.4" a="0" b="0" c="0.023475"/>
-+            <distortion model="ptlens" focal="28.5" a="0" b="0" c="0.023498"/>
-+            <distortion model="ptlens" focal="28.6" a="0" b="0" c="0.023522"/>
-+            <distortion model="ptlens" focal="28.7" a="0" b="0" c="0.023545"/>
-+            <distortion model="ptlens" focal="28.8" a="0" b="0" c="0.023568"/>
-+            <distortion model="ptlens" focal="28.9" a="0" b="0" c="0.023591"/>
-+            <distortion model="ptlens" focal="29" a="0" b="0" c="0.023613"/>
-+            <distortion model="ptlens" focal="29.1" a="0" b="0" c="0.023636"/>
-+            <distortion model="ptlens" focal="29.2" a="0" b="0" c="0.023658"/>
-+            <distortion model="ptlens" focal="29.3" a="0" b="0" c="0.023681"/>
-+            <distortion model="ptlens" focal="29.4" a="0" b="0" c="0.023703"/>
-+            <distortion model="ptlens" focal="29.5" a="0" b="0" c="0.023725"/>
-+            <distortion model="ptlens" focal="29.6" a="0" b="0" c="0.023747"/>
-+            <distortion model="ptlens" focal="29.7" a="0" b="0" c="0.023769"/>
-+            <distortion model="ptlens" focal="29.8" a="0" b="0" c="0.02379"/>
-+            <distortion model="ptlens" focal="29.9" a="0" b="0" c="0.023812"/>
-+            <distortion model="ptlens" focal="30" a="0" b="0" c="0.023834"/>
-+            <distortion model="ptlens" focal="30.1" a="0" b="0" c="0.023855"/>
-+            <distortion model="ptlens" focal="30.2" a="0" b="0" c="0.023876"/>
-+            <distortion model="ptlens" focal="30.3" a="0" b="0" c="0.023898"/>
-+            <distortion model="ptlens" focal="30.4" a="0" b="0" c="0.023919"/>
-+            <distortion model="ptlens" focal="30.5" a="0" b="0" c="0.02394"/>
-+            <distortion model="ptlens" focal="30.6" a="0" b="0" c="0.023961"/>
-+            <distortion model="ptlens" focal="30.7" a="0" b="0" c="0.023981"/>
-+            <distortion model="ptlens" focal="30.8" a="0" b="0" c="0.024002"/>
-+            <distortion model="ptlens" focal="30.9" a="0" b="0" c="0.024023"/>
-+            <distortion model="ptlens" focal="31" a="0" b="0" c="0.024043"/>
-+            <distortion model="ptlens" focal="31.1" a="0" b="0" c="0.024064"/>
-+            <distortion model="ptlens" focal="31.2" a="0" b="0" c="0.024084"/>
-+            <distortion model="ptlens" focal="31.3" a="0" b="0" c="0.024105"/>
-+            <distortion model="ptlens" focal="31.4" a="0" b="0" c="0.024125"/>
-+            <distortion model="ptlens" focal="31.5" a="0" b="0" c="0.024145"/>
-+            <distortion model="ptlens" focal="31.6" a="0" b="0" c="0.024165"/>
-+            <distortion model="ptlens" focal="31.7" a="0" b="0" c="0.024185"/>
-+            <distortion model="ptlens" focal="31.8" a="0" b="0" c="0.024205"/>
-+            <distortion model="ptlens" focal="31.9" a="0" b="0" c="0.024225"/>
-+            <distortion model="ptlens" focal="32" a="0" b="0" c="0.024245"/>
-+            <distortion model="ptlens" focal="32.1" a="0" b="0" c="0.024264"/>
-+            <distortion model="ptlens" focal="32.2" a="0" b="0" c="0.024284"/>
-+            <distortion model="ptlens" focal="32.3" a="0" b="0" c="0.024304"/>
-+            <distortion model="ptlens" focal="32.4" a="0" b="0" c="0.024323"/>
-+            <distortion model="ptlens" focal="32.5" a="0" b="0" c="0.024343"/>
-+            <distortion model="ptlens" focal="32.6" a="0" b="0" c="0.024362"/>
-+            <distortion model="ptlens" focal="32.7" a="0" b="0" c="0.024381"/>
-+            <distortion model="ptlens" focal="32.8" a="0" b="0" c="0.024401"/>
-+            <distortion model="ptlens" focal="32.9" a="0" b="0" c="0.02442"/>
-+            <distortion model="ptlens" focal="33" a="0" b="0" c="0.024439"/>
-+            <distortion model="ptlens" focal="33.1" a="0" b="0" c="0.024458"/>
-+            <distortion model="ptlens" focal="33.2" a="0" b="0" c="0.024477"/>
-+            <distortion model="ptlens" focal="33.3" a="0" b="0" c="0.024497"/>
-+            <distortion model="ptlens" focal="33.4" a="0" b="0" c="0.024516"/>
-+            <distortion model="ptlens" focal="33.5" a="0" b="0" c="0.024534"/>
-+            <distortion model="ptlens" focal="33.6" a="0" b="0" c="0.024553"/>
-+            <distortion model="ptlens" focal="33.7" a="0" b="0" c="0.024572"/>
-+            <distortion model="ptlens" focal="33.8" a="0" b="0" c="0.024591"/>
-+            <distortion model="ptlens" focal="33.9" a="0" b="0" c="0.02461"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0" c="0.024629"/>
-+            <distortion model="ptlens" focal="34.1" a="0" b="0" c="0.024648"/>
-+            <distortion model="ptlens" focal="34.2" a="0" b="0" c="0.024666"/>
-+            <distortion model="ptlens" focal="34.3" a="0" b="0" c="0.024685"/>
-+            <distortion model="ptlens" focal="34.4" a="0" b="0" c="0.024704"/>
-+            <distortion model="ptlens" focal="34.5" a="0" b="0" c="0.024722"/>
-+            <distortion model="ptlens" focal="34.6" a="0" b="0" c="0.024741"/>
-+            <distortion model="ptlens" focal="34.7" a="0" b="0" c="0.02476"/>
-+            <distortion model="ptlens" focal="34.8" a="0" b="0" c="0.024778"/>
-+            <distortion model="ptlens" focal="34.9" a="0" b="0" c="0.024797"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0" c="0.024815"/>
-+            <distortion model="ptlens" focal="35.1" a="0" b="0" c="0.024834"/>
-+            <distortion model="ptlens" focal="35.2" a="0" b="0" c="0.024852"/>
-+            <distortion model="ptlens" focal="35.3" a="0" b="0" c="0.024871"/>
-+            <distortion model="ptlens" focal="35.4" a="0" b="0" c="0.024889"/>
-+            <distortion model="ptlens" focal="35.5" a="0" b="0" c="0.024908"/>
-+            <distortion model="ptlens" focal="35.6" a="0" b="0" c="0.024926"/>
-+            <distortion model="ptlens" focal="35.7" a="0" b="0" c="0.024945"/>
-+            <distortion model="ptlens" focal="35.8" a="0" b="0" c="0.024963"/>
-+            <distortion model="ptlens" focal="35.9" a="0" b="0" c="0.024982"/>
-+            <distortion model="ptlens" focal="36" a="0" b="0" c="0.025"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F200EXR &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fujiF200exr</mount>
-         <cropfactor>4.341</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.4" a="0.01564" b="-0.04677" c="0.01961" />
--            <distortion model="ptlens" focal="8.1" a="-0.00375" b="0.0034" c="-0.01065" />
--            <distortion model="ptlens" focal="13" a="-0.00638" b="0.01208" c="-0.01137" />
--            <distortion model="ptlens" focal="16" a="-0.00790" b="0.02297" c="-0.02505" />
--            <distortion model="ptlens" focal="25" a="-0.00176" b="0.00648" c="-0.00065" />
--            <distortion model="ptlens" focal="32" a="-0.00962" b="0.02592" c="-0.01447" />
-+            <distortion model="ptlens" focal="6.4" a="0.01564" b="-0.04677" c="0.01961"/>
-+            <distortion model="ptlens" focal="8.1" a="-0.00375" b="0.0034" c="-0.01065"/>
-+            <distortion model="ptlens" focal="13" a="-0.00638" b="0.01208" c="-0.01137"/>
-+            <distortion model="ptlens" focal="16" a="-0.00790" b="0.02297" c="-0.02505"/>
-+            <distortion model="ptlens" focal="25" a="-0.00176" b="0.00648" c="-0.00065"/>
-+            <distortion model="ptlens" focal="32" a="-0.00962" b="0.02592" c="-0.01447"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
--        <mount>fujix100s</mount>
--        <cropfactor>1.523</cropfactor>
-+        <maker>Fujifilm</maker>
-+        <model>X100 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujix100</mount>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="23" a="0.02159" b="-0.0618" c="0.04364" />
--            <tca model="poly3" focal="23" br="-0.0001543" vr="1.0006122" bb="0.0001753" vb="0.9996422" />
-+            <distortion model="ptlens" focal="23" a="0.02159" b="-0.0618" c="0.04364"/>
-+            <tca model="poly3" focal="23" br="-0.0001543" vr="1.0006122" bb="0.0001753" vb="0.9996422"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Fuji</maker>
--        <model>Standard</model>
-+        <maker>Fujifilm</maker>
-+        <model>X100 &amp; compatibles (Standard) + TCL-X100</model>
-+        <model lang="en">TCL-X100</model>
-+        <mount>fujix100</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X100s -->
-+            <distortion model="ptlens" focal="33" a="0.02986" b="-0.05994" c="0.05518"/>
-+            <tca model="poly3" focal="33" vr="1.0000047" vb="0.9999998"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>X10 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>fujix10</mount>
-         <cropfactor>3.93</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.02972" b="-0.09564" c="0.0155" />
--            <distortion model="ptlens" focal="8.9" a="0.02083" b="-0.07255" c="0.03871" />
--            <distortion model="ptlens" focal="12.2" a="0.01649" b="-0.03788" c="0.01562" />
--            <distortion model="ptlens" focal="19.5" a="0.00142" b="0.01461" c="-0.01538" />
--            <distortion model="ptlens" focal="28.4" a="0" b="0.00718" c="0" />
--            <tca model="poly3" focal="7.1" vr="1.0007" vb="1.00012" />
--            <tca model="poly3" focal="8.9" vr="1.00046" vb="0.99992" />
--            <tca model="poly3" focal="12.2" vr="1.00043" vb="1.00008" />
--            <tca model="poly3" focal="19.5" />
--            <tca model="poly3" focal="28.4" vr="0.9998" vb="0.9996" />
-+            <distortion model="ptlens" focal="7.1" a="0.02972" b="-0.09564" c="0.0155"/>
-+            <distortion model="ptlens" focal="8.9" a="0.02083" b="-0.07255" c="0.03871"/>
-+            <distortion model="ptlens" focal="12.2" a="0.01649" b="-0.03788" c="0.01562"/>
-+            <distortion model="ptlens" focal="19.5" a="0.00142" b="0.01461" c="-0.01538"/>
-+            <distortion model="ptlens" focal="28.4" a="0" b="0.00718" c="0"/>
-+            <tca model="poly3" focal="7.1" vr="1.0007" vb="1.00012"/>
-+            <tca model="poly3" focal="8.9" vr="1.00046" vb="0.99992"/>
-+            <tca model="poly3" focal="12.2" vr="1.00043" vb="1.00008"/>
-+            <tca model="poly3" focal="19.5"/>
-+            <tca model="poly3" focal="28.4" vr="0.9998" vb="0.9996"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix HS20EXR &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujihs20exr</mount>
-+        <cropfactor>5.71</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.2" a="0.01557" b="-0.05066" c="-0.04858"/>
-+            <distortion model="ptlens" focal="5" a="0.00758" b="-0.01443" c="-0.03499"/>
-+            <distortion model="ptlens" focal="5.4" a="0.01195" b="-0.02342" c="-0.00966"/>
-+            <distortion model="ptlens" focal="5.6" a="0.02236" b="-0.05672" c="0.04049"/>
-+            <distortion model="ptlens" focal="7.1" a="0.03547" b="-0.07378" c="0.07626"/>
-+            <distortion model="ptlens" focal="8.6" a="0.01117" b="0.00674" c="0.01696"/>
-+            <distortion model="ptlens" focal="12.3" a="0.03635" b="-0.05129" c="0.06929"/>
-+            <distortion model="ptlens" focal="16.1" a="0.04961" b="-0.09542" c="0.11586"/>
-+            <distortion model="ptlens" focal="21.2" a="0.03377" b="-0.02899" c="0.03685"/>
-+            <distortion model="ptlens" focal="24.9" a="-0.00438" b="0.0363" c="0.04379"/>
-+            <distortion model="ptlens" focal="28" a="-0.02454" b="0.13049" c="-0.09839"/>
-+            <distortion model="ptlens" focal="30.3" a="-0.03533" b="0.14051" c="-0.06339"/>
-+            <distortion model="ptlens" focal="43.1" a="-0.00121" b="0.04359" c="0.01142"/>
-+            <distortion model="ptlens" focal="59" a="-0.02082" b="0.09605" c="-0.04338"/>
-+            <distortion model="ptlens" focal="84.1" a="-0.03895" b="0.14772" c="-0.08548"/>
-+            <distortion model="ptlens" focal="126" a="-0.00275" b="0.03685" c="0.0165"/>
-+            <tca model="poly3" focal="4.2" br="-0.0006044" vr="1.0015583" bb="0.0003064" vb="0.9996509"/>
-+            <tca model="poly3" focal="5" br="-0.0006921" vr="1.0015321" bb="0.0002984" vb="0.9996267"/>
-+            <tca model="poly3" focal="5.4" br="-0.0004830" vr="1.0012212" bb="0.0002778" vb="0.9996477"/>
-+            <tca model="poly3" focal="5.6" br="-0.0005000" vr="1.0012408" bb="0.0002717" vb="0.9996562"/>
-+            <tca model="poly3" focal="7.1" br="-0.0005363" vr="1.0012541" bb="0.0001994" vb="0.9997148"/>
-+            <tca model="poly3" focal="8.6" br="-0.0004482" vr="1.0008582" bb="0.0002015" vb="0.9997459"/>
-+            <tca model="poly3" focal="12.3" br="-0.0002563" vr="1.0006152" bb="0.0001535" vb="0.9998155"/>
-+            <tca model="poly3" focal="16.1" br="-0.0002135" vr="1.0004230" bb="0.0001455" vb="0.9998099"/>
-+            <tca model="poly3" focal="21.2" br="-0.0001491" vr="1.0002478" bb="0.0000214" vb="0.9999322"/>
-+            <tca model="poly3" focal="24.9" br="-0.0000712" vr="1.0001499" bb="0.0000178" vb="0.9999370"/>
-+            <tca model="poly3" focal="28" br="-0.0002714" vr="1.0005178" bb="0.0001966" vb="0.9995914"/>
-+            <tca model="poly3" focal="30.3" br="-0.0000742" vr="1.0000964" bb="0.0000090" vb="0.9999415"/>
-+            <tca model="poly3" focal="43.1" br="-0.0001378" vr="1.0002126" bb="0.0000720" vb="0.9995407"/>
-+            <tca model="poly3" focal="59" br="-0.0001059" vr="0.9999289" bb="0.0001135" vb="0.9996203"/>
-+            <tca model="poly3" focal="84.1" br="-0.0001983" vr="0.9999666" bb="0.0000523" vb="0.9996942"/>
-+            <tca model="poly3" focal="126" br="0.0000220" vr="0.9994784" bb="0.0001868" vb="0.9993445"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix F770EXR &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujif770exr</mount>
-+        <cropfactor>5.43</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.6" a="0.01272" b="-0.05766" c="-0.00271"/>
-+            <distortion model="ptlens" focal="9.2" a="0.0079" b="-0.00036" c="0.00893"/>
-+            <distortion model="ptlens" focal="19.1" a="-0.02764" b="0.10049" c="-0.08307"/>
-+            <distortion model="ptlens" focal="36.3" a="-0.01688" b="0.04463" c="-0.02165"/>
-+            <distortion model="ptlens" focal="60.4" a="-0.01809" b="0.02613" c="0.00016"/>
-+            <distortion model="ptlens" focal="92" a="-0.01825" b="0.02645" c="-0.01387"/>
-+            <tca model="poly3" focal="4.6" vr="1.0004912" vb="1.0002067"/>
-+            <tca model="poly3" focal="9.2" vr="1.0002420" vb="1.0001037"/>
-+            <tca model="poly3" focal="19.1" vr="1.0000862" vb="1.0000509"/>
-+            <tca model="poly3" focal="36.3" vr="0.9999841" vb="0.9999159"/>
-+            <tca model="poly3" focal="60.4" vr="0.9999076" vb="0.9999219"/>
-+            <tca model="poly3" focal="92" vr="0.999" vb="0.999"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>FinePix S5600</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujiS5600</mount>
-+        <cropfactor>6.03</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="6.3" k1="-0.01437"/>
-+            <distortion model="poly3" focal="6.9" k1="-0.00883"/>
-+            <distortion model="poly3" focal="7.5" k1="-0.005619"/>
-+            <distortion model="poly3" focal="9" k1="0.00042"/>
-+            <distortion model="poly3" focal="16.7" k1="0.00266"/>
-+            <distortion model="poly3" focal="21.6" k1="0.00156"/>
-+            <distortion model="poly3" focal="28.6" k1="0.00094"/>
-+            <distortion model="poly3" focal="63" k1="0.00021"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>Fujifilm XQ1</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujiXQ1</mount>
-+        <cropfactor>3.91</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6.4" a="0.01267" b="-0.07641" c="0.00242"/>
-+            <distortion model="ptlens" focal="9.7" a="-0.00489" b="-0.00182" c="-0.02868"/>
-+            <distortion model="ptlens" focal="14.9" a="0" b="-0.00793" c="0"/>
-+            <distortion model="ptlens" focal="22.2" a="0" b="-0.00295" c="0"/>
-+            <distortion model="ptlens" focal="25.6" a="0" b="-0.00116" c="0"/>
-+            <tca model="poly3" focal="6.4" br="0.0003842" vr="0.9998453" bb="-0.0003690" vb="1.0009162"/>
-+            <tca model="poly3" focal="9.7" br="0.0001230" vr="0.9998798" bb="-0.0001439" vb="1.0005130"/>
-+            <tca model="poly3" focal="14.9" br="0.0000232" vr="0.9999439" bb="0.0000423" vb="1.0004204"/>
-+            <tca model="poly3" focal="22.2" br="-0.0000659" vr="1.0001220" bb="-0.0000503" vb="1.0002306"/>
-+            <tca model="poly3" focal="25.6" br="-0.0000914" vr="1.0001901" bb="-0.0000653" vb="1.0001226"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>Fujifilm FinePix A370</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujiA370</mount>
-+        <cropfactor>6.03</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5.9" a="0.01077" b="-0.03642" c="0.0168"/>
-+            <distortion model="ptlens" focal="7.6" a="0.01088" b="-0.03855" c="0.03003"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="0.00062" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>Fujifilm X-S1</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>fujiXS1</mount>
-+        <cropfactor>3.93</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6.1" a="0.04173" b="-0.1255" c="0.03337"/>
-+            <distortion model="ptlens" focal="9.2" a="0.05507" b="-0.14991" c="0.16436"/>
-+            <distortion model="ptlens" focal="12" a="0.03847" b="-0.07323" c="0.07359"/>
-+            <distortion model="ptlens" focal="15.1" a="0.00645" b="0.01798" c="0.01622"/>
-+            <distortion model="ptlens" focal="16.3" a="-0.00502" b="0.06208" c="-0.04238"/>
-+            <distortion model="ptlens" focal="25.7" a="0.02044" b="-0.0267" c="0.07563"/>
-+            <distortion model="ptlens" focal="30" a="0.00802" b="0.01586" c="0.01124"/>
-+            <distortion model="ptlens" focal="49.1" a="-0.00692" b="0.05513" c="-0.00162"/>
-+            <distortion model="ptlens" focal="51" a="0.02053" b="-0.03035" c="0.0728"/>
-+            <distortion model="ptlens" focal="61.8" a="-0.0162" b="0.07471" c="-0.01617"/>
-+            <distortion model="ptlens" focal="77.6" a="-0.03119" b="0.11626" c="-0.04673"/>
-+            <distortion model="ptlens" focal="118" a="-0.03622" b="0.12026" c="-0.05082"/>
-+            <distortion model="ptlens" focal="158.6" a="-0.03593" b="0.1124" c="-0.03696"/>
-+            <tca model="poly3" focal="6.1" br="-0.0006698" vr="1.0015060" bb="0.0001771" vb="0.9997757"/>
-+            <tca model="poly3" focal="9.2" br="-0.0003439" vr="1.0011847" bb="0.0001094" vb="0.9997936"/>
-+            <tca model="poly3" focal="12" br="-0.0001715" vr="1.0005107" bb="0.0000503" vb="0.9998925"/>
-+            <tca model="poly3" focal="13" br="-0.0002957" vr="1.0011080" bb="0.0000873" vb="0.9998131"/>
-+            <tca model="poly3" focal="15.1" br="-0.0001575" vr="1.0004048" bb="0.0000547" vb="0.9999092"/>
-+            <tca model="poly3" focal="16.3" br="-0.0001187" vr="1.0004237" bb="0.0000731" vb="0.9998992"/>
-+            <tca model="poly3" focal="20.5" br="-0.0001369" vr="1.0005299" bb="0.0000650" vb="0.9998692"/>
-+            <tca model="poly3" focal="25.7" br="-0.0000855" vr="1.0002196" bb="0.0000465" vb="0.9999389"/>
-+            <tca model="poly3" focal="30" br="-0.0000874" vr="1.0002188" bb="0.0000667" vb="0.9998927"/>
-+            <tca model="poly3" focal="40.6" br="-0.0000627" vr="1.0001223" bb="0.0000768" vb="0.9998504"/>
-+            <tca model="poly3" focal="49.1" br="-0.0000789" vr="1.0000674" bb="0.0000261" vb="0.9999830"/>
-+            <tca model="poly3" focal="61.8" br="-0.0000792" vr="0.9999716" bb="0.0000256" vb="0.9999884"/>
-+            <tca model="poly3" focal="64.2" br="-0.0000833" vr="0.9999308" bb="-0.0001554" vb="1.0000881"/>
-+            <tca model="poly3" focal="77.6" br="-0.0001047" vr="0.9998898" bb="0.0000203" vb="1.0000117"/>
-+            <tca model="poly3" focal="90.4" br="-0.0001352" vr="0.9999454" bb="-0.0001451" vb="1.0001396"/>
-+            <tca model="poly3" focal="118" br="-0.0002359" vr="0.9999663" bb="-0.0000332" vb="1.0000257"/>
-+            <tca model="poly3" focal="158.6" br="-0.0005435" vr="0.9996900" bb="0.0001082" vb="0.9999633"/>
-+            <vignetting model="pa" focal="6.1" aperture="2.8" distance="10" k1="-0.6581" k2="0.7127" k3="-0.5429"/>
-+            <vignetting model="pa" focal="6.1" aperture="2.8" distance="1000" k1="-0.6581" k2="0.7127" k3="-0.5429"/>
-+            <vignetting model="pa" focal="6.1" aperture="3.2" distance="10" k1="-0.6793" k2="0.7144" k3="-0.4351"/>
-+            <vignetting model="pa" focal="6.1" aperture="3.2" distance="1000" k1="-0.6793" k2="0.7144" k3="-0.4351"/>
-+            <vignetting model="pa" focal="6.1" aperture="3.6" distance="10" k1="-0.6629" k2="0.6624" k3="-0.4054"/>
-+            <vignetting model="pa" focal="6.1" aperture="3.6" distance="1000" k1="-0.6629" k2="0.6624" k3="-0.4054"/>
-+            <vignetting model="pa" focal="6.1" aperture="4" distance="10" k1="-0.6061" k2="0.4407" k3="-0.1881"/>
-+            <vignetting model="pa" focal="6.1" aperture="4" distance="1000" k1="-0.6061" k2="0.4407" k3="-0.1881"/>
-+            <vignetting model="pa" focal="6.1" aperture="11" distance="10" k1="-0.5866" k2="0.5655" k3="-0.2802"/>
-+            <vignetting model="pa" focal="6.1" aperture="11" distance="1000" k1="-0.5866" k2="0.5655" k3="-0.2802"/>
-+            <vignetting model="pa" focal="15.1" aperture="3.6" distance="10" k1="-0.6070" k2="0.7431" k3="-0.4935"/>
-+            <vignetting model="pa" focal="15.1" aperture="3.6" distance="1000" k1="-0.6070" k2="0.7431" k3="-0.4935"/>
-+            <vignetting model="pa" focal="15.1" aperture="4" distance="10" k1="-0.5303" k2="0.4250" k3="-0.1861"/>
-+            <vignetting model="pa" focal="15.1" aperture="4" distance="1000" k1="-0.5303" k2="0.4250" k3="-0.1861"/>
-+            <vignetting model="pa" focal="15.1" aperture="4.5" distance="10" k1="-0.5090" k2="0.3295" k3="-0.0886"/>
-+            <vignetting model="pa" focal="15.1" aperture="4.5" distance="1000" k1="-0.5090" k2="0.3295" k3="-0.0886"/>
-+            <vignetting model="pa" focal="15.1" aperture="5" distance="10" k1="-0.5044" k2="0.3137" k3="-0.0776"/>
-+            <vignetting model="pa" focal="15.1" aperture="5" distance="1000" k1="-0.5044" k2="0.3137" k3="-0.0776"/>
-+            <vignetting model="pa" focal="15.1" aperture="11" distance="10" k1="-0.4872" k2="0.2816" k3="-0.0957"/>
-+            <vignetting model="pa" focal="15.1" aperture="11" distance="1000" k1="-0.4872" k2="0.2816" k3="-0.0957"/>
-+            <vignetting model="pa" focal="34.9" aperture="4.5" distance="10" k1="-0.5227" k2="0.3657" k3="-0.1251"/>
-+            <vignetting model="pa" focal="34.9" aperture="4.5" distance="1000" k1="-0.5227" k2="0.3657" k3="-0.1251"/>
-+            <vignetting model="pa" focal="34.9" aperture="5" distance="10" k1="-0.4981" k2="0.2696" k3="-0.0351"/>
-+            <vignetting model="pa" focal="34.9" aperture="5" distance="1000" k1="-0.4981" k2="0.2696" k3="-0.0351"/>
-+            <vignetting model="pa" focal="34.9" aperture="5.6" distance="10" k1="-0.5072" k2="0.3208" k3="-0.0827"/>
-+            <vignetting model="pa" focal="34.9" aperture="5.6" distance="1000" k1="-0.5072" k2="0.3208" k3="-0.0827"/>
-+            <vignetting model="pa" focal="34.9" aperture="6.4" distance="10" k1="-0.5611" k2="0.4349" k3="-0.1608"/>
-+            <vignetting model="pa" focal="34.9" aperture="6.4" distance="1000" k1="-0.5611" k2="0.4349" k3="-0.1608"/>
-+            <vignetting model="pa" focal="34.9" aperture="11" distance="10" k1="-0.5332" k2="0.3572" k3="-0.0624"/>
-+            <vignetting model="pa" focal="34.9" aperture="11" distance="1000" k1="-0.5332" k2="0.3572" k3="-0.0624"/>
-+            <vignetting model="pa" focal="77.6" aperture="5.6" distance="10" k1="-0.5770" k2="0.4783" k3="-0.1440"/>
-+            <vignetting model="pa" focal="77.6" aperture="5.6" distance="1000" k1="-0.5770" k2="0.4783" k3="-0.1440"/>
-+            <vignetting model="pa" focal="77.6" aperture="6.4" distance="10" k1="-0.5468" k2="0.4264" k3="-0.1121"/>
-+            <vignetting model="pa" focal="77.6" aperture="6.4" distance="1000" k1="-0.5468" k2="0.4264" k3="-0.1121"/>
-+            <vignetting model="pa" focal="77.6" aperture="7.1" distance="10" k1="-0.5350" k2="0.3480" k3="-0.0305"/>
-+            <vignetting model="pa" focal="77.6" aperture="7.1" distance="1000" k1="-0.5350" k2="0.3480" k3="-0.0305"/>
-+            <vignetting model="pa" focal="77.6" aperture="8" distance="10" k1="-0.5479" k2="0.4077" k3="-0.0887"/>
-+            <vignetting model="pa" focal="77.6" aperture="8" distance="1000" k1="-0.5479" k2="0.4077" k3="-0.0887"/>
-+            <vignetting model="pa" focal="77.6" aperture="11" distance="10" k1="-0.5119" k2="0.2929" k3="0.0091"/>
-+            <vignetting model="pa" focal="77.6" aperture="11" distance="1000" k1="-0.5119" k2="0.2929" k3="0.0091"/>
-+            <vignetting model="pa" focal="158.6" aperture="5.6" distance="10" k1="-0.7216" k2="0.1993" k3="0.1109"/>
-+            <vignetting model="pa" focal="158.6" aperture="5.6" distance="1000" k1="-0.7216" k2="0.1993" k3="0.1109"/>
-+            <vignetting model="pa" focal="158.6" aperture="6.4" distance="10" k1="-0.5204" k2="0.2966" k3="-0.0631"/>
-+            <vignetting model="pa" focal="158.6" aperture="6.4" distance="1000" k1="-0.5204" k2="0.2966" k3="-0.0631"/>
-+            <vignetting model="pa" focal="158.6" aperture="7.1" distance="10" k1="-0.5705" k2="0.4937" k3="-0.1689"/>
-+            <vignetting model="pa" focal="158.6" aperture="7.1" distance="1000" k1="-0.5705" k2="0.4937" k3="-0.1689"/>
-+            <vignetting model="pa" focal="158.6" aperture="8" distance="10" k1="-0.5619" k2="0.4321" k3="-0.0672"/>
-+            <vignetting model="pa" focal="158.6" aperture="8" distance="1000" k1="-0.5619" k2="0.4321" k3="-0.0672"/>
-+            <vignetting model="pa" focal="158.6" aperture="11" distance="10" k1="-0.5375" k2="0.3770" k3="-0.0282"/>
-+            <vignetting model="pa" focal="158.6" aperture="11" distance="1000" k1="-0.5375" k2="0.3770" k3="-0.0282"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-kodak.xml b/data/db/compact-kodak.xml
---- a/data/db/compact-kodak.xml	2010-02-18 20:34:13.000000000 +0100
-+++ b/data/db/compact-kodak.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,31 +1,42 @@
- <lensdatabase>
--
--    <mount>
--        <name>KodakDC120</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>KodakDC50</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
-         <maker>Eastman Kodak Company</maker>
-         <maker lang="en">Kodak</maker>
-         <model>Kodak DC120 ZOOM Digital Camera</model>
-         <model lang="en">Kodak DC120</model>
--        <mount>KodakDC120</mount>
-+        <mount>kodakDC120</mount>
-         <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Eastman Kodak Company</maker>
-         <maker lang="en">Kodak</maker>
-         <model>Kodak Digital Science DC50 Zoom Camera</model>
-         <model lang="en">Kodak DC50</model>
--        <mount>KodakDC50</mount>
-+        <mount>kodakDC50</mount>
-         <cropfactor>1</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Eastman Kodak Company</maker>
-+        <maker lang="en">Kodak</maker>
-+        <model>Kodak CX6330 Zoom Digital Camera</model>
-+        <model lang="en">Kodak CX6330</model>
-+        <mount>kodakCX6330</mount>
-+        <cropfactor>6.593</cropfactor>
-+    </camera>
-+    <lens>
-+        <maker>Kodak</maker>
-+        <model>Kodak CX6330 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>kodakCX6330</mount>
-+        <cropfactor>6.593</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="5.6" a="0.02078" b="-0.06962" c="0.04229"/>
-+            <distortion model="ptlens" focal="7" a="0" b="-0.0089" c="0"/>
-+            <distortion model="ptlens" focal="8.6" a="0.00856" b="-0.03587" c="0.0327"/>
-+            <distortion model="ptlens" focal="10.8" a="0" b="-0.00465" c="0"/>
-+            <distortion model="ptlens" focal="13.5" a="0" b="-0.00357" c="0"/>
-+            <distortion model="ptlens" focal="16.8" a="0" b="-0.00293" c="0"/>
-+        </calibration>
-+    </lens>
- </lensdatabase>
-diff -Nurpd a/data/db/compact-konica-minolta.xml b/data/db/compact-konica-minolta.xml
---- a/data/db/compact-konica-minolta.xml	2008-06-02 00:24:54.000000000 +0200
-+++ b/data/db/compact-konica-minolta.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,64 +1,22 @@
- <lensdatabase>
--
--    <mount>
--        <name>kmG400</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>kmXt</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>kmZ2</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>kmZ3</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>kmZ1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>kmD7</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>kmZ10</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
-+        <maker>Konica Minolta</maker>
-         <model>DiMAGE Z6</model>
-         <mount>kmZ3</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
-+        <maker>Konica Minolta</maker>
-         <model>DiMAGE Z5</model>
-         <mount>kmZ3</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
-+        <maker>Konica Minolta</maker>
-         <model>DiMAGE Z3</model>
-         <mount>kmZ3</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Konica Minolta Camera, Inc.</maker>
-         <maker lang="en">Konica Minolta</maker>
-@@ -66,7 +24,6 @@
-         <mount>kmZ2</mount>
-         <cropfactor>6.03</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -74,31 +31,24 @@
-         <mount>kmZ1</mount>
-         <cropfactor>6.545</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
-+        <maker>Konica Minolta</maker>
-         <model>DiMAGE Z20</model>
-         <mount>kmZ10</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
-+        <maker>Konica Minolta</maker>
-         <model>DiMAGE Z10</model>
-         <mount>kmZ10</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
-+        <maker>Konica Minolta</maker>
-         <model>DiMAGE A200</model>
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Konica Minolta Camera, Inc.</maker>
-         <maker lang="en">Konica Minolta</maker>
-@@ -106,7 +56,6 @@
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -114,7 +63,6 @@
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -122,7 +70,6 @@
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -130,7 +77,6 @@
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -138,7 +84,6 @@
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -146,7 +91,6 @@
-         <mount>kmXt</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -154,7 +98,6 @@
-         <mount>kmXt</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Minolta Co., Ltd.</maker>
-         <maker lang="en">Minolta</maker>
-@@ -162,186 +105,194 @@
-         <mount>kmXt</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA CAMERA, Inc.</maker>
-+        <maker>Konica Minolta Camera, Inc.</maker>
-         <maker lang="en">Konica Minolta</maker>
-         <model>DiMAGE G400</model>
-         <mount>kmG400</mount>
-         <cropfactor>6.144</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA CAMERA, Inc.</maker>
-+        <maker>Konica Minolta Camera, Inc.</maker>
-         <maker lang="en">Konica Minolta</maker>
-         <model>Revio KD-420Z</model>
-         <mount>kmG400</mount>
-         <cropfactor>6.144</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE Z3 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmZ3</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.859" a="0.008857" b="-0.033348" c="0" />
--            <distortion model="ptlens" focal="6.542" a="0" b="-0.008767" c="0" />
--            <distortion model="ptlens" focal="7.61" a="0" b="-0.005089" c="0" />
--            <distortion model="ptlens" focal="8.747" a="0" b="-0.003083" c="0" />
--            <distortion model="ptlens" focal="9.911" a="0" b="-0.001565" c="0" />
--            <distortion model="ptlens" focal="12.821" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="37.832" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="69.454" a="0" b="0.00172" c="0" />
-+            <distortion model="ptlens" focal="5.859" a="0.008857" b="-0.033348" c="0"/>
-+            <distortion model="ptlens" focal="6.542" a="0" b="-0.008767" c="0"/>
-+            <distortion model="ptlens" focal="7.61" a="0" b="-0.005089" c="0"/>
-+            <distortion model="ptlens" focal="8.747" a="0" b="-0.003083" c="0"/>
-+            <distortion model="ptlens" focal="9.911" a="0" b="-0.001565" c="0"/>
-+            <distortion model="ptlens" focal="12.821" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="37.832" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="69.454" a="0" b="0.00172" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE Z2 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmZ2</mount>
-         <cropfactor>6.03</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.3" a="0.024434" b="-0.049454" c="0" />
--            <distortion model="ptlens" focal="8.6" a="0.012009" b="-0.022336" c="0" />
--            <distortion model="ptlens" focal="12.1" a="0" b="-0.001567" c="0" />
--            <distortion model="ptlens" focal="17.5" a="0" b="-0.002328" c="0" />
--            <distortion model="ptlens" focal="24.8" a="0" b="-0.002045" c="0" />
--            <distortion model="ptlens" focal="34.7" a="0" b="-0.004272" c="0" />
--            <distortion model="ptlens" focal="52.4" a="0" b="-0.003142" c="0" />
--            <distortion model="ptlens" focal="63" a="0" b="0.000531" c="0" />
-+            <distortion model="ptlens" focal="6.3" a="0.024434" b="-0.049454" c="0"/>
-+            <distortion model="ptlens" focal="8.6" a="0.012009" b="-0.022336" c="0"/>
-+            <distortion model="ptlens" focal="12.1" a="0" b="-0.001567" c="0"/>
-+            <distortion model="ptlens" focal="17.5" a="0" b="-0.002328" c="0"/>
-+            <distortion model="ptlens" focal="24.8" a="0" b="-0.002045" c="0"/>
-+            <distortion model="ptlens" focal="34.7" a="0" b="-0.004272" c="0"/>
-+            <distortion model="ptlens" focal="52.4" a="0" b="-0.003142" c="0"/>
-+            <distortion model="ptlens" focal="63" a="0" b="0.000531" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>ZCW-100</model>
-+        <model>DiMAGE Z2 &amp; compatibles, with ZCW-100</model>
-+        <model lang="en">fixed lens, with ZCW-100</model>
-+        <model lang="de">festes Objektiv, mit ZCW-100</model>
-         <mount>kmZ2</mount>
-         <cropfactor>6.03</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.3" a="0.020234" b="-0.07549" c="0" />
--            <distortion model="ptlens" focal="7.4" a="0.013032" b="-0.054808" c="0" />
--            <distortion model="ptlens" focal="10.4" a="-0.001905" b="-0.017509" c="0" />
-+            <distortion model="ptlens" focal="6.3" a="0.020234" b="-0.07549" c="0"/>
-+            <distortion model="ptlens" focal="7.4" a="0.013032" b="-0.054808" c="0"/>
-+            <distortion model="ptlens" focal="10.4" a="-0.001905" b="-0.017509" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE Z1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmZ1</mount>
-         <cropfactor>6.545</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.025087" b="-0.065158" c="0" />
--            <distortion model="ptlens" focal="6" a="0.021188" b="-0.052445" c="0" />
--            <distortion model="ptlens" focal="6.6" a="0.020944" b="-0.047765" c="0" />
--            <distortion model="ptlens" focal="7.3" a="0.015342" b="-0.033767" c="0" />
--            <distortion model="ptlens" focal="10.5" a="0.008218" b="-0.019123" c="0" />
--            <distortion model="ptlens" focal="15.2" a="0.007013" b="-0.016335" c="0" />
--            <distortion model="ptlens" focal="22.9" a="0.002611" b="-0.00752" c="0" />
--            <distortion model="ptlens" focal="30.1" a="0" b="-0.00372" c="0" />
--            <distortion model="ptlens" focal="39.6" a="0" b="-0.0046" c="0" />
--            <distortion model="ptlens" focal="45.4" a="0" b="-0.004482" c="0" />
--            <distortion model="ptlens" focal="49.8" a="0" b="-0.004394" c="0" />
--            <distortion model="ptlens" focal="58" a="0" b="0.000217" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.025087" b="-0.065158" c="0"/>
-+            <distortion model="ptlens" focal="6" a="0.021188" b="-0.052445" c="0"/>
-+            <distortion model="ptlens" focal="6.6" a="0.020944" b="-0.047765" c="0"/>
-+            <distortion model="ptlens" focal="7.3" a="0.015342" b="-0.033767" c="0"/>
-+            <distortion model="ptlens" focal="10.5" a="0.008218" b="-0.019123" c="0"/>
-+            <distortion model="ptlens" focal="15.2" a="0.007013" b="-0.016335" c="0"/>
-+            <distortion model="ptlens" focal="22.9" a="0.002611" b="-0.00752" c="0"/>
-+            <distortion model="ptlens" focal="30.1" a="0" b="-0.00372" c="0"/>
-+            <distortion model="ptlens" focal="39.6" a="0" b="-0.0046" c="0"/>
-+            <distortion model="ptlens" focal="45.4" a="0" b="-0.004482" c="0"/>
-+            <distortion model="ptlens" focal="49.8" a="0" b="-0.004394" c="0"/>
-+            <distortion model="ptlens" focal="58" a="0" b="0.000217" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>ZCW-100</model>
-+        <model>DiMAGE Z1 &amp; compatibles, with ZCW-100</model>
-+        <model lang="en">fixed lens, with ZCW-100</model>
-+        <model lang="de">festes Objektiv, mit ZCW-100</model>
-         <mount>kmZ1</mount>
-         <cropfactor>6.545</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="4.4" a="0.030707" b="-0.10549" c="0" />
-+            <distortion model="ptlens" focal="4.4" a="0.030707" b="-0.10549" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE Z10 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmZ10</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.012869" b="-0.041112" c="0" />
--            <distortion model="ptlens" focal="7.4" a="0.020326" b="-0.036191" c="0" />
--            <distortion model="ptlens" focal="8.9" a="0.015295" b="-0.018566" c="0" />
--            <distortion model="ptlens" focal="11.9" a="0.012247" b="-0.010229" c="0" />
--            <distortion model="ptlens" focal="13.4" a="0.011031" b="-0.010002" c="0" />
--            <distortion model="ptlens" focal="17.3" a="0.006649" b="-0.001496" c="0" />
--            <distortion model="ptlens" focal="27.8" a="0.005224" b="-0.000697" c="0" />
--            <distortion model="ptlens" focal="35.9" a="0.006913" b="-0.002215" c="0" />
--            <distortion model="ptlens" focal="48" a="0.006184" b="0.003347" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.012869" b="-0.041112" c="0"/>
-+            <distortion model="ptlens" focal="7.4" a="0.020326" b="-0.036191" c="0"/>
-+            <distortion model="ptlens" focal="8.9" a="0.015295" b="-0.018566" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="0.012247" b="-0.010229" c="0"/>
-+            <distortion model="ptlens" focal="13.4" a="0.011031" b="-0.010002" c="0"/>
-+            <distortion model="ptlens" focal="17.3" a="0.006649" b="-0.001496" c="0"/>
-+            <distortion model="ptlens" focal="27.8" a="0.005224" b="-0.000697" c="0"/>
-+            <distortion model="ptlens" focal="35.9" a="0.006913" b="-0.002215" c="0"/>
-+            <distortion model="ptlens" focal="48" a="0.006184" b="0.003347" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>ZCW-200</model>
-+        <model>DiMAGE Z10 &amp; compatibles, with ZCW-200</model>
-+        <model lang="en">fixed lens, with ZCW-200</model>
-+        <model lang="de">festes Objektiv, mit ZCW-200</model>
-         <mount>kmZ10</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="4.2" a="0.024186" b="-0.107425" c="0" />
-+            <distortion model="ptlens" focal="4.2" a="0.024186" b="-0.107425" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE 7 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.3" a="0.025" b="-0.065" c="0" />
--            <distortion model="ptlens" focal="8.9" a="0.015" b="-0.033" c="0" />
--            <distortion model="ptlens" focal="12.7" a="0" b="0.003" c="0" />
--            <distortion model="ptlens" focal="25.4" a="0" b="0.005" c="0" />
--            <distortion model="ptlens" focal="38.1" a="0" b="0.008" c="0" />
--            <distortion model="ptlens" focal="50.8" a="0" b="0.008" c="0" />
-+            <distortion model="ptlens" focal="7.3" a="0.025" b="-0.065" c="0"/>
-+            <distortion model="ptlens" focal="8.9" a="0.015" b="-0.033" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="0" b="0.003" c="0"/>
-+            <distortion model="ptlens" focal="25.4" a="0" b="0.005" c="0"/>
-+            <distortion model="ptlens" focal="38.1" a="0" b="0.008" c="0"/>
-+            <distortion model="ptlens" focal="50.8" a="0" b="0.008" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>ACW-100 Converter</model>
-+        <model>DiMAGE 7 &amp; compatibles, with ACW-100 converter</model>
-+        <model lang="en">fixed lens, with ACW-100 converter</model>
-+        <model lang="de">festes Objektiv, mit ACW-100-Konverter</model>
-         <mount>kmD7</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.3" a="0" b="0.02892" c="-0.106517" />
-+            <distortion model="ptlens" focal="7.3" a="0" b="0.02892" c="-0.106517"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE X &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmXt</mount>
-         <cropfactor>6.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.7" a="0.006514" b="-0.029243" c="0" />
--            <distortion model="ptlens" focal="6" a="0.006797" b="-0.025877" c="0" />
--            <distortion model="ptlens" focal="6.5" a="0.005866" b="-0.017735" c="0" />
--            <distortion model="ptlens" focal="8" a="0" b="0.002707" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0" b="0.006484" c="0" />
--            <distortion model="ptlens" focal="10.2" a="0" b="0.006944" c="0" />
--            <distortion model="ptlens" focal="11.3" a="0" b="0.006926" c="0" />
--            <distortion model="ptlens" focal="13" a="0" b="0.006213" c="0" />
--            <distortion model="ptlens" focal="15.7" a="0" b="0.009464" c="0" />
--            <distortion model="ptlens" focal="17.1" a="0" b="0.009984" c="0" />
-+            <distortion model="ptlens" focal="5.7" a="0.006514" b="-0.029243" c="0"/>
-+            <distortion model="ptlens" focal="6" a="0.006797" b="-0.025877" c="0"/>
-+            <distortion model="ptlens" focal="6.5" a="0.005866" b="-0.017735" c="0"/>
-+            <distortion model="ptlens" focal="8" a="0" b="0.002707" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0" b="0.006484" c="0"/>
-+            <distortion model="ptlens" focal="10.2" a="0" b="0.006944" c="0"/>
-+            <distortion model="ptlens" focal="11.3" a="0" b="0.006926" c="0"/>
-+            <distortion model="ptlens" focal="13" a="0" b="0.006213" c="0"/>
-+            <distortion model="ptlens" focal="15.7" a="0" b="0.009464" c="0"/>
-+            <distortion model="ptlens" focal="17.1" a="0" b="0.009984" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>Standard</model>
-+        <model>DiMAGE G400 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>kmG400</mount>
-         <cropfactor>6.144</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.6" a="0.006939" b="-0.026729" c="0" />
--            <distortion model="ptlens" focal="6.3" a="-0.00032" b="-0.008211" c="0" />
--            <distortion model="ptlens" focal="7.7" a="-0.001922" b="0.000251" c="0" />
--            <distortion model="ptlens" focal="9.9" a="-0.002401" b="0.002342" c="0" />
--            <distortion model="ptlens" focal="12.4" a="-0.004609" b="0.008805" c="0" />
--            <distortion model="ptlens" focal="14.7" a="-0.002296" b="0.004882" c="0" />
--            <distortion model="ptlens" focal="16.8" a="-0.005442" b="0.012752" c="0" />
-+            <distortion model="ptlens" focal="5.6" a="0.006939" b="-0.026729" c="0"/>
-+            <distortion model="ptlens" focal="6.3" a="-0.00032" b="-0.008211" c="0"/>
-+            <distortion model="ptlens" focal="7.7" a="-0.001922" b="0.000251" c="0"/>
-+            <distortion model="ptlens" focal="9.9" a="-0.002401" b="0.002342" c="0"/>
-+            <distortion model="ptlens" focal="12.4" a="-0.004609" b="0.008805" c="0"/>
-+            <distortion model="ptlens" focal="14.7" a="-0.002296" b="0.004882" c="0"/>
-+            <distortion model="ptlens" focal="16.8" a="-0.005442" b="0.012752" c="0"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-leica.xml b/data/db/compact-leica.xml
---- a/data/db/compact-leica.xml	2013-02-02 18:11:04.000000000 +0100
-+++ b/data/db/compact-leica.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,72 +1,74 @@
- <lensdatabase>
--
--    <mount>
--        <name>leicaDigilux2</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>LEICA</maker>
--        <maker lang="en">Leica</maker>
--        <model>DIGILUX 2</model>
--        <model lang="en">Digilux 2</model>
-+        <maker>Leica</maker>
-+        <model>Digilux 2</model>
-         <mount>leicaDigilux2</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>LEICA</maker>
--        <maker lang="en">Leica</maker>
-+        <maker>Leica</maker>
-         <model>D-LUX2</model>
-         <model lang="en">Digilux 2</model>
--        <variant>16:9</variant>
-         <mount>panasonicLX1</mount>
-         <cropfactor>4.45</cropfactor>
-+        <!-- aspect ratio 16:9 -->
-     </camera>
--
-     <camera>
--        <maker>LEICA</maker>
--        <maker lang="en">Leica</maker>
-+        <maker>Leica</maker>
-         <model>D-LUX 4</model>
-         <model lang="en">Digilux 4</model>
--        <variant>16:9</variant>
--        <variant>4:3</variant>
--        <mount>panasonicLX3</mount>
-+        <mount>panasonicLX4</mount>
-         <cropfactor>4.33</cropfactor>
-+        <!-- aspect ratio 4:3 -->
-     </camera>
--
-     <camera>
--        <maker>LEICA</maker>
--        <maker lang="en">Leica</maker>
-+        <maker>Leica</maker>
-         <model>D-LUX 3</model>
-         <model lang="en">Digilux 3</model>
--        <variant>16:9</variant>
--        <variant>4:3</variant>
-         <mount>panasonicLX3</mount>
-         <cropfactor>4.33</cropfactor>
-+        <!-- aspect ratio 16:9 -->
-+    </camera>
-+    <camera>
-+        <maker>Leica Camera AG</maker>
-+        <model>Leica Q (Typ 116)</model>
-+        <mount>leicaQTyp116</mount>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>Digilux 2 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>leicaDigilux2</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0" b="0.009873" c="-0.057763" />
--            <distortion model="ptlens" focal="7.6" a="0" b="0.003123" c="-0.039833" />
--            <distortion model="ptlens" focal="8.3" a="0" b="-0.003305" c="-0.03234" />
--            <distortion model="ptlens" focal="9.1" a="0" b="-0.006188" c="-0.01791" />
--            <distortion model="ptlens" focal="9.8" a="0" b="-0.01067" c="-0.008812" />
--            <distortion model="ptlens" focal="10.6" a="0" b="-0.007992" c="-0.009762" />
--            <distortion model="ptlens" focal="11.6" a="0" b="-0.009507" c="-0.002939" />
--            <distortion model="ptlens" focal="12.8" a="0" b="-0.00301" c="-0.00523" />
--            <distortion model="ptlens" focal="13.8" a="0" b="-0.002981" c="-0.008074" />
--            <distortion model="ptlens" focal="14.7" a="0" b="-0.010144" c="0.002157" />
--            <distortion model="ptlens" focal="16" a="0" b="-0.007409" c="0.003268" />
--            <distortion model="ptlens" focal="17.3" a="0" b="-0.010874" c="0.007128" />
--            <distortion model="ptlens" focal="19.1" a="0" b="-0.009048" c="0.005592" />
--            <distortion model="ptlens" focal="22.5" a="0" b="-0.003695" c="0.005038" />
-+            <distortion model="ptlens" focal="7" a="0" b="0.009873" c="-0.057763"/>
-+            <distortion model="ptlens" focal="7.6" a="0" b="0.003123" c="-0.039833"/>
-+            <distortion model="ptlens" focal="8.3" a="0" b="-0.003305" c="-0.03234"/>
-+            <distortion model="ptlens" focal="9.1" a="0" b="-0.006188" c="-0.01791"/>
-+            <distortion model="ptlens" focal="9.8" a="0" b="-0.01067" c="-0.008812"/>
-+            <distortion model="ptlens" focal="10.6" a="0" b="-0.007992" c="-0.009762"/>
-+            <distortion model="ptlens" focal="11.6" a="0" b="-0.009507" c="-0.002939"/>
-+            <distortion model="ptlens" focal="12.8" a="0" b="-0.00301" c="-0.00523"/>
-+            <distortion model="ptlens" focal="13.8" a="0" b="-0.002981" c="-0.008074"/>
-+            <distortion model="ptlens" focal="14.7" a="0" b="-0.010144" c="0.002157"/>
-+            <distortion model="ptlens" focal="16" a="0" b="-0.007409" c="0.003268"/>
-+            <distortion model="ptlens" focal="17.3" a="0" b="-0.010874" c="0.007128"/>
-+            <distortion model="ptlens" focal="19.1" a="0" b="-0.009048" c="0.005592"/>
-+            <distortion model="ptlens" focal="22.5" a="0" b="-0.003695" c="0.005038"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica Camera AG</maker>
-+        <maker lang="en">Leica</maker>
-+        <model>28.0mm f/1.7</model>
-+        <mount>leicaQTyp116</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- results obtained using sample RAW from dpreview.com -->
-+            <distortion model="ptlens" focal="28" a="0.00098" b="-0.043" c="0.01683"/>
-+            <tca model="poly3" focal="28" br="-0.0000329" vr="1.0002023" bb="0.0000845" vb="0.9999781"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-nikon.xml b/data/db/compact-nikon.xml
---- a/data/db/compact-nikon.xml	2013-08-14 10:09:02.000000000 +0200
-+++ b/data/db/compact-nikon.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,653 +1,664 @@
- <lensdatabase>
--
--    <mount>
--        <name>nikon8400</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon7900</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon4800</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon995</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon950</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon5400</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon5000</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon5700</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon990</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon8800</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon4500</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikonP330</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikonP6000</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>nikon60</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
--        <model>COOLPIX P60</model>
--        <mount>nikon60</mount>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P60</model>
-+        <mount>nikonP60</mount>
-         <cropfactor>5.62</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E8800</model>
--        <variant>CP8800</variant>
-+        <model lang="en">Coolpix 8800</model>
-         <mount>nikon8800</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E8700</model>
--        <variant>CP8700</variant>
-+        <model lang="en">Coolpix 8700</model>
-         <mount>nikon5700</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E5700</model>
--        <variant>CP5700</variant>
-+        <model lang="en">Coolpix 5700</model>
-         <mount>nikon5700</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E7900</model>
--        <variant>CP7900</variant>
-+        <model lang="en">Coolpix 7900</model>
-         <mount>nikon7900</mount>
-         <cropfactor>4.86</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E7600</model>
--        <variant>CP7600</variant>
-+        <model lang="en">Coolpix 7600</model>
-         <mount>nikon7900</mount>
-         <cropfactor>4.86</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E5900</model>
--        <variant>CP5900</variant>
-+        <model lang="en">Coolpix 5900</model>
-         <mount>nikon7900</mount>
-         <cropfactor>4.86</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E5200</model>
--        <variant>CP5200</variant>
-+        <model lang="en">Coolpix 5200</model>
-         <mount>nikon7900</mount>
-         <cropfactor>4.86</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E4200</model>
--        <variant>CP4200</variant>
-+        <model lang="en">Coolpix 4200</model>
-         <mount>nikon7900</mount>
-         <cropfactor>4.86</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E5400</model>
--        <variant>CP5400</variant>
-+        <model lang="en">Coolpix 5400</model>
-         <mount>nikon5400</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E5000</model>
--        <variant>CP5000</variant>
-+        <model lang="en">Coolpix 5000</model>
-         <mount>nikon5000</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E4800</model>
--        <variant>CP4800</variant>
-+        <model lang="en">Coolpix 4800</model>
-         <mount>nikon4800</mount>
-         <cropfactor>6</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E4500</model>
--        <variant>CP4500</variant>
-+        <model lang="en">Coolpix 4500</model>
-         <mount>nikon4500</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E995</model>
--        <variant>CP995</variant>
-+        <model lang="en">Coolpix 995</model>
-         <mount>nikon995</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E990</model>
--        <variant>CP990</variant>
-+        <model lang="en">Coolpix 990</model>
-         <mount>nikon990</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E950</model>
--        <variant>CP950</variant>
-+        <model lang="en">Coolpix 950</model>
-         <mount>nikon950</mount>
-         <cropfactor>5.408</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
--        <model>COOLPIX P330</model>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P330</model>
-         <mount>nikonP330</mount>
-         <cropfactor>4.706</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
--        <model>COOLPIX P6000</model>
-+        <maker>Nikon</maker>
-+        <model>Coolpix S3300</model>
-+        <mount>nikonS3300</mount>
-+        <cropfactor>5.65</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P6000</model>
-         <mount>nikonP6000</mount>
-         <cropfactor>4.6</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON</maker>
--        <maker lang="en">Nikon</maker>
-+        <maker>Nikon</maker>
-         <model>E8400</model>
--        <variant>CP8400</variant>
-+        <model lang="en">Coolpix 8400</model>
-         <mount>nikon8400</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P7000</model>
-+        <mount>nikonP7000</mount>
-+        <cropfactor>4.69</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P7800</model>
-+        <mount>nikonP7800</mount>
-+        <cropfactor>4.67</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Coolpix A</model>
-+        <mount>nikonA</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E8800 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon8800</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.9" a="0.013454" b="-0.041694" c="0" />
--            <distortion model="ptlens" focal="9.5" a="0.013174" b="-0.037229" c="0" />
--            <distortion model="ptlens" focal="11" a="0.011875" b="-0.027921" c="0" />
--            <distortion model="ptlens" focal="13.8" a="0.011533" b="-0.021238" c="0" />
--            <distortion model="ptlens" focal="19.8" a="0.005936" b="-0.007387" c="0" />
--            <distortion model="ptlens" focal="29.3" a="0.004248" b="-0.004453" c="0" />
--            <distortion model="ptlens" focal="40" a="0" b="0.004755" c="0" />
--            <distortion model="ptlens" focal="49" a="0" b="0.003129" c="0" />
--            <distortion model="ptlens" focal="89" a="0" b="0.002974" c="0" />
-+            <distortion model="ptlens" focal="8.9" a="0.013454" b="-0.041694" c="0"/>
-+            <distortion model="ptlens" focal="9.5" a="0.013174" b="-0.037229" c="0"/>
-+            <distortion model="ptlens" focal="11" a="0.011875" b="-0.027921" c="0"/>
-+            <distortion model="ptlens" focal="13.8" a="0.011533" b="-0.021238" c="0"/>
-+            <distortion model="ptlens" focal="19.8" a="0.005936" b="-0.007387" c="0"/>
-+            <distortion model="ptlens" focal="29.3" a="0.004248" b="-0.004453" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.004755" c="0"/>
-+            <distortion model="ptlens" focal="49" a="0" b="0.003129" c="0"/>
-+            <distortion model="ptlens" focal="89" a="0" b="0.002974" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WM-E80</model>
-+        <model>E8800 &amp; compatibles, with WM-E80</model>
-+        <model lang="en">fixed lens, with WM-E80</model>
-+        <model lang="de">festes Objektiv, mit WM-E80</model>
-         <mount>nikon8800</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.9" a="0.015468" b="-0.07614" c="0" />
--            <distortion model="ptlens" focal="11" a="0.009214" b="-0.051437" c="0" />
--            <distortion model="ptlens" focal="12.7" a="0.007165" b="-0.041386" c="0" />
--            <distortion model="ptlens" focal="15" a="0.004854" b="-0.032212" c="0" />
--            <distortion model="ptlens" focal="21.8" a="0.003889" b="-0.022494" c="0" />
--            <distortion model="ptlens" focal="26.5" a="-0.001886" b="-0.00899" c="0" />
--            <distortion model="ptlens" focal="35.9" a="-0.0024" b="-0.006042" c="0" />
-+            <distortion model="ptlens" focal="8.9" a="0.015468" b="-0.07614" c="0"/>
-+            <distortion model="ptlens" focal="11" a="0.009214" b="-0.051437" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="0.007165" b="-0.041386" c="0"/>
-+            <distortion model="ptlens" focal="15" a="0.004854" b="-0.032212" c="0"/>
-+            <distortion model="ptlens" focal="21.8" a="0.003889" b="-0.022494" c="0"/>
-+            <distortion model="ptlens" focal="26.5" a="-0.001886" b="-0.00899" c="0"/>
-+            <distortion model="ptlens" focal="35.9" a="-0.0024" b="-0.006042" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E8400 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon8400</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.1" a="0" b="-0.014928" c="0" />
--            <distortion model="ptlens" focal="7" a="0" b="-0.011637" c="0" />
--            <distortion model="ptlens" focal="8.1" a="0" b="-0.009313" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="-0.006115" c="0" />
--            <distortion model="ptlens" focal="12.3" a="0" b="-0.004044" c="0" />
--            <distortion model="ptlens" focal="15.2" a="0" b="-0.001226" c="0" />
--            <distortion model="ptlens" focal="21.6" a="0" b="0" c="0" />
-+            <distortion model="poly3" focal="6.1" k1="-0.014928"/>
-+            <distortion model="poly3" focal="7" k1="-0.011637"/>
-+            <distortion model="poly3" focal="8.1" k1="-0.009313"/>
-+            <distortion model="poly3" focal="10" k1="-0.006115"/>
-+            <distortion model="poly3" focal="12.3" k1="-0.004044"/>
-+            <distortion model="poly3" focal="15.2" k1="-0.001226"/>
-+            <distortion model="poly3" focal="21.6" k1="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E75</model>
-+        <model>E8400 &amp; compatibles, with WC-E75</model>
-+        <model lang="en">fixed lens, with WC-E75</model>
-+        <model lang="de">festes Objektiv, mit WC-E75</model>
-         <mount>nikon8400</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.1" a="0.0165" b="-0.057649" c="0" />
--            <distortion model="ptlens" focal="7.5" a="0.009749" b="-0.039706" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0" b="-0.014859" c="0" />
--            <distortion model="ptlens" focal="11.5" a="0" b="-0.011079" c="0" />
--            <distortion model="ptlens" focal="14.2" a="0" b="-0.007817" c="0" />
--            <distortion model="ptlens" focal="17.5" a="0" b="-0.005923" c="0" />
--            <distortion model="ptlens" focal="21.6" a="0" b="-0.003667" c="0" />
-+            <distortion model="ptlens" focal="6.1" a="0.0165" b="-0.057649" c="0"/>
-+            <distortion model="ptlens" focal="7.5" a="0.009749" b="-0.039706" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0" b="-0.014859" c="0"/>
-+            <distortion model="ptlens" focal="11.5" a="0" b="-0.011079" c="0"/>
-+            <distortion model="ptlens" focal="14.2" a="0" b="-0.007817" c="0"/>
-+            <distortion model="ptlens" focal="17.5" a="0" b="-0.005923" c="0"/>
-+            <distortion model="ptlens" focal="21.6" a="0" b="-0.003667" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E5700 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon5700</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.9" a="0.014425" b="-0.044782" c="0" />
--            <distortion model="ptlens" focal="9" a="0.01501" b="-0.045355" c="0" />
--            <distortion model="ptlens" focal="9.5" a="0.012659" b="-0.038385" c="0" />
--            <distortion model="ptlens" focal="10.7" a="0.014239" b="-0.038035" c="0" />
--            <distortion model="ptlens" focal="12.7" a="0.007615" b="-0.020282" c="0" />
--            <distortion model="ptlens" focal="14.7" a="0.004843" b="-0.012421" c="0" />
--            <distortion model="ptlens" focal="15.7" a="0.008849" b="-0.018943" c="0" />
--            <distortion model="ptlens" focal="17.8" a="0.002011" b="-0.004148" c="0" />
--            <distortion model="ptlens" focal="19.9" a="0.002308" b="-0.003845" c="0" />
--            <distortion model="ptlens" focal="22.3" a="0.003059" b="-0.0054" c="0" />
--            <distortion model="ptlens" focal="23.7" a="0.006541" b="-0.012168" c="0" />
--            <distortion model="ptlens" focal="31.9" a="0.004286" b="-0.006875" c="0" />
--            <distortion model="ptlens" focal="37.7" a="0.004035" b="-0.005926" c="0" />
--            <distortion model="ptlens" focal="44.7" a="0.00459" b="-0.007871" c="0" />
--            <distortion model="ptlens" focal="52.4" a="0.000773" b="-0.00099" c="0" />
--            <distortion model="ptlens" focal="61.5" a="0.001251" b="-0.002049" c="0" />
--            <distortion model="ptlens" focal="71.2" a="0.004259" b="-0.007821" c="0" />
-+            <distortion model="ptlens" focal="8.9" a="0.014425" b="-0.044782" c="0"/>
-+            <distortion model="ptlens" focal="9" a="0.01501" b="-0.045355" c="0"/>
-+            <distortion model="ptlens" focal="9.5" a="0.012659" b="-0.038385" c="0"/>
-+            <distortion model="ptlens" focal="10.7" a="0.014239" b="-0.038035" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="0.007615" b="-0.020282" c="0"/>
-+            <distortion model="ptlens" focal="14.7" a="0.004843" b="-0.012421" c="0"/>
-+            <distortion model="ptlens" focal="15.7" a="0.008849" b="-0.018943" c="0"/>
-+            <distortion model="ptlens" focal="17.8" a="0.002011" b="-0.004148" c="0"/>
-+            <distortion model="ptlens" focal="19.9" a="0.002308" b="-0.003845" c="0"/>
-+            <distortion model="ptlens" focal="22.3" a="0.003059" b="-0.0054" c="0"/>
-+            <distortion model="ptlens" focal="23.7" a="0.006541" b="-0.012168" c="0"/>
-+            <distortion model="ptlens" focal="31.9" a="0.004286" b="-0.006875" c="0"/>
-+            <distortion model="ptlens" focal="37.7" a="0.004035" b="-0.005926" c="0"/>
-+            <distortion model="ptlens" focal="44.7" a="0.00459" b="-0.007871" c="0"/>
-+            <distortion model="ptlens" focal="52.4" a="0.000773" b="-0.00099" c="0"/>
-+            <distortion model="ptlens" focal="61.5" a="0.001251" b="-0.002049" c="0"/>
-+            <distortion model="ptlens" focal="71.2" a="0.004259" b="-0.007821" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>TC-E15ED (full tele)</model>
-+        <model>E5700 &amp; compatibles, with TC-E15ED (full tele)</model>
-+        <model lang="en">fixed lens, with TC-E15ED (full tele)</model>
-+        <model lang="de">festes Objektiv, mit TC-E15ED (längste Brennw.)</model>
-         <mount>nikon5700</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="71.2" a="-0.000659" b="0.004458" c="0" />
-+            <distortion model="ptlens" focal="71.2" a="-0.000659" b="0.004458" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E80 (full wide)</model>
-+        <model>E5700 &amp; compatibles, with WC-E80 (full wide)</model>
-+        <model lang="en">fixed lens, with WC-E80 (full wide)</model>
-+        <model lang="de">festes Objektiv, mit WC-E80 (kürzeste Brennw.)</model>
-         <mount>nikon5700</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.9" a="0.016692" b="-0.060767" c="0" />
-+            <distortion model="ptlens" focal="8.9" a="0.016692" b="-0.060767" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E7900 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon7900</mount>
-         <cropfactor>4.86</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.8" a="0.006962" b="-0.036546" c="0" />
--            <distortion model="ptlens" focal="10.6" a="0" b="-0.009971" c="0" />
--            <distortion model="ptlens" focal="12.7" a="0" b="-0.005826" c="0" />
--            <distortion model="ptlens" focal="14.9" a="0" b="-0.002714" c="0" />
--            <distortion model="ptlens" focal="17" a="0" b="-0.002326" c="0" />
--            <distortion model="ptlens" focal="21.3" a="0" b="-0.001355" c="0" />
--            <distortion model="ptlens" focal="23.4" a="0" b="-0.000554" c="0" />
-+            <distortion model="ptlens" focal="7.8" a="0.006962" b="-0.036546" c="0"/>
-+            <distortion model="ptlens" focal="10.6" a="0" b="-0.009971" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="0" b="-0.005826" c="0"/>
-+            <distortion model="ptlens" focal="14.9" a="0" b="-0.002714" c="0"/>
-+            <distortion model="ptlens" focal="17" a="0" b="-0.002326" c="0"/>
-+            <distortion model="ptlens" focal="21.3" a="0" b="-0.001355" c="0"/>
-+            <distortion model="ptlens" focal="23.4" a="0" b="-0.000554" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E5400 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon5400</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0" b="0.009612" c="-0.058281" />
--            <distortion model="ptlens" focal="6.5" a="0" b="0.017795" c="-0.060086" />
--            <distortion model="ptlens" focal="7.2" a="0" b="0.016182" c="-0.04319" />
--            <distortion model="ptlens" focal="8" a="0" b="0.017362" c="-0.038087" />
--            <distortion model="ptlens" focal="9.5" a="0" b="0.027021" c="-0.054907" />
--            <distortion model="ptlens" focal="11.1" a="0" b="0.013847" c="-0.023501" />
--            <distortion model="ptlens" focal="12.6" a="0" b="0.009377" c="-0.009348" />
--            <distortion model="ptlens" focal="14.5" a="0" b="0.011435" c="-0.007858" />
--            <distortion model="ptlens" focal="16.7" a="0" b="0.014832" c="-0.017945" />
--            <distortion model="ptlens" focal="18.8" a="0" b="0.010791" c="0" />
--            <distortion model="ptlens" focal="21.1" a="0" b="0.010574" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="0.009755" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0" b="0.009612" c="-0.058281"/>
-+            <distortion model="ptlens" focal="6.5" a="0" b="0.017795" c="-0.060086"/>
-+            <distortion model="ptlens" focal="7.2" a="0" b="0.016182" c="-0.04319"/>
-+            <distortion model="ptlens" focal="8" a="0" b="0.017362" c="-0.038087"/>
-+            <distortion model="ptlens" focal="9.5" a="0" b="0.027021" c="-0.054907"/>
-+            <distortion model="ptlens" focal="11.1" a="0" b="0.013847" c="-0.023501"/>
-+            <distortion model="ptlens" focal="12.6" a="0" b="0.009377" c="-0.009348"/>
-+            <distortion model="ptlens" focal="14.5" a="0" b="0.011435" c="-0.007858"/>
-+            <distortion model="ptlens" focal="16.7" a="0" b="0.014832" c="-0.017945"/>
-+            <distortion model="ptlens" focal="18.8" a="0" b="0.010791" c="0"/>
-+            <distortion model="ptlens" focal="21.1" a="0" b="0.010574" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0" b="0.009755" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E80</model>
-+        <model>E5400 &amp; compatibles, with WC-E80</model>
-+        <model lang="en">fixed lens, with WC-E80</model>
-+        <model lang="de">festes Objektiv, mit WC-E80</model>
-         <mount>nikon5400</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.02609" b="-0.086283" c="0" />
--            <distortion model="ptlens" focal="6.5" a="0.016185" b="-0.057085" c="0" />
--            <distortion model="ptlens" focal="7.2" a="0.012528" b="-0.043316" c="0" />
--            <distortion model="ptlens" focal="9.5" a="0.006344" b="-0.019451" c="0" />
--            <distortion model="ptlens" focal="11.8" a="0" b="-0.003078" c="0" />
--            <distortion model="ptlens" focal="14.5" a="0" b="0.001104" c="0" />
--            <distortion model="ptlens" focal="17.8" a="0" b="0.004936" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="0.00557" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.02609" b="-0.086283" c="0"/>
-+            <distortion model="ptlens" focal="6.5" a="0.016185" b="-0.057085" c="0"/>
-+            <distortion model="ptlens" focal="7.2" a="0.012528" b="-0.043316" c="0"/>
-+            <distortion model="ptlens" focal="9.5" a="0.006344" b="-0.019451" c="0"/>
-+            <distortion model="ptlens" focal="11.8" a="0" b="-0.003078" c="0"/>
-+            <distortion model="ptlens" focal="14.5" a="0" b="0.001104" c="0"/>
-+            <distortion model="ptlens" focal="17.8" a="0" b="0.004936" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0" b="0.00557" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E5000 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon5000</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="-0.009406" b="0.022592" c="-0.044771" />
--            <distortion model="ptlens" focal="7.7" a="0.007336" b="-0.031746" c="0.010831" />
--            <distortion model="ptlens" focal="9" a="-0.003338" b="0.004105" c="-0.020631" />
--            <distortion model="ptlens" focal="9.7" a="0.005392" b="-0.021679" c="0.006308" />
--            <distortion model="ptlens" focal="11.4" a="-0.001128" b="-0.001987" c="-0.005919" />
--            <distortion model="ptlens" focal="12.4" a="-0.003078" b="0.002279" c="-0.005827" />
--            <distortion model="ptlens" focal="14.9" a="9.5e-05" b="-0.005124" c="0.002716" />
--            <distortion model="ptlens" focal="17.5" a="0.000795" b="-0.008614" c="0.009284" />
--            <distortion model="ptlens" focal="18.8" a="0.000796" b="-0.008619" c="0.009289" />
--            <distortion model="ptlens" focal="21.4" a="-0.000745" b="0.001506" c="-0.005233" />
-+            <distortion model="ptlens" focal="7.1" a="-0.009406" b="0.022592" c="-0.044771"/>
-+            <distortion model="ptlens" focal="7.7" a="0.007336" b="-0.031746" c="0.010831"/>
-+            <distortion model="ptlens" focal="9" a="-0.003338" b="0.004105" c="-0.020631"/>
-+            <distortion model="ptlens" focal="9.7" a="0.005392" b="-0.021679" c="0.006308"/>
-+            <distortion model="ptlens" focal="11.4" a="-0.001128" b="-0.001987" c="-0.005919"/>
-+            <distortion model="ptlens" focal="12.4" a="-0.003078" b="0.002279" c="-0.005827"/>
-+            <distortion model="ptlens" focal="14.9" a="9.5e-05" b="-0.005124" c="0.002716"/>
-+            <distortion model="ptlens" focal="17.5" a="0.000795" b="-0.008614" c="0.009284"/>
-+            <distortion model="ptlens" focal="18.8" a="0.000796" b="-0.008619" c="0.009289"/>
-+            <distortion model="ptlens" focal="21.4" a="-0.000745" b="0.001506" c="-0.005233"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E68 (full wide)</model>
-+        <model>E5000 &amp; compatibles, with WC-E68 (full wide)</model>
-+        <model lang="en">fixed lens, with WC-E68 (full wide)</model>
-+        <model lang="de">festes Objektiv, mit WC-E68 (kürzeste Brennw.)</model>
-         <mount>nikon5000</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.026854" b="-0.077694" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.026854" b="-0.077694" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E4800 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon4800</mount>
-         <cropfactor>6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.010112" b="-0.033866" c="0" />
--            <distortion model="ptlens" focal="9.6" a="0.009772" b="-0.009384" c="0" />
--            <distortion model="ptlens" focal="14.2" a="0" b="0.019748" c="0" />
--            <distortion model="ptlens" focal="20.4" a="0" b="0.021197" c="0" />
--            <distortion model="ptlens" focal="32.4" a="0" b="0.019923" c="0" />
--            <distortion model="ptlens" focal="38.8" a="0" b="0.013267" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.012609" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.010112" b="-0.033866" c="0"/>
-+            <distortion model="ptlens" focal="9.6" a="0.009772" b="-0.009384" c="0"/>
-+            <distortion model="ptlens" focal="14.2" a="0" b="0.019748" c="0"/>
-+            <distortion model="ptlens" focal="20.4" a="0" b="0.021197" c="0"/>
-+            <distortion model="ptlens" focal="32.4" a="0" b="0.019923" c="0"/>
-+            <distortion model="ptlens" focal="38.8" a="0" b="0.013267" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.012609" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E995 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon995</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.2" a="0" b="-0.019966" c="0" />
--            <distortion model="ptlens" focal="10.1" a="0" b="-0.010931" c="0" />
--            <distortion model="ptlens" focal="13.6" a="0" b="-0.002049" c="0" />
--            <distortion model="ptlens" focal="18.4" a="0" b="0.003845" c="0" />
--            <distortion model="ptlens" focal="23.4" a="0" b="0.006884" c="0" />
--            <distortion model="ptlens" focal="28.3" a="0" b="0.008666" c="0" />
--            <distortion model="ptlens" focal="31" a="0" b="0.009298" c="0" />
-+            <distortion model="poly3" focal="8.2" k1="-0.019966"/>
-+            <distortion model="poly3" focal="10.1" k1="-0.010931"/>
-+            <distortion model="poly3" focal="13.6" k1="-0.002049"/>
-+            <distortion model="poly3" focal="18.4" k1="0.003845"/>
-+            <distortion model="poly3" focal="23.4" k1="0.006884"/>
-+            <distortion model="poly3" focal="28.3" k1="0.008666"/>
-+            <distortion model="poly3" focal="31" k1="0.009298"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E63</model>
-+        <model>E995 &amp; compatibles, with WC-E63</model>
-+        <model lang="en">fixed lens, with WC-E63</model>
-+        <model lang="de">festes Objektiv, mit WC-E63</model>
-         <mount>nikon995</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.2" a="0.017724" b="-0.0578" c="0" />
--            <distortion model="ptlens" focal="8.8" a="0.012045" b="-0.044107" c="0" />
--            <distortion model="ptlens" focal="9.1" a="0.00985" b="-0.040541" c="0" />
--            <distortion model="ptlens" focal="9.6" a="0.006511" b="-0.030909" c="0" />
--            <distortion model="ptlens" focal="9.8" a="0.007913" b="-0.03391" c="0" />
--            <distortion model="ptlens" focal="10.3" a="0.003447" b="-0.023187" c="0" />
--            <distortion model="ptlens" focal="11.2" a="0.004496" b="-0.02263" c="0" />
--            <distortion model="ptlens" focal="11.7" a="0.002755" b="-0.017101" c="0" />
--            <distortion model="ptlens" focal="12.9" a="0.002498" b="-0.014059" c="0" />
--            <distortion model="ptlens" focal="13.6" a="0.000766" b="-0.009079" c="0" />
--            <distortion model="ptlens" focal="15" a="0.000591" b="-0.005949" c="0" />
--            <distortion model="ptlens" focal="16.9" a="-0.000905" b="0.000825" c="0" />
-+            <distortion model="ptlens" focal="8.2" a="0.017724" b="-0.0578" c="0"/>
-+            <distortion model="ptlens" focal="8.8" a="0.012045" b="-0.044107" c="0"/>
-+            <distortion model="ptlens" focal="9.1" a="0.00985" b="-0.040541" c="0"/>
-+            <distortion model="ptlens" focal="9.6" a="0.006511" b="-0.030909" c="0"/>
-+            <distortion model="ptlens" focal="9.8" a="0.007913" b="-0.03391" c="0"/>
-+            <distortion model="ptlens" focal="10.3" a="0.003447" b="-0.023187" c="0"/>
-+            <distortion model="ptlens" focal="11.2" a="0.004496" b="-0.02263" c="0"/>
-+            <distortion model="ptlens" focal="11.7" a="0.002755" b="-0.017101" c="0"/>
-+            <distortion model="ptlens" focal="12.9" a="0.002498" b="-0.014059" c="0"/>
-+            <distortion model="ptlens" focal="13.6" a="0.000766" b="-0.009079" c="0"/>
-+            <distortion model="ptlens" focal="15" a="0.000591" b="-0.005949" c="0"/>
-+            <distortion model="ptlens" focal="16.9" a="-0.000905" b="0.000825" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E24</model>
-+        <model>E995 &amp; compatibles, with WC-E24</model>
-+        <model lang="en">fixed lens, with WC-E24</model>
-+        <model lang="de">festes Objektiv, mit WC-E24</model>
-         <mount>nikon995</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.2" a="0" b="-0.0377" c="0" />
--            <distortion model="ptlens" focal="9" a="0" b="-0.0307" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="-0.026" c="0" />
--            <distortion model="ptlens" focal="11" a="0" b="-0.0216" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="-0.0174" c="0" />
--            <distortion model="ptlens" focal="13" a="0" b="-0.014" c="0" />
--            <distortion model="ptlens" focal="14" a="0" b="-0.0105" c="0" />
--            <distortion model="ptlens" focal="15" a="0" b="-0.0079" c="0" />
--            <distortion model="ptlens" focal="16" a="0" b="-0.0053" c="0" />
--            <distortion model="ptlens" focal="17" a="0" b="-0.00309" c="0" />
--            <distortion model="ptlens" focal="18" a="0" b="-0.0012" c="0" />
--            <distortion model="ptlens" focal="19" a="0" b="1.5e-05" c="0" />
--            <distortion model="ptlens" focal="20" a="0" b="0.0018" c="0" />
--            <distortion model="ptlens" focal="21" a="0" b="0.0028" c="0" />
--            <distortion model="ptlens" focal="22" a="0" b="0.0038" c="0" />
--            <distortion model="ptlens" focal="23" a="0" b="0.0044" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="0.0053" c="0" />
--            <distortion model="ptlens" focal="25" a="0" b="0.00548" c="0" />
--            <distortion model="ptlens" focal="26" a="0" b="0.006" c="0" />
--            <distortion model="ptlens" focal="27" a="0" b="0.0064" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="0.0067" c="0" />
--            <distortion model="ptlens" focal="29" a="0" b="0.0069" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="0.0073" c="0" />
--            <distortion model="ptlens" focal="31" a="0" b="0.0078" c="0" />
--            <distortion model="ptlens" focal="32" a="0" b="0.0081" c="0" />
-+            <distortion model="poly3" focal="8.2" k1="-0.0377"/>
-+            <distortion model="poly3" focal="9" k1="-0.0307"/>
-+            <distortion model="poly3" focal="10" k1="-0.026"/>
-+            <distortion model="poly3" focal="11" k1="-0.0216"/>
-+            <distortion model="poly3" focal="12" k1="-0.0174"/>
-+            <distortion model="poly3" focal="13" k1="-0.014"/>
-+            <distortion model="poly3" focal="14" k1="-0.0105"/>
-+            <distortion model="poly3" focal="15" k1="-0.0079"/>
-+            <distortion model="poly3" focal="16" k1="-0.0053"/>
-+            <distortion model="poly3" focal="17" k1="-0.00309"/>
-+            <distortion model="poly3" focal="18" k1="-0.0012"/>
-+            <distortion model="poly3" focal="19" k1="1.5e-05"/>
-+            <distortion model="poly3" focal="20" k1="0.0018"/>
-+            <distortion model="poly3" focal="21" k1="0.0028"/>
-+            <distortion model="poly3" focal="22" k1="0.0038"/>
-+            <distortion model="poly3" focal="23" k1="0.0044"/>
-+            <distortion model="poly3" focal="24" k1="0.0053"/>
-+            <distortion model="poly3" focal="25" k1="0.00548"/>
-+            <distortion model="poly3" focal="26" k1="0.006"/>
-+            <distortion model="poly3" focal="27" k1="0.0064"/>
-+            <distortion model="poly3" focal="28" k1="0.0067"/>
-+            <distortion model="poly3" focal="29" k1="0.0069"/>
-+            <distortion model="poly3" focal="30" k1="0.0073"/>
-+            <distortion model="poly3" focal="31" k1="0.0078"/>
-+            <distortion model="poly3" focal="32" k1="0.0081"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>TC-E2</model>
-+        <model>E995 &amp; compatibles, with TC-E2</model>
-+        <model lang="en">fixed lens, with TC-E2</model>
-+        <model lang="de">festes Objektiv, mit TC-E2</model>
-         <mount>nikon995</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0" b="0.0055" c="0" />
--            <distortion model="ptlens" focal="15" a="0" b="0.0061" c="0" />
--            <distortion model="ptlens" focal="16" a="0" b="0.0067" c="0" />
--            <distortion model="ptlens" focal="17" a="0" b="0.0073" c="0" />
--            <distortion model="ptlens" focal="18" a="0" b="0.0078" c="0" />
--            <distortion model="ptlens" focal="19" a="0" b="0.0084" c="0" />
--            <distortion model="ptlens" focal="20" a="0" b="0.0088" c="0" />
--            <distortion model="ptlens" focal="21" a="0" b="0.0093" c="0" />
--            <distortion model="ptlens" focal="22" a="0" b="0.0098" c="0" />
--            <distortion model="ptlens" focal="23" a="0" b="0.0102" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="0.0106" c="0" />
--            <distortion model="ptlens" focal="25" a="0" b="0.011" c="0" />
--            <distortion model="ptlens" focal="26" a="0" b="0.0112" c="0" />
--            <distortion model="ptlens" focal="27" a="0" b="0.0115" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="0.0116" c="0" />
--            <distortion model="ptlens" focal="29" a="0" b="0.0118" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="0.0118" c="0" />
--            <distortion model="ptlens" focal="31" a="0" b="0.0118" c="0" />
-+            <distortion model="poly3" focal="14" k1="0.0055"/>
-+            <distortion model="poly3" focal="15" k1="0.0061"/>
-+            <distortion model="poly3" focal="16" k1="0.0067"/>
-+            <distortion model="poly3" focal="17" k1="0.0073"/>
-+            <distortion model="poly3" focal="18" k1="0.0078"/>
-+            <distortion model="poly3" focal="19" k1="0.0084"/>
-+            <distortion model="poly3" focal="20" k1="0.0088"/>
-+            <distortion model="poly3" focal="21" k1="0.0093"/>
-+            <distortion model="poly3" focal="22" k1="0.0098"/>
-+            <distortion model="poly3" focal="23" k1="0.0102"/>
-+            <distortion model="poly3" focal="24" k1="0.0106"/>
-+            <distortion model="poly3" focal="25" k1="0.011"/>
-+            <distortion model="poly3" focal="26" k1="0.0112"/>
-+            <distortion model="poly3" focal="27" k1="0.0115"/>
-+            <distortion model="poly3" focal="28" k1="0.0116"/>
-+            <distortion model="poly3" focal="29" k1="0.0118"/>
-+            <distortion model="poly3" focal="30" k1="0.0118"/>
-+            <distortion model="poly3" focal="31" k1="0.0118"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E990 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon990</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.2" a="0.009323" b="-0.036014" c="0" />
--            <distortion model="ptlens" focal="8.8" a="0.006981" b="-0.028396" c="0" />
--            <distortion model="ptlens" focal="9.9" a="0.007066" b="-0.023481" c="0" />
--            <distortion model="ptlens" focal="10.7" a="0.004841" b="-0.017212" c="0" />
--            <distortion model="ptlens" focal="11.6" a="-0.000649" b="-0.003458" c="0" />
--            <distortion model="ptlens" focal="12.7" a="0.002233" b="-0.005998" c="0" />
--            <distortion model="ptlens" focal="13.5" a="0.002265" b="-0.004391" c="0" />
--            <distortion model="ptlens" focal="14.6" a="0.004307" b="-0.006345" c="0" />
--            <distortion model="ptlens" focal="15.5" a="0.003109" b="-0.003799" c="0" />
--            <distortion model="ptlens" focal="16.3" a="0.001762" b="0.001325" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0.002518" b="-0.000226" c="0" />
--            <distortion model="ptlens" focal="18.2" a="0.001309" b="0.004015" c="0" />
--            <distortion model="ptlens" focal="19.1" a="0.000967" b="0.005566" c="0" />
--            <distortion model="ptlens" focal="20.2" a="0.001772" b="0.004291" c="0" />
--            <distortion model="ptlens" focal="21" a="0.000183" b="0.007835" c="0" />
--            <distortion model="ptlens" focal="21.6" a="0.002632" b="0.004132" c="0" />
--            <distortion model="ptlens" focal="22.2" a="0.000101" b="0.009482" c="0" />
--            <distortion model="ptlens" focal="22.8" a="-0.001457" b="0.012402" c="0" />
--            <distortion model="ptlens" focal="23.4" a="1.9e-05" b="0.009522" c="0" />
-+            <distortion model="ptlens" focal="8.2" a="0.009323" b="-0.036014" c="0"/>
-+            <distortion model="ptlens" focal="8.8" a="0.006981" b="-0.028396" c="0"/>
-+            <distortion model="ptlens" focal="9.9" a="0.007066" b="-0.023481" c="0"/>
-+            <distortion model="ptlens" focal="10.7" a="0.004841" b="-0.017212" c="0"/>
-+            <distortion model="ptlens" focal="11.6" a="-0.000649" b="-0.003458" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="0.002233" b="-0.005998" c="0"/>
-+            <distortion model="ptlens" focal="13.5" a="0.002265" b="-0.004391" c="0"/>
-+            <distortion model="ptlens" focal="14.6" a="0.004307" b="-0.006345" c="0"/>
-+            <distortion model="ptlens" focal="15.5" a="0.003109" b="-0.003799" c="0"/>
-+            <distortion model="ptlens" focal="16.3" a="0.001762" b="0.001325" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0.002518" b="-0.000226" c="0"/>
-+            <distortion model="ptlens" focal="18.2" a="0.001309" b="0.004015" c="0"/>
-+            <distortion model="ptlens" focal="19.1" a="0.000967" b="0.005566" c="0"/>
-+            <distortion model="ptlens" focal="20.2" a="0.001772" b="0.004291" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.000183" b="0.007835" c="0"/>
-+            <distortion model="ptlens" focal="21.6" a="0.002632" b="0.004132" c="0"/>
-+            <distortion model="ptlens" focal="22.2" a="0.000101" b="0.009482" c="0"/>
-+            <distortion model="ptlens" focal="22.8" a="-0.001457" b="0.012402" c="0"/>
-+            <distortion model="ptlens" focal="23.4" a="1.9e-05" b="0.009522" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>WC-E63</model>
-+        <model>E990 &amp; compatibles, with WC-E63</model>
-+        <model lang="en">fixed lens, with WC-E63</model>
-+        <model lang="de">festes Objektiv, mit WC-E63</model>
-         <mount>nikon990</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="8.2" a="0.027148" b="-0.073181" c="0" />
-+            <distortion model="ptlens" focal="8.2" a="0.027148" b="-0.073181" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>E950 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikon950</mount>
-         <cropfactor>5.408</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0" b="-0.017" c="0" />
--            <distortion model="ptlens" focal="8" a="0" b="-0.013" c="0" />
--            <distortion model="ptlens" focal="9" a="0" b="-0.0095" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="-0.006" c="0" />
--            <distortion model="ptlens" focal="11" a="0" b="-0.003" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="13" a="0" b="0.002" c="0" />
--            <distortion model="ptlens" focal="14" a="0" b="0.0045" c="0" />
--            <distortion model="ptlens" focal="15" a="0" b="0.0065" c="0" />
--            <distortion model="ptlens" focal="16" a="0" b="0.008" c="0" />
--            <distortion model="ptlens" focal="17" a="0" b="0.009" c="0" />
--            <distortion model="ptlens" focal="18" a="0" b="0.0102" c="0" />
--            <distortion model="ptlens" focal="19" a="0" b="0.011" c="0" />
--            <distortion model="ptlens" focal="20" a="0" b="0.0114" c="0" />
--            <distortion model="ptlens" focal="21" a="0" b="0.0116" c="0" />
-+            <distortion model="poly3" focal="7" k1="-0.017"/>
-+            <distortion model="poly3" focal="8" k1="-0.013"/>
-+            <distortion model="poly3" focal="9" k1="-0.0095"/>
-+            <distortion model="poly3" focal="10" k1="-0.006"/>
-+            <distortion model="poly3" focal="11" k1="-0.003"/>
-+            <distortion model="poly3" focal="12" k1="0"/>
-+            <distortion model="poly3" focal="13" k1="0.002"/>
-+            <distortion model="poly3" focal="14" k1="0.0045"/>
-+            <distortion model="poly3" focal="15" k1="0.0065"/>
-+            <distortion model="poly3" focal="16" k1="0.008"/>
-+            <distortion model="poly3" focal="17" k1="0.009"/>
-+            <distortion model="poly3" focal="18" k1="0.0102"/>
-+            <distortion model="poly3" focal="19" k1="0.011"/>
-+            <distortion model="poly3" focal="20" k1="0.0114"/>
-+            <distortion model="poly3" focal="21" k1="0.0116"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
--        <mount>nikon60</mount>
-+        <model>Coolpix P60 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>nikonP60</mount>
-         <cropfactor>5.62</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.4" a="0.01144" b="-0.05486" c="0.02864" />
--            <distortion model="ptlens" focal="7.5" a="0.01046" b="-0.03608" c="0.01364" />
--            <distortion model="ptlens" focal="8.8" a="0.01059" b="-0.03248" c="0.01726" />
--            <distortion model="ptlens" focal="10.4" a="0.01115" b="-0.02963" c="0.01704" />
--            <distortion model="ptlens" focal="12.2" a="-0.00319" b="0.01344" c="-0.01893" />
--            <distortion model="ptlens" focal="16.8" a="-0.00414" b="0.01633" c="-0.01256" />
--            <distortion model="ptlens" focal="23.2" a="0.00325" b="0.00014" c="-0.00351" />
--            <distortion model="ptlens" focal="32" a="0.01901" b="-0.04013" c="0.02487" />
-+            <distortion model="ptlens" focal="6.4" a="0.01144" b="-0.05486" c="0.02864"/>
-+            <distortion model="ptlens" focal="7.5" a="0.01046" b="-0.03608" c="0.01364"/>
-+            <distortion model="ptlens" focal="8.8" a="0.01059" b="-0.03248" c="0.01726"/>
-+            <distortion model="ptlens" focal="10.4" a="0.01115" b="-0.02963" c="0.01704"/>
-+            <distortion model="ptlens" focal="12.2" a="-0.00319" b="0.01344" c="-0.01893"/>
-+            <distortion model="ptlens" focal="16.8" a="-0.00414" b="0.01633" c="-0.01256"/>
-+            <distortion model="ptlens" focal="23.2" a="0.00325" b="0.00014" c="-0.00351"/>
-+            <distortion model="ptlens" focal="32" a="0.01901" b="-0.04013" c="0.02487"/>
-             <!-- TCA and vignetting doesn't matter for this camera. -->
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Nikon</maker>
--        <model>Standard</model>
-+        <model>Coolpix P330 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>nikonP330</mount>
-         <cropfactor>4.706</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.1" a="0.0176" b="-0.07831" c="-0.03885" />
--            <distortion model="ptlens" focal="6" a="0.01418" b="-0.06625" c="-0.02427" />
--            <distortion model="ptlens" focal="7.5" a="0.00127" b="-0.01984" c="-0.02692" />
--            <distortion model="ptlens" focal="10.7" a="-0.00235" b="0.00566" c="-0.03388" />
--            <distortion model="ptlens" focal="18.2" b="-0.00243" />
--            <distortion model="ptlens" focal="22.4" b="-0.00077" />
--            <distortion model="ptlens" focal="25.5" b="0.00023" />
--            <tca model="poly3" focal="5.1" br="0.0005094" vr="0.9997604" bb="-0.0007459" vb="1.0013662" />
--            <tca model="poly3" focal="6" br="0.0003130" vr="0.9998362" bb="-0.0006603" vb="1.0013404" />
--            <tca model="poly3" focal="7.5" br="0.0001122" vr="0.9999132" bb="-0.0004930" vb="1.0013154" />
--            <tca model="poly3" focal="10.7" br="0.0000194" vr="0.9999687" bb="-0.0003203" vb="1.0011665" />
--            <tca model="poly3" focal="18.2" br="-0.0000083" vr="1.0001021" bb="-0.0000163" vb="1.0004001" />
--            <tca model="poly3" focal="22.4" br="-0.0000270" vr="1.0001445" bb="-0.0000302" vb="1.0002259" />
--            <tca model="poly3" focal="25.5" br="0.0000262" vr="1.0000900" bb="-0.0000026" vb="1.0001305" />
-+            <distortion model="ptlens" focal="5.1" a="0.0176" b="-0.07831" c="-0.03885"/>
-+            <distortion model="ptlens" focal="6" a="0.01418" b="-0.06625" c="-0.02427"/>
-+            <distortion model="ptlens" focal="7.5" a="0.00127" b="-0.01984" c="-0.02692"/>
-+            <distortion model="ptlens" focal="10.7" a="-0.00235" b="0.00566" c="-0.03388"/>
-+            <distortion model="ptlens" focal="18.2" b="-0.00243"/>
-+            <distortion model="ptlens" focal="22.4" b="-0.00077"/>
-+            <distortion model="ptlens" focal="25.5" b="0.00023"/>
-+            <tca model="poly3" focal="5.1" br="0.0005094" vr="0.9997604" bb="-0.0007459" vb="1.0013662"/>
-+            <tca model="poly3" focal="6" br="0.0003130" vr="0.9998362" bb="-0.0006603" vb="1.0013404"/>
-+            <tca model="poly3" focal="7.5" br="0.0001122" vr="0.9999132" bb="-0.0004930" vb="1.0013154"/>
-+            <tca model="poly3" focal="10.7" br="0.0000194" vr="0.9999687" bb="-0.0003203" vb="1.0011665"/>
-+            <tca model="poly3" focal="18.2" br="-0.0000083" vr="1.0001021" bb="-0.0000163" vb="1.0004001"/>
-+            <tca model="poly3" focal="22.4" br="-0.0000270" vr="1.0001445" bb="-0.0000302" vb="1.0002259"/>
-+            <tca model="poly3" focal="25.5" br="0.0000262" vr="1.0000900" bb="-0.0000026" vb="1.0001305"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Coolpix S3300 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>nikonS3300</mount>
-+        <cropfactor>5.65</cropfactor>
-+        <calibration>
-+            <!-- Bogus calibration entries, just to document that the
-+                 camera-correction does a perfect job. -->
-+            <distortion model="poly3" focal="4.6"/>
-+            <distortion model="poly3" focal="27.6"/>
-+            <tca model="poly3" focal="4.6"/>
-+            <tca model="poly3" focal="27.6"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P7000 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>nikonP7000</mount>
-+        <cropfactor>4.69</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6" a="0.01246" b="-0.02848" c="-0.02244"/>
-+            <distortion model="ptlens" focal="8.8" a="0.01448" b="-0.03373" c="0.0304"/>
-+            <distortion model="ptlens" focal="16.3" a="0" b="0.01025" c="0"/>
-+            <distortion model="ptlens" focal="42.6" a="0" b="0.00694" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Coolpix A &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>nikonA</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="18.5" a="0.00611" b="-0.01026" c="-0.01844"/>
-+            <tca model="poly3" focal="18.5" vr="1.0000922" vb="1.0000229"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Coolpix P7800 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>nikonP7800</mount>
-+        <cropfactor>4.67</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon Coolpix P7800 -->
-+            <distortion model="ptlens" focal="6" a="-0.00644" b="-0.01027" c="0.01753"/>
-+            <distortion model="ptlens" focal="7" a="-0.00228" b="-0.01209" c="0.03087"/>
-+            <distortion model="ptlens" focal="8.2" a="-0.00585" b="0.00803" c="0.01475"/>
-+            <distortion model="ptlens" focal="9.9" a="-0.00442" b="0.01551" c="-0.00154"/>
-+            <distortion model="ptlens" focal="12.5" a="0.01527" b="-0.06092" c="0.09903"/>
-+            <distortion model="ptlens" focal="15.9" a="-0.00529" b="0.00731" c="0.02763"/>
-+            <distortion model="ptlens" focal="19.7" a="0.00713" b="-0.02789" c="0.05207"/>
-+            <distortion model="ptlens" focal="25" a="-0.00902" b="0.0241" c="-0.00347"/>
-+            <distortion model="ptlens" focal="32.6" a="-0.00725" b="0.01842" c="-0.00119"/>
-+            <distortion model="ptlens" focal="42.8" a="-0.00937" b="0.02926" c="-0.00796"/>
-+            <tca model="poly3" focal="6" vr="1.0001746" vb="1.0002787"/>
-+            <tca model="poly3" focal="7" vr="1.0001291" vb="1.0002796"/>
-+            <tca model="poly3" focal="8.2" vr="1.0001035" vb="1.0002686"/>
-+            <tca model="poly3" focal="9.9" vr="1.0001177" vb="1.0002300"/>
-+            <tca model="poly3" focal="12.5" vr="1.0001136" vb="1.0001188"/>
-+            <tca model="poly3" focal="15.9" vr="1.0001461" vb="1.0000067"/>
-+            <tca model="poly3" focal="19.7" vr="1.0001575" vb="0.9998596"/>
-+            <tca model="poly3" focal="25" vr="1.0001193" vb="0.9996409"/>
-+            <tca model="poly3" focal="32.6" vr="1.0000405" vb="0.9994710"/>
-+            <tca model="poly3" focal="42.8" vr="0.9997493" vb="0.9998575"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-olympus.xml b/data/db/compact-olympus.xml
---- a/data/db/compact-olympus.xml	2013-06-23 12:17:14.000000000 +0200
-+++ b/data/db/compact-olympus.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,556 +1,613 @@
- <lensdatabase>
--
--    <mount>
--        <name>olympus8080</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympus2040</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusStylusV</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympus700</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympus750</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusC50</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympus4000</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusEpic</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympus5060</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusC860</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympus7000</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusSP350</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusSP500uz</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>olympusSP560uz</name>
--        <compat>Generic</compat>
--    </mount>
--    
--    <mount>
--        <name>olympusxz1</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>OLYMPUS CORPORATION</maker>
-+        <maker>Olympus Corporation</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C8080WZ</model>
-+        <model lang="en">C-8080 Wide Zoom</model>
-         <mount>olympus8080</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>u-miniD,Stylus V</model>
--        <variant>Stylus Verve S</variant>
-+        <model lang="en">µ-mini Digital</model>
-         <mount>olympusStylusV</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>u-miniD,Stylus V</model>
-+        <model lang="en">Stylus Verve Digital</model>
-+        <!-- The following line is necessary so that Lensfun regards this as an
-+             enry of its own. -->
-+        <variant>variant of the µ-mini Digital</variant>
-+        <mount>olympusStylusV</mount>
-+        <cropfactor>6.0</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C70Z,C7000Z</model>
-+        <model lang="en">C-70 Zoom, C-7000 Zoom</model>
-         <mount>olympus7000</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C4100Z,C4000Z</model>
-+        <model lang="en">C-4000 Zoom, C-4100 Zoom</model>
-         <mount>olympus4000</mount>
-         <cropfactor>4.92</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
--        <model>C4100Z,C4000Z</model>
--        <mount>olympus4000</mount>
--        <cropfactor>4.8</cropfactor>
-+        <model>X-2,C-50Z</model>
-+        <model lang="en">X-2</model>
-+        <mount>olympusC50</mount>
-+        <cropfactor>4.9</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>X-2,C-50Z</model>
-+        <model lang="en">C-50 Zoom</model>
-+        <!-- The following line is necessary so that Lensfun regards this as an
-+             enry of its own. -->
-+        <variant>variant of the X-2</variant>
-         <mount>olympusC50</mount>
-         <cropfactor>4.9</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C750UZ</model>
-+        <model lang="en">C-750 Ultra Zoom</model>
-         <mount>olympus750</mount>
-         <cropfactor>6.03</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C730UZ</model>
-+        <model lang="en">C-730 Ultra Zoom</model>
-         <mount>olympus700</mount>
-         <cropfactor>6.52</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C700UZ</model>
-+        <model lang="en">C-700 Ultra Zoom</model>
-         <mount>olympus700</mount>
-         <cropfactor>6.52</cropfactor>
-     </camera>
--
--    <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
--        <maker lang="en">Olympus</maker>
--        <model>C7070WZ</model>
--        <mount>olympus5060</mount>
--        <cropfactor>4.930</cropfactor>
--    </camera>
--
-     <camera>
--        <maker>OLYMPUS CORPORATION</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C7070WZ</model>
-+        <model lang="en">C-7070 Wide Zoom</model>
-         <mount>olympus5060</mount>
-         <cropfactor>4.930</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS CORPORATION</maker>
-+        <maker>Olympus Corporation</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C5060WZ</model>
-+        <model lang="en">C-5060 Wide Zoom</model>
-         <mount>olympus5060</mount>
-         <cropfactor>4.930</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C5050Z</model>
-+        <model lang="en">C-5050 Zoom</model>
-         <mount>olympus2040</mount>
-         <cropfactor>4.930</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C4040Z</model>
-+        <model lang="en">C-4040 Zoom</model>
-         <mount>olympus2040</mount>
-         <cropfactor>4.930</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C3040Z</model>
-+        <model lang="en">C-3040 Zoom</model>
-         <mount>olympus2040</mount>
-         <cropfactor>4.930</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C2040Z</model>
-+        <model lang="en">C-2040 Zoom</model>
-         <mount>olympus2040</mount>
-         <cropfactor>4.930</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>C860L,D360L</model>
-+        <model lang="en">C-860L</model>
-+        <mount>olympusC860</mount>
-+        <cropfactor>6.563</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>C860L,D360L</model>
-+        <model lang="en">D-360L</model>
-+        <!-- The following line is necessary so that Lensfun regards this as an
-+             enry of its own. -->
-+        <variant>variant of the C-860L</variant>
-         <mount>olympusC860</mount>
-         <cropfactor>6.563</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Olympus</maker>
-         <model>mju-II</model>
-+        <model lang="en">µ-II</model>
-         <mount>olympusEpic</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Olympus</maker>
-         <model>Stylus Epic</model>
-         <mount>olympusEpic</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>SP350</model>
-+        <model lang="en">SP-350</model>
-         <mount>olympusSP350</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>SP500UZ</model>
-+        <model lang="en">SP-500 Ultra Zoom</model>
-         <mount>olympusSP500</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>SP560UZ</model>
-+        <model lang="en">SP-560 Ultra Zoom</model>
-         <mount>olympusSP560</mount>
-         <cropfactor>5.8</cropfactor>
-     </camera>
--    
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>XZ-1</model>
-         <mount>olympusxz1</mount>
-         <cropfactor>4.68</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>XZ-2</model>
-+        <mount>olympusxz1</mount>
-+        <cropfactor>4.68</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>Stylus1</model>
-+        <model lang="en">Stylus 1</model>
-+        <mount>olympusStylus1</mount>
-+        <cropfactor>4.67</cropfactor>
-+    </camera>
-+    <camera>
-+        <!-- This is an alias of the previous entry.  The new firmware of the
-+             Stylus 1 even identifies the Stylus 1 as "Stylus 1,1s". -->
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>Stylus1,1s</model>
-+        <model lang="en">Stylus 1, 1s</model>
-+        <mount>olympusStylus1</mount>
-+        <cropfactor>4.67</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Corporation</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>TG-1</model>
-+        <model lang="en">Stylus TG-1</model>
-+        <mount>olympusStylusTG4</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Corporation</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>TG-2</model>
-+        <model lang="en">Stylus TG-2</model>
-+        <mount>olympusStylusTG4</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Corporation</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>TG-3</model>
-+        <model lang="en">Stylus TG-3</model>
-+        <mount>olympusStylusTG4</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Corporation</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>TG-4</model>
-+        <model lang="en">Stylus TG-4</model>
-+        <mount>olympusStylusTG4</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C8080WZ &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus8080</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.013182" b="-0.036019" c="0" />
--            <distortion model="ptlens" focal="8.4" a="0.007334" b="-0.017216" c="0" />
--            <distortion model="ptlens" focal="10.7" a="0.001287" b="0.004729" c="0" />
--            <distortion model="ptlens" focal="11.9" a="0.006157" b="-0.005368" c="0" />
--            <distortion model="ptlens" focal="15.8" a="0.001207" b="0.003221" c="0" />
--            <distortion model="ptlens" focal="20.6" a="0.003286" b="0.001466" c="0" />
--            <distortion model="ptlens" focal="27.1" a="0.004701" b="-0.005662" c="0" />
--            <distortion model="ptlens" focal="31.9" a="-0.00563" b="0.017601" c="0" />
--            <distortion model="ptlens" focal="35.6" a="0.013081" b="-0.014879" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.013182" b="-0.036019" c="0"/>
-+            <distortion model="ptlens" focal="8.4" a="0.007334" b="-0.017216" c="0"/>
-+            <distortion model="ptlens" focal="10.7" a="0.001287" b="0.004729" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="0.006157" b="-0.005368" c="0"/>
-+            <distortion model="ptlens" focal="15.8" a="0.001207" b="0.003221" c="0"/>
-+            <distortion model="ptlens" focal="20.6" a="0.003286" b="0.001466" c="0"/>
-+            <distortion model="ptlens" focal="27.1" a="0.004701" b="-0.005662" c="0"/>
-+            <distortion model="ptlens" focal="31.9" a="-0.00563" b="0.017601" c="0"/>
-+            <distortion model="ptlens" focal="35.6" a="0.013081" b="-0.014879" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>Stylus V &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympusStylusV</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.95" a="0" b="-0.015907" c="0" />
--            <distortion model="ptlens" focal="6.76" a="0" b="-0.01018" c="0" />
--            <distortion model="ptlens" focal="8.02" a="0" b="-0.005811" c="0" />
--            <distortion model="ptlens" focal="9.34" a="0" b="-0.004323" c="0" />
--            <distortion model="ptlens" focal="10.65" a="0" b="-0.002622" c="0" />
--            <distortion model="ptlens" focal="11.52" a="0" b="-0.001258" c="0" />
-+            <distortion model="poly3" focal="5.95" k1="-0.015907"/>
-+            <distortion model="poly3" focal="6.76" k1="-0.01018"/>
-+            <distortion model="poly3" focal="8.02" k1="-0.005811"/>
-+            <distortion model="poly3" focal="9.34" k1="-0.004323"/>
-+            <distortion model="poly3" focal="10.65" k1="-0.002622"/>
-+            <distortion model="poly3" focal="11.52" k1="-0.001258"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C7000Z &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus7000</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.9" a="0.008728" b="-0.032692" c="0" />
--            <distortion model="ptlens" focal="10.4" a="0.004014" b="-0.012678" c="0" />
--            <distortion model="ptlens" focal="11.2" a="0.000366" b="-0.004663" c="0" />
--            <distortion model="ptlens" focal="12.1" a="0" b="-0.002819" c="0" />
--            <distortion model="ptlens" focal="14.3" a="0" b="-0.002892" c="0" />
--            <distortion model="ptlens" focal="17.1" a="0" b="-0.002579" c="0" />
--            <distortion model="ptlens" focal="18.7" a="0" b="-0.002406" c="0" />
--            <distortion model="ptlens" focal="22.3" a="0" b="-0.000464" c="0" />
--            <distortion model="ptlens" focal="31.3" a="0" b="0.005551" c="0" />
--            <distortion model="ptlens" focal="39.5" a="0" b="0.00644" c="0" />
-+            <distortion model="ptlens" focal="7.9" a="0.008728" b="-0.032692" c="0"/>
-+            <distortion model="ptlens" focal="10.4" a="0.004014" b="-0.012678" c="0"/>
-+            <distortion model="ptlens" focal="11.2" a="0.000366" b="-0.004663" c="0"/>
-+            <distortion model="ptlens" focal="12.1" a="0" b="-0.002819" c="0"/>
-+            <distortion model="ptlens" focal="14.3" a="0" b="-0.002892" c="0"/>
-+            <distortion model="ptlens" focal="17.1" a="0" b="-0.002579" c="0"/>
-+            <distortion model="ptlens" focal="18.7" a="0" b="-0.002406" c="0"/>
-+            <distortion model="ptlens" focal="22.3" a="0" b="-0.000464" c="0"/>
-+            <distortion model="ptlens" focal="31.3" a="0" b="0.005551" c="0"/>
-+            <distortion model="ptlens" focal="39.5" a="0" b="0.00644" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C4000Z &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus4000</mount>
-         <cropfactor>4.92</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.8" a="0.021642" b="-0.049919" c="0" />
--            <distortion model="ptlens" focal="7.3" a="0.019191" b="-0.041291" c="0" />
--            <distortion model="ptlens" focal="7.7" a="0.016704" b="-0.034647" c="0" />
--            <distortion model="ptlens" focal="8.5" a="0.007519" b="-0.013786" c="0" />
--            <distortion model="ptlens" focal="9.6" a="0.010265" b="-0.014702" c="0" />
--            <distortion model="ptlens" focal="11.5" a="0.008528" b="-0.008361" c="0" />
--            <distortion model="ptlens" focal="13.9" a="0.007456" b="-0.006165" c="0" />
--            <distortion model="ptlens" focal="14.8" a="0" b="0.006037" c="0" />
--            <distortion model="ptlens" focal="19.1" a="0" b="0.004666" c="0" />
-+            <distortion model="ptlens" focal="6.8" a="0.021642" b="-0.049919" c="0"/>
-+            <distortion model="ptlens" focal="7.3" a="0.019191" b="-0.041291" c="0"/>
-+            <distortion model="ptlens" focal="7.7" a="0.016704" b="-0.034647" c="0"/>
-+            <distortion model="ptlens" focal="8.5" a="0.007519" b="-0.013786" c="0"/>
-+            <distortion model="ptlens" focal="9.6" a="0.010265" b="-0.014702" c="0"/>
-+            <distortion model="ptlens" focal="11.5" a="0.008528" b="-0.008361" c="0"/>
-+            <distortion model="ptlens" focal="13.9" a="0.007456" b="-0.006165" c="0"/>
-+            <distortion model="ptlens" focal="14.8" a="0" b="0.006037" c="0"/>
-+            <distortion model="ptlens" focal="19.1" a="0" b="0.004666" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>A-28 iS/L Converter</model>
-+        <model>C4000Z &amp; compatibles, with A-28 iS/L converter</model>
-+        <model lang="en">fixed lens, with A-28 iS/L converter</model>
-+        <model lang="de">festes Objektiv, mit A-28 iS/L-Konverter</model>
-         <mount>olympus4000</mount>
-         <cropfactor>4.92</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.8" a="0.033" b="-0.072996" c="0" />
--            <distortion model="ptlens" focal="8.5" a="0.018055" b="-0.035714" c="0" />
--            <distortion model="ptlens" focal="9.6" a="0.011346" b="-0.019011" c="0" />
--            <distortion model="ptlens" focal="10.7" a="0" b="0.005155" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="0.005255" c="0" />
--            <distortion model="ptlens" focal="13.1" a="0" b="0.005363" c="0" />
--            <distortion model="ptlens" focal="14.8" a="0" b="0.004901" c="0" />
--            <distortion model="ptlens" focal="19.9" a="0" b="0.004447" c="0" />
-+            <distortion model="ptlens" focal="6.8" a="0.033" b="-0.072996" c="0"/>
-+            <distortion model="ptlens" focal="8.5" a="0.018055" b="-0.035714" c="0"/>
-+            <distortion model="ptlens" focal="9.6" a="0.011346" b="-0.019011" c="0"/>
-+            <distortion model="ptlens" focal="10.7" a="0" b="0.005155" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0" b="0.005255" c="0"/>
-+            <distortion model="ptlens" focal="13.1" a="0" b="0.005363" c="0"/>
-+            <distortion model="ptlens" focal="14.8" a="0" b="0.004901" c="0"/>
-+            <distortion model="ptlens" focal="19.9" a="0" b="0.004447" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C-50Z &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympusC50</mount>
-         <cropfactor>4.9</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.8" a="0" b="-0.013352" c="0" />
--            <distortion model="ptlens" focal="9.04" a="0" b="-0.011264" c="0" />
--            <distortion model="ptlens" focal="10.59" a="0" b="-0.008279" c="0" />
--            <distortion model="ptlens" focal="12.36" a="0" b="-0.004946" c="0" />
--            <distortion model="ptlens" focal="18.83" a="0" b="-0.002577" c="0" />
--            <distortion model="ptlens" focal="21.64" a="0" b="-0.001835" c="0" />
--            <distortion model="ptlens" focal="23.4" a="0" b="-0.001201" c="0" />
-+            <distortion model="poly3" focal="7.8" k1="-0.013352"/>
-+            <distortion model="poly3" focal="9.04" k1="-0.011264"/>
-+            <distortion model="poly3" focal="10.59" k1="-0.008279"/>
-+            <distortion model="poly3" focal="12.36" k1="-0.004946"/>
-+            <distortion model="poly3" focal="18.83" k1="-0.002577"/>
-+            <distortion model="poly3" focal="21.64" k1="-0.001835"/>
-+            <distortion model="poly3" focal="23.4" k1="-0.001201"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C750UZ &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus750</mount>
-         <cropfactor>6.03</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.3" a="0.014396" b="-0.03198" c="0" />
--            <distortion model="ptlens" focal="8.6" a="0.004455" b="-0.008915" c="0" />
--            <distortion model="ptlens" focal="10.4" a="0.000123" b="-0.001324" c="0" />
--            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="52.4" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="57.1" a="0" b="0.001557" c="0" />
--            <distortion model="ptlens" focal="63" a="0" b="0.004464" c="0" />
-+            <distortion model="ptlens" focal="6.3" a="0.014396" b="-0.03198" c="0"/>
-+            <distortion model="ptlens" focal="8.6" a="0.004455" b="-0.008915" c="0"/>
-+            <distortion model="ptlens" focal="10.4" a="0.000123" b="-0.001324" c="0"/>
-+            <distortion model="ptlens" focal="12.1" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="52.4" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="57.1" a="0" b="0.001557" c="0"/>
-+            <distortion model="ptlens" focal="63" a="0" b="0.004464" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C700UZ &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus700</mount>
-         <cropfactor>6.52</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.9" a="0.02035" b="-0.054079" c="0" />
--            <distortion model="ptlens" focal="6.9" a="0.014877" b="-0.033764" c="0" />
--            <distortion model="ptlens" focal="10" a="0.008152" b="-0.016493" c="0" />
--            <distortion model="ptlens" focal="13.7" a="0" b="-0.001382" c="0" />
--            <distortion model="ptlens" focal="17.3" a="0" b="-0.002491" c="0" />
--            <distortion model="ptlens" focal="23.7" a="0" b="-0.002448" c="0" />
--            <distortion model="ptlens" focal="32.4" a="0" b="-0.004102" c="0" />
--            <distortion model="ptlens" focal="58" a="0" b="-0" c="0" />
-+            <distortion model="ptlens" focal="5.9" a="0.02035" b="-0.054079" c="0"/>
-+            <distortion model="ptlens" focal="6.9" a="0.014877" b="-0.033764" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0.008152" b="-0.016493" c="0"/>
-+            <distortion model="ptlens" focal="13.7" a="0" b="-0.001382" c="0"/>
-+            <distortion model="ptlens" focal="17.3" a="0" b="-0.002491" c="0"/>
-+            <distortion model="ptlens" focal="23.7" a="0" b="-0.002448" c="0"/>
-+            <distortion model="ptlens" focal="32.4" a="0" b="-0.004102" c="0"/>
-+            <distortion model="ptlens" focal="58" a="0" b="-0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C2040Z &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus2040</mount>
-         <cropfactor>4.930</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.018282" b="-0.052125" c="0" />
--            <distortion model="ptlens" focal="7.9" a="0.019487" b="-0.050797" c="0" />
--            <distortion model="ptlens" focal="8.2" a="0.012667" b="-0.033455" c="0" />
--            <distortion model="ptlens" focal="8.4" a="0.007855" b="-0.023699" c="0" />
--            <distortion model="ptlens" focal="8.7" a="0.012867" b="-0.032007" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0.000566" b="-0.004599" c="0" />
--            <distortion model="ptlens" focal="11.9" a="0.007423" b="-0.014208" c="0" />
--            <distortion model="ptlens" focal="13.2" a="-0.002075" b="0.005545" c="0" />
--            <distortion model="ptlens" focal="15" a="-0.004884" b="0.014178" c="0" />
--            <distortion model="ptlens" focal="17.6" a="-0.013836" b="0.033711" c="0" />
--            <distortion model="ptlens" focal="21.3" a="0.000657" b="0.002024" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.018282" b="-0.052125" c="0"/>
-+            <distortion model="ptlens" focal="7.9" a="0.019487" b="-0.050797" c="0"/>
-+            <distortion model="ptlens" focal="8.2" a="0.012667" b="-0.033455" c="0"/>
-+            <distortion model="ptlens" focal="8.4" a="0.007855" b="-0.023699" c="0"/>
-+            <distortion model="ptlens" focal="8.7" a="0.012867" b="-0.032007" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0.000566" b="-0.004599" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="0.007423" b="-0.014208" c="0"/>
-+            <distortion model="ptlens" focal="13.2" a="-0.002075" b="0.005545" c="0"/>
-+            <distortion model="ptlens" focal="15" a="-0.004884" b="0.014178" c="0"/>
-+            <distortion model="ptlens" focal="17.6" a="-0.013836" b="0.033711" c="0"/>
-+            <distortion model="ptlens" focal="21.3" a="0.000657" b="0.002024" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>WCON-08B</model>
-+        <model>C2040Z &amp; compatibles, with WCON-08B</model>
-+        <model lang="en">fixed lens, with WCON-08B</model>
-+        <model lang="de">festes Objektiv, mit WCON-08B</model>
-         <mount>olympus2040</mount>
-         <cropfactor>4.930</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.027465" b="-0.07362" c="0" />
--            <distortion model="ptlens" focal="7.9" a="0.012773" b="-0.036148" c="0" />
--            <distortion model="ptlens" focal="8.7" a="0.019964" b="-0.047659" c="0" />
--            <distortion model="ptlens" focal="9" a="0.010697" b="-0.028343" c="0" />
--            <distortion model="ptlens" focal="10.5" a="0.004591" b="-0.013381" c="0" />
--            <distortion model="ptlens" focal="11.9" a="0.01083" b="-0.021339" c="0" />
--            <distortion model="ptlens" focal="13.2" a="0.005054" b="-0.010225" c="0" />
--            <distortion model="ptlens" focal="14.5" a="0.001686" b="-0.001529" c="0" />
--            <distortion model="ptlens" focal="16.9" a="-0.002782" b="0.008112" c="0" />
--            <distortion model="ptlens" focal="17.6" a="0.000679" b="0.001663" c="0" />
--            <distortion model="ptlens" focal="21.3" a="0.004686" b="-0.008143" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.027465" b="-0.07362" c="0"/>
-+            <distortion model="ptlens" focal="7.9" a="0.012773" b="-0.036148" c="0"/>
-+            <distortion model="ptlens" focal="8.7" a="0.019964" b="-0.047659" c="0"/>
-+            <distortion model="ptlens" focal="9" a="0.010697" b="-0.028343" c="0"/>
-+            <distortion model="ptlens" focal="10.5" a="0.004591" b="-0.013381" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="0.01083" b="-0.021339" c="0"/>
-+            <distortion model="ptlens" focal="13.2" a="0.005054" b="-0.010225" c="0"/>
-+            <distortion model="ptlens" focal="14.5" a="0.001686" b="-0.001529" c="0"/>
-+            <distortion model="ptlens" focal="16.9" a="-0.002782" b="0.008112" c="0"/>
-+            <distortion model="ptlens" focal="17.6" a="0.000679" b="0.001663" c="0"/>
-+            <distortion model="ptlens" focal="21.3" a="0.004686" b="-0.008143" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C5060WZ &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympus5060</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.7" a="0" b="-0.004736" c="-0.025632" />
--            <distortion model="ptlens" focal="7.3" a="0" b="-0.001423" c="-0.032997" />
--            <distortion model="ptlens" focal="8.6" a="0" b="-0.043809" c="0.067939" />
--            <distortion model="ptlens" focal="10" a="0" b="-0.010586" c="0.000919" />
--            <distortion model="ptlens" focal="11.8" a="0" b="-0.007287" c="0.002822" />
--            <distortion model="ptlens" focal="12.8" a="0" b="-0.007539" c="-0.014107" />
--            <distortion model="ptlens" focal="13.4" a="0" b="-0.015426" c="0.0202" />
--            <distortion model="ptlens" focal="14.5" a="0" b="-0.011352" c="0.021863" />
--            <distortion model="ptlens" focal="15.8" a="0" b="-0.000188" c="-0.010549" />
--            <distortion model="ptlens" focal="18.9" a="0" b="-0.009209" c="0.013324" />
--            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="5.7" a="0" b="-0.004736" c="-0.025632"/>
-+            <distortion model="ptlens" focal="7.3" a="0" b="-0.001423" c="-0.032997"/>
-+            <distortion model="ptlens" focal="8.6" a="0" b="-0.043809" c="0.067939"/>
-+            <distortion model="ptlens" focal="10" a="0" b="-0.010586" c="0.000919"/>
-+            <distortion model="ptlens" focal="11.8" a="0" b="-0.007287" c="0.002822"/>
-+            <distortion model="ptlens" focal="12.8" a="0" b="-0.007539" c="-0.014107"/>
-+            <distortion model="ptlens" focal="13.4" a="0" b="-0.015426" c="0.0202"/>
-+            <distortion model="ptlens" focal="14.5" a="0" b="-0.011352" c="0.021863"/>
-+            <distortion model="ptlens" focal="15.8" a="0" b="-0.000188" c="-0.010549"/>
-+            <distortion model="ptlens" focal="18.9" a="0" b="-0.009209" c="0.013324"/>
-+            <distortion model="ptlens" focal="20.4" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="22.9" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>C860L &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympusC860</mount>
-         <cropfactor>6.563</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.5" a="0.01115" b="-0.029245" c="0" />
-+            <distortion model="ptlens" focal="5.5" a="0.01115" b="-0.029245" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>Stylus Epic &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympusEpic</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="-0.01247" b="0.027098" c="0" />
-+            <distortion model="ptlens" focal="35" a="-0.01247" b="0.027098" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>XZ-1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympusxz1</mount>
--	    <focal min="6" max="24" />
--	    <aperture min="1.8" max="8" />
-+        <focal min="6" max="24"/>
-+        <aperture min="1.8" max="8"/>
-         <cropfactor>4.68</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.01604" b="-0.05047" c="0" />
--            <distortion model="ptlens" focal="6.5" a="0.01062" b="-0.03568" c="0" />
--            <distortion model="ptlens" focal="6.9" a="0.01005" b="-0.032" c="0" />
--            <distortion model="ptlens" focal="7.4" a="0.0093" b="-0.02656" c="0" />
--            <distortion model="ptlens" focal="8.2" a="0.0054" b="-0.01759" c="0" />
--            <distortion model="ptlens" focal="9" a="0.0039" b="-0.01169" c="0" />
--            <distortion model="ptlens" focal="9.9" a="0.00681" b="-0.01404" c="0" />
--            <distortion model="ptlens" focal="10.8" a="0.00403" b="-0.00779" c="0" />
--            <distortion model="ptlens" focal="11.8" a="0.00045" b="-0.00198" c="0" />
--            <distortion model="ptlens" focal="12.9" a="-0.00279" b="0.00569" c="0" />
--            <distortion model="ptlens" focal="14.1" a="0.00656" b="-0.01053" c="0" />
--            <distortion model="ptlens" focal="15.3" a="0.00245" b="-0.00075" c="0" />
--            <distortion model="ptlens" focal="16.6" a="0.00104" b="0.00264" c="0" />
--            <distortion model="ptlens" focal="18.2" a="0.00146" b="0.00052" c="0" />
--            <distortion model="ptlens" focal="19.8" a="0.00166" b="0.00164" c="0" />
--            <distortion model="ptlens" focal="21.6" a="0.00064" b="0.00348" c="0" />
--            <distortion model="ptlens" focal="24" a="0.00074" b="0.0032" c="0" />
--			<vignetting model="pa" focal="6" aperture="1.8" distance="10" k1="-0.2032" k2="-0.2235" k3="-0.0230" />
--            <vignetting model="pa" focal="6" aperture="1.8" distance="1000" k1="-0.2032" k2="-0.2235" k3="-0.0230" />
--            <vignetting model="pa" focal="6" aperture="2.8" distance="10" k1="-0.1922" k2="-0.0942" k3="0.0504" />
--            <vignetting model="pa" focal="6" aperture="2.8" distance="1000" k1="-0.1922" k2="-0.0942" k3="0.0504" />
--            <vignetting model="pa" focal="6" aperture="4" distance="10" k1="-0.1690" k2="-0.1739" k3="0.1166" />
--            <vignetting model="pa" focal="6" aperture="4" distance="1000" k1="-0.1690" k2="-0.1739" k3="0.1166" />
--            <vignetting model="pa" focal="6" aperture="5" distance="10" k1="-0.1668" k2="-0.1787" k3="0.1202" />
--            <vignetting model="pa" focal="6" aperture="5" distance="1000" k1="-0.1668" k2="-0.1787" k3="0.1202" />
--            <vignetting model="pa" focal="6" aperture="8" distance="10" k1="-0.1688" k2="-0.1835" k3="0.1267" />
--            <vignetting model="pa" focal="6" aperture="8" distance="1000" k1="-0.1688" k2="-0.1835" k3="0.1267" />
--            <vignetting model="pa" focal="10.8" aperture="2.1" distance="10" k1="-0.1642" k2="-0.1555" k3="0.1147" />
--            <vignetting model="pa" focal="10.8" aperture="2.1" distance="1000" k1="-0.1642" k2="-0.1555" k3="0.1147" />
--            <vignetting model="pa" focal="10.8" aperture="3.2" distance="10" k1="-0.0990" k2="0.0311" k3="0.0035" />
--            <vignetting model="pa" focal="10.8" aperture="3.2" distance="1000" k1="-0.0990" k2="0.0311" k3="0.0035" />
--            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.1012" k2="0.0322" k3="0.0044" />
--            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.1012" k2="0.0322" k3="0.0044" />
--            <vignetting model="pa" focal="10.8" aperture="5" distance="10" k1="-0.1109" k2="0.0508" k3="-0.0055" />
--            <vignetting model="pa" focal="10.8" aperture="5" distance="1000" k1="-0.1109" k2="0.0508" k3="-0.0055" />
--            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.1369" k2="0.1004" k3="-0.0314" />
--            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.1369" k2="0.1004" k3="-0.0314" />
--            <vignetting model="pa" focal="15.3" aperture="2.3" distance="10" k1="-0.2326" k2="0.2678" k3="-0.3386" />
--            <vignetting model="pa" focal="15.3" aperture="2.3" distance="1000" k1="-0.2326" k2="0.2678" k3="-0.3386" />
--            <vignetting model="pa" focal="15.3" aperture="3.2" distance="10" k1="-0.0428" k2="-0.0007" k3="-0.0313" />
--            <vignetting model="pa" focal="15.3" aperture="3.2" distance="1000" k1="-0.0428" k2="-0.0007" k3="-0.0313" />
--            <vignetting model="pa" focal="15.3" aperture="4.5" distance="10" k1="-0.0063" k2="-0.1286" k3="0.0797" />
--            <vignetting model="pa" focal="15.3" aperture="4.5" distance="1000" k1="-0.0063" k2="-0.1286" k3="0.0797" />
--            <vignetting model="pa" focal="15.3" aperture="5.6" distance="10" k1="-0.0109" k2="-0.1175" k3="0.0728" />
--            <vignetting model="pa" focal="15.3" aperture="5.6" distance="1000" k1="-0.0109" k2="-0.1175" k3="0.0728" />
--            <vignetting model="pa" focal="15.3" aperture="8" distance="10" k1="-0.0366" k2="-0.0638" k3="0.0413" />
--            <vignetting model="pa" focal="15.3" aperture="8" distance="1000" k1="-0.0366" k2="-0.0638" k3="0.0413" />
--            <vignetting model="pa" focal="19.8" aperture="2.4" distance="10" k1="-0.1864" k2="0.1960" k3="-0.3680" />
--            <vignetting model="pa" focal="19.8" aperture="2.4" distance="1000" k1="-0.1864" k2="0.1960" k3="-0.3680" />
--            <vignetting model="pa" focal="19.8" aperture="3.5" distance="10" k1="-0.0276" k2="-0.0346" k3="-0.0155" />
--            <vignetting model="pa" focal="19.8" aperture="3.5" distance="1000" k1="-0.0276" k2="-0.0346" k3="-0.0155" />
--            <vignetting model="pa" focal="19.8" aperture="4.5" distance="10" k1="0.0093" k2="-0.1641" k3="0.0957" />
--            <vignetting model="pa" focal="19.8" aperture="4.5" distance="1000" k1="0.0093" k2="-0.1641" k3="0.0957" />
--            <vignetting model="pa" focal="19.8" aperture="5.6" distance="10" k1="0.0084" k2="-0.1652" k3="0.0975" />
--            <vignetting model="pa" focal="19.8" aperture="5.6" distance="1000" k1="0.0084" k2="-0.1652" k3="0.0975" />
--            <vignetting model="pa" focal="19.8" aperture="8" distance="10" k1="-0.0077" k2="-0.1306" k3="0.0764" />
--            <vignetting model="pa" focal="19.8" aperture="8" distance="1000" k1="-0.0077" k2="-0.1306" k3="0.0764" />
--            <vignetting model="pa" focal="24" aperture="2.5" distance="10" k1="-0.1756" k2="0.1217" k3="-0.2849" />
--            <vignetting model="pa" focal="24" aperture="2.5" distance="1000" k1="-0.1756" k2="0.1217" k3="-0.2849" />
--            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.0445" k2="-0.0020" k3="-0.0543" />
--            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.0445" k2="-0.0020" k3="-0.0543" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="0.0011" k2="-0.1738" k3="0.0997" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="0.0011" k2="-0.1738" k3="0.0997" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="0.0083" k2="-0.1907" k3="0.1100" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="0.0083" k2="-0.1907" k3="0.1100" />
--            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="0.0049" k2="-0.1887" k3="0.1121" />
--            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="0.0049" k2="-0.1887" k3="0.1121" />
-+            <distortion model="ptlens" focal="6" a="0.01604" b="-0.05047" c="0"/>
-+            <distortion model="ptlens" focal="6.5" a="0.01062" b="-0.03568" c="0"/>
-+            <distortion model="ptlens" focal="6.9" a="0.01005" b="-0.032" c="0"/>
-+            <distortion model="ptlens" focal="7.4" a="0.0093" b="-0.02656" c="0"/>
-+            <distortion model="ptlens" focal="8.2" a="0.0054" b="-0.01759" c="0"/>
-+            <distortion model="ptlens" focal="9" a="0.0039" b="-0.01169" c="0"/>
-+            <distortion model="ptlens" focal="9.9" a="0.00681" b="-0.01404" c="0"/>
-+            <distortion model="ptlens" focal="10.8" a="0.00403" b="-0.00779" c="0"/>
-+            <distortion model="ptlens" focal="11.8" a="0.00045" b="-0.00198" c="0"/>
-+            <distortion model="ptlens" focal="12.9" a="-0.00279" b="0.00569" c="0"/>
-+            <distortion model="ptlens" focal="14.1" a="0.00656" b="-0.01053" c="0"/>
-+            <distortion model="ptlens" focal="15.3" a="0.00245" b="-0.00075" c="0"/>
-+            <distortion model="ptlens" focal="16.6" a="0.00104" b="0.00264" c="0"/>
-+            <distortion model="ptlens" focal="18.2" a="0.00146" b="0.00052" c="0"/>
-+            <distortion model="ptlens" focal="19.8" a="0.00166" b="0.00164" c="0"/>
-+            <distortion model="ptlens" focal="21.6" a="0.00064" b="0.00348" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.00074" b="0.0032" c="0"/>
-+            <vignetting model="pa" focal="6" aperture="1.8" distance="10" k1="-0.2032" k2="-0.2235" k3="-0.0230"/>
-+            <vignetting model="pa" focal="6" aperture="1.8" distance="1000" k1="-0.2032" k2="-0.2235" k3="-0.0230"/>
-+            <vignetting model="pa" focal="6" aperture="2.8" distance="10" k1="-0.1922" k2="-0.0942" k3="0.0504"/>
-+            <vignetting model="pa" focal="6" aperture="2.8" distance="1000" k1="-0.1922" k2="-0.0942" k3="0.0504"/>
-+            <vignetting model="pa" focal="6" aperture="4" distance="10" k1="-0.1690" k2="-0.1739" k3="0.1166"/>
-+            <vignetting model="pa" focal="6" aperture="4" distance="1000" k1="-0.1690" k2="-0.1739" k3="0.1166"/>
-+            <vignetting model="pa" focal="6" aperture="5" distance="10" k1="-0.1668" k2="-0.1787" k3="0.1202"/>
-+            <vignetting model="pa" focal="6" aperture="5" distance="1000" k1="-0.1668" k2="-0.1787" k3="0.1202"/>
-+            <vignetting model="pa" focal="6" aperture="8" distance="10" k1="-0.1688" k2="-0.1835" k3="0.1267"/>
-+            <vignetting model="pa" focal="6" aperture="8" distance="1000" k1="-0.1688" k2="-0.1835" k3="0.1267"/>
-+            <vignetting model="pa" focal="10.8" aperture="2.1" distance="10" k1="-0.1642" k2="-0.1555" k3="0.1147"/>
-+            <vignetting model="pa" focal="10.8" aperture="2.1" distance="1000" k1="-0.1642" k2="-0.1555" k3="0.1147"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.2" distance="10" k1="-0.0990" k2="0.0311" k3="0.0035"/>
-+            <vignetting model="pa" focal="10.8" aperture="3.2" distance="1000" k1="-0.0990" k2="0.0311" k3="0.0035"/>
-+            <vignetting model="pa" focal="10.8" aperture="4" distance="10" k1="-0.1012" k2="0.0322" k3="0.0044"/>
-+            <vignetting model="pa" focal="10.8" aperture="4" distance="1000" k1="-0.1012" k2="0.0322" k3="0.0044"/>
-+            <vignetting model="pa" focal="10.8" aperture="5" distance="10" k1="-0.1109" k2="0.0508" k3="-0.0055"/>
-+            <vignetting model="pa" focal="10.8" aperture="5" distance="1000" k1="-0.1109" k2="0.0508" k3="-0.0055"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="10" k1="-0.1369" k2="0.1004" k3="-0.0314"/>
-+            <vignetting model="pa" focal="10.8" aperture="8" distance="1000" k1="-0.1369" k2="0.1004" k3="-0.0314"/>
-+            <vignetting model="pa" focal="15.3" aperture="2.3" distance="10" k1="-0.2326" k2="0.2678" k3="-0.3386"/>
-+            <vignetting model="pa" focal="15.3" aperture="2.3" distance="1000" k1="-0.2326" k2="0.2678" k3="-0.3386"/>
-+            <vignetting model="pa" focal="15.3" aperture="3.2" distance="10" k1="-0.0428" k2="-0.0007" k3="-0.0313"/>
-+            <vignetting model="pa" focal="15.3" aperture="3.2" distance="1000" k1="-0.0428" k2="-0.0007" k3="-0.0313"/>
-+            <vignetting model="pa" focal="15.3" aperture="4.5" distance="10" k1="-0.0063" k2="-0.1286" k3="0.0797"/>
-+            <vignetting model="pa" focal="15.3" aperture="4.5" distance="1000" k1="-0.0063" k2="-0.1286" k3="0.0797"/>
-+            <vignetting model="pa" focal="15.3" aperture="5.6" distance="10" k1="-0.0109" k2="-0.1175" k3="0.0728"/>
-+            <vignetting model="pa" focal="15.3" aperture="5.6" distance="1000" k1="-0.0109" k2="-0.1175" k3="0.0728"/>
-+            <vignetting model="pa" focal="15.3" aperture="8" distance="10" k1="-0.0366" k2="-0.0638" k3="0.0413"/>
-+            <vignetting model="pa" focal="15.3" aperture="8" distance="1000" k1="-0.0366" k2="-0.0638" k3="0.0413"/>
-+            <vignetting model="pa" focal="19.8" aperture="2.4" distance="10" k1="-0.1864" k2="0.1960" k3="-0.3680"/>
-+            <vignetting model="pa" focal="19.8" aperture="2.4" distance="1000" k1="-0.1864" k2="0.1960" k3="-0.3680"/>
-+            <vignetting model="pa" focal="19.8" aperture="3.5" distance="10" k1="-0.0276" k2="-0.0346" k3="-0.0155"/>
-+            <vignetting model="pa" focal="19.8" aperture="3.5" distance="1000" k1="-0.0276" k2="-0.0346" k3="-0.0155"/>
-+            <vignetting model="pa" focal="19.8" aperture="4.5" distance="10" k1="0.0093" k2="-0.1641" k3="0.0957"/>
-+            <vignetting model="pa" focal="19.8" aperture="4.5" distance="1000" k1="0.0093" k2="-0.1641" k3="0.0957"/>
-+            <vignetting model="pa" focal="19.8" aperture="5.6" distance="10" k1="0.0084" k2="-0.1652" k3="0.0975"/>
-+            <vignetting model="pa" focal="19.8" aperture="5.6" distance="1000" k1="0.0084" k2="-0.1652" k3="0.0975"/>
-+            <vignetting model="pa" focal="19.8" aperture="8" distance="10" k1="-0.0077" k2="-0.1306" k3="0.0764"/>
-+            <vignetting model="pa" focal="19.8" aperture="8" distance="1000" k1="-0.0077" k2="-0.1306" k3="0.0764"/>
-+            <vignetting model="pa" focal="24" aperture="2.5" distance="10" k1="-0.1756" k2="0.1217" k3="-0.2849"/>
-+            <vignetting model="pa" focal="24" aperture="2.5" distance="1000" k1="-0.1756" k2="0.1217" k3="-0.2849"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.0445" k2="-0.0020" k3="-0.0543"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.0445" k2="-0.0020" k3="-0.0543"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="0.0011" k2="-0.1738" k3="0.0997"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="0.0011" k2="-0.1738" k3="0.0997"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="0.0083" k2="-0.1907" k3="0.1100"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="0.0083" k2="-0.1907" k3="0.1100"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="0.0049" k2="-0.1887" k3="0.1121"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="0.0049" k2="-0.1887" k3="0.1121"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Stylus 1 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>olympusStylus1</mount>
-+        <cropfactor>4.67</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6" a="-0.00245" b="-0.00755" c="-0.06886"/>
-+            <distortion model="ptlens" focal="7.4" a="0.02154" b="-0.07222" c="0.02781"/>
-+            <distortion model="ptlens" focal="9.8" a="0" b="-0.00026" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0" b="0.00868" c="0"/>
-+            <distortion model="ptlens" focal="17.8" a="0" b="0.01546" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.01915" c="0"/>
-+            <distortion model="ptlens" focal="64.3" a="0" b="0.01865" c="0"/>
-+            <tca model="poly3" focal="6" br="-0.0000115" vr="1.0005629" bb="0.0000971" vb="0.9999294"/>
-+            <tca model="poly3" focal="7.4" br="-0.0000325" vr="1.0005431" bb="0.0000828" vb="0.9999069"/>
-+            <tca model="poly3" focal="9.8" br="-0.0000787" vr="1.0005433" bb="0.0000792" vb="0.9999241"/>
-+            <tca model="poly3" focal="12" br="-0.0001483" vr="1.0004799" bb="0.0000771" vb="0.9999224"/>
-+            <tca model="poly3" focal="14.5" br="-0.0001035" vr="1.0003665" bb="0.0000667" vb="0.9999654"/>
-+            <tca model="poly3" focal="17.8" br="-0.0001415" vr="1.0003736" bb="0.0000348" vb="1.0000034"/>
-+            <tca model="poly3" focal="19.6" br="-0.0000649" vr="1.0002254" bb="0.0000194" vb="1.0000348"/>
-+            <tca model="poly3" focal="35" br="0.0000169" vr="0.9998975" bb="-0.0000098" vb="1.0000255"/>
-+            <tca model="poly3" focal="51.4" br="0.0000277" vr="0.9998371" bb="-0.0000071" vb="1.0000043"/>
-+            <tca model="poly3" focal="64.3" br="0.0000729" vr="0.9996827" bb="0.0000264" vb="0.9998948"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus Stylus TG-4 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>olympusStylusTG4</mount>
-+        <cropfactor>5.56</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus Stylus TG-4 -->
-+            <distortion model="poly3" focal="4.5" k1="-0.04661"/>
-+            <distortion model="poly3" focal="5.1" k1="-0.03028"/>
-+            <distortion model="poly3" focal="6.9" k1="-0.00581"/>
-+            <distortion model="poly3" focal="9" k1="0.00574"/>
-+            <distortion model="poly3" focal="18" k1="0.01525"/>
-+            <tca model="poly3" focal="4.5" br="-0.0000440" vr="1.0004022" bb="0.0000003" vb="1.0000025"/>
-+            <tca model="poly3" focal="5.1" br="0.0000436" vr="1.0002117" bb="-0.0000141" vb="1.0000376"/>
-+            <tca model="poly3" focal="6.9" br="-0.0000276" vr="1.0001322" bb="-0.0000199" vb="1.0000921"/>
-+            <tca model="poly3" focal="9" br="-0.0000200" vr="1.0000631" bb="-0.0000128" vb="1.0000870"/>
-+            <tca model="poly3" focal="18" br="-0.0000067" vr="0.9999876" bb="-0.0000838" vb="1.0000917"/>
-         </calibration>
-     </lens>
--    
- </lensdatabase>
-diff -Nurpd a/data/db/compact-panasonic.xml b/data/db/compact-panasonic.xml
---- a/data/db/compact-panasonic.xml	2013-10-18 21:21:00.000000000 +0200
-+++ b/data/db/compact-panasonic.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,98 +1,4 @@
- <lensdatabase>
--
--    <mount>
--        <name>panasonicFZ10</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicFX7</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicLX1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicLX3</name>
--    </mount>
--
--    <mount>
--        <name>panasonicLX5</name>
--    </mount>
--
--    <mount>
--        <name>panasonicLX7</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicFZ30</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicLZ2</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicFZ5</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicFZ3</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicFZ28</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicFX150</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCGH1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCL10</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCLX2</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCFZ18</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCFZ35</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCFZ50</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>panasonicDMCFZ8</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX1</model>
-@@ -100,39 +6,48 @@
-         <mount>panasonicLX1</mount>
-         <cropfactor>4.45</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-LX1</model>
-+        <variant>3:2</variant>
-+        <mount>panasonicLX1</mount>
-+        <cropfactor>5.08</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-LX1</model>
-+        <variant>4:3</variant>
-+        <mount>panasonicLX1</mount>
-+        <cropfactor>5.40</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX3</model>
-         <variant>4:3</variant>
--        <mount>PanasonicLX3</mount>
-+        <mount>panasonicLX3</mount>
-         <cropfactor>4.7</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX3</model>
-         <variant>16:9</variant>
--        <mount>PanasonicLX3</mount>
-+        <mount>panasonicLX3</mount>
-         <cropfactor>5.7528</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX3</model>
-         <variant>3:2</variant>
--        <mount>PanasonicLX3</mount>
-+        <mount>panasonicLX3</mount>
-         <cropfactor>5.1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX3</model>
-         <variant>1:1</variant>
--        <mount>PanasonicLX3</mount>
--        <cropfactor>4.7</cropfactor>
-+        <mount>panasonicLX3</mount>
-+        <cropfactor>5.32</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX5</model>
-@@ -140,7 +55,6 @@
-         <mount>panasonicLX5</mount>
-         <cropfactor>4.71</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX7</model>
-@@ -148,412 +62,641 @@
-         <mount>panasonicLX7</mount>
-         <cropfactor>5.1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LC1</model>
-         <mount>leicaDigilux2</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LZ2</model>
-         <mount>panasonicLZ2</mount>
-         <cropfactor>6.06</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LZ1</model>
-         <mount>panasonicLZ2</mount>
-         <cropfactor>6.06</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FX9</model>
-         <mount>panasonicFX7</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FX8</model>
-         <mount>panasonicFX7</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FX7</model>
-         <mount>panasonicFX7</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FX2</model>
-         <mount>panasonicFX7</mount>
-         <cropfactor>6.05</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ30</model>
-         <mount>panasonicFZ30</mount>
-         <cropfactor>4.73</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ20</model>
-         <mount>panasonicFZ10</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ10</model>
-         <mount>panasonicFZ10</mount>
-         <cropfactor>5.84</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ5</model>
-         <mount>panasonicFZ5</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ3</model>
-         <mount>panasonicFZ3</mount>
-         <cropfactor>7.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ28</model>
-         <mount>panasonicFZ28</mount>
-         <cropfactor>5.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FX150</model>
-         <mount>panasonicFX150</mount>
-         <cropfactor>4.7</cropfactor>
-     </camera>
--
--    <camera>
--        <maker>Panasonic</maker>
--        <model>DMC-GH1</model>
--        <mount>panasonicDMCGH1</mount>
--        <cropfactor>2.0</cropfactor>
--    </camera>
--
--    <camera>
--        <maker>Panasonic</maker>
--        <model>DMC-L10</model>
--        <mount>panasonicDMCL10</mount>
--        <cropfactor>2.0</cropfactor>
--    </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-LX2</model>
-         <mount>panasonicDMCLX2</mount>
-         <cropfactor>4.44</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ18</model>
-         <mount>panasonicDMCFZ18</mount>
-         <cropfactor>6.1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ35</model>
-         <mount>panasonicDMCFZ35</mount>
-         <cropfactor>5.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ50</model>
-         <mount>panasonicDMCFZ50</mount>
-         <cropfactor>4.84</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-FZ8</model>
-         <mount>panasonicDMCFZ8</mount>
-         <cropfactor>6.02</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-FZ200</model>
-+        <mount>panasonicDMCFZ200</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-LX100</model>
-+        <mount>panasonicDMCLX100</mount>
-+        <cropfactor>2.21</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-FZ1000</model>
-+        <mount>panasonicFZ1000</mount>
-+        <cropfactor>2.73</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-FZ150</model>
-+        <mount>panasonicFZ150</mount>
-+        <cropfactor>5.56</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-LF1</model>
-+        <mount>panasonicLF1</mount>
-+        <cropfactor>4.67</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-TZ71</model>
-+        <mount>panasonicTZ71</mount>
-+        <cropfactor>5.58</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-LX1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicLX1</mount>
-         <cropfactor>4.45</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.3" a="0.007252" b="-0.024439" c="0" />
--            <distortion model="ptlens" focal="6.7" a="0.005478" b="-0.019975" c="0" />
--            <distortion model="ptlens" focal="7.5" a="0.003453" b="-0.012092" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0" b="-0.000134" c="0" />
--            <distortion model="ptlens" focal="10.8" a="0" b="0.001701" c="0" />
--            <distortion model="ptlens" focal="14.4" a="0" b="0.003043" c="0" />
--            <distortion model="ptlens" focal="19.2" a="0" b="0.00316" c="0" />
--            <distortion model="ptlens" focal="23.2" a="0" b="0.003386" c="0" />
--            <distortion model="ptlens" focal="25.2" a="0" b="0.003557" c="0" />
-+            <distortion model="ptlens" focal="6.3" a="0.007252" b="-0.024439" c="0"/>
-+            <distortion model="ptlens" focal="6.7" a="0.005478" b="-0.019975" c="0"/>
-+            <distortion model="ptlens" focal="7.5" a="0.003453" b="-0.012092" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0" b="-0.000134" c="0"/>
-+            <distortion model="ptlens" focal="10.8" a="0" b="0.001701" c="0"/>
-+            <distortion model="ptlens" focal="14.4" a="0" b="0.003043" c="0"/>
-+            <distortion model="ptlens" focal="19.2" a="0" b="0.00316" c="0"/>
-+            <distortion model="ptlens" focal="23.2" a="0" b="0.003386" c="0"/>
-+            <distortion model="ptlens" focal="25.2" a="0" b="0.003557" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>LX3</model>
-+        <model>DMC-LX3 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicLX3</mount>
--        <focal min="5.1" max="12.8" />
--        <aperture min="2.0" max="8.0" />
-+        <focal min="5.1" max="12.8"/>
-+        <aperture min="2" max="8"/>
-         <cropfactor>4.7</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.1" a="-0.003959" b="0.004736" c="-0.081302" />
--            <distortion model="ptlens" focal="5.4" a="-0.005553" b="0.009049" c="-0.077906" />
--            <distortion model="ptlens" focal="5.9" a="0.011732" b="-0.066315" c="0.029221" />
--            <distortion model="ptlens" focal="6.3" a="-0.008619" b="0.017573" c="-0.069065" />
--            <distortion model="ptlens" focal="6.8" a="-0.012256" b="0.036251" c="-0.088407" />
--            <distortion model="ptlens" focal="7.4" a="0.009106" b="-0.048429" c="0.022523" />
--            <distortion model="ptlens" focal="7.9" a="0.000603" b="-0.027831" c="0.020523" />
--            <distortion model="ptlens" focal="8.8" a="-0.018814" b="0.059370" c="-0.092180" />
--            <distortion model="ptlens" focal="9.3" a="-0.001016" b="-0.010300" c="-0.001994" />
--            <distortion model="ptlens" focal="10.2" a="-0.017673" b="0.055682" c="-0.082869" />
--            <distortion model="ptlens" focal="11.1" a="-0.011262" b="0.038785" c="-0.068040" />
--            <distortion model="ptlens" focal="12.1" a="-0.011262" b="0.038785" c="-0.068040" />
--            <distortion model="ptlens" focal="12.8" a="-0.011262" b="0.038785" c="-0.068040" />
-+            <distortion model="ptlens" focal="5.1" a="-0.003959" b="0.004736" c="-0.081302"/>
-+            <distortion model="ptlens" focal="5.4" a="-0.005553" b="0.009049" c="-0.077906"/>
-+            <distortion model="ptlens" focal="5.9" a="0.011732" b="-0.066315" c="0.029221"/>
-+            <distortion model="ptlens" focal="6.3" a="-0.008619" b="0.017573" c="-0.069065"/>
-+            <distortion model="ptlens" focal="6.8" a="-0.012256" b="0.036251" c="-0.088407"/>
-+            <distortion model="ptlens" focal="7.4" a="0.009106" b="-0.048429" c="0.022523"/>
-+            <distortion model="ptlens" focal="7.9" a="0.000603" b="-0.027831" c="0.020523"/>
-+            <distortion model="ptlens" focal="8.8" a="-0.018814" b="0.059370" c="-0.092180"/>
-+            <distortion model="ptlens" focal="9.3" a="-0.001016" b="-0.010300" c="-0.001994"/>
-+            <distortion model="ptlens" focal="10.2" a="-0.017673" b="0.055682" c="-0.082869"/>
-+            <distortion model="ptlens" focal="11.1" a="-0.011262" b="0.038785" c="-0.068040"/>
-+            <distortion model="ptlens" focal="12.1" a="-0.011262" b="0.038785" c="-0.068040"/>
-+            <distortion model="ptlens" focal="12.8" a="-0.011262" b="0.038785" c="-0.068040"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
--        <focal min="5.1" max="19.2" />
--        <aperture min="2.0" max="8.0" />
-+        <model>DMC-LX5 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicLX5</mount>
-+        <focal min="5.1" max="19.2"/>
-+        <aperture min="2" max="8"/>
-         <cropfactor>4.71</cropfactor>
--	    <calibration>
--		    <distortion focal="5.1" model="ptlens" a="0.03955" b="-0.16355" c="0.11864" />
--		    <field_of_view focal="5.1" fov="71.5277" />
--		    <distortion focal="6" model="ptlens" a="0.02451" b="-0.08952" c="0.03353" />
--		    <field_of_view focal="6" fov="63.388" />
--		    <distortion focal="7.5" model="ptlens" a="0.00853" b="-0.03409" c="0.00531" />
--		    <field_of_view focal="7.5" fov="52.5764" />
--		    <distortion focal="10.7" model="ptlens" a="0.00594" b="-0.02024" c="0.0042" />
--		    <field_of_view focal="10.7" fov="38.1962" />
--		    <distortion focal="14.9" model="ptlens" a="0.00141" b="-0.00799" c="0.00152" />
--		    <field_of_view focal="14.9" fov="27.7549" />
--		    <distortion focal="19.2" model="ptlens" a="0.00095" b="-0.00297" c="-0.00298" />
--		    <field_of_view focal="19.2" fov="21.7521" />
--	    </calibration>
--	</lens>    
--
-+        <calibration>
-+            <distortion focal="5.1" model="ptlens" a="0.03955" b="-0.16355" c="0.11864"/>
-+            <distortion focal="6" model="ptlens" a="0.02451" b="-0.08952" c="0.03353"/>
-+            <distortion focal="7.5" model="ptlens" a="0.00853" b="-0.03409" c="0.00531"/>
-+            <distortion focal="10.7" model="ptlens" a="0.00594" b="-0.02024" c="0.0042"/>
-+            <distortion focal="14.9" model="ptlens" a="0.00141" b="-0.00799" c="0.00152"/>
-+            <distortion focal="19.2" model="ptlens" a="0.00095" b="-0.00297" c="-0.00298"/>
-+        </calibration>
-+    </lens>
-     <lens>
-         <maker>Leica</maker>
--        <model>DMC-LX7</model>
-+        <model>DMC-LX7 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicLX7</mount>
-         <cropfactor>5.1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="4.7" a="0.02076" b="-0.11853" c="0.05898" />
--            <distortion model="ptlens" focal="5.5" a="0.01453" b="-0.07905" c="0.02713" />
--            <distortion model="ptlens" focal="6.9" a="0.00063" b="-0.03486" c="0.03442" />
--            <distortion model="ptlens" focal="9.8" a="-0.00577" b="0.00314" c="0.01006" />
--            <distortion model="ptlens" focal="13.7" a="-0.00367" b="0.00263" c="0.01366" />
--            <distortion model="ptlens" focal="17.7" a="-0.00223" b="-0.00193" c="0.02159" />
--            <vignetting model="pa" focal="4.7" aperture="1.4" distance="10" k1="-0.1410" k2="0.4158" k3="-0.7446" />
--            <vignetting model="pa" focal="4.7" aperture="1.4" distance="1000" k1="-0.1410" k2="0.4158" k3="-0.7446" />
--            <vignetting model="pa" focal="4.7" aperture="4.5" distance="10" k1="-0.8436" k2="2.3162" k3="-2.0640" />
--            <vignetting model="pa" focal="4.7" aperture="4.5" distance="1000" k1="-0.8436" k2="2.3162" k3="-2.0640" />
--            <vignetting model="pa" focal="4.7" aperture="5.6" distance="10" k1="-0.8410" k2="2.4559" k3="-2.2453" />
--            <vignetting model="pa" focal="4.7" aperture="5.6" distance="1000" k1="-0.8410" k2="2.4559" k3="-2.2453" />
--            <vignetting model="pa" focal="4.7" aperture="7.1" distance="10" k1="-0.9368" k2="2.7497" k3="-2.5655" />
--            <vignetting model="pa" focal="4.7" aperture="7.1" distance="1000" k1="-0.9368" k2="2.7497" k3="-2.5655" />
--            <vignetting model="pa" focal="4.7" aperture="8" distance="10" k1="-1.0606" k2="2.8873" k3="-2.5985" />
--            <vignetting model="pa" focal="4.7" aperture="8" distance="1000" k1="-1.0606" k2="2.8873" k3="-2.5985" />
--            <vignetting model="pa" focal="6.9" aperture="1.6" distance="10" k1="-0.2169" k2="0.2225" k3="-0.0954" />
--            <vignetting model="pa" focal="6.9" aperture="1.6" distance="1000" k1="-0.2169" k2="0.2225" k3="-0.0954" />
--            <vignetting model="pa" focal="6.9" aperture="4.5" distance="10" k1="-0.3427" k2="0.4273" k3="-0.1984" />
--            <vignetting model="pa" focal="6.9" aperture="4.5" distance="1000" k1="-0.3427" k2="0.4273" k3="-0.1984" />
--            <vignetting model="pa" focal="6.9" aperture="5.6" distance="10" k1="-0.3136" k2="0.4624" k3="-0.2384" />
--            <vignetting model="pa" focal="6.9" aperture="5.6" distance="1000" k1="-0.3136" k2="0.4624" k3="-0.2384" />
--            <vignetting model="pa" focal="6.9" aperture="7.1" distance="10" k1="-0.3141" k2="0.4232" k3="-0.2166" />
--            <vignetting model="pa" focal="6.9" aperture="7.1" distance="1000" k1="-0.3141" k2="0.4232" k3="-0.2166" />
--            <vignetting model="pa" focal="6.9" aperture="8" distance="10" k1="-0.2774" k2="0.3500" k3="-0.1858" />
--            <vignetting model="pa" focal="6.9" aperture="8" distance="1000" k1="-0.2774" k2="0.3500" k3="-0.1858" />
--            <vignetting model="pa" focal="9.8" aperture="1.9" distance="10" k1="-0.1005" k2="0.1044" k3="-0.0444" />
--            <vignetting model="pa" focal="9.8" aperture="1.9" distance="1000" k1="-0.1005" k2="0.1044" k3="-0.0444" />
--            <vignetting model="pa" focal="9.8" aperture="4.5" distance="10" k1="-0.2848" k2="0.3649" k3="-0.1798" />
--            <vignetting model="pa" focal="9.8" aperture="4.5" distance="1000" k1="-0.2848" k2="0.3649" k3="-0.1798" />
--            <vignetting model="pa" focal="9.8" aperture="5.6" distance="10" k1="-0.2975" k2="0.4452" k3="-0.2304" />
--            <vignetting model="pa" focal="9.8" aperture="5.6" distance="1000" k1="-0.2975" k2="0.4452" k3="-0.2304" />
--            <vignetting model="pa" focal="9.8" aperture="7.1" distance="10" k1="-0.2567" k2="0.3476" k3="-0.1659" />
--            <vignetting model="pa" focal="9.8" aperture="7.1" distance="1000" k1="-0.2567" k2="0.3476" k3="-0.1659" />
--            <vignetting model="pa" focal="9.8" aperture="8" distance="10" k1="-0.2853" k2="0.3640" k3="-0.1642" />
--            <vignetting model="pa" focal="9.8" aperture="8" distance="1000" k1="-0.2853" k2="0.3640" k3="-0.1642" />
--            <vignetting model="pa" focal="13.7" aperture="2.1" distance="10" k1="-0.1202" k2="0.1498" k3="-0.0520" />
--            <vignetting model="pa" focal="13.7" aperture="2.1" distance="1000" k1="-0.1202" k2="0.1498" k3="-0.0520" />
--            <vignetting model="pa" focal="13.7" aperture="4.5" distance="10" k1="-0.2728" k2="0.4519" k3="-0.2301" />
--            <vignetting model="pa" focal="13.7" aperture="4.5" distance="1000" k1="-0.2728" k2="0.4519" k3="-0.2301" />
--            <vignetting model="pa" focal="13.7" aperture="5.6" distance="10" k1="-0.2041" k2="0.3199" k3="-0.1610" />
--            <vignetting model="pa" focal="13.7" aperture="5.6" distance="1000" k1="-0.2041" k2="0.3199" k3="-0.1610" />
--            <vignetting model="pa" focal="13.7" aperture="7.1" distance="10" k1="-0.2050" k2="0.3161" k3="-0.1558" />
--            <vignetting model="pa" focal="13.7" aperture="7.1" distance="1000" k1="-0.2050" k2="0.3161" k3="-0.1558" />
--            <vignetting model="pa" focal="13.7" aperture="8" distance="10" k1="-0.2083" k2="0.3043" k3="-0.1399" />
--            <vignetting model="pa" focal="13.7" aperture="8" distance="1000" k1="-0.2083" k2="0.3043" k3="-0.1399" />
--            <vignetting model="pa" focal="17.7" aperture="2.3" distance="10" k1="-0.1186" k2="0.2006" k3="-0.1067" />
--            <vignetting model="pa" focal="17.7" aperture="2.3" distance="1000" k1="-0.1186" k2="0.2006" k3="-0.1067" />
--            <vignetting model="pa" focal="17.7" aperture="4.5" distance="10" k1="-0.2314" k2="0.3522" k3="-0.1631" />
--            <vignetting model="pa" focal="17.7" aperture="4.5" distance="1000" k1="-0.2314" k2="0.3522" k3="-0.1631" />
--            <vignetting model="pa" focal="17.7" aperture="5.6" distance="10" k1="-0.2475" k2="0.3952" k3="-0.1927" />
--            <vignetting model="pa" focal="17.7" aperture="5.6" distance="1000" k1="-0.2475" k2="0.3952" k3="-0.1927" />
--            <vignetting model="pa" focal="17.7" aperture="7.1" distance="10" k1="-0.2621" k2="0.4297" k3="-0.2188" />
--            <vignetting model="pa" focal="17.7" aperture="7.1" distance="1000" k1="-0.2621" k2="0.4297" k3="-0.2188" />
--            <vignetting model="pa" focal="17.7" aperture="8" distance="10" k1="-0.2610" k2="0.4822" k3="-0.2689" />
--            <vignetting model="pa" focal="17.7" aperture="8" distance="1000" k1="-0.2610" k2="0.4822" k3="-0.2689" />
-+            <distortion model="ptlens" focal="4.7" a="0.02076" b="-0.11853" c="0.05898"/>
-+            <distortion model="ptlens" focal="5.5" a="0.01453" b="-0.07905" c="0.02713"/>
-+            <distortion model="ptlens" focal="6.9" a="0.00063" b="-0.03486" c="0.03442"/>
-+            <distortion model="ptlens" focal="9.8" a="-0.00577" b="0.00314" c="0.01006"/>
-+            <distortion model="ptlens" focal="13.7" a="-0.00367" b="0.00263" c="0.01366"/>
-+            <distortion model="ptlens" focal="17.7" a="-0.00223" b="-0.00193" c="0.02159"/>
-+            <vignetting model="pa" focal="4.7" aperture="1.4" distance="10" k1="-0.1410" k2="0.4158" k3="-0.7446"/>
-+            <vignetting model="pa" focal="4.7" aperture="1.4" distance="1000" k1="-0.1410" k2="0.4158" k3="-0.7446"/>
-+            <vignetting model="pa" focal="4.7" aperture="4.5" distance="10" k1="-0.8436" k2="2.3162" k3="-2.0640"/>
-+            <vignetting model="pa" focal="4.7" aperture="4.5" distance="1000" k1="-0.8436" k2="2.3162" k3="-2.0640"/>
-+            <vignetting model="pa" focal="4.7" aperture="5.6" distance="10" k1="-0.8410" k2="2.4559" k3="-2.2453"/>
-+            <vignetting model="pa" focal="4.7" aperture="5.6" distance="1000" k1="-0.8410" k2="2.4559" k3="-2.2453"/>
-+            <vignetting model="pa" focal="4.7" aperture="7.1" distance="10" k1="-0.9368" k2="2.7497" k3="-2.5655"/>
-+            <vignetting model="pa" focal="4.7" aperture="7.1" distance="1000" k1="-0.9368" k2="2.7497" k3="-2.5655"/>
-+            <vignetting model="pa" focal="4.7" aperture="8" distance="10" k1="-1.0606" k2="2.8873" k3="-2.5985"/>
-+            <vignetting model="pa" focal="4.7" aperture="8" distance="1000" k1="-1.0606" k2="2.8873" k3="-2.5985"/>
-+            <vignetting model="pa" focal="6.9" aperture="1.6" distance="10" k1="-0.2169" k2="0.2225" k3="-0.0954"/>
-+            <vignetting model="pa" focal="6.9" aperture="1.6" distance="1000" k1="-0.2169" k2="0.2225" k3="-0.0954"/>
-+            <vignetting model="pa" focal="6.9" aperture="4.5" distance="10" k1="-0.3427" k2="0.4273" k3="-0.1984"/>
-+            <vignetting model="pa" focal="6.9" aperture="4.5" distance="1000" k1="-0.3427" k2="0.4273" k3="-0.1984"/>
-+            <vignetting model="pa" focal="6.9" aperture="5.6" distance="10" k1="-0.3136" k2="0.4624" k3="-0.2384"/>
-+            <vignetting model="pa" focal="6.9" aperture="5.6" distance="1000" k1="-0.3136" k2="0.4624" k3="-0.2384"/>
-+            <vignetting model="pa" focal="6.9" aperture="7.1" distance="10" k1="-0.3141" k2="0.4232" k3="-0.2166"/>
-+            <vignetting model="pa" focal="6.9" aperture="7.1" distance="1000" k1="-0.3141" k2="0.4232" k3="-0.2166"/>
-+            <vignetting model="pa" focal="6.9" aperture="8" distance="10" k1="-0.2774" k2="0.3500" k3="-0.1858"/>
-+            <vignetting model="pa" focal="6.9" aperture="8" distance="1000" k1="-0.2774" k2="0.3500" k3="-0.1858"/>
-+            <vignetting model="pa" focal="9.8" aperture="1.9" distance="10" k1="-0.1005" k2="0.1044" k3="-0.0444"/>
-+            <vignetting model="pa" focal="9.8" aperture="1.9" distance="1000" k1="-0.1005" k2="0.1044" k3="-0.0444"/>
-+            <vignetting model="pa" focal="9.8" aperture="4.5" distance="10" k1="-0.2848" k2="0.3649" k3="-0.1798"/>
-+            <vignetting model="pa" focal="9.8" aperture="4.5" distance="1000" k1="-0.2848" k2="0.3649" k3="-0.1798"/>
-+            <vignetting model="pa" focal="9.8" aperture="5.6" distance="10" k1="-0.2975" k2="0.4452" k3="-0.2304"/>
-+            <vignetting model="pa" focal="9.8" aperture="5.6" distance="1000" k1="-0.2975" k2="0.4452" k3="-0.2304"/>
-+            <vignetting model="pa" focal="9.8" aperture="7.1" distance="10" k1="-0.2567" k2="0.3476" k3="-0.1659"/>
-+            <vignetting model="pa" focal="9.8" aperture="7.1" distance="1000" k1="-0.2567" k2="0.3476" k3="-0.1659"/>
-+            <vignetting model="pa" focal="9.8" aperture="8" distance="10" k1="-0.2853" k2="0.3640" k3="-0.1642"/>
-+            <vignetting model="pa" focal="9.8" aperture="8" distance="1000" k1="-0.2853" k2="0.3640" k3="-0.1642"/>
-+            <vignetting model="pa" focal="13.7" aperture="2.1" distance="10" k1="-0.1202" k2="0.1498" k3="-0.0520"/>
-+            <vignetting model="pa" focal="13.7" aperture="2.1" distance="1000" k1="-0.1202" k2="0.1498" k3="-0.0520"/>
-+            <vignetting model="pa" focal="13.7" aperture="4.5" distance="10" k1="-0.2728" k2="0.4519" k3="-0.2301"/>
-+            <vignetting model="pa" focal="13.7" aperture="4.5" distance="1000" k1="-0.2728" k2="0.4519" k3="-0.2301"/>
-+            <vignetting model="pa" focal="13.7" aperture="5.6" distance="10" k1="-0.2041" k2="0.3199" k3="-0.1610"/>
-+            <vignetting model="pa" focal="13.7" aperture="5.6" distance="1000" k1="-0.2041" k2="0.3199" k3="-0.1610"/>
-+            <vignetting model="pa" focal="13.7" aperture="7.1" distance="10" k1="-0.2050" k2="0.3161" k3="-0.1558"/>
-+            <vignetting model="pa" focal="13.7" aperture="7.1" distance="1000" k1="-0.2050" k2="0.3161" k3="-0.1558"/>
-+            <vignetting model="pa" focal="13.7" aperture="8" distance="10" k1="-0.2083" k2="0.3043" k3="-0.1399"/>
-+            <vignetting model="pa" focal="13.7" aperture="8" distance="1000" k1="-0.2083" k2="0.3043" k3="-0.1399"/>
-+            <vignetting model="pa" focal="17.7" aperture="2.3" distance="10" k1="-0.1186" k2="0.2006" k3="-0.1067"/>
-+            <vignetting model="pa" focal="17.7" aperture="2.3" distance="1000" k1="-0.1186" k2="0.2006" k3="-0.1067"/>
-+            <vignetting model="pa" focal="17.7" aperture="4.5" distance="10" k1="-0.2314" k2="0.3522" k3="-0.1631"/>
-+            <vignetting model="pa" focal="17.7" aperture="4.5" distance="1000" k1="-0.2314" k2="0.3522" k3="-0.1631"/>
-+            <vignetting model="pa" focal="17.7" aperture="5.6" distance="10" k1="-0.2475" k2="0.3952" k3="-0.1927"/>
-+            <vignetting model="pa" focal="17.7" aperture="5.6" distance="1000" k1="-0.2475" k2="0.3952" k3="-0.1927"/>
-+            <vignetting model="pa" focal="17.7" aperture="7.1" distance="10" k1="-0.2621" k2="0.4297" k3="-0.2188"/>
-+            <vignetting model="pa" focal="17.7" aperture="7.1" distance="1000" k1="-0.2621" k2="0.4297" k3="-0.2188"/>
-+            <vignetting model="pa" focal="17.7" aperture="8" distance="10" k1="-0.2610" k2="0.4822" k3="-0.2689"/>
-+            <vignetting model="pa" focal="17.7" aperture="8" distance="1000" k1="-0.2610" k2="0.4822" k3="-0.2689"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-LZ2 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicLZ2</mount>
-         <cropfactor>6.06</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.1" a="0.018339" b="-0.048901" c="0" />
--            <distortion model="ptlens" focal="7" a="0.011425" b="-0.029522" c="0" />
--            <distortion model="ptlens" focal="7.9" a="0.010736" b="-0.024495" c="0" />
--            <distortion model="ptlens" focal="8.9" a="0.007669" b="-0.016263" c="0" />
--            <distortion model="ptlens" focal="11.4" a="0" b="0.00068" c="0" />
--            <distortion model="ptlens" focal="16.1" a="0" b="0.00105" c="0" />
--            <distortion model="ptlens" focal="22.7" a="0" b="0.001032" c="0" />
--            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="36.6" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="6.1" a="0.018339" b="-0.048901" c="0"/>
-+            <distortion model="ptlens" focal="7" a="0.011425" b="-0.029522" c="0"/>
-+            <distortion model="ptlens" focal="7.9" a="0.010736" b="-0.024495" c="0"/>
-+            <distortion model="ptlens" focal="8.9" a="0.007669" b="-0.016263" c="0"/>
-+            <distortion model="ptlens" focal="11.4" a="0" b="0.00068" c="0"/>
-+            <distortion model="ptlens" focal="16.1" a="0" b="0.00105" c="0"/>
-+            <distortion model="ptlens" focal="22.7" a="0" b="0.001032" c="0"/>
-+            <distortion model="ptlens" focal="27.6" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="36.6" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-FX7 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicFX7</mount>
-         <cropfactor>6.05</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.004918" b="-0.016726" c="0" />
--            <distortion model="ptlens" focal="8.5" a="0.003428" b="-0.010885" c="0" />
--            <distortion model="ptlens" focal="10.1" a="0" b="-0.001831" c="0" />
--            <distortion model="ptlens" focal="12.3" a="0" b="0.000183" c="0" />
--            <distortion model="ptlens" focal="14" a="0" b="0.000416" c="0" />
--            <distortion model="ptlens" focal="16.1" a="0" b="0.001765" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0" b="0.001235" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.004918" b="-0.016726" c="0"/>
-+            <distortion model="ptlens" focal="8.5" a="0.003428" b="-0.010885" c="0"/>
-+            <distortion model="ptlens" focal="10.1" a="0" b="-0.001831" c="0"/>
-+            <distortion model="ptlens" focal="12.3" a="0" b="0.000183" c="0"/>
-+            <distortion model="ptlens" focal="14" a="0" b="0.000416" c="0"/>
-+            <distortion model="ptlens" focal="16.1" a="0" b="0.001765" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="0.001235" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-FZ28 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicFZ28</mount>
--	    <focal min="4.8" max="86.4"/> 
--	    <aperture min="2.8" max="4.4"/> 
-+        <focal min="4.8" max="86.4"/>
-+        <aperture min="2.8" max="8"/>
-         <cropfactor>5.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="4.8" a="0.0151051047088923" b="-0.0590418104126213"  c="0.0522404604411257" />
--            <distortion model="ptlens" focal="5.5" a="0.0097263708023807" b="-0.0404126502555069" c="0.0356794326344223" />
--            <distortion model="ptlens" focal="6.1" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123" />
--            <distortion model="ptlens" focal="6.9" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123" />
--            <distortion model="ptlens" focal="8.2" a="0.00252217796060456" b="0.00406258888297525" c="-0.00902488977450724" />
--            <distortion model="ptlens" focal="8.2" a="0.0136046055037993" b="-0.0241186263472487" c="0.0125418235034799" />
--            <distortion model="ptlens" focal="9.0" a="0.0137599637728544" b="-0.0250948730402496" c="0.0160544859044301" />
--            <distortion model="ptlens" focal="11.9" a="0.000337392416435729" b="0.0100459086335183" c="-0.00994856944375364" />
--            <distortion model="ptlens" focal="14.4" a="0.000732769598129668" b="0.00515254826530127" c="-0.00686539554143091" />
--            <distortion model="ptlens" focal="14.9" a="0.00584048075864842" b="-0.0108398840906803" c="0.0100244102797433" />
--            <distortion model="ptlens" focal="20.8" a="0.00028294704124076" b="0.000670293694980388" c="-0.0011265790621693" />
--            <distortion model="ptlens" focal="25.2" a="-0.00259970212897242" b="0.00799923834974951" c="-0.0091582160365622" />
--       </calibration>
--   </lens>
--
-+            <distortion model="ptlens" focal="4.8" a="0.0151051047088923" b="-0.0590418104126213" c="0.0522404604411257"/>
-+            <distortion model="ptlens" focal="5.5" a="0.0097263708023807" b="-0.0404126502555069" c="0.0356794326344223"/>
-+            <distortion model="ptlens" focal="6.1" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123"/>
-+            <distortion model="ptlens" focal="6.9" a="0.00545155030636666" b="-0.0210447640238848" c="0.0157982485686123"/>
-+            <distortion model="ptlens" focal="8.2" a="0.00252217796060456" b="0.00406258888297525" c="-0.00902488977450724"/>
-+            <distortion model="ptlens" focal="8.2" a="0.0136046055037993" b="-0.0241186263472487" c="0.0125418235034799"/>
-+            <distortion model="ptlens" focal="9.0" a="0.0137599637728544" b="-0.0250948730402496" c="0.0160544859044301"/>
-+            <distortion model="ptlens" focal="11.9" a="0.000337392416435729" b="0.0100459086335183" c="-0.00994856944375364"/>
-+            <distortion model="ptlens" focal="14.4" a="0.000732769598129668" b="0.00515254826530127" c="-0.00686539554143091"/>
-+            <distortion model="ptlens" focal="14.9" a="0.00584048075864842" b="-0.0108398840906803" c="0.0100244102797433"/>
-+            <distortion model="ptlens" focal="20.8" a="0.00028294704124076" b="0.000670293694980388" c="-0.0011265790621693"/>
-+            <distortion model="ptlens" focal="25.2" a="-0.00259970212897242" b="0.00799923834974951" c="-0.0091582160365622"/>
-+        </calibration>
-+    </lens>
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-FZ30 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicFZ30</mount>
-         <cropfactor>4.73</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.4" a="0.014174" b="-0.039301" c="0" />
--            <distortion model="ptlens" focal="8.9" a="0.011806" b="-0.025518" c="0" />
--            <distortion model="ptlens" focal="10.9" a="0.005042" b="-0.008641" c="0" />
--            <distortion model="ptlens" focal="15.1" a="0" b="0.002124" c="0" />
--            <distortion model="ptlens" focal="21.7" a="0" b="0.001727" c="0" />
--            <distortion model="ptlens" focal="31.8" a="0" b="-0.00058" c="0" />
--            <distortion model="ptlens" focal="50.7" a="0" b="-0.002237" c="0" />
--            <distortion model="ptlens" focal="63.9" a="0" b="-0.001695" c="0" />
--            <distortion model="ptlens" focal="77.7" a="0" b="-0.001747" c="0" />
--            <distortion model="ptlens" focal="88.8" a="0" b="-0.001182" c="0" />
-+            <distortion model="ptlens" focal="7.4" a="0.014174" b="-0.039301" c="0"/>
-+            <distortion model="ptlens" focal="8.9" a="0.011806" b="-0.025518" c="0"/>
-+            <distortion model="ptlens" focal="10.9" a="0.005042" b="-0.008641" c="0"/>
-+            <distortion model="ptlens" focal="15.1" a="0" b="0.002124" c="0"/>
-+            <distortion model="ptlens" focal="21.7" a="0" b="0.001727" c="0"/>
-+            <distortion model="ptlens" focal="31.8" a="0" b="-0.00058" c="0"/>
-+            <distortion model="ptlens" focal="50.7" a="0" b="-0.002237" c="0"/>
-+            <distortion model="ptlens" focal="63.9" a="0" b="-0.001695" c="0"/>
-+            <distortion model="ptlens" focal="77.7" a="0" b="-0.001747" c="0"/>
-+            <distortion model="ptlens" focal="88.8" a="0" b="-0.001182" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-FZ10 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicFZ10</mount>
-         <cropfactor>5.84</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.015495" b="-0.046197" c="0" />
--            <distortion model="ptlens" focal="7" a="0.014175" b="-0.026853" c="0" />
--            <distortion model="ptlens" focal="12" a="0.00511" b="0.000522" c="0" />
--            <distortion model="ptlens" focal="21.1" a="0" b="0.003946" c="0" />
--            <distortion model="ptlens" focal="37.6" a="0" b="0.000939" c="0" />
--            <distortion model="ptlens" focal="47.1" a="0" b="0.00102" c="0" />
--            <distortion model="ptlens" focal="56.1" a="0" b="0.00117" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.001308" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.015495" b="-0.046197" c="0"/>
-+            <distortion model="ptlens" focal="7" a="0.014175" b="-0.026853" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0.00511" b="0.000522" c="0"/>
-+            <distortion model="ptlens" focal="21.1" a="0" b="0.003946" c="0"/>
-+            <distortion model="ptlens" focal="37.6" a="0" b="0.000939" c="0"/>
-+            <distortion model="ptlens" focal="47.1" a="0" b="0.00102" c="0"/>
-+            <distortion model="ptlens" focal="56.1" a="0" b="0.00117" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0.001308" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-FZ5 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicFZ5</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.007805" b="-0.026346" c="0" />
--            <distortion model="ptlens" focal="7.7" a="0.008566" b="-0.017707" c="0" />
--            <distortion model="ptlens" focal="9.5" a="0" b="0.003184" c="0" />
--            <distortion model="ptlens" focal="13.4" a="0.000617" b="0.002603" c="0" />
--            <distortion model="ptlens" focal="26.8" a="0" b="0.001" c="0" />
--            <distortion model="ptlens" focal="51.8" a="0" b="0.001249" c="0" />
--            <distortion model="ptlens" focal="63.3" a="0" b="0.003277" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.004148" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.007805" b="-0.026346" c="0"/>
-+            <distortion model="ptlens" focal="7.7" a="0.008566" b="-0.017707" c="0"/>
-+            <distortion model="ptlens" focal="9.5" a="0" b="0.003184" c="0"/>
-+            <distortion model="ptlens" focal="13.4" a="0.000617" b="0.002603" c="0"/>
-+            <distortion model="ptlens" focal="26.8" a="0" b="0.001" c="0"/>
-+            <distortion model="ptlens" focal="51.8" a="0" b="0.001249" c="0"/>
-+            <distortion model="ptlens" focal="63.3" a="0" b="0.003277" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0.004148" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
--        <model>Standard</model>
-+        <model>DMC-FZ3 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>panasonicFZ3</mount>
-         <cropfactor>7.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="4.6" a="0.016092" b="-0.047846" c="0" />
--            <distortion model="ptlens" focal="5" a="0.01307" b="-0.031845" c="0" />
--            <distortion model="ptlens" focal="5.7" a="0.011157" b="-0.020427" c="0" />
--            <distortion model="ptlens" focal="6.2" a="0.010717" b="-0.017183" c="0" />
--            <distortion model="ptlens" focal="10.1" a="0" b="0.006851" c="0" />
--            <distortion model="ptlens" focal="16" a="0" b="0.002924" c="0" />
--            <distortion model="ptlens" focal="22.9" a="0" b="0.001299" c="0" />
--            <distortion model="ptlens" focal="30.5" a="0" b="0.001482" c="0" />
--            <distortion model="ptlens" focal="37.8" a="0" b="0.000853" c="0" />
--            <distortion model="ptlens" focal="50.9" a="0" b="0.003134" c="0" />
--            <distortion model="ptlens" focal="55.2" a="0" b="0.002567" c="0" />
-+            <distortion model="ptlens" focal="4.6" a="0.016092" b="-0.047846" c="0"/>
-+            <distortion model="ptlens" focal="5" a="0.01307" b="-0.031845" c="0"/>
-+            <distortion model="ptlens" focal="5.7" a="0.011157" b="-0.020427" c="0"/>
-+            <distortion model="ptlens" focal="6.2" a="0.010717" b="-0.017183" c="0"/>
-+            <distortion model="ptlens" focal="10.1" a="0" b="0.006851" c="0"/>
-+            <distortion model="ptlens" focal="16" a="0" b="0.002924" c="0"/>
-+            <distortion model="ptlens" focal="22.9" a="0" b="0.001299" c="0"/>
-+            <distortion model="ptlens" focal="30.5" a="0" b="0.001482" c="0"/>
-+            <distortion model="ptlens" focal="37.8" a="0" b="0.000853" c="0"/>
-+            <distortion model="ptlens" focal="50.9" a="0" b="0.003134" c="0"/>
-+            <distortion model="ptlens" focal="55.2" a="0" b="0.002567" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>DMC-FZ200 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>panasonicDMCFZ200</mount>
-+        <cropfactor>5.56</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.5" a="0.02263" b="-0.08126" c="-0.02068"/>
-+            <distortion model="ptlens" focal="6.4" a="0.02901" b="-0.09166" c="0.02698"/>
-+            <distortion model="ptlens" focal="6.6" a="0.03178" b="-0.10015" c="0.03574"/>
-+            <distortion model="ptlens" focal="9.1" a="0.01355" b="-0.0436" c="0.00536"/>
-+            <distortion model="ptlens" focal="11.4" a="0" b="-0.01092" c="0"/>
-+            <distortion model="ptlens" focal="18.7" a="0.01289" b="-0.04634" c="0.02406"/>
-+            <distortion model="ptlens" focal="21.8" a="0" b="-0.00838" c="0"/>
-+            <distortion model="ptlens" focal="33" a="0" b="-0.00853" c="0"/>
-+            <distortion model="ptlens" focal="39.1" a="0" b="-0.00806" c="0"/>
-+            <distortion model="ptlens" focal="53.4" a="0" b="-0.00832" c="0"/>
-+            <distortion model="ptlens" focal="74.3" a="0" b="-0.00968" c="0"/>
-+            <distortion model="ptlens" focal="108" a="0" b="-0.00966" c="0"/>
-+            <tca model="poly3" focal="4.5" br="-0.0000282" vr="1.0003174" bb="-0.0001782" vb="1.0004494"/>
-+            <tca model="poly3" focal="6.4" br="0.0000071" vr="1.0004512" bb="-0.0001618" vb="1.0005839"/>
-+            <tca model="poly3" focal="6.6" br="0.0000598" vr="1.0002704" bb="-0.0000028" vb="1.0003658"/>
-+            <tca model="poly3" focal="9.1" br="0.0000331" vr="1.0003041" bb="-0.0001697" vb="1.0005103"/>
-+            <tca model="poly3" focal="11.4" br="0.0000330" vr="1.0003122" bb="-0.0001264" vb="1.0006757"/>
-+            <tca model="poly3" focal="18.7" br="-0.0000000" vr="1.0001963" bb="-0.0000756" vb="1.0005116"/>
-+            <tca model="poly3" focal="21.8" br="0.0000299" vr="1.0001076" bb="-0.0001118" vb="1.0003995"/>
-+            <tca model="poly3" focal="33" br="-0.0000004" vr="1.0000426" bb="-0.0000728" vb="1.0001783"/>
-+            <tca model="poly3" focal="39.1" br="0.0000028" vr="0.9999825" bb="-0.0000814" vb="1.0001422"/>
-+            <tca model="poly3" focal="53.4" br="0.0000565" vr="0.9998327" bb="-0.0000872" vb="1.0000933"/>
-+            <tca model="poly3" focal="74.3" br="0.0000610" vr="0.9997108" bb="-0.0000895" vb="0.9999250"/>
-+            <tca model="poly3" focal="108" br="0.0000213" vr="0.9997623" bb="0.0000385" vb="0.9996617"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- This calibration works for 3:2 as well as for 4:3 because the crop
-+             factor is almost the same -->
-+        <maker>Leica</maker>
-+        <model>DMC-LX100 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>panasonicDMCLX100</mount>
-+        <cropfactor>2.21</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="10.9" a="0.02706" b="-0.09683" c="-0.02057"/>
-+            <distortion model="ptlens" focal="12.5" a="0.02981" b="-0.10327" c="0.00595"/>
-+            <distortion model="ptlens" focal="15.9" a="0.02515" b="-0.08331" c="0.02024"/>
-+            <distortion model="ptlens" focal="22.7" a="0.00868" b="-0.02576" c="-0.00005"/>
-+            <distortion model="ptlens" focal="31.5" a="0" b="0.00046" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0.00324" c="0"/>
-+            <tca model="poly3" focal="10.9" vr="1.0004851" vb="1.0000676"/>
-+            <tca model="poly3" focal="12.5" vr="1.0004875" vb="1.0000645"/>
-+            <tca model="poly3" focal="15.9" vr="1.0002464" vb="1.0000777"/>
-+            <tca model="poly3" focal="22.7" vr="1.0001506" vb="1.0000442"/>
-+            <tca model="poly3" focal="31.5" vr="1.0000419" vb="1.0000978"/>
-+            <tca model="poly3" focal="34" vr="0.9999857" vb="1.0000940"/>
-+            <vignetting model="pa" focal="10.9" aperture="1.7" distance="10" k1="-1.2310" k2="1.0827" k3="-0.5380"/>
-+            <vignetting model="pa" focal="10.9" aperture="1.7" distance="1000" k1="-1.2310" k2="1.0827" k3="-0.5380"/>
-+            <vignetting model="pa" focal="10.9" aperture="2.8" distance="10" k1="-0.4913" k2="0.3664" k3="-0.4053"/>
-+            <vignetting model="pa" focal="10.9" aperture="2.8" distance="1000" k1="-0.4913" k2="0.3664" k3="-0.4053"/>
-+            <vignetting model="pa" focal="10.9" aperture="4" distance="10" k1="-0.2715" k2="0.2062" k3="-0.3036"/>
-+            <vignetting model="pa" focal="10.9" aperture="4" distance="1000" k1="-0.2715" k2="0.2062" k3="-0.3036"/>
-+            <vignetting model="pa" focal="10.9" aperture="5.6" distance="10" k1="-0.4388" k2="0.2647" k3="-0.2038"/>
-+            <vignetting model="pa" focal="10.9" aperture="5.6" distance="1000" k1="-0.4388" k2="0.2647" k3="-0.2038"/>
-+            <vignetting model="pa" focal="10.9" aperture="8" distance="10" k1="-0.6673" k2="0.1891" k3="-0.0222"/>
-+            <vignetting model="pa" focal="10.9" aperture="8" distance="1000" k1="-0.6673" k2="0.1891" k3="-0.0222"/>
-+            <vignetting model="pa" focal="10.9" aperture="11" distance="10" k1="-0.6240" k2="-0.0502" k3="0.1670"/>
-+            <vignetting model="pa" focal="10.9" aperture="11" distance="1000" k1="-0.6240" k2="-0.0502" k3="0.1670"/>
-+            <vignetting model="pa" focal="12.5" aperture="2.1" distance="10" k1="-0.5847" k2="-0.1691" k3="0.1864"/>
-+            <vignetting model="pa" focal="12.5" aperture="2.1" distance="1000" k1="-0.5847" k2="-0.1691" k3="0.1864"/>
-+            <vignetting model="pa" focal="12.5" aperture="2.8" distance="10" k1="-0.2112" k2="-0.1747" k3="0.0303"/>
-+            <vignetting model="pa" focal="12.5" aperture="2.8" distance="1000" k1="-0.2112" k2="-0.1747" k3="0.0303"/>
-+            <vignetting model="pa" focal="12.5" aperture="4" distance="10" k1="-0.1170" k2="-0.3072" k3="0.1872"/>
-+            <vignetting model="pa" focal="12.5" aperture="4" distance="1000" k1="-0.1170" k2="-0.3072" k3="0.1872"/>
-+            <vignetting model="pa" focal="12.5" aperture="5.6" distance="10" k1="-0.2452" k2="-0.0083" k3="0.0035"/>
-+            <vignetting model="pa" focal="12.5" aperture="5.6" distance="1000" k1="-0.2452" k2="-0.0083" k3="0.0035"/>
-+            <vignetting model="pa" focal="12.5" aperture="8" distance="10" k1="-0.3687" k2="-0.1580" k3="0.1606"/>
-+            <vignetting model="pa" focal="12.5" aperture="8" distance="1000" k1="-0.3687" k2="-0.1580" k3="0.1606"/>
-+            <vignetting model="pa" focal="12.5" aperture="11" distance="10" k1="-0.5135" k2="-0.0079" k3="0.0920"/>
-+            <vignetting model="pa" focal="12.5" aperture="11" distance="1000" k1="-0.5135" k2="-0.0079" k3="0.0920"/>
-+            <vignetting model="pa" focal="15.9" aperture="2.3" distance="10" k1="-0.1022" k2="-0.4316" k3="0.2384"/>
-+            <vignetting model="pa" focal="15.9" aperture="2.3" distance="1000" k1="-0.1022" k2="-0.4316" k3="0.2384"/>
-+            <vignetting model="pa" focal="15.9" aperture="2.8" distance="10" k1="-0.2136" k2="0.0407" k3="-0.0872"/>
-+            <vignetting model="pa" focal="15.9" aperture="2.8" distance="1000" k1="-0.2136" k2="0.0407" k3="-0.0872"/>
-+            <vignetting model="pa" focal="15.9" aperture="4" distance="10" k1="-0.1280" k2="-0.0439" k3="0.0284"/>
-+            <vignetting model="pa" focal="15.9" aperture="4" distance="1000" k1="-0.1280" k2="-0.0439" k3="0.0284"/>
-+            <vignetting model="pa" focal="15.9" aperture="5.6" distance="10" k1="-0.1387" k2="-0.1319" k3="0.0989"/>
-+            <vignetting model="pa" focal="15.9" aperture="5.6" distance="1000" k1="-0.1387" k2="-0.1319" k3="0.0989"/>
-+            <vignetting model="pa" focal="15.9" aperture="8" distance="10" k1="-0.4416" k2="0.2785" k3="-0.1030"/>
-+            <vignetting model="pa" focal="15.9" aperture="8" distance="1000" k1="-0.4416" k2="0.2785" k3="-0.1030"/>
-+            <vignetting model="pa" focal="15.9" aperture="11" distance="10" k1="-0.4278" k2="0.1668" k3="-0.0298"/>
-+            <vignetting model="pa" focal="15.9" aperture="11" distance="1000" k1="-0.4278" k2="0.1668" k3="-0.0298"/>
-+            <vignetting model="pa" focal="22.7" aperture="2.7" distance="10" k1="-0.1457" k2="0.1441" k3="-0.2262"/>
-+            <vignetting model="pa" focal="22.7" aperture="2.7" distance="1000" k1="-0.1457" k2="0.1441" k3="-0.2262"/>
-+            <vignetting model="pa" focal="22.7" aperture="2.8" distance="10" k1="-0.1810" k2="0.2943" k3="-0.3341"/>
-+            <vignetting model="pa" focal="22.7" aperture="2.8" distance="1000" k1="-0.1810" k2="0.2943" k3="-0.3341"/>
-+            <vignetting model="pa" focal="22.7" aperture="4" distance="10" k1="-0.1907" k2="0.4320" k3="-0.3729"/>
-+            <vignetting model="pa" focal="22.7" aperture="4" distance="1000" k1="-0.1907" k2="0.4320" k3="-0.3729"/>
-+            <vignetting model="pa" focal="22.7" aperture="5.6" distance="10" k1="-0.1573" k2="0.1798" k3="-0.1591"/>
-+            <vignetting model="pa" focal="22.7" aperture="5.6" distance="1000" k1="-0.1573" k2="0.1798" k3="-0.1591"/>
-+            <vignetting model="pa" focal="22.7" aperture="8" distance="10" k1="-0.2614" k2="0.1065" k3="-0.0078"/>
-+            <vignetting model="pa" focal="22.7" aperture="8" distance="1000" k1="-0.2614" k2="0.1065" k3="-0.0078"/>
-+            <vignetting model="pa" focal="22.7" aperture="11" distance="10" k1="-0.2455" k2="0.0699" k3="0.0161"/>
-+            <vignetting model="pa" focal="22.7" aperture="11" distance="1000" k1="-0.2455" k2="0.0699" k3="0.0161"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.0695" k2="-0.1646" k3="-0.0060"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.0695" k2="-0.1646" k3="-0.0060"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.1321" k2="0.2856" k3="-0.3193"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.1321" k2="0.2856" k3="-0.3193"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.1204" k2="0.1275" k3="-0.1137"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.1204" k2="0.1275" k3="-0.1137"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.2169" k2="0.1911" k3="-0.1275"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.2169" k2="0.1911" k3="-0.1275"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.2275" k2="0.1124" k3="-0.0330"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.2275" k2="0.1124" k3="-0.0330"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>FZ1000 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>panasonicFZ1000</mount>
-+        <cropfactor>2.73</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="9.1" a="0.01858" b="-0.05809" c="-0.06581"/>
-+            <distortion model="ptlens" focal="10.1" a="0.01914" b="-0.06488" c="-0.03567"/>
-+            <distortion model="ptlens" focal="12.6" a="0.01159" b="-0.0477" c="-0.00043"/>
-+            <distortion model="ptlens" focal="18.2" a="0" b="-0.00914" c="0"/>
-+            <distortion model="ptlens" focal="26.3" a="0" b="-0.00224" c="0"/>
-+            <distortion model="ptlens" focal="65.8" a="0" b="0.00035" c="0"/>
-+            <distortion model="ptlens" focal="109.3" a="0" b="0.00049" c="0"/>
-+            <distortion model="ptlens" focal="146" a="0" b="-0.00305" c="0"/>
-+            <tca model="poly3" focal="9.1" vr="1.0004262" vb="1.0003030"/>
-+            <tca model="poly3" focal="9.1" vr="1.0004371" vb="1.0003172"/>
-+            <tca model="poly3" focal="10.1" vr="1.0003178" vb="1.0001682"/>
-+            <tca model="poly3" focal="12.6" vr="1.0003066" vb="1.0001788"/>
-+            <tca model="poly3" focal="18.2" vr="1.0002344" vb="1.0002283"/>
-+            <tca model="poly3" focal="18.2" vr="1.0002353" vb="1.0002221"/>
-+            <tca model="poly3" focal="18.2" vr="1.0002476" vb="1.0002138"/>
-+            <tca model="poly3" focal="26.3" vr="1.0001965" vb="1.0001175"/>
-+            <tca model="poly3" focal="65.8" vr="1.0000103" vb="0.9999799"/>
-+            <tca model="poly3" focal="109.3" vr="0.9999002" vb="0.9999031"/>
-+            <tca model="poly3" focal="146" vr="0.9997527" vb="0.9998454"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>FZ150 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>panasonicFZ150</mount>
-+        <focal min="4.5" max="54.7"/>
-+        <cropfactor>5.56</cropfactor>
-+        <calibration>
-+            <distortion focal="4.5" model="ptlens" a="0.0109406" b="-0.042017" c="-0.0287289"/>
-+            <distortion focal="6.2" model="ptlens" a="0.01238" b="-0.03216" c="0.00191"/>
-+            <distortion focal="7" model="ptlens" a="0.00449447" b="-0.000799359" c="-0.0270328"/>
-+            <distortion focal="10" model="ptlens" a="0.00224" b="0.00206" c="-0.00143"/>
-+            <distortion focal="11.8" model="ptlens" a="0.00242159" b="0.00232646" c="-0.000967443"/>
-+            <distortion focal="19.7" model="ptlens" a="0.00105492" b="0.0010669" c="5.33034e-06"/>
-+            <distortion focal="54.7" model="ptlens" a="-0.00067858" b="-0.00127213" c="0.000975807"/>
-+            <tca focal="4.5" model="poly3" br="0.0006938" cr="-0.0008628" vr="1.0004030" bb="-0.0007262" cb="0.0008623" vb="1.0003767"/>
-+            <tca focal="6.2" model="poly3" br="0.0005127" cr="-0.0007866" vr="1.0004315" bb="-0.0004348" cb="0.0006767" vb="1.0003031"/>
-+            <tca focal="7.0" model="poly3" br="0.0001114" cr="-0.0000751" vr="1.0001151" bb="-0.0001269" cb="0.0003163" vb="1.0003149"/>
-+            <tca focal="10.0" model="poly3" br="-0.0008996" cr="0.0018212" vr="0.9994318" bb="-0.0027042" cb="0.0043072" vb="1.0001793"/>
-+            <tca focal="11.8" model="poly3" br="-0.0001123" cr="0.0002160" vr="0.9999639" bb="-0.0000447" cb="-0.0002364" vb="1.0005859"/>
-+            <tca focal="19.7" model="poly3" br="0.0001264" cr="-0.0002769" vr="1.0001582" bb="-0.0002199" cb="0.0002568" vb="1.0001491"/>
-+            <tca focal="54.7" model="poly3" br="0.0000262" cr="0.0000067" vr="0.9998924" bb="-0.0000739" cb="0.0001647" vb="0.9998393"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>DMC-LF1 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>panasonicLF1</mount>
-+        <cropfactor>4.67</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6" a="0.0290756" b="-0.105241" c="-0.00975908"/>
-+            <distortion model="ptlens" focal="7.5" a="0.0254088" b="-0.104486" c="0.0517154"/>
-+            <distortion model="ptlens" focal="10.7" a="0.00649441" b="-0.0339281" c="0.00949454"/>
-+            <distortion model="ptlens" focal="15" a="-0.00579877" b="0.0113171" c="-0.0224867"/>
-+            <distortion model="ptlens" focal="19.2" a="-0.0114423" b="0.0258147" c="-0.0243471"/>
-+            <distortion model="ptlens" focal="28.9" a="-0.00393443" b="0.00375899" c="0.00442879"/>
-+            <distortion model="ptlens" focal="34.2" a="-0.00539526" b="0.00468442" c="0.0148425"/>
-+            <distortion model="ptlens" focal="42.8" a="-0.00292388" b="0.00778436" c="0.00956107"/>
-+            <tca model="poly3" focal="6" br="0.0000082" vr="1.0004008" bb="-0.0000233" vb="1.0001733"/>
-+            <tca model="poly3" focal="7.5" br="-0.0000519" vr="1.0005797" bb="0.0000232" vb="0.9999621"/>
-+            <tca model="poly3" focal="10.7" br="-0.0001425" vr="1.0007670" bb="-0.0000026" vb="0.9998783"/>
-+            <tca model="poly3" focal="15" br="-0.0000097" vr="1.0005447" bb="0.0000201" vb="0.9997567"/>
-+            <tca model="poly3" focal="19.2" br="-0.0000350" vr="1.0004647" bb="0.0000041" vb="0.9996599"/>
-+            <tca model="poly3" focal="28.9" br="0.0000107" vr="1.0001178" bb="-0.0000115" vb="0.9996089"/>
-+            <tca model="poly3" focal="34.2" br="0.0000015" vr="0.9999963" bb="0.0000183" vb="0.9995892"/>
-+            <tca model="poly3" focal="42.8" br="-0.0000327" vr="0.9998752" bb="0.0000593" vb="0.9996754"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>DMC-TZ71 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>panasonicTZ71</mount>
-+        <cropfactor>5.58</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.3" a="0.10898" b="-0.3138" c="0.1171"/>
-+            <distortion model="ptlens" focal="5.4" a="0.04935" b="-0.16257" c="0.08998"/>
-+            <distortion model="ptlens" focal="6.3" a="0.0239" b="-0.07731" c="0.03149"/>
-+            <distortion model="ptlens" focal="10.3" a="-0.016" b="0.04475" c="-0.02684"/>
-+            <distortion model="ptlens" focal="11.7" a="-0.01122" b="0.02923" c="-0.01147"/>
-+            <distortion model="ptlens" focal="41.4" a="-0.01376" b="0.03001" c="-0.00944"/>
-+            <distortion model="ptlens" focal="129" a="-0.01196" b="0.02828" c="-0.03556"/>
-+            <tca model="poly3" focal="4.3" vr="1.0004219" vb="1.0002436"/>
-+            <tca model="poly3" focal="5.4" vr="1.0003684" vb="1.0001668"/>
-+            <tca model="poly3" focal="6.3" vr="1.0004112" vb="1.0002591"/>
-+            <tca model="poly3" focal="10.3" vr="1.0003052" vb="1.0002050"/>
-+            <tca model="poly3" focal="11.7" vr="1.0001494" vb="1.0001194"/>
-+            <tca model="poly3" focal="20.6" vr="1.0000405" vb="1.0001280"/>
-+            <tca model="poly3" focal="41.4" vr="1.0000212" vb="1.0000264"/>
-+            <tca model="poly3" focal="71.7" vr="0.9999084" vb="1.0000344"/>
-+            <tca model="poly3" focal="129" vr="1.0000347" vb="0.9999647"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-pentax.xml b/data/db/compact-pentax.xml
---- a/data/db/compact-pentax.xml	2008-06-02 00:24:54.000000000 +0200
-+++ b/data/db/compact-pentax.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,178 +1,151 @@
- <lensdatabase>
--
--    <mount>
--        <name>pentax430</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>pentax230</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>pentax43WR</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>pentax750</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 43WR</model>
-+        <model>Pentax Optio 43WR</model>
-         <model lang="en">Optio 43WR</model>
-         <mount>pentax43WR</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 750Z</model>
-+        <model>Pentax Optio 750Z</model>
-         <model lang="en">Optio 750Z</model>
-         <mount>pentax750</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 555</model>
-+        <model>Pentax Optio 555</model>
-         <model lang="en">Optio 555</model>
-         <mount>pentax750</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 550</model>
-+        <model>Pentax Optio 550</model>
-         <model lang="en">Optio 550</model>
-         <mount>pentax750</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 450</model>
-+        <model>Pentax Optio 450</model>
-         <model lang="en">Optio 450</model>
-         <mount>pentax750</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 33LF</model>
-+        <model>Pentax Optio 33LF</model>
-         <model lang="en">Optio 33LF</model>
-         <mount>pentax230</mount>
-         <cropfactor>6.563</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 33L</model>
-+        <model>Pentax Optio 33L</model>
-         <model lang="en">Optio 33L</model>
-         <mount>pentax230</mount>
-         <cropfactor>6.563</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 230GS</model>
-+        <model>Pentax Optio 230GS</model>
-         <model lang="en">Optio 230GS</model>
-         <mount>pentax230</mount>
-         <cropfactor>6.563</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 330GS</model>
-+        <model>Pentax Optio 330GS</model>
-         <model lang="en">Optio 330GS</model>
-         <mount>pentax230</mount>
-         <cropfactor>6.563</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Asahi Optical Co.,Ltd</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX Optio 430</model>
-+        <model>Pentax Optio 430</model>
-         <model lang="en">Optio 430</model>
-         <mount>pentax430</mount>
-         <cropfactor>4.85</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>Standard</model>
-+        <model>Pentax Optio 43WR &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>pentax43WR</mount>
-         <cropfactor>6.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.7" a="0.00051" b="-0.015327" c="0" />
--            <distortion model="ptlens" focal="6.9" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="8.2" a="-0.006746" b="0.019261" c="0" />
--            <distortion model="ptlens" focal="9.8" a="-0.011758" b="0.03348" c="0" />
--            <distortion model="ptlens" focal="11.9" a="-0.015423" b="0.040788" c="0" />
--            <distortion model="ptlens" focal="14.7" a="-0.017255" b="0.043783" c="0" />
--            <distortion model="ptlens" focal="16" a="-0.021041" b="0.050701" c="0" />
-+            <distortion model="ptlens" focal="5.7" a="0.00051" b="-0.015327" c="0"/>
-+            <distortion model="ptlens" focal="6.9" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="8.2" a="-0.006746" b="0.019261" c="0"/>
-+            <distortion model="ptlens" focal="9.8" a="-0.011758" b="0.03348" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="-0.015423" b="0.040788" c="0"/>
-+            <distortion model="ptlens" focal="14.7" a="-0.017255" b="0.043783" c="0"/>
-+            <distortion model="ptlens" focal="16" a="-0.021041" b="0.050701" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>Standard</model>
-+        <model>Pentax Optio 750Z &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>pentax750</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.8" a="0.017912" b="-0.044145" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0.010471" b="-0.016609" c="0" />
--            <distortion model="ptlens" focal="10.9" a="0.00702" b="-0.002889" c="0" />
--            <distortion model="ptlens" focal="12.8" a="0.007121" b="0.000786" c="0" />
--            <distortion model="ptlens" focal="14.9" a="0.004833" b="0.007372" c="0" />
--            <distortion model="ptlens" focal="20.4" a="0" b="0.016691" c="0" />
--            <distortion model="ptlens" focal="27.8" a="0" b="0.016102" c="0" />
--            <distortion model="ptlens" focal="39" a="0" b="0.011569" c="0" />
-+            <distortion model="ptlens" focal="7.8" a="0.017912" b="-0.044145" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0.010471" b="-0.016609" c="0"/>
-+            <distortion model="ptlens" focal="10.9" a="0.00702" b="-0.002889" c="0"/>
-+            <distortion model="ptlens" focal="12.8" a="0.007121" b="0.000786" c="0"/>
-+            <distortion model="ptlens" focal="14.9" a="0.004833" b="0.007372" c="0"/>
-+            <distortion model="ptlens" focal="20.4" a="0" b="0.016691" c="0"/>
-+            <distortion model="ptlens" focal="27.8" a="0" b="0.016102" c="0"/>
-+            <distortion model="ptlens" focal="39" a="0" b="0.011569" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>Standard</model>
-+        <model>Pentax Optio 230GS &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>pentax230</mount>
-         <cropfactor>6.563</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.021182" b="-0.054588" c="0" />
--            <distortion model="ptlens" focal="7.8" a="-0.000669" b="-0.00783" c="0" />
--            <distortion model="ptlens" focal="9.6" a="-0.002098" b="-0.001871" c="0" />
--            <distortion model="ptlens" focal="11.5" a="-0.00268" b="0.000773" c="0" />
--            <distortion model="ptlens" focal="13.3" a="-0.003061" b="0.001865" c="0" />
--            <distortion model="ptlens" focal="15.2" a="0.003807" b="-0.012299" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0.001466" b="-0.007908" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.021182" b="-0.054588" c="0"/>
-+            <distortion model="ptlens" focal="7.8" a="-0.000669" b="-0.00783" c="0"/>
-+            <distortion model="ptlens" focal="9.6" a="-0.002098" b="-0.001871" c="0"/>
-+            <distortion model="ptlens" focal="11.5" a="-0.00268" b="0.000773" c="0"/>
-+            <distortion model="ptlens" focal="13.3" a="-0.003061" b="0.001865" c="0"/>
-+            <distortion model="ptlens" focal="15.2" a="0.003807" b="-0.012299" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0.001466" b="-0.007908" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>Standard</model>
-+        <model>Pentax Optio 430 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>pentax430</mount>
-         <cropfactor>4.85</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.6" a="0.00125" b="-0.015475" c="0" />
--            <distortion model="ptlens" focal="10.2" a="0.003051" b="-0.012489" c="0" />
--            <distortion model="ptlens" focal="12.6" a="0" b="-0.002855" c="0" />
--            <distortion model="ptlens" focal="15.2" a="0" b="-0.001651" c="0" />
--            <distortion model="ptlens" focal="17.7" a="0" b="-0.001512" c="0" />
--            <distortion model="ptlens" focal="20.2" a="0" b="-0.00227" c="0" />
--            <distortion model="ptlens" focal="22.8" a="0" b="-0.002609" c="0" />
-+            <distortion model="ptlens" focal="7.6" a="0.00125" b="-0.015475" c="0"/>
-+            <distortion model="ptlens" focal="10.2" a="0.003051" b="-0.012489" c="0"/>
-+            <distortion model="ptlens" focal="12.6" a="0" b="-0.002855" c="0"/>
-+            <distortion model="ptlens" focal="15.2" a="0" b="-0.001651" c="0"/>
-+            <distortion model="ptlens" focal="17.7" a="0" b="-0.001512" c="0"/>
-+            <distortion model="ptlens" focal="20.2" a="0" b="-0.00227" c="0"/>
-+            <distortion model="ptlens" focal="22.8" a="0" b="-0.002609" c="0"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-ricoh.xml b/data/db/compact-ricoh.xml
---- a/data/db/compact-ricoh.xml	2008-06-02 00:24:54.000000000 +0200
-+++ b/data/db/compact-ricoh.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,110 +1,109 @@
- <lensdatabase>
--
--    <mount>
--        <name>ricohGX</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>ricohGR</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>ricohRR30</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>RICOH</maker>
--        <maker lang="en">Ricoh</maker>
-+        <maker>Ricoh</maker>
-         <model>GR Digital</model>
--        <mount>ricohGR</mount>
-+        <mount>ricohGRdigital</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>RICOH</maker>
--        <maker lang="en">Ricoh</maker>
-+        <maker>Ricoh</maker>
-         <model>Caplio GX8</model>
-         <mount>ricohGX</mount>
-         <cropfactor>4.9</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>RICOH</maker>
--        <maker lang="en">Ricoh</maker>
-+        <maker>Ricoh</maker>
-         <model>Caplio GX</model>
-         <mount>ricohGX</mount>
-         <cropfactor>4.9</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>RICOH</maker>
--        <maker lang="en">Ricoh</maker>
-+        <maker>Ricoh</maker>
-         <model>Caplio RR30</model>
-         <mount>ricohRR30</mount>
-         <cropfactor>6.4</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Ricoh Imaging Company, Ltd.</maker>
-+        <maker lang="en">Ricoh</maker>
-+        <model>GR</model>
-+        <mount>ricohGR</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Ricoh</maker>
--        <model>Standard</model>
--        <mount>ricohGR</mount>
-+        <model>GR Digital &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>ricohGRdigital</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.9" a="0.008807" b="-0.022132" c="0" />
-+            <distortion model="ptlens" focal="5.9" a="0.008807" b="-0.022132" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Ricoh</maker>
--        <model>Standard</model>
-+        <model>Caplio GX &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>ricohGX</mount>
-         <cropfactor>4.9</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.010201" b="-0.035572" c="0" />
--            <distortion model="ptlens" focal="7.2" a="0.008368" b="-0.030732" c="0" />
--            <distortion model="ptlens" focal="8.6" a="0" b="-0.011357" c="0" />
--            <distortion model="ptlens" focal="10.6" a="0" b="-0.008582" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="-0.006789" c="0" />
--            <distortion model="ptlens" focal="13.5" a="0" b="-0.005898" c="0" />
--            <distortion model="ptlens" focal="15" a="0" b="-0.005782" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0" b="-0.004653" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.010201" b="-0.035572" c="0"/>
-+            <distortion model="ptlens" focal="7.2" a="0.008368" b="-0.030732" c="0"/>
-+            <distortion model="ptlens" focal="8.6" a="0" b="-0.011357" c="0"/>
-+            <distortion model="ptlens" focal="10.6" a="0" b="-0.008582" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0" b="-0.006789" c="0"/>
-+            <distortion model="ptlens" focal="13.5" a="0" b="-0.005898" c="0"/>
-+            <distortion model="ptlens" focal="15" a="0" b="-0.005782" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="-0.004653" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Ricoh</maker>
--        <model>DW-4</model>
-+        <model>Caplio GX &amp; compatibles, with DW-4</model>
-+        <model lang="en">fixed lens, with DW-4</model>
-+        <model lang="de">festes Objektiv, mit DW-4</model>
-         <mount>ricohGX</mount>
-         <cropfactor>4.9</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.8" a="0.016596" b="-0.050843" c="0" />
--            <distortion model="ptlens" focal="7.2" a="0.011694" b="-0.04205" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0" b="-0.016018" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="-0.012339" c="0" />
--            <distortion model="ptlens" focal="11.3" a="0" b="-0.011732" c="0" />
--            <distortion model="ptlens" focal="13.5" a="0" b="-0.007362" c="0" />
--            <distortion model="ptlens" focal="15.8" a="0" b="-0.005769" c="0" />
--            <distortion model="ptlens" focal="17.4" a="0" b="-0.005946" c="0" />
-+            <distortion model="ptlens" focal="5.8" a="0.016596" b="-0.050843" c="0"/>
-+            <distortion model="ptlens" focal="7.2" a="0.011694" b="-0.04205" c="0"/>
-+            <distortion model="ptlens" focal="9.3" a="0" b="-0.016018" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0" b="-0.012339" c="0"/>
-+            <distortion model="ptlens" focal="11.3" a="0" b="-0.011732" c="0"/>
-+            <distortion model="ptlens" focal="13.5" a="0" b="-0.007362" c="0"/>
-+            <distortion model="ptlens" focal="15.8" a="0" b="-0.005769" c="0"/>
-+            <distortion model="ptlens" focal="17.4" a="0" b="-0.005946" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Ricoh</maker>
--        <model>Standard</model>
-+        <model>Caplio RR30 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>ricohRR30</mount>
-         <cropfactor>6.4</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="5.7" a="0" b="-0.015153" c="0" />
--            <distortion model="ptlens" focal="7" a="0" b="-0.008738" c="0" />
--            <distortion model="ptlens" focal="8" a="0" b="-0.005355" c="0" />
--            <distortion model="ptlens" focal="9.3" a="0" b="-0.003278" c="0" />
--            <distortion model="ptlens" focal="11.6" a="0" b="-0.002382" c="0" />
--            <distortion model="ptlens" focal="13.2" a="0" b="-0.003511" c="0" />
--            <distortion model="ptlens" focal="16.3" a="0" b="-0.006576" c="0" />
-+            <distortion model="poly3" focal="5.7" k1="-0.015153"/>
-+            <distortion model="poly3" focal="7" k1="-0.008738"/>
-+            <distortion model="poly3" focal="8" k1="-0.005355"/>
-+            <distortion model="poly3" focal="9.3" k1="-0.003278"/>
-+            <distortion model="poly3" focal="11.6" k1="-0.002382"/>
-+            <distortion model="poly3" focal="13.2" k1="-0.003511"/>
-+            <distortion model="poly3" focal="16.3" k1="-0.006576"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Ricoh</maker>
-+        <model>Ricoh GR &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>ricohGR</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="18.3" a="0.01134" b="-0.03066" c="0.01059"/>
-+            <tca model="poly3" focal="18.3" vr="1.0001157" vb="0.9999549"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-samsung.xml b/data/db/compact-samsung.xml
---- a/data/db/compact-samsung.xml	2013-06-23 12:16:38.000000000 +0200
-+++ b/data/db/compact-samsung.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,106 +1,100 @@
- <lensdatabase>
--
--    <mount>
--	    <name>SamsungWB2000</name>
--	    <compat>Generic</compat>
--    </mount>
--
-     <camera>
--	    <maker>SAMSUNG</maker>
--	    <model>WB2000</model>
--	    <mount>SamsungWB2000</mount>
--	    <cropfactor>5.69</cropfactor>
-+        <maker>Samsung</maker>
-+        <model>WB2000</model>
-+        <mount>samsungWB2000</mount>
-+        <cropfactor>5.69</cropfactor>
-     </camera>
--
-     <lens>
--        <maker>SAMSUNG</maker>
--        <model>Standard</model>
--        <mount>SamsungWB2000</mount>
-+        <maker>Samsung</maker>
-+        <model>WB2000 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>samsungWB2000</mount>
-         <cropfactor>5.69</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.0252892" b="-0.097418" c="0.0155762" />
--            <distortion model="ptlens" focal="28" a="0.0208251" b="-0.0732534" c="0.018483" />
--            <distortion model="ptlens" focal="35" a="-0.0159443" b="0.0281739" c="-0.0246404" />
--            <distortion model="ptlens" focal="42" a="0.00787344" b="-0.0252142" c="0.014697" />
--            <distortion model="ptlens" focal="50" a="-0.00516537" b="0.0152856" c="-0.0109653" />
--            <distortion model="ptlens" focal="60" a="-0.010784" b="0.0370302" c="-0.0322257" />
--            <distortion model="ptlens" focal="70" a="0.00254554" b="0.000214427" c="0.00702316" />
--            <distortion model="ptlens" focal="80" a="0.0052106" b="-0.00535521" c="0.0108253" />
--            <distortion model="ptlens" focal="90" a="0.00510908" b="-0.00372541" c="0.00946807" />
--            <distortion model="ptlens" focal="105" a="0.0110426" b="-0.0219426" c="0.0299614" />
--            <distortion model="ptlens" focal="120" a="0.00208743" b="0.00549283" c="-0.0034208" />
--            <tca model="poly3" focal="24" br="0.0001191" vr="0.9998426" bb="-0.0001814" vb="1.0004809" />
--            <tca model="poly3" focal="28" br="0.0000640" vr="0.9998924" bb="-0.0001995" vb="1.0004667" />
--            <tca model="poly3" focal="35" br="-0.0000158" vr="0.9999988" bb="-0.0001793" vb="1.0003610" />
--            <tca model="poly3" focal="42" br="-0.0000450" vr="1.0000639" bb="-0.0001242" vb="1.0002915" />
--            <tca model="poly3" focal="50" br="0.0000000" vr="1.0000319" bb="-0.0000292" vb="1.0001563" />
--            <tca model="poly3" focal="60" br="-0.0000632" vr="1.0001260" bb="-0.0000484" vb="1.0001077" />
--            <tca model="poly3" focal="70" br="-0.0000461" vr="1.0001466" bb="0.0000116" vb="0.9999822" />
--            <tca model="poly3" focal="90" br="-0.0000537" vr="1.0002304" bb="0.0000495" vb="0.9998292" />
--            <tca model="poly3" focal="120" br="0.0000124" vr="1.0002394" bb="0.0000194" vb="0.9997186" />
--            <vignetting model="pa" focal="24" aperture="2.4" distance="10" k1="-0.7565" k2="0.9444" k3="-0.7155" />
--            <vignetting model="pa" focal="24" aperture="2.4" distance="1000" k1="-0.7565" k2="0.9444" k3="-0.7155" />
--            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.7379" k2="0.9837" k3="-0.7958" />
--            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.7379" k2="0.9837" k3="-0.7958" />
--            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3262" k2="0.1244" k3="-0.1772" />
--            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3262" k2="0.1244" k3="-0.1772" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.6314" k2="1.4131" k3="-1.2231" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6314" k2="1.4131" k3="-1.2231" />
--            <vignetting model="pa" focal="24" aperture="7.2" distance="10" k1="-1.0110" k2="2.8118" k3="-2.4533" />
--            <vignetting model="pa" focal="24" aperture="7.2" distance="1000" k1="-1.0110" k2="2.8118" k3="-2.4533" />
--            <vignetting model="pa" focal="28" aperture="3" distance="10" k1="-0.6151" k2="0.3369" k3="-0.0923" />
--            <vignetting model="pa" focal="28" aperture="3" distance="1000" k1="-0.6151" k2="0.3369" k3="-0.0923" />
--            <vignetting model="pa" focal="28" aperture="3.9" distance="10" k1="-0.2434" k2="-0.4317" k3="0.3851" />
--            <vignetting model="pa" focal="28" aperture="3.9" distance="1000" k1="-0.2434" k2="-0.4317" k3="0.3851" />
--            <vignetting model="pa" focal="28" aperture="5.5" distance="10" k1="-0.3866" k2="0.1025" k3="-0.0489" />
--            <vignetting model="pa" focal="28" aperture="5.5" distance="1000" k1="-0.3866" k2="0.1025" k3="-0.0489" />
--            <vignetting model="pa" focal="28" aperture="7.2" distance="10" k1="-0.4699" k2="0.2417" k3="-0.1107" />
--            <vignetting model="pa" focal="28" aperture="7.2" distance="1000" k1="-0.4699" k2="0.2417" k3="-0.1107" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5318" k2="0.2489" k3="-0.0494" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5318" k2="0.2489" k3="-0.0494" />
--            <vignetting model="pa" focal="35" aperture="3.8" distance="10" k1="-0.3641" k2="-0.1161" k3="0.1859" />
--            <vignetting model="pa" focal="35" aperture="3.8" distance="1000" k1="-0.3641" k2="-0.1161" k3="0.1859" />
--            <vignetting model="pa" focal="35" aperture="5.4" distance="10" k1="-0.3734" k2="0.0363" k3="0.0152" />
--            <vignetting model="pa" focal="35" aperture="5.4" distance="1000" k1="-0.3734" k2="0.0363" k3="0.0152" />
--            <vignetting model="pa" focal="35" aperture="7" distance="10" k1="-0.4810" k2="0.2589" k3="-0.1108" />
--            <vignetting model="pa" focal="35" aperture="7" distance="1000" k1="-0.4810" k2="0.2589" k3="-0.1108" />
--            <vignetting model="pa" focal="42" aperture="3.9" distance="10" k1="-0.4003" k2="0.0172" k3="0.0731" />
--            <vignetting model="pa" focal="42" aperture="3.9" distance="1000" k1="-0.4003" k2="0.0172" k3="0.0731" />
--            <vignetting model="pa" focal="42" aperture="5.5" distance="10" k1="-0.3585" k2="0.0573" k3="-0.0141" />
--            <vignetting model="pa" focal="42" aperture="5.5" distance="1000" k1="-0.3585" k2="0.0573" k3="-0.0141" />
--            <vignetting model="pa" focal="42" aperture="7.2" distance="10" k1="-0.3898" k2="0.1562" k3="-0.0459" />
--            <vignetting model="pa" focal="42" aperture="7.2" distance="1000" k1="-0.3898" k2="0.1562" k3="-0.0459" />
--            <vignetting model="pa" focal="50" aperture="4.4" distance="10" k1="-0.3642" k2="-0.0057" k3="0.0681" />
--            <vignetting model="pa" focal="50" aperture="4.4" distance="1000" k1="-0.3642" k2="-0.0057" k3="0.0681" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3362" k2="0.0711" k3="-0.0238" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3362" k2="0.0711" k3="-0.0238" />
--            <vignetting model="pa" focal="50" aperture="7.3" distance="10" k1="-0.3603" k2="0.1471" k3="-0.0377" />
--            <vignetting model="pa" focal="50" aperture="7.3" distance="1000" k1="-0.3603" k2="0.1471" k3="-0.0377" />
--            <vignetting model="pa" focal="60" aperture="5" distance="10" k1="-0.2746" k2="-0.0200" k3="0.0551" />
--            <vignetting model="pa" focal="60" aperture="5" distance="1000" k1="-0.2746" k2="-0.0200" k3="0.0551" />
--            <vignetting model="pa" focal="60" aperture="5.4" distance="10" k1="-0.2824" k2="0.0033" k3="0.0160" />
--            <vignetting model="pa" focal="60" aperture="5.4" distance="1000" k1="-0.2824" k2="0.0033" k3="0.0160" />
--            <vignetting model="pa" focal="60" aperture="7" distance="10" k1="-0.3103" k2="0.1113" k3="-0.0315" />
--            <vignetting model="pa" focal="60" aperture="7" distance="1000" k1="-0.3103" k2="0.1113" k3="-0.0315" />
--            <vignetting model="pa" focal="70" aperture="5.1" distance="10" k1="-0.3732" k2="0.1209" k3="-0.0264" />
--            <vignetting model="pa" focal="70" aperture="5.1" distance="1000" k1="-0.3732" k2="0.1209" k3="-0.0264" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2776" k2="-0.0274" k3="0.0468" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2776" k2="-0.0274" k3="0.0468" />
--            <vignetting model="pa" focal="70" aperture="7.2" distance="10" k1="-0.2932" k2="0.0988" k3="-0.0299" />
--            <vignetting model="pa" focal="70" aperture="7.2" distance="1000" k1="-0.2932" k2="0.0988" k3="-0.0299" />
--            <vignetting model="pa" focal="80" aperture="5.7" distance="10" k1="-0.3073" k2="0.0056" k3="0.0454" />
--            <vignetting model="pa" focal="80" aperture="5.7" distance="1000" k1="-0.3073" k2="0.0056" k3="0.0454" />
--            <vignetting model="pa" focal="80" aperture="7.3" distance="10" k1="-0.2675" k2="0.0560" k3="0.0149" />
--            <vignetting model="pa" focal="80" aperture="7.3" distance="1000" k1="-0.2675" k2="0.0560" k3="0.0149" />
--            <vignetting model="pa" focal="105" aperture="5.8" distance="10" k1="-0.3313" k2="0.0655" k3="0.0274" />
--            <vignetting model="pa" focal="105" aperture="5.8" distance="1000" k1="-0.3313" k2="0.0655" k3="0.0274" />
--            <vignetting model="pa" focal="105" aperture="7.6" distance="10" k1="-0.2368" k2="-0.0174" k3="0.0569" />
--            <vignetting model="pa" focal="105" aperture="7.6" distance="1000" k1="-0.2368" k2="-0.0174" k3="0.0569" />
--            <vignetting model="pa" focal="120" aperture="5.8" distance="10" k1="-0.3271" k2="0.0771" k3="0.0172" />
--            <vignetting model="pa" focal="120" aperture="5.8" distance="1000" k1="-0.3271" k2="0.0771" k3="0.0172" />
--            <vignetting model="pa" focal="120" aperture="7.5" distance="10" k1="-0.2428" k2="0.0351" k3="0.0172" />
--            <vignetting model="pa" focal="120" aperture="7.5" distance="1000" k1="-0.2428" k2="0.0351" k3="0.0172" />
-+            <distortion model="ptlens" focal="24" a="0.0252892" b="-0.097418" c="0.0155762"/>
-+            <distortion model="ptlens" focal="28" a="0.0208251" b="-0.0732534" c="0.018483"/>
-+            <distortion model="ptlens" focal="35" a="-0.0159443" b="0.0281739" c="-0.0246404"/>
-+            <distortion model="ptlens" focal="42" a="0.00787344" b="-0.0252142" c="0.014697"/>
-+            <distortion model="ptlens" focal="50" a="-0.00516537" b="0.0152856" c="-0.0109653"/>
-+            <distortion model="ptlens" focal="60" a="-0.010784" b="0.0370302" c="-0.0322257"/>
-+            <distortion model="ptlens" focal="70" a="0.00254554" b="0.000214427" c="0.00702316"/>
-+            <distortion model="ptlens" focal="80" a="0.0052106" b="-0.00535521" c="0.0108253"/>
-+            <distortion model="ptlens" focal="90" a="0.00510908" b="-0.00372541" c="0.00946807"/>
-+            <distortion model="ptlens" focal="105" a="0.0110426" b="-0.0219426" c="0.0299614"/>
-+            <distortion model="ptlens" focal="120" a="0.00208743" b="0.00549283" c="-0.0034208"/>
-+            <tca model="poly3" focal="24" br="0.0001191" vr="0.9998426" bb="-0.0001814" vb="1.0004809"/>
-+            <tca model="poly3" focal="28" br="0.0000640" vr="0.9998924" bb="-0.0001995" vb="1.0004667"/>
-+            <tca model="poly3" focal="35" br="-0.0000158" vr="0.9999988" bb="-0.0001793" vb="1.0003610"/>
-+            <tca model="poly3" focal="42" br="-0.0000450" vr="1.0000639" bb="-0.0001242" vb="1.0002915"/>
-+            <tca model="poly3" focal="50" br="0.0000000" vr="1.0000319" bb="-0.0000292" vb="1.0001563"/>
-+            <tca model="poly3" focal="60" br="-0.0000632" vr="1.0001260" bb="-0.0000484" vb="1.0001077"/>
-+            <tca model="poly3" focal="70" br="-0.0000461" vr="1.0001466" bb="0.0000116" vb="0.9999822"/>
-+            <tca model="poly3" focal="90" br="-0.0000537" vr="1.0002304" bb="0.0000495" vb="0.9998292"/>
-+            <tca model="poly3" focal="120" br="0.0000124" vr="1.0002394" bb="0.0000194" vb="0.9997186"/>
-+            <vignetting model="pa" focal="24" aperture="2.4" distance="10" k1="-0.7565" k2="0.9444" k3="-0.7155"/>
-+            <vignetting model="pa" focal="24" aperture="2.4" distance="1000" k1="-0.7565" k2="0.9444" k3="-0.7155"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.7379" k2="0.9837" k3="-0.7958"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.7379" k2="0.9837" k3="-0.7958"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3262" k2="0.1244" k3="-0.1772"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3262" k2="0.1244" k3="-0.1772"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.6314" k2="1.4131" k3="-1.2231"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6314" k2="1.4131" k3="-1.2231"/>
-+            <vignetting model="pa" focal="24" aperture="7.2" distance="10" k1="-1.0110" k2="2.8118" k3="-2.4533"/>
-+            <vignetting model="pa" focal="24" aperture="7.2" distance="1000" k1="-1.0110" k2="2.8118" k3="-2.4533"/>
-+            <vignetting model="pa" focal="28" aperture="3" distance="10" k1="-0.6151" k2="0.3369" k3="-0.0923"/>
-+            <vignetting model="pa" focal="28" aperture="3" distance="1000" k1="-0.6151" k2="0.3369" k3="-0.0923"/>
-+            <vignetting model="pa" focal="28" aperture="3.9" distance="10" k1="-0.2434" k2="-0.4317" k3="0.3851"/>
-+            <vignetting model="pa" focal="28" aperture="3.9" distance="1000" k1="-0.2434" k2="-0.4317" k3="0.3851"/>
-+            <vignetting model="pa" focal="28" aperture="5.5" distance="10" k1="-0.3866" k2="0.1025" k3="-0.0489"/>
-+            <vignetting model="pa" focal="28" aperture="5.5" distance="1000" k1="-0.3866" k2="0.1025" k3="-0.0489"/>
-+            <vignetting model="pa" focal="28" aperture="7.2" distance="10" k1="-0.4699" k2="0.2417" k3="-0.1107"/>
-+            <vignetting model="pa" focal="28" aperture="7.2" distance="1000" k1="-0.4699" k2="0.2417" k3="-0.1107"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5318" k2="0.2489" k3="-0.0494"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5318" k2="0.2489" k3="-0.0494"/>
-+            <vignetting model="pa" focal="35" aperture="3.8" distance="10" k1="-0.3641" k2="-0.1161" k3="0.1859"/>
-+            <vignetting model="pa" focal="35" aperture="3.8" distance="1000" k1="-0.3641" k2="-0.1161" k3="0.1859"/>
-+            <vignetting model="pa" focal="35" aperture="5.4" distance="10" k1="-0.3734" k2="0.0363" k3="0.0152"/>
-+            <vignetting model="pa" focal="35" aperture="5.4" distance="1000" k1="-0.3734" k2="0.0363" k3="0.0152"/>
-+            <vignetting model="pa" focal="35" aperture="7" distance="10" k1="-0.4810" k2="0.2589" k3="-0.1108"/>
-+            <vignetting model="pa" focal="35" aperture="7" distance="1000" k1="-0.4810" k2="0.2589" k3="-0.1108"/>
-+            <vignetting model="pa" focal="42" aperture="3.9" distance="10" k1="-0.4003" k2="0.0172" k3="0.0731"/>
-+            <vignetting model="pa" focal="42" aperture="3.9" distance="1000" k1="-0.4003" k2="0.0172" k3="0.0731"/>
-+            <vignetting model="pa" focal="42" aperture="5.5" distance="10" k1="-0.3585" k2="0.0573" k3="-0.0141"/>
-+            <vignetting model="pa" focal="42" aperture="5.5" distance="1000" k1="-0.3585" k2="0.0573" k3="-0.0141"/>
-+            <vignetting model="pa" focal="42" aperture="7.2" distance="10" k1="-0.3898" k2="0.1562" k3="-0.0459"/>
-+            <vignetting model="pa" focal="42" aperture="7.2" distance="1000" k1="-0.3898" k2="0.1562" k3="-0.0459"/>
-+            <vignetting model="pa" focal="50" aperture="4.4" distance="10" k1="-0.3642" k2="-0.0057" k3="0.0681"/>
-+            <vignetting model="pa" focal="50" aperture="4.4" distance="1000" k1="-0.3642" k2="-0.0057" k3="0.0681"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3362" k2="0.0711" k3="-0.0238"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3362" k2="0.0711" k3="-0.0238"/>
-+            <vignetting model="pa" focal="50" aperture="7.3" distance="10" k1="-0.3603" k2="0.1471" k3="-0.0377"/>
-+            <vignetting model="pa" focal="50" aperture="7.3" distance="1000" k1="-0.3603" k2="0.1471" k3="-0.0377"/>
-+            <vignetting model="pa" focal="60" aperture="5" distance="10" k1="-0.2746" k2="-0.0200" k3="0.0551"/>
-+            <vignetting model="pa" focal="60" aperture="5" distance="1000" k1="-0.2746" k2="-0.0200" k3="0.0551"/>
-+            <vignetting model="pa" focal="60" aperture="5.4" distance="10" k1="-0.2824" k2="0.0033" k3="0.0160"/>
-+            <vignetting model="pa" focal="60" aperture="5.4" distance="1000" k1="-0.2824" k2="0.0033" k3="0.0160"/>
-+            <vignetting model="pa" focal="60" aperture="7" distance="10" k1="-0.3103" k2="0.1113" k3="-0.0315"/>
-+            <vignetting model="pa" focal="60" aperture="7" distance="1000" k1="-0.3103" k2="0.1113" k3="-0.0315"/>
-+            <vignetting model="pa" focal="70" aperture="5.1" distance="10" k1="-0.3732" k2="0.1209" k3="-0.0264"/>
-+            <vignetting model="pa" focal="70" aperture="5.1" distance="1000" k1="-0.3732" k2="0.1209" k3="-0.0264"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2776" k2="-0.0274" k3="0.0468"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2776" k2="-0.0274" k3="0.0468"/>
-+            <vignetting model="pa" focal="70" aperture="7.2" distance="10" k1="-0.2932" k2="0.0988" k3="-0.0299"/>
-+            <vignetting model="pa" focal="70" aperture="7.2" distance="1000" k1="-0.2932" k2="0.0988" k3="-0.0299"/>
-+            <vignetting model="pa" focal="80" aperture="5.7" distance="10" k1="-0.3073" k2="0.0056" k3="0.0454"/>
-+            <vignetting model="pa" focal="80" aperture="5.7" distance="1000" k1="-0.3073" k2="0.0056" k3="0.0454"/>
-+            <vignetting model="pa" focal="80" aperture="7.3" distance="10" k1="-0.2675" k2="0.0560" k3="0.0149"/>
-+            <vignetting model="pa" focal="80" aperture="7.3" distance="1000" k1="-0.2675" k2="0.0560" k3="0.0149"/>
-+            <vignetting model="pa" focal="105" aperture="5.8" distance="10" k1="-0.3313" k2="0.0655" k3="0.0274"/>
-+            <vignetting model="pa" focal="105" aperture="5.8" distance="1000" k1="-0.3313" k2="0.0655" k3="0.0274"/>
-+            <vignetting model="pa" focal="105" aperture="7.6" distance="10" k1="-0.2368" k2="-0.0174" k3="0.0569"/>
-+            <vignetting model="pa" focal="105" aperture="7.6" distance="1000" k1="-0.2368" k2="-0.0174" k3="0.0569"/>
-+            <vignetting model="pa" focal="120" aperture="5.8" distance="10" k1="-0.3271" k2="0.0771" k3="0.0172"/>
-+            <vignetting model="pa" focal="120" aperture="5.8" distance="1000" k1="-0.3271" k2="0.0771" k3="0.0172"/>
-+            <vignetting model="pa" focal="120" aperture="7.5" distance="10" k1="-0.2428" k2="0.0351" k3="0.0172"/>
-+            <vignetting model="pa" focal="120" aperture="7.5" distance="1000" k1="-0.2428" k2="0.0351" k3="0.0172"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-sigma.xml b/data/db/compact-sigma.xml
---- a/data/db/compact-sigma.xml	2013-08-14 10:09:02.000000000 +0200
-+++ b/data/db/compact-sigma.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,120 +1,76 @@
- <lensdatabase>
--
--    <mount>
--        <name>SigmaDP1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>SigmaDP1M</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>SigmaDP2</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>SigmaDP2M</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>SigmaDP3M</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP1</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP1</model>
-         <model lang="en">DP1</model>
--        <mount>SigmaDP1</mount>
-+        <mount>sigmaDP1</mount>
-         <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP1 Merrill</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP1 Merrill</model>
-         <model lang="en">DP1 Merrill</model>
--        <mount>SigmaDP1M</mount>
--        <cropfactor>1.531</cropfactor>
-+        <mount>sigmaDP1M</mount>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP1S</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP1S</model>
-         <model lang="en">DP1S</model>
--        <mount>SigmaDP1</mount>
-+        <mount>sigmaDP1</mount>
-         <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP1X</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP1X</model>
-         <model lang="en">DP1X</model>
--        <mount>SigmaDP1</mount>
-+        <mount>sigmaDP1</mount>
-         <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP2</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP2</model>
-         <model lang="en">DP2</model>
--        <mount>SigmaDP2</mount>
-+        <mount>sigmaDP2</mount>
-         <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP2 Merrill</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP2 Merrill</model>
-         <model lang="en">DP2 Merrill</model>
--        <mount>SigmaDP2M</mount>
--        <cropfactor>1.531</cropfactor>
-+        <mount>sigmaDP2M</mount>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP2S</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP2S</model>
-         <model lang="en">DP2S</model>
--        <mount>SigmaDP2</mount>
-+        <mount>sigmaDP2</mount>
-         <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP2X</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP2X</model>
-         <model lang="en">DP2X</model>
--        <mount>SigmaDP2</mount>
-+        <mount>sigmaDP2</mount>
-         <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA DP3 Merrill</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP3 Merrill</model>
-         <model lang="en">DP3 Merrill</model>
--        <mount>SigmaDP3M</mount>
--        <cropfactor>1.531</cropfactor>
-+        <mount>sigmaDP3M</mount>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <lens>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>Standard</model>
--        <mount>SigmaDP2</mount>
-+        <maker>Sigma</maker>
-+        <model>Sigma DP2 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sigmaDP2</mount>
-         <cropfactor>1.739</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24.2" a="0.00558" b="-0.01995" c="0.00605" />
-+            <distortion model="ptlens" focal="24.2" a="0.00558" b="-0.01995" c="0.00605"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/compact-sony.xml b/data/db/compact-sony.xml
---- a/data/db/compact-sony.xml	2012-08-25 11:48:34.000000000 +0200
-+++ b/data/db/compact-sony.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,735 +1,1219 @@
- <lensdatabase>
--
--    <mount>
--        <name>sony707</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sony828</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyH1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyS85</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyV1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyW1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyR1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyS60</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyT1</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>sonyRX100</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-R1</model>
-         <mount>sonyR1</mount>
-         <cropfactor>1.68</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-H1</model>
-         <mount>sonyH1</mount>
-         <cropfactor>6.0</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-F828</model>
-         <mount>sony828</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
--        <model>CYBERSHOT</model>
--        <model lang="en">CyberShot</model>
-+        <maker>Sony</maker>
-+        <model>Cybershot</model>
-+        <model lang="en">Cyber-shot</model>
-         <variant>DSC-F717</variant>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
--        <model>CYBERSHOT</model>
--        <model lang="en">CyberShot</model>
-+        <maker>Sony</maker>
-+        <model>Cybershot</model>
-+        <model lang="en">Cyber-shot</model>
-         <variant>DSC-F707</variant>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-P200</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-P150</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-P100</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-P93</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-W12</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-W7</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-W15</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-W5</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-W1</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-V3</model>
-         <mount>sonyV1</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-V1</model>
-         <mount>sonyV1</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-T1</model>
-         <mount>sonyT1</mount>
-         <cropfactor>5.650</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
--        <model>CYBERSHOT</model>
--        <model lang="en">CyberShot</model>
-+        <maker>Sony</maker>
-+        <model>Cybershot</model>
-+        <model lang="en">Cyber-shot</model>
-         <variant>DSC-S85</variant>
-         <mount>sonyS85</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
--        <model>CYBERSHOT</model>
--        <model lang="en">CyberShot</model>
-+        <maker>Sony</maker>
-+        <model>Cybershot</model>
-+        <model lang="en">Cyber-shot</model>
-         <variant>DSC-S75</variant>
-         <mount>sonyS85</mount>
-         <cropfactor>4.843</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-S90</model>
-         <mount>sonyS60</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-ST80</model>
-         <mount>sonyS60</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-S80</model>
-         <mount>sonyS60</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-S60</model>
-         <mount>sonyS60</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSC-P73</model>
-         <mount>sonyS60</mount>
-         <cropfactor>6.5</cropfactor>
-     </camera>
--    
-     <camera>
-         <maker>Sony</maker>
-         <model>DSC-RX100</model>
-+        <model lang="en">RX100</model>
-         <mount>sonyRX100</mount>
-         <cropfactor>2.73</cropfactor>
--    </camera>      
--
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-RX100M2</model>
-+        <model lang="en">RX100 II</model>
-+        <mount>sonyRX100II</mount>
-+        <cropfactor>2.73</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-RX100M3</model>
-+        <model lang="en">RX100 III</model>
-+        <mount>sonyRX100III</mount>
-+        <cropfactor>2.73</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-RX100M4</model>
-+        <model lang="en">RX100 IV</model>
-+        <mount>sonyRX100III</mount>
-+        <cropfactor>2.73</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-HX300</model>
-+        <mount>sonyHX300</mount>
-+        <cropfactor>5.58</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-HX20V</model>
-+        <mount>sonyHX20V</mount>
-+        <cropfactor>5.62</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>Xperia Z3</model>
-+        <mount>sonyXperiaZ3</mount>
-+        <cropfactor>7.87</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-RX10</model>
-+        <model lang="en">RX10</model>
-+        <mount>sonyRX10</mount>
-+        <cropfactor>2.73</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-RX10M2</model>
-+        <model lang="en">RX10 II</model>
-+        <mount>sonyRX10II</mount>
-+        <cropfactor>2.73</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>DSC-RX1RM2</model>
-+        <model lang="en">RX1 R II</model>
-+        <mount>sonyRX1</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-R1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyR1</mount>
-         <cropfactor>1.68</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14.3" a="0.016048" b="-0.04251" c="0" />
--            <distortion model="ptlens" focal="14.8" a="0.013923" b="-0.036204" c="0" />
--            <distortion model="ptlens" focal="16" a="0.007736" b="-0.019699" c="0" />
--            <distortion model="ptlens" focal="17.8" a="0.006109" b="-0.012654" c="0" />
--            <distortion model="ptlens" focal="19.7" a="0.00779" b="-0.01452" c="0" />
--            <distortion model="ptlens" focal="22.2" a="0.006436" b="-0.009769" c="0" />
--            <distortion model="ptlens" focal="26.2" a="0" b="0.00356" c="0" />
--            <distortion model="ptlens" focal="28.7" a="0" b="0.003947" c="0" />
--            <distortion model="ptlens" focal="32.3" a="0" b="0.003852" c="0" />
--            <distortion model="ptlens" focal="35.4" a="0" b="0.003556" c="0" />
--            <distortion model="ptlens" focal="39.5" a="0" b="0.003135" c="0" />
--            <distortion model="ptlens" focal="49.8" a="0" b="0.002513" c="0" />
--            <distortion model="ptlens" focal="65.7" a="0" b="0.00051" c="0" />
--            <distortion model="ptlens" focal="71.5" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="14.3" a="0.016048" b="-0.04251" c="0"/>
-+            <distortion model="ptlens" focal="14.8" a="0.013923" b="-0.036204" c="0"/>
-+            <distortion model="ptlens" focal="16" a="0.007736" b="-0.019699" c="0"/>
-+            <distortion model="ptlens" focal="17.8" a="0.006109" b="-0.012654" c="0"/>
-+            <distortion model="ptlens" focal="19.7" a="0.00779" b="-0.01452" c="0"/>
-+            <distortion model="ptlens" focal="22.2" a="0.006436" b="-0.009769" c="0"/>
-+            <distortion model="ptlens" focal="26.2" a="0" b="0.00356" c="0"/>
-+            <distortion model="ptlens" focal="28.7" a="0" b="0.003947" c="0"/>
-+            <distortion model="ptlens" focal="32.3" a="0" b="0.003852" c="0"/>
-+            <distortion model="ptlens" focal="35.4" a="0" b="0.003556" c="0"/>
-+            <distortion model="ptlens" focal="39.5" a="0" b="0.003135" c="0"/>
-+            <distortion model="ptlens" focal="49.8" a="0" b="0.002513" c="0"/>
-+            <distortion model="ptlens" focal="65.7" a="0" b="0.00051" c="0"/>
-+            <distortion model="ptlens" focal="71.5" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-H1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyH1</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.021497" b="-0.054037" c="0" />
--            <distortion model="ptlens" focal="6.4" a="0.020384" b="-0.046414" c="0" />
--            <distortion model="ptlens" focal="6.7" a="0.015021" b="-0.03528" c="0" />
--            <distortion model="ptlens" focal="7.1" a="0.012633" b="-0.028516" c="0" />
--            <distortion model="ptlens" focal="7.8" a="0.012854" b="-0.025864" c="0" />
--            <distortion model="ptlens" focal="8.9" a="0.006579" b="-0.010167" c="0" />
--            <distortion model="ptlens" focal="9.8" a="0.008125" b="-0.013508" c="0" />
--            <distortion model="ptlens" focal="14.2" a="0.004555" b="-0.006496" c="0" />
--            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="45.2" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.001577" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.021497" b="-0.054037" c="0"/>
-+            <distortion model="ptlens" focal="6.4" a="0.020384" b="-0.046414" c="0"/>
-+            <distortion model="ptlens" focal="6.7" a="0.015021" b="-0.03528" c="0"/>
-+            <distortion model="ptlens" focal="7.1" a="0.012633" b="-0.028516" c="0"/>
-+            <distortion model="ptlens" focal="7.8" a="0.012854" b="-0.025864" c="0"/>
-+            <distortion model="ptlens" focal="8.9" a="0.006579" b="-0.010167" c="0"/>
-+            <distortion model="ptlens" focal="9.8" a="0.008125" b="-0.013508" c="0"/>
-+            <distortion model="ptlens" focal="14.2" a="0.004555" b="-0.006496" c="0"/>
-+            <distortion model="ptlens" focal="17.5" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="45.2" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0.001577" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>VCL-DH0758 0.7x Converter</model>
-+        <model>DSC-H1 &amp; compatibles, with VCL-DH0758 0.7x converter</model>
-+        <model lang="en">fixed lens, with VCL-DH0758 0.7× converter</model>
-+        <model lang="de">festes Objektiv, mit VCL-DH0758 0.7×-Konverter</model>
-         <mount>sonyH1</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.026726" b="-0.080352" c="0" />
--            <distortion model="ptlens" focal="6.6" a="0.022257" b="-0.062663" c="0" />
--            <distortion model="ptlens" focal="7.5" a="0.017517" b="-0.047928" c="0" />
--            <distortion model="ptlens" focal="8.4" a="0.013993" b="-0.036261" c="0" />
--            <distortion model="ptlens" focal="9.6" a="0.009595" b="-0.025744" c="0" />
--            <distortion model="ptlens" focal="10.9" a="0.005448" b="-0.015924" c="0" />
--            <distortion model="ptlens" focal="13.8" a="0" b="-0.004096" c="0" />
--            <distortion model="ptlens" focal="19.8" a="0" b="-0.003755" c="0" />
--            <distortion model="ptlens" focal="28.4" a="0" b="-0.004627" c="0" />
--            <distortion model="ptlens" focal="48" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.026726" b="-0.080352" c="0"/>
-+            <distortion model="ptlens" focal="6.6" a="0.022257" b="-0.062663" c="0"/>
-+            <distortion model="ptlens" focal="7.5" a="0.017517" b="-0.047928" c="0"/>
-+            <distortion model="ptlens" focal="8.4" a="0.013993" b="-0.036261" c="0"/>
-+            <distortion model="ptlens" focal="9.6" a="0.009595" b="-0.025744" c="0"/>
-+            <distortion model="ptlens" focal="10.9" a="0.005448" b="-0.015924" c="0"/>
-+            <distortion model="ptlens" focal="13.8" a="0" b="-0.004096" c="0"/>
-+            <distortion model="ptlens" focal="19.8" a="0" b="-0.003755" c="0"/>
-+            <distortion model="ptlens" focal="28.4" a="0" b="-0.004627" c="0"/>
-+            <distortion model="ptlens" focal="48" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>VCL-DH1758 1.7x Converter</model>
-+        <model>DSC-H1 &amp; compatibles, with VCL-DH1758 1.7x converter</model>
-+        <model lang="en">fixed lens, with VCL-DH1758 1.7× converter</model>
-+        <model lang="de">festes Objektiv, mit VCL-DH1758 1.7×-Konverter</model>
-         <mount>sonyH1</mount>
-         <cropfactor>6.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="22.5" a="0" b="-0.00573" c="0" />
--            <distortion model="ptlens" focal="25.7" a="0" b="-0.005648" c="0" />
--            <distortion model="ptlens" focal="32.1" a="0" b="-0.004426" c="0" />
--            <distortion model="ptlens" focal="47.1" a="0" b="-0.00185" c="0" />
--            <distortion model="ptlens" focal="61.7" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="68.3" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.001196" c="0" />
-+            <distortion model="poly3" focal="22.5" k1="-0.00573"/>
-+            <distortion model="poly3" focal="25.7" k1="-0.005648"/>
-+            <distortion model="poly3" focal="32.1" k1="-0.004426"/>
-+            <distortion model="poly3" focal="47.1" k1="-0.00185"/>
-+            <distortion model="poly3" focal="61.7" k1="0"/>
-+            <distortion model="poly3" focal="68.3" k1="0"/>
-+            <distortion model="poly3" focal="72" k1="0.001196"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-F828 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sony828</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.018095" b="-0.048162" c="0" />
--            <distortion model="ptlens" focal="8.1" a="0.014132" b="-0.032924" c="0" />
--            <distortion model="ptlens" focal="8.7" a="-0.00066" b="-0.002438" c="0" />
--            <distortion model="ptlens" focal="10.6" a="-0.004167" b="0.008802" c="0" />
--            <distortion model="ptlens" focal="12.2" a="0.001366" b="-0.001343" c="0" />
--            <distortion model="ptlens" focal="14.3" a="0.000869" b="0.000672" c="0" />
--            <distortion model="ptlens" focal="17.5" a="-0.01026" b="0.019351" c="0" />
--            <distortion model="ptlens" focal="20.5" a="0.002486" b="-0.001685" c="0" />
--            <distortion model="ptlens" focal="25.5" a="0.016746" b="-0.028622" c="0" />
--            <distortion model="ptlens" focal="29.3" a="-0.008873" b="0.019679" c="0" />
--            <distortion model="ptlens" focal="33.4" a="-0.00044" b="0.003954" c="0" />
--            <distortion model="ptlens" focal="40.7" a="0.010042" b="-0.013474" c="0" />
--            <distortion model="ptlens" focal="51" a="-0.005786" b="0.018882" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.018095" b="-0.048162" c="0"/>
-+            <distortion model="ptlens" focal="8.1" a="0.014132" b="-0.032924" c="0"/>
-+            <distortion model="ptlens" focal="8.7" a="-0.00066" b="-0.002438" c="0"/>
-+            <distortion model="ptlens" focal="10.6" a="-0.004167" b="0.008802" c="0"/>
-+            <distortion model="ptlens" focal="12.2" a="0.001366" b="-0.001343" c="0"/>
-+            <distortion model="ptlens" focal="14.3" a="0.000869" b="0.000672" c="0"/>
-+            <distortion model="ptlens" focal="17.5" a="-0.01026" b="0.019351" c="0"/>
-+            <distortion model="ptlens" focal="20.5" a="0.002486" b="-0.001685" c="0"/>
-+            <distortion model="ptlens" focal="25.5" a="0.016746" b="-0.028622" c="0"/>
-+            <distortion model="ptlens" focal="29.3" a="-0.008873" b="0.019679" c="0"/>
-+            <distortion model="ptlens" focal="33.4" a="-0.00044" b="0.003954" c="0"/>
-+            <distortion model="ptlens" focal="40.7" a="0.010042" b="-0.013474" c="0"/>
-+            <distortion model="ptlens" focal="51" a="-0.005786" b="0.018882" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard: 2 feet lens-to-subject</model>
-+        <model>DSC-F828 &amp; compatibles, at 2 feet lens-to-subject</model>
-+        <model lang="en">fixed lens, at 2 feet lens-to-subject</model>
-+        <model lang="de">festes Objektiv, bei 60 cm Fokusabstand</model>
-         <mount>sony828</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.1" a="0.031747" b="-0.075086" c="0" />
--            <distortion model="ptlens" focal="8" a="0.015399" b="-0.03809" c="0" />
--            <distortion model="ptlens" focal="8.7" a="0.014101" b="-0.032049" c="0" />
--            <distortion model="ptlens" focal="10.4" a="0.004335" b="-0.010924" c="0" />
--            <distortion model="ptlens" focal="12.2" a="0.001721" b="-0.004613" c="0" />
--            <distortion model="ptlens" focal="14.9" a="-0.000396" b="-0.000724" c="0" />
--            <distortion model="ptlens" focal="17.1" a="-0.006932" b="0.009088" c="0" />
--            <distortion model="ptlens" focal="20.5" a="-0.000158" b="-0.001579" c="0" />
--            <distortion model="ptlens" focal="24.2" a="-0.000815" b="-0.00117" c="0" />
--            <distortion model="ptlens" focal="28.7" a="-0.002467" b="0.0025" c="0" />
--            <distortion model="ptlens" focal="32.8" a="-0.000607" b="-0.001426" c="0" />
--            <distortion model="ptlens" focal="40.1" a="-0.002333" b="0.002419" c="0" />
--            <distortion model="ptlens" focal="51" a="-0.003365" b="0.002377" c="0" />
-+            <distortion model="ptlens" focal="7.1" a="0.031747" b="-0.075086" c="0"/>
-+            <distortion model="ptlens" focal="8" a="0.015399" b="-0.03809" c="0"/>
-+            <distortion model="ptlens" focal="8.7" a="0.014101" b="-0.032049" c="0"/>
-+            <distortion model="ptlens" focal="10.4" a="0.004335" b="-0.010924" c="0"/>
-+            <distortion model="ptlens" focal="12.2" a="0.001721" b="-0.004613" c="0"/>
-+            <distortion model="ptlens" focal="14.9" a="-0.000396" b="-0.000724" c="0"/>
-+            <distortion model="ptlens" focal="17.1" a="-0.006932" b="0.009088" c="0"/>
-+            <distortion model="ptlens" focal="20.5" a="-0.000158" b="-0.001579" c="0"/>
-+            <distortion model="ptlens" focal="24.2" a="-0.000815" b="-0.00117" c="0"/>
-+            <distortion model="ptlens" focal="28.7" a="-0.002467" b="0.0025" c="0"/>
-+            <distortion model="ptlens" focal="32.8" a="-0.000607" b="-0.001426" c="0"/>
-+            <distortion model="ptlens" focal="40.1" a="-0.002333" b="0.002419" c="0"/>
-+            <distortion model="ptlens" focal="51" a="-0.003365" b="0.002377" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-F707 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.013439" b="-0.038147" c="0" />
--            <distortion model="ptlens" focal="11.7" a="0.00984" b="-0.02115" c="0" />
--            <distortion model="ptlens" focal="12.7" a="0.009803" b="-0.01733" c="0" />
--            <distortion model="ptlens" focal="16" a="0.007957" b="-0.008839" c="0" />
--            <distortion model="ptlens" focal="19.5" a="0.004565" b="-0.000807" c="0" />
--            <distortion model="ptlens" focal="24.4" a="0" b="0.00903" c="0" />
--            <distortion model="ptlens" focal="28.1" a="0" b="0.009803" c="0" />
--            <distortion model="ptlens" focal="31.9" a="0" b="0.009723" c="0" />
--            <distortion model="ptlens" focal="36.1" a="0" b="0.00974" c="0" />
--            <distortion model="ptlens" focal="41.4" a="0" b="0.010245" c="0" />
--            <distortion model="ptlens" focal="48.5" a="0" b="0.012038" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.013439" b="-0.038147" c="0"/>
-+            <distortion model="ptlens" focal="11.7" a="0.00984" b="-0.02115" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="0.009803" b="-0.01733" c="0"/>
-+            <distortion model="ptlens" focal="16" a="0.007957" b="-0.008839" c="0"/>
-+            <distortion model="ptlens" focal="19.5" a="0.004565" b="-0.000807" c="0"/>
-+            <distortion model="ptlens" focal="24.4" a="0" b="0.00903" c="0"/>
-+            <distortion model="ptlens" focal="28.1" a="0" b="0.009803" c="0"/>
-+            <distortion model="ptlens" focal="31.9" a="0" b="0.009723" c="0"/>
-+            <distortion model="ptlens" focal="36.1" a="0" b="0.00974" c="0"/>
-+            <distortion model="ptlens" focal="41.4" a="0" b="0.010245" c="0"/>
-+            <distortion model="ptlens" focal="48.5" a="0" b="0.012038" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 1 inch lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 1 inch lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 1 inch lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 1 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.006106" b="-0.039021" c="0" />
--            <distortion model="ptlens" focal="10.9" a="0.001231" b="-0.028795" c="0" />
--            <distortion model="ptlens" focal="11" a="0.001246" b="-0.027783" c="0" />
--            <distortion model="ptlens" focal="11.9" a="-0.003364" b="-0.017023" c="0" />
--            <distortion model="ptlens" focal="12.7" a="-0.0067" b="-0.007913" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.006106" b="-0.039021" c="0"/>
-+            <distortion model="ptlens" focal="10.9" a="0.001231" b="-0.028795" c="0"/>
-+            <distortion model="ptlens" focal="11" a="0.001246" b="-0.027783" c="0"/>
-+            <distortion model="ptlens" focal="11.9" a="-0.003364" b="-0.017023" c="0"/>
-+            <distortion model="ptlens" focal="12.7" a="-0.0067" b="-0.007913" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 2 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 2 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 2 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 2 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.006526" b="-0.03487" c="0" />
--            <distortion model="ptlens" focal="10.9" a="-0.002841" b="-0.015131" c="0" />
--            <distortion model="ptlens" focal="12.2" a="0.00522" b="-0.028071" c="0" />
--            <distortion model="ptlens" focal="13.4" a="0.00207" b="-0.019368" c="0" />
--            <distortion model="ptlens" focal="14.6" a="0.000187" b="-0.014489" c="0" />
--            <distortion model="ptlens" focal="15.5" a="-0.001112" b="-0.01061" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.006526" b="-0.03487" c="0"/>
-+            <distortion model="ptlens" focal="10.9" a="-0.002841" b="-0.015131" c="0"/>
-+            <distortion model="ptlens" focal="12.2" a="0.00522" b="-0.028071" c="0"/>
-+            <distortion model="ptlens" focal="13.4" a="0.00207" b="-0.019368" c="0"/>
-+            <distortion model="ptlens" focal="14.6" a="0.000187" b="-0.014489" c="0"/>
-+            <distortion model="ptlens" focal="15.5" a="-0.001112" b="-0.01061" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 4 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 4 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 4 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 4 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.011414" b="-0.041732" c="0" />
--            <distortion model="ptlens" focal="10.2" a="0.011525" b="-0.041182" c="0" />
--            <distortion model="ptlens" focal="11.4" a="0.005654" b="-0.02482" c="0" />
--            <distortion model="ptlens" focal="12" a="0.007988" b="-0.028628" c="0" />
--            <distortion model="ptlens" focal="12.4" a="0.007251" b="-0.026438" c="0" />
--            <distortion model="ptlens" focal="13.7" a="0.005559" b="-0.021097" c="0" />
--            <distortion model="ptlens" focal="16.2" a="0.000227" b="-0.007708" c="0" />
--            <distortion model="ptlens" focal="18.3" a="0.005302" b="-0.015272" c="0" />
--            <distortion model="ptlens" focal="19.8" a="0.000277" b="-0.004201" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.011414" b="-0.041732" c="0"/>
-+            <distortion model="ptlens" focal="10.2" a="0.011525" b="-0.041182" c="0"/>
-+            <distortion model="ptlens" focal="11.4" a="0.005654" b="-0.02482" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0.007988" b="-0.028628" c="0"/>
-+            <distortion model="ptlens" focal="12.4" a="0.007251" b="-0.026438" c="0"/>
-+            <distortion model="ptlens" focal="13.7" a="0.005559" b="-0.021097" c="0"/>
-+            <distortion model="ptlens" focal="16.2" a="0.000227" b="-0.007708" c="0"/>
-+            <distortion model="ptlens" focal="18.3" a="0.005302" b="-0.015272" c="0"/>
-+            <distortion model="ptlens" focal="19.8" a="0.000277" b="-0.004201" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 6 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 6 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 6 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 6 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.010005" b="-0.036568" c="0" />
--            <distortion model="ptlens" focal="11.6" a="0.007818" b="-0.025626" c="0" />
--            <distortion model="ptlens" focal="13.4" a="0.008336" b="-0.023635" c="0" />
--            <distortion model="ptlens" focal="16.2" a="0.003258" b="-0.010335" c="0" />
--            <distortion model="ptlens" focal="18.5" a="0.002886" b="-0.007316" c="0" />
--            <distortion model="ptlens" focal="21.7" a="-0.000938" b="0.000754" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.010005" b="-0.036568" c="0"/>
-+            <distortion model="ptlens" focal="11.6" a="0.007818" b="-0.025626" c="0"/>
-+            <distortion model="ptlens" focal="13.4" a="0.008336" b="-0.023635" c="0"/>
-+            <distortion model="ptlens" focal="16.2" a="0.003258" b="-0.010335" c="0"/>
-+            <distortion model="ptlens" focal="18.5" a="0.002886" b="-0.007316" c="0"/>
-+            <distortion model="ptlens" focal="21.7" a="-0.000938" b="0.000754" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 8 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 8 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 8 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 8 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.008828" b="-0.033454" c="0" />
--            <distortion model="ptlens" focal="10" a="0.009809" b="-0.034654" c="0" />
--            <distortion model="ptlens" focal="12.3" a="0.00792" b="-0.023487" c="0" />
--            <distortion model="ptlens" focal="14" a="0.008493" b="-0.022144" c="0" />
--            <distortion model="ptlens" focal="15.7" a="0.007818" b="-0.018959" c="0" />
--            <distortion model="ptlens" focal="17.6" a="0.007518" b="-0.01686" c="0" />
--            <distortion model="ptlens" focal="20" a="0.007483" b="-0.01459" c="0" />
--            <distortion model="ptlens" focal="21.7" a="0.00499" b="-0.009241" c="0" />
--            <distortion model="ptlens" focal="23.5" a="0.008569" b="-0.01449" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.008828" b="-0.033454" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0.009809" b="-0.034654" c="0"/>
-+            <distortion model="ptlens" focal="12.3" a="0.00792" b="-0.023487" c="0"/>
-+            <distortion model="ptlens" focal="14" a="0.008493" b="-0.022144" c="0"/>
-+            <distortion model="ptlens" focal="15.7" a="0.007818" b="-0.018959" c="0"/>
-+            <distortion model="ptlens" focal="17.6" a="0.007518" b="-0.01686" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.007483" b="-0.01459" c="0"/>
-+            <distortion model="ptlens" focal="21.7" a="0.00499" b="-0.009241" c="0"/>
-+            <distortion model="ptlens" focal="23.5" a="0.008569" b="-0.01449" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 12 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 12 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 12 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 12 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.005441" b="-0.026284" c="0" />
--            <distortion model="ptlens" focal="11.8" a="0.002698" b="-0.013035" c="0" />
--            <distortion model="ptlens" focal="13.7" a="0.002173" b="-0.007676" c="0" />
--            <distortion model="ptlens" focal="16" a="0.001309" b="-0.003671" c="0" />
--            <distortion model="ptlens" focal="20.3" a="-0.00041" b="0.001674" c="0" />
--            <distortion model="ptlens" focal="23.2" a="-0.000971" b="0.004488" c="0" />
--            <distortion model="ptlens" focal="26.2" a="0.001346" b="0.001204" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.005441" b="-0.026284" c="0"/>
-+            <distortion model="ptlens" focal="11.8" a="0.002698" b="-0.013035" c="0"/>
-+            <distortion model="ptlens" focal="13.7" a="0.002173" b="-0.007676" c="0"/>
-+            <distortion model="ptlens" focal="16" a="0.001309" b="-0.003671" c="0"/>
-+            <distortion model="ptlens" focal="20.3" a="-0.00041" b="0.001674" c="0"/>
-+            <distortion model="ptlens" focal="23.2" a="-0.000971" b="0.004488" c="0"/>
-+            <distortion model="ptlens" focal="26.2" a="0.001346" b="0.001204" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 16 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 16 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 16 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 16 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.003516" b="-0.019643" c="0" />
--            <distortion model="ptlens" focal="10" a="0.006212" b="-0.024486" c="0" />
--            <distortion model="ptlens" focal="11.8" a="0.005146" b="-0.014241" c="0" />
--            <distortion model="ptlens" focal="14.4" a="-0.001178" b="0.002261" c="0" />
--            <distortion model="ptlens" focal="17.2" a="-0.004022" b="0.010283" c="0" />
--            <distortion model="ptlens" focal="19.8" a="-0.006228" b="0.0155" c="0" />
--            <distortion model="ptlens" focal="22.2" a="-0.006146" b="0.016116" c="0" />
--            <distortion model="ptlens" focal="25.1" a="-0.005856" b="0.016421" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.003516" b="-0.019643" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0.006212" b="-0.024486" c="0"/>
-+            <distortion model="ptlens" focal="11.8" a="0.005146" b="-0.014241" c="0"/>
-+            <distortion model="ptlens" focal="14.4" a="-0.001178" b="0.002261" c="0"/>
-+            <distortion model="ptlens" focal="17.2" a="-0.004022" b="0.010283" c="0"/>
-+            <distortion model="ptlens" focal="19.8" a="-0.006228" b="0.0155" c="0"/>
-+            <distortion model="ptlens" focal="22.2" a="-0.006146" b="0.016116" c="0"/>
-+            <distortion model="ptlens" focal="25.1" a="-0.005856" b="0.016421" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 20 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 20 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 20 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 20 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.007797" b="-0.028559" c="0" />
--            <distortion model="ptlens" focal="11.3" a="0.005268" b="-0.015619" c="0" />
--            <distortion model="ptlens" focal="13.2" a="0.00529" b="-0.010754" c="0" />
--            <distortion model="ptlens" focal="15.7" a="0.000909" b="0.000249" c="0" />
--            <distortion model="ptlens" focal="19" a="-0.001878" b="0.007994" c="0" />
--            <distortion model="ptlens" focal="23.8" a="-0.005316" b="0.015693" c="0" />
--            <distortion model="ptlens" focal="27.3" a="-0.002718" b="0.011242" c="0" />
--            <distortion model="ptlens" focal="31" a="-0.005955" b="0.017757" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.007797" b="-0.028559" c="0"/>
-+            <distortion model="ptlens" focal="11.3" a="0.005268" b="-0.015619" c="0"/>
-+            <distortion model="ptlens" focal="13.2" a="0.00529" b="-0.010754" c="0"/>
-+            <distortion model="ptlens" focal="15.7" a="0.000909" b="0.000249" c="0"/>
-+            <distortion model="ptlens" focal="19" a="-0.001878" b="0.007994" c="0"/>
-+            <distortion model="ptlens" focal="23.8" a="-0.005316" b="0.015693" c="0"/>
-+            <distortion model="ptlens" focal="27.3" a="-0.002718" b="0.011242" c="0"/>
-+            <distortion model="ptlens" focal="31" a="-0.005955" b="0.017757" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 24 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 24 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 24 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 24 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.010658" b="-0.033833" c="0" />
--            <distortion model="ptlens" focal="11.7" a="0.005202" b="-0.013888" c="0" />
--            <distortion model="ptlens" focal="13.8" a="-4.8e-05" b="0.000712" c="0" />
--            <distortion model="ptlens" focal="16.8" a="0.000439" b="0.002163" c="0" />
--            <distortion model="ptlens" focal="20.8" a="-0.003775" b="0.012109" c="0" />
--            <distortion model="ptlens" focal="26.9" a="-0.004368" b="0.014947" c="0" />
--            <distortion model="ptlens" focal="30.1" a="-0.007381" b="0.021336" c="0" />
--            <distortion model="ptlens" focal="32.3" a="0.001832" b="0.004546" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.010658" b="-0.033833" c="0"/>
-+            <distortion model="ptlens" focal="11.7" a="0.005202" b="-0.013888" c="0"/>
-+            <distortion model="ptlens" focal="13.8" a="-4.8e-05" b="0.000712" c="0"/>
-+            <distortion model="ptlens" focal="16.8" a="0.000439" b="0.002163" c="0"/>
-+            <distortion model="ptlens" focal="20.8" a="-0.003775" b="0.012109" c="0"/>
-+            <distortion model="ptlens" focal="26.9" a="-0.004368" b="0.014947" c="0"/>
-+            <distortion model="ptlens" focal="30.1" a="-0.007381" b="0.021336" c="0"/>
-+            <distortion model="ptlens" focal="32.3" a="0.001832" b="0.004546" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>std macro: 32 inches lens-to-subject</model>
-+        <model>DSC-F707 &amp; compatibles, macro at 32 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro at 32 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro bei 32 Zoll Fokusabstand</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.011238" b="-0.03276" c="0" />
--            <distortion model="ptlens" focal="11.7" a="0.010299" b="-0.022773" c="0" />
--            <distortion model="ptlens" focal="12.9" a="0.006434" b="-0.011551" c="0" />
--            <distortion model="ptlens" focal="16" a="0.00257" b="-0.000701" c="0" />
--            <distortion model="ptlens" focal="20.8" a="-0.000547" b="0.007442" c="0" />
--            <distortion model="ptlens" focal="25.8" a="-0.002161" b="0.011043" c="0" />
--            <distortion model="ptlens" focal="32.8" a="-0.003287" b="0.014812" c="0" />
--            <distortion model="ptlens" focal="41.9" a="-0.004935" b="0.018777" c="0" />
--            <distortion model="ptlens" focal="48.5" a="0.004262" b="0.000662" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.011238" b="-0.03276" c="0"/>
-+            <distortion model="ptlens" focal="11.7" a="0.010299" b="-0.022773" c="0"/>
-+            <distortion model="ptlens" focal="12.9" a="0.006434" b="-0.011551" c="0"/>
-+            <distortion model="ptlens" focal="16" a="0.00257" b="-0.000701" c="0"/>
-+            <distortion model="ptlens" focal="20.8" a="-0.000547" b="0.007442" c="0"/>
-+            <distortion model="ptlens" focal="25.8" a="-0.002161" b="0.011043" c="0"/>
-+            <distortion model="ptlens" focal="32.8" a="-0.003287" b="0.014812" c="0"/>
-+            <distortion model="ptlens" focal="41.9" a="-0.004935" b="0.018777" c="0"/>
-+            <distortion model="ptlens" focal="48.5" a="0.004262" b="0.000662" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>VCL-HGD0758 Wide Angle</model>
-+        <model>DSC-F707 &amp; compatibles, with VCL-HGD0758 wide angle</model>
-+        <model lang="en">fixed lens, with VCL-HGD0758 wide angle</model>
-+        <model lang="de">festes Objektiv, mit VCL-HGD0758 Weitwinkel</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="0.016774" b="-0.047703" c="0" />
--            <distortion model="ptlens" focal="11" a="0.009581" b="-0.02965" c="0" />
--            <distortion model="ptlens" focal="12" a="0.008705" b="-0.025049" c="0" />
--            <distortion model="ptlens" focal="13.4" a="0.004145" b="-0.011484" c="0" />
--            <distortion model="ptlens" focal="15.5" a="0.0037" b="-0.008603" c="0" />
--            <distortion model="ptlens" focal="17.6" a="0.003904" b="-0.007234" c="0" />
--            <distortion model="ptlens" focal="20.8" a="-0.002051" b="0.005661" c="0" />
--            <distortion model="ptlens" focal="24.1" a="-0.001926" b="0.007451" c="0" />
--            <distortion model="ptlens" focal="28.5" a="0.004636" b="-0.003879" c="0" />
--            <distortion model="ptlens" focal="33.3" a="0.002188" b="0.002064" c="0" />
--            <distortion model="ptlens" focal="38.7" a="0.004276" b="-0.001513" c="0" />
--            <distortion model="ptlens" focal="48.5" a="0.0019" b="0.005193" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="0.016774" b="-0.047703" c="0"/>
-+            <distortion model="ptlens" focal="11" a="0.009581" b="-0.02965" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0.008705" b="-0.025049" c="0"/>
-+            <distortion model="ptlens" focal="13.4" a="0.004145" b="-0.011484" c="0"/>
-+            <distortion model="ptlens" focal="15.5" a="0.0037" b="-0.008603" c="0"/>
-+            <distortion model="ptlens" focal="17.6" a="0.003904" b="-0.007234" c="0"/>
-+            <distortion model="ptlens" focal="20.8" a="-0.002051" b="0.005661" c="0"/>
-+            <distortion model="ptlens" focal="24.1" a="-0.001926" b="0.007451" c="0"/>
-+            <distortion model="ptlens" focal="28.5" a="0.004636" b="-0.003879" c="0"/>
-+            <distortion model="ptlens" focal="33.3" a="0.002188" b="0.002064" c="0"/>
-+            <distortion model="ptlens" focal="38.7" a="0.004276" b="-0.001513" c="0"/>
-+            <distortion model="ptlens" focal="48.5" a="0.0019" b="0.005193" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Sakar 1858W</model>
-+        <model>DSC-F707 &amp; compatibles, with Sakar 1858W</model>
-+        <model lang="en">fixed lens, with Sakar 1858W</model>
-+        <model lang="de">festes Objektiv, mit Sakar 1858W</model>
-         <mount>sony707</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9.7" a="-0.002331" b="0.001991" c="-0.087683" />
--            <distortion model="ptlens" focal="11.2" a="0.007839" b="-0.04002" c="0" />
--            <distortion model="ptlens" focal="15.5" a="0.003505" b="-0.0146" c="0" />
--            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="30.1" a="0" b="0.003841" c="0" />
--            <distortion model="ptlens" focal="48.5" a="0" b="0.008175" c="0" />
-+            <distortion model="ptlens" focal="9.7" a="-0.002331" b="0.001991" c="-0.087683"/>
-+            <distortion model="ptlens" focal="11.2" a="0.007839" b="-0.04002" c="0"/>
-+            <distortion model="ptlens" focal="15.5" a="0.003505" b="-0.0146" c="0"/>
-+            <distortion model="ptlens" focal="20.8" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="30.1" a="0" b="0.003841" c="0"/>
-+            <distortion model="ptlens" focal="48.5" a="0" b="0.008175" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-W1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyW1</mount>
-         <cropfactor>4.8</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7.9" a="-0.008279" b="0.002007" c="0" />
--            <distortion model="ptlens" focal="9.2" a="-0.007809" b="0.005" c="0" />
--            <distortion model="ptlens" focal="10.7" a="-0.007003" b="0.007151" c="0" />
--            <distortion model="ptlens" focal="12.1" a="-0.009672" b="0.0148" c="0" />
--            <distortion model="ptlens" focal="13.7" a="-0.007984" b="0.013" c="0" />
--            <distortion model="ptlens" focal="16.7" a="-0.006571" b="0.011638" c="0" />
--            <distortion model="ptlens" focal="18.7" a="-0.007423" b="0.014476" c="0" />
--            <distortion model="ptlens" focal="23.7" a="-0.00342" b="0.006814" c="0" />
-+            <distortion model="ptlens" focal="7.9" a="-0.008279" b="0.002007" c="0"/>
-+            <distortion model="ptlens" focal="9.2" a="-0.007809" b="0.005" c="0"/>
-+            <distortion model="ptlens" focal="10.7" a="-0.007003" b="0.007151" c="0"/>
-+            <distortion model="ptlens" focal="12.1" a="-0.009672" b="0.0148" c="0"/>
-+            <distortion model="ptlens" focal="13.7" a="-0.007984" b="0.013" c="0"/>
-+            <distortion model="ptlens" focal="16.7" a="-0.006571" b="0.011638" c="0"/>
-+            <distortion model="ptlens" focal="18.7" a="-0.007423" b="0.014476" c="0"/>
-+            <distortion model="ptlens" focal="23.7" a="-0.00342" b="0.006814" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-V1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyV1</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.020149" b="-0.051282" c="0" />
--            <distortion model="ptlens" focal="8.4" a="0.009589" b="-0.02989" c="0" />
--            <distortion model="ptlens" focal="9.9" a="0.005758" b="-0.01638" c="0" />
--            <distortion model="ptlens" focal="11.8" a="0.004149" b="-0.008145" c="0" />
--            <distortion model="ptlens" focal="13.9" a="0.003385" b="-0.003763" c="0" />
--            <distortion model="ptlens" focal="16.5" a="0" b="0.004756" c="0" />
--            <distortion model="ptlens" focal="19.7" a="0" b="0.005925" c="0" />
--            <distortion model="ptlens" focal="23.4" a="0" b="0.006385" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="0.00446" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.020149" b="-0.051282" c="0"/>
-+            <distortion model="ptlens" focal="8.4" a="0.009589" b="-0.02989" c="0"/>
-+            <distortion model="ptlens" focal="9.9" a="0.005758" b="-0.01638" c="0"/>
-+            <distortion model="ptlens" focal="11.8" a="0.004149" b="-0.008145" c="0"/>
-+            <distortion model="ptlens" focal="13.9" a="0.003385" b="-0.003763" c="0"/>
-+            <distortion model="ptlens" focal="16.5" a="0" b="0.004756" c="0"/>
-+            <distortion model="ptlens" focal="19.7" a="0" b="0.005925" c="0"/>
-+            <distortion model="ptlens" focal="23.4" a="0" b="0.006385" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0.00446" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>VCL-DEH07V Converter</model>
-+        <model>DSC-V1 &amp; compatibles, with VCL-DEH07V converter</model>
-+        <model lang="en">fixed lens, with VCL-DEH07V converter</model>
-+        <model lang="de">festes Objektiv, mit VCL-DEH07V-Konverter</model>
-         <mount>sonyV1</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.045731" b="-0.098626" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.045731" b="-0.098626" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>VCL-DEH17V Converter</model>
-+        <model>DSC-V1 &amp; compatibles, with VCL-DEH17V converter</model>
-+        <model lang="en">fixed lens, with VCL-DEH17V converter</model>
-+        <model lang="de">festes Objektiv, mit VCL-DEH17V-Konverter</model>
-         <mount>sonyV1</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="0.009101" c="0" />
-+            <distortion model="poly3" focal="28" k1="0.009101"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-T1 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyT1</mount>
-         <cropfactor>5.650</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6.7" a="0" b="-0.014873" c="0" />
--            <distortion model="ptlens" focal="7.7" a="0" b="-0.006302" c="0" />
--            <distortion model="ptlens" focal="9.1" a="0" b="0.008439" c="-0.020907" />
--            <distortion model="ptlens" focal="10.8" a="0" b="0.017351" c="-0.032506" />
--            <distortion model="ptlens" focal="13" a="0" b="0.017565" c="-0.023987" />
--            <distortion model="ptlens" focal="15.4" a="0" b="0.015416" c="-0.016469" />
--            <distortion model="ptlens" focal="17.8" a="0" b="0.019638" c="-0.022392" />
--            <distortion model="ptlens" focal="20.1" a="0" b="0.020712" c="-0.027228" />
-+            <distortion model="ptlens" focal="6.7" a="0" b="-0.014873" c="0"/>
-+            <distortion model="ptlens" focal="7.7" a="0" b="-0.006302" c="0"/>
-+            <distortion model="ptlens" focal="9.1" a="0" b="0.008439" c="-0.020907"/>
-+            <distortion model="ptlens" focal="10.8" a="0" b="0.017351" c="-0.032506"/>
-+            <distortion model="ptlens" focal="13" a="0" b="0.017565" c="-0.023987"/>
-+            <distortion model="ptlens" focal="15.4" a="0" b="0.015416" c="-0.016469"/>
-+            <distortion model="ptlens" focal="17.8" a="0" b="0.019638" c="-0.022392"/>
-+            <distortion model="ptlens" focal="20.1" a="0" b="0.020712" c="-0.027228"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-S85 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyS85</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.014946" b="-0.03766" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.014946" b="-0.03766" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>VCL-MHG07a</model>
-+        <model>DSC-S85 &amp; compatibles, with VCL-MHG07a converter</model>
-+        <model lang="en">fixed lens, with VCL-MHG07a converter</model>
-+        <model lang="de">festes Objektiv, mit VCL-MHG07a-Konverter</model>
-         <mount>sonyS85</mount>
-         <cropfactor>4.843</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="0.03951" b="-0.094976" c="0" />
-+            <distortion model="ptlens" focal="7" a="0.03951" b="-0.094976" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Carl Zeiss</maker>
--        <model>Standard</model>
-+        <model>DSC-S60 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyS60</mount>
-         <cropfactor>6.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="6" a="0.003091" b="-0.022634" c="0" />
--            <distortion model="ptlens" focal="6.8" a="0" b="-0.011585" c="0" />
--            <distortion model="ptlens" focal="7.8" a="0" b="-0.008459" c="0" />
--            <distortion model="ptlens" focal="8.9" a="0" b="-0.006522" c="0" />
--            <distortion model="ptlens" focal="10.3" a="0" b="-0.004379" c="0" />
--            <distortion model="ptlens" focal="11.6" a="0" b="-0.005021" c="0" />
--            <distortion model="ptlens" focal="13.6" a="0" b="-0.0056" c="0" />
--            <distortion model="ptlens" focal="15.6" a="0" b="-0.004708" c="0" />
--            <distortion model="ptlens" focal="18" a="0" b="-0.004799" c="0" />
-+            <distortion model="ptlens" focal="6" a="0.003091" b="-0.022634" c="0"/>
-+            <distortion model="ptlens" focal="6.8" a="0" b="-0.011585" c="0"/>
-+            <distortion model="ptlens" focal="7.8" a="0" b="-0.008459" c="0"/>
-+            <distortion model="ptlens" focal="8.9" a="0" b="-0.006522" c="0"/>
-+            <distortion model="ptlens" focal="10.3" a="0" b="-0.004379" c="0"/>
-+            <distortion model="ptlens" focal="11.6" a="0" b="-0.005021" c="0"/>
-+            <distortion model="ptlens" focal="13.6" a="0" b="-0.0056" c="0"/>
-+            <distortion model="ptlens" focal="15.6" a="0" b="-0.004708" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0" b="-0.004799" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>RX100</model>
--        <focal value="10.4" />
-+        <model>DSC-RX100 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>sonyRX100</mount>
-+        <focal min="10.4" max="37.1"/>
-         <cropfactor>2.73</cropfactor>
-         <calibration>
--            <distortion focal="10.4" model="ptlens" a="0.00836" b="-0.05316" c="-0.02788" />
--            <distortion focal="12.8" model="ptlens" a="0.00891" b="-0.06095" c="0.02196" />
--            <distortion focal="14.9" model="ptlens" a="-0.00571" b="0.00909" c="-0.06449" />
--            <distortion focal="16.6" model="ptlens" a="-0.00428" b="-0.01113" c="0.0042" />
--            <distortion focal="19.1" model="ptlens" a="0.00523" b="-0.03743" c="0.03369" />
--            <distortion focal="20.4" model="ptlens" a="-0.00312" b="-0.00368" c="-0.0036" />
--            <distortion focal="23.3" model="ptlens" a="-0.00222" b="-0.00843" c="0.01379" />
--            <distortion focal="25" model="ptlens" a="-0.00565" b="0.0037" c="0.00318" />
--            <distortion focal="26.9" model="ptlens" a="-0.00245" b="-0.00859" c="0.01924" />
--            <distortion focal="28.8" model="ptlens" a="-0.00842" b="0.0158" c="-0.01114" />
--            <distortion focal="33.2" model="ptlens" a="-0.01065" b="0.02132" c="-0.01154" />
--            <distortion focal="37.1" model="ptlens" a="0.00226" b="-0.02401" c="0.0397" />
-+            <distortion model="ptlens" focal="10.4" a="0.01545" b="-0.08481" c="0.01241"/>
-+            <distortion model="ptlens" focal="10.5" a="0.01626" b="-0.08787" c="0.01927"/>
-+            <distortion model="ptlens" focal="11" a="0.01399" b="-0.08007" c="0.01782"/>
-+            <distortion model="ptlens" focal="11.9" a="0.00893" b="-0.06134" c="0.01024"/>
-+            <distortion model="ptlens" focal="12.3" a="0.00845" b="-0.06008" c="0.01686"/>
-+            <distortion model="ptlens" focal="12.6" a="0.00961" b="-0.06359" c="0.02584"/>
-+            <distortion model="ptlens" focal="13.6" a="0.00609" b="-0.05032" c="0.01908"/>
-+            <distortion model="ptlens" focal="14.2" a="0.00302" b="-0.03672" c="0.01188"/>
-+            <distortion model="ptlens" focal="14.6" a="0.00352" b="-0.03932" c="0.01669"/>
-+            <distortion model="ptlens" focal="15.3" a="0.00209" b="-0.03384" c="0.01502"/>
-+            <distortion model="ptlens" focal="16.4" a="0.00077" b="-0.02669" c="0.01369"/>
-+            <distortion model="ptlens" focal="17.2" a="0.00265" b="-0.03145" c="0.02022"/>
-+            <distortion model="ptlens" focal="17.4" a="-0.00228" b="-0.01227" c="0.00127"/>
-+            <distortion model="ptlens" focal="18.7" a="-0.00131" b="-0.01567" c="0.0091"/>
-+            <distortion model="ptlens" focal="20" a="-0.00192" b="-0.00977" c="0.00312"/>
-+            <distortion model="ptlens" focal="20.4" a="-0.00107" b="-0.01519" c="0.01405"/>
-+            <distortion model="ptlens" focal="21.3" a="-0.00504" b="-0.00065" c="0.00061"/>
-+            <distortion model="ptlens" focal="22.5" a="-0.00238" b="-0.00734" c="0.00716"/>
-+            <distortion model="ptlens" focal="22.7" a="-0.00235" b="-0.00695" c="0.00775"/>
-+            <distortion model="ptlens" focal="24.1" a="-0.00183" b="-0.00986" c="0.01416"/>
-+            <distortion model="ptlens" focal="25.3" a="-0.0031" b="-0.00379" c="0.00842"/>
-+            <distortion model="ptlens" focal="27.2" a="-0.00188" b="-0.00871" c="0.0151"/>
-+            <distortion model="ptlens" focal="28.5" a="-0.00256" b="-0.00394" c="0.00904"/>
-+            <distortion model="ptlens" focal="28.8" a="-0.00092" b="-0.01079" c="0.01804"/>
-+            <distortion model="ptlens" focal="30.5" a="-0.00415" b="0.00132" c="0.00385"/>
-+            <distortion model="ptlens" focal="31.5" a="-0.00456" b="0.00351" c="0.00105"/>
-+            <distortion model="ptlens" focal="33.9" a="-0.00265" b="-0.00167" c="0.00464"/>
-+            <distortion model="ptlens" focal="34.9" a="-0.00212" b="-0.00435" c="0.00905"/>
-+            <distortion model="ptlens" focal="36.6" a="-0.00247" b="-0.00236" c="0.00582"/>
-+            <distortion model="ptlens" focal="37" a="-0.00349" b="0.00154" c="0.00098"/>
-+            <distortion model="ptlens" focal="37.1" a="-0.00271" b="-0.00118" c="0.00412"/>
-+            <tca model="poly3" focal="10.4" br="0.0002342" vr="1.0001550" bb="-0.0001554" vb="1.0004942"/>
-+            <tca model="poly3" focal="10.5" br="0.0002463" vr="1.0001198" bb="-0.0001306" vb="1.0004317"/>
-+            <tca model="poly3" focal="11" br="0.0002368" vr="1.0001749" bb="-0.0001164" vb="1.0003703"/>
-+            <tca model="poly3" focal="11.9" br="0.0002203" vr="1.0002392" bb="-0.0001186" vb="1.0003039"/>
-+            <tca model="poly3" focal="12.3" br="0.0002004" vr="1.0002655" bb="-0.0001209" vb="1.0002965"/>
-+            <tca model="poly3" focal="12.6" br="0.0001974" vr="1.0002404" bb="-0.0000958" vb="1.0002659"/>
-+            <tca model="poly3" focal="13.6" br="0.0001659" vr="1.0002605" bb="-0.0000997" vb="1.0002604"/>
-+            <tca model="poly3" focal="14.2" br="0.0001257" vr="1.0002471" bb="-0.0000798" vb="1.0002490"/>
-+            <tca model="poly3" focal="14.6" br="0.0001403" vr="1.0002301" bb="-0.0000759" vb="1.0002271"/>
-+            <tca model="poly3" focal="15.3" br="0.0001234" vr="1.0002022" bb="-0.0000695" vb="1.0002019"/>
-+            <tca model="poly3" focal="16.4" br="0.0000620" vr="1.0002378" bb="-0.0000676" vb="1.0001978"/>
-+            <tca model="poly3" focal="17.2" br="0.0000527" vr="1.0002461" bb="-0.0000601" vb="1.0001940"/>
-+            <tca model="poly3" focal="17.4" br="0.0000358" vr="1.0002497" bb="-0.0000560" vb="1.0001913"/>
-+            <tca model="poly3" focal="18.7" br="0.0000253" vr="1.0002263" bb="-0.0000490" vb="1.0001715"/>
-+            <tca model="poly3" focal="20" br="0.0000199" vr="1.0002162" bb="-0.0000511" vb="1.0001707"/>
-+            <tca model="poly3" focal="20.4" br="0.0000414" vr="1.0001780" bb="-0.0000436" vb="1.0001611"/>
-+            <tca model="poly3" focal="21.3" br="0.0000417" vr="1.0001842" bb="-0.0000376" vb="1.0001561"/>
-+            <tca model="poly3" focal="22.5" br="0.0000040" vr="1.0001884" bb="-0.0000404" vb="1.0001393"/>
-+            <tca model="poly3" focal="22.7" br="-0.0000082" vr="1.0002098" bb="-0.0000274" vb="1.0001262"/>
-+            <tca model="poly3" focal="24.1" br="0.0000091" vr="1.0002030" bb="-0.0000354" vb="1.0001363"/>
-+            <tca model="poly3" focal="25.3" br="0.0000076" vr="1.0001528" bb="-0.0000459" vb="1.0001618"/>
-+            <tca model="poly3" focal="27.2" br="-0.0000282" vr="1.0002109" bb="-0.0000426" vb="1.0001308"/>
-+            <tca model="poly3" focal="28.5" br="-0.0000386" vr="1.0001745" bb="-0.0000564" vb="1.0001661"/>
-+            <tca model="poly3" focal="28.8" br="-0.0000182" vr="1.0001582" bb="-0.0000477" vb="1.0001482"/>
-+            <tca model="poly3" focal="30.5" br="-0.0000354" vr="1.0001600" bb="-0.0000419" vb="1.0001247"/>
-+            <tca model="poly3" focal="31.5" br="-0.0000311" vr="1.0001766" bb="-0.0000439" vb="1.0001142"/>
-+            <tca model="poly3" focal="33.9" br="-0.0000328" vr="1.0001196" bb="-0.0000508" vb="1.0001311"/>
-+            <tca model="poly3" focal="34.9" br="-0.0000372" vr="1.0001175" bb="-0.0000599" vb="1.0001487"/>
-+            <tca model="poly3" focal="36.6" br="-0.0000291" vr="1.0001111" bb="-0.0000474" vb="1.0001054"/>
-+            <tca model="poly3" focal="37" br="-0.0000219" vr="1.0001117" bb="-0.0000363" vb="1.0000888"/>
-+            <tca model="poly3" focal="37.1" br="-0.0000370" vr="1.0001328" bb="-0.0000389" vb="1.0000566"/>
-+            <vignetting model="pa" focal="10.4" aperture="1.8" distance="10" k1="-0.8321" k2="1.2846" k3="-1.0229"/>
-+            <vignetting model="pa" focal="10.4" aperture="1.8" distance="1000" k1="-0.8321" k2="1.2846" k3="-1.0229"/>
-+            <vignetting model="pa" focal="10.4" aperture="2" distance="10" k1="-0.7935" k2="1.0734" k3="-0.8346"/>
-+            <vignetting model="pa" focal="10.4" aperture="2" distance="1000" k1="-0.7935" k2="1.0734" k3="-0.8346"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.2" distance="10" k1="-0.6079" k2="0.5105" k3="-0.4177"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.2" distance="1000" k1="-0.6079" k2="0.5105" k3="-0.4177"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.5" distance="10" k1="-0.5136" k2="0.2018" k3="-0.1792"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.5" distance="1000" k1="-0.5136" k2="0.2018" k3="-0.1792"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.8" distance="10" k1="-0.5153" k2="0.1626" k3="-0.1250"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.8" distance="1000" k1="-0.5153" k2="0.1626" k3="-0.1250"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.2" distance="10" k1="-0.4034" k2="-0.0160" k3="-0.0352"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.2" distance="1000" k1="-0.4034" k2="-0.0160" k3="-0.0352"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.5" distance="10" k1="-0.3601" k2="-0.0278" k3="-0.0512"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.5" distance="1000" k1="-0.3601" k2="-0.0278" k3="-0.0512"/>
-+            <vignetting model="pa" focal="10.4" aperture="4" distance="10" k1="-0.3654" k2="0.0623" k3="-0.1222"/>
-+            <vignetting model="pa" focal="10.4" aperture="4" distance="1000" k1="-0.3654" k2="0.0623" k3="-0.1222"/>
-+            <vignetting model="pa" focal="10.4" aperture="4.5" distance="10" k1="-0.4127" k2="0.2516" k3="-0.2743"/>
-+            <vignetting model="pa" focal="10.4" aperture="4.5" distance="1000" k1="-0.4127" k2="0.2516" k3="-0.2743"/>
-+            <vignetting model="pa" focal="10.4" aperture="5" distance="10" k1="-0.4689" k2="0.4299" k3="-0.4132"/>
-+            <vignetting model="pa" focal="10.4" aperture="5" distance="1000" k1="-0.4689" k2="0.4299" k3="-0.4132"/>
-+            <vignetting model="pa" focal="10.4" aperture="5.6" distance="10" k1="-0.5018" k2="0.4860" k3="-0.4574"/>
-+            <vignetting model="pa" focal="10.4" aperture="5.6" distance="1000" k1="-0.5018" k2="0.4860" k3="-0.4574"/>
-+            <vignetting model="pa" focal="10.4" aperture="6.3" distance="10" k1="-0.5447" k2="0.6030" k3="-0.5152"/>
-+            <vignetting model="pa" focal="10.4" aperture="6.3" distance="1000" k1="-0.5447" k2="0.6030" k3="-0.5152"/>
-+            <vignetting model="pa" focal="10.4" aperture="7.1" distance="10" k1="-0.5713" k2="0.6539" k3="-0.5207"/>
-+            <vignetting model="pa" focal="10.4" aperture="7.1" distance="1000" k1="-0.5713" k2="0.6539" k3="-0.5207"/>
-+            <vignetting model="pa" focal="10.4" aperture="8" distance="10" k1="-0.5756" k2="0.6362" k3="-0.4830"/>
-+            <vignetting model="pa" focal="10.4" aperture="8" distance="1000" k1="-0.5756" k2="0.6362" k3="-0.4830"/>
-+            <vignetting model="pa" focal="10.4" aperture="9" distance="10" k1="-0.5599" k2="0.5717" k3="-0.4048"/>
-+            <vignetting model="pa" focal="10.4" aperture="9" distance="1000" k1="-0.5599" k2="0.5717" k3="-0.4048"/>
-+            <vignetting model="pa" focal="10.4" aperture="10" distance="10" k1="-0.5351" k2="0.4943" k3="-0.3245"/>
-+            <vignetting model="pa" focal="10.4" aperture="10" distance="1000" k1="-0.5351" k2="0.4943" k3="-0.3245"/>
-+            <vignetting model="pa" focal="10.4" aperture="11" distance="10" k1="-0.5176" k2="0.4157" k3="-0.2460"/>
-+            <vignetting model="pa" focal="10.4" aperture="11" distance="1000" k1="-0.5176" k2="0.4157" k3="-0.2460"/>
-+            <vignetting model="pa" focal="13.2" aperture="2.8" distance="10" k1="-0.0310" k2="-0.7872" k3="0.4306"/>
-+            <vignetting model="pa" focal="13.2" aperture="2.8" distance="1000" k1="-0.0310" k2="-0.7872" k3="0.4306"/>
-+            <vignetting model="pa" focal="13.2" aperture="3.2" distance="10" k1="0.0310" k2="-0.7967" k3="0.3779"/>
-+            <vignetting model="pa" focal="13.2" aperture="3.2" distance="1000" k1="0.0310" k2="-0.7967" k3="0.3779"/>
-+            <vignetting model="pa" focal="13.2" aperture="3.5" distance="10" k1="0.0038" k2="-0.6216" k3="0.2292"/>
-+            <vignetting model="pa" focal="13.2" aperture="3.5" distance="1000" k1="0.0038" k2="-0.6216" k3="0.2292"/>
-+            <vignetting model="pa" focal="13.2" aperture="4" distance="10" k1="-0.0883" k2="-0.3065" k3="0.0060"/>
-+            <vignetting model="pa" focal="13.2" aperture="4" distance="1000" k1="-0.0883" k2="-0.3065" k3="0.0060"/>
-+            <vignetting model="pa" focal="13.2" aperture="4.5" distance="10" k1="-0.2164" k2="0.0574" k3="-0.2291"/>
-+            <vignetting model="pa" focal="13.2" aperture="4.5" distance="1000" k1="-0.2164" k2="0.0574" k3="-0.2291"/>
-+            <vignetting model="pa" focal="13.2" aperture="5" distance="10" k1="-0.3330" k2="0.3290" k3="-0.3773"/>
-+            <vignetting model="pa" focal="13.2" aperture="5" distance="1000" k1="-0.3330" k2="0.3290" k3="-0.3773"/>
-+            <vignetting model="pa" focal="13.2" aperture="5.6" distance="10" k1="-0.4549" k2="0.5749" k3="-0.4953"/>
-+            <vignetting model="pa" focal="13.2" aperture="5.6" distance="1000" k1="-0.4549" k2="0.5749" k3="-0.4953"/>
-+            <vignetting model="pa" focal="13.2" aperture="6.3" distance="10" k1="-0.4988" k2="0.7224" k3="-0.6053"/>
-+            <vignetting model="pa" focal="13.2" aperture="6.3" distance="1000" k1="-0.4988" k2="0.7224" k3="-0.6053"/>
-+            <vignetting model="pa" focal="13.2" aperture="7.1" distance="10" k1="-0.5221" k2="0.7892" k3="-0.6525"/>
-+            <vignetting model="pa" focal="13.2" aperture="7.1" distance="1000" k1="-0.5221" k2="0.7892" k3="-0.6525"/>
-+            <vignetting model="pa" focal="13.2" aperture="8" distance="10" k1="-0.5166" k2="0.7629" k3="-0.6316"/>
-+            <vignetting model="pa" focal="13.2" aperture="8" distance="1000" k1="-0.5166" k2="0.7629" k3="-0.6316"/>
-+            <vignetting model="pa" focal="13.2" aperture="9" distance="10" k1="-0.5437" k2="0.8567" k3="-0.6878"/>
-+            <vignetting model="pa" focal="13.2" aperture="9" distance="1000" k1="-0.5437" k2="0.8567" k3="-0.6878"/>
-+            <vignetting model="pa" focal="13.2" aperture="10" distance="10" k1="-0.5508" k2="0.8897" k3="-0.7080"/>
-+            <vignetting model="pa" focal="13.2" aperture="10" distance="1000" k1="-0.5508" k2="0.8897" k3="-0.7080"/>
-+            <vignetting model="pa" focal="13.2" aperture="11" distance="10" k1="-0.5499" k2="0.8958" k3="-0.7088"/>
-+            <vignetting model="pa" focal="13.2" aperture="11" distance="1000" k1="-0.5499" k2="0.8958" k3="-0.7088"/>
-+            <vignetting model="pa" focal="18.7" aperture="3.2" distance="10" k1="-0.1132" k2="-0.7446" k3="0.4854"/>
-+            <vignetting model="pa" focal="18.7" aperture="3.2" distance="1000" k1="-0.1132" k2="-0.7446" k3="0.4854"/>
-+            <vignetting model="pa" focal="18.7" aperture="3.5" distance="10" k1="0.0762" k2="-0.9229" k3="0.5035"/>
-+            <vignetting model="pa" focal="18.7" aperture="3.5" distance="1000" k1="0.0762" k2="-0.9229" k3="0.5035"/>
-+            <vignetting model="pa" focal="18.7" aperture="4" distance="10" k1="0.1330" k2="-0.7857" k3="0.3368"/>
-+            <vignetting model="pa" focal="18.7" aperture="4" distance="1000" k1="0.1330" k2="-0.7857" k3="0.3368"/>
-+            <vignetting model="pa" focal="18.7" aperture="4.5" distance="10" k1="0.0416" k2="-0.3692" k3="0.0257"/>
-+            <vignetting model="pa" focal="18.7" aperture="4.5" distance="1000" k1="0.0416" k2="-0.3692" k3="0.0257"/>
-+            <vignetting model="pa" focal="18.7" aperture="5" distance="10" k1="-0.1035" k2="0.0359" k3="-0.2311"/>
-+            <vignetting model="pa" focal="18.7" aperture="5" distance="1000" k1="-0.1035" k2="0.0359" k3="-0.2311"/>
-+            <vignetting model="pa" focal="18.7" aperture="5.6" distance="10" k1="-0.2575" k2="0.4093" k3="-0.4403"/>
-+            <vignetting model="pa" focal="18.7" aperture="5.6" distance="1000" k1="-0.2575" k2="0.4093" k3="-0.4403"/>
-+            <vignetting model="pa" focal="18.7" aperture="6.3" distance="10" k1="-0.3764" k2="0.6211" k3="-0.5246"/>
-+            <vignetting model="pa" focal="18.7" aperture="6.3" distance="1000" k1="-0.3764" k2="0.6211" k3="-0.5246"/>
-+            <vignetting model="pa" focal="18.7" aperture="7.1" distance="10" k1="-0.4680" k2="0.7105" k3="-0.5110"/>
-+            <vignetting model="pa" focal="18.7" aperture="7.1" distance="1000" k1="-0.4680" k2="0.7105" k3="-0.5110"/>
-+            <vignetting model="pa" focal="18.7" aperture="8" distance="10" k1="-0.4570" k2="0.6469" k3="-0.4371"/>
-+            <vignetting model="pa" focal="18.7" aperture="8" distance="1000" k1="-0.4570" k2="0.6469" k3="-0.4371"/>
-+            <vignetting model="pa" focal="18.7" aperture="9" distance="10" k1="-0.4226" k2="0.5152" k3="-0.3220"/>
-+            <vignetting model="pa" focal="18.7" aperture="9" distance="1000" k1="-0.4226" k2="0.5152" k3="-0.3220"/>
-+            <vignetting model="pa" focal="18.7" aperture="10" distance="10" k1="-0.3843" k2="0.3712" k3="-0.2056"/>
-+            <vignetting model="pa" focal="18.7" aperture="10" distance="1000" k1="-0.3843" k2="0.3712" k3="-0.2056"/>
-+            <vignetting model="pa" focal="18.7" aperture="11" distance="10" k1="-0.3679" k2="0.3022" k3="-0.1444"/>
-+            <vignetting model="pa" focal="18.7" aperture="11" distance="1000" k1="-0.3679" k2="0.3022" k3="-0.1444"/>
-+            <vignetting model="pa" focal="26.3" aperture="4" distance="10" k1="-0.2102" k2="-0.4690" k3="0.3420"/>
-+            <vignetting model="pa" focal="26.3" aperture="4" distance="1000" k1="-0.2102" k2="-0.4690" k3="0.3420"/>
-+            <vignetting model="pa" focal="26.3" aperture="4.5" distance="10" k1="-0.0958" k2="-0.4577" k3="0.2539"/>
-+            <vignetting model="pa" focal="26.3" aperture="4.5" distance="1000" k1="-0.0958" k2="-0.4577" k3="0.2539"/>
-+            <vignetting model="pa" focal="26.3" aperture="5" distance="10" k1="-0.1269" k2="-0.1655" k3="0.0260"/>
-+            <vignetting model="pa" focal="26.3" aperture="5" distance="1000" k1="-0.1269" k2="-0.1655" k3="0.0260"/>
-+            <vignetting model="pa" focal="26.3" aperture="5.6" distance="10" k1="-0.1967" k2="0.1392" k3="-0.1716"/>
-+            <vignetting model="pa" focal="26.3" aperture="5.6" distance="1000" k1="-0.1967" k2="0.1392" k3="-0.1716"/>
-+            <vignetting model="pa" focal="26.3" aperture="6.3" distance="10" k1="-0.2359" k2="0.2713" k3="-0.2241"/>
-+            <vignetting model="pa" focal="26.3" aperture="6.3" distance="1000" k1="-0.2359" k2="0.2713" k3="-0.2241"/>
-+            <vignetting model="pa" focal="26.3" aperture="7.1" distance="10" k1="-0.2635" k2="0.2668" k3="-0.1614"/>
-+            <vignetting model="pa" focal="26.3" aperture="7.1" distance="1000" k1="-0.2635" k2="0.2668" k3="-0.1614"/>
-+            <vignetting model="pa" focal="26.3" aperture="8" distance="10" k1="-0.2829" k2="0.2315" k3="-0.0937"/>
-+            <vignetting model="pa" focal="26.3" aperture="8" distance="1000" k1="-0.2829" k2="0.2315" k3="-0.0937"/>
-+            <vignetting model="pa" focal="26.3" aperture="9" distance="10" k1="-0.3206" k2="0.2610" k3="-0.0871"/>
-+            <vignetting model="pa" focal="26.3" aperture="9" distance="1000" k1="-0.3206" k2="0.2610" k3="-0.0871"/>
-+            <vignetting model="pa" focal="26.3" aperture="10" distance="10" k1="-0.3170" k2="0.2624" k3="-0.0900"/>
-+            <vignetting model="pa" focal="26.3" aperture="10" distance="1000" k1="-0.3170" k2="0.2624" k3="-0.0900"/>
-+            <vignetting model="pa" focal="26.3" aperture="11" distance="10" k1="-0.3158" k2="0.2663" k3="-0.0933"/>
-+            <vignetting model="pa" focal="26.3" aperture="11" distance="1000" k1="-0.3158" k2="0.2663" k3="-0.0933"/>
-+            <vignetting model="pa" focal="37.1" aperture="4.9" distance="10" k1="-0.2176" k2="-0.4194" k3="0.2535"/>
-+            <vignetting model="pa" focal="37.1" aperture="4.9" distance="1000" k1="-0.2176" k2="-0.4194" k3="0.2535"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.6" distance="10" k1="-0.1964" k2="-0.2475" k3="0.0897"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.6" distance="1000" k1="-0.1964" k2="-0.2475" k3="0.0897"/>
-+            <vignetting model="pa" focal="37.1" aperture="6.3" distance="10" k1="-0.2301" k2="-0.0700" k3="-0.0247"/>
-+            <vignetting model="pa" focal="37.1" aperture="6.3" distance="1000" k1="-0.2301" k2="-0.0700" k3="-0.0247"/>
-+            <vignetting model="pa" focal="37.1" aperture="7.1" distance="10" k1="-0.2246" k2="-0.0741" k3="-0.0026"/>
-+            <vignetting model="pa" focal="37.1" aperture="7.1" distance="1000" k1="-0.2246" k2="-0.0741" k3="-0.0026"/>
-+            <vignetting model="pa" focal="37.1" aperture="8" distance="10" k1="-0.2047" k2="-0.1257" k3="0.0412"/>
-+            <vignetting model="pa" focal="37.1" aperture="8" distance="1000" k1="-0.2047" k2="-0.1257" k3="0.0412"/>
-+            <vignetting model="pa" focal="37.1" aperture="9" distance="10" k1="-0.1949" k2="-0.1368" k3="0.0459"/>
-+            <vignetting model="pa" focal="37.1" aperture="9" distance="1000" k1="-0.1949" k2="-0.1368" k3="0.0459"/>
-+            <vignetting model="pa" focal="37.1" aperture="10" distance="10" k1="-0.1864" k2="-0.1499" k3="0.0543"/>
-+            <vignetting model="pa" focal="37.1" aperture="10" distance="1000" k1="-0.1864" k2="-0.1499" k3="0.0543"/>
-+            <vignetting model="pa" focal="37.1" aperture="11" distance="10" k1="-0.1810" k2="-0.1572" k3="0.0584"/>
-+            <vignetting model="pa" focal="37.1" aperture="11" distance="1000" k1="-0.1810" k2="-0.1572" k3="0.0584"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>DSC-RX100 II &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyRX100II</mount>
-+        <cropfactor>2.73</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="10.4" a="0.011046" b="-0.066845" c="-0.010623"/>
-+            <distortion model="ptlens" focal="12.5" a="0.005301" b="-0.046738" c="0.00161"/>
-+            <distortion model="ptlens" focal="14.1" a="0.007319" b="-0.055833" c="0.038765"/>
-+            <distortion model="ptlens" focal="16.6" a="0.005602" b="-0.042056" c="0.031479"/>
-+            <distortion model="ptlens" focal="18.2" a="-0.001954" b="-0.015736" c="0.011271"/>
-+            <distortion model="ptlens" focal="20.6" a="-0.002294" b="-0.017409" c="0.029357"/>
-+            <distortion model="ptlens" focal="23.3" a="0.000795" b="-0.023144" c="0.033147"/>
-+            <distortion model="ptlens" focal="25.3" a="-0.001021" b="-0.010802" c="0.014495"/>
-+            <distortion model="ptlens" focal="26.6" a="-0.000752" b="-0.01116" c="0.015762"/>
-+            <distortion model="ptlens" focal="29.5" a="0.003277" b="-0.024738" c="0.031628"/>
-+            <distortion model="ptlens" focal="30.8" a="0.001826" b="-0.01782" c="0.021784"/>
-+            <distortion model="ptlens" focal="33.2" a="0.003849" b="-0.028663" c="0.040715"/>
-+            <distortion model="ptlens" focal="35.3" a="0.0039" b="-0.025627" c="0.03066"/>
-+            <distortion model="ptlens" focal="37.1" a="0.001596" b="-0.022367" c="0.033843"/>
-+            <tca model="poly3" focal="10.4" br="0.0001237" vr="1.0002385" bb="-0.0001421" vb="1.0004466"/>
-+            <tca model="poly3" focal="12.5" br="0.0001230" vr="1.0002997" bb="-0.0000907" vb="1.0002562"/>
-+            <tca model="poly3" focal="14.1" br="0.0001337" vr="1.0003018" bb="-0.0000653" vb="1.0002075"/>
-+            <tca model="poly3" focal="16.6" br="0.0000925" vr="1.0002945" bb="-0.0000533" vb="1.0001741"/>
-+            <tca model="poly3" focal="18.2" br="0.0000752" vr="1.0002626" bb="-0.0000469" vb="1.0001686"/>
-+            <tca model="poly3" focal="20.6" br="0.0000398" vr="1.0002549" bb="-0.0000539" vb="1.0001774"/>
-+            <tca model="poly3" focal="23.3" br="0.0000583" vr="1.0002447" bb="-0.0000446" vb="1.0001558"/>
-+            <tca model="poly3" focal="25.3" br="0.0000804" vr="1.0001705" bb="-0.0000263" vb="1.0001217"/>
-+            <tca model="poly3" focal="26.6" br="-0.0000023" vr="1.0002448" bb="-0.0000481" vb="1.0001799"/>
-+            <tca model="poly3" focal="29.5" br="0.0000001" vr="1.0002366" bb="-0.0000120" vb="1.0000857"/>
-+            <tca model="poly3" focal="30.8" br="0.0000657" vr="1.0000796" bb="-0.0000449" vb="1.0001984"/>
-+            <tca model="poly3" focal="33.2" br="0.0000214" vr="1.0000994" bb="-0.0000269" vb="1.0001729"/>
-+            <tca model="poly3" focal="35.3" br="-0.0000002" vr="1.0000516" bb="-0.0000812" vb="1.0002827"/>
-+            <tca model="poly3" focal="37.1" br="0.0000607" vr="1.0000855" bb="-0.0000273" vb="1.0000706"/>
-+            <vignetting model="pa" focal="10.4" aperture="1.8" distance="10" k1="-0.7135" k2="1.3463" k3="-1.2816"/>
-+            <vignetting model="pa" focal="10.4" aperture="1.8" distance="1000" k1="-0.7135" k2="1.3463" k3="-1.2816"/>
-+            <vignetting model="pa" focal="10.4" aperture="2" distance="10" k1="-0.8326" k2="1.3279" k3="-1.0356"/>
-+            <vignetting model="pa" focal="10.4" aperture="2" distance="1000" k1="-0.8326" k2="1.3279" k3="-1.0356"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.2" distance="10" k1="-0.6656" k2="0.5921" k3="-0.5394"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.2" distance="1000" k1="-0.6656" k2="0.5921" k3="-0.5394"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.5" distance="10" k1="-0.7229" k2="0.7602" k3="-0.6923"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.5" distance="1000" k1="-0.7229" k2="0.7602" k3="-0.6923"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.8" distance="10" k1="-0.7498" k2="0.7621" k3="-0.5955"/>
-+            <vignetting model="pa" focal="10.4" aperture="2.8" distance="1000" k1="-0.7498" k2="0.7621" k3="-0.5955"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.2" distance="10" k1="-0.6216" k2="0.5553" k3="-0.5182"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.2" distance="1000" k1="-0.6216" k2="0.5553" k3="-0.5182"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.5" distance="10" k1="-0.5630" k2="0.4498" k3="-0.4015"/>
-+            <vignetting model="pa" focal="10.4" aperture="3.5" distance="1000" k1="-0.5630" k2="0.4498" k3="-0.4015"/>
-+            <vignetting model="pa" focal="10.4" aperture="4" distance="10" k1="-0.5777" k2="0.5116" k3="-0.3904"/>
-+            <vignetting model="pa" focal="10.4" aperture="4" distance="1000" k1="-0.5777" k2="0.5116" k3="-0.3904"/>
-+            <vignetting model="pa" focal="10.4" aperture="5.6" distance="10" k1="-0.5390" k2="0.2408" k3="-0.0446"/>
-+            <vignetting model="pa" focal="10.4" aperture="5.6" distance="1000" k1="-0.5390" k2="0.2408" k3="-0.0446"/>
-+            <vignetting model="pa" focal="10.4" aperture="8" distance="10" k1="-0.6269" k2="0.5259" k3="-0.3552"/>
-+            <vignetting model="pa" focal="10.4" aperture="8" distance="1000" k1="-0.6269" k2="0.5259" k3="-0.3552"/>
-+            <vignetting model="pa" focal="10.4" aperture="11" distance="10" k1="-0.5159" k2="0.1094" k3="0.0314"/>
-+            <vignetting model="pa" focal="10.4" aperture="11" distance="1000" k1="-0.5159" k2="0.1094" k3="0.0314"/>
-+            <vignetting model="pa" focal="11.2" aperture="2.2" distance="10" k1="-0.7467" k2="0.3276" k3="-0.0407"/>
-+            <vignetting model="pa" focal="11.2" aperture="2.2" distance="1000" k1="-0.7467" k2="0.3276" k3="-0.0407"/>
-+            <vignetting model="pa" focal="13.8" aperture="2.8" distance="10" k1="-0.5590" k2="-0.0464" k3="0.2053"/>
-+            <vignetting model="pa" focal="13.8" aperture="2.8" distance="1000" k1="-0.5590" k2="-0.0464" k3="0.2053"/>
-+            <vignetting model="pa" focal="13.8" aperture="4" distance="10" k1="-0.2494" k2="-0.1809" k3="0.0453"/>
-+            <vignetting model="pa" focal="13.8" aperture="4" distance="1000" k1="-0.2494" k2="-0.1809" k3="0.0453"/>
-+            <vignetting model="pa" focal="13.8" aperture="5.6" distance="10" k1="-0.3791" k2="0.2275" k3="-0.2863"/>
-+            <vignetting model="pa" focal="13.8" aperture="5.6" distance="1000" k1="-0.3791" k2="0.2275" k3="-0.2863"/>
-+            <vignetting model="pa" focal="13.8" aperture="8" distance="10" k1="-0.4985" k2="0.4805" k3="-0.3736"/>
-+            <vignetting model="pa" focal="13.8" aperture="8" distance="1000" k1="-0.4985" k2="0.4805" k3="-0.3736"/>
-+            <vignetting model="pa" focal="13.8" aperture="11" distance="10" k1="-0.4288" k2="0.1443" k3="-0.0009"/>
-+            <vignetting model="pa" focal="13.8" aperture="11" distance="1000" k1="-0.4288" k2="0.1443" k3="-0.0009"/>
-+            <vignetting model="pa" focal="15.3" aperture="2.8" distance="10" k1="-0.4644" k2="-0.1983" k3="0.2649"/>
-+            <vignetting model="pa" focal="15.3" aperture="2.8" distance="1000" k1="-0.4644" k2="-0.1983" k3="0.2649"/>
-+            <vignetting model="pa" focal="15.3" aperture="4" distance="10" k1="-0.2199" k2="-0.1659" k3="0.0650"/>
-+            <vignetting model="pa" focal="15.3" aperture="4" distance="1000" k1="-0.2199" k2="-0.1659" k3="0.0650"/>
-+            <vignetting model="pa" focal="15.3" aperture="5.6" distance="10" k1="-0.3723" k2="0.2516" k3="-0.1362"/>
-+            <vignetting model="pa" focal="15.3" aperture="5.6" distance="1000" k1="-0.3723" k2="0.2516" k3="-0.1362"/>
-+            <vignetting model="pa" focal="15.3" aperture="8" distance="10" k1="-0.3691" k2="0.0957" k3="0.0523"/>
-+            <vignetting model="pa" focal="15.3" aperture="8" distance="1000" k1="-0.3691" k2="0.0957" k3="0.0523"/>
-+            <vignetting model="pa" focal="15.3" aperture="11" distance="10" k1="-0.3575" k2="0.0843" k3="0.0146"/>
-+            <vignetting model="pa" focal="15.3" aperture="11" distance="1000" k1="-0.3575" k2="0.0843" k3="0.0146"/>
-+            <vignetting model="pa" focal="17.2" aperture="3.2" distance="10" k1="-0.2519" k2="-0.3907" k3="0.3136"/>
-+            <vignetting model="pa" focal="17.2" aperture="3.2" distance="1000" k1="-0.2519" k2="-0.3907" k3="0.3136"/>
-+            <vignetting model="pa" focal="17.2" aperture="4" distance="10" k1="-0.1731" k2="-0.2987" k3="0.1314"/>
-+            <vignetting model="pa" focal="17.2" aperture="4" distance="1000" k1="-0.1731" k2="-0.2987" k3="0.1314"/>
-+            <vignetting model="pa" focal="17.2" aperture="5.6" distance="10" k1="-0.4100" k2="0.5769" k3="-0.4051"/>
-+            <vignetting model="pa" focal="17.2" aperture="5.6" distance="1000" k1="-0.4100" k2="0.5769" k3="-0.4051"/>
-+            <vignetting model="pa" focal="17.2" aperture="8" distance="10" k1="-0.4308" k2="0.4526" k3="-0.2350"/>
-+            <vignetting model="pa" focal="17.2" aperture="8" distance="1000" k1="-0.4308" k2="0.4526" k3="-0.2350"/>
-+            <vignetting model="pa" focal="17.2" aperture="11" distance="10" k1="-0.3237" k2="0.0824" k3="0.0077"/>
-+            <vignetting model="pa" focal="17.2" aperture="11" distance="1000" k1="-0.3237" k2="0.0824" k3="0.0077"/>
-+            <vignetting model="pa" focal="21.1" aperture="3.5" distance="10" k1="-0.1925" k2="-0.3745" k3="0.2358"/>
-+            <vignetting model="pa" focal="21.1" aperture="3.5" distance="1000" k1="-0.1925" k2="-0.3745" k3="0.2358"/>
-+            <vignetting model="pa" focal="21.1" aperture="4" distance="10" k1="-0.2053" k2="-0.0766" k3="-0.0076"/>
-+            <vignetting model="pa" focal="21.1" aperture="4" distance="1000" k1="-0.2053" k2="-0.0766" k3="-0.0076"/>
-+            <vignetting model="pa" focal="21.1" aperture="5.6" distance="10" k1="-0.3967" k2="0.6719" k3="-0.5349"/>
-+            <vignetting model="pa" focal="21.1" aperture="5.6" distance="1000" k1="-0.3967" k2="0.6719" k3="-0.5349"/>
-+            <vignetting model="pa" focal="21.1" aperture="8" distance="10" k1="-0.3037" k2="0.1550" k3="-0.0403"/>
-+            <vignetting model="pa" focal="21.1" aperture="8" distance="1000" k1="-0.3037" k2="0.1550" k3="-0.0403"/>
-+            <vignetting model="pa" focal="21.1" aperture="11" distance="10" k1="-0.2912" k2="0.1147" k3="-0.0086"/>
-+            <vignetting model="pa" focal="21.1" aperture="11" distance="1000" k1="-0.2912" k2="0.1147" k3="-0.0086"/>
-+            <vignetting model="pa" focal="27.9" aperture="4" distance="10" k1="-0.1966" k2="-0.3641" k3="0.2689"/>
-+            <vignetting model="pa" focal="27.9" aperture="4" distance="1000" k1="-0.1966" k2="-0.3641" k3="0.2689"/>
-+            <vignetting model="pa" focal="27.9" aperture="5.6" distance="10" k1="-0.3166" k2="0.4107" k3="-0.2405"/>
-+            <vignetting model="pa" focal="27.9" aperture="5.6" distance="1000" k1="-0.3166" k2="0.4107" k3="-0.2405"/>
-+            <vignetting model="pa" focal="27.9" aperture="8" distance="10" k1="-0.3054" k2="0.3035" k3="-0.1081"/>
-+            <vignetting model="pa" focal="27.9" aperture="8" distance="1000" k1="-0.3054" k2="0.3035" k3="-0.1081"/>
-+            <vignetting model="pa" focal="27.9" aperture="11" distance="10" k1="-0.3304" k2="0.3339" k3="-0.1145"/>
-+            <vignetting model="pa" focal="27.9" aperture="11" distance="1000" k1="-0.3304" k2="0.3339" k3="-0.1145"/>
-+            <vignetting model="pa" focal="37.1" aperture="4.9" distance="10" k1="-0.1605" k2="-0.1277" k3="0.1141"/>
-+            <vignetting model="pa" focal="37.1" aperture="4.9" distance="1000" k1="-0.1605" k2="-0.1277" k3="0.1141"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.6" distance="10" k1="-0.1830" k2="0.2314" k3="-0.1886"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.6" distance="1000" k1="-0.1830" k2="0.2314" k3="-0.1886"/>
-+            <vignetting model="pa" focal="37.1" aperture="6.3" distance="10" k1="-0.2721" k2="0.5075" k3="-0.3135"/>
-+            <vignetting model="pa" focal="37.1" aperture="6.3" distance="1000" k1="-0.2721" k2="0.5075" k3="-0.3135"/>
-+            <vignetting model="pa" focal="37.1" aperture="7.1" distance="10" k1="-0.2413" k2="0.3955" k3="-0.2181"/>
-+            <vignetting model="pa" focal="37.1" aperture="7.1" distance="1000" k1="-0.2413" k2="0.3955" k3="-0.2181"/>
-+            <vignetting model="pa" focal="37.1" aperture="8" distance="10" k1="-0.2099" k2="0.2854" k3="-0.1354"/>
-+            <vignetting model="pa" focal="37.1" aperture="8" distance="1000" k1="-0.2099" k2="0.2854" k3="-0.1354"/>
-+            <vignetting model="pa" focal="37.1" aperture="11" distance="10" k1="-0.2129" k2="0.2491" k3="-0.0930"/>
-+            <vignetting model="pa" focal="37.1" aperture="11" distance="1000" k1="-0.2129" k2="0.2491" k3="-0.0930"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>DSC-RX100 III &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyRX100III</mount>
-+        <cropfactor>2.73</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="8.8" a="0.02266" b="-0.09581" c="0.0019"/>
-+            <distortion model="ptlens" focal="10.9" a="0.02376" b="-0.09457" c="0.03217"/>
-+            <distortion model="ptlens" focal="13" a="0.02326" b="-0.08674" c="0.04569"/>
-+            <distortion model="ptlens" focal="14.7" a="0.0234" b="-0.08395" c="0.0497"/>
-+            <distortion model="ptlens" focal="16.6" a="0.02045" b="-0.06253" c="0.02684"/>
-+            <distortion model="ptlens" focal="20" a="0.02295" b="-0.06814" c="0.05127"/>
-+            <distortion model="ptlens" focal="25.7" a="0.02377" b="-0.06078" c="0.04156"/>
-+            <tca model="poly3" focal="8.8" br="0.0001786" vr="1.0000881" bb="-0.0001087" vb="1.0003934"/>
-+            <tca model="poly3" focal="10.9" br="0.0000887" vr="1.0001670" bb="-0.0000723" vb="1.0003152"/>
-+            <tca model="poly3" focal="13" br="0.0000518" vr="1.0002194" bb="-0.0000203" vb="1.0001770"/>
-+            <tca model="poly3" focal="14.7" br="0.0000185" vr="1.0002369" bb="-0.0000000" vb="1.0001315"/>
-+            <tca model="poly3" focal="16.6" br="0.0000075" vr="1.0002936" bb="-0.0000085" vb="1.0000657"/>
-+            <tca model="poly3" focal="20" br="-0.0000081" vr="1.0003041" bb="0.0000035" vb="1.0000616"/>
-+            <tca model="poly3" focal="25.7" br="-0.0000121" vr="1.0002604" bb="0.0000035" vb="1.0000797"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>DSC-HX300 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyHX300</mount>
-+        <focal min="4.3" max="215"/>
-+        <cropfactor>5.58</cropfactor>
-+        <calibration>
-+            <!-- The camera already corrects very well.  So this refers to the
-+                 JPEGs.  The camera cannot produce RAWs.  JPEGs for calibration
-+                 (if really requested) has bronger@physik.rwth-aachen.de. -->
-+            <distortion focal="4.3" model="poly3" k1="0"/>
-+            <distortion focal="215" model="poly3" k1="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony Xperia Z3 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyXperiaZ3</mount>
-+        <cropfactor>7.87</cropfactor>
-+        <calibration>
-+            <!-- This stems from the advertised feature of 25mm equiv. -->
-+            <distortion model="ptlens" focal="4.9" a="0.0132" b="-0.07765" c="0.14683"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony RX10 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyRX10</mount>
-+        <cropfactor>2.73</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="8.8" a="0.0376" b="-0.14223" c="0.1059"/>
-+            <distortion model="ptlens" focal="9.9" a="0.02873" b="-0.10439" c="0.08589"/>
-+            <distortion model="ptlens" focal="10.9" a="0.01917" b="-0.07335" c="0.07298"/>
-+            <distortion model="ptlens" focal="13.1" a="0.00477" b="-0.02653" c="0.05952"/>
-+            <distortion model="ptlens" focal="18.2" a="-0.00665" b="0.03433" c="-0.00945"/>
-+            <distortion model="ptlens" focal="25.2" a="-0.00888" b="0.03994" c="0.0052"/>
-+            <distortion model="ptlens" focal="73.2" a="-0.00843" b="0.03659" c="0.01609"/>
-+            <tca model="poly3" focal="8.8" br="-0.0000278" vr="1.0007192" bb="0.0000913" vb="0.9999164"/>
-+            <tca model="poly3" focal="10.3" br="-0.0000800" vr="1.0007387" bb="0.0000756" vb="0.9999193"/>
-+            <tca model="poly3" focal="12.8" br="-0.0001529" vr="1.0007873" bb="0.0001241" vb="0.9998314"/>
-+            <tca model="poly3" focal="15.4" br="-0.0001801" vr="1.0006865" bb="0.0000925" vb="0.9998612"/>
-+            <tca model="poly3" focal="17.8" br="-0.0001510" vr="1.0007237" bb="0.0000961" vb="0.9998292"/>
-+            <tca model="poly3" focal="25.7" br="-0.0001137" vr="1.0005035" bb="0.0000802" vb="0.9998297"/>
-+            <tca model="poly3" focal="31.3" br="-0.0000974" vr="1.0004100" bb="0.0000760" vb="0.9998261"/>
-+            <tca model="poly3" focal="32.8" br="-0.0000346" vr="1.0003456" bb="0.0000701" vb="0.9998303"/>
-+            <tca model="poly3" focal="36.8" br="-0.0000779" vr="1.0003575" bb="0.0000644" vb="0.9998296"/>
-+            <tca model="poly3" focal="49.4" br="-0.0000130" vr="1.0001023" bb="0.0000332" vb="0.9998657"/>
-+            <tca model="poly3" focal="73.3" br="0.0000154" vr="0.9999244" bb="0.0000192" vb="0.9999136"/>
-+            <vignetting model="pa" focal="8.8" aperture="2.8" distance="10" k1="-0.7078" k2="1.2333" k3="-1.2422"/>
-+            <vignetting model="pa" focal="8.8" aperture="2.8" distance="1000" k1="-0.7078" k2="1.2333" k3="-1.2422"/>
-+            <vignetting model="pa" focal="8.8" aperture="3.2" distance="10" k1="-0.6416" k2="1.3734" k3="-1.4473"/>
-+            <vignetting model="pa" focal="8.8" aperture="3.2" distance="1000" k1="-0.6416" k2="1.3734" k3="-1.4473"/>
-+            <vignetting model="pa" focal="8.8" aperture="3.5" distance="10" k1="-0.7743" k2="1.7536" k3="-1.7233"/>
-+            <vignetting model="pa" focal="8.8" aperture="3.5" distance="1000" k1="-0.7743" k2="1.7536" k3="-1.7233"/>
-+            <vignetting model="pa" focal="8.8" aperture="4" distance="10" k1="-0.6750" k2="1.5220" k3="-1.5361"/>
-+            <vignetting model="pa" focal="8.8" aperture="4" distance="1000" k1="-0.6750" k2="1.5220" k3="-1.5361"/>
-+            <vignetting model="pa" focal="8.8" aperture="5.6" distance="10" k1="-1.0081" k2="2.6576" k3="-2.3930"/>
-+            <vignetting model="pa" focal="8.8" aperture="5.6" distance="1000" k1="-1.0081" k2="2.6576" k3="-2.3930"/>
-+            <vignetting model="pa" focal="8.8" aperture="8" distance="10" k1="-1.0870" k2="2.9411" k3="-2.6221"/>
-+            <vignetting model="pa" focal="8.8" aperture="8" distance="1000" k1="-1.0870" k2="2.9411" k3="-2.6221"/>
-+            <vignetting model="pa" focal="8.8" aperture="16" distance="10" k1="-1.2172" k2="3.0825" k3="-2.6802"/>
-+            <vignetting model="pa" focal="8.8" aperture="16" distance="1000" k1="-1.2172" k2="3.0825" k3="-2.6802"/>
-+            <vignetting model="pa" focal="10.3" aperture="2.8" distance="10" k1="-0.8548" k2="1.3623" k3="-0.9644"/>
-+            <vignetting model="pa" focal="10.3" aperture="2.8" distance="1000" k1="-0.8548" k2="1.3623" k3="-0.9644"/>
-+            <vignetting model="pa" focal="10.3" aperture="3.2" distance="10" k1="-0.8399" k2="1.3547" k3="-0.9741"/>
-+            <vignetting model="pa" focal="10.3" aperture="3.2" distance="1000" k1="-0.8399" k2="1.3547" k3="-0.9741"/>
-+            <vignetting model="pa" focal="10.3" aperture="3.5" distance="10" k1="-0.7968" k2="1.1862" k3="-0.8171"/>
-+            <vignetting model="pa" focal="10.3" aperture="3.5" distance="1000" k1="-0.7968" k2="1.1862" k3="-0.8171"/>
-+            <vignetting model="pa" focal="10.3" aperture="4" distance="10" k1="-0.8262" k2="1.2539" k3="-0.8333"/>
-+            <vignetting model="pa" focal="10.3" aperture="4" distance="1000" k1="-0.8262" k2="1.2539" k3="-0.8333"/>
-+            <vignetting model="pa" focal="10.3" aperture="5.6" distance="10" k1="-0.7614" k2="0.8763" k3="-0.4500"/>
-+            <vignetting model="pa" focal="10.3" aperture="5.6" distance="1000" k1="-0.7614" k2="0.8763" k3="-0.4500"/>
-+            <vignetting model="pa" focal="10.3" aperture="8" distance="10" k1="-0.8382" k2="1.0781" k3="-0.6352"/>
-+            <vignetting model="pa" focal="10.3" aperture="8" distance="1000" k1="-0.8382" k2="1.0781" k3="-0.6352"/>
-+            <vignetting model="pa" focal="12.8" aperture="2.8" distance="10" k1="-0.9081" k2="1.0961" k3="-0.6231"/>
-+            <vignetting model="pa" focal="12.8" aperture="2.8" distance="1000" k1="-0.9081" k2="1.0961" k3="-0.6231"/>
-+            <vignetting model="pa" focal="12.8" aperture="3.2" distance="10" k1="-0.8844" k2="1.0024" k3="-0.5276"/>
-+            <vignetting model="pa" focal="12.8" aperture="3.2" distance="1000" k1="-0.8844" k2="1.0024" k3="-0.5276"/>
-+            <vignetting model="pa" focal="12.8" aperture="3.5" distance="10" k1="-0.8884" k2="1.0225" k3="-0.5497"/>
-+            <vignetting model="pa" focal="12.8" aperture="3.5" distance="1000" k1="-0.8884" k2="1.0225" k3="-0.5497"/>
-+            <vignetting model="pa" focal="12.8" aperture="4" distance="10" k1="-0.8910" k2="1.0217" k3="-0.5487"/>
-+            <vignetting model="pa" focal="12.8" aperture="4" distance="1000" k1="-0.8910" k2="1.0217" k3="-0.5487"/>
-+            <vignetting model="pa" focal="12.8" aperture="5.6" distance="10" k1="-0.8758" k2="0.9824" k3="-0.5244"/>
-+            <vignetting model="pa" focal="12.8" aperture="5.6" distance="1000" k1="-0.8758" k2="0.9824" k3="-0.5244"/>
-+            <vignetting model="pa" focal="12.8" aperture="8" distance="10" k1="-0.8347" k2="0.9017" k3="-0.4803"/>
-+            <vignetting model="pa" focal="12.8" aperture="8" distance="1000" k1="-0.8347" k2="0.9017" k3="-0.4803"/>
-+            <vignetting model="pa" focal="12.8" aperture="16" distance="10" k1="-0.8226" k2="0.8700" k3="-0.4558"/>
-+            <vignetting model="pa" focal="12.8" aperture="16" distance="1000" k1="-0.8226" k2="0.8700" k3="-0.4558"/>
-+            <vignetting model="pa" focal="18.2" aperture="2.8" distance="10" k1="-0.7510" k2="0.7536" k3="-0.3622"/>
-+            <vignetting model="pa" focal="18.2" aperture="2.8" distance="1000" k1="-0.7510" k2="0.7536" k3="-0.3622"/>
-+            <vignetting model="pa" focal="18.2" aperture="4" distance="10" k1="-0.7386" k2="0.6923" k3="-0.3163"/>
-+            <vignetting model="pa" focal="18.2" aperture="4" distance="1000" k1="-0.7386" k2="0.6923" k3="-0.3163"/>
-+            <vignetting model="pa" focal="18.2" aperture="5.6" distance="10" k1="-0.7696" k2="0.7669" k3="-0.3588"/>
-+            <vignetting model="pa" focal="18.2" aperture="5.6" distance="1000" k1="-0.7696" k2="0.7669" k3="-0.3588"/>
-+            <vignetting model="pa" focal="18.2" aperture="8" distance="10" k1="-0.7210" k2="0.6825" k3="-0.3130"/>
-+            <vignetting model="pa" focal="18.2" aperture="8" distance="1000" k1="-0.7210" k2="0.6825" k3="-0.3130"/>
-+            <vignetting model="pa" focal="18.2" aperture="16" distance="10" k1="-0.8083" k2="0.8415" k3="-0.3901"/>
-+            <vignetting model="pa" focal="18.2" aperture="16" distance="1000" k1="-0.8083" k2="0.8415" k3="-0.3901"/>
-+            <vignetting model="pa" focal="25.7" aperture="4" distance="10" k1="-0.7184" k2="0.7128" k3="-0.3154"/>
-+            <vignetting model="pa" focal="25.7" aperture="4" distance="1000" k1="-0.7184" k2="0.7128" k3="-0.3154"/>
-+            <vignetting model="pa" focal="25.7" aperture="8" distance="10" k1="-0.7649" k2="0.7499" k3="-0.2829"/>
-+            <vignetting model="pa" focal="25.7" aperture="8" distance="1000" k1="-0.7649" k2="0.7499" k3="-0.2829"/>
-+            <vignetting model="pa" focal="25.7" aperture="16" distance="10" k1="-0.6784" k2="0.6044" k3="-0.2442"/>
-+            <vignetting model="pa" focal="25.7" aperture="16" distance="1000" k1="-0.6784" k2="0.6044" k3="-0.2442"/>
-+            <vignetting model="pa" focal="33.4" aperture="2.8" distance="10" k1="-0.7282" k2="0.8237" k3="-0.4524"/>
-+            <vignetting model="pa" focal="33.4" aperture="2.8" distance="1000" k1="-0.7282" k2="0.8237" k3="-0.4524"/>
-+            <vignetting model="pa" focal="33.4" aperture="4" distance="10" k1="-0.7011" k2="0.7048" k3="-0.3177"/>
-+            <vignetting model="pa" focal="33.4" aperture="4" distance="1000" k1="-0.7011" k2="0.7048" k3="-0.3177"/>
-+            <vignetting model="pa" focal="33.4" aperture="5.6" distance="10" k1="-0.7036" k2="0.6900" k3="-0.2841"/>
-+            <vignetting model="pa" focal="33.4" aperture="5.6" distance="1000" k1="-0.7036" k2="0.6900" k3="-0.2841"/>
-+            <vignetting model="pa" focal="33.4" aperture="8" distance="10" k1="-0.6922" k2="0.6686" k3="-0.2908"/>
-+            <vignetting model="pa" focal="33.4" aperture="8" distance="1000" k1="-0.6922" k2="0.6686" k3="-0.2908"/>
-+            <vignetting model="pa" focal="33.4" aperture="16" distance="10" k1="-0.6914" k2="0.6706" k3="-0.2945"/>
-+            <vignetting model="pa" focal="33.4" aperture="16" distance="1000" k1="-0.6914" k2="0.6706" k3="-0.2945"/>
-+            <vignetting model="pa" focal="36.8" aperture="2.8" distance="10" k1="-0.7582" k2="0.9175" k3="-0.5182"/>
-+            <vignetting model="pa" focal="36.8" aperture="2.8" distance="1000" k1="-0.7582" k2="0.9175" k3="-0.5182"/>
-+            <vignetting model="pa" focal="36.8" aperture="4" distance="10" k1="-0.7025" k2="0.6804" k3="-0.2813"/>
-+            <vignetting model="pa" focal="36.8" aperture="4" distance="1000" k1="-0.7025" k2="0.6804" k3="-0.2813"/>
-+            <vignetting model="pa" focal="36.8" aperture="16" distance="10" k1="-0.7480" k2="0.7938" k3="-0.3391"/>
-+            <vignetting model="pa" focal="36.8" aperture="16" distance="1000" k1="-0.7480" k2="0.7938" k3="-0.3391"/>
-+            <vignetting model="pa" focal="49.4" aperture="2.8" distance="10" k1="-0.7732" k2="0.8595" k3="-0.5079"/>
-+            <vignetting model="pa" focal="49.4" aperture="2.8" distance="1000" k1="-0.7732" k2="0.8595" k3="-0.5079"/>
-+            <vignetting model="pa" focal="49.4" aperture="4" distance="10" k1="-0.6924" k2="0.7213" k3="-0.3283"/>
-+            <vignetting model="pa" focal="49.4" aperture="4" distance="1000" k1="-0.6924" k2="0.7213" k3="-0.3283"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.7191" k2="0.7714" k3="-0.3461"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.7191" k2="0.7714" k3="-0.3461"/>
-+            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="-0.6656" k2="0.6307" k3="-0.2399"/>
-+            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="-0.6656" k2="0.6307" k3="-0.2399"/>
-+            <vignetting model="pa" focal="73.3" aperture="2.8" distance="10" k1="-0.7230" k2="0.4629" k3="-0.1359"/>
-+            <vignetting model="pa" focal="73.3" aperture="2.8" distance="1000" k1="-0.7230" k2="0.4629" k3="-0.1359"/>
-+            <vignetting model="pa" focal="73.3" aperture="8" distance="10" k1="-0.8606" k2="1.3721" k3="-0.9345"/>
-+            <vignetting model="pa" focal="73.3" aperture="8" distance="1000" k1="-0.8606" k2="1.3721" k3="-0.9345"/>
-+            <vignetting model="pa" focal="73.3" aperture="16" distance="10" k1="-0.7658" k2="0.9603" k3="-0.5151"/>
-+            <vignetting model="pa" focal="73.3" aperture="16" distance="1000" k1="-0.7658" k2="0.9603" k3="-0.5151"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony RX10II &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyRX10II</mount>
-+        <cropfactor>2.73</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="8.8" a="0.0376" b="-0.14223" c="0.1059"/>
-+            <distortion model="ptlens" focal="9.9" a="0.02873" b="-0.10439" c="0.08589"/>
-+            <distortion model="ptlens" focal="10.9" a="0.01917" b="-0.07335" c="0.07298"/>
-+            <distortion model="ptlens" focal="13.1" a="0.00477" b="-0.02653" c="0.05952"/>
-+            <distortion model="ptlens" focal="18.2" a="-0.00665" b="0.03433" c="-0.00945"/>
-+            <distortion model="ptlens" focal="25.2" a="-0.00888" b="0.03994" c="0.0052"/>
-+            <distortion model="ptlens" focal="73.2" a="-0.00843" b="0.03659" c="0.01609"/>
-+            <tca model="poly3" focal="8.8" vr="1.0006418" vb="1.0000433"/>
-+            <tca model="poly3" focal="9.9" vr="1.0001893" vb="1.0000506"/>
-+            <tca model="poly3" focal="10.9" vr="1.0001793" vb="1.0000381"/>
-+            <tca model="poly3" focal="13.1" vr="1.0005385" vb="1.0000273"/>
-+            <tca model="poly3" focal="18.2" vr="1.0004791" vb="1.0000114"/>
-+            <tca model="poly3" focal="25.2" vr="1.0003735" vb="0.9999717"/>
-+            <tca model="poly3" focal="73.2" vr="0.9998839" vb="0.9999304"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Carl Zeiss</maker>
-+        <model>DSC-RX1RM2 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>sonyRX1</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="35" a="0.01397" b="-0.05582" c="0.04619"/>
-+            <tca model="poly3" focal="35" vr="1.0001751" vb="1.0000530"/>
-         </calibration>
-     </lens>
- </lensdatabase>
-diff -Nurpd a/data/db/contax.xml b/data/db/contax.xml
---- a/data/db/contax.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/contax.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,53 @@
-+<lensdatabase>
-+    <mount>
-+        <name>Contax/Yashica</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>Contax G</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-+        <compat>Generic</compat>
-+    </mount>
-+    <camera>
-+        <maker>Contax</maker>
-+        <model>35mm film: full frame</model>
-+        <mount>Contax/Yashica</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <lens>
-+        <maker>Contax</maker>
-+        <model>Zeiss 21mm f/2.8 Distagon</model>
-+        <mount>Contax/Yashica</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="21" a="0.021925" b="-0.043445" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Contax</maker>
-+        <model>Zeiss 28mm f/2.8 Distagon</model>
-+        <mount>Contax/Yashica</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="28" a="0.007448" b="-0.019182" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Contax</maker>
-+        <model>Contax G Planar T* 2/35</model>
-+        <mount>Contax G</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="poly3" focal="35" k1="-0.0021"/>
-+            <tca model="poly3" focal="35" vr="1.0002" vb="0.9997"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/db.mak b/data/db/db.mak
---- a/data/db/db.mak	2007-11-08 02:18:36.000000000 +0100
-+++ b/data/db/db.mak	1970-01-01 01:00:00.000000000 +0100
-@@ -1,5 +0,0 @@
--DATA += lensdb
--DESCRIPTION.lensdb = Lens database files
--TARGETS.lensdb = $(wildcard data/db/*.xml)
--TOOLKIT.lensdb = DATA
--INSTALL.TARGETS += lensdb
-diff -Nurpd a/data/db/generic.xml b/data/db/generic.xml
---- a/data/db/generic.xml	2013-10-11 23:54:00.000000000 +0200
-+++ b/data/db/generic.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,111 +1,132 @@
--<!--
--    The meaning of this file is to provide some generic lenses that can be used
--    to correct or simulate geometric distortions for specific types of lenses.
--    It does not provide (obviously) any calibration data.
---->
- <lensdatabase>
--
--    <mount>
--        <name>M42</name>
--        <compat>Generic</compat>
--    </mount>
--
--    <mount>
--        <name>T2</name>
--        <compat>Generic</compat>
--    </mount>
--
-     <mount>
-         <name>Generic</name>
-+        <!-- The following is a list of all mounts in the Lensfun database for
-+             interchangeable lenses. -->
-+        <compat>4/3 System</compat>
-         <compat>Canon EF</compat>
-+        <compat>Canon EF-M</compat>
-         <compat>Canon EF-S</compat>
-+        <compat>Canon FD</compat>
-+        <compat>Canon FL</compat>
-         <compat>Contax/Yashica</compat>
-+        <compat>Contax G</compat>
-+        <compat>Fujifilm X</compat>
-+        <compat>Hasselblad 500</compat>
-+        <compat>Hasselblad H</compat>
-+        <compat>Leica M</compat>
-+        <compat>Leica R</compat>
-+        <compat>Leica S</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>Mamiya 645</compat>
-+        <compat>Micro 4/3 System</compat>
-+        <compat>Minolta AF</compat>
-+        <compat>Minolta MC</compat>
-+        <compat>Minolta MD</compat>
-+        <compat>Nikon CX</compat>
-         <compat>Nikon F</compat>
-+        <compat>Nikon F AF</compat>
-         <compat>Nikon F AI</compat>
-         <compat>Nikon F AI-S</compat>
--        <compat>Nikon F AF</compat>
--        <compat>4/3 System</compat>
--        <compat>olympusE10</compat>
-+        <compat>Olympus OM</compat>
-+        <compat>Pentax Q</compat>
-         <compat>Pentax K</compat>
-         <compat>Pentax KA</compat>
-         <compat>Pentax KAF</compat>
-         <compat>Pentax KAF2</compat>
--        <compat>Sigma</compat>
-+        <compat>Pentax KAF3</compat>
-+        <compat>Rollei 6x6</compat>
-+        <compat>Samsung NX</compat>
-+        <compat>Samsung NX mini</compat>
-+        <compat>Sigma SA</compat>
-         <compat>Sony Alpha</compat>
--        <compat>M42</compat>
-+        <compat>Sony E</compat>
-+        <compat>T2</compat>
-+        <compat>C</compat>
-     </mount>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 1.0 (Full Frame)</model>
-+        <model lang="de">Crop-Faktor 1.0 (Kleinbildformat)</model>
-         <mount>Generic</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 1.1</model>
-+        <model lang="de">Crop-Faktor 1.1</model>
-         <mount>Generic</mount>
-         <cropfactor>1.1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 1.3 (APS-H)</model>
-+        <model lang="de">Crop-Faktor 1.3 (APS-H)</model>
-         <mount>Generic</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.267</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 1.5 (APS-C)</model>
-+        <model lang="de">Crop-Faktor 1.5 (APS-C)</model>
-         <mount>Generic</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 1.6 (APS-C)</model>
-+        <model lang="de">Crop-Faktor 1.6 (Canon APS-C)</model>
-         <mount>Generic</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 1.7</model>
-+        <model lang="de">Crop-Faktor 1.7 (Sigma)</model>
-         <mount>Generic</mount>
--        <cropfactor>1.7</cropfactor>
-+        <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Crop-factor 2.0 (Four-Thirds)</model>
-+        <model lang="de">Crop-Faktor 2.0 (Four-Thirds)</model>
-         <mount>Generic</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Rectilinear 10-1000mm f/1.0</model>
-+        <model lang="de">Rektilinear 10-1000mm f/1.0</model>
-         <mount>Generic</mount>
--        <cropfactor>1.0</cropfactor>
-         <type>rectilinear</type>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Fisheye 8-20mm f/1.0</model>
-+        <model lang="de">Fischauge 8-20mm f/1.0</model>
-         <mount>Generic</mount>
--        <cropfactor>1.0</cropfactor>
-         <type>fisheye</type>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Generic</maker>
-+        <maker lang="de">Generisch</maker>
-         <model>Panoramic 10-100mm f/1.0</model>
-+        <model lang="de">Panoramaobjektiv 10-100mm f/1.0</model>
-         <mount>Generic</mount>
--        <cropfactor>1.0</cropfactor>
-         <type>panoramic</type>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-canon.xml b/data/db/mil-canon.xml
---- a/data/db/mil-canon.xml	2013-10-11 23:54:00.000000000 +0200
-+++ b/data/db/mil-canon.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,14 +1,14 @@
- <lensdatabase>
--
-     <mount>
-         <name>Canon EF-M</name>
-         <compat>Canon EF-S</compat>
-         <compat>Canon EF</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS M</model>
-@@ -16,5 +16,263 @@
-         <mount>Canon EF-M</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS M2</model>
-+        <model lang="en">EOS M2</model>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS M3</model>
-+        <model lang="en">EOS M3</model>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-M 18-55mm f/3.5-5.6 IS STM</model>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="18" a="0.0208" b="-0.06707" c="0.02864"/>
-+            <distortion model="ptlens" focal="24" a="0.01074" b="-0.03245" c="0.01496"/>
-+            <distortion model="ptlens" focal="28" a="0.01015" b="-0.03385" c="0.03436"/>
-+            <distortion model="ptlens" focal="35" a="0.00738" b="-0.0241" c="0.0299"/>
-+            <distortion model="ptlens" focal="45" a="0.0079" b="-0.02394" c="0.02941"/>
-+            <distortion model="ptlens" focal="55" a="0.00824" b="-0.0265" c="0.0378"/>
-+            <tca model="poly3" focal="18" br="-0.0001552" vr="1.0005722" bb="0.0001298" vb="0.9997515"/>
-+            <tca model="poly3" focal="24" br="-0.0001187" vr="1.0004246" bb="0.0000721" vb="0.9998423"/>
-+            <tca model="poly3" focal="28" br="-0.0001068" vr="1.0003574" bb="0.0000875" vb="0.9998350"/>
-+            <tca model="poly3" focal="35" br="-0.0000862" vr="1.0002480" bb="0.0000485" vb="0.9998690"/>
-+            <tca model="poly3" focal="45" br="-0.0000211" vr="1.0000679" bb="-0.0000189" vb="1.0000319"/>
-+            <tca model="poly3" focal="55" br="-0.0000349" vr="0.9999870" bb="0.0000058" vb="1.0000393"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.3322" k2="1.1067" k3="-0.4495"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.3322" k2="1.1067" k3="-0.4495"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.9981" k2="0.3611" k3="0.0001"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.9981" k2="0.3611" k3="0.0001"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.4874" k2="-0.6382" k3="0.5159"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.4874" k2="-0.6382" k3="0.5159"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.4020" k2="-0.4262" k3="0.2472"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.4020" k2="-0.4262" k3="0.2472"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.5060" k2="0.0099" k3="-0.0542"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.5060" k2="0.0099" k3="-0.0542"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.5454" k2="0.1158" k3="-0.0910"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.5454" k2="0.1158" k3="-0.0910"/>
-+            <vignetting model="pa" focal="18" aperture="13" distance="10" k1="-0.5080" k2="-0.0298" k3="0.0520"/>
-+            <vignetting model="pa" focal="18" aperture="13" distance="1000" k1="-0.5080" k2="-0.0298" k3="0.0520"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.5054" k2="-0.0546" k3="0.0766"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.5054" k2="-0.0546" k3="0.0766"/>
-+            <vignetting model="pa" focal="18" aperture="20" distance="10" k1="-0.5073" k2="-0.0562" k3="0.0803"/>
-+            <vignetting model="pa" focal="18" aperture="20" distance="1000" k1="-0.5073" k2="-0.0562" k3="0.0803"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.5099" k2="-0.0601" k3="0.0832"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.5099" k2="-0.0601" k3="0.0832"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.1172" k2="0.8679" k3="-0.3365"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.1172" k2="0.8679" k3="-0.3365"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.8195" k2="0.2410" k3="0.0322"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.8195" k2="0.2410" k3="0.0322"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2904" k2="-0.7164" k3="0.5065"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2904" k2="-0.7164" k3="0.5065"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.2449" k2="-0.5351" k3="0.3055"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.2449" k2="-0.5351" k3="0.3055"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.3667" k2="-0.0164" k3="-0.0471"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3667" k2="-0.0164" k3="-0.0471"/>
-+            <vignetting model="pa" focal="24" aperture="10" distance="10" k1="-0.4050" k2="0.0699" k3="-0.0438"/>
-+            <vignetting model="pa" focal="24" aperture="10" distance="1000" k1="-0.4050" k2="0.0699" k3="-0.0438"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.3733" k2="-0.0463" k3="0.0610"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.3733" k2="-0.0463" k3="0.0610"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.3784" k2="-0.0396" k3="0.0593"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.3784" k2="-0.0396" k3="0.0593"/>
-+            <vignetting model="pa" focal="24" aperture="20" distance="10" k1="-0.3771" k2="-0.0401" k3="0.0573"/>
-+            <vignetting model="pa" focal="24" aperture="20" distance="1000" k1="-0.3771" k2="-0.0401" k3="0.0573"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.3841" k2="-0.0301" k3="0.0508"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3841" k2="-0.0301" k3="0.0508"/>
-+            <vignetting model="pa" focal="31" aperture="4.5" distance="10" k1="-0.9289" k2="0.6723" k3="-0.2469"/>
-+            <vignetting model="pa" focal="31" aperture="4.5" distance="1000" k1="-0.9289" k2="0.6723" k3="-0.2469"/>
-+            <vignetting model="pa" focal="31" aperture="5" distance="10" k1="-0.6920" k2="0.1915" k3="0.0349"/>
-+            <vignetting model="pa" focal="31" aperture="5" distance="1000" k1="-0.6920" k2="0.1915" k3="0.0349"/>
-+            <vignetting model="pa" focal="31" aperture="6.3" distance="10" k1="-0.1584" k2="-0.5926" k3="0.3605"/>
-+            <vignetting model="pa" focal="31" aperture="6.3" distance="1000" k1="-0.1584" k2="-0.5926" k3="0.3605"/>
-+            <vignetting model="pa" focal="31" aperture="8" distance="10" k1="-0.2692" k2="-0.0178" k3="-0.0490"/>
-+            <vignetting model="pa" focal="31" aperture="8" distance="1000" k1="-0.2692" k2="-0.0178" k3="-0.0490"/>
-+            <vignetting model="pa" focal="31" aperture="10" distance="10" k1="-0.2963" k2="0.0330" k3="-0.0091"/>
-+            <vignetting model="pa" focal="31" aperture="10" distance="1000" k1="-0.2963" k2="0.0330" k3="-0.0091"/>
-+            <vignetting model="pa" focal="31" aperture="13" distance="10" k1="-0.2843" k2="-0.0144" k3="0.0369"/>
-+            <vignetting model="pa" focal="31" aperture="13" distance="1000" k1="-0.2843" k2="-0.0144" k3="0.0369"/>
-+            <vignetting model="pa" focal="31" aperture="16" distance="10" k1="-0.2904" k2="0.0050" k3="0.0244"/>
-+            <vignetting model="pa" focal="31" aperture="16" distance="1000" k1="-0.2904" k2="0.0050" k3="0.0244"/>
-+            <vignetting model="pa" focal="31" aperture="20" distance="10" k1="-0.2886" k2="-0.0044" k3="0.0293"/>
-+            <vignetting model="pa" focal="31" aperture="20" distance="1000" k1="-0.2886" k2="-0.0044" k3="0.0293"/>
-+            <vignetting model="pa" focal="31" aperture="25" distance="10" k1="-0.2850" k2="-0.0074" k3="0.0297"/>
-+            <vignetting model="pa" focal="31" aperture="25" distance="1000" k1="-0.2850" k2="-0.0074" k3="0.0297"/>
-+            <vignetting model="pa" focal="31" aperture="29" distance="10" k1="-0.2879" k2="-0.0134" k3="0.0375"/>
-+            <vignetting model="pa" focal="31" aperture="29" distance="1000" k1="-0.2879" k2="-0.0134" k3="0.0375"/>
-+            <vignetting model="pa" focal="39" aperture="5" distance="10" k1="-0.7550" k2="0.4876" k3="-0.1637"/>
-+            <vignetting model="pa" focal="39" aperture="5" distance="1000" k1="-0.7550" k2="0.4876" k3="-0.1637"/>
-+            <vignetting model="pa" focal="39" aperture="5.6" distance="10" k1="-0.3883" k2="-0.2244" k3="0.2380"/>
-+            <vignetting model="pa" focal="39" aperture="5.6" distance="1000" k1="-0.3883" k2="-0.2244" k3="0.2380"/>
-+            <vignetting model="pa" focal="39" aperture="7.1" distance="10" k1="-0.1068" k2="-0.4347" k3="0.2373"/>
-+            <vignetting model="pa" focal="39" aperture="7.1" distance="1000" k1="-0.1068" k2="-0.4347" k3="0.2373"/>
-+            <vignetting model="pa" focal="39" aperture="9" distance="10" k1="-0.2316" k2="0.0691" k3="-0.0457"/>
-+            <vignetting model="pa" focal="39" aperture="9" distance="1000" k1="-0.2316" k2="0.0691" k3="-0.0457"/>
-+            <vignetting model="pa" focal="39" aperture="10" distance="10" k1="-0.2242" k2="0.0150" k3="0.0142"/>
-+            <vignetting model="pa" focal="39" aperture="10" distance="1000" k1="-0.2242" k2="0.0150" k3="0.0142"/>
-+            <vignetting model="pa" focal="39" aperture="13" distance="10" k1="-0.2222" k2="0.0131" k3="0.0182"/>
-+            <vignetting model="pa" focal="39" aperture="13" distance="1000" k1="-0.2222" k2="0.0131" k3="0.0182"/>
-+            <vignetting model="pa" focal="39" aperture="16" distance="10" k1="-0.2248" k2="0.0189" k3="0.0139"/>
-+            <vignetting model="pa" focal="39" aperture="16" distance="1000" k1="-0.2248" k2="0.0189" k3="0.0139"/>
-+            <vignetting model="pa" focal="39" aperture="20" distance="10" k1="-0.2301" k2="0.0268" k3="0.0108"/>
-+            <vignetting model="pa" focal="39" aperture="20" distance="1000" k1="-0.2301" k2="0.0268" k3="0.0108"/>
-+            <vignetting model="pa" focal="39" aperture="25" distance="10" k1="-0.2277" k2="0.0163" k3="0.0184"/>
-+            <vignetting model="pa" focal="39" aperture="25" distance="1000" k1="-0.2277" k2="0.0163" k3="0.0184"/>
-+            <vignetting model="pa" focal="39" aperture="32" distance="10" k1="-0.2321" k2="0.0255" k3="0.0120"/>
-+            <vignetting model="pa" focal="39" aperture="32" distance="1000" k1="-0.2321" k2="0.0255" k3="0.0120"/>
-+            <vignetting model="pa" focal="47" aperture="5.6" distance="10" k1="-0.6616" k2="0.4076" k3="-0.1308"/>
-+            <vignetting model="pa" focal="47" aperture="5.6" distance="1000" k1="-0.6616" k2="0.4076" k3="-0.1308"/>
-+            <vignetting model="pa" focal="47" aperture="6.3" distance="10" k1="-0.1392" k2="-0.4872" k3="0.3286"/>
-+            <vignetting model="pa" focal="47" aperture="6.3" distance="1000" k1="-0.1392" k2="-0.4872" k3="0.3286"/>
-+            <vignetting model="pa" focal="47" aperture="8" distance="10" k1="-0.1672" k2="-0.0069" k3="-0.0490"/>
-+            <vignetting model="pa" focal="47" aperture="8" distance="1000" k1="-0.1672" k2="-0.0069" k3="-0.0490"/>
-+            <vignetting model="pa" focal="47" aperture="10" distance="10" k1="-0.1980" k2="0.0536" k3="-0.0156"/>
-+            <vignetting model="pa" focal="47" aperture="10" distance="1000" k1="-0.1980" k2="0.0536" k3="-0.0156"/>
-+            <vignetting model="pa" focal="47" aperture="13" distance="10" k1="-0.1958" k2="0.0473" k3="-0.0079"/>
-+            <vignetting model="pa" focal="47" aperture="13" distance="1000" k1="-0.1958" k2="0.0473" k3="-0.0079"/>
-+            <vignetting model="pa" focal="47" aperture="16" distance="10" k1="-0.2024" k2="0.0584" k3="-0.0134"/>
-+            <vignetting model="pa" focal="47" aperture="16" distance="1000" k1="-0.2024" k2="0.0584" k3="-0.0134"/>
-+            <vignetting model="pa" focal="47" aperture="20" distance="10" k1="-0.2012" k2="0.0572" k3="-0.0141"/>
-+            <vignetting model="pa" focal="47" aperture="20" distance="1000" k1="-0.2012" k2="0.0572" k3="-0.0141"/>
-+            <vignetting model="pa" focal="47" aperture="25" distance="10" k1="-0.1971" k2="0.0470" k3="-0.0070"/>
-+            <vignetting model="pa" focal="47" aperture="25" distance="1000" k1="-0.1971" k2="0.0470" k3="-0.0070"/>
-+            <vignetting model="pa" focal="47" aperture="32" distance="10" k1="-0.2053" k2="0.0651" k3="-0.0188"/>
-+            <vignetting model="pa" focal="47" aperture="32" distance="1000" k1="-0.2053" k2="0.0651" k3="-0.0188"/>
-+            <vignetting model="pa" focal="47" aperture="36" distance="10" k1="-0.2116" k2="0.0699" k3="-0.0204"/>
-+            <vignetting model="pa" focal="47" aperture="36" distance="1000" k1="-0.2116" k2="0.0699" k3="-0.0204"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6081" k2="0.3726" k3="-0.1244"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6081" k2="0.3726" k3="-0.1244"/>
-+            <vignetting model="pa" focal="55" aperture="6.3" distance="10" k1="-0.2656" k2="-0.2359" k3="0.2059"/>
-+            <vignetting model="pa" focal="55" aperture="6.3" distance="1000" k1="-0.2656" k2="-0.2359" k3="0.2059"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1732" k2="0.0054" k3="-0.0483"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1732" k2="0.0054" k3="-0.0483"/>
-+            <vignetting model="pa" focal="55" aperture="10" distance="10" k1="-0.2177" k2="0.1287" k3="-0.0562"/>
-+            <vignetting model="pa" focal="55" aperture="10" distance="1000" k1="-0.2177" k2="0.1287" k3="-0.0562"/>
-+            <vignetting model="pa" focal="55" aperture="13" distance="10" k1="-0.2068" k2="0.1038" k3="-0.0402"/>
-+            <vignetting model="pa" focal="55" aperture="13" distance="1000" k1="-0.2068" k2="0.1038" k3="-0.0402"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2090" k2="0.1074" k3="-0.0418"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2090" k2="0.1074" k3="-0.0418"/>
-+            <vignetting model="pa" focal="55" aperture="20" distance="10" k1="-0.2145" k2="0.1189" k3="-0.0493"/>
-+            <vignetting model="pa" focal="55" aperture="20" distance="1000" k1="-0.2145" k2="0.1189" k3="-0.0493"/>
-+            <vignetting model="pa" focal="55" aperture="25" distance="10" k1="-0.2162" k2="0.1227" k3="-0.0521"/>
-+            <vignetting model="pa" focal="55" aperture="25" distance="1000" k1="-0.2162" k2="0.1227" k3="-0.0521"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="10" k1="-0.2201" k2="0.1294" k3="-0.0577"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.2201" k2="0.1294" k3="-0.0577"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.2304" k2="0.1392" k3="-0.0595"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.2304" k2="0.1392" k3="-0.0595"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-M 55-200mm f/4.5-6.3 IS STM</model>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS M3 -->
-+            <distortion model="ptlens" focal="55" a="0.00329" b="-0.01435" c="0.00377"/>
-+            <distortion model="ptlens" focal="70" a="0.00015" b="-0.00242" c="0.00388"/>
-+            <distortion model="ptlens" focal="100" a="-0.00155" b="0.01025" c="-0.01011"/>
-+            <distortion model="ptlens" focal="135" a="0.00082" b="0.00321" c="0.00353"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.00627" c="0"/>
-+            <tca model="poly3" focal="55" br="0.0001071" vr="0.9998291" bb="-0.0001337" vb="1.0003026"/>
-+            <tca model="poly3" focal="70" br="0.0001116" vr="0.9997943" bb="-0.0001178" vb="1.0002674"/>
-+            <tca model="poly3" focal="100" br="0.0000854" vr="0.9997423" bb="-0.0000962" vb="1.0001993"/>
-+            <tca model="poly3" focal="135" br="0.0000790" vr="0.9996930" bb="-0.0000693" vb="1.0000981"/>
-+            <tca model="poly3" focal="200" br="0.0000039" vr="0.9997842" bb="-0.0000210" vb="0.9998454"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.8433" k2="0.3433" k3="-0.1118"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.8433" k2="0.3433" k3="-0.1118"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0182" k2="-0.6545" k3="0.2298"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0182" k2="-0.6545" k3="0.2298"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.2507" k2="0.3525" k3="-0.4179"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.2507" k2="0.3525" k3="-0.4179"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.2337" k2="0.1947" k3="-0.1535"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.2337" k2="0.1947" k3="-0.1535"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1837" k2="0.0173" k3="-0.0031"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1837" k2="0.0173" k3="-0.0031"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.9554" k2="0.7145" k3="-0.3311"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.9554" k2="0.7145" k3="-0.3311"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0480" k2="-0.6194" k3="0.2584"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0480" k2="-0.6194" k3="0.2584"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2278" k2="0.3198" k3="-0.3787"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2278" k2="0.3198" k3="-0.3787"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2006" k2="0.1435" k3="-0.1132"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2006" k2="0.1435" k3="-0.1132"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1872" k2="0.0641" k3="-0.0331"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1872" k2="0.0641" k3="-0.0331"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.9906" k2="0.9718" k3="-0.5459"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.9906" k2="0.9718" k3="-0.5459"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.3833" k2="-0.1289" k3="0.0226"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.3833" k2="-0.1289" k3="0.0226"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1705" k2="0.1832" k3="-0.2866"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1705" k2="0.1832" k3="-0.2866"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.1799" k2="0.1162" k3="-0.0876"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1799" k2="0.1162" k3="-0.0876"/>
-+            <vignetting model="pa" focal="100" aperture="25" distance="10" k1="-0.1637" k2="0.0499" k3="-0.0247"/>
-+            <vignetting model="pa" focal="100" aperture="25" distance="1000" k1="-0.1637" k2="0.0499" k3="-0.0247"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.8756" k2="0.3596" k3="-0.0943"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.8756" k2="0.3596" k3="-0.0943"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0976" k2="0.0226" k3="-0.2644"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0976" k2="0.0226" k3="-0.2644"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1509" k2="0.0612" k3="-0.0359"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1509" k2="0.0612" k3="-0.0359"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1506" k2="0.0526" k3="-0.0254"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1506" k2="0.0526" k3="-0.0254"/>
-+            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="-0.1561" k2="0.0642" k3="-0.0328"/>
-+            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="-0.1561" k2="0.0642" k3="-0.0328"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-1.4623" k2="1.5775" k3="-0.7386"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-1.4623" k2="1.5775" k3="-0.7386"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1575" k2="-0.7181" k3="0.4431"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1575" k2="-0.7181" k3="0.4431"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1077" k2="0.0286" k3="-0.1211"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1077" k2="0.0286" k3="-0.1211"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.1262" k2="0.0398" k3="-0.0189"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.1262" k2="0.0398" k3="-0.0189"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.1265" k2="0.0423" k3="-0.0239"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1265" k2="0.0423" k3="-0.0239"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-M 22mm f/2 STM</model>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="22" k1="-0.00018"/>
-+            <tca model="poly3" focal="22" br="-0.0000678" vr="1.0002505" bb="0.0000624" vb="1.0000225"/>
-+            <vignetting model="pa" focal="22" aperture="2" distance="10" k1="-1.7852" k2="1.6007" k3="-0.6249"/>
-+            <vignetting model="pa" focal="22" aperture="2" distance="1000" k1="-1.7852" k2="1.6007" k3="-0.6249"/>
-+            <vignetting model="pa" focal="22" aperture="2.2" distance="10" k1="-0.7930" k2="-0.3929" k3="0.4473"/>
-+            <vignetting model="pa" focal="22" aperture="2.2" distance="1000" k1="-0.7930" k2="-0.3929" k3="0.4473"/>
-+            <vignetting model="pa" focal="22" aperture="2.5" distance="10" k1="-0.7636" k2="-0.2093" k3="0.2587"/>
-+            <vignetting model="pa" focal="22" aperture="2.5" distance="1000" k1="-0.7636" k2="-0.2093" k3="0.2587"/>
-+            <vignetting model="pa" focal="22" aperture="3.2" distance="10" k1="-0.8930" k2="0.3786" k3="-0.1146"/>
-+            <vignetting model="pa" focal="22" aperture="3.2" distance="1000" k1="-0.8930" k2="0.3786" k3="-0.1146"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="10" k1="-0.8868" k2="0.3302" k3="-0.0361"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="1000" k1="-0.8868" k2="0.3302" k3="-0.0361"/>
-+            <vignetting model="pa" focal="22" aperture="5" distance="10" k1="-0.8820" k2="0.3159" k3="-0.0204"/>
-+            <vignetting model="pa" focal="22" aperture="5" distance="1000" k1="-0.8820" k2="0.3159" k3="-0.0204"/>
-+            <vignetting model="pa" focal="22" aperture="6.3" distance="10" k1="-0.8804" k2="0.3111" k3="-0.0150"/>
-+            <vignetting model="pa" focal="22" aperture="6.3" distance="1000" k1="-0.8804" k2="0.3111" k3="-0.0150"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="10" k1="-0.8788" k2="0.3072" k3="-0.0121"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="1000" k1="-0.8788" k2="0.3072" k3="-0.0121"/>
-+            <vignetting model="pa" focal="22" aperture="10" distance="10" k1="-0.8842" k2="0.3173" k3="-0.0168"/>
-+            <vignetting model="pa" focal="22" aperture="10" distance="1000" k1="-0.8842" k2="0.3173" k3="-0.0168"/>
-+            <vignetting model="pa" focal="22" aperture="13" distance="10" k1="-0.8957" k2="0.3596" k3="-0.0484"/>
-+            <vignetting model="pa" focal="22" aperture="13" distance="1000" k1="-0.8957" k2="0.3596" k3="-0.0484"/>
-+            <vignetting model="pa" focal="22" aperture="16" distance="10" k1="-0.8819" k2="0.3147" k3="-0.0177"/>
-+            <vignetting model="pa" focal="22" aperture="16" distance="1000" k1="-0.8819" k2="0.3147" k3="-0.0177"/>
-+            <vignetting model="pa" focal="22" aperture="20" distance="10" k1="-0.8851" k2="0.3189" k3="-0.0201"/>
-+            <vignetting model="pa" focal="22" aperture="20" distance="1000" k1="-0.8851" k2="0.3189" k3="-0.0201"/>
-+            <vignetting model="pa" focal="22" aperture="22" distance="10" k1="-0.8954" k2="0.3316" k3="-0.0229"/>
-+            <vignetting model="pa" focal="22" aperture="22" distance="1000" k1="-0.8954" k2="0.3316" k3="-0.0229"/>
-+        </calibration>
-+    </lens>
- </lensdatabase>
-diff -Nurpd a/data/db/mil-fujifilm.xml b/data/db/mil-fujifilm.xml
---- a/data/db/mil-fujifilm.xml	2013-10-18 19:20:57.000000000 +0200
-+++ b/data/db/mil-fujifilm.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,34 +1,951 @@
- <lensdatabase>
--
-     <mount>
-         <name>Fujifilm X</name>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>X-Pro1</model>
-         <mount>Fujifilm X</mount>
--        <cropfactor>1.529</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>X-E1</model>
-         <mount>Fujifilm X</mount>
--        <cropfactor>1.529</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-+        <model>X-E2</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X-T1</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-         <model>X-M1</model>
-         <mount>Fujifilm X</mount>
--        <cropfactor>1.529</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X-A1</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X-A2</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>X-T10</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF18-55mmF2.8-4 R LM OIS</model>
-+        <model lang="en">XF 18-55mm f/2.8-4 R LM OIS</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-E1 -->
-+            <distortion model="ptlens" focal="18" a="0.02808" b="-0.10604" c="0.07041"/>
-+            <distortion model="ptlens" focal="22.3" a="0.01298" b="-0.03695" c="0.01899"/>
-+            <distortion model="ptlens" focal="27.7" a="0.03709" b="-0.11695" c="0.1187"/>
-+            <distortion model="ptlens" focal="35.8" a="0.02942" b="-0.08799" c="0.09673"/>
-+            <distortion model="ptlens" focal="44.4" a="0.00611" b="-0.00562" c="0.0159"/>
-+            <distortion model="ptlens" focal="55" a="0.00491" b="-0.00114" c="0.01427"/>
-+            <tca model="poly3" focal="18" br="-0.0001885" vr="1.0006600" bb="0.0001738" vb="0.9998316"/>
-+            <tca model="poly3" focal="22.3" br="-0.0001934" vr="1.0004668" bb="0.0002412" vb="0.9997719"/>
-+            <tca model="poly3" focal="27.7" br="-0.0001630" vr="1.0003388" bb="0.0001984" vb="0.9997897"/>
-+            <tca model="poly3" focal="35.8" br="-0.0001699" vr="1.0002943" bb="0.0001666" vb="0.9997469"/>
-+            <tca model="poly3" focal="44.4" br="-0.0001304" vr="1.0002094" bb="0.0001355" vb="0.9996474"/>
-+            <tca model="poly3" focal="55" br="-0.0001185" vr="1.0001664" bb="0.0001695" vb="0.9993813"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="18" aperture="2.8" distance="10" k1="-0.9940" k2="0.9214" k3="-0.6090"/>
-+            <vignetting model="pa" focal="18" aperture="2.8" distance="1000" k1="-0.9940" k2="0.9214" k3="-0.6090"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2929" k2="-0.2031" k3="-0.0206"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2929" k2="-0.2031" k3="-0.0206"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.4171" k2="0.2130" k3="-0.2220"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.4171" k2="0.2130" k3="-0.2220"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3676" k2="0.0019" k3="-0.0094"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3676" k2="0.0019" k3="-0.0094"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3752" k2="0.0224" k3="-0.0227"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3752" k2="0.0224" k3="-0.0227"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.3861" k2="0.0443" k3="-0.0331"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.3861" k2="0.0443" k3="-0.0331"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3907" k2="0.0521" k3="-0.0360"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3907" k2="0.0521" k3="-0.0360"/>
-+            <vignetting model="pa" focal="23.3" aperture="3.2" distance="10" k1="-1.0139" k2="1.2731" k3="-0.7978"/>
-+            <vignetting model="pa" focal="23.3" aperture="3.2" distance="1000" k1="-1.0139" k2="1.2731" k3="-0.7978"/>
-+            <vignetting model="pa" focal="23.3" aperture="4" distance="10" k1="-0.3673" k2="-0.0866" k3="0.0234"/>
-+            <vignetting model="pa" focal="23.3" aperture="4" distance="1000" k1="-0.3673" k2="-0.0866" k3="0.0234"/>
-+            <vignetting model="pa" focal="23.3" aperture="5.6" distance="10" k1="-0.3168" k2="0.0613" k3="-0.0534"/>
-+            <vignetting model="pa" focal="23.3" aperture="5.6" distance="1000" k1="-0.3168" k2="0.0613" k3="-0.0534"/>
-+            <vignetting model="pa" focal="23.3" aperture="8" distance="10" k1="-0.3039" k2="0.0142" k3="-0.0113"/>
-+            <vignetting model="pa" focal="23.3" aperture="8" distance="1000" k1="-0.3039" k2="0.0142" k3="-0.0113"/>
-+            <vignetting model="pa" focal="23.3" aperture="11" distance="10" k1="-0.3033" k2="0.0151" k3="-0.0123"/>
-+            <vignetting model="pa" focal="23.3" aperture="11" distance="1000" k1="-0.3033" k2="0.0151" k3="-0.0123"/>
-+            <vignetting model="pa" focal="23.3" aperture="16" distance="10" k1="-0.3170" k2="0.0485" k3="-0.0348"/>
-+            <vignetting model="pa" focal="23.3" aperture="16" distance="1000" k1="-0.3170" k2="0.0485" k3="-0.0348"/>
-+            <vignetting model="pa" focal="23.3" aperture="22" distance="10" k1="-0.3237" k2="0.0555" k3="-0.0357"/>
-+            <vignetting model="pa" focal="23.3" aperture="22" distance="1000" k1="-0.3237" k2="0.0555" k3="-0.0357"/>
-+            <vignetting model="pa" focal="28.9" aperture="3.2" distance="10" k1="-0.9565" k2="1.3570" k3="-0.9694"/>
-+            <vignetting model="pa" focal="28.9" aperture="3.2" distance="1000" k1="-0.9565" k2="1.3570" k3="-0.9694"/>
-+            <vignetting model="pa" focal="28.9" aperture="4" distance="10" k1="-0.3912" k2="0.2104" k3="-0.2598"/>
-+            <vignetting model="pa" focal="28.9" aperture="4" distance="1000" k1="-0.3912" k2="0.2104" k3="-0.2598"/>
-+            <vignetting model="pa" focal="28.9" aperture="5.6" distance="10" k1="-0.2824" k2="0.0648" k3="-0.0563"/>
-+            <vignetting model="pa" focal="28.9" aperture="5.6" distance="1000" k1="-0.2824" k2="0.0648" k3="-0.0563"/>
-+            <vignetting model="pa" focal="28.9" aperture="8" distance="10" k1="-0.2744" k2="0.0335" k3="-0.0273"/>
-+            <vignetting model="pa" focal="28.9" aperture="8" distance="1000" k1="-0.2744" k2="0.0335" k3="-0.0273"/>
-+            <vignetting model="pa" focal="28.9" aperture="11" distance="10" k1="-0.2786" k2="0.0444" k3="-0.0334"/>
-+            <vignetting model="pa" focal="28.9" aperture="11" distance="1000" k1="-0.2786" k2="0.0444" k3="-0.0334"/>
-+            <vignetting model="pa" focal="28.9" aperture="16" distance="10" k1="-0.2878" k2="0.0649" k3="-0.0462"/>
-+            <vignetting model="pa" focal="28.9" aperture="16" distance="1000" k1="-0.2878" k2="0.0649" k3="-0.0462"/>
-+            <vignetting model="pa" focal="28.9" aperture="22" distance="10" k1="-0.2878" k2="0.0600" k3="-0.0421"/>
-+            <vignetting model="pa" focal="28.9" aperture="22" distance="1000" k1="-0.2878" k2="0.0600" k3="-0.0421"/>
-+            <vignetting model="pa" focal="35.8" aperture="3.6" distance="10" k1="-0.8448" k2="1.2051" k3="-0.9476"/>
-+            <vignetting model="pa" focal="35.8" aperture="3.6" distance="1000" k1="-0.8448" k2="1.2051" k3="-0.9476"/>
-+            <vignetting model="pa" focal="35.8" aperture="4" distance="10" k1="-0.6601" k2="0.8248" k3="-0.6931"/>
-+            <vignetting model="pa" focal="35.8" aperture="4" distance="1000" k1="-0.6601" k2="0.8248" k3="-0.6931"/>
-+            <vignetting model="pa" focal="35.8" aperture="5.6" distance="10" k1="-0.3767" k2="0.4933" k3="-0.4300"/>
-+            <vignetting model="pa" focal="35.8" aperture="5.6" distance="1000" k1="-0.3767" k2="0.4933" k3="-0.4300"/>
-+            <vignetting model="pa" focal="35.8" aperture="8" distance="10" k1="-0.2710" k2="0.0847" k3="-0.0614"/>
-+            <vignetting model="pa" focal="35.8" aperture="8" distance="1000" k1="-0.2710" k2="0.0847" k3="-0.0614"/>
-+            <vignetting model="pa" focal="35.8" aperture="11" distance="10" k1="-0.2727" k2="0.0875" k3="-0.0614"/>
-+            <vignetting model="pa" focal="35.8" aperture="11" distance="1000" k1="-0.2727" k2="0.0875" k3="-0.0614"/>
-+            <vignetting model="pa" focal="35.8" aperture="16" distance="10" k1="-0.2772" k2="0.1002" k3="-0.0710"/>
-+            <vignetting model="pa" focal="35.8" aperture="16" distance="1000" k1="-0.2772" k2="0.1002" k3="-0.0710"/>
-+            <vignetting model="pa" focal="35.8" aperture="22" distance="10" k1="-0.2818" k2="0.1161" k3="-0.0841"/>
-+            <vignetting model="pa" focal="35.8" aperture="22" distance="1000" k1="-0.2818" k2="0.1161" k3="-0.0841"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.4700" k2="0.1851" k3="-0.3613"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.4700" k2="0.1851" k3="-0.3613"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.3795" k2="0.7246" k3="-0.7785"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3795" k2="0.7246" k3="-0.7785"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.3782" k2="0.6199" k3="-0.5550"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.3782" k2="0.6199" k3="-0.5550"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.2621" k2="0.1629" k3="-0.1325"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.2621" k2="0.1629" k3="-0.1325"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2565" k2="0.1369" k3="-0.1058"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2565" k2="0.1369" k3="-0.1058"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2428" k2="0.1097" k3="-0.0909"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2428" k2="0.1097" k3="-0.0909"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XC16-50mmF3.5-5.6 OIS</model>
-+        <model lang="en">XC 16-50mm f/3.5-5.6 OIS</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-M1 -->
-+            <distortion model="ptlens" focal="16" a="0.02487" b="-0.09617" c="0.03106"/>
-+            <distortion model="ptlens" focal="22.2" a="0.00843" b="-0.03427" c="0.01288"/>
-+            <distortion model="ptlens" focal="28.2" a="0.01218" b="-0.05193" c="0.0513"/>
-+            <distortion model="ptlens" focal="34" a="-0.00417" b="0.01591" c="-0.02319"/>
-+            <distortion model="ptlens" focal="41.8" a="0" b="-0.00159" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.00416" c="0"/>
-+            <tca model="poly3" focal="16" br="-0.0001013" vr="1.0003838" bb="0.0000720" vb="1.0000557"/>
-+            <tca model="poly3" focal="22.2" br="-0.0000844" vr="1.0002839" bb="0.0000997" vb="0.9999382"/>
-+            <tca model="poly3" focal="29.5" br="-0.0000603" vr="1.0002492" bb="0.0000545" vb="0.9999185"/>
-+            <tca model="poly3" focal="37.1" br="-0.0000480" vr="1.0002372" bb="0.0000296" vb="0.9998630"/>
-+            <tca model="poly3" focal="50" br="-0.0000550" vr="1.0001813" bb="0.0000121" vb="0.9997167"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-1.1839" k2="1.2688" k3="-0.6976"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.1839" k2="1.2688" k3="-0.6976"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.5706" k2="-0.1552" k3="0.2003"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.5706" k2="-0.1552" k3="0.2003"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1243" k2="-0.5545" k3="0.2593"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1243" k2="-0.5545" k3="0.2593"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.2917" k2="0.0492" k3="-0.0798"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.2917" k2="0.0492" k3="-0.0798"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.2665" k2="-0.0732" k3="0.0502"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.2665" k2="-0.0732" k3="0.0502"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.2743" k2="-0.0585" k3="0.0416"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.2743" k2="-0.0585" k3="0.0416"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.2939" k2="-0.0216" k3="0.0203"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.2939" k2="-0.0216" k3="0.0203"/>
-+            <vignetting model="pa" focal="22.2" aperture="4" distance="10" k1="-0.9609" k2="0.9526" k3="-0.4347"/>
-+            <vignetting model="pa" focal="22.2" aperture="4" distance="1000" k1="-0.9609" k2="0.9526" k3="-0.4347"/>
-+            <vignetting model="pa" focal="22.2" aperture="5.6" distance="10" k1="-0.0607" k2="-0.5769" k3="0.3142"/>
-+            <vignetting model="pa" focal="22.2" aperture="5.6" distance="1000" k1="-0.0607" k2="-0.5769" k3="0.3142"/>
-+            <vignetting model="pa" focal="22.2" aperture="8" distance="10" k1="-0.2201" k2="0.0815" k3="-0.0674"/>
-+            <vignetting model="pa" focal="22.2" aperture="8" distance="1000" k1="-0.2201" k2="0.0815" k3="-0.0674"/>
-+            <vignetting model="pa" focal="22.2" aperture="11" distance="10" k1="-0.2106" k2="0.0205" k3="0.0001"/>
-+            <vignetting model="pa" focal="22.2" aperture="11" distance="1000" k1="-0.2106" k2="0.0205" k3="0.0001"/>
-+            <vignetting model="pa" focal="22.2" aperture="16" distance="10" k1="-0.2208" k2="0.0402" k3="-0.0109"/>
-+            <vignetting model="pa" focal="22.2" aperture="16" distance="1000" k1="-0.2208" k2="0.0402" k3="-0.0109"/>
-+            <vignetting model="pa" focal="22.2" aperture="22" distance="10" k1="-0.2409" k2="0.0809" k3="-0.0369"/>
-+            <vignetting model="pa" focal="22.2" aperture="22" distance="1000" k1="-0.2409" k2="0.0809" k3="-0.0369"/>
-+            <vignetting model="pa" focal="29.5" aperture="4.7" distance="10" k1="-0.8714" k2="0.9190" k3="-0.4339"/>
-+            <vignetting model="pa" focal="29.5" aperture="4.7" distance="1000" k1="-0.8714" k2="0.9190" k3="-0.4339"/>
-+            <vignetting model="pa" focal="29.5" aperture="5.6" distance="10" k1="-0.0995" k2="-0.5194" k3="0.3242"/>
-+            <vignetting model="pa" focal="29.5" aperture="5.6" distance="1000" k1="-0.0995" k2="-0.5194" k3="0.3242"/>
-+            <vignetting model="pa" focal="29.5" aperture="8" distance="10" k1="-0.1767" k2="0.0901" k3="-0.0842"/>
-+            <vignetting model="pa" focal="29.5" aperture="8" distance="1000" k1="-0.1767" k2="0.0901" k3="-0.0842"/>
-+            <vignetting model="pa" focal="29.5" aperture="11" distance="10" k1="-0.1791" k2="0.0441" k3="-0.0163"/>
-+            <vignetting model="pa" focal="29.5" aperture="11" distance="1000" k1="-0.1791" k2="0.0441" k3="-0.0163"/>
-+            <vignetting model="pa" focal="29.5" aperture="16" distance="10" k1="-0.1945" k2="0.0750" k3="-0.0336"/>
-+            <vignetting model="pa" focal="29.5" aperture="16" distance="1000" k1="-0.1945" k2="0.0750" k3="-0.0336"/>
-+            <vignetting model="pa" focal="29.5" aperture="22" distance="10" k1="-0.2026" k2="0.0875" k3="-0.0397"/>
-+            <vignetting model="pa" focal="29.5" aperture="22" distance="1000" k1="-0.2026" k2="0.0875" k3="-0.0397"/>
-+            <vignetting model="pa" focal="35.5" aperture="5.6" distance="10" k1="-0.3113" k2="-0.1482" k3="0.1584"/>
-+            <vignetting model="pa" focal="35.5" aperture="5.6" distance="1000" k1="-0.3113" k2="-0.1482" k3="0.1584"/>
-+            <vignetting model="pa" focal="35.5" aperture="8" distance="10" k1="-0.1623" k2="0.1135" k3="-0.1163"/>
-+            <vignetting model="pa" focal="35.5" aperture="8" distance="1000" k1="-0.1623" k2="0.1135" k3="-0.1163"/>
-+            <vignetting model="pa" focal="35.5" aperture="11" distance="10" k1="-0.1579" k2="0.0460" k3="-0.0163"/>
-+            <vignetting model="pa" focal="35.5" aperture="11" distance="1000" k1="-0.1579" k2="0.0460" k3="-0.0163"/>
-+            <vignetting model="pa" focal="35.5" aperture="16" distance="10" k1="-0.1710" k2="0.0757" k3="-0.0348"/>
-+            <vignetting model="pa" focal="35.5" aperture="16" distance="1000" k1="-0.1710" k2="0.0757" k3="-0.0348"/>
-+            <vignetting model="pa" focal="35.5" aperture="22" distance="10" k1="-0.1645" k2="0.0550" k3="-0.0204"/>
-+            <vignetting model="pa" focal="35.5" aperture="22" distance="1000" k1="-0.1645" k2="0.0550" k3="-0.0204"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.3" distance="10" k1="-0.7175" k2="0.7596" k3="-0.3610"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.3" distance="1000" k1="-0.7175" k2="0.7596" k3="-0.3610"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.6" distance="10" k1="-0.2833" k2="-0.1402" k3="0.1490"/>
-+            <vignetting model="pa" focal="40.2" aperture="5.6" distance="1000" k1="-0.2833" k2="-0.1402" k3="0.1490"/>
-+            <vignetting model="pa" focal="40.2" aperture="8" distance="10" k1="-0.1516" k2="0.1215" k3="-0.1076"/>
-+            <vignetting model="pa" focal="40.2" aperture="8" distance="1000" k1="-0.1516" k2="0.1215" k3="-0.1076"/>
-+            <vignetting model="pa" focal="40.2" aperture="11" distance="10" k1="-0.1462" k2="0.0599" k3="-0.0293"/>
-+            <vignetting model="pa" focal="40.2" aperture="11" distance="1000" k1="-0.1462" k2="0.0599" k3="-0.0293"/>
-+            <vignetting model="pa" focal="40.2" aperture="16" distance="10" k1="-0.1531" k2="0.0708" k3="-0.0345"/>
-+            <vignetting model="pa" focal="40.2" aperture="16" distance="1000" k1="-0.1531" k2="0.0708" k3="-0.0345"/>
-+            <vignetting model="pa" focal="40.2" aperture="22" distance="10" k1="-0.1474" k2="0.0529" k3="-0.0227"/>
-+            <vignetting model="pa" focal="40.2" aperture="22" distance="1000" k1="-0.1474" k2="0.0529" k3="-0.0227"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.7982" k2="1.2935" k3="-0.9377"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.7982" k2="1.2935" k3="-0.9377"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0891" k2="0.0030" k3="-0.0895"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0891" k2="0.0030" k3="-0.0895"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1110" k2="0.0315" k3="-0.0167"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1110" k2="0.0315" k3="-0.0167"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1146" k2="0.0370" k3="-0.0193"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1146" k2="0.0370" k3="-0.0193"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1198" k2="0.0400" k3="-0.0190"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1198" k2="0.0400" k3="-0.0190"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XC50-230mmF4.5-6.7 OIS</model>
-+        <model lang="en">XC 50-230mm f/4.5-6.7 OIS</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-M1 -->
-+            <distortion model="poly3" focal="50" k1="0.0017"/>
-+            <distortion model="poly3" focal="67.1" k1="0.00774"/>
-+            <distortion model="poly3" focal="101.2" k1="0.00967"/>
-+            <distortion model="poly3" focal="135.7" k1="0.00836"/>
-+            <distortion model="poly3" focal="181.9" k1="0.0089"/>
-+            <distortion model="poly3" focal="230" k1="0.00772"/>
-+            <tca model="poly3" focal="50" br="-0.0001000" vr="1.0003015" bb="0.0001185" vb="0.9999656"/>
-+            <tca model="poly3" focal="67.1" br="-0.0000913" vr="1.0002869" bb="0.0000633" vb="0.9998660"/>
-+            <tca model="poly3" focal="101.2" br="-0.0000511" vr="1.0001847" bb="0.0000461" vb="0.9996973"/>
-+            <tca model="poly3" focal="107.3" br="-0.0000559" vr="1.0001940" bb="0.0000439" vb="0.9996962"/>
-+            <tca model="poly3" focal="135.7" br="-0.0000520" vr="1.0001402" bb="0.0000174" vb="0.9995976"/>
-+            <tca model="poly3" focal="152.6" br="-0.0000292" vr="1.0000646" bb="-0.0000088" vb="0.9995959"/>
-+            <tca model="poly3" focal="181.9" br="-0.0000091" vr="0.9999066" bb="0.0000116" vb="0.9995961"/>
-+            <tca model="poly3" focal="230" br="-0.0000631" vr="0.9994886" bb="0.0000510" vb="0.9998227"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.2342" k2="-1.3181" k3="0.9147"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.2342" k2="-1.3181" k3="0.9147"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="0.0704" k2="-1.0728" k3="0.4962"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="0.0704" k2="-1.0728" k3="0.4962"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2497" k2="0.2275" k3="-0.3150"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2497" k2="0.2275" k3="-0.3150"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2653" k2="0.1802" k3="-0.1343"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2653" k2="0.1802" k3="-0.1343"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2292" k2="0.0352" k3="-0.0001"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2292" k2="0.0352" k3="-0.0001"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2299" k2="0.0366" k3="-0.0004"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2299" k2="0.0366" k3="-0.0004"/>
-+            <vignetting model="pa" focal="63.2" aperture="4.8" distance="10" k1="-0.2358" k2="-0.9246" k3="0.6416"/>
-+            <vignetting model="pa" focal="63.2" aperture="4.8" distance="1000" k1="-0.2358" k2="-0.9246" k3="0.6416"/>
-+            <vignetting model="pa" focal="63.2" aperture="5.6" distance="10" k1="-0.0466" k2="-0.4433" k3="0.1303"/>
-+            <vignetting model="pa" focal="63.2" aperture="5.6" distance="1000" k1="-0.0466" k2="-0.4433" k3="0.1303"/>
-+            <vignetting model="pa" focal="63.2" aperture="8" distance="10" k1="-0.1943" k2="0.0410" k3="-0.0102"/>
-+            <vignetting model="pa" focal="63.2" aperture="8" distance="1000" k1="-0.1943" k2="0.0410" k3="-0.0102"/>
-+            <vignetting model="pa" focal="63.2" aperture="11" distance="10" k1="-0.1952" k2="0.0373" k3="-0.0041"/>
-+            <vignetting model="pa" focal="63.2" aperture="11" distance="1000" k1="-0.1952" k2="0.0373" k3="-0.0041"/>
-+            <vignetting model="pa" focal="63.2" aperture="16" distance="10" k1="-0.1963" k2="0.0381" k3="-0.0037"/>
-+            <vignetting model="pa" focal="63.2" aperture="16" distance="1000" k1="-0.1963" k2="0.0381" k3="-0.0037"/>
-+            <vignetting model="pa" focal="63.2" aperture="22" distance="10" k1="-0.2109" k2="0.0707" k3="-0.0253"/>
-+            <vignetting model="pa" focal="63.2" aperture="22" distance="1000" k1="-0.2109" k2="0.0707" k3="-0.0253"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.4" distance="10" k1="-0.2328" k2="-0.7301" k3="0.5121"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.4" distance="1000" k1="-0.2328" k2="-0.7301" k3="0.5121"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.6" distance="10" k1="-0.0398" k2="-0.7432" k3="0.4136"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.6" distance="1000" k1="-0.0398" k2="-0.7432" k3="0.4136"/>
-+            <vignetting model="pa" focal="95.4" aperture="8" distance="10" k1="-0.1912" k2="0.1743" k3="-0.1720"/>
-+            <vignetting model="pa" focal="95.4" aperture="8" distance="1000" k1="-0.1912" k2="0.1743" k3="-0.1720"/>
-+            <vignetting model="pa" focal="95.4" aperture="11" distance="10" k1="-0.1824" k2="0.0825" k3="-0.0324"/>
-+            <vignetting model="pa" focal="95.4" aperture="11" distance="1000" k1="-0.1824" k2="0.0825" k3="-0.0324"/>
-+            <vignetting model="pa" focal="95.4" aperture="16" distance="10" k1="-0.1852" k2="0.0889" k3="-0.0363"/>
-+            <vignetting model="pa" focal="95.4" aperture="16" distance="1000" k1="-0.1852" k2="0.0889" k3="-0.0363"/>
-+            <vignetting model="pa" focal="95.4" aperture="22" distance="10" k1="-0.1732" k2="0.0609" k3="-0.0185"/>
-+            <vignetting model="pa" focal="95.4" aperture="22" distance="1000" k1="-0.1732" k2="0.0609" k3="-0.0185"/>
-+            <vignetting model="pa" focal="127.9" aperture="5.8" distance="10" k1="-0.0938" k2="-0.9267" k3="0.5128"/>
-+            <vignetting model="pa" focal="127.9" aperture="5.8" distance="1000" k1="-0.0938" k2="-0.9267" k3="0.5128"/>
-+            <vignetting model="pa" focal="127.9" aperture="8" distance="10" k1="-0.1421" k2="0.1737" k3="-0.2982"/>
-+            <vignetting model="pa" focal="127.9" aperture="8" distance="1000" k1="-0.1421" k2="0.1737" k3="-0.2982"/>
-+            <vignetting model="pa" focal="127.9" aperture="11" distance="10" k1="-0.1462" k2="0.0739" k3="-0.0333"/>
-+            <vignetting model="pa" focal="127.9" aperture="11" distance="1000" k1="-0.1462" k2="0.0739" k3="-0.0333"/>
-+            <vignetting model="pa" focal="127.9" aperture="16" distance="10" k1="-0.1475" k2="0.0729" k3="-0.0295"/>
-+            <vignetting model="pa" focal="127.9" aperture="16" distance="1000" k1="-0.1475" k2="0.0729" k3="-0.0295"/>
-+            <vignetting model="pa" focal="127.9" aperture="22" distance="10" k1="-0.1377" k2="0.0528" k3="-0.0179"/>
-+            <vignetting model="pa" focal="127.9" aperture="22" distance="1000" k1="-0.1377" k2="0.0528" k3="-0.0179"/>
-+            <vignetting model="pa" focal="171.6" aperture="6.4" distance="10" k1="0.1066" k2="-1.6998" k3="1.0146"/>
-+            <vignetting model="pa" focal="171.6" aperture="6.4" distance="1000" k1="0.1066" k2="-1.6998" k3="1.0146"/>
-+            <vignetting model="pa" focal="171.6" aperture="8" distance="10" k1="0.1683" k2="-0.8557" k3="0.2474"/>
-+            <vignetting model="pa" focal="171.6" aperture="8" distance="1000" k1="0.1683" k2="-0.8557" k3="0.2474"/>
-+            <vignetting model="pa" focal="171.6" aperture="11" distance="10" k1="-0.2061" k2="0.4193" k3="-0.3749"/>
-+            <vignetting model="pa" focal="171.6" aperture="11" distance="1000" k1="-0.2061" k2="0.4193" k3="-0.3749"/>
-+            <vignetting model="pa" focal="171.6" aperture="16" distance="10" k1="-0.1209" k2="0.0637" k3="-0.0283"/>
-+            <vignetting model="pa" focal="171.6" aperture="16" distance="1000" k1="-0.1209" k2="0.0637" k3="-0.0283"/>
-+            <vignetting model="pa" focal="171.6" aperture="22" distance="10" k1="-0.1230" k2="0.0678" k3="-0.0306"/>
-+            <vignetting model="pa" focal="171.6" aperture="22" distance="1000" k1="-0.1230" k2="0.0678" k3="-0.0306"/>
-+            <vignetting model="pa" focal="230" aperture="6.7" distance="10" k1="-0.4666" k2="-0.5099" k3="0.3285"/>
-+            <vignetting model="pa" focal="230" aperture="6.7" distance="1000" k1="-0.4666" k2="-0.5099" k3="0.3285"/>
-+            <vignetting model="pa" focal="230" aperture="8" distance="10" k1="0.0351" k2="-0.9080" k3="0.3734"/>
-+            <vignetting model="pa" focal="230" aperture="8" distance="1000" k1="0.0351" k2="-0.9080" k3="0.3734"/>
-+            <vignetting model="pa" focal="230" aperture="11" distance="10" k1="-0.1290" k2="0.2248" k3="-0.3407"/>
-+            <vignetting model="pa" focal="230" aperture="11" distance="1000" k1="-0.1290" k2="0.2248" k3="-0.3407"/>
-+            <vignetting model="pa" focal="230" aperture="16" distance="10" k1="-0.1270" k2="0.0993" k3="-0.0612"/>
-+            <vignetting model="pa" focal="230" aperture="16" distance="1000" k1="-0.1270" k2="0.0993" k3="-0.0612"/>
-+            <vignetting model="pa" focal="230" aperture="22" distance="10" k1="-0.1088" k2="0.0432" k3="-0.0165"/>
-+            <vignetting model="pa" focal="230" aperture="22" distance="1000" k1="-0.1088" k2="0.0432" k3="-0.0165"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XC50-230mmF4.5-6.7 OIS II</model>
-+        <model lang="en">XC 50-230mm f/4.5-6.7 OIS II</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-A2 -->
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.2704" k2="-1.2793" k3="0.9014"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.2704" k2="-1.2793" k3="0.9014"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="0.0210" k2="-0.9425" k3="0.4102"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="0.0210" k2="-0.9425" k3="0.4102"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2687" k2="0.2264" k3="-0.3177"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2687" k2="0.2264" k3="-0.3177"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3051" k2="0.2454" k3="-0.1803"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3051" k2="0.2454" k3="-0.1803"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2491" k2="0.0475" k3="-0.0056"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2491" k2="0.0475" k3="-0.0056"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2473" k2="0.0432" k3="-0.0023"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2473" k2="0.0432" k3="-0.0023"/>
-+            <vignetting model="pa" focal="67.1" aperture="4.8" distance="10" k1="-0.2709" k2="-0.8927" k3="0.6304"/>
-+            <vignetting model="pa" focal="67.1" aperture="4.8" distance="1000" k1="-0.2709" k2="-0.8927" k3="0.6304"/>
-+            <vignetting model="pa" focal="67.1" aperture="5.6" distance="10" k1="-0.0467" k2="-0.5184" k3="0.1808"/>
-+            <vignetting model="pa" focal="67.1" aperture="5.6" distance="1000" k1="-0.0467" k2="-0.5184" k3="0.1808"/>
-+            <vignetting model="pa" focal="67.1" aperture="8" distance="10" k1="-0.2047" k2="0.0286" k3="0.0021"/>
-+            <vignetting model="pa" focal="67.1" aperture="8" distance="1000" k1="-0.2047" k2="0.0286" k3="0.0021"/>
-+            <vignetting model="pa" focal="67.1" aperture="11" distance="10" k1="-0.2061" k2="0.0339" k3="-0.0017"/>
-+            <vignetting model="pa" focal="67.1" aperture="11" distance="1000" k1="-0.2061" k2="0.0339" k3="-0.0017"/>
-+            <vignetting model="pa" focal="67.1" aperture="16" distance="10" k1="-0.2083" k2="0.0374" k3="-0.0029"/>
-+            <vignetting model="pa" focal="67.1" aperture="16" distance="1000" k1="-0.2083" k2="0.0374" k3="-0.0029"/>
-+            <vignetting model="pa" focal="67.1" aperture="22" distance="10" k1="-0.2081" k2="0.0383" k3="-0.0032"/>
-+            <vignetting model="pa" focal="67.1" aperture="22" distance="1000" k1="-0.2081" k2="0.0383" k3="-0.0032"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.4" distance="10" k1="-0.2426" k2="-0.7319" k3="0.5151"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.4" distance="1000" k1="-0.2426" k2="-0.7319" k3="0.5151"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.6" distance="10" k1="-0.0398" k2="-0.7879" k3="0.4440"/>
-+            <vignetting model="pa" focal="95.4" aperture="5.6" distance="1000" k1="-0.0398" k2="-0.7879" k3="0.4440"/>
-+            <vignetting model="pa" focal="95.4" aperture="8" distance="10" k1="-0.1840" k2="0.1628" k3="-0.1674"/>
-+            <vignetting model="pa" focal="95.4" aperture="8" distance="1000" k1="-0.1840" k2="0.1628" k3="-0.1674"/>
-+            <vignetting model="pa" focal="95.4" aperture="11" distance="10" k1="-0.1685" k2="0.0479" k3="-0.0147"/>
-+            <vignetting model="pa" focal="95.4" aperture="11" distance="1000" k1="-0.1685" k2="0.0479" k3="-0.0147"/>
-+            <vignetting model="pa" focal="95.4" aperture="16" distance="10" k1="-0.1720" k2="0.0527" k3="-0.0158"/>
-+            <vignetting model="pa" focal="95.4" aperture="16" distance="1000" k1="-0.1720" k2="0.0527" k3="-0.0158"/>
-+            <vignetting model="pa" focal="95.4" aperture="22" distance="10" k1="-0.1667" k2="0.0388" k3="-0.0059"/>
-+            <vignetting model="pa" focal="95.4" aperture="22" distance="1000" k1="-0.1667" k2="0.0388" k3="-0.0059"/>
-+            <vignetting model="pa" focal="152.6" aperture="6.2" distance="10" k1="0.0579" k2="-1.4403" k3="0.8283"/>
-+            <vignetting model="pa" focal="152.6" aperture="6.2" distance="1000" k1="0.0579" k2="-1.4403" k3="0.8283"/>
-+            <vignetting model="pa" focal="152.6" aperture="8" distance="10" k1="-0.0975" k2="0.1577" k3="-0.3786"/>
-+            <vignetting model="pa" focal="152.6" aperture="8" distance="1000" k1="-0.0975" k2="0.1577" k3="-0.3786"/>
-+            <vignetting model="pa" focal="152.6" aperture="11" distance="10" k1="-0.1294" k2="0.0894" k3="-0.0608"/>
-+            <vignetting model="pa" focal="152.6" aperture="11" distance="1000" k1="-0.1294" k2="0.0894" k3="-0.0608"/>
-+            <vignetting model="pa" focal="152.6" aperture="16" distance="10" k1="-0.1264" k2="0.0621" k3="-0.0284"/>
-+            <vignetting model="pa" focal="152.6" aperture="16" distance="1000" k1="-0.1264" k2="0.0621" k3="-0.0284"/>
-+            <vignetting model="pa" focal="152.6" aperture="22" distance="10" k1="-0.1157" k2="0.0414" k3="-0.0159"/>
-+            <vignetting model="pa" focal="152.6" aperture="22" distance="1000" k1="-0.1157" k2="0.0414" k3="-0.0159"/>
-+            <vignetting model="pa" focal="230" aperture="6.7" distance="10" k1="-0.4766" k2="-0.4936" k3="0.3169"/>
-+            <vignetting model="pa" focal="230" aperture="6.7" distance="1000" k1="-0.4766" k2="-0.4936" k3="0.3169"/>
-+            <vignetting model="pa" focal="230" aperture="8" distance="10" k1="0.0398" k2="-0.9033" k3="0.3624"/>
-+            <vignetting model="pa" focal="230" aperture="8" distance="1000" k1="0.0398" k2="-0.9033" k3="0.3624"/>
-+            <vignetting model="pa" focal="230" aperture="11" distance="10" k1="-0.0988" k2="0.1521" k3="-0.3191"/>
-+            <vignetting model="pa" focal="230" aperture="11" distance="1000" k1="-0.0988" k2="0.1521" k3="-0.3191"/>
-+            <vignetting model="pa" focal="230" aperture="16" distance="10" k1="-0.1202" k2="0.0960" k3="-0.0680"/>
-+            <vignetting model="pa" focal="230" aperture="16" distance="1000" k1="-0.1202" k2="0.0960" k3="-0.0680"/>
-+            <vignetting model="pa" focal="230" aperture="22" distance="10" k1="-0.0982" k2="0.0290" k3="-0.0130"/>
-+            <vignetting model="pa" focal="230" aperture="22" distance="1000" k1="-0.0982" k2="0.0290" k3="-0.0130"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF55-200mmF3.5-4.8 R LM OIS</model>
-+        <model lang="en">XF 55-200mm f/3.5-4.8 R LM OIS</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-E2 -->
-+            <distortion model="poly3" focal="55" k1="0.00464"/>
-+            <distortion model="poly3" focal="67.1" k1="0.00754"/>
-+            <distortion model="poly3" focal="86" k1="0.00912"/>
-+            <distortion model="poly3" focal="156.1" k1="0.01009"/>
-+            <distortion model="poly3" focal="200" k1="0.00926"/>
-+            <tca model="poly3" focal="55" br="-0.0000979" vr="1.0002600" bb="0.0000512" vb="0.9999442"/>
-+            <tca model="poly3" focal="81.9" br="-0.0000791" vr="1.0001593" bb="0.0000312" vb="0.9999369"/>
-+            <tca model="poly3" focal="104.9" br="-0.0000138" vr="1.0000328" bb="0.0000383" vb="0.9998767"/>
-+            <tca model="poly3" focal="134.5" br="-0.0000322" vr="1.0000360" bb="0.0000025" vb="0.9999154"/>
-+            <tca model="poly3" focal="164" br="-0.0000368" vr="0.9999711" bb="-0.0000173" vb="0.9999506"/>
-+            <tca model="poly3" focal="200" br="-0.0000028" vr="0.9998289" bb="-0.0000235" vb="0.9999706"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="55" aperture="3.5" distance="10" k1="-0.5492" k2="-0.1769" k3="0.1260"/>
-+            <vignetting model="pa" focal="55" aperture="3.5" distance="1000" k1="-0.5492" k2="-0.1769" k3="0.1260"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.2141" k2="-0.4327" k3="0.1289"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.2141" k2="-0.4327" k3="0.1289"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.3368" k2="0.4542" k3="-0.4484"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3368" k2="0.4542" k3="-0.4484"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.2919" k2="0.1993" k3="-0.1359"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.2919" k2="0.1993" k3="-0.1359"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.2636" k2="0.0840" k3="-0.0294"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.2636" k2="0.0840" k3="-0.0294"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.2582" k2="0.0685" k3="-0.0184"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.2582" k2="0.0685" k3="-0.0184"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2640" k2="0.0802" k3="-0.0246"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2640" k2="0.0802" k3="-0.0246"/>
-+            <vignetting model="pa" focal="70.5" aperture="3.7" distance="10" k1="-0.5783" k2="-0.0814" k3="0.0968"/>
-+            <vignetting model="pa" focal="70.5" aperture="3.7" distance="1000" k1="-0.5783" k2="-0.0814" k3="0.0968"/>
-+            <vignetting model="pa" focal="70.5" aperture="4" distance="10" k1="-0.2549" k2="-0.3636" k3="0.1405"/>
-+            <vignetting model="pa" focal="70.5" aperture="4" distance="1000" k1="-0.2549" k2="-0.3636" k3="0.1405"/>
-+            <vignetting model="pa" focal="70.5" aperture="5.6" distance="10" k1="-0.2990" k2="0.4306" k3="-0.4454"/>
-+            <vignetting model="pa" focal="70.5" aperture="5.6" distance="1000" k1="-0.2990" k2="0.4306" k3="-0.4454"/>
-+            <vignetting model="pa" focal="70.5" aperture="8" distance="10" k1="-0.2985" k2="0.2983" k3="-0.2079"/>
-+            <vignetting model="pa" focal="70.5" aperture="8" distance="1000" k1="-0.2985" k2="0.2983" k3="-0.2079"/>
-+            <vignetting model="pa" focal="70.5" aperture="11" distance="10" k1="-0.2444" k2="0.1053" k3="-0.0392"/>
-+            <vignetting model="pa" focal="70.5" aperture="11" distance="1000" k1="-0.2444" k2="0.1053" k3="-0.0392"/>
-+            <vignetting model="pa" focal="70.5" aperture="16" distance="10" k1="-0.2636" k2="0.1435" k3="-0.0602"/>
-+            <vignetting model="pa" focal="70.5" aperture="16" distance="1000" k1="-0.2636" k2="0.1435" k3="-0.0602"/>
-+            <vignetting model="pa" focal="70.5" aperture="22" distance="10" k1="-0.2503" k2="0.1065" k3="-0.0355"/>
-+            <vignetting model="pa" focal="70.5" aperture="22" distance="1000" k1="-0.2503" k2="0.1065" k3="-0.0355"/>
-+            <vignetting model="pa" focal="99.8" aperture="4" distance="10" k1="-0.4793" k2="-0.3109" k3="0.1994"/>
-+            <vignetting model="pa" focal="99.8" aperture="4" distance="1000" k1="-0.4793" k2="-0.3109" k3="0.1994"/>
-+            <vignetting model="pa" focal="99.8" aperture="5.6" distance="10" k1="-0.1900" k2="0.1171" k3="-0.2934"/>
-+            <vignetting model="pa" focal="99.8" aperture="5.6" distance="1000" k1="-0.1900" k2="0.1171" k3="-0.2934"/>
-+            <vignetting model="pa" focal="99.8" aperture="8" distance="10" k1="-0.3013" k2="0.4427" k3="-0.3427"/>
-+            <vignetting model="pa" focal="99.8" aperture="8" distance="1000" k1="-0.3013" k2="0.4427" k3="-0.3427"/>
-+            <vignetting model="pa" focal="99.8" aperture="11" distance="10" k1="-0.2354" k2="0.1593" k3="-0.0697"/>
-+            <vignetting model="pa" focal="99.8" aperture="11" distance="1000" k1="-0.2354" k2="0.1593" k3="-0.0697"/>
-+            <vignetting model="pa" focal="99.8" aperture="16" distance="10" k1="-0.2377" k2="0.1640" k3="-0.0729"/>
-+            <vignetting model="pa" focal="99.8" aperture="16" distance="1000" k1="-0.2377" k2="0.1640" k3="-0.0729"/>
-+            <vignetting model="pa" focal="99.8" aperture="22" distance="10" k1="-0.2312" k2="0.1563" k3="-0.0725"/>
-+            <vignetting model="pa" focal="99.8" aperture="22" distance="1000" k1="-0.2312" k2="0.1563" k3="-0.0725"/>
-+            <vignetting model="pa" focal="134.5" aperture="4.4" distance="10" k1="-0.3370" k2="-1.1017" k3="0.7855"/>
-+            <vignetting model="pa" focal="134.5" aperture="4.4" distance="1000" k1="-0.3370" k2="-1.1017" k3="0.7855"/>
-+            <vignetting model="pa" focal="134.5" aperture="5.6" distance="10" k1="0.1184" k2="-1.0776" k3="0.4486"/>
-+            <vignetting model="pa" focal="134.5" aperture="5.6" distance="1000" k1="0.1184" k2="-1.0776" k3="0.4486"/>
-+            <vignetting model="pa" focal="134.5" aperture="8" distance="10" k1="-0.3403" k2="0.7246" k3="-0.6513"/>
-+            <vignetting model="pa" focal="134.5" aperture="8" distance="1000" k1="-0.3403" k2="0.7246" k3="-0.6513"/>
-+            <vignetting model="pa" focal="134.5" aperture="11" distance="10" k1="-0.2257" k2="0.1999" k3="-0.1028"/>
-+            <vignetting model="pa" focal="134.5" aperture="11" distance="1000" k1="-0.2257" k2="0.1999" k3="-0.1028"/>
-+            <vignetting model="pa" focal="134.5" aperture="16" distance="10" k1="-0.2296" k2="0.2077" k3="-0.1079"/>
-+            <vignetting model="pa" focal="134.5" aperture="16" distance="1000" k1="-0.2296" k2="0.2077" k3="-0.1079"/>
-+            <vignetting model="pa" focal="134.5" aperture="22" distance="10" k1="-0.2331" k2="0.2183" k3="-0.1163"/>
-+            <vignetting model="pa" focal="134.5" aperture="22" distance="1000" k1="-0.2331" k2="0.2183" k3="-0.1163"/>
-+            <vignetting model="pa" focal="200" aperture="4.8" distance="10" k1="-0.8506" k2="0.0745" k3="0.0981"/>
-+            <vignetting model="pa" focal="200" aperture="4.8" distance="1000" k1="-0.8506" k2="0.0745" k3="0.0981"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.2911" k2="-0.7717" k3="0.4672"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.2911" k2="-0.7717" k3="0.4672"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1963" k2="0.3035" k3="-0.4623"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1963" k2="0.3035" k3="-0.4623"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.2417" k2="0.2950" k3="-0.1829"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2417" k2="0.2950" k3="-0.1829"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.2334" k2="0.2564" k3="-0.1456"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2334" k2="0.2564" k3="-0.1456"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.2272" k2="0.2404" k3="-0.1342"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.2272" k2="0.2404" k3="-0.1342"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF27mmF2.8</model>
-+        <model lang="en">XF 27mm f/2.8</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-A1 -->
-+            <distortion model="poly3" focal="27" k1="-0.00621"/>
-+            <tca model="poly3" focal="27" vr="0.999996" vb="1.00002"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="27" aperture="2.8" distance="10" k1="-0.9412" k2="0.1158" k3="0.1433"/>
-+            <vignetting model="pa" focal="27" aperture="2.8" distance="1000" k1="-0.9412" k2="0.1158" k3="0.1433"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="10" k1="-0.3815" k2="-0.0002" k3="-0.0924"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="1000" k1="-0.3815" k2="-0.0002" k3="-0.0924"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="10" k1="-0.5174" k2="0.4132" k3="-0.2336"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="1000" k1="-0.5174" k2="0.4132" k3="-0.2336"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="10" k1="-0.4814" k2="0.2629" k3="-0.0925"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="1000" k1="-0.4814" k2="0.2629" k3="-0.0925"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="10" k1="-0.4844" k2="0.2659" k3="-0.0926"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="1000" k1="-0.4844" k2="0.2659" k3="-0.0926"/>
-+            <vignetting model="pa" focal="27" aperture="16" distance="10" k1="-0.4938" k2="0.2759" k3="-0.0978"/>
-+            <vignetting model="pa" focal="27" aperture="16" distance="1000" k1="-0.4938" k2="0.2759" k3="-0.0978"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF18mmF2 R</model>
-+        <model lang="en">XF 18mm f/2 R</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-Pro1 -->
-+            <distortion model="ptlens" focal="18" a="-0.01002" b="0.01206" c="-0.03947"/>
-+            <tca model="poly3" focal="18" br="-0.0000854" vr="1.0003786" bb="0.0002872" vb="0.9999238"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF35mmF1.4 R</model>
-+        <model lang="en">XF 35mm f/1.4 R</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-Pro1 -->
-+            <distortion model="ptlens" focal="35" a="0.00729" b="-0.02422" c="0.02113"/>
-+            <tca model="poly3" focal="35" vr="1.0001" vb="0.9999"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="10" k1="-1.4164" k2="1.3668" k3="-0.6236"/>
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="1000" k1="-1.4164" k2="1.3668" k3="-0.6236"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="10" k1="-0.1860" k2="-0.4906" k3="0.1979"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="1000" k1="-0.1860" k2="-0.4906" k3="0.1979"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.3832" k2="0.3788" k3="-0.3333"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3832" k2="0.3788" k3="-0.3333"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3449" k2="0.1600" k3="-0.0807"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3449" k2="0.1600" k3="-0.0807"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.3384" k2="0.1392" k3="-0.0637"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3384" k2="0.1392" k3="-0.0637"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3506" k2="0.1689" k3="-0.0838"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3506" k2="0.1689" k3="-0.0838"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3582" k2="0.1811" k3="-0.0907"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3582" k2="0.1811" k3="-0.0907"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3614" k2="0.1864" k3="-0.0939"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3614" k2="0.1864" k3="-0.0939"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF60mmF2.4 R Macro</model>
-+        <model lang="en">XF 60mm f/2.4 R Macro</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-E2 -->
-+            <distortion model="poly3" focal="60" k1="0.00913"/>
-+            <tca model="poly3" focal="60" br="0.0000295" vr="0.9999431" bb="-0.0000805" vb="0.9999333"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="60" aperture="2.4" distance="10" k1="-0.7658" k2="0.2728" k3="-0.0025"/>
-+            <vignetting model="pa" focal="60" aperture="2.4" distance="1000" k1="-0.7658" k2="0.2728" k3="-0.0025"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="10" k1="-0.2579" k2="-0.4737" k3="0.3315"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.2579" k2="-0.4737" k3="0.3315"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="10" k1="-0.3073" k2="0.1245" k3="-0.0272"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.3073" k2="0.1245" k3="-0.0272"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="10" k1="-0.3041" k2="0.1121" k3="-0.0187"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.3041" k2="0.1121" k3="-0.0187"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.3094" k2="0.1193" k3="-0.0223"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.3094" k2="0.1193" k3="-0.0223"/>
-+            <vignetting model="pa" focal="60" aperture="11" distance="10" k1="-0.3144" k2="0.1294" k3="-0.0281"/>
-+            <vignetting model="pa" focal="60" aperture="11" distance="1000" k1="-0.3144" k2="0.1294" k3="-0.0281"/>
-+            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="-0.3159" k2="0.1292" k3="-0.0272"/>
-+            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="-0.3159" k2="0.1292" k3="-0.0272"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="10" k1="-0.3205" k2="0.1341" k3="-0.0290"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="-0.3205" k2="0.1341" k3="-0.0290"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF23mmF1.4 R</model>
-+        <model lang="en">XF 23mm f/1.4 R</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with X-E2 -->
-+            <distortion model="ptlens" focal="23" a="0.00331" b="-0.0094" c="0.00784"/>
-+            <tca model="poly3" focal="23" vr="1.0002" vb="1.0001"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="23" aperture="1.4" distance="10" k1="-1.5441" k2="1.4339" k3="-0.6158"/>
-+            <vignetting model="pa" focal="23" aperture="1.4" distance="1000" k1="-1.5441" k2="1.4339" k3="-0.6158"/>
-+            <vignetting model="pa" focal="23" aperture="2" distance="10" k1="-0.4114" k2="-0.3383" k3="0.1718"/>
-+            <vignetting model="pa" focal="23" aperture="2" distance="1000" k1="-0.4114" k2="-0.3383" k3="0.1718"/>
-+            <vignetting model="pa" focal="23" aperture="2.8" distance="10" k1="-0.5922" k2="0.3908" k3="-0.2007"/>
-+            <vignetting model="pa" focal="23" aperture="2.8" distance="1000" k1="-0.5922" k2="0.3908" k3="-0.2007"/>
-+            <vignetting model="pa" focal="23" aperture="4" distance="10" k1="-0.5682" k2="0.2531" k3="-0.0551"/>
-+            <vignetting model="pa" focal="23" aperture="4" distance="1000" k1="-0.5682" k2="0.2531" k3="-0.0551"/>
-+            <vignetting model="pa" focal="23" aperture="5.6" distance="10" k1="-0.5708" k2="0.2595" k3="-0.0611"/>
-+            <vignetting model="pa" focal="23" aperture="5.6" distance="1000" k1="-0.5708" k2="0.2595" k3="-0.0611"/>
-+            <vignetting model="pa" focal="23" aperture="8" distance="10" k1="-0.5748" k2="0.2653" k3="-0.0647"/>
-+            <vignetting model="pa" focal="23" aperture="8" distance="1000" k1="-0.5748" k2="0.2653" k3="-0.0647"/>
-+            <vignetting model="pa" focal="23" aperture="11" distance="10" k1="-0.5711" k2="0.2509" k3="-0.0545"/>
-+            <vignetting model="pa" focal="23" aperture="11" distance="1000" k1="-0.5711" k2="0.2509" k3="-0.0545"/>
-+            <vignetting model="pa" focal="23" aperture="16" distance="10" k1="-0.5706" k2="0.2446" k3="-0.0513"/>
-+            <vignetting model="pa" focal="23" aperture="16" distance="1000" k1="-0.5706" k2="0.2446" k3="-0.0513"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XC16-50mmF3.5-5.6 OIS II</model>
-+        <model lang="en">XC 16-50mm f/3.5-5.6 OIS II</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-A2 -->
-+            <distortion model="ptlens" focal="16" a="0.02234" b="-0.0861" c="0.01689"/>
-+            <distortion model="ptlens" focal="23.2" a="0.01026" b="-0.04209" c="0.0245"/>
-+            <distortion model="ptlens" focal="29.5" a="0.00387" b="-0.01658" c="0.00911"/>
-+            <distortion model="ptlens" focal="35.5" a="0" b="-0.00122" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.00373" c="0"/>
-+            <tca model="poly3" focal="16" vr="1.0006" vb="1.0005"/>
-+            <tca model="poly3" focal="23.2" vr="1.0006" vb="1.0006"/>
-+            <tca model="poly3" focal="29.5" vr="1.0004" vb="1.0003"/>
-+            <tca model="poly3" focal="35.5" vr="1.0003" vb="1.0000"/>
-+            <tca model="poly3" focal="50" vr="1.0002" vb="0.9993"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-1.2073" k2="1.2792" k3="-0.7009"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.2073" k2="1.2792" k3="-0.7009"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.6322" k2="-0.0506" k3="0.1355"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.6322" k2="-0.0506" k3="0.1355"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1656" k2="-0.4944" k3="0.2248"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1656" k2="-0.4944" k3="0.2248"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.3436" k2="0.1263" k3="-0.1238"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.3436" k2="0.1263" k3="-0.1238"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.3174" k2="-0.0032" k3="0.0116"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.3174" k2="-0.0032" k3="0.0116"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.3141" k2="-0.0106" k3="0.0159"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.3141" k2="-0.0106" k3="0.0159"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.3256" k2="0.0116" k3="0.0011"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.3256" k2="0.0116" k3="0.0011"/>
-+            <vignetting model="pa" focal="21.1" aperture="4" distance="10" k1="-1.0236" k2="1.0032" k3="-0.4551"/>
-+            <vignetting model="pa" focal="21.1" aperture="4" distance="1000" k1="-1.0236" k2="1.0032" k3="-0.4551"/>
-+            <vignetting model="pa" focal="21.1" aperture="5.6" distance="10" k1="-0.0884" k2="-0.6236" k3="0.3506"/>
-+            <vignetting model="pa" focal="21.1" aperture="5.6" distance="1000" k1="-0.0884" k2="-0.6236" k3="0.3506"/>
-+            <vignetting model="pa" focal="21.1" aperture="8" distance="10" k1="-0.2629" k2="0.1345" k3="-0.1264"/>
-+            <vignetting model="pa" focal="21.1" aperture="8" distance="1000" k1="-0.2629" k2="0.1345" k3="-0.1264"/>
-+            <vignetting model="pa" focal="21.1" aperture="11" distance="10" k1="-0.2490" k2="0.0471" k3="-0.0262"/>
-+            <vignetting model="pa" focal="21.1" aperture="11" distance="1000" k1="-0.2490" k2="0.0471" k3="-0.0262"/>
-+            <vignetting model="pa" focal="21.1" aperture="16" distance="10" k1="-0.2437" k2="0.0170" k3="0.0005"/>
-+            <vignetting model="pa" focal="21.1" aperture="16" distance="1000" k1="-0.2437" k2="0.0170" k3="0.0005"/>
-+            <vignetting model="pa" focal="21.1" aperture="22" distance="10" k1="-0.2583" k2="0.0507" k3="-0.0206"/>
-+            <vignetting model="pa" focal="21.1" aperture="22" distance="1000" k1="-0.2583" k2="0.0507" k3="-0.0206"/>
-+            <vignetting model="pa" focal="25.6" aperture="4.5" distance="10" k1="-0.9057" k2="0.9248" k3="-0.4344"/>
-+            <vignetting model="pa" focal="25.6" aperture="4.5" distance="1000" k1="-0.9057" k2="0.9248" k3="-0.4344"/>
-+            <vignetting model="pa" focal="25.6" aperture="5.6" distance="10" k1="-0.0975" k2="-0.5842" k3="0.3618"/>
-+            <vignetting model="pa" focal="25.6" aperture="5.6" distance="1000" k1="-0.0975" k2="-0.5842" k3="0.3618"/>
-+            <vignetting model="pa" focal="25.6" aperture="8" distance="10" k1="-0.2022" k2="0.1108" k3="-0.1116"/>
-+            <vignetting model="pa" focal="25.6" aperture="8" distance="1000" k1="-0.2022" k2="0.1108" k3="-0.1116"/>
-+            <vignetting model="pa" focal="25.6" aperture="11" distance="10" k1="-0.1875" k2="0.0102" k3="0.0053"/>
-+            <vignetting model="pa" focal="25.6" aperture="11" distance="1000" k1="-0.1875" k2="0.0102" k3="0.0053"/>
-+            <vignetting model="pa" focal="25.6" aperture="16" distance="10" k1="-0.1832" k2="0.0027" k3="0.0072"/>
-+            <vignetting model="pa" focal="25.6" aperture="16" distance="1000" k1="-0.1832" k2="0.0027" k3="0.0072"/>
-+            <vignetting model="pa" focal="25.6" aperture="22" distance="10" k1="-0.2000" k2="0.0355" k3="-0.0088"/>
-+            <vignetting model="pa" focal="25.6" aperture="22" distance="1000" k1="-0.2000" k2="0.0355" k3="-0.0088"/>
-+            <vignetting model="pa" focal="32.5" aperture="5" distance="10" k1="-0.8328" k2="0.8542" k3="-0.3972"/>
-+            <vignetting model="pa" focal="32.5" aperture="5" distance="1000" k1="-0.8328" k2="0.8542" k3="-0.3972"/>
-+            <vignetting model="pa" focal="32.5" aperture="5.6" distance="10" k1="-0.3345" k2="-0.1905" k3="0.1940"/>
-+            <vignetting model="pa" focal="32.5" aperture="5.6" distance="1000" k1="-0.3345" k2="-0.1905" k3="0.1940"/>
-+            <vignetting model="pa" focal="32.5" aperture="8" distance="10" k1="-0.1540" k2="0.0547" k3="-0.0939"/>
-+            <vignetting model="pa" focal="32.5" aperture="8" distance="1000" k1="-0.1540" k2="0.0547" k3="-0.0939"/>
-+            <vignetting model="pa" focal="32.5" aperture="11" distance="10" k1="-0.1409" k2="-0.0263" k3="0.0228"/>
-+            <vignetting model="pa" focal="32.5" aperture="11" distance="1000" k1="-0.1409" k2="-0.0263" k3="0.0228"/>
-+            <vignetting model="pa" focal="32.5" aperture="16" distance="10" k1="-0.1577" k2="0.0130" k3="-0.0008"/>
-+            <vignetting model="pa" focal="32.5" aperture="16" distance="1000" k1="-0.1577" k2="0.0130" k3="-0.0008"/>
-+            <vignetting model="pa" focal="32.5" aperture="22" distance="10" k1="-0.1699" k2="0.0351" k3="-0.0128"/>
-+            <vignetting model="pa" focal="32.5" aperture="22" distance="1000" k1="-0.1699" k2="0.0351" k3="-0.0128"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.3" distance="10" k1="-0.7327" k2="0.7429" k3="-0.3463"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.3" distance="1000" k1="-0.7327" k2="0.7429" k3="-0.3463"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.6" distance="10" k1="-0.2963" k2="-0.1676" k3="0.1706"/>
-+            <vignetting model="pa" focal="37.1" aperture="5.6" distance="1000" k1="-0.2963" k2="-0.1676" k3="0.1706"/>
-+            <vignetting model="pa" focal="37.1" aperture="8" distance="10" k1="-0.1398" k2="0.0733" k3="-0.0810"/>
-+            <vignetting model="pa" focal="37.1" aperture="8" distance="1000" k1="-0.1398" k2="0.0733" k3="-0.0810"/>
-+            <vignetting model="pa" focal="37.1" aperture="11" distance="10" k1="-0.1208" k2="-0.0104" k3="0.0117"/>
-+            <vignetting model="pa" focal="37.1" aperture="11" distance="1000" k1="-0.1208" k2="-0.0104" k3="0.0117"/>
-+            <vignetting model="pa" focal="37.1" aperture="16" distance="10" k1="-0.1348" k2="0.0174" k3="-0.0038"/>
-+            <vignetting model="pa" focal="37.1" aperture="16" distance="1000" k1="-0.1348" k2="0.0174" k3="-0.0038"/>
-+            <vignetting model="pa" focal="37.1" aperture="22" distance="10" k1="-0.1418" k2="0.0273" k3="-0.0077"/>
-+            <vignetting model="pa" focal="37.1" aperture="22" distance="1000" k1="-0.1418" k2="0.0273" k3="-0.0077"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.7648" k2="1.2137" k3="-0.8982"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.7648" k2="1.2137" k3="-0.8982"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0800" k2="0.0144" k3="-0.1169"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0800" k2="0.0144" k3="-0.1169"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.0783" k2="-0.0246" k3="0.0066"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.0783" k2="-0.0246" k3="0.0066"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.0879" k2="-0.0115" k3="0.0026"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.0879" k2="-0.0115" k3="0.0026"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.0917" k2="-0.0093" k3="0.0035"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0917" k2="-0.0093" k3="0.0035"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF35mmF2 R WR</model>
-+        <model lang="en">XF 35mm f/2 WR</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-E2 -->
-+            <!-- The subject was not really trustworthy for distortion
-+                 measurement.  I asked the uploader to upload a better
-+                 image. -->
-+            <distortion model="poly3" focal="35" k1="-0.02597"/>
-+            <tca model="poly3" focal="35" vr="1.0000774" vb="0.9999724"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF14mmF2.8 R</model>
-+        <model lang="en">XF 14mm f/2.8 R</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <distortion model="ptlens" focal="14" a="0.003995" b="-0.009534" c="0.002875"/>
-+            <tca model="poly3" focal="14" br="-0.0000566" vr="1.0002277" bb="0.0000255" vb="0.9999647"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-1.5144" k2="1.2334" k3="-0.4684"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.5144" k2="1.2334" k3="-0.4684"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.8299" k2="0.1039" k3="0.0798"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.8299" k2="0.1039" k3="0.0798"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.9446" k2="0.5688" k3="-0.2059"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.9446" k2="0.5688" k3="-0.2059"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.9367" k2="0.5144" k3="-0.1402"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.9367" k2="0.5144" k3="-0.1402"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.9377" k2="0.5142" k3="-0.1405"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.9377" k2="0.5142" k3="-0.1405"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.9409" k2="0.5209" k3="-0.1460"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.9409" k2="0.5209" k3="-0.1460"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.9398" k2="0.5132" k3="-0.1416"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.9398" k2="0.5132" k3="-0.1416"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF16mmF1.4 R WR</model>
-+        <model lang="en">XF 16mm f/1.4 R WR</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <distortion model="ptlens" focal="16" a="0.00071" b="-0.00085" c="-0.005909"/>
-+            <tca model="poly3" focal="16" br="-0.0000585" vr="1.0001524" bb="0.0000149" vb="0.9999698"/>
-+            <vignetting model="pa" focal="16" aperture="1.4" distance="10" k1="-1.4840" k2="1.2252" k3="-0.4670"/>
-+            <vignetting model="pa" focal="16" aperture="1.4" distance="1000" k1="-1.4840" k2="1.2252" k3="-0.4670"/>
-+            <vignetting model="pa" focal="16" aperture="2" distance="10" k1="-0.2881" k2="-0.5922" k3="0.3184"/>
-+            <vignetting model="pa" focal="16" aperture="2" distance="1000" k1="-0.2881" k2="-0.5922" k3="0.3184"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5054" k2="0.2294" k3="-0.0910"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5054" k2="0.2294" k3="-0.0910"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.4919" k2="0.1660" k3="-0.0301"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.4919" k2="0.1660" k3="-0.0301"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.4949" k2="0.1791" k3="-0.0439"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4949" k2="0.1791" k3="-0.0439"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.5018" k2="0.1913" k3="-0.0501"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.5018" k2="0.1913" k3="-0.0501"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.5074" k2="0.2009" k3="-0.0563"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.5074" k2="0.2009" k3="-0.0563"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.5182" k2="0.2205" k3="-0.0699"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.5182" k2="0.2205" k3="-0.0699"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF56mmF1.2 R APD</model>
-+        <model lang="en">XF 56mm f/1.2 R APD</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <distortion model="ptlens" focal="56" a="0.000434" b="-0.006427" c="0.018063"/>
-+            <tca model="poly3" focal="56" br="-0.0000190" vr="0.9999886" bb="0.0000222" vb="0.9999822"/>
-+            <vignetting model="pa" focal="56" aperture="1.2" distance="10" k1="-0.8282" k2="0.0167" k3="0.1553"/>
-+            <vignetting model="pa" focal="56" aperture="1.2" distance="1000" k1="-0.8282" k2="0.0167" k3="0.1553"/>
-+            <vignetting model="pa" focal="56" aperture="1.4" distance="10" k1="-0.5900" k2="-0.4423" k3="0.3965"/>
-+            <vignetting model="pa" focal="56" aperture="1.4" distance="1000" k1="-0.5900" k2="-0.4423" k3="0.3965"/>
-+            <vignetting model="pa" focal="56" aperture="2" distance="10" k1="-0.3774" k2="-0.0284" k3="-0.0732"/>
-+            <vignetting model="pa" focal="56" aperture="2" distance="1000" k1="-0.3774" k2="-0.0284" k3="-0.0732"/>
-+            <vignetting model="pa" focal="56" aperture="2.8" distance="10" k1="-0.3624" k2="0.1878" k3="-0.1172"/>
-+            <vignetting model="pa" focal="56" aperture="2.8" distance="1000" k1="-0.3624" k2="0.1878" k3="-0.1172"/>
-+            <vignetting model="pa" focal="56" aperture="4" distance="10" k1="-0.3657" k2="0.3219" k3="-0.1805"/>
-+            <vignetting model="pa" focal="56" aperture="4" distance="1000" k1="-0.3657" k2="0.3219" k3="-0.1805"/>
-+            <vignetting model="pa" focal="56" aperture="5.6" distance="10" k1="-0.3896" k2="0.4244" k3="-0.2330"/>
-+            <vignetting model="pa" focal="56" aperture="5.6" distance="1000" k1="-0.3896" k2="0.4244" k3="-0.2330"/>
-+            <vignetting model="pa" focal="56" aperture="8" distance="10" k1="-0.4132" k2="0.4879" k3="-0.2637"/>
-+            <vignetting model="pa" focal="56" aperture="8" distance="1000" k1="-0.4132" k2="0.4879" k3="-0.2637"/>
-+            <vignetting model="pa" focal="56" aperture="11" distance="10" k1="-0.4211" k2="0.5182" k3="-0.2812"/>
-+            <vignetting model="pa" focal="56" aperture="11" distance="1000" k1="-0.4211" k2="0.5182" k3="-0.2812"/>
-+            <vignetting model="pa" focal="56" aperture="16" distance="10" k1="-0.4315" k2="0.5217" k3="-0.2718"/>
-+            <vignetting model="pa" focal="56" aperture="16" distance="1000" k1="-0.4315" k2="0.5217" k3="-0.2718"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF16-55mmF2.8 R LM WR</model>
-+        <model lang="en">XF 16-55mm f/2.8 R LM WR</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-T10 -->
-+            <distortion model="ptlens" focal="16" a="0.02551" b="-0.08802" c="0.02986"/>
-+            <distortion model="ptlens" focal="18.7" a="0.02639" b="-0.09371" c="0.06949"/>
-+            <distortion model="ptlens" focal="28.3" a="-0.00603" b="0.03552" c="-0.04632"/>
-+            <distortion model="ptlens" focal="35.3" a="0.00725" b="-0.00705" c="0.00456"/>
-+            <distortion model="ptlens" focal="55" a="0.02046" b="-0.05859" c="0.08192"/>
-+            <tca model="poly3" focal="16" br="-0.0002950" vr="1.0013143" bb="0.0002728" vb="0.9995741"/>
-+            <tca model="poly3" focal="18.7" br="-0.0002591" vr="1.0013211" bb="0.0002701" vb="0.9992707"/>
-+            <tca model="poly3" focal="28.3" br="-0.0002947" vr="1.0012029" bb="0.0003146" vb="0.9988996"/>
-+            <tca model="poly3" focal="35.3" br="-0.0003870" vr="1.0011116" bb="0.0003397" vb="0.9987853"/>
-+            <tca model="poly3" focal="55" br="-0.0003426" vr="1.0004456" bb="0.0002934" vb="0.9987352"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF56mmF1.2 R</model>
-+        <model lang="en">XF 56mm f/1.2 R</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-E2 -->
-+            <distortion model="ptlens" focal="56" a="0.00239" b="-0.00767" c="0.00358"/>
-+            <tca model="poly3" focal="56" vr="1.0000116" vb="0.9999456"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF10-24mmF4 R OIS</model>
-+        <model lang="en">XF 10-24mm f/4 R OIS</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-T10 -->
-+            <distortion model="ptlens" focal="10" a="0.01619" b="-0.07655" c="0.05816"/>
-+            <distortion model="ptlens" focal="12" a="-0.00089" b="-0.00928" c="0.00304"/>
-+            <distortion model="ptlens" focal="14.5" a="-0.00966" b="0.02255" c="-0.00776"/>
-+            <distortion model="ptlens" focal="18.2" a="-0.01658" b="0.04898" c="-0.0265"/>
-+            <distortion model="ptlens" focal="20" a="-0.02138" b="0.06476" c="-0.03966"/>
-+            <distortion model="ptlens" focal="24" a="-0.02363" b="0.07681" c="-0.05944"/>
-+            <tca model="poly3" focal="10" vr="1.0003928" vb="0.9999066"/>
-+            <tca model="poly3" focal="12" vr="1.0003642" vb="0.9999359"/>
-+            <tca model="poly3" focal="14.5" vr="1.0001902" vb="1.0000327"/>
-+            <tca model="poly3" focal="18.2" vr="1.0000632" vb="1.0001139"/>
-+            <tca model="poly3" focal="20" vr="1.0000037" vb="1.0001642"/>
-+            <tca model="poly3" focal="24" vr="0.9999651" vb="1.0001861"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fujifilm</maker>
-+        <model>XF18-135mmF3.5-5.6R LM OIS WR</model>
-+        <model lang="en">XF 18-135mm f/3.5-5.6R LM OIS WR</model>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <distortion model="ptlens" focal="18" a="0.01941" b="-0.06675" c="0.0182"/>
-+            <distortion model="ptlens" focal="23.3" a="0.02157" b="-0.06615" c="0.0498"/>
-+            <distortion model="ptlens" focal="32.6" a="0.0121" b="-0.02671" c="0.01745"/>
-+            <distortion model="ptlens" focal="36.6" a="0.00095" b="0.00464" c="-0.00262"/>
-+            <distortion model="ptlens" focal="49.4" a="0.01018" b="-0.0215" c="0.02094"/>
-+            <distortion model="ptlens" focal="66.2" a="0.00047" b="0.00047" c="0.01288"/>
-+            <distortion model="ptlens" focal="88.2" a="-0.00663" b="0.02638" c="-0.02265"/>
-+            <distortion model="ptlens" focal="98.6" a="0.00243" b="-0.00754" c="0.01607"/>
-+            <distortion model="ptlens" focal="135" a="0.02188" b="-0.06638" c="0.06834"/>
-+            <tca model="poly3" focal="18" vr="1.0005311" vb="1.0000593"/>
-+            <tca model="poly3" focal="23.3" vr="1.0001611" vb="1.0001960"/>
-+            <tca model="poly3" focal="32.6" vr="1.0000350" vb="1.0003320"/>
-+            <tca model="poly3" focal="36.6" vr="1.0000125" vb="1.0002991"/>
-+            <tca model="poly3" focal="49.4" vr="1.0000246" vb="1.0000648"/>
-+            <tca model="poly3" focal="52.4" vr="1.0000208" vb="1.0000512"/>
-+            <tca model="poly3" focal="70.2" vr="1.0000080" vb="0.9998932"/>
-+            <tca model="poly3" focal="88.2" vr="0.9998601" vb="0.9998080"/>
-+            <tca model="poly3" focal="93.2" vr="0.9998528" vb="0.9998364"/>
-+            <tca model="poly3" focal="98.6" vr="0.9998614" vb="0.9997719"/>
-+            <tca model="poly3" focal="135" vr="0.9994228" vb="0.9998818"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="0.0088" k2="-1.0364" k3="0.3033"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="0.0088" k2="-1.0364" k3="0.3033"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.4149" k2="0.5907" k3="-0.7285"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.4149" k2="0.5907" k3="-0.7285"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.5591" k2="0.9937" k3="-0.9320"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.5591" k2="0.9937" k3="-0.9320"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.4701" k2="0.5359" k3="-0.4458"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.4701" k2="0.5359" k3="-0.4458"/>
-+            <vignetting model="pa" focal="18" aperture="20" distance="10" k1="-0.4267" k2="0.3431" k3="-0.2523"/>
-+            <vignetting model="pa" focal="18" aperture="20" distance="1000" k1="-0.4267" k2="0.3431" k3="-0.2523"/>
-+            <vignetting model="pa" focal="22.4" aperture="4" distance="10" k1="-0.3607" k2="0.4741" k3="-0.5737"/>
-+            <vignetting model="pa" focal="22.4" aperture="4" distance="1000" k1="-0.3607" k2="0.4741" k3="-0.5737"/>
-+            <vignetting model="pa" focal="22.4" aperture="5.6" distance="10" k1="-0.3521" k2="0.5198" k3="-0.4770"/>
-+            <vignetting model="pa" focal="22.4" aperture="5.6" distance="1000" k1="-0.3521" k2="0.5198" k3="-0.4770"/>
-+            <vignetting model="pa" focal="22.4" aperture="8" distance="10" k1="-0.3126" k2="0.3319" k3="-0.2598"/>
-+            <vignetting model="pa" focal="22.4" aperture="8" distance="1000" k1="-0.3126" k2="0.3319" k3="-0.2598"/>
-+            <vignetting model="pa" focal="22.4" aperture="16" distance="10" k1="-0.3903" k2="0.4285" k3="-0.2353"/>
-+            <vignetting model="pa" focal="22.4" aperture="16" distance="1000" k1="-0.3903" k2="0.4285" k3="-0.2353"/>
-+            <vignetting model="pa" focal="22.4" aperture="22" distance="10" k1="-0.1827" k2="-0.1746" k3="0.1626"/>
-+            <vignetting model="pa" focal="22.4" aperture="22" distance="1000" k1="-0.1827" k2="-0.1746" k3="0.1626"/>
-+            <vignetting model="pa" focal="32.6" aperture="4.3" distance="10" k1="-0.4155" k2="0.9589" k3="-0.9222"/>
-+            <vignetting model="pa" focal="32.6" aperture="4.3" distance="1000" k1="-0.4155" k2="0.9589" k3="-0.9222"/>
-+            <vignetting model="pa" focal="32.6" aperture="5.6" distance="10" k1="-0.4612" k2="1.0807" k3="-0.8684"/>
-+            <vignetting model="pa" focal="32.6" aperture="5.6" distance="1000" k1="-0.4612" k2="1.0807" k3="-0.8684"/>
-+            <vignetting model="pa" focal="32.6" aperture="8" distance="10" k1="-0.3536" k2="0.6799" k3="-0.4775"/>
-+            <vignetting model="pa" focal="32.6" aperture="8" distance="1000" k1="-0.3536" k2="0.6799" k3="-0.4775"/>
-+            <vignetting model="pa" focal="32.6" aperture="16" distance="10" k1="-0.2545" k2="0.3042" k3="-0.1457"/>
-+            <vignetting model="pa" focal="32.6" aperture="16" distance="1000" k1="-0.2545" k2="0.3042" k3="-0.1457"/>
-+            <vignetting model="pa" focal="32.6" aperture="22" distance="10" k1="-0.2641" k2="0.3190" k3="-0.1557"/>
-+            <vignetting model="pa" focal="32.6" aperture="22" distance="1000" k1="-0.2641" k2="0.3190" k3="-0.1557"/>
-+            <vignetting model="pa" focal="52.4" aperture="5" distance="10" k1="-0.2140" k2="0.6959" k3="-0.8707"/>
-+            <vignetting model="pa" focal="52.4" aperture="5" distance="1000" k1="-0.2140" k2="0.6959" k3="-0.8707"/>
-+            <vignetting model="pa" focal="52.4" aperture="6.4" distance="10" k1="-0.3004" k2="0.8921" k3="-0.8794"/>
-+            <vignetting model="pa" focal="52.4" aperture="6.4" distance="1000" k1="-0.3004" k2="0.8921" k3="-0.8794"/>
-+            <vignetting model="pa" focal="52.4" aperture="8" distance="10" k1="-0.2886" k2="0.7815" k3="-0.7054"/>
-+            <vignetting model="pa" focal="52.4" aperture="8" distance="1000" k1="-0.2886" k2="0.7815" k3="-0.7054"/>
-+            <vignetting model="pa" focal="52.4" aperture="16" distance="10" k1="-0.1454" k2="0.1258" k3="-0.0758"/>
-+            <vignetting model="pa" focal="52.4" aperture="16" distance="1000" k1="-0.1454" k2="0.1258" k3="-0.0758"/>
-+            <vignetting model="pa" focal="52.4" aperture="22" distance="10" k1="-0.1601" k2="0.1164" k3="-0.0615"/>
-+            <vignetting model="pa" focal="52.4" aperture="22" distance="1000" k1="-0.1601" k2="0.1164" k3="-0.0615"/>
-+            <vignetting model="pa" focal="70.2" aperture="5.3" distance="10" k1="-0.1213" k2="0.4060" k3="-0.6625"/>
-+            <vignetting model="pa" focal="70.2" aperture="5.3" distance="1000" k1="-0.1213" k2="0.4060" k3="-0.6625"/>
-+            <vignetting model="pa" focal="70.2" aperture="8" distance="10" k1="-0.3224" k2="0.9035" k3="-0.7999"/>
-+            <vignetting model="pa" focal="70.2" aperture="8" distance="1000" k1="-0.3224" k2="0.9035" k3="-0.7999"/>
-+            <vignetting model="pa" focal="70.2" aperture="11" distance="10" k1="-0.2728" k2="0.5688" k3="-0.4179"/>
-+            <vignetting model="pa" focal="70.2" aperture="11" distance="1000" k1="-0.2728" k2="0.5688" k3="-0.4179"/>
-+            <vignetting model="pa" focal="70.2" aperture="16" distance="10" k1="-0.2154" k2="0.3578" k3="-0.2371"/>
-+            <vignetting model="pa" focal="70.2" aperture="16" distance="1000" k1="-0.2154" k2="0.3578" k3="-0.2371"/>
-+            <vignetting model="pa" focal="70.2" aperture="22" distance="10" k1="-0.2213" k2="0.3836" k3="-0.2591"/>
-+            <vignetting model="pa" focal="70.2" aperture="22" distance="1000" k1="-0.2213" k2="0.3836" k3="-0.2591"/>
-+            <vignetting model="pa" focal="93.2" aperture="5.6" distance="10" k1="0.0111" k2="-0.1721" k3="-0.2157"/>
-+            <vignetting model="pa" focal="93.2" aperture="5.6" distance="1000" k1="0.0111" k2="-0.1721" k3="-0.2157"/>
-+            <vignetting model="pa" focal="93.2" aperture="8" distance="10" k1="-0.2357" k2="0.6739" k3="-0.7121"/>
-+            <vignetting model="pa" focal="93.2" aperture="8" distance="1000" k1="-0.2357" k2="0.6739" k3="-0.7121"/>
-+            <vignetting model="pa" focal="93.2" aperture="11" distance="10" k1="-0.3122" k2="0.7110" k3="-0.5602"/>
-+            <vignetting model="pa" focal="93.2" aperture="11" distance="1000" k1="-0.3122" k2="0.7110" k3="-0.5602"/>
-+            <vignetting model="pa" focal="93.2" aperture="16" distance="10" k1="-0.2389" k2="0.3517" k3="-0.2082"/>
-+            <vignetting model="pa" focal="93.2" aperture="16" distance="1000" k1="-0.2389" k2="0.3517" k3="-0.2082"/>
-+            <vignetting model="pa" focal="93.2" aperture="22" distance="10" k1="-0.2260" k2="0.2950" k3="-0.1597"/>
-+            <vignetting model="pa" focal="93.2" aperture="22" distance="1000" k1="-0.2260" k2="0.2950" k3="-0.1597"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.0763" k2="-0.7617" k3="0.3866"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0763" k2="-0.7617" k3="0.3866"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0713" k2="0.0839" k3="-0.3096"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0713" k2="0.0839" k3="-0.3096"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.2862" k2="0.6522" k3="-0.5513"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2862" k2="0.6522" k3="-0.5513"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.1849" k2="0.2127" k3="-0.1223"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1849" k2="0.2127" k3="-0.1223"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.1240" k2="0.0245" k3="0.0001"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1240" k2="0.0245" k3="0.0001"/>
-+        </calibration>
-+    </lens>
- </lensdatabase>
-diff -Nurpd a/data/db/mil-nikon.xml b/data/db/mil-nikon.xml
---- a/data/db/mil-nikon.xml	2013-10-11 23:54:00.000000000 +0200
-+++ b/data/db/mil-nikon.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,112 +1,215 @@
- <lensdatabase>
--
-     <mount>
-         <name>Nikon CX</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
--	<compat>Nikon F</compat>
-+        <compat>Nikon F</compat>
-         <compat>Nikon F AI</compat>
-         <compat>Nikon F AI-S</compat>
-         <compat>Nikon F AF</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON 1 S1</model>
-+        <model>Nikon 1 S1</model>
-         <model lang="en">1 S1</model>
-         <mount>Nikon CX</mount>
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON 1 V1</model>
-+        <model>Nikon 1 V1</model>
-         <model lang="en">1 V1</model>
-         <mount>Nikon CX</mount>
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON 1 J1</model>
-+        <model>Nikon 1 J1</model>
-         <model lang="en">1 J1</model>
-         <mount>Nikon CX</mount>
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON 1 V2</model>
-+        <model>Nikon 1 AW1</model>
-+        <model lang="en">1 AW1</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon 1 S2</model>
-+        <model lang="en">1 S2</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon 1 V2</model>
-         <model lang="en">1 V2</model>
-         <mount>Nikon CX</mount>
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON 1 J2</model>
-+        <model>Nikon 1 J2</model>
-         <model lang="en">1 J2</model>
-         <mount>Nikon CX</mount>
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON 1 J3</model>
-+        <model>Nikon 1 V3</model>
-+        <model lang="en">1 V3</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon 1 J3</model>
-         <model lang="en">1 J3</model>
-         <mount>Nikon CX</mount>
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon 1 J4</model>
-+        <model lang="en">1 J4</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon 1 J5</model>
-+        <model lang="en">1 J5</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>1 NIKKOR VR 10-30mm f/3.5-5.6</model>
-+        <model>1 Nikkor VR 10-30mm f/3.5-5.6</model>
-         <mount>Nikon CX</mount>
--        <!-- FixMe: Actually cropfactor 2.727 -->
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon 1 J1 -->
--            <distortion model="ptlens" focal="10" a="0.00625" b="-0.02807" c="0.01012" />
--            <distortion model="ptlens" focal="14" a="0" b="-0.00506" c="0" />
--            <distortion model="ptlens" focal="18.2" a="0" b="-0.00166" c="0" />
--            <distortion model="ptlens" focal="20.3" a="0" b="-0.0012" c="0" />
--            <distortion model="ptlens" focal="23.6" a="0" b="-0.00026" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="0.00046" c="0" />
--            <tca model="poly3" focal="10" vr="1.0002498" vb="1.0002093" />
--            <tca model="poly3" focal="14" vr="1.0001798" vb="1.0001781" />
--            <tca model="poly3" focal="18.2" vr="1.0001406" vb="1.0001690" />
--            <tca model="poly3" focal="20.3" vr="1.0001429" vb="1.0001581" />
--            <tca model="poly3" focal="23.6" vr="1.0001309" vb="1.0001345" />
--            <tca model="poly3" focal="30" vr="1.0001281" vb="1.0000955" />
-+            <distortion model="ptlens" focal="10" a="0.00625" b="-0.02807" c="0.01012"/>
-+            <distortion model="ptlens" focal="14" a="0" b="-0.00506" c="0"/>
-+            <distortion model="ptlens" focal="18.2" a="0" b="-0.00166" c="0"/>
-+            <distortion model="ptlens" focal="20.3" a="0" b="-0.0012" c="0"/>
-+            <distortion model="ptlens" focal="23.6" a="0" b="-0.00026" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0" b="0.00046" c="0"/>
-+            <tca model="poly3" focal="10" vr="1.0002498" vb="1.0002093"/>
-+            <tca model="poly3" focal="14" vr="1.0001798" vb="1.0001781"/>
-+            <tca model="poly3" focal="18.2" vr="1.0001406" vb="1.0001690"/>
-+            <tca model="poly3" focal="20.3" vr="1.0001429" vb="1.0001581"/>
-+            <tca model="poly3" focal="23.6" vr="1.0001309" vb="1.0001345"/>
-+            <tca model="poly3" focal="30" vr="1.0001281" vb="1.0000955"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>1 NIKKOR VR 30-110mm f/3.8-5.6</model>
-+        <model>1 Nikkor VR 30-110mm f/3.8-5.6</model>
-         <mount>Nikon CX</mount>
--        <!-- FixMe: Actually cropfactor 2.727 -->
--        <cropfactor>2.7</cropfactor>
-+        <cropfactor>2.727</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon 1 J1 -->
--            <distortion model="poly3" focal="30" k1="-0.01024" />
--            <distortion model="poly3" focal="39.8" k1="0.00097" />
--            <distortion model="poly3" focal="59.4" k1="0.00573" />
--            <distortion model="poly3" focal="80.1" k1="0.00556" />
--            <distortion model="poly3" focal="110" k1="0.00532" />
--            <tca model="poly3" focal="30" vr="1.0000704" vb="1.0001468" />
--            <tca model="poly3" focal="39.8" vr="1.0000811" vb="1.0000224" />
--            <tca model="poly3" focal="59.4" vr="0.9999867" vb="0.9999353" />
--            <tca model="poly3" focal="80.1" vr="0.9999499" vb="0.9998968" />
--            <tca model="poly3" focal="110" vr="0.9998706" vb="0.9998498" />
-+            <distortion model="poly3" focal="30" k1="-0.01024"/>
-+            <distortion model="poly3" focal="39.8" k1="0.00097"/>
-+            <distortion model="poly3" focal="59.4" k1="0.00573"/>
-+            <distortion model="poly3" focal="80.1" k1="0.00556"/>
-+            <distortion model="poly3" focal="110" k1="0.00532"/>
-+            <tca model="poly3" focal="30" vr="1.0000704" vb="1.0001468"/>
-+            <tca model="poly3" focal="39.8" vr="1.0000811" vb="1.0000224"/>
-+            <tca model="poly3" focal="59.4" vr="0.9999867" vb="0.9999353"/>
-+            <tca model="poly3" focal="80.1" vr="0.9999499" vb="0.9998968"/>
-+            <tca model="poly3" focal="110" vr="0.9998706" vb="0.9998498"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>1 Nikkor AW 11-27.5mm f/3.5-5.6</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon 1 AW1 -->
-+            <distortion model="ptlens" focal="11" a="0.0108" b="-0.04366" c="0.01672"/>
-+            <distortion model="ptlens" focal="14" a="0.00707" b="-0.03017" c="0.01789"/>
-+            <distortion model="ptlens" focal="16.1" a="0.00422" b="-0.01878" c="0.01041"/>
-+            <distortion model="ptlens" focal="18.2" a="0.00176" b="-0.01145" c="0.00993"/>
-+            <distortion model="ptlens" focal="21" a="0.00225" b="-0.01094" c="0.01183"/>
-+            <distortion model="ptlens" focal="23.6" a="0.00121" b="-0.00499" c="0.00367"/>
-+            <distortion model="ptlens" focal="27.5" a="0.00158" b="-0.00591" c="0.00483"/>
-+            <tca model="poly3" focal="11" br="0.0000054" vr="1.0002237" bb="0.0000092" vb="1.0000626"/>
-+            <tca model="poly3" focal="14" br="-0.0000744" vr="1.0002354" bb="0.0000058" vb="1.0000739"/>
-+            <tca model="poly3" focal="16.1" br="-0.0000501" vr="1.0001925" bb="0.0000057" vb="1.0000790"/>
-+            <tca model="poly3" focal="18.2" br="-0.0000541" vr="1.0001661" bb="-0.0000100" vb="1.0000806"/>
-+            <tca model="poly3" focal="21" br="-0.0000300" vr="1.0001514" bb="0.0000051" vb="1.0000838"/>
-+            <tca model="poly3" focal="23.6" br="-0.0000236" vr="1.0001017" bb="0.0000001" vb="1.0000574"/>
-+            <tca model="poly3" focal="27.5" br="-0.0000339" vr="1.0001351" bb="-0.0000011" vb="1.0000496"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>1 Nikkor 18.5mm f/1.8</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon 1 J1 -->
-+            <distortion model="poly3" focal="18.5" k1="-0.00974"/>
-+            <tca model="poly3" focal="18.5" br="-0.0000181" vr="1.0004235" bb="0.0000843" vb="0.9999900"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>1 Nikkor 32mm f/1.2</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon 1 J1 -->
-+            <distortion model="ptlens" focal="32" a="-0.002" b="0.004" c="-0.003"/>
-+            <tca model="poly3" focal="32" br="-0.0000293" vr="1.0000997" bb="0.0000337" vb="0.9998935"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>1 Nikkor 10mm f/2.8</model>
-+        <mount>Nikon CX</mount>
-+        <cropfactor>2.727</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon 1 J4 -->
-+            <distortion model="ptlens" focal="10" a="0.06176" b="-0.15886" c="0.10734"/>
-+            <vignetting model="pa" focal="10" aperture="2.8" distance="10" k1="-1.2282" k2="0.8855" k3="-0.3102"/>
-+            <vignetting model="pa" focal="10" aperture="2.8" distance="1000" k1="-1.2282" k2="0.8855" k3="-0.3102"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-0.4906" k2="0.1215" k3="-0.0680"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-0.4906" k2="0.1215" k3="-0.0680"/>
-+            <vignetting model="pa" focal="10" aperture="5" distance="10" k1="-0.5344" k2="0.1676" k3="-0.0339"/>
-+            <vignetting model="pa" focal="10" aperture="5" distance="1000" k1="-0.5344" k2="0.1676" k3="-0.0339"/>
-+            <vignetting model="pa" focal="10" aperture="6.3" distance="10" k1="-0.5544" k2="0.1830" k3="-0.0409"/>
-+            <vignetting model="pa" focal="10" aperture="6.3" distance="1000" k1="-0.5544" k2="0.1830" k3="-0.0409"/>
-+            <vignetting model="pa" focal="10" aperture="7.1" distance="10" k1="-0.5706" k2="0.1847" k3="-0.0359"/>
-+            <vignetting model="pa" focal="10" aperture="7.1" distance="1000" k1="-0.5706" k2="0.1847" k3="-0.0359"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.5728" k2="0.1638" k3="-0.0093"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.5728" k2="0.1638" k3="-0.0093"/>
-+            <vignetting model="pa" focal="10" aperture="9" distance="10" k1="-0.5793" k2="0.1723" k3="-0.0110"/>
-+            <vignetting model="pa" focal="10" aperture="9" distance="1000" k1="-0.5793" k2="0.1723" k3="-0.0110"/>
-+            <vignetting model="pa" focal="10" aperture="10" distance="10" k1="-0.5870" k2="0.1850" k3="-0.0172"/>
-+            <vignetting model="pa" focal="10" aperture="10" distance="1000" k1="-0.5870" k2="0.1850" k3="-0.0172"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.5985" k2="0.1814" k3="-0.0093"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.5985" k2="0.1814" k3="-0.0093"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-olympus.xml b/data/db/mil-olympus.xml
---- a/data/db/mil-olympus.xml	2013-10-13 11:59:02.000000000 +0200
-+++ b/data/db/mil-olympus.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,239 +1,249 @@
- <lensdatabase>
--
-     <mount>
-         <name>Micro 4/3 System</name>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
--        <compat>4/3 System</compat>
-     </mount>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-P1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-P2</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-P3</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-P5</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PL1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PL1s</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PL2</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PL3</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PL5</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PL6</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>E-PL7</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PM1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-PM2</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-M1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-M5</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>E-M5MarkII</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>E-M10</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Corporation</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>E-M10MarkII</model>
-+        <model lang="en">E-M10 II</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.12mm F2.0</model>
-+        <model>Olympus M.Zuiko Digital ED 12mm f/2.0</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
--        <focal value="12" />
-+        <focal value="12"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="12" a="-0.005" b="-0.016" c="-0.014" />
--            <tca model="poly3" focal="12" br="0.0000749" vr="1.0001239" bb="0.0000350" vb="1.0000181" />
-+            <distortion model="ptlens" focal="12" a="-0.005" b="-0.016" c="-0.014"/>
-+            <tca model="poly3" focal="12" br="0.0000749" vr="1.0001239" bb="0.0000350" vb="1.0000181"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.12-50mm F3.5-6.3</model>
-+        <model>Olympus M.Zuiko Digital ED 12-50mm f/3.5-6.3 EZ</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="12" a="0.00331" b="-0.03343" c="-0.00683" />
--            <distortion model="ptlens" focal="15" a="0.00521" b="-0.02919" c="0.00519" />
--            <distortion model="ptlens" focal="18" a="-0.00075" b="-0.00029" c="-0.01458" />
--            <distortion model="ptlens" focal="22" a="0.0006" b="-0.00075" c="-0.00843" />
--            <distortion model="ptlens" focal="26" a="-0.00059" b="0.00449" c="-0.01271" />
--            <distortion model="ptlens" focal="30" a="0.00128" b="-0.00365" c="0.0029" />
--            <distortion model="ptlens" focal="35" a="0.00046" b="0.00124" c="-0.0013" />
--            <distortion model="ptlens" focal="40" a="0.01662" b="-0.0539" c="0.06353" />
--            <distortion model="ptlens" focal="45" a="0.00827" b="-0.02519" c="0.0347" />
--            <distortion model="ptlens" focal="50" a="-0.0063" b="0.02983" c="-0.02886" />
--            <tca model="poly3" focal="12" br="0.0002153" vr="1.0006397" bb="-0.0001625" vb="1.0003859" />
--            <tca model="poly3" focal="12" br="0.0002549" vr="1.0005804" bb="-0.0001694" vb="1.0004041" />
--            <tca model="poly3" focal="12" br="0.0002567" vr="1.0005732" bb="-0.0001771" vb="1.0004148" />
--            <tca model="poly3" focal="15" br="0.0000901" vr="1.0004739" bb="-0.0000734" vb="1.0004506" />
--            <tca model="poly3" focal="15" br="0.0001052" vr="1.0004582" bb="-0.0000700" vb="1.0004424" />
--            <tca model="poly3" focal="15" br="0.0001196" vr="1.0004310" bb="-0.0000908" vb="1.0004670" />
--            <tca model="poly3" focal="18" br="0.0001710" vr="1.0002351" bb="-0.0000676" vb="1.0003208" />
--            <tca model="poly3" focal="18" br="0.0001998" vr="1.0001989" bb="-0.0000551" vb="1.0002972" />
--            <tca model="poly3" focal="18" br="0.0002004" vr="1.0001907" bb="-0.0000672" vb="1.0003084" />
--            <tca model="poly3" focal="22" br="0.0002187" vr="1.0001159" bb="-0.0001002" vb="1.0002496" />
--            <tca model="poly3" focal="22" br="0.0002200" vr="1.0001153" bb="-0.0000944" vb="1.0002600" />
--            <tca model="poly3" focal="22" br="0.0002222" vr="1.0001016" bb="-0.0001145" vb="1.0002688" />
--            <tca model="poly3" focal="26" br="0.0002792" vr="0.9999735" bb="-0.0001156" vb="1.0003080" />
--            <tca model="poly3" focal="26" br="0.0002939" vr="0.9999418" bb="-0.0000956" vb="1.0002767" />
--            <tca model="poly3" focal="26" br="0.0002973" vr="0.9999405" bb="-0.0001146" vb="1.0002992" />
--            <tca model="poly3" focal="30" br="0.0002072" vr="0.9998717" bb="-0.0001749" vb="1.0004954" />
--            <tca model="poly3" focal="30" br="0.0002495" vr="0.9998295" bb="-0.0001372" vb="1.0004401" />
--            <tca model="poly3" focal="30" br="0.0002527" vr="0.9998374" bb="-0.0001661" vb="1.0004878" />
--            <tca model="poly3" focal="35" br="0.0001735" vr="0.9997893" bb="-0.0002156" vb="1.0006502" />
--            <tca model="poly3" focal="35" br="0.0001856" vr="0.9997740" bb="-0.0002036" vb="1.0005955" />
--            <tca model="poly3" focal="35" br="0.0002013" vr="0.9997600" bb="-0.0002229" vb="1.0006799" />
--            <tca model="poly3" focal="40" br="0.0001250" vr="0.9998265" bb="-0.0002366" vb="1.0006687" />
--            <tca model="poly3" focal="40" br="0.0001359" vr="0.9998189" bb="-0.0002446" vb="1.0006998" />
--            <tca model="poly3" focal="40" br="0.0001907" vr="0.9997482" bb="-0.0002707" vb="1.0007475" />
--            <tca model="poly3" focal="45" br="0.0001734" vr="0.9997963" bb="-0.0002222" vb="1.0006242" />
--            <tca model="poly3" focal="45" br="0.0001800" vr="0.9997888" bb="-0.0002076" vb="1.0005887" />
--            <tca model="poly3" focal="45" br="0.0001942" vr="0.9997736" bb="-0.0002343" vb="1.0006603" />
--            <tca model="poly3" focal="50" br="0.0001414" vr="0.9998089" bb="-0.0002393" vb="1.0005384" />
--            <tca model="poly3" focal="50" br="0.0001516" vr="0.9998080" bb="-0.0002719" vb="1.0005789" />
--            <tca model="poly3" focal="50" br="0.0001784" vr="0.9997785" bb="-0.0002152" vb="1.0004737" />
-+            <distortion model="ptlens" focal="12" a="0.00331" b="-0.03343" c="-0.00683"/>
-+            <distortion model="ptlens" focal="15" a="0.00521" b="-0.02919" c="0.00519"/>
-+            <distortion model="ptlens" focal="18" a="-0.00075" b="-0.00029" c="-0.01458"/>
-+            <distortion model="ptlens" focal="22" a="0.0006" b="-0.00075" c="-0.00843"/>
-+            <distortion model="ptlens" focal="26" a="-0.00059" b="0.00449" c="-0.01271"/>
-+            <distortion model="ptlens" focal="30" a="0.00128" b="-0.00365" c="0.0029"/>
-+            <distortion model="ptlens" focal="35" a="0.00046" b="0.00124" c="-0.0013"/>
-+            <distortion model="ptlens" focal="40" a="0.01662" b="-0.0539" c="0.06353"/>
-+            <distortion model="ptlens" focal="45" a="0.00827" b="-0.02519" c="0.0347"/>
-+            <distortion model="ptlens" focal="50" a="-0.0063" b="0.02983" c="-0.02886"/>
-+            <tca model="poly3" focal="12" br="0.0002153" vr="1.0006397" bb="-0.0001625" vb="1.0003859"/>
-+            <tca model="poly3" focal="12" br="0.0002549" vr="1.0005804" bb="-0.0001694" vb="1.0004041"/>
-+            <tca model="poly3" focal="12" br="0.0002567" vr="1.0005732" bb="-0.0001771" vb="1.0004148"/>
-+            <tca model="poly3" focal="15" br="0.0000901" vr="1.0004739" bb="-0.0000734" vb="1.0004506"/>
-+            <tca model="poly3" focal="15" br="0.0001052" vr="1.0004582" bb="-0.0000700" vb="1.0004424"/>
-+            <tca model="poly3" focal="15" br="0.0001196" vr="1.0004310" bb="-0.0000908" vb="1.0004670"/>
-+            <tca model="poly3" focal="18" br="0.0001710" vr="1.0002351" bb="-0.0000676" vb="1.0003208"/>
-+            <tca model="poly3" focal="18" br="0.0001998" vr="1.0001989" bb="-0.0000551" vb="1.0002972"/>
-+            <tca model="poly3" focal="18" br="0.0002004" vr="1.0001907" bb="-0.0000672" vb="1.0003084"/>
-+            <tca model="poly3" focal="22" br="0.0002187" vr="1.0001159" bb="-0.0001002" vb="1.0002496"/>
-+            <tca model="poly3" focal="22" br="0.0002200" vr="1.0001153" bb="-0.0000944" vb="1.0002600"/>
-+            <tca model="poly3" focal="22" br="0.0002222" vr="1.0001016" bb="-0.0001145" vb="1.0002688"/>
-+            <tca model="poly3" focal="26" br="0.0002792" vr="0.9999735" bb="-0.0001156" vb="1.0003080"/>
-+            <tca model="poly3" focal="26" br="0.0002939" vr="0.9999418" bb="-0.0000956" vb="1.0002767"/>
-+            <tca model="poly3" focal="26" br="0.0002973" vr="0.9999405" bb="-0.0001146" vb="1.0002992"/>
-+            <tca model="poly3" focal="30" br="0.0002072" vr="0.9998717" bb="-0.0001749" vb="1.0004954"/>
-+            <tca model="poly3" focal="30" br="0.0002495" vr="0.9998295" bb="-0.0001372" vb="1.0004401"/>
-+            <tca model="poly3" focal="30" br="0.0002527" vr="0.9998374" bb="-0.0001661" vb="1.0004878"/>
-+            <tca model="poly3" focal="35" br="0.0001735" vr="0.9997893" bb="-0.0002156" vb="1.0006502"/>
-+            <tca model="poly3" focal="35" br="0.0001856" vr="0.9997740" bb="-0.0002036" vb="1.0005955"/>
-+            <tca model="poly3" focal="35" br="0.0002013" vr="0.9997600" bb="-0.0002229" vb="1.0006799"/>
-+            <tca model="poly3" focal="40" br="0.0001250" vr="0.9998265" bb="-0.0002366" vb="1.0006687"/>
-+            <tca model="poly3" focal="40" br="0.0001359" vr="0.9998189" bb="-0.0002446" vb="1.0006998"/>
-+            <tca model="poly3" focal="40" br="0.0001907" vr="0.9997482" bb="-0.0002707" vb="1.0007475"/>
-+            <tca model="poly3" focal="45" br="0.0001734" vr="0.9997963" bb="-0.0002222" vb="1.0006242"/>
-+            <tca model="poly3" focal="45" br="0.0001800" vr="0.9997888" bb="-0.0002076" vb="1.0005887"/>
-+            <tca model="poly3" focal="45" br="0.0001942" vr="0.9997736" bb="-0.0002343" vb="1.0006603"/>
-+            <tca model="poly3" focal="50" br="0.0001414" vr="0.9998089" bb="-0.0002393" vb="1.0005384"/>
-+            <tca model="poly3" focal="50" br="0.0001516" vr="0.9998080" bb="-0.0002719" vb="1.0005789"/>
-+            <tca model="poly3" focal="50" br="0.0001784" vr="0.9997785" bb="-0.0002152" vb="1.0004737"/>
-         </calibration>
-     </lens>
--
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.14-42mm F3.5-5.6</model>
-+        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="14" k1="-0.079" />
--            <distortion model="poly3" focal="18" k1="-0.036" />
--            <distortion model="poly3" focal="25" k1="0.0004" />
--            <distortion model="poly3" focal="30" k1="0.013" />
--            <distortion model="poly3" focal="35" k1="0.014" />
--            <distortion model="poly3" focal="42" k1="0.012" />
--            <tca model="poly3" focal="14" br="0.0002632" vr="1.0002908" bb="-0.0003817" vb="1.0" />
--            <tca model="poly3" focal="18" br="-0.0000326" vr="1.0004544" bb="-0.0003189" vb="1.0007081" />
--            <tca model="poly3" focal="25" br="-0.0001613" vr="1.0005611" bb="-0.0001126" vb="1.0004058" />
--            <tca model="poly3" focal="30" br="-0.0002418" vr="1.0006295" bb="-0.0000052" vb="1.0002145" />
--            <tca model="poly3" focal="35" br="-0.0002539" vr="1.0006484" bb="0.0000470" vb="1.0000846" />
--            <tca model="poly3" focal="42" br="-0.0002029" vr="1.0006187" bb="0.0001236" vb="0.9999271" />
-+            <distortion model="poly3" focal="14" k1="-0.079"/>
-+            <distortion model="poly3" focal="18" k1="-0.036"/>
-+            <distortion model="poly3" focal="25" k1="0.0004"/>
-+            <distortion model="poly3" focal="30" k1="0.013"/>
-+            <distortion model="poly3" focal="35" k1="0.014"/>
-+            <distortion model="poly3" focal="42" k1="0.012"/>
-+            <tca model="poly3" focal="14" br="0.0002632" vr="1.0002908" bb="-0.0003817" vb="1.0"/>
-+            <tca model="poly3" focal="18" br="-0.0000326" vr="1.0004544" bb="-0.0003189" vb="1.0007081"/>
-+            <tca model="poly3" focal="25" br="-0.0001613" vr="1.0005611" bb="-0.0001126" vb="1.0004058"/>
-+            <tca model="poly3" focal="30" br="-0.0002418" vr="1.0006295" bb="-0.0000052" vb="1.0002145"/>
-+            <tca model="poly3" focal="35" br="-0.0002539" vr="1.0006484" bb="0.0000470" vb="1.0000846"/>
-+            <tca model="poly3" focal="42" br="-0.0002029" vr="1.0006187" bb="0.0001236" vb="0.9999271"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.14-42mm F3.5-5.6 L</model>
-+        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 L</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <focal min="14" max="42"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <tca model="poly3" focal="14" br="0.0000600" vr="1.0001242" bb="-0.0002995" vb="1.0007041" />
--            <tca model="poly3" focal="18" br="0.0001267" vr="1.0000281" bb="-0.0001852" vb="1.0007117" />
--            <tca model="poly3" focal="25" br="-0.0000200" vr="1.0001315" bb="0.0001459" vb="1.0002999" />
--            <tca model="poly3" focal="35" br="-0.0001014" vr="1.0002742" bb="0.0000318" vb="1.0002395" />
--            <tca model="poly3" focal="42" br="-0.0001526" vr="1.0004259" bb="0.0001596" vb="1.0000256" />
--            <distortion model="ptlens" focal="13.56" a="0.10558" b="-0.3175" c="0.19816" />
--            <distortion model="ptlens" focal="16.49" a="0.0738" b="-0.25191" c="0.21409" />
--            <distortion model="ptlens" focal="24.40" a="-0.01895" b="0.05672" c="-0.05355" />
--            <distortion model="ptlens" focal="34.28" a="0.00451" b="-0.00716" c="0.02727" />
--            <distortion model="ptlens" focal="41.01" a="-0.00173" b="0.01774" c="0.00339" />
-+            <tca model="poly3" focal="14" br="0.0000600" vr="1.0001242" bb="-0.0002995" vb="1.0007041"/>
-+            <tca model="poly3" focal="18" br="0.0001267" vr="1.0000281" bb="-0.0001852" vb="1.0007117"/>
-+            <tca model="poly3" focal="25" br="-0.0000200" vr="1.0001315" bb="0.0001459" vb="1.0002999"/>
-+            <tca model="poly3" focal="35" br="-0.0001014" vr="1.0002742" bb="0.0000318" vb="1.0002395"/>
-+            <tca model="poly3" focal="42" br="-0.0001526" vr="1.0004259" bb="0.0001596" vb="1.0000256"/>
-+            <distortion model="ptlens" focal="13.56" a="0.10558" b="-0.3175" c="0.19816"/>
-+            <distortion model="ptlens" focal="16.49" a="0.0738" b="-0.25191" c="0.21409"/>
-+            <distortion model="ptlens" focal="24.40" a="-0.01895" b="0.05672" c="-0.05355"/>
-+            <distortion model="ptlens" focal="34.28" a="0.00451" b="-0.00716" c="0.02727"/>
-+            <distortion model="ptlens" focal="41.01" a="-0.00173" b="0.01774" c="0.00339"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--	<model>OLYMPUS M.14-42mm F3.5-5.6 II</model>
-+        <model>Olympus M.Zuiko Digital 14-42mm f/3.5-5.6 II</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014" />
--            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021" />
--            <distortion model="ptlens" focal="25" a="0.0" b="-0.012" c="0.008" />
--            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003" />
--            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018" />
--            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010" />
-+            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014"/>
-+            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021"/>
-+            <distortion model="ptlens" focal="25" a="0" b="-0.012" c="0.008"/>
-+            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003"/>
-+            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018"/>
-+            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010"/>
-             <tca model="poly3" focal="14" br="0.0000882" vr="1.0001828" bb="0.0002104" vb="1.0004280"/>
-             <tca model="poly3" focal="18" br="0.0000087" vr="1.0000985" bb="-0.0001260" vb="1.0002535"/>
-             <tca model="poly3" focal="25" br="-0.0000210" vr="1.0001388" bb="-0.0001294" vb="1.0005537"/>
-@@ -242,236 +252,662 @@
-             <tca model="poly3" focal="42" br="-0.0000752" vr="1.0003152" bb="-0.0000213" vb="1.0001196"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.14-42mm F3.5-5.6 II R</model>
-+        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 II R</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014" />
--            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021" />
--            <distortion model="ptlens" focal="25" a="0.0" b="-0.012" c="0.008" />
--            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003" />
--            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018" />
--            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010" />
-+            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014"/>
-+            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021"/>
-+            <distortion model="ptlens" focal="25" a="0" b="-0.012" c="0.008"/>
-+            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003"/>
-+            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018"/>
-+            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010"/>
-             <tca model="poly3" focal="14" br="0.0000882" vr="1.0001828" bb="0.0002104" vb="1.0004280"/>
-             <tca model="poly3" focal="18" br="0.0000087" vr="1.0000985" bb="-0.0001260" vb="1.0002535"/>
-             <tca model="poly3" focal="25" br="-0.0000210" vr="1.0001388" bb="-0.0001294" vb="1.0005537"/>
-             <tca model="poly3" focal="30" br="-0.0000429" vr="1.0002040" bb="0.0000872" vb="1.0002187"/>
-             <tca model="poly3" focal="35" br="-0.0001262" vr="1.0003653" bb="-0.0000270" vb="1.0003605"/>
-             <tca model="poly3" focal="42" br="-0.0000752" vr="1.0003152" bb="-0.0000213" vb="1.0001196"/>
-+            <!-- Taken with Olympus PEN E-PL3  -->
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.2618" k2="-0.5226" k3="0.1669"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.2618" k2="-0.5226" k3="0.1669"/>
-+            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.2661" k2="-0.1267" k3="-0.1413"/>
-+            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.2661" k2="-0.1267" k3="-0.1413"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.4324" k2="0.5192" k3="-0.5239"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4324" k2="0.5192" k3="-0.5239"/>
-+            <vignetting model="pa" focal="14" aperture="6.3" distance="10" k1="-0.4329" k2="0.5300" k3="-0.4875"/>
-+            <vignetting model="pa" focal="14" aperture="6.3" distance="1000" k1="-0.4329" k2="0.5300" k3="-0.4875"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.3966" k2="0.2349" k3="-0.1238"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3966" k2="0.2349" k3="-0.1238"/>
-+            <vignetting model="pa" focal="21" aperture="4.1" distance="10" k1="-0.0965" k2="-0.9250" k3="0.5590"/>
-+            <vignetting model="pa" focal="21" aperture="4.1" distance="1000" k1="-0.0965" k2="-0.9250" k3="0.5590"/>
-+            <vignetting model="pa" focal="21" aperture="5" distance="10" k1="-0.1010" k2="-0.5931" k3="0.2620"/>
-+            <vignetting model="pa" focal="21" aperture="5" distance="1000" k1="-0.1010" k2="-0.5931" k3="0.2620"/>
-+            <vignetting model="pa" focal="21" aperture="6.3" distance="10" k1="-0.2687" k2="0.1273" k3="-0.2234"/>
-+            <vignetting model="pa" focal="21" aperture="6.3" distance="1000" k1="-0.2687" k2="0.1273" k3="-0.2234"/>
-+            <vignetting model="pa" focal="21" aperture="7.1" distance="10" k1="-0.3345" k2="0.3032" k3="-0.2916"/>
-+            <vignetting model="pa" focal="21" aperture="7.1" distance="1000" k1="-0.3345" k2="0.3032" k3="-0.2916"/>
-+            <vignetting model="pa" focal="21" aperture="22" distance="10" k1="-0.2662" k2="0.0139" k3="0.0211"/>
-+            <vignetting model="pa" focal="21" aperture="22" distance="1000" k1="-0.2662" k2="0.0139" k3="0.0211"/>
-+            <vignetting model="pa" focal="28" aperture="4.6" distance="10" k1="-0.0105" k2="-0.8787" k3="0.4778"/>
-+            <vignetting model="pa" focal="28" aperture="4.6" distance="1000" k1="-0.0105" k2="-0.8787" k3="0.4778"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.0826" k2="-0.4127" k3="0.1303"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.0826" k2="-0.4127" k3="0.1303"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="10" k1="-0.1589" k2="-0.1101" k3="-0.0735"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.1589" k2="-0.1101" k3="-0.0735"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2761" k2="0.2615" k3="-0.2631"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2761" k2="0.2615" k3="-0.2631"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2455" k2="0.0395" k3="0.0035"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2455" k2="0.0395" k3="0.0035"/>
-+            <vignetting model="pa" focal="35" aperture="5.2" distance="10" k1="0.0071" k2="-0.8165" k3="0.4255"/>
-+            <vignetting model="pa" focal="35" aperture="5.2" distance="1000" k1="0.0071" k2="-0.8165" k3="0.4255"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.0293" k2="-0.4632" k3="0.1419"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.0293" k2="-0.4632" k3="0.1419"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1390" k2="-0.0683" k3="-0.1162"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1390" k2="-0.0683" k3="-0.1162"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1955" k2="0.1649" k3="-0.2496"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1955" k2="0.1649" k3="-0.2496"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1874" k2="-0.0217" k3="0.0399"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1874" k2="-0.0217" k3="0.0399"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="10" k1="-0.1727" k2="-0.3576" k3="0.1560"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.1727" k2="-0.3576" k3="0.1560"/>
-+            <vignetting model="pa" focal="42" aperture="6.3" distance="10" k1="0.0412" k2="-0.7054" k3="0.3133"/>
-+            <vignetting model="pa" focal="42" aperture="6.3" distance="1000" k1="0.0412" k2="-0.7054" k3="0.3133"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="10" k1="-0.1253" k2="0.0027" k3="-0.1655"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.1253" k2="0.0027" k3="-0.1655"/>
-+            <vignetting model="pa" focal="42" aperture="9" distance="10" k1="-0.1875" k2="0.1948" k3="-0.2627"/>
-+            <vignetting model="pa" focal="42" aperture="9" distance="1000" k1="-0.1875" k2="0.1948" k3="-0.2627"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="10" k1="-0.1455" k2="-0.0510" k3="0.0470"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1455" k2="-0.0510" k3="0.0470"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Olympus</maker>
--	    <model>OLYMPUS M.14-150mm F4.0-5.6</model>
--	    <focal min="14" max="150" />
--	    <aperture min="4" max="5.6" />
--	    <aperture>4-22</aperture>
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="14" model="ptlens" a="0.0188691" b="-0.0734975" c="0.0114623" />
--            <distortion focal="25" model="ptlens" a="-0.0101877" b="0.0257528" c="-0.0226344" />
--	        <distortion focal="45" model="ptlens" a="-0.0094443" b="0.0311439" c="-0.0196775" />
--	        <distortion focal="70" model="ptlens" a="0.00389548" b="-0.00256133" c="0.00668901" />
--	        <distortion focal="100" model="ptlens" a="-0.00317114" b="0.0149587" c="-0.00860884" />
--	        <distortion focal="150" model="ptlens" a="-0.00218749" b="0.0145162" c="-0.00842408" />
--	        <tca model="poly3" focal="14" br="0.0001674" vr="1.0005298" bb="0.0000441" vb="0.9998478" />
--            <tca model="poly3" focal="25" br="-0.0000789" vr="1.0002537" bb="-0.0000285" vb="1.0000552" />
--            <tca model="poly3" focal="45" br="0.0000404" vr="0.9998261" bb="-0.0000489" vb="1.0002042" />
--            <tca model="poly3" focal="70" br="0.0000554" vr="0.9992661" bb="-0.0001090" vb="1.0005723" />
--            <tca model="poly3" focal="100" br="0.0000476" vr="0.9991092" bb="-0.0000076" vb="1.0003522" />
--            <tca model="poly3" focal="150" br="0.0000531" vr="0.9991318" bb="-0.0000424" vb="1.0001241" />
--	        <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.3182" k2="0.1259" k3="-0.5945" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="-0.2255" k2="-0.3591" k3="-0.1541" />
--            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="-0.2704" k2="-0.2630" k3="-0.2081" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.2705" k2="-0.2775" k3="-0.1900" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4740" k2="0.9221" k3="-1.1605" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.3744" k2="0.4030" k3="-0.6734" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4226" k2="0.4843" k3="-0.7001" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4294" k2="0.4949" k3="-0.6982" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.6059" k2="1.3512" k3="-1.3494" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.4786" k2="0.7059" k3="-0.7501" />
--            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5353" k2="0.8132" k3="-0.7970" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5226" k2="0.7598" k3="-0.7426" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.5533" k2="1.1048" k3="-1.0602" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.4018" k2="0.3474" k3="-0.3561" />
--            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.4555" k2="0.4608" k3="-0.4160" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.4670" k2="0.4808" k3="-0.4196" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.4692" k2="0.7888" k3="-0.7810" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.2996" k2="-0.0524" k3="0.0021" />
--            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.3475" k2="0.0488" k3="-0.0514" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3693" k2="0.1029" k3="-0.0821" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.2590" k2="0.4378" k3="-0.4580" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.2916" k2="0.4755" k3="-0.4598" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.3084" k2="0.4201" k3="-0.4025" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.3353" k2="0.4940" k3="-0.4523" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.2510" k2="0.3160" k3="-0.2831" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.2578" k2="0.3092" k3="-0.2596" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.2874" k2="0.3027" k3="-0.2428" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2704" k2="0.2029" k3="-0.1278" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1619" k2="-0.0233" k3="0.0236" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.1776" k2="-0.0059" k3="0.0273" />
--            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.2094" k2="0.0028" k3="0.0297" />
--	        <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2326" k2="0.0535" k3="0.0043" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1530" k2="-0.0685" k3="0.0621" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.1689" k2="-0.0354" k3="0.0494" />
--            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1853" k2="-0.0649" k3="0.0771" />
--	        <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.2236" k2="0.0224" k3="0.0265" />            		
--	        <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1408" k2="-0.0969" k3="0.0747" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1598" k2="-0.0568" k3="0.0580" />
--            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1676" k2="-0.0997" k3="0.0919" />
--	        <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2119" k2="-0.0016" k3="0.0337" />            		
--	        <vignetting model="pa" focal="45" aperture="5.4" distance="0.5" k1="-0.1442" k2="0.0203" k3="0.0013" />
--            <vignetting model="pa" focal="45" aperture="5.4" distance="1" k1="-0.1477" k2="0.1333" k3="-0.1100" />
--            <vignetting model="pa" focal="45" aperture="5.4" distance="3" k1="-0.1989" k2="0.1942" k3="-0.1438" />
--            <vignetting model="pa" focal="45" aperture="5.4" distance="1000" k1="-0.1883" k2="0.1766" k3="-0.1385" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="0.5" k1="-0.1351" k2="0.0038" k3="0.0093" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="1" k1="-0.1452" k2="0.1218" k3="-0.1011" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="3" k1="-0.2003" k2="0.1978" k3="-0.1453" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.1959" k2="0.1899" k3="-0.1452" />
--            <vignetting model="pa" focal="45" aperture="8" distance="0.5" k1="-0.1124" k2="-0.0659" k3="0.0628" />
--            <vignetting model="pa" focal="45" aperture="8" distance="1" k1="-0.1037" k2="-0.0438" k3="0.0442" />
--            <vignetting model="pa" focal="45" aperture="8" distance="3" k1="-0.1535" k2="0.0084" k3="0.0249" />
--            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.1279" k2="-0.0494" k3="0.0573" />
--            <vignetting model="pa" focal="45" aperture="11" distance="0.5" k1="-0.1115" k2="-0.0835" k3="0.0769" />
--            <vignetting model="pa" focal="45" aperture="11" distance="1" k1="-0.1003" k2="-0.0511" k3="0.0481" />
--            <vignetting model="pa" focal="45" aperture="11" distance="3" k1="-0.1472" k2="-0.0068" k3="0.0332" />
--            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.1206" k2="-0.0643" k3="0.0650" />
--            <vignetting model="pa" focal="45" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0921" k3="0.0824" />
--            <vignetting model="pa" focal="45" aperture="16" distance="1" k1="-0.0945" k2="-0.0671" k3="0.0556" />
--            <vignetting model="pa" focal="45" aperture="16" distance="3" k1="-0.1402" k2="-0.0238" k3="0.0424" />
--            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.1068" k2="-0.0931" k3="0.0804" />
--            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1114" k2="-0.0924" k3="0.0828" />
--            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.0842" k2="-0.0892" k3="0.0680" />
--            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1406" k2="-0.0179" k3="0.0358" />
--            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1003" k2="-0.1075" k3="0.0880" />
--            <vignetting model="pa" focal="70" aperture="5.4" distance="0.5" k1="-0.3127" k2="0.9207" k3="-0.9547" />
--            <vignetting model="pa" focal="70" aperture="5.4" distance="1" k1="-0.1916" k2="0.5619" k3="-0.7221" />
--            <vignetting model="pa" focal="70" aperture="5.4" distance="3" k1="-0.1673" k2="0.4276" k3="-0.6145" />
--            <vignetting model="pa" focal="70" aperture="5.4" distance="1000" k1="-0.1116" k2="0.2834" k3="-0.5272" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="0.5" k1="-0.3309" k2="0.9468" k3="-0.9535" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="1" k1="-0.2045" k2="0.5835" k3="-0.7182" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="3" k1="-0.1873" k2="0.4801" k3="-0.6323" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1286" k2="0.3422" k3="-0.5557" />
--            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.2932" k2="0.7073" k3="-0.6462" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.2362" k2="0.5712" k3="-0.5553" />
--            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.2512" k2="0.5914" k3="-0.5567" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2137" k2="0.5395" k3="-0.5471" />
--            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.1840" k2="0.2555" k3="-0.2231" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="-0.1320" k2="0.1352" k3="-0.1348" />
--            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.1599" k2="0.1927" k3="-0.1595" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1183" k2="0.1309" k3="-0.1390" />
--            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0228" k3="0.0236" />
--            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="-0.0678" k2="-0.0941" k3="0.0652" />
--            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.1071" k2="-0.0078" k3="0.0202" />
--            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0546" k2="-0.0981" k3="0.0624" />
--            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.1010" k2="-0.0595" k3="0.0536" />
--            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0601" k2="-0.1137" k3="0.0786" />
--            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.1035" k2="-0.0211" k3="0.0298" />
--            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0494" k2="-0.1136" k3="0.0727" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="0.5" k1="-0.2273" k2="0.7085" k3="-0.9193" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="0.0783" k2="-0.3650" k3="-0.1316" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="0.1008" k2="-0.5429" k3="0.0399" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="0.1655" k2="-0.8375" k3="0.2623" />
--	        <vignetting model="pa" focal="100" aperture="8" distance="0.5" k1="-0.3503" k2="1.0560" k3="-1.0632" />            		
--	        <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.1643" k2="0.4936" k3="-0.6717" />
--            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1918" k2="0.4916" k3="-0.6128" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1113" k2="0.2360" k3="-0.4604" />
--	        <vignetting model="pa" focal="100" aperture="11" distance="0.5" k1="-0.3308" k2="0.9217" k3="-0.8725" />            		
--	        <vignetting model="pa" focal="100" aperture="11" distance="1" k1="-0.2262" k2="0.5889" k3="-0.5886" />
--	        <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.2518" k2="0.5771" k3="-0.5419" />            		
--	        <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.2299" k2="0.5245" k3="-0.5068" />
--	        <vignetting model="pa" focal="100" aperture="16" distance="0.5" k1="-0.2422" k2="0.5401" k3="-0.4935" />            		
--	        <vignetting model="pa" focal="100" aperture="16" distance="1" k1="-0.1143" k2="0.1311" k3="-0.1430" />
--	        <vignetting model="pa" focal="100" aperture="16" distance="3" k1="-0.1446" k2="0.1239" k3="-0.0974" />            		
--	        <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1284" k2="0.0913" k3="-0.0781" />
--	        <vignetting model="pa" focal="100" aperture="22" distance="0.5" k1="-0.1258" k2="0.0860" k3="-0.0832" />            		
--	        <vignetting model="pa" focal="100" aperture="22" distance="1" k1="-0.0548" k2="-0.1004" k3="0.0632" />
--	        <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1120" k2="-0.0107" k3="0.0253" />            		
--	        <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0933" k2="-0.0404" k3="0.0389" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="0.5" k1="0.0272" k2="-0.1292" k3="-0.3733" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1" k1="0.2704" k2="-1.3992" k3="0.6819" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1042" k2="-1.3875" k3="0.8383" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0398" k2="-1.2995" k3="0.8145" />
--            <vignetting model="pa" focal="150" aperture="8" distance="0.5" k1="-0.2197" k2="0.7304" k3="-0.9151" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1" k1="0.0500" k2="-0.2273" k3="-0.2014" />
--            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="0.1392" k2="-0.6833" k3="0.1755" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="0.1615" k2="-0.7998" k3="0.2693" />
--            <vignetting model="pa" focal="150" aperture="11" distance="0.5" k1="-0.3191" k2="0.9724" k3="-0.9732" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1" k1="-0.1815" k2="0.5374" k3="-0.6391" />
--            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.1405" k2="0.3368" k3="-0.4674" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.1242" k2="0.2821" k3="-0.4309" />
--            <vignetting model="pa" focal="150" aperture="16" distance="0.5" k1="-0.2632" k2="0.6883" k3="-0.6477" />
--            <vignetting model="pa" focal="150" aperture="16" distance="1" k1="-0.1667" k2="0.3791" k3="-0.3790" />
--            <vignetting model="pa" focal="150" aperture="16" distance="3" k1="-0.1528" k2="0.2632" k3="-0.2588" />
--            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.1516" k2="0.2625" k3="-0.2597" />
--            <vignetting model="pa" focal="150" aperture="22" distance="0.5" k1="-0.1287" k2="0.1610" k3="-0.1651" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1" k1="-0.0569" k2="-0.0503" k3="0.0160" />
--            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0646" k2="-0.0816" k3="0.0582" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0543" k2="-0.0933" k3="0.0628" />
--	    </calibration>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 14-150mm f/4.0-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal min="14" max="150"/>
-+        <aperture min="4" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.0188691" b="-0.0734975" c="0.0114623"/>
-+            <distortion focal="25" model="ptlens" a="-0.0101877" b="0.0257528" c="-0.0226344"/>
-+            <distortion focal="45" model="ptlens" a="-0.0094443" b="0.0311439" c="-0.0196775"/>
-+            <distortion focal="70" model="ptlens" a="0.00389548" b="-0.00256133" c="0.00668901"/>
-+            <distortion focal="100" model="ptlens" a="-0.00317114" b="0.0149587" c="-0.00860884"/>
-+            <distortion focal="150" model="ptlens" a="-0.00218749" b="0.0145162" c="-0.00842408"/>
-+            <tca model="poly3" focal="14" br="0.0001674" vr="1.0005298" bb="0.0000441" vb="0.9998478"/>
-+            <tca model="poly3" focal="25" br="-0.0000789" vr="1.0002537" bb="-0.0000285" vb="1.0000552"/>
-+            <tca model="poly3" focal="45" br="0.0000404" vr="0.9998261" bb="-0.0000489" vb="1.0002042"/>
-+            <tca model="poly3" focal="70" br="0.0000554" vr="0.9992661" bb="-0.0001090" vb="1.0005723"/>
-+            <tca model="poly3" focal="100" br="0.0000476" vr="0.9991092" bb="-0.0000076" vb="1.0003522"/>
-+            <tca model="poly3" focal="150" br="0.0000531" vr="0.9991318" bb="-0.0000424" vb="1.0001241"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.3182" k2="0.1259" k3="-0.5945"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="-0.2255" k2="-0.3591" k3="-0.1541"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="-0.2704" k2="-0.2630" k3="-0.2081"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.2705" k2="-0.2775" k3="-0.1900"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4740" k2="0.9221" k3="-1.1605"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.3744" k2="0.4030" k3="-0.6734"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4226" k2="0.4843" k3="-0.7001"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4294" k2="0.4949" k3="-0.6982"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.6059" k2="1.3512" k3="-1.3494"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.4786" k2="0.7059" k3="-0.7501"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5353" k2="0.8132" k3="-0.7970"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5226" k2="0.7598" k3="-0.7426"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.5533" k2="1.1048" k3="-1.0602"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.4018" k2="0.3474" k3="-0.3561"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.4555" k2="0.4608" k3="-0.4160"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.4670" k2="0.4808" k3="-0.4196"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.4692" k2="0.7888" k3="-0.7810"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.2996" k2="-0.0524" k3="0.0021"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.3475" k2="0.0488" k3="-0.0514"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3693" k2="0.1029" k3="-0.0821"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.2590" k2="0.4378" k3="-0.4580"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.2916" k2="0.4755" k3="-0.4598"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.3084" k2="0.4201" k3="-0.4025"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.3353" k2="0.4940" k3="-0.4523"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.2510" k2="0.3160" k3="-0.2831"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.2578" k2="0.3092" k3="-0.2596"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.2874" k2="0.3027" k3="-0.2428"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2704" k2="0.2029" k3="-0.1278"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1619" k2="-0.0233" k3="0.0236"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.1776" k2="-0.0059" k3="0.0273"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.2094" k2="0.0028" k3="0.0297"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2326" k2="0.0535" k3="0.0043"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1530" k2="-0.0685" k3="0.0621"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.1689" k2="-0.0354" k3="0.0494"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1853" k2="-0.0649" k3="0.0771"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.2236" k2="0.0224" k3="0.0265"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1408" k2="-0.0969" k3="0.0747"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1598" k2="-0.0568" k3="0.0580"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1676" k2="-0.0997" k3="0.0919"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2119" k2="-0.0016" k3="0.0337"/>
-+            <vignetting model="pa" focal="45" aperture="5.4" distance="0.5" k1="-0.1442" k2="0.0203" k3="0.0013"/>
-+            <vignetting model="pa" focal="45" aperture="5.4" distance="1" k1="-0.1477" k2="0.1333" k3="-0.1100"/>
-+            <vignetting model="pa" focal="45" aperture="5.4" distance="3" k1="-0.1989" k2="0.1942" k3="-0.1438"/>
-+            <vignetting model="pa" focal="45" aperture="5.4" distance="1000" k1="-0.1883" k2="0.1766" k3="-0.1385"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="0.5" k1="-0.1351" k2="0.0038" k3="0.0093"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="1" k1="-0.1452" k2="0.1218" k3="-0.1011"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="3" k1="-0.2003" k2="0.1978" k3="-0.1453"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.1959" k2="0.1899" k3="-0.1452"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="0.5" k1="-0.1124" k2="-0.0659" k3="0.0628"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="1" k1="-0.1037" k2="-0.0438" k3="0.0442"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="3" k1="-0.1535" k2="0.0084" k3="0.0249"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.1279" k2="-0.0494" k3="0.0573"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="0.5" k1="-0.1115" k2="-0.0835" k3="0.0769"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="1" k1="-0.1003" k2="-0.0511" k3="0.0481"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="3" k1="-0.1472" k2="-0.0068" k3="0.0332"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.1206" k2="-0.0643" k3="0.0650"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0921" k3="0.0824"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="1" k1="-0.0945" k2="-0.0671" k3="0.0556"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="3" k1="-0.1402" k2="-0.0238" k3="0.0424"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.1068" k2="-0.0931" k3="0.0804"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1114" k2="-0.0924" k3="0.0828"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.0842" k2="-0.0892" k3="0.0680"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1406" k2="-0.0179" k3="0.0358"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1003" k2="-0.1075" k3="0.0880"/>
-+            <vignetting model="pa" focal="70" aperture="5.4" distance="0.5" k1="-0.3127" k2="0.9207" k3="-0.9547"/>
-+            <vignetting model="pa" focal="70" aperture="5.4" distance="1" k1="-0.1916" k2="0.5619" k3="-0.7221"/>
-+            <vignetting model="pa" focal="70" aperture="5.4" distance="3" k1="-0.1673" k2="0.4276" k3="-0.6145"/>
-+            <vignetting model="pa" focal="70" aperture="5.4" distance="1000" k1="-0.1116" k2="0.2834" k3="-0.5272"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.5" k1="-0.3309" k2="0.9468" k3="-0.9535"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1" k1="-0.2045" k2="0.5835" k3="-0.7182"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="3" k1="-0.1873" k2="0.4801" k3="-0.6323"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1286" k2="0.3422" k3="-0.5557"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.2932" k2="0.7073" k3="-0.6462"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.2362" k2="0.5712" k3="-0.5553"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.2512" k2="0.5914" k3="-0.5567"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2137" k2="0.5395" k3="-0.5471"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.1840" k2="0.2555" k3="-0.2231"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="-0.1320" k2="0.1352" k3="-0.1348"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.1599" k2="0.1927" k3="-0.1595"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1183" k2="0.1309" k3="-0.1390"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.1110" k2="-0.0228" k3="0.0236"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="-0.0678" k2="-0.0941" k3="0.0652"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.1071" k2="-0.0078" k3="0.0202"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0546" k2="-0.0981" k3="0.0624"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.1010" k2="-0.0595" k3="0.0536"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0601" k2="-0.1137" k3="0.0786"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.1035" k2="-0.0211" k3="0.0298"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0494" k2="-0.1136" k3="0.0727"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.5" k1="-0.2273" k2="0.7085" k3="-0.9193"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="0.0783" k2="-0.3650" k3="-0.1316"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="0.1008" k2="-0.5429" k3="0.0399"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="0.1655" k2="-0.8375" k3="0.2623"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.5" k1="-0.3503" k2="1.0560" k3="-1.0632"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.1643" k2="0.4936" k3="-0.6717"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1918" k2="0.4916" k3="-0.6128"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1113" k2="0.2360" k3="-0.4604"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.5" k1="-0.3308" k2="0.9217" k3="-0.8725"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1" k1="-0.2262" k2="0.5889" k3="-0.5886"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.2518" k2="0.5771" k3="-0.5419"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.2299" k2="0.5245" k3="-0.5068"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.5" k1="-0.2422" k2="0.5401" k3="-0.4935"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1" k1="-0.1143" k2="0.1311" k3="-0.1430"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="3" k1="-0.1446" k2="0.1239" k3="-0.0974"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1284" k2="0.0913" k3="-0.0781"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.5" k1="-0.1258" k2="0.0860" k3="-0.0832"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1" k1="-0.0548" k2="-0.1004" k3="0.0632"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1120" k2="-0.0107" k3="0.0253"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0933" k2="-0.0404" k3="0.0389"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="0.5" k1="0.0272" k2="-0.1292" k3="-0.3733"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1" k1="0.2704" k2="-1.3992" k3="0.6819"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1042" k2="-1.3875" k3="0.8383"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0398" k2="-1.2995" k3="0.8145"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="0.5" k1="-0.2197" k2="0.7304" k3="-0.9151"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1" k1="0.0500" k2="-0.2273" k3="-0.2014"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="0.1392" k2="-0.6833" k3="0.1755"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="0.1615" k2="-0.7998" k3="0.2693"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="0.5" k1="-0.3191" k2="0.9724" k3="-0.9732"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1" k1="-0.1815" k2="0.5374" k3="-0.6391"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.1405" k2="0.3368" k3="-0.4674"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.1242" k2="0.2821" k3="-0.4309"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="0.5" k1="-0.2632" k2="0.6883" k3="-0.6477"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="1" k1="-0.1667" k2="0.3791" k3="-0.3790"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="3" k1="-0.1528" k2="0.2632" k3="-0.2588"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.1516" k2="0.2625" k3="-0.2597"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="0.5" k1="-0.1287" k2="0.1610" k3="-0.1651"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1" k1="-0.0569" k2="-0.0503" k3="0.0160"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0646" k2="-0.0816" k3="0.0582"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0543" k2="-0.0933" k3="0.0628"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.17mm F2.8</model>
-+        <model>Olympus M.Zuiko Digital 17mm f/2.8 Pancake</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--             <distortion model="ptlens" focal="17" a="0.00835" b="-0.04149" c="-0.0022" />
--             <tca model="poly3" focal="17" br="-0.0004492" vr="1.0016410" bb="0.0005749" vb="0.9989794" />
-+            <distortion model="ptlens" focal="17" a="0.00835" b="-0.04149" c="-0.0022"/>
-+            <tca model="poly3" focal="17" br="-0.0004492" vr="1.0016410" bb="0.0005749" vb="0.9989794"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.45mm F1.8</model>
--	    <focal value="45" />
--	    <aperture min="1.8" max="22" />
-+        <model>Olympus M.Zuiko Digital 45mm f/1.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal value="45"/>
-+        <aperture min="1.8" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="45" a="0.00149954" b="-0.0023693" c="0.00382496"/>
-+            <tca model="poly3" focal="45" br="-0.0000129" vr="1.0001904" bb="0.0000108" vb="0.9999203"/>
-+            <tca model="poly3" focal="45" br="-0.0000440" vr="1.0002771" bb="0.0000282" vb="0.9998497"/>
-+            <tca model="poly3" focal="45" br="-0.0000484" vr="1.0001937" bb="0.0000056" vb="0.9999340"/>
-+            <vignetting model="pa" focal="45" aperture="1.8" distance="0.5" k1="-0.1316" k2="-0.3770" k3="0.2472"/>
-+            <vignetting model="pa" focal="45" aperture="1.8" distance="1" k1="-0.2255" k2="-0.1345" k3="0.0659"/>
-+            <vignetting model="pa" focal="45" aperture="1.8" distance="3" k1="-0.2785" k2="-0.0510" k3="0.0102"/>
-+            <vignetting model="pa" focal="45" aperture="1.8" distance="1000" k1="-0.3385" k2="0.0596" k3="-0.0582"/>
-+            <vignetting model="pa" focal="45" aperture="2" distance="0.5" k1="-0.1464" k2="-0.0489" k3="0.0091"/>
-+            <vignetting model="pa" focal="45" aperture="2" distance="1" k1="-0.1200" k2="0.0168" k3="-0.1094"/>
-+            <vignetting model="pa" focal="45" aperture="2" distance="3" k1="-0.0571" k2="-0.1512" k3="-0.0265"/>
-+            <vignetting model="pa" focal="45" aperture="2" distance="1000" k1="-0.0080" k2="-0.3083" k3="0.0663"/>
-+            <vignetting model="pa" focal="45" aperture="2.8" distance="0.5" k1="-0.1506" k2="-0.0366" k3="0.0414"/>
-+            <vignetting model="pa" focal="45" aperture="2.8" distance="1" k1="-0.1214" k2="-0.0310" k3="0.0366"/>
-+            <vignetting model="pa" focal="45" aperture="2.8" distance="3" k1="-0.1069" k2="-0.0244" k3="0.0285"/>
-+            <vignetting model="pa" focal="45" aperture="2.8" distance="1000" k1="-0.1093" k2="0.0134" k3="-0.0044"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="0.5" k1="-0.1576" k2="-0.0189" k3="0.0303"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="1" k1="-0.1232" k2="-0.0232" k3="0.0293"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="3" k1="-0.1091" k2="-0.0196" k3="0.0259"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.1000" k2="-0.0296" k3="0.0347"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1730" k2="0.0117" k3="0.0109"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.1578" k2="0.0464" k3="-0.0149"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1341" k2="0.0328" k3="-0.0102"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1288" k2="0.0174" k3="0.0038"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital 17mm f/1.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M5 -->
-+            <distortion model="ptlens" focal="17" a="0.01989" b="-0.09761" c="0.07461"/>
-+            <tca model="poly3" focal="17" br="-0.0000767" vr="1.0002674" bb="0.0001410" vb="0.9997845"/>
-+            <vignetting model="pa" focal="17" aperture="1.8" distance="0.25" k1="-0.7183" k2="-0.0334" k3="0.1648"/>
-+            <vignetting model="pa" focal="17" aperture="1.8" distance="1.5" k1="-0.7165" k2="-0.1724" k3="0.2618"/>
-+            <vignetting model="pa" focal="17" aperture="1.8" distance="1000" k1="-0.8358" k2="-0.0614" k3="0.2354"/>
-+            <vignetting model="pa" focal="17" aperture="2" distance="0.25" k1="-0.3115" k2="-0.6889" k3="0.4766"/>
-+            <vignetting model="pa" focal="17" aperture="2" distance="1.5" k1="-0.2970" k2="-0.8478" k3="0.5771"/>
-+            <vignetting model="pa" focal="17" aperture="2" distance="1000" k1="-0.3481" k2="-0.8816" k3="0.6316"/>
-+            <vignetting model="pa" focal="17" aperture="2.2" distance="0.25" k1="-0.1491" k2="-0.7597" k3="0.4550"/>
-+            <vignetting model="pa" focal="17" aperture="2.2" distance="1.5" k1="-0.1159" k2="-0.9493" k3="0.5634"/>
-+            <vignetting model="pa" focal="17" aperture="2.2" distance="1000" k1="-0.2045" k2="-0.9180" k3="0.5843"/>
-+            <vignetting model="pa" focal="17" aperture="2.5" distance="0.25" k1="-0.2264" k2="-0.3664" k3="0.1761"/>
-+            <vignetting model="pa" focal="17" aperture="2.5" distance="1.5" k1="-0.1926" k2="-0.5268" k3="0.2468"/>
-+            <vignetting model="pa" focal="17" aperture="2.5" distance="1000" k1="-0.2800" k2="-0.5238" k3="0.2880"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="0.25" k1="-0.3370" k2="-0.0253" k3="-0.0252"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1.5" k1="-0.3038" k2="-0.1389" k3="-0.0033"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.3778" k2="-0.1474" k3="0.0372"/>
-+            <vignetting model="pa" focal="17" aperture="3.2" distance="0.25" k1="-0.3815" k2="0.0725" k3="-0.0496"/>
-+            <vignetting model="pa" focal="17" aperture="3.2" distance="1.5" k1="-0.3886" k2="0.1099" k3="-0.1365"/>
-+            <vignetting model="pa" focal="17" aperture="3.2" distance="1000" k1="-0.4707" k2="0.1251" k3="-0.1173"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="0.25" k1="-0.3773" k2="0.0195" k3="0.0247"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="1.5" k1="-0.4553" k2="0.2344" k3="-0.1723"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="1000" k1="-0.5163" k2="0.2343" k3="-0.1530"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="0.25" k1="-0.4121" k2="0.0466" k3="0.0323"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1.5" k1="-0.4343" k2="0.1261" k3="-0.0464"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.5086" k2="0.1563" k3="-0.0441"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="0.25" k1="-0.4649" k2="0.1401" k3="-0.0198"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1.5" k1="-0.4624" k2="0.1259" k3="-0.0118"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.5182" k2="0.0931" k3="0.0481"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="0.25" k1="-0.4844" k2="0.1729" k3="-0.0380"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1.5" k1="-0.4832" k2="0.1635" k3="-0.0335"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.5266" k2="0.0977" k3="0.0491"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="0.25" k1="-0.4755" k2="0.1492" k3="-0.0190"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="1.5" k1="-0.4916" k2="0.1791" k3="-0.0422"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-0.5175" k2="0.0858" k3="0.0561"/>
-+            <vignetting model="pa" focal="17" aperture="16" distance="0.25" k1="-0.4908" k2="0.1684" k3="-0.0305"/>
-+            <vignetting model="pa" focal="17" aperture="16" distance="1.5" k1="-0.4955" k2="0.1790" k3="-0.0402"/>
-+            <vignetting model="pa" focal="17" aperture="16" distance="1000" k1="-0.5293" k2="0.0991" k3="0.0478"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="0.25" k1="-0.5019" k2="0.1737" k3="-0.0320"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1.5" k1="-0.5138" k2="0.2068" k3="-0.0567"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.5351" k2="0.0973" k3="0.0501"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 40-150mm f/4.0-5.6 R</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M5 -->
-+            <distortion model="poly3" focal="40" k1="-0.01246"/>
-+            <distortion model="poly3" focal="45" k1="-0.01017"/>
-+            <distortion model="poly3" focal="49" k1="-0.00887"/>
-+            <distortion model="poly3" focal="58" k1="-0.00466"/>
-+            <distortion model="poly3" focal="70" k1="-0.0008"/>
-+            <distortion model="poly3" focal="85" k1="0.00099"/>
-+            <distortion model="poly3" focal="102" k1="0.00206"/>
-+            <distortion model="poly3" focal="114" k1="0.00409"/>
-+            <distortion model="poly3" focal="123" k1="0.00465"/>
-+            <distortion model="poly3" focal="138" k1="0.00293"/>
-+            <distortion model="poly3" focal="150" k1="0.00365"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 9-18mm f/4.0-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M5 -->
-+            <distortion model="ptlens" focal="9" a="-0.00243" b="-0.05248" c="0.0576"/>
-+            <distortion model="ptlens" focal="10" a="-0.01843" b="0.00876" c="0.00143"/>
-+            <distortion model="ptlens" focal="13" a="-0.00767" b="0.0044" c="0.00695"/>
-+            <distortion model="ptlens" focal="14" a="-0.00643" b="0.0062" c="0.0044"/>
-+            <distortion model="ptlens" focal="16" a="-0.0036" b="0.00137" c="0.00803"/>
-+            <distortion model="ptlens" focal="18" a="0.0014" b="-0.00822" c="0.01145"/>
-+            <tca model="poly3" focal="9" br="0.0002967" vr="1.0001617" bb="-0.0001941" vb="1.0002941"/>
-+            <tca model="poly3" focal="10" br="0.0003830" vr="1.0000787" bb="-0.0002023" vb="1.0003066"/>
-+            <tca model="poly3" focal="13" br="0.0004065" vr="0.9999052" bb="-0.0002830" vb="1.0004586"/>
-+            <tca model="poly3" focal="14" br="0.0003393" vr="0.9999490" bb="-0.0002826" vb="1.0004648"/>
-+            <tca model="poly3" focal="16" br="0.0002626" vr="1.0000189" bb="-0.0002668" vb="1.0004628"/>
-+            <tca model="poly3" focal="18" br="0.0002269" vr="1.0000589" bb="-0.0002144" vb="1.0003623"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 12-40mm f/2.8 Pro</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M1 -->
-+            <distortion model="ptlens" focal="12" a="0.03659" b="-0.11322" c="0.0294"/>
-+            <distortion model="ptlens" focal="19" a="0.00375" b="-0.0151" c="-0.01028"/>
-+            <distortion model="ptlens" focal="26" a="0" b="-0.00273" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0" b="0.00212" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.00408" c="0"/>
-+            <tca model="poly3" focal="12" br="-0.0001355" vr="1.0004733" bb="0.0001043" vb="0.9998876"/>
-+            <tca model="poly3" focal="19" br="0.0000135" vr="1.0003633" bb="-0.0000030" vb="0.9998815"/>
-+            <tca model="poly3" focal="26" br="0.0000121" vr="1.0002821" bb="-0.0000102" vb="0.9998613"/>
-+            <tca model="poly3" focal="32" br="-0.0000284" vr="1.0001670" bb="-0.0000205" vb="0.9999078"/>
-+            <tca model="poly3" focal="40" br="0.0000001" vr="0.9999588" bb="-0.0000046" vb="0.9999736"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="0.0756" k2="-1.5826" k3="0.7487"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="0.0756" k2="-1.5826" k3="0.7487"/>
-+            <vignetting model="pa" focal="12" aperture="3.2" distance="10" k1="0.0630" k2="-1.2737" k3="0.4842"/>
-+            <vignetting model="pa" focal="12" aperture="3.2" distance="1000" k1="0.0630" k2="-1.2737" k3="0.4842"/>
-+            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.0572" k2="-0.7780" k3="0.1454"/>
-+            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.0572" k2="-0.7780" k3="0.1454"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.1791" k2="-0.3857" k3="-0.0892"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.1791" k2="-0.3857" k3="-0.0892"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.2169" k2="-0.4882" k3="0.1850"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.2169" k2="-0.4882" k3="0.1850"/>
-+            <vignetting model="pa" focal="19" aperture="2.8" distance="10" k1="-0.6166" k2="-0.0955" k3="0.1820"/>
-+            <vignetting model="pa" focal="19" aperture="2.8" distance="1000" k1="-0.6166" k2="-0.0955" k3="0.1820"/>
-+            <vignetting model="pa" focal="19" aperture="3.2" distance="10" k1="-0.4959" k2="-0.1667" k3="0.1503"/>
-+            <vignetting model="pa" focal="19" aperture="3.2" distance="1000" k1="-0.4959" k2="-0.1667" k3="0.1503"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="10" k1="-0.4709" k2="0.0159" k3="-0.0366"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="1000" k1="-0.4709" k2="0.0159" k3="-0.0366"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="10" k1="-0.5480" k2="0.4012" k3="-0.3216"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-0.5480" k2="0.4012" k3="-0.3216"/>
-+            <vignetting model="pa" focal="19" aperture="22" distance="10" k1="-0.5561" k2="0.4662" k3="-0.2449"/>
-+            <vignetting model="pa" focal="19" aperture="22" distance="1000" k1="-0.5561" k2="0.4662" k3="-0.2449"/>
-+            <vignetting model="pa" focal="26" aperture="2.8" distance="10" k1="-0.3984" k2="-0.4154" k3="0.3537"/>
-+            <vignetting model="pa" focal="26" aperture="2.8" distance="1000" k1="-0.3984" k2="-0.4154" k3="0.3537"/>
-+            <vignetting model="pa" focal="26" aperture="3.2" distance="10" k1="-0.2499" k2="-0.5815" k3="0.3887"/>
-+            <vignetting model="pa" focal="26" aperture="3.2" distance="1000" k1="-0.2499" k2="-0.5815" k3="0.3887"/>
-+            <vignetting model="pa" focal="26" aperture="3.5" distance="10" k1="-0.2141" k2="-0.4357" k3="0.2290"/>
-+            <vignetting model="pa" focal="26" aperture="3.5" distance="1000" k1="-0.2141" k2="-0.4357" k3="0.2290"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="10" k1="-0.3470" k2="0.1084" k3="-0.1510"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.3470" k2="0.1084" k3="-0.1510"/>
-+            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.5201" k2="0.5512" k3="-0.2766"/>
-+            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.5201" k2="0.5512" k3="-0.2766"/>
-+            <vignetting model="pa" focal="32" aperture="2.8" distance="10" k1="-0.4245" k2="-0.3942" k3="0.3744"/>
-+            <vignetting model="pa" focal="32" aperture="2.8" distance="1000" k1="-0.4245" k2="-0.3942" k3="0.3744"/>
-+            <vignetting model="pa" focal="32" aperture="3.2" distance="10" k1="-0.2355" k2="-0.6582" k3="0.4701"/>
-+            <vignetting model="pa" focal="32" aperture="3.2" distance="1000" k1="-0.2355" k2="-0.6582" k3="0.4701"/>
-+            <vignetting model="pa" focal="32" aperture="3.5" distance="10" k1="-0.1421" k2="-0.6307" k3="0.3748"/>
-+            <vignetting model="pa" focal="32" aperture="3.5" distance="1000" k1="-0.1421" k2="-0.6307" k3="0.3748"/>
-+            <vignetting model="pa" focal="32" aperture="4" distance="10" k1="-0.1766" k2="-0.3048" k3="0.1076"/>
-+            <vignetting model="pa" focal="32" aperture="4" distance="1000" k1="-0.1766" k2="-0.3048" k3="0.1076"/>
-+            <vignetting model="pa" focal="32" aperture="22" distance="10" k1="-0.2762" k2="0.1093" k3="-0.0325"/>
-+            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.2762" k2="0.1093" k3="-0.0325"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="10" k1="-0.3272" k2="-0.3863" k3="0.2617"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.3272" k2="-0.3863" k3="0.2617"/>
-+            <vignetting model="pa" focal="40" aperture="3.2" distance="10" k1="-0.0400" k2="-0.9194" k3="0.5609"/>
-+            <vignetting model="pa" focal="40" aperture="3.2" distance="1000" k1="-0.0400" k2="-0.9194" k3="0.5609"/>
-+            <vignetting model="pa" focal="40" aperture="3.5" distance="10" k1="0.0866" k2="-0.9782" k3="0.5301"/>
-+            <vignetting model="pa" focal="40" aperture="3.5" distance="1000" k1="0.0866" k2="-0.9782" k3="0.5301"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="10" k1="0.0641" k2="-0.6800" k3="0.2830"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="0.0641" k2="-0.6800" k3="0.2830"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="10" k1="-0.1294" k2="-0.0992" k3="0.0737"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1294" k2="-0.0992" k3="0.0737"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital 25mm f/1.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with E-M10 -->
-+            <distortion model="ptlens" focal="25" a="0.00454" b="-0.0141" c="0.00283"/>
-+            <tca model="poly3" focal="25" vr="1.0003" vb="1.0001"/>
-+            <!-- Taken with Olympus E-PL6 -->
-+            <vignetting model="pa" focal="25" aperture="1.8" distance="0.25" k1="-0.6903" k2="0.5378" k3="-0.2296"/>
-+            <vignetting model="pa" focal="25" aperture="1.8" distance="3.675" k1="-0.9318" k2="0.5595" k3="-0.1813"/>
-+            <vignetting model="pa" focal="25" aperture="1.8" distance="1000" k1="-0.9277" k2="0.5280" k3="-0.1581"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="0.25" k1="-0.2611" k2="-0.2502" k3="0.1928"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="3.675" k1="-0.4885" k2="-0.3012" k3="0.2847"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="1000" k1="-0.4815" k2="-0.3312" k3="0.3023"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="0.25" k1="-0.1095" k2="-0.2784" k3="0.1222"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="3.675" k1="-0.1527" k2="-0.8429" k3="0.5227"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="1000" k1="-0.1505" k2="-0.8676" k3="0.5399"/>
-+            <vignetting model="pa" focal="25" aperture="2.5" distance="0.25" k1="-0.2047" k2="0.0987" k3="-0.1083"/>
-+            <vignetting model="pa" focal="25" aperture="2.5" distance="3.675" k1="-0.0485" k2="-0.7477" k3="0.3542"/>
-+            <vignetting model="pa" focal="25" aperture="2.5" distance="1000" k1="-0.0403" k2="-0.7939" k3="0.3860"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="0.25" k1="-0.1892" k2="0.0178" k3="-0.0135"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="3.675" k1="-0.1069" k2="-0.3737" k3="0.0628"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.0911" k2="-0.4310" k3="0.0954"/>
-+            <vignetting model="pa" focal="25" aperture="3.2" distance="0.25" k1="-0.1837" k2="-0.0097" k3="0.0155"/>
-+            <vignetting model="pa" focal="25" aperture="3.2" distance="3.675" k1="-0.2257" k2="0.0951" k3="-0.2530"/>
-+            <vignetting model="pa" focal="25" aperture="3.2" distance="1000" k1="-0.2103" k2="0.0478" k3="-0.2314"/>
-+            <vignetting model="pa" focal="25" aperture="3.5" distance="0.25" k1="-0.1864" k2="-0.0014" k3="0.0095"/>
-+            <vignetting model="pa" focal="25" aperture="3.5" distance="3.675" k1="-0.2867" k2="0.2934" k3="-0.3649"/>
-+            <vignetting model="pa" focal="25" aperture="3.5" distance="1000" k1="-0.2704" k2="0.2533" k3="-0.3480"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="0.25" k1="-0.1883" k2="0.0064" k3="0.0040"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="3.675" k1="-0.3230" k2="0.3698" k3="-0.3610"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.3178" k2="0.3722" k3="-0.3780"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="0.25" k1="-0.1903" k2="0.0091" k3="0.0031"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="3.675" k1="-0.3143" k2="0.2979" k3="-0.2642"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="1000" k1="-0.3147" k2="0.3219" k3="-0.2971"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="0.25" k1="-0.1999" k2="0.0316" k3="-0.0100"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="3.675" k1="-0.2860" k2="0.1647" k3="-0.1305"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="1000" k1="-0.2837" k2="0.1839" k3="-0.1577"/>
-+            <vignetting model="pa" focal="25" aperture="7.1" distance="0.25" k1="-0.2146" k2="0.0616" k3="-0.0284"/>
-+            <vignetting model="pa" focal="25" aperture="7.1" distance="3.675" k1="-0.2628" k2="0.0491" k3="-0.0215"/>
-+            <vignetting model="pa" focal="25" aperture="7.1" distance="1000" k1="-0.2608" k2="0.0681" k3="-0.0419"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.25" k1="-0.2739" k2="0.1756" k3="-0.0983"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="3.675" k1="-0.2533" k2="0.0122" k3="-0.0029"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.3094" k2="0.1649" k3="-0.1039"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 75mm f/1.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M1 -->
-+            <distortion model="poly3" focal="75" k1="-0.00025"/>
-+            <tca model="poly3" focal="75" vr="0.9999905" vb="0.9999613"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 75-300mm f/4.8-6.7 II</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with E-M1 -->
-+            <distortion model="poly3" focal="75" k1="0.0019"/>
-+            <distortion model="poly3" focal="132" k1="0.00532"/>
-+            <distortion model="poly3" focal="187" k1="0.00479"/>
-+            <distortion model="poly3" focal="246" k1="0.00441"/>
-+            <distortion model="poly3" focal="300" k1="0.00583"/>
-+            <tca model="poly3" focal="75" br="-0.0000135" vr="1.0001628" bb="0.0000087" vb="0.9999804"/>
-+            <tca model="poly3" focal="132" br="0.0000033" vr="1.0001604" bb="-0.0000519" vb="0.9997709"/>
-+            <tca model="poly3" focal="187" br="-0.0000091" vr="1.0000425" bb="-0.0000314" vb="0.9997551"/>
-+            <tca model="poly3" focal="246" br="-0.0000100" vr="0.9998524" bb="-0.0000022" vb="0.9997614"/>
-+            <tca model="poly3" focal="300" br="-0.0000574" vr="0.9996155" bb="0.0000031" vb="0.9999526"/>
-+            <vignetting model="pa" focal="75" aperture="4.8" distance="10" k1="-0.7567" k2="0.6812" k3="-0.3645"/>
-+            <vignetting model="pa" focal="75" aperture="4.8" distance="1000" k1="-0.7567" k2="0.6812" k3="-0.3645"/>
-+            <vignetting model="pa" focal="75" aperture="5" distance="10" k1="-0.6463" k2="0.4587" k3="-0.2401"/>
-+            <vignetting model="pa" focal="75" aperture="5" distance="1000" k1="-0.6463" k2="0.4587" k3="-0.2401"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="10" k1="-0.0894" k2="-0.2584" k3="0.0427"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.0894" k2="-0.2584" k3="0.0427"/>
-+            <vignetting model="pa" focal="75" aperture="6.3" distance="10" k1="-0.1969" k2="0.1766" k3="-0.2104"/>
-+            <vignetting model="pa" focal="75" aperture="6.3" distance="1000" k1="-0.1969" k2="0.1766" k3="-0.2104"/>
-+            <vignetting model="pa" focal="75" aperture="7.1" distance="10" k1="-0.2354" k2="0.2760" k3="-0.2270"/>
-+            <vignetting model="pa" focal="75" aperture="7.1" distance="1000" k1="-0.2354" k2="0.2760" k3="-0.2270"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="10" k1="-0.2154" k2="0.1692" k3="-0.1043"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.2154" k2="0.1692" k3="-0.1043"/>
-+            <vignetting model="pa" focal="75" aperture="10" distance="10" k1="-0.2021" k2="0.1173" k3="-0.0579"/>
-+            <vignetting model="pa" focal="75" aperture="10" distance="1000" k1="-0.2021" k2="0.1173" k3="-0.0579"/>
-+            <vignetting model="pa" focal="132" aperture="5.5" distance="10" k1="-0.2238" k2="-0.4064" k3="0.2454"/>
-+            <vignetting model="pa" focal="132" aperture="5.5" distance="1000" k1="-0.2238" k2="-0.4064" k3="0.2454"/>
-+            <vignetting model="pa" focal="132" aperture="6.3" distance="10" k1="-0.1187" k2="-0.0124" k3="-0.1248"/>
-+            <vignetting model="pa" focal="132" aperture="6.3" distance="1000" k1="-0.1187" k2="-0.0124" k3="-0.1248"/>
-+            <vignetting model="pa" focal="132" aperture="7.1" distance="10" k1="-0.2171" k2="0.2914" k3="-0.2439"/>
-+            <vignetting model="pa" focal="132" aperture="7.1" distance="1000" k1="-0.2171" k2="0.2914" k3="-0.2439"/>
-+            <vignetting model="pa" focal="132" aperture="8" distance="10" k1="-0.1895" k2="0.1631" k3="-0.1007"/>
-+            <vignetting model="pa" focal="132" aperture="8" distance="1000" k1="-0.1895" k2="0.1631" k3="-0.1007"/>
-+            <vignetting model="pa" focal="132" aperture="22" distance="10" k1="-0.1624" k2="0.0925" k3="-0.0476"/>
-+            <vignetting model="pa" focal="132" aperture="22" distance="1000" k1="-0.1624" k2="0.0925" k3="-0.0476"/>
-+            <vignetting model="pa" focal="187" aperture="6" distance="10" k1="-0.3778" k2="-0.1256" k3="0.1317"/>
-+            <vignetting model="pa" focal="187" aperture="6" distance="1000" k1="-0.3778" k2="-0.1256" k3="0.1317"/>
-+            <vignetting model="pa" focal="187" aperture="6.3" distance="10" k1="-0.1482" k2="-0.4028" k3="0.2355"/>
-+            <vignetting model="pa" focal="187" aperture="6.3" distance="1000" k1="-0.1482" k2="-0.4028" k3="0.2355"/>
-+            <vignetting model="pa" focal="187" aperture="7.1" distance="10" k1="-0.1072" k2="-0.0090" k3="-0.0941"/>
-+            <vignetting model="pa" focal="187" aperture="7.1" distance="1000" k1="-0.1072" k2="-0.0090" k3="-0.0941"/>
-+            <vignetting model="pa" focal="187" aperture="8" distance="10" k1="-0.1842" k2="0.2172" k3="-0.1532"/>
-+            <vignetting model="pa" focal="187" aperture="8" distance="1000" k1="-0.1842" k2="0.2172" k3="-0.1532"/>
-+            <vignetting model="pa" focal="187" aperture="22" distance="10" k1="-0.1604" k2="0.1289" k3="-0.0742"/>
-+            <vignetting model="pa" focal="187" aperture="22" distance="1000" k1="-0.1604" k2="0.1289" k3="-0.0742"/>
-+            <vignetting model="pa" focal="246" aperture="6.4" distance="10" k1="-0.5009" k2="0.0466" k3="0.0450"/>
-+            <vignetting model="pa" focal="246" aperture="6.4" distance="1000" k1="-0.5009" k2="0.0466" k3="0.0450"/>
-+            <vignetting model="pa" focal="246" aperture="7.1" distance="10" k1="-0.0387" k2="-0.5354" k3="0.2745"/>
-+            <vignetting model="pa" focal="246" aperture="7.1" distance="1000" k1="-0.0387" k2="-0.5354" k3="0.2745"/>
-+            <vignetting model="pa" focal="246" aperture="8" distance="10" k1="-0.1022" k2="-0.0050" k3="-0.0948"/>
-+            <vignetting model="pa" focal="246" aperture="8" distance="1000" k1="-0.1022" k2="-0.0050" k3="-0.0948"/>
-+            <vignetting model="pa" focal="246" aperture="22" distance="10" k1="-0.1661" k2="0.1685" k3="-0.0980"/>
-+            <vignetting model="pa" focal="246" aperture="22" distance="1000" k1="-0.1661" k2="0.1685" k3="-0.0980"/>
-+            <vignetting model="pa" focal="300" aperture="6.7" distance="10" k1="-0.8425" k2="0.6532" k3="-0.2714"/>
-+            <vignetting model="pa" focal="300" aperture="6.7" distance="1000" k1="-0.8425" k2="0.6532" k3="-0.2714"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.7434" k2="0.5229" k3="-0.2177"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.7434" k2="0.5229" k3="-0.2177"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.3042" k2="-0.0906" k3="0.0722"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.3042" k2="-0.0906" k3="0.0722"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0639" k2="-0.3802" k3="0.2152"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0639" k2="-0.3802" k3="0.2152"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="10" k1="-0.1583" k2="0.1636" k3="-0.0935"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.1583" k2="0.1636" k3="-0.0935"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 EZ</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with E-M10 -->
-+            <distortion model="ptlens" focal="14" a="0.01468" b="-0.06545" c="-0.00437"/>
-+            <distortion model="ptlens" focal="18" a="0.00892" b="-0.04043" c="0.005"/>
-+            <distortion model="ptlens" focal="22" a="0.00578" b="-0.01597" c="-0.00043"/>
-+            <distortion model="ptlens" focal="30" a="0.00209" b="0.01156" c="-0.02364"/>
-+            <distortion model="ptlens" focal="42" a="0.01839" b="-0.05556" c="0.07121"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 60mm f/2.8 Macro</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with E-M10 -->
-+            <distortion model="poly3" focal="60" k1="0.00078"/>
-+            <tca model="poly3" focal="60" br="-0.0000632" vr="1.0002668" bb="0.0000602" vb="0.9998450"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 7-14mm f/2.8 Pro</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M1 -->
-+            <distortion model="ptlens" focal="7" a="0.04439" b="-0.17864" c="0.13663"/>
-+            <distortion model="ptlens" focal="8" a="0.03553" b="-0.15302" c="0.13031"/>
-+            <distortion model="ptlens" focal="9" a="0.0244" b="-0.11622" c="0.10732"/>
-+            <distortion model="ptlens" focal="10" a="0.00877" b="-0.06446" c="0.0724"/>
-+            <distortion model="ptlens" focal="12" a="-0.0012" b="-0.02183" c="0.03886"/>
-+            <distortion model="ptlens" focal="14" a="-0.00708" b="0.00634" c="0.01377"/>
-+            <tca model="poly3" focal="7" vr="1.0002513" vb="1.0000643"/>
-+            <tca model="poly3" focal="8" vr="1.0002812" vb="1.0000534"/>
-+            <tca model="poly3" focal="9" vr="1.0003194" vb="1.0000333"/>
-+            <tca model="poly3" focal="10" vr="1.0003171" vb="1.0000324"/>
-+            <tca model="poly3" focal="11" vr="1.0003051" vb="1.0000588"/>
-+            <tca model="poly3" focal="12" vr="1.0002551" vb="1.0000838"/>
-+            <tca model="poly3" focal="13" vr="1.0001951" vb="1.0001380"/>
-+            <tca model="poly3" focal="14" vr="1.0001628" vb="1.0001960"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro</model>
-         <mount>Micro 4/3 System</mount>
-         <cropfactor>2.0</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="45" a="0.00149954" b="-0.0023693" c="0.00382496" />
--            <tca model="poly3" focal="45" br="-0.0000129" vr="1.0001904" bb="0.0000108" vb="0.9999203" />
--            <tca model="poly3" focal="45" br="-0.0000440" vr="1.0002771" bb="0.0000282" vb="0.9998497" />
--            <tca model="poly3" focal="45" br="-0.0000484" vr="1.0001937" bb="0.0000056" vb="0.9999340" />
--            <vignetting model="pa" focal="45" aperture="1.8" distance="0.5" k1="-0.1316" k2="-0.3770" k3="0.2472" />
--            <vignetting model="pa" focal="45" aperture="1.8" distance="1" k1="-0.2255" k2="-0.1345" k3="0.0659" />
--            <vignetting model="pa" focal="45" aperture="1.8" distance="3" k1="-0.2785" k2="-0.0510" k3="0.0102" />
--            <vignetting model="pa" focal="45" aperture="1.8" distance="1000" k1="-0.3385" k2="0.0596" k3="-0.0582" />
--            <vignetting model="pa" focal="45" aperture="2" distance="0.5" k1="-0.1464" k2="-0.0489" k3="0.0091" />
--            <vignetting model="pa" focal="45" aperture="2" distance="1" k1="-0.1200" k2="0.0168" k3="-0.1094" />
--            <vignetting model="pa" focal="45" aperture="2" distance="3" k1="-0.0571" k2="-0.1512" k3="-0.0265" />
--            <vignetting model="pa" focal="45" aperture="2" distance="1000" k1="-0.0080" k2="-0.3083" k3="0.0663" />
--            <vignetting model="pa" focal="45" aperture="2.8" distance="0.5" k1="-0.1506" k2="-0.0366" k3="0.0414" />
--            <vignetting model="pa" focal="45" aperture="2.8" distance="1" k1="-0.1214" k2="-0.0310" k3="0.0366" />
--            <vignetting model="pa" focal="45" aperture="2.8" distance="3" k1="-0.1069" k2="-0.0244" k3="0.0285" />
--            <vignetting model="pa" focal="45" aperture="2.8" distance="1000" k1="-0.1093" k2="0.0134" k3="-0.0044" />
--            <vignetting model="pa" focal="45" aperture="4" distance="0.5" k1="-0.1576" k2="-0.0189" k3="0.0303" />
--            <vignetting model="pa" focal="45" aperture="4" distance="1" k1="-0.1232" k2="-0.0232" k3="0.0293" />
--            <vignetting model="pa" focal="45" aperture="4" distance="3" k1="-0.1091" k2="-0.0196" k3="0.0259" />
--            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.1000" k2="-0.0296" k3="0.0347" />
--            <vignetting model="pa" focal="45" aperture="22" distance="0.5" k1="-0.1730" k2="0.0117" k3="0.0109" />
--            <vignetting model="pa" focal="45" aperture="22" distance="1" k1="-0.1578" k2="0.0464" k3="-0.0149" />
--            <vignetting model="pa" focal="45" aperture="22" distance="3" k1="-0.1341" k2="0.0328" k3="-0.0102" />
--            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1288" k2="0.0174" k3="0.0038" />
-+            <!-- Taken with OMD E-M10 Mk II -->
-+            <distortion model="ptlens" focal="40" a="-0.000686648" b="-0.00940753" c="-0.00546391"/>
-+            <distortion model="ptlens" focal="70" a="-0.00205376" b="0.00258215" c="-0.000489355"/>
-+            <distortion model="ptlens" focal="150" a="0.00420926" b="-0.00754286" c="0.0130875"/>
-+            <tca model="poly3" focal="40" br="-0.0000104" vr="1.0003979" bb="0.0000706" vb="0.9999588"/>
-+            <tca model="poly3" focal="70" br="0.0000367" vr="1.0000212" bb="-0.0000337" vb="1.0000500"/>
-+            <tca model="poly3" focal="150" br="-0.0000304" vr="0.9998731" bb="-0.0000193" vb="1.0000447"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>OLYMPUS M.17mm F1.8</model>
-+        <model>Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro + 1.4x converter</model>
-+        <model lang="en">Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro + 1.4× conv.</model>
-+        <model lang="de">Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro + 1.4×-Konv.</model>
-         <mount>Micro 4/3 System</mount>
-         <cropfactor>2.0</cropfactor>
-         <calibration>
--            <!-- Taken with Olympus E-M5 -->
--            <distortion model="ptlens" focal="17" a="0.01989" b="-0.09761" c="0.07461" />
--            <tca model="poly3" focal="17" br="-0.0000767" vr="1.0002674" bb="0.0001410" vb="0.9997845" />
-+            <!-- Taken with OMD E-M10 Mk II -->
-+            <distortion model="ptlens" focal="56" a="-0.00554012" b="0.00335391" c="-0.00497355"/>
-+            <distortion model="ptlens" focal="120" a="-0.00860568" b="0.0192665" c="-0.0136313"/>
-+            <distortion model="ptlens" focal="210" a="-0.0109997" b="0.0283301" c="-0.0224234"/>
-+            <tca model="poly3" focal="56" br="0.0000289" vr="0.9999754" bb="-0.0000163" vb="1.0000247"/>
-+            <tca model="poly3" focal="120" br="-0.0000026" vr="0.9998838" bb="-0.0000125" vb="1.0000670"/>
-+            <tca model="poly3" focal="210" br="-0.0002411" vr="0.9999655" bb="0.0000035" vb="1.0000091"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus 9mm Body Cap Lens Fisheye</model>
-+        <mount>Micro 4/3 System</mount>
-+        <type>stereographic</type>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M10 -->
-+            <distortion model="poly3" focal="9" k1="-0.03111"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus M.Zuiko Digital ED 8mm f/1.8 Fisheye Pro</model>
-+        <mount>Micro 4/3 System</mount>
-+        <type>equisolid</type>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M5 II -->
-+            <distortion model="poly3" focal="8" k1="-0.00531"/>
-+            <tca model="poly3" focal="8" br="-0.0000479" vr="1.0005124" bb="0.0000296" vb="1.0000150"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-panasonic.xml b/data/db/mil-panasonic.xml
---- a/data/db/mil-panasonic.xml	2013-10-12 22:23:28.000000000 +0200
-+++ b/data/db/mil-panasonic.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,796 +1,1470 @@
- <lensdatabase>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-G1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GF1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GH1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-GM1</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GX1</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-G2</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GF2</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GH2</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-G3</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GF3</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GH3</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-GH4</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-G5</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GF5</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-G6</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GF6</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
--        <model>DMC-G10</model>
-+        <model>DMC-GF7</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-GX7</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-G10</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-GM5</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Panasonic</maker>
-+        <model>DMC-GX8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G 14mm F2.5</model>
--	    <focal value="14" />
--	    <aperture min="2.5" max="22" />
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="14" model="ptlens" a="0.0115556" b="-0.0589829" c="0.000154452" />
--	        <tca focal="14" model="poly3" br="-0.0002929" vr="1.0006360" bb="-0.0000512" vb="1.0002741" />
--	        <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.2596" k2="1.0551" k3="-0.4356" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.5289" k2="1.4047" k3="-0.5919" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.6489" k2="1.5835" k3="-0.6797" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.8292" k2="1.8493" k3="-0.8101" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.7929" k2="0.0786" k3="0.1210" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.0357" k2="0.3193" k3="0.0410" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.1998" k2="0.5758" k3="-0.0875" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4134" k2="0.8928" k3="-0.2433" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6406" k2="0.2635" k3="-0.1317" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.5714" k2="-0.2234" k3="0.1716" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.5583" k2="-0.4441" k3="0.3348" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6066" k2="-0.6339" k3="0.5028" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6487" k2="0.2044" k3="-0.0130" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.7505" k2="0.4707" k3="-0.2878" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.7382" k2="0.4256" k3="-0.3142" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6656" k2="0.0385" k3="-0.1041" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.6876" k2="0.2499" k3="-0.0285" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.6954" k2="0.1546" k3="0.0468" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.7122" k2="0.1687" k3="0.0443" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.8248" k2="0.4676" k3="-0.1965" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 14mm f/2.5 Asph.</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal value="14"/>
-+        <aperture min="2.5" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.0115556" b="-0.0589829" c="0.000154452"/>
-+            <tca focal="14" model="poly3" br="-0.0002929" vr="1.0006360" bb="-0.0000512" vb="1.0002741"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.2596" k2="1.0551" k3="-0.4356"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.5289" k2="1.4047" k3="-0.5919"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.6489" k2="1.5835" k3="-0.6797"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.8292" k2="1.8493" k3="-0.8101"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.7929" k2="0.0786" k3="0.1210"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.0357" k2="0.3193" k3="0.0410"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.1998" k2="0.5758" k3="-0.0875"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4134" k2="0.8928" k3="-0.2433"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6406" k2="0.2635" k3="-0.1317"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.5714" k2="-0.2234" k3="0.1716"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.5583" k2="-0.4441" k3="0.3348"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6066" k2="-0.6339" k3="0.5028"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6487" k2="0.2044" k3="-0.0130"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.7505" k2="0.4707" k3="-0.2878"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.7382" k2="0.4256" k3="-0.3142"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6656" k2="0.0385" k3="-0.1041"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.6876" k2="0.2499" k3="-0.0285"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.6954" k2="0.1546" k3="0.0468"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.7122" k2="0.1687" k3="0.0443"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.8248" k2="0.4676" k3="-0.1965"/>
-+        </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G 14/F2.5 + GWC1 0.79x</model>
--	    <focal value="14" />
--	    <aperture min="2.5" max="22"/>
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="14" model="ptlens" a="0.000389003" b="-0.0125969" c="-0.00230827" />
--            <tca model="poly3" focal="14" br="-0.0000039" vr="1.0007997" bb="0.0000698" vb="0.9998824" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.3601" k2="1.1562" k3="-0.4828" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.7251" k2="1.7094" k3="-0.7511" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.7963" k2="1.8325" k3="-0.8182" />
--            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.9392" k2="2.0189" k3="-0.9016" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.8537" k2="0.0851" k3="0.1294" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.2352" k2="0.6078" k3="-0.1020" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.2889" k2="0.6800" k3="-0.1365" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4614" k2="0.9088" k3="-0.2399" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6732" k2="0.1870" k3="-0.0890" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.6633" k2="-0.2575" k3="0.2275" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.6677" k2="-0.3342" k3="0.2860" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6885" k2="-0.5752" k3="0.4881" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6951" k2="0.1912" k3="-0.0103" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.8328" k2="0.5479" k3="-0.3711" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.8164" k2="0.4837" k3="-0.3577" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6978" k2="-0.0029" k3="-0.0786" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.7218" k2="0.2143" k3="-0.0127" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.8000" k2="0.2761" k3="-0.0171" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.8137" k2="0.3066" k3="-0.0363" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.9701" k2="0.8715" k3="-0.5484" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 14mm f/2.5 Asph. + GWC1 0.79x</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal value="14"/>
-+        <aperture min="2.5" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.000389003" b="-0.0125969" c="-0.00230827"/>
-+            <tca model="poly3" focal="14" br="-0.0000039" vr="1.0007997" bb="0.0000698" vb="0.9998824"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="0.18" k1="-1.3601" k2="1.1562" k3="-0.4828"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="0.36" k1="-1.7251" k2="1.7094" k3="-0.7511"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="1.08" k1="-1.7963" k2="1.8325" k3="-0.8182"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.9392" k2="2.0189" k3="-0.9016"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="0.18" k1="-0.8537" k2="0.0851" k3="0.1294"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="0.36" k1="-1.2352" k2="0.6078" k3="-0.1020"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1.08" k1="-1.2889" k2="0.6800" k3="-0.1365"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4614" k2="0.9088" k3="-0.2399"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.18" k1="-0.6732" k2="0.1870" k3="-0.0890"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.36" k1="-0.6633" k2="-0.2575" k3="0.2275"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1.08" k1="-0.6677" k2="-0.3342" k3="0.2860"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6885" k2="-0.5752" k3="0.4881"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.18" k1="-0.6951" k2="0.1912" k3="-0.0103"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.36" k1="-0.8328" k2="0.5479" k3="-0.3711"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.08" k1="-0.8164" k2="0.4837" k3="-0.3577"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.6978" k2="-0.0029" k3="-0.0786"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.18" k1="-0.7218" k2="0.2143" k3="-0.0127"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.36" k1="-0.8000" k2="0.2761" k3="-0.0171"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.08" k1="-0.8137" k2="0.3066" k3="-0.0363"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.9701" k2="0.8715" k3="-0.5484"/>
-+        </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G 20/F1.7</model>
--	    <focal value="20" />
--	    <aperture min="1.7" max="16" />
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="20" model="ptlens" a="0.00670602" b="-0.0381172" c="0.0065352" />
--	        <tca focal="20" model="poly3" br="-0.0001326" vr="1.0003463" bb="0.00002051" vb="1.0001875" />
--	        <vignetting model="pa" focal="20" aperture="1.7" distance="0.2" k1="-1.0774" k2="0.7422" k3="-0.2967" />
--            <vignetting model="pa" focal="20" aperture="1.7" distance="0.4" k1="-1.1535" k2="0.7938" k3="-0.3151" />
--            <vignetting model="pa" focal="20" aperture="1.7" distance="1.2" k1="-1.1913" k2="0.8154" k3="-0.3195" />
--            <vignetting model="pa" focal="20" aperture="1.7" distance="1000" k1="-1.2097" k2="0.8192" k3="-0.3192" />
--            <vignetting model="pa" focal="20" aperture="2" distance="0.2" k1="-0.5597" k2="-0.1857" k3="0.1982" />
--            <vignetting model="pa" focal="20" aperture="2" distance="0.4" k1="-0.5705" k2="-0.2413" k3="0.2191" />
--            <vignetting model="pa" focal="20" aperture="2" distance="1.2" k1="-0.5678" k2="-0.3012" k3="0.2550" />
--            <vignetting model="pa" focal="20" aperture="2" distance="1000" k1="-0.5576" k2="-0.3515" k3="0.2781" />
--            <vignetting model="pa" focal="20" aperture="2.8" distance="0.2" k1="-0.2511" k2="-0.2148" k3="0.0074" />
--            <vignetting model="pa" focal="20" aperture="2.8" distance="0.4" k1="-0.2742" k2="-0.2219" k3="0.0005" />
--            <vignetting model="pa" focal="20" aperture="2.8" distance="1.2" k1="-0.2774" k2="-0.2958" k3="0.0512" />
--            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.2980" k2="-0.2266" k3="-0.0062" />
--            <vignetting model="pa" focal="20" aperture="4" distance="0.2" k1="-0.3919" k2="0.2105" k3="-0.1757" />
--            <vignetting model="pa" focal="20" aperture="4" distance="0.4" k1="-0.4385" k2="0.2670" k3="-0.2289" />
--            <vignetting model="pa" focal="20" aperture="4" distance="1.2" k1="-0.4717" k2="0.3088" k3="-0.2589" />
--            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4793" k2="0.3279" k3="-0.2908" />
--            <vignetting model="pa" focal="20" aperture="16" distance="0.2" k1="-0.3500" k2="-0.0395" k3="0.0612" />
--            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.3846" k2="-0.0492" k3="0.0749" />
--            <vignetting model="pa" focal="20" aperture="16" distance="1.2" k1="-0.4185" k2="-0.0195" k3="0.0613" />
--            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4210" k2="-0.0358" k3="0.0746" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 20mm f/1.7 Asph.</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal value="20"/>
-+        <aperture min="1.7" max="16"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="20" model="ptlens" a="0.00670602" b="-0.0381172" c="0.0065352"/>
-+            <tca focal="20" model="poly3" br="-0.0001326" vr="1.0003463" bb="0.00002051" vb="1.0001875"/>
-+            <vignetting model="pa" focal="20" aperture="1.7" distance="0.2" k1="-1.0774" k2="0.7422" k3="-0.2967"/>
-+            <vignetting model="pa" focal="20" aperture="1.7" distance="0.4" k1="-1.1535" k2="0.7938" k3="-0.3151"/>
-+            <vignetting model="pa" focal="20" aperture="1.7" distance="1.2" k1="-1.1913" k2="0.8154" k3="-0.3195"/>
-+            <vignetting model="pa" focal="20" aperture="1.7" distance="1000" k1="-1.2097" k2="0.8192" k3="-0.3192"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="0.2" k1="-0.5597" k2="-0.1857" k3="0.1982"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="0.4" k1="-0.5705" k2="-0.2413" k3="0.2191"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="1.2" k1="-0.5678" k2="-0.3012" k3="0.2550"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="1000" k1="-0.5576" k2="-0.3515" k3="0.2781"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.2" k1="-0.2511" k2="-0.2148" k3="0.0074"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.4" k1="-0.2742" k2="-0.2219" k3="0.0005"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1.2" k1="-0.2774" k2="-0.2958" k3="0.0512"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.2980" k2="-0.2266" k3="-0.0062"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.2" k1="-0.3919" k2="0.2105" k3="-0.1757"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.4" k1="-0.4385" k2="0.2670" k3="-0.2289"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1.2" k1="-0.4717" k2="0.3088" k3="-0.2589"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4793" k2="0.3279" k3="-0.2908"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.2" k1="-0.3500" k2="-0.0395" k3="0.0612"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.3846" k2="-0.0492" k3="0.0749"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1.2" k1="-0.4185" k2="-0.0195" k3="0.0613"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4210" k2="-0.0358" k3="0.0746"/>
-+        </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G VARIO PZ 14-42/F3.5-5.6</model>
--	    <focal min="14" max="42" />
--	    <aperture min="3.5" max="22" />
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="14" model="ptlens" a="0.0143556" b="-0.0749276" c="0.00791831" />
--	        <distortion focal="18" model="ptlens" a="0.0178423" b="-0.0489859" c="-0.00250207" />
--	        <distortion focal="25" model="ptlens" a="0.0304634" b="-0.0790615" c="0.0446911" />
--	        <distortion focal="35" model="ptlens" a="0.0197351" b="-0.0412857" c="0.0264783" />
--	        <distortion focal="42" model="ptlens" a="0.00785081" b="-0.002968" c="-0.00395351" />
--            <tca model="poly3" focal="14" br="0.0000399" vr="0.9999729" bb="-0.0002503" vb="1.0005586" />
--            <tca model="poly3" focal="18" br="-0.0000110" vr="1.0000205" bb="-0.0002269" vb="1.0005124" />
--            <tca model="poly3" focal="25" br="-0.0000027" vr="1.0000210" bb="-0.0001025" vb="1.0003060" />
--            <tca model="poly3" focal="35" br="0.0000478" vr="0.9999745" bb="-0.0000213" vb="1.0001376" />
--            <tca model="poly3" focal="42" br="0.0000292" vr="1.0000187" bb="-0.0000197" vb="1.0000910" />
--	        <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2279" k2="-1.0763" k3="0.5610" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.0951" k2="-1.4326" k3="0.7789" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1003" k2="-1.4651" k3="0.8091" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.1869" k2="-1.3638" k3="0.7806" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1277" k2="-1.1307" k3="0.5303" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0276" k2="-1.4155" k3="0.7092" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0139" k2="-1.4755" k3="0.7488" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0192" k2="-1.5936" k3="0.8259" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4561" k2="0.2525" k3="-0.3794" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.3727" k2="0.0534" k3="-0.2734" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.3652" k2="0.0196" k3="-0.2584" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3374" k2="-0.0445" k3="-0.2307" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5018" k2="0.3342" k3="-0.3287" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4670" k2="0.3186" k3="-0.3714" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4802" k2="0.3599" k3="-0.4137" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4707" k2="0.3739" k3="-0.4528" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.3935" k2="-0.1258" k3="0.1192" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.3528" k2="-0.1992" k3="0.1628" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3651" k2="-0.1759" k3="0.1497" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3661" k2="-0.1512" k3="0.1276" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.2710" k2="-0.5110" k3="0.3156" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.2277" k2="-0.5777" k3="0.3643" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1821" k2="-0.6504" k3="0.4028" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1901" k2="-0.6330" k3="0.3902" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.3609" k2="0.0967" k3="-0.1190" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3238" k2="0.0388" k3="-0.0589" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2791" k2="-0.0683" k3="0.0156" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2899" k2="-0.0393" k3="0.0034" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.3094" k2="-0.1260" k3="0.1036" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2916" k2="-0.1022" k3="0.0803" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2559" k2="-0.1747" k3="0.1230" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2722" k2="-0.1282" k3="0.0971" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.3059" k2="-0.1359" k3="0.1104" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2871" k2="-0.1148" k3="0.0889" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2537" k2="-0.1814" k3="0.1275" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2689" k2="-0.1383" k3="0.1038" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.3051" k2="-0.1358" k3="0.1094" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2893" k2="-0.1096" k3="0.0852" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2522" k2="-0.1853" k3="0.1297" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2729" k2="-0.1348" k3="0.1038" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.2018" k2="-0.2665" k3="0.0571" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1634" k2="-0.3260" k3="0.1101" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1295" k2="-0.3605" k3="0.1401" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.1274" k2="-0.3864" k3="0.1779" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2652" k2="0.0671" k3="-0.1896" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2339" k2="0.0302" k3="-0.1498" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2080" k2="0.0006" k3="-0.1150" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2153" k2="0.0212" k3="-0.1103" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2666" k2="-0.0122" k3="-0.0206" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2140" k2="-0.1137" k3="0.0599" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1904" k2="-0.1296" k3="0.0710" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1931" k2="-0.1198" k3="0.0741" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.2358" k2="-0.1359" k3="0.0920" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2054" k2="-0.1526" k3="0.0963" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1861" k2="-0.1549" k3="0.0960" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1965" k2="-0.1139" k3="0.0709" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.2396" k2="-0.1284" k3="0.0860" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2120" k2="-0.1410" k3="0.0905" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1954" k2="-0.1379" k3="0.0869" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2096" k2="-0.0868" k3="0.0544" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.2235" k2="-0.3007" k3="-0.0196" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.2062" k2="-0.2405" k3="-0.0356" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1712" k2="-0.2289" k3="-0.0202" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1712" k2="-0.1977" k3="-0.0219" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2818" k2="0.1776" k3="-0.4047" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2793" k2="0.2553" k3="-0.4072" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2411" k2="0.2293" k3="-0.3509" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2508" k2="0.2657" k3="-0.3438" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3641" k2="0.3814" k3="-0.4506" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2902" k2="0.2031" k3="-0.2584" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2063" k2="0.0154" k3="-0.0779" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1979" k2="-0.0102" k3="-0.0349" />
--            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.3081" k2="0.1018" k3="-0.1440" />
--            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2148" k2="-0.1207" k3="0.0548" />
--            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1585" k2="-0.1816" k3="0.1045" />
--            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1745" k2="-0.1179" k3="0.0672" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2606" k2="-0.0934" k3="0.0377" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.1987" k2="-0.1873" k3="0.1151" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1601" k2="-0.1793" k3="0.1029" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1784" k2="-0.1122" k3="0.0644" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.4664" k2="0.0127" k3="-0.1991" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.4457" k2="0.1016" k3="-0.2303" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.4050" k2="0.1096" k3="-0.2063" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3811" k2="0.1152" k3="-0.1942" />
--            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1980" k2="-0.1116" k3="-0.3206" />
--            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2305" k2="0.1212" k3="-0.4205" />
--            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2346" k2="0.2463" k3="-0.4460" />
--            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2272" k2="0.2861" k3="-0.4421" />
--            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3693" k2="0.4737" k3="-0.7079" />
--            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3520" k2="0.4838" k3="-0.6046" />
--            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2870" k2="0.3452" k3="-0.4173" />
--            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2533" k2="0.2921" k3="-0.3460" />
--            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4894" k2="0.8105" k3="-0.8723" />
--            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.3556" k2="0.4065" k3="-0.4457" />
--            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2216" k2="0.0330" k3="-0.0885" />
--            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1691" k2="-0.0698" k3="0.0102" />
--            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4963" k2="0.7611" k3="-0.7603" />
--            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2736" k2="0.0560" k3="-0.1053" />
--            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1758" k2="-0.1633" k3="0.0950" />
--            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1522" k2="-0.1439" k3="0.0785" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS</model>
-+        <model lang="en">Lumix G X Vario PZ 14-42mm f/3.5-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal min="14" max="42"/>
-+        <aperture min="3.5" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="14" a="0.02565" b="-0.08842" c="0.01461"/>
-+            <distortion model="ptlens" focal="19" a="0.01209" b="-0.03965" c="0.00339"/>
-+            <distortion model="ptlens" focal="26" a="0.00118" b="0.00765" c="-0.03503"/>
-+            <distortion model="ptlens" focal="33" a="0.00329" b="0.01434" c="-0.03376"/>
-+            <distortion model="ptlens" focal="42" a="0.01352" b="-0.01628" c="0.00739"/>
-+            <tca model="poly3" focal="14" br="0.0000399" vr="0.9999729" bb="-0.0002503" vb="1.0005586"/>
-+            <tca model="poly3" focal="18" br="-0.0000110" vr="1.0000205" bb="-0.0002269" vb="1.0005124"/>
-+            <tca model="poly3" focal="25" br="-0.0000027" vr="1.0000210" bb="-0.0001025" vb="1.0003060"/>
-+            <tca model="poly3" focal="35" br="0.0000478" vr="0.9999745" bb="-0.0000213" vb="1.0001376"/>
-+            <tca model="poly3" focal="42" br="0.0000292" vr="1.0000187" bb="-0.0000197" vb="1.0000910"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2279" k2="-1.0763" k3="0.5610"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.0951" k2="-1.4326" k3="0.7789"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1003" k2="-1.4651" k3="0.8091"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.1869" k2="-1.3638" k3="0.7806"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1277" k2="-1.1307" k3="0.5303"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0276" k2="-1.4155" k3="0.7092"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0139" k2="-1.4755" k3="0.7488"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0192" k2="-1.5936" k3="0.8259"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4561" k2="0.2525" k3="-0.3794"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.3727" k2="0.0534" k3="-0.2734"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.3652" k2="0.0196" k3="-0.2584"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3374" k2="-0.0445" k3="-0.2307"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5018" k2="0.3342" k3="-0.3287"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4670" k2="0.3186" k3="-0.3714"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4802" k2="0.3599" k3="-0.4137"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4707" k2="0.3739" k3="-0.4528"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.3935" k2="-0.1258" k3="0.1192"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.3528" k2="-0.1992" k3="0.1628"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3651" k2="-0.1759" k3="0.1497"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3661" k2="-0.1512" k3="0.1276"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.2710" k2="-0.5110" k3="0.3156"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.2277" k2="-0.5777" k3="0.3643"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1821" k2="-0.6504" k3="0.4028"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1901" k2="-0.6330" k3="0.3902"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.3609" k2="0.0967" k3="-0.1190"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3238" k2="0.0388" k3="-0.0589"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2791" k2="-0.0683" k3="0.0156"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2899" k2="-0.0393" k3="0.0034"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.3094" k2="-0.1260" k3="0.1036"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2916" k2="-0.1022" k3="0.0803"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2559" k2="-0.1747" k3="0.1230"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2722" k2="-0.1282" k3="0.0971"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.3059" k2="-0.1359" k3="0.1104"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2871" k2="-0.1148" k3="0.0889"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2537" k2="-0.1814" k3="0.1275"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2689" k2="-0.1383" k3="0.1038"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.3051" k2="-0.1358" k3="0.1094"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2893" k2="-0.1096" k3="0.0852"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2522" k2="-0.1853" k3="0.1297"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2729" k2="-0.1348" k3="0.1038"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.2018" k2="-0.2665" k3="0.0571"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1634" k2="-0.3260" k3="0.1101"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1295" k2="-0.3605" k3="0.1401"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.1274" k2="-0.3864" k3="0.1779"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2652" k2="0.0671" k3="-0.1896"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2339" k2="0.0302" k3="-0.1498"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2080" k2="0.0006" k3="-0.1150"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2153" k2="0.0212" k3="-0.1103"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2666" k2="-0.0122" k3="-0.0206"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2140" k2="-0.1137" k3="0.0599"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1904" k2="-0.1296" k3="0.0710"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1931" k2="-0.1198" k3="0.0741"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.2358" k2="-0.1359" k3="0.0920"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2054" k2="-0.1526" k3="0.0963"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1861" k2="-0.1549" k3="0.0960"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1965" k2="-0.1139" k3="0.0709"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.2396" k2="-0.1284" k3="0.0860"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2120" k2="-0.1410" k3="0.0905"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1954" k2="-0.1379" k3="0.0869"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2096" k2="-0.0868" k3="0.0544"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.2235" k2="-0.3007" k3="-0.0196"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.2062" k2="-0.2405" k3="-0.0356"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1712" k2="-0.2289" k3="-0.0202"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1712" k2="-0.1977" k3="-0.0219"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2818" k2="0.1776" k3="-0.4047"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2793" k2="0.2553" k3="-0.4072"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2411" k2="0.2293" k3="-0.3509"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2508" k2="0.2657" k3="-0.3438"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3641" k2="0.3814" k3="-0.4506"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2902" k2="0.2031" k3="-0.2584"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2063" k2="0.0154" k3="-0.0779"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1979" k2="-0.0102" k3="-0.0349"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.3081" k2="0.1018" k3="-0.1440"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2148" k2="-0.1207" k3="0.0548"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1585" k2="-0.1816" k3="0.1045"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1745" k2="-0.1179" k3="0.0672"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2606" k2="-0.0934" k3="0.0377"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.1987" k2="-0.1873" k3="0.1151"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1601" k2="-0.1793" k3="0.1029"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1784" k2="-0.1122" k3="0.0644"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.4664" k2="0.0127" k3="-0.1991"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.4457" k2="0.1016" k3="-0.2303"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.4050" k2="0.1096" k3="-0.2063"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3811" k2="0.1152" k3="-0.1942"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1980" k2="-0.1116" k3="-0.3206"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2305" k2="0.1212" k3="-0.4205"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2346" k2="0.2463" k3="-0.4460"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2272" k2="0.2861" k3="-0.4421"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3693" k2="0.4737" k3="-0.7079"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3520" k2="0.4838" k3="-0.6046"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2870" k2="0.3452" k3="-0.4173"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2533" k2="0.2921" k3="-0.3460"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4894" k2="0.8105" k3="-0.8723"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.3556" k2="0.4065" k3="-0.4457"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2216" k2="0.0330" k3="-0.0885"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1691" k2="-0.0698" k3="0.0102"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4963" k2="0.7611" k3="-0.7603"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2736" k2="0.0560" k3="-0.1053"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1758" k2="-0.1633" k3="0.0950"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1522" k2="-0.1439" k3="0.0785"/>
-+        </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G VARIO PZ 14-42/F3.5-5.6 + GWC1 0.79x</model>
--	    <focal min="14" max="42" />
--	    <aperture min="3.5" max="22" />
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="14" model="ptlens" a="0.0179152" b="-0.045476" c="-0.00473275" />
--	        <distortion focal="18" model="ptlens" a="0.025807" b="-0.0640215" c="0.0309495" />
--	        <distortion focal="25" model="ptlens" a="0.0116902" b="-0.0256329" c="0.0158116" />
--	        <distortion focal="35" model="ptlens" a="0.0115103" b="-0.0149202" c="0.00888769" />
--	        <distortion focal="42" model="ptlens" a="0.00886028" b="-0.003387" c="0.000962099" />
--            <tca model="poly3" focal="14" br="0.0001359" vr="1.0000609" bb="-0.0000804" vb="1.0002627" />
--            <tca model="poly3" focal="18" br="0.0000834" vr="1.0001707" bb="-0.0000528" vb="1.0001610" />
--            <tca model="poly3" focal="25" br="0.0000700" vr="1.0003581" bb="-0.0000636" vb="1.0000337" />
--            <tca model="poly3" focal="35" br="0.0000657" vr="1.0003876" bb="-0.0000258" vb="0.9998841" />
--            <tca model="poly3" focal="42" br="0.0001242" vr="1.0003650" bb="-0.0000807" vb="0.9999576" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2549" k2="-0.9540" k3="0.5212" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.1498" k2="-1.2155" k3="0.6383" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1251" k2="-1.2176" k3="0.6926" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0969" k2="-1.2431" k3="0.7274" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1766" k2="-0.9398" k3="0.4530" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0996" k2="-1.1445" k3="0.5322" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0868" k2="-1.1608" k3="0.6072" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.0452" k2="-1.2580" k3="0.6997" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4805" k2="0.2388" k3="-0.2811" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.4465" k2="0.1928" k3="-0.3400" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.4028" k2="0.0605" k3="-0.2032" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3344" k2="-0.0982" k3="-0.0872" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5059" k2="0.2898" k3="-0.2420" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.5356" k2="0.4598" k3="-0.4434" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4881" k2="0.3249" k3="-0.3242" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4280" k2="0.2116" k3="-0.2645" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.4271" k2="-0.0329" k3="0.0697" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.4270" k2="-0.0133" k3="0.0429" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3947" k2="-0.0819" k3="0.0931" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3682" k2="-0.0789" k3="0.0589" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.1912" k2="-0.6479" k3="0.5580" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.1946" k2="-0.5671" k3="0.3795" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1984" k2="-0.6116" k3="0.5695" />
--            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1654" k2="-0.6738" k3="0.7110" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.2588" k2="-0.2385" k3="0.2977" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3008" k2="-0.0338" k3="0.0211" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2724" k2="-0.1898" k3="0.2417" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2073" k2="-0.3615" k3="0.4299" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.1450" k2="-0.6284" k3="0.6146" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2679" k2="-0.1437" k3="0.1198" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2276" k2="-0.3153" k3="0.3104" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1597" k2="-0.4757" k3="0.4601" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.1394" k2="-0.6045" k3="0.5520" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2667" k2="-0.1437" k3="0.1189" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2314" k2="-0.2738" k3="0.2494" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1660" k2="-0.4073" k3="0.3592" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.1607" k2="-0.4948" k3="0.4304" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2627" k2="-0.1488" k3="0.1207" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2515" k2="-0.1796" k3="0.1552" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2011" k2="-0.2576" k3="0.2105" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.1605" k2="-0.2826" k3="0.1400" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1704" k2="-0.2367" k3="0.0927" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1647" k2="-0.2657" k3="0.2869" />
--            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.0814" k2="-0.3983" k3="0.4973" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2195" k2="0.0285" k3="-0.0993" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2409" k2="0.0779" k3="-0.1414" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2239" k2="0.0108" k3="0.0585" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1743" k2="-0.0808" k3="0.2378" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.1772" k2="-0.1601" k3="0.1228" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2003" k2="-0.0648" k3="0.0412" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1459" k2="-0.2637" k3="0.2603" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.0717" k2="-0.4325" k3="0.4228" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.1780" k2="-0.1659" k3="0.1175" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2037" k2="-0.1147" k3="0.0837" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1607" k2="-0.2069" k3="0.1835" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.0884" k2="-0.3324" k3="0.2905" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1804" k2="-0.1504" k3="0.1015" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2014" k2="-0.1208" k3="0.0875" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1836" k2="-0.1111" k3="0.0897" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1288" k2="-0.1626" k3="0.1271" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.1712" k2="-0.2632" k3="-0.0268" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1828" k2="-0.0487" k3="-0.1482" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1482" k2="-0.0817" k3="-0.0963" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1381" k2="-0.0322" k3="-0.1095" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2529" k2="0.1687" k3="-0.3660" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2920" k2="0.3823" k3="-0.4492" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2587" k2="0.3245" k3="-0.3772" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2305" k2="0.3164" k3="-0.3577" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3261" k2="0.3561" k3="-0.4036" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2711" k2="0.2367" k3="-0.2281" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2092" k2="0.0795" k3="-0.0907" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1616" k2="0.0051" k3="-0.0271" />
--            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.2705" k2="0.0927" k3="-0.1214" />
--            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2044" k2="-0.0560" k3="0.0400" />
--            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1606" k2="-0.1177" k3="0.0848" />
--            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1306" k2="-0.1038" k3="0.0659" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2246" k2="-0.0875" k3="0.0435" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2019" k2="-0.0648" k3="0.0480" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1596" k2="-0.1190" k3="0.0846" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1316" k2="-0.1029" k3="0.0654" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.3748" k2="0.0411" k3="-0.2413" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.3684" k2="0.2509" k3="-0.3389" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.3606" k2="0.3085" k3="-0.3427" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3268" k2="0.2812" k3="-0.3033" />
--            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1963" k2="0.0032" k3="-0.3776" />
--            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2559" k2="0.3367" k3="-0.5121" />
--            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2601" k2="0.4003" k3="-0.5105" />
--            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2625" k2="0.4721" k3="-0.5322" />
--            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3470" k2="0.5343" k3="-0.7429" />
--            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3344" k2="0.5798" k3="-0.6194" />
--            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2945" k2="0.4594" k3="-0.4694" />
--            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2695" k2="0.4102" k3="-0.3925" />
--            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4661" k2="0.8819" k3="-0.9227" />
--            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.2938" k2="0.3266" k3="-0.3223" />
--            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2113" k2="0.0888" k3="-0.0971" />
--            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1746" k2="0.0250" k3="-0.0258" />
--            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4630" k2="0.7983" k3="-0.7757" />
--            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2044" k2="-0.0300" k3="0.0078" />
--            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1664" k2="-0.0868" k3="0.0613" />
--            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1599" k2="-0.0358" k3="0.0291" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario 14-42mm f/3.5-5.6 II Asph. Mega OIS</model>
-+        <model lang="en">Lumix G Vario 14-42mm f/3.5-5.6 II</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal min="14" max="42"/>
-+        <aperture min="3.5" max="5.6"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.0225278" b="-0.0802366" c="0.00964907"/>
-+            <distortion focal="18" model="ptlens" a="0.0429574" b="-0.140955" c="0.102005"/>
-+            <distortion focal="25" model="ptlens" a="0.0136782" b="-0.0405175" c="0.0293264"/>
-+            <distortion focal="35" model="ptlens" a="0.00177402" b="0.00379145" c="-0.000383617"/>
-+            <distortion focal="42" model="ptlens" a="-0.00198101" b="0.0153511" c="-0.00974301"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.1926" k2="-0.5161" k3="0.1650"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.1926" k2="-0.5161" k3="0.1650"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.1634" k2="-0.3651" k3="-0.0056"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.1634" k2="-0.3651" k3="-0.0056"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.3835" k2="0.5740" k3="-0.6269"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3835" k2="0.5740" k3="-0.6269"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.3886" k2="0.7040" k3="-0.7046"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.3886" k2="0.7040" k3="-0.7046"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.5057" k2="0.9068" k3="-0.7483"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5057" k2="0.9068" k3="-0.7483"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.4771" k2="0.7660" k3="-0.5941"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.4771" k2="0.7660" k3="-0.5941"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.4521" k2="0.6309" k3="-0.4670"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.4521" k2="0.6309" k3="-0.4670"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2778" k2="-0.0052" k3="0.0050"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2778" k2="-0.0052" k3="0.0050"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.3188" k2="0.2849" k3="-0.1858"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3188" k2="0.2849" k3="-0.1858"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3045" k2="0.1705" k3="-0.0602"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3045" k2="0.1705" k3="-0.0602"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1960" k2="-0.0043" k3="0.0167"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1960" k2="-0.0043" k3="0.0167"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2516" k2="0.0986" k3="-0.0354"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2516" k2="0.0986" k3="-0.0354"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2881" k2="0.1190" k3="-0.0304"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2881" k2="0.1190" k3="-0.0304"/>
-+            <vignetting model="pa" focal="25" aperture="5.3" distance="10" k1="-0.1805" k2="-0.0073" k3="-0.0255"/>
-+            <vignetting model="pa" focal="25" aperture="5.3" distance="1000" k1="-0.1805" k2="-0.0073" k3="-0.0255"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.1652" k2="-0.0049" k3="-0.0368"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1652" k2="-0.0049" k3="-0.0368"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.2012" k2="0.0253" k3="0.0170"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2012" k2="0.0253" k3="0.0170"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="10" k1="-0.1830" k2="0.0134" k3="0.0173"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1830" k2="0.0134" k3="0.0173"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.1745" k2="0.0148" k3="0.0132"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.1745" k2="0.0148" k3="0.0132"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.1907" k2="0.0381" k3="-0.0017"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1907" k2="0.0381" k3="-0.0017"/>
-+            <vignetting model="pa" focal="35" aperture="5.5" distance="10" k1="-0.2088" k2="-0.0157" k3="0.0163"/>
-+            <vignetting model="pa" focal="35" aperture="5.5" distance="1000" k1="-0.2088" k2="-0.0157" k3="0.0163"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2191" k2="0.0021" k3="0.0065"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2191" k2="0.0021" k3="0.0065"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1610" k2="0.0325" k3="-0.0149"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1610" k2="0.0325" k3="-0.0149"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.1274" k2="-0.0357" k3="0.0273"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1274" k2="-0.0357" k3="0.0273"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.1525" k2="0.0034" k3="0.0065"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1525" k2="0.0034" k3="0.0065"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1682" k2="0.0437" k3="-0.0230"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1682" k2="0.0437" k3="-0.0230"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="10" k1="-0.5059" k2="0.6085" k3="-0.3705"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.5059" k2="0.6085" k3="-0.3705"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="10" k1="-0.2117" k2="0.2821" k3="-0.2506"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2117" k2="0.2821" k3="-0.2506"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="10" k1="-0.1682" k2="0.1370" k3="-0.1155"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.1682" k2="0.1370" k3="-0.1155"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="10" k1="-0.1471" k2="0.0159" k3="-0.0079"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1471" k2="0.0159" k3="-0.0079"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="10" k1="-0.1486" k2="0.0136" k3="-0.0007"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1486" k2="0.0136" k3="-0.0007"/>
-+        </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G VARIO 14-140/F4.0-5.8</model>
--	    <focal min="14" max="140" />
--	    <aperture min="4" max="22" />
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--            <distortion focal="14" model="ptlens" a="0.00966207" b="-0.0543377" c="-0.00740716" />
--            <distortion focal="18" model="ptlens" a="0.00949869" b="-0.0385525" c="0.00465051" />
--            <distortion focal="25" model="ptlens" a="0.00754759" b="-0.0231595" c="0.00924953" />
--            <distortion focal="32" model="ptlens" a="-0.000903732" b="0.00151614" c="-0.00342479" />
--            <distortion focal="48" model="ptlens" a="-0.000410749" b="-0.0000791434" c="-0.000958721" />
--            <distortion focal="70" model="ptlens" a="-0.00120315" b="0.00145905" c="-0.00120032" />
--            <distortion focal="99" model="ptlens" a="0.000923285" b="-0.00651435" c="0.00726719" />
--            <distortion focal="140" model="ptlens" a="-0.00190609" b="0.000381078" c="0.00332496" />
--            <tca model="poly3" focal="14" br="0.0000867" vr="1.0002346" bb="-0.0000697" vb="1.0001381" />
--            <tca model="poly3" focal="18" br="0.0000355" vr="1.0001169" bb="-0.0000740" vb="1.0001872" />
--            <tca model="poly3" focal="25" br="0.0000334" vr="1.0000834" bb="-0.0000785" vb="1.0001885" />
--            <tca model="poly3" focal="32" br="0.0000818" vr="0.9999374" bb="-0.0000874" vb="1.0001907" />
--            <tca model="poly3" focal="48" br="0.0001101" vr="0.9998177" bb="-0.0000759" vb="1.0001548" />
--            <tca model="poly3" focal="70" br="0.0001590" vr="0.9994949" bb="-0.0001671" vb="1.0003511" />
--            <tca model="poly3" focal="99" br="0.0001559" vr="0.9991839" bb="-0.0001412" vb="1.0003344" />
--            <tca model="poly3" focal="140" br="0.0001327" vr="0.9993829" bb="-0.0000982" vb="0.9999327" />        
--	        <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="0.1204" k2="-1.4049" k3="0.4935" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="0.0734" k2="-1.2021" k3="0.3642" />
--            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="0.0580" k2="-1.1566" k3="0.3308" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0399" k2="-1.0417" k3="0.2322" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4085" k2="0.6773" k3="-0.9550" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.4199" k2="0.8066" k3="-1.0284" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4353" k2="0.8178" k3="-1.0256" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4688" k2="0.9887" k3="-1.1732" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.5555" k2="1.1158" k3="-1.1486" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.5307" k2="1.1004" k3="-1.1047" />
--            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5503" k2="1.1103" k3="-1.0962" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5681" k2="1.2335" k3="-1.2147" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.6285" k2="1.2814" k3="-1.1805" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.5450" k2="1.0668" k3="-0.9869" />
--            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.5648" k2="1.0714" k3="-0.9762" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5752" k2="1.1827" k3="-1.0981" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.5163" k2="0.7997" k3="-0.7118" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.4465" k2="0.6425" k3="-0.5861" />
--            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.4688" k2="0.6498" k3="-0.5772" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.4439" k2="0.6177" k3="-0.5611" />
--            <vignetting model="pa" focal="18" aperture="4.3" distance="0.5" k1="-0.0587" k2="-0.3087" k3="-0.0619" />
--            <vignetting model="pa" focal="18" aperture="4.3" distance="1" k1="-0.0649" k2="-0.3425" k3="-0.0108" />
--            <vignetting model="pa" focal="18" aperture="4.3" distance="3" k1="-0.0376" k2="-0.3783" k3="0.0035" />
--            <vignetting model="pa" focal="18" aperture="4.3" distance="1000" k1="-0.1206" k2="-0.2810" k3="-0.0211" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2639" k2="0.3225" k3="-0.2749" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2540" k2="0.2511" k3="-0.2008" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="3" k1="-0.2239" k2="0.1919" k3="-0.1675" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2989" k2="0.2729" k3="-0.1935" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2039" k2="0.0649" k3="-0.0305" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.1905" k2="0.0058" k3="0.0213" />
--            <vignetting model="pa" focal="18" aperture="8" distance="3" k1="-0.1749" k2="-0.0319" k3="0.0443" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2510" k2="0.0727" k3="-0.0071" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2086" k2="0.0696" k3="-0.0321" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1" k1="-0.1950" k2="0.0117" k3="0.0177" />
--            <vignetting model="pa" focal="18" aperture="11" distance="3" k1="-0.1774" k2="-0.0451" k3="0.0564" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2499" k2="0.0656" k3="-0.0023" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2201" k2="0.0801" k3="-0.0365" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2029" k2="0.0209" k3="0.0115" />
--            <vignetting model="pa" focal="18" aperture="22" distance="3" k1="-0.2022" k2="-0.0032" k3="0.0329" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2515" k2="0.0643" k3="-0.0041" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.0703" k2="-0.0678" k3="-0.1154" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.0706" k2="-0.0987" k3="-0.0819" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.1087" k2="-0.1066" k3="-0.0571" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1137" k2="-0.0185" k3="-0.1223" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1367" k2="0.2270" k3="-0.2553" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.1238" k2="0.1686" k3="-0.2106" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.1719" k2="0.1770" k3="-0.1905" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1728" k2="0.2551" k3="-0.2522" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1133" k2="0.0707" k3="-0.0359" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.0909" k2="-0.0087" k3="0.0242" />
--            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.1368" k2="-0.0176" k3="0.0585" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1427" k2="0.0586" k3="0.0036" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1156" k2="0.0687" k3="-0.0341" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.0924" k2="-0.0104" k3="0.0274" />
--            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1298" k2="-0.0376" k3="0.0699" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1495" k2="0.0629" k3="0.0032" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1310" k2="0.0919" k3="-0.0482" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1049" k2="0.0115" k3="0.0129" />
--            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1356" k2="-0.0295" k3="0.0626" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1701" k2="0.1000" k3="-0.0187" />
--            <vignetting model="pa" focal="32" aperture="5" distance="0.5" k1="-0.1804" k2="0.5238" k3="-0.6403" />
--            <vignetting model="pa" focal="32" aperture="5" distance="1" k1="-0.1598" k2="0.4341" k3="-0.5655" />
--            <vignetting model="pa" focal="32" aperture="5" distance="3" k1="-0.1774" k2="0.4073" k3="-0.5354" />
--            <vignetting model="pa" focal="32" aperture="5" distance="1000" k1="-0.1748" k2="0.3315" k3="-0.4641" />
--            <vignetting model="pa" focal="32" aperture="5.6" distance="0.5" k1="-0.2181" k2="0.7421" k3="-0.7358" />
--            <vignetting model="pa" focal="32" aperture="5.6" distance="1" k1="-0.1993" k2="0.6651" k3="-0.6683" />
--            <vignetting model="pa" focal="32" aperture="5.6" distance="3" k1="-0.2262" k2="0.6720" k3="-0.6610" />
--            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.2204" k2="0.5827" k3="-0.5819" />
--            <vignetting model="pa" focal="32" aperture="8" distance="0.5" k1="-0.1110" k2="0.2759" k3="-0.2386" />
--            <vignetting model="pa" focal="32" aperture="8" distance="1" k1="-0.0916" k2="0.1892" k3="-0.1561" />
--            <vignetting model="pa" focal="32" aperture="8" distance="3" k1="-0.1274" k2="0.2199" k3="-0.1664" />
--            <vignetting model="pa" focal="32" aperture="8" distance="1000" k1="-0.1185" k2="0.1155" k3="-0.0746" />
--            <vignetting model="pa" focal="32" aperture="11" distance="0.5" k1="-0.0577" k2="0.0604" k3="-0.0446" />
--            <vignetting model="pa" focal="32" aperture="11" distance="1" k1="-0.0466" k2="0.0100" k3="0.0040" />
--            <vignetting model="pa" focal="32" aperture="11" distance="3" k1="-0.0834" k2="0.0401" k3="-0.0041" />
--            <vignetting model="pa" focal="32" aperture="11" distance="1000" k1="-0.0842" k2="-0.0332" k3="0.0624" />
--            <vignetting model="pa" focal="32" aperture="22" distance="0.5" k1="-0.0563" k2="0.0338" k3="-0.0179" />
--            <vignetting model="pa" focal="32" aperture="22" distance="1" k1="-0.0453" k2="-0.0003" k3="0.0132" />
--            <vignetting model="pa" focal="32" aperture="22" distance="3" k1="-0.0912" k2="0.0448" k3="-0.0020" />
--            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.0912" k2="-0.0265" k3="0.0605" />
--            <vignetting model="pa" focal="48" aperture="5.5" distance="0.5" k1="-0.1135" k2="0.2612" k3="-0.3764" />
--            <vignetting model="pa" focal="48" aperture="5.5" distance="1" k1="-0.1146" k2="0.2464" k3="-0.3838" />
--            <vignetting model="pa" focal="48" aperture="5.5" distance="3" k1="-0.1258" k2="0.1982" k3="-0.3434" />
--            <vignetting model="pa" focal="48" aperture="5.5" distance="1000" k1="-0.1058" k2="0.1661" k3="-0.3322" />
--            <vignetting model="pa" focal="48" aperture="5.6" distance="0.5" k1="-0.0985" k2="0.2631" k3="-0.3835" />
--            <vignetting model="pa" focal="48" aperture="5.6" distance="1" k1="-0.0910" k2="0.2435" k3="-0.3853" />
--            <vignetting model="pa" focal="48" aperture="5.6" distance="3" k1="-0.1044" k2="0.2104" k3="-0.3583" />
--            <vignetting model="pa" focal="48" aperture="5.6" distance="1000" k1="-0.0888" k2="0.1702" k3="-0.3365" />
--            <vignetting model="pa" focal="48" aperture="8" distance="0.5" k1="-0.0533" k2="0.1502" k3="-0.1199" />
--            <vignetting model="pa" focal="48" aperture="8" distance="1" k1="-0.0400" k2="0.1107" k3="-0.0924" />
--            <vignetting model="pa" focal="48" aperture="8" distance="3" k1="-0.0587" k2="0.0937" k3="-0.0755" />
--            <vignetting model="pa" focal="48" aperture="8" distance="1000" k1="-0.0424" k2="0.0531" k3="-0.0553" />
--            <vignetting model="pa" focal="48" aperture="11" distance="0.5" k1="-0.0264" k2="0.0504" k3="-0.0316" />
--            <vignetting model="pa" focal="48" aperture="11" distance="1" k1="-0.0076" k2="-0.0098" k3="0.0127" />
--            <vignetting model="pa" focal="48" aperture="11" distance="3" k1="-0.0276" k2="-0.0234" k3="0.0270" />
--            <vignetting model="pa" focal="48" aperture="11" distance="1000" k1="-0.0100" k2="-0.0670" k3="0.0501" />
--            <vignetting model="pa" focal="48" aperture="16" distance="0.5" k1="-0.0150" k2="0.0008" k3="0.0043" />
--            <vignetting model="pa" focal="48" aperture="16" distance="1" k1="-0.0110" k2="-0.0075" k3="0.0131" />
--            <vignetting model="pa" focal="48" aperture="16" distance="3" k1="-0.0283" k2="-0.0270" k3="0.0299" />
--            <vignetting model="pa" focal="48" aperture="16" distance="1000" k1="-0.0148" k2="-0.0606" k3="0.0469" />
--            <vignetting model="pa" focal="48" aperture="22" distance="0.5" k1="-0.0254" k2="0.0275" k3="-0.0124" />
--            <vignetting model="pa" focal="48" aperture="22" distance="1" k1="-0.0172" k2="0.0038" k3="0.0061" />
--            <vignetting model="pa" focal="48" aperture="22" distance="3" k1="-0.0417" k2="0.0069" k3="0.0079" />
--            <vignetting model="pa" focal="48" aperture="22" distance="1000" k1="-0.0217" k2="-0.0465" k3="0.0378" />
--            <vignetting model="pa" focal="70" aperture="5.8" distance="0.5" k1="-0.2468" k2="0.5478" k3="-0.5848" />
--            <vignetting model="pa" focal="70" aperture="5.8" distance="1" k1="-0.2083" k2="0.4559" k3="-0.5517" />
--            <vignetting model="pa" focal="70" aperture="5.8" distance="3" k1="-0.2088" k2="0.3943" k3="-0.5079" />
--            <vignetting model="pa" focal="70" aperture="5.8" distance="1000" k1="-0.2169" k2="0.3614" k3="-0.4757" />
--            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.0527" k2="0.2241" k3="-0.1981" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.0602" k2="0.2572" k3="-0.2299" />
--            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.0702" k2="0.2278" k3="-0.2037" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0705" k2="0.2088" k3="-0.1901" />
--            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.0052" k2="0.0427" k3="-0.0391" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="0.0065" k2="0.0053" k3="-0.0057" />
--            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.0025" k2="-0.0234" k3="0.0165" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0053" k2="-0.0383" k3="0.0307" />
--            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.0028" k2="0.0262" k3="-0.0236" />
--            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="0.0055" k2="-0.0001" k3="0.0008" />
--            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.0050" k2="-0.0238" k3="0.0196" />
--            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0114" k2="-0.0280" k3="0.0261" />
--            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.0114" k2="0.0408" k3="-0.0315" />
--            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0012" k2="0.0096" k3="-0.0034" />
--            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.0080" k2="-0.0222" k3="0.0181" />
--            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0183" k2="-0.0112" k3="0.0150" />
--            <vignetting model="pa" focal="99" aperture="5.8" distance="0.5" k1="-0.3418" k2="0.8556" k3="-0.9367" />
--            <vignetting model="pa" focal="99" aperture="5.8" distance="1" k1="-0.1814" k2="0.2439" k3="-0.4961" />
--            <vignetting model="pa" focal="99" aperture="5.8" distance="3" k1="-0.1118" k2="-0.0229" k3="-0.3051" />
--            <vignetting model="pa" focal="99" aperture="5.8" distance="1000" k1="-0.0967" k2="-0.1548" k3="-0.1961" />
--            <vignetting model="pa" focal="99" aperture="8" distance="0.5" k1="-0.1868" k2="0.7844" k3="-0.7327" />
--            <vignetting model="pa" focal="99" aperture="8" distance="1" k1="-0.1717" k2="0.6821" k3="-0.6645" />
--            <vignetting model="pa" focal="99" aperture="8" distance="3" k1="-0.1406" k2="0.6005" k3="-0.6117" />
--            <vignetting model="pa" focal="99" aperture="8" distance="1000" k1="-0.1527" k2="0.5551" k3="-0.5731" />
--            <vignetting model="pa" focal="99" aperture="11" distance="0.5" k1="-0.0571" k2="0.2611" k3="-0.2392" />
--            <vignetting model="pa" focal="99" aperture="11" distance="1" k1="-0.0651" k2="0.2200" k3="-0.1956" />
--            <vignetting model="pa" focal="99" aperture="11" distance="3" k1="-0.0435" k2="0.1696" k3="-0.1602" />
--            <vignetting model="pa" focal="99" aperture="11" distance="1000" k1="-0.0782" k2="0.1915" k3="-0.1710" />
--            <vignetting model="pa" focal="99" aperture="16" distance="0.5" k1="0.0036" k2="0.0202" k3="-0.0224" />
--            <vignetting model="pa" focal="99" aperture="16" distance="1" k1="-0.0159" k2="0.0176" k3="-0.0103" />
--            <vignetting model="pa" focal="99" aperture="16" distance="3" k1="0.0022" k2="-0.0133" k3="0.0077" />
--            <vignetting model="pa" focal="99" aperture="16" distance="1000" k1="-0.0221" k2="-0.0366" k3="0.0377" />
--            <vignetting model="pa" focal="99" aperture="22" distance="0.5" k1="0.0052" k2="0.0008" k3="-0.0030" />
--            <vignetting model="pa" focal="99" aperture="22" distance="1" k1="-0.0165" k2="0.0107" k3="-0.0031" />
--            <vignetting model="pa" focal="99" aperture="22" distance="3" k1="-0.0055" k2="0.0049" k3="-0.0040" />
--            <vignetting model="pa" focal="99" aperture="22" distance="1000" k1="-0.0262" k2="-0.0336" k3="0.0371" />
--            <vignetting model="pa" focal="140" aperture="5.8" distance="0.5" k1="-0.2318" k2="0.6000" k3="-0.8918" />
--            <vignetting model="pa" focal="140" aperture="5.8" distance="1" k1="0.0607" k2="-0.6084" k3="0.0529" />
--            <vignetting model="pa" focal="140" aperture="5.8" distance="3" k1="0.1067" k2="-0.9530" k3="0.3587" />
--            <vignetting model="pa" focal="140" aperture="5.8" distance="1000" k1="0.1003" k2="-1.0369" k3="0.4506" />
--            <vignetting model="pa" focal="140" aperture="8" distance="0.5" k1="-0.2470" k2="1.1758" k3="-1.2411" />
--            <vignetting model="pa" focal="140" aperture="8" distance="1" k1="-0.0542" k2="0.4705" k3="-0.6946" />
--            <vignetting model="pa" focal="140" aperture="8" distance="3" k1="0.0074" k2="0.1963" k3="-0.4765" />
--            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="0.0358" k2="0.0801" k3="-0.3855" />
--            <vignetting model="pa" focal="140" aperture="11" distance="0.5" k1="-0.2548" k2="1.0687" k3="-1.0002" />
--            <vignetting model="pa" focal="140" aperture="11" distance="1" k1="-0.1400" k2="0.6396" k3="-0.6297" />
--            <vignetting model="pa" focal="140" aperture="11" distance="3" k1="-0.1257" k2="0.5400" k3="-0.5388" />
--            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.1251" k2="0.5189" k3="-0.5126" />
--            <vignetting model="pa" focal="140" aperture="16" distance="0.5" k1="-0.1405" k2="0.5837" k3="-0.5246" />
--            <vignetting model="pa" focal="140" aperture="16" distance="1" k1="-0.0235" k2="0.1481" k3="-0.1453" />
--            <vignetting model="pa" focal="140" aperture="16" distance="3" k1="-0.0169" k2="0.0659" k3="-0.0620" />
--            <vignetting model="pa" focal="140" aperture="16" distance="1000" k1="-0.0305" k2="0.0938" k3="-0.0757" />
--            <vignetting model="pa" focal="140" aperture="22" distance="0.5" k1="-0.0328" k2="0.1547" k3="-0.1340" />
--            <vignetting model="pa" focal="140" aperture="22" distance="1" k1="0.0092" k2="0.0086" k3="-0.0156" />
--            <vignetting model="pa" focal="140" aperture="22" distance="3" k1="-0.0056" k2="0.0098" k3="-0.0061" />
--            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0267" k2="0.0536" k3="-0.0313" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS + GWC1 0.79x</model>
-+        <model lang="en">Lumix G X Vario PZ 14-42mm f/3.5-5.6 + GWC1 0.79×</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal min="14" max="42"/>
-+        <aperture min="3.5" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.0179152" b="-0.045476" c="-0.00473275"/>
-+            <distortion focal="18" model="ptlens" a="0.025807" b="-0.0640215" c="0.0309495"/>
-+            <distortion focal="25" model="ptlens" a="0.0116902" b="-0.0256329" c="0.0158116"/>
-+            <distortion focal="35" model="ptlens" a="0.0115103" b="-0.0149202" c="0.00888769"/>
-+            <distortion focal="42" model="ptlens" a="0.00886028" b="-0.003387" c="0.000962099"/>
-+            <tca model="poly3" focal="14" br="0.0001359" vr="1.0000609" bb="-0.0000804" vb="1.0002627"/>
-+            <tca model="poly3" focal="18" br="0.0000834" vr="1.0001707" bb="-0.0000528" vb="1.0001610"/>
-+            <tca model="poly3" focal="25" br="0.0000700" vr="1.0003581" bb="-0.0000636" vb="1.0000337"/>
-+            <tca model="poly3" focal="35" br="0.0000657" vr="1.0003876" bb="-0.0000258" vb="0.9998841"/>
-+            <tca model="poly3" focal="42" br="0.0001242" vr="1.0003650" bb="-0.0000807" vb="0.9999576"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="0.2" k1="-0.2549" k2="-0.9540" k3="0.5212"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="0.4" k1="-0.1498" k2="-1.2155" k3="0.6383"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1.2" k1="-0.1251" k2="-1.2176" k3="0.6926"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0969" k2="-1.2431" k3="0.7274"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.1766" k2="-0.9398" k3="0.4530"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.0996" k2="-1.1445" k3="0.5322"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.0868" k2="-1.1608" k3="0.6072"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.0452" k2="-1.2580" k3="0.6997"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.4805" k2="0.2388" k3="-0.2811"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.4465" k2="0.1928" k3="-0.3400"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.4028" k2="0.0605" k3="-0.2032"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3344" k2="-0.0982" k3="-0.0872"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.5059" k2="0.2898" k3="-0.2420"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.5356" k2="0.4598" k3="-0.4434"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.4881" k2="0.3249" k3="-0.3242"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4280" k2="0.2116" k3="-0.2645"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.4271" k2="-0.0329" k3="0.0697"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.4270" k2="-0.0133" k3="0.0429"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.3947" k2="-0.0819" k3="0.0931"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3682" k2="-0.0789" k3="0.0589"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="0.2" k1="-0.1912" k2="-0.6479" k3="0.5580"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="0.4" k1="-0.1946" k2="-0.5671" k3="0.3795"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="1.2" k1="-0.1984" k2="-0.6116" k3="0.5695"/>
-+            <vignetting model="pa" focal="18" aperture="4.2" distance="1000" k1="-0.1654" k2="-0.6738" k3="0.7110"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.2588" k2="-0.2385" k3="0.2977"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.3008" k2="-0.0338" k3="0.0211"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1.2" k1="-0.2724" k2="-0.1898" k3="0.2417"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2073" k2="-0.3615" k3="0.4299"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.2" k1="-0.1450" k2="-0.6284" k3="0.6146"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.2679" k2="-0.1437" k3="0.1198"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1.2" k1="-0.2276" k2="-0.3153" k3="0.3104"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1597" k2="-0.4757" k3="0.4601"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.2" k1="-0.1394" k2="-0.6045" k3="0.5520"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.2667" k2="-0.1437" k3="0.1189"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1.2" k1="-0.2314" k2="-0.2738" k3="0.2494"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1660" k2="-0.4073" k3="0.3592"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.1607" k2="-0.4948" k3="0.4304"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.2627" k2="-0.1488" k3="0.1207"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1.2" k1="-0.2515" k2="-0.1796" k3="0.1552"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2011" k2="-0.2576" k3="0.2105"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="0.2" k1="-0.1605" k2="-0.2826" k3="0.1400"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="0.4" k1="-0.1704" k2="-0.2367" k3="0.0927"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="1.2" k1="-0.1647" k2="-0.2657" k3="0.2869"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.0814" k2="-0.3983" k3="0.4973"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2195" k2="0.0285" k3="-0.0993"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2409" k2="0.0779" k3="-0.1414"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2239" k2="0.0108" k3="0.0585"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1743" k2="-0.0808" k3="0.2378"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.1772" k2="-0.1601" k3="0.1228"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2003" k2="-0.0648" k3="0.0412"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.1459" k2="-0.2637" k3="0.2603"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.0717" k2="-0.4325" k3="0.4228"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.2" k1="-0.1780" k2="-0.1659" k3="0.1175"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.4" k1="-0.2037" k2="-0.1147" k3="0.0837"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1.2" k1="-0.1607" k2="-0.2069" k3="0.1835"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.0884" k2="-0.3324" k3="0.2905"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1804" k2="-0.1504" k3="0.1015"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2014" k2="-0.1208" k3="0.0875"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.1836" k2="-0.1111" k3="0.0897"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1288" k2="-0.1626" k3="0.1271"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.1712" k2="-0.2632" k3="-0.0268"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1828" k2="-0.0487" k3="-0.1482"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1.2" k1="-0.1482" k2="-0.0817" k3="-0.0963"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1381" k2="-0.0322" k3="-0.1095"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.2" k1="-0.2529" k2="0.1687" k3="-0.3660"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2920" k2="0.3823" k3="-0.4492"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1.2" k1="-0.2587" k2="0.3245" k3="-0.3772"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2305" k2="0.3164" k3="-0.3577"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.2" k1="-0.3261" k2="0.3561" k3="-0.4036"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.2711" k2="0.2367" k3="-0.2281"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1.2" k1="-0.2092" k2="0.0795" k3="-0.0907"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1616" k2="0.0051" k3="-0.0271"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.2" k1="-0.2705" k2="0.0927" k3="-0.1214"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.4" k1="-0.2044" k2="-0.0560" k3="0.0400"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1.2" k1="-0.1606" k2="-0.1177" k3="0.0848"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1306" k2="-0.1038" k3="0.0659"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.2" k1="-0.2246" k2="-0.0875" k3="0.0435"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2019" k2="-0.0648" k3="0.0480"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1.2" k1="-0.1596" k2="-0.1190" k3="0.0846"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1316" k2="-0.1029" k3="0.0654"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="0.2" k1="-0.3748" k2="0.0411" k3="-0.2413"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="0.4" k1="-0.3684" k2="0.2509" k3="-0.3389"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1.2" k1="-0.3606" k2="0.3085" k3="-0.3427"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.3268" k2="0.2812" k3="-0.3033"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="0.2" k1="-0.1963" k2="0.0032" k3="-0.3776"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="0.4" k1="-0.2559" k2="0.3367" k3="-0.5121"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1.2" k1="-0.2601" k2="0.4003" k3="-0.5105"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.2625" k2="0.4721" k3="-0.5322"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="0.2" k1="-0.3470" k2="0.5343" k3="-0.7429"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="0.4" k1="-0.3344" k2="0.5798" k3="-0.6194"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1.2" k1="-0.2945" k2="0.4594" k3="-0.4694"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.2695" k2="0.4102" k3="-0.3925"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="0.2" k1="-0.4661" k2="0.8819" k3="-0.9227"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="0.4" k1="-0.2938" k2="0.3266" k3="-0.3223"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1.2" k1="-0.2113" k2="0.0888" k3="-0.0971"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.1746" k2="0.0250" k3="-0.0258"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="0.2" k1="-0.4630" k2="0.7983" k3="-0.7757"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="0.4" k1="-0.2044" k2="-0.0300" k3="0.0078"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1.2" k1="-0.1664" k2="-0.0868" k3="0.0613"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1599" k2="-0.0358" k3="0.0291"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Panasonic</maker>
--        <model>LUMIX G VARIO 45-200mm F4.0-5.6</model>
-+        <model>Lumix G Vario 14-45mm f/3.5-5.6 Asph. Mega OIS</model>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="45" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="61" a="0" b="0.00494" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.00645" c="0" />
--            <distortion model="ptlens" focal="103" a="-0.001" b="0.007" c="0.002" />
--            <distortion model="ptlens" focal="144" a="-0.005" b="0.023" c="-0.015" />
--            <distortion model="ptlens" focal="180" a="-0.003" b="0.020" c="-0.017" />
--            <distortion model="ptlens" focal="200" a="0.004" b="-0.007" c="0.012" />
-+            <distortion model="poly3" focal="14" k1="-0.028"/>
-+            <distortion model="poly3" focal="15" k1="-0.027"/>
-+            <distortion model="poly3" focal="16" k1="-0.027"/>
-+            <distortion model="poly3" focal="17" k1="-0.026"/>
-+            <distortion model="poly3" focal="18" k1="-0.022"/>
-+            <distortion model="poly3" focal="19" k1="-0.021"/>
-+            <distortion model="poly3" focal="20" k1="-0.018"/>
-+            <distortion model="poly3" focal="21" k1="-0.017"/>
-+            <distortion model="poly3" focal="22" k1="-0.016"/>
-+            <distortion model="poly3" focal="23" k1="-0.016"/>
-+            <distortion model="poly3" focal="24" k1="-0.013"/>
-+            <distortion model="poly3" focal="25" k1="-0.011"/>
-+            <distortion model="poly3" focal="26" k1="-0.011"/>
-+            <distortion model="poly3" focal="27" k1="-0.011"/>
-+            <distortion model="poly3" focal="28" k1="-0.011"/>
-+            <distortion model="poly3" focal="29" k1="-0.008"/>
-+            <distortion model="poly3" focal="30" k1="-0.008"/>
-+            <distortion model="poly3" focal="31" k1="-0.007"/>
-+            <distortion model="poly3" focal="32" k1="-0.006"/>
-+            <distortion model="poly3" focal="33" k1="-0.006"/>
-+            <distortion model="poly3" focal="34" k1="-0.006"/>
-+            <distortion model="poly3" focal="35" k1="-0.005"/>
-+            <distortion model="poly3" focal="36" k1="-0.005"/>
-+            <distortion model="poly3" focal="37" k1="-0.005"/>
-+            <distortion model="poly3" focal="38" k1="-0.003"/>
-+            <distortion model="poly3" focal="39" k1="-0.003"/>
-+            <distortion model="poly3" focal="40" k1="-0.003"/>
-+            <distortion model="poly3" focal="41" k1="-0.002"/>
-+            <distortion model="poly3" focal="42" k1="-0.002"/>
-+            <distortion model="poly3" focal="43" k1="-0.002"/>
-+            <distortion model="poly3" focal="44" k1="-0.002"/>
-+            <distortion model="poly3" focal="45" k1="-0.002"/>
-+            <tca model="poly3" focal="14" br="-0.0000208" cr="-0.0001450" vr="0.9999670" bb="0.0000551" cb="0.0004740" vb="0.9997706"/>
-+            <tca model="poly3" focal="15" br="-0.0000208" cr="-0.0001450" vr="0.9999670" bb="0.0000551" cb="0.0004740" vb="0.9997706"/>
-+            <tca model="poly3" focal="16" br="0.0000004" cr="0.0001262" vr="0.9999621" bb="0.0000448" cb="0.0003730" vb="0.9998125"/>
-+            <tca model="poly3" focal="17" br="-0.0000238" cr="0.0001654" vr="0.9999548" bb="-0.0001032" cb="0.0004285" vb="0.9998252"/>
-+            <tca model="poly3" focal="18" br="-0.0000278" cr="0.0001658" vr="0.9999524" bb="-0.0000671" cb="0.0002216" vb="0.9999079"/>
-+            <tca model="poly3" focal="19" br="-0.0001241" cr="0.0003412" vr="0.9998798" bb="-0.0001394" cb="0.0002996" vb="0.9998814"/>
-+            <tca model="poly3" focal="20" br="-0.0001187" cr="0.0003339" vr="0.9998891" bb="-0.0001665" cb="0.0002155" vb="0.9999358"/>
-+            <tca model="poly3" focal="21" br="-0.0001187" cr="0.0003339" vr="0.9998891" bb="-0.0001665" cb="0.0002155" vb="0.9999358"/>
-+            <tca model="poly3" focal="22" br="-0.0000673" cr="0.0002186" vr="0.9999365" bb="-0.0002032" cb="0.0002750" vb="0.9998907"/>
-+            <tca model="poly3" focal="23" br="-0.0000884" cr="0.0002615" vr="0.9999049" bb="-0.0001770" cb="0.0001873" vb="0.9999257"/>
-+            <tca model="poly3" focal="24" br="-0.0000884" cr="0.0002615" vr="0.9999049" bb="-0.0001770" cb="0.0001873" vb="0.9999257"/>
-+            <tca model="poly3" focal="25" br="-0.0001291" cr="0.0003318" vr="0.9998718" bb="-0.0000991" cb="0.0000141" vb="0.9999903"/>
-+            <tca model="poly3" focal="26" br="-0.0001086" cr="0.0002857" vr="0.9998944" bb="-0.0001846" cb="0.0001735" vb="0.9999208"/>
-+            <tca model="poly3" focal="27" br="-0.0001086" cr="0.0002857" vr="0.9998944" bb="-0.0001846" cb="0.0001735" vb="0.9999208"/>
-+            <tca model="poly3" focal="28" br="-0.0000860" cr="0.0002475" vr="0.9998917" bb="-0.0001547" cb="0.0001266" vb="0.9999016"/>
-+            <tca model="poly3" focal="29" br="-0.0000047" cr="0.0000585" vr="0.9999748" bb="-0.0001541" cb="0.0000921" vb="0.9999271"/>
-+            <tca model="poly3" focal="30" br="-0.0000276" cr="0.0001067" vr="0.9999561" bb="-0.0001001" cb="-0.0000262" vb="0.9999608"/>
-+            <tca model="poly3" focal="31" br="-0.0000147" cr="0.0000757" vr="0.9999669" bb="-0.0001550" cb="0.0000799" vb="0.9999128"/>
-+            <tca model="poly3" focal="32" br="-0.0000147" cr="0.0000757" vr="0.9999669" bb="-0.0001550" cb="0.0000799" vb="0.9999128"/>
-+            <tca model="poly3" focal="33" br="-0.0000147" cr="0.0000757" vr="0.9999669" bb="-0.0001550" cb="0.0000799" vb="0.9999128"/>
-+            <tca model="poly3" focal="34" br="0.0000020" cr="0.0000080" vr="1.0000083" bb="-0.0001221" cb="0.0000361" vb="0.9999098"/>
-+            <tca model="poly3" focal="35" br="-0.0000315" cr="0.0000743" vr="0.9999683" bb="-0.0002006" cb="0.0002110" vb="0.9998378"/>
-+            <tca model="poly3" focal="36" br="-0.0000315" cr="0.0000743" vr="0.9999683" bb="-0.0002006" cb="0.0002110" vb="0.9998378"/>
-+            <tca model="poly3" focal="37" br="0.0000162" cr="-0.0000315" vr="1.0000125" bb="-0.0001136" cb="0.0000350" vb="0.9999376"/>
-+            <tca model="poly3" focal="38" br="0.0000162" cr="-0.0000315" vr="1.0000125" bb="-0.0001136" cb="0.0000350" vb="0.9999376"/>
-+            <tca model="poly3" focal="39" br="0.0000162" cr="-0.0000315" vr="1.0000125" bb="-0.0001136" cb="0.0000350" vb="0.9999376"/>
-+            <tca model="poly3" focal="40" br="-0.0000113" cr="0.0000208" vr="0.9999843" bb="-0.0002226" cb="0.0002580" vb="0.9998716"/>
-+            <tca model="poly3" focal="41" br="-0.0000113" cr="0.0000208" vr="0.9999843" bb="-0.0002226" cb="0.0002580" vb="0.9998716"/>
-+            <tca model="poly3" focal="42" br="-0.0000113" cr="0.0000208" vr="0.9999843" bb="-0.0002226" cb="0.0002580" vb="0.9998716"/>
-+            <tca model="poly3" focal="43" br="-0.0000067" cr="-0.0000019" vr="1.0000013" bb="-0.0002214" cb="0.0002490" vb="0.9999027"/>
-+            <tca model="poly3" focal="44" br="-0.0000067" cr="-0.0000019" vr="1.0000013" bb="-0.0002214" cb="0.0002490" vb="0.9999027"/>
-+            <tca model="poly3" focal="45" br="0.0000014" cr="-0.0000123" vr="1.0000005" bb="-0.0003283" cb="0.0004525" vb="0.9998245"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.4160" k2="-0.0535" k3="-0.2092"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.4160" k2="-0.0535" k3="-0.2092"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="0.0541" k2="-0.6281" k3="-0.0360"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0541" k2="-0.6281" k3="-0.0360"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.2505" k2="0.7187" k3="-0.9480"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2505" k2="0.7187" k3="-0.9480"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.4017" k2="1.1520" k3="-1.1655"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4017" k2="1.1520" k3="-1.1655"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.4148" k2="1.1171" k3="-1.0530"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.4148" k2="1.1171" k3="-1.0530"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.3212" k2="0.7555" k3="-0.7030"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.3212" k2="0.7555" k3="-0.7030"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.2166" k2="0.3349" k3="-0.3206"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.2166" k2="0.3349" k3="-0.3206"/>
-+            <vignetting model="pa" focal="18" aperture="3.9" distance="10" k1="-0.4309" k2="0.3071" k3="-0.2317"/>
-+            <vignetting model="pa" focal="18" aperture="3.9" distance="1000" k1="-0.4309" k2="0.3071" k3="-0.2317"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.4241" k2="0.2954" k3="-0.2265"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.4241" k2="0.2954" k3="-0.2265"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.1319" k2="0.1410" k3="-0.1074"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1319" k2="0.1410" k3="-0.1074"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.1238" k2="0.0888" k3="-0.0480"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1238" k2="0.0888" k3="-0.0480"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1394" k2="0.1180" k3="-0.0645"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1394" k2="0.1180" k3="-0.0645"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.1259" k2="0.0951" k3="-0.0495"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.1259" k2="0.0951" k3="-0.0495"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1373" k2="0.1134" k3="-0.0625"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1373" k2="0.1134" k3="-0.0625"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="10" k1="-0.2750" k2="0.2124" k3="-0.1047"/>
-+            <vignetting model="pa" focal="25" aperture="4.9" distance="1000" k1="-0.2750" k2="0.2124" k3="-0.1047"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.0334" k2="-0.0118" k3="-0.0138"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.0334" k2="-0.0118" k3="-0.0138"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.0782" k2="0.1240" k3="-0.0669"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.0782" k2="0.1240" k3="-0.0669"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="10" k1="-0.0841" k2="0.1289" k3="-0.0656"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.0841" k2="0.1289" k3="-0.0656"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.0772" k2="0.1200" k3="-0.0590"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.0772" k2="0.1200" k3="-0.0590"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.0712" k2="0.1057" k3="-0.0509"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.0712" k2="0.1057" k3="-0.0509"/>
-+            <vignetting model="pa" focal="35" aperture="5.5" distance="10" k1="-0.1301" k2="0.0355" k3="-0.0074"/>
-+            <vignetting model="pa" focal="35" aperture="5.5" distance="1000" k1="-0.1301" k2="0.0355" k3="-0.0074"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1888" k2="0.1667" k3="-0.0708"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1888" k2="0.1667" k3="-0.0708"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.0015" k2="0.0348" k3="-0.0264"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.0015" k2="0.0348" k3="-0.0264"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.0125" k2="0.0582" k3="-0.0401"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.0125" k2="0.0582" k3="-0.0401"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.0031" k2="0.0421" k3="-0.0282"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.0031" k2="0.0421" k3="-0.0282"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.0069" k2="0.0442" k3="-0.0295"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.0069" k2="0.0442" k3="-0.0295"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.2882" k2="0.7409" k3="-0.7107"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.2882" k2="0.7409" k3="-0.7107"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="10" k1="-0.0883" k2="0.3356" k3="-0.2890"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.0883" k2="0.3356" k3="-0.2890"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.0376" k2="0.1277" k3="-0.0958"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.0376" k2="0.1277" k3="-0.0958"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="10" k1="-0.0025" k2="0.0521" k3="-0.0423"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.0025" k2="0.0521" k3="-0.0423"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.0041" k2="0.0502" k3="-0.0419"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.0041" k2="0.0502" k3="-0.0419"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Panasonic</maker>
--	    <model>LUMIX G VARIO 100-300/F4.0-5.6</model>
--	    <focal min="100" max="300" />
--	    <aperture min="4" max="22" />
--	    <mount>Micro 4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="100" model="ptlens" a="-0.000115873" b="0.00367061" c="0.000486072" />
--            <distortion focal="150" model="ptlens" a="-0.000100403" b="0.000815659" c="0.00253173" />
--            <distortion focal="197" model="ptlens" a="-0.0029432" b="0.0069786" c="-0.00246844" />
--            <distortion focal="246" model="ptlens" a="-0.00294535" b="0.0111089" c="-0.010398" /> 
--	        <distortion focal="300" model="ptlens" a="0.00409853" b="-0.00799507" c="0.00980475" />
--	        <tca focal="100" model="poly3" br="-0.0000288" vr="0.9999865" bb="-0.0000845" vb="1.0001016" />
--            <tca focal="150" model="poly3" br="-0.0000893" vr="0.9999362" bb="-0.0000124" vb="0.9998824" />
--            <tca focal="201" model="poly3" br="0.0000085" vr="0.9997969" bb="-0.0001544" vb="0.9997401" />
--            <tca focal="252" model="poly3" br="0.0000600" vr="0.9997044" bb="0.0000330" vb="0.9993205" />
--            <tca focal="300" model="poly3" br="0.0001282" vr="0.9995055" bb="0.0003644" vb="0.9989849" />                   
--	        <vignetting model="pa" focal="100" aperture="4" distance="1.5" k1="-1.0955" k2="1.0732" k3="-0.5374" />
--            <vignetting model="pa" focal="100" aperture="4" distance="3" k1="-0.8250" k2="0.6604" k3="-0.3331" />
--            <vignetting model="pa" focal="100" aperture="4" distance="9" k1="-0.7323" k2="0.5977" k3="-0.3260" />
--            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.6990" k2="0.6356" k3="-0.3703" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1.5" k1="0.0014" k2="-0.2276" k3="-0.0957" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="-0.0627" k2="-0.0453" k3="-0.1597" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="9" k1="-0.0531" k2="-0.1102" k3="-0.0839" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0436" k2="-0.1352" k3="-0.0643" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1.5" k1="-0.1922" k2="0.4486" k3="-0.3736" />
--            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1932" k2="0.4408" k3="-0.3641" />
--            <vignetting model="pa" focal="100" aperture="8" distance="9" k1="-0.1851" k2="0.4138" k3="-0.3466" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1870" k2="0.4082" k3="-0.3438" />
--            <vignetting model="pa" focal="100" aperture="11" distance="1.5" k1="-0.1040" k2="0.0860" k3="-0.0285" />
--            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.1000" k2="0.0686" k3="-0.0150" />
--            <vignetting model="pa" focal="100" aperture="11" distance="9" k1="-0.0860" k2="0.0306" k3="0.0087" />
--            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0870" k2="0.0202" k3="0.0136" />
--            <vignetting model="pa" focal="100" aperture="22" distance="1.5" k1="-0.1171" k2="0.1076" k3="-0.0371" />
--            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1044" k2="0.0750" k3="-0.0163" />
--            <vignetting model="pa" focal="100" aperture="22" distance="9" k1="-0.0819" k2="0.0231" k3="0.0146" />
--            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0742" k2="-0.0119" k3="0.0344" />
--            <vignetting model="pa" focal="150" aperture="4.5" distance="1.5" k1="-0.9708" k2="0.8772" k3="-0.4192" />
--            <vignetting model="pa" focal="150" aperture="4.5" distance="3" k1="-0.7444" k2="0.4822" k3="-0.2016" />
--            <vignetting model="pa" focal="150" aperture="4.5" distance="9" k1="-0.5112" k2="0.0811" k3="0.0150" />
--            <vignetting model="pa" focal="150" aperture="4.5" distance="1000" k1="-0.3935" k2="-0.0608" k3="0.0662" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1.5" k1="-0.0805" k2="-0.6345" k3="0.3377" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1231" k2="-0.8161" k3="0.3880" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="9" k1="0.1168" k2="-0.6028" k3="0.2276" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0686" k2="-0.4034" k3="0.0951" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1.5" k1="-0.0917" k2="0.2725" k3="-0.2315" />
--            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="-0.0833" k2="0.1700" k3="-0.1298" />
--            <vignetting model="pa" focal="150" aperture="8" distance="9" k1="-0.0783" k2="0.1582" k3="-0.1221" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0703" k2="0.1368" k3="-0.1088" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1.5" k1="-0.0323" k2="0.0383" k3="-0.0038" />
--            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.0427" k2="0.0109" k3="0.0178" />
--            <vignetting model="pa" focal="150" aperture="11" distance="9" k1="-0.0318" k2="-0.0089" k3="0.0299" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0299" k2="-0.0215" k3="0.0378" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1.5" k1="-0.0408" k2="0.0638" k3="-0.0213" />
--            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0506" k2="0.0259" k3="0.0078" />
--            <vignetting model="pa" focal="150" aperture="22" distance="9" k1="-0.0307" k2="-0.0083" k3="0.0285" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0369" k2="-0.0062" k3="0.0267" />
--            <vignetting model="pa" focal="197" aperture="4.9" distance="1.5" k1="-0.3910" k2="-0.2972" k3="0.2571" />
--            <vignetting model="pa" focal="197" aperture="4.9" distance="3" k1="-0.4069" k2="-0.1423" k3="0.1062" />
--            <vignetting model="pa" focal="197" aperture="4.9" distance="9" k1="-0.0545" k2="-0.9693" k3="0.5861" />
--            <vignetting model="pa" focal="197" aperture="4.9" distance="1000" k1="0.0149" k2="-1.1890" k3="0.7299" />
--            <vignetting model="pa" focal="197" aperture="5.6" distance="1.5" k1="-0.1439" k2="-0.3976" k3="0.2078" />
--            <vignetting model="pa" focal="197" aperture="5.6" distance="3" k1="0.0717" k2="-0.8687" k3="0.4395" />
--	        <vignetting model="pa" focal="197" aperture="5.6" distance="9" k1="0.2605" k2="-1.2592" k3="0.6404" />
--            <vignetting model="pa" focal="197" aperture="5.6" distance="1000" k1="0.2564" k2="-1.3100" k3="0.6844" />
--            <vignetting model="pa" focal="197" aperture="8" distance="1.5" k1="-0.0399" k2="0.1088" k3="-0.0745" />
--            <vignetting model="pa" focal="197" aperture="8" distance="3" k1="-0.0839" k2="0.2336" k3="-0.1938" />
--            <vignetting model="pa" focal="197" aperture="8" distance="9" k1="-0.0898" k2="0.2598" k3="-0.2195" />
--            <vignetting model="pa" focal="197" aperture="8" distance="1000" k1="-0.0907" k2="0.2745" k3="-0.2411" />
--            <vignetting model="pa" focal="197" aperture="11" distance="1.5" k1="-0.0201" k2="0.0404" k3="-0.0108" />
--            <vignetting model="pa" focal="197" aperture="11" distance="3" k1="-0.0317" k2="0.0195" k3="0.0067" />
--            <vignetting model="pa" focal="197" aperture="11" distance="9" k1="-0.0283" k2="0.0164" k3="0.0083" />
--            <vignetting model="pa" focal="197" aperture="11" distance="1000" k1="-0.0277" k2="0.0125" k3="0.0105" />
--            <vignetting model="pa" focal="197" aperture="22" distance="1.5" k1="-0.0286" k2="0.0613" k3="-0.0242" />
--            <vignetting model="pa" focal="197" aperture="22" distance="3" k1="-0.0260" k2="0.0057" k3="0.0158" />
--            <vignetting model="pa" focal="197" aperture="22" distance="9" k1="-0.0194" k2="-0.0003" k3="0.0170" />
--            <vignetting model="pa" focal="197" aperture="22" distance="1000" k1="-0.0220" k2="-0.0023" k3="0.0192" />
--            <vignetting model="pa" focal="246" aperture="5.3" distance="1.5" k1="-0.2608" k2="-0.5259" k3="0.3610" />
--            <vignetting model="pa" focal="246" aperture="5.3" distance="3" k1="-0.3991" k2="-0.5124" k3="0.4169" />
--            <vignetting model="pa" focal="246" aperture="5.3" distance="9" k1="-0.5003" k2="-0.3435" k3="0.3309" />
--            <vignetting model="pa" focal="246" aperture="5.3" distance="1000" k1="-0.5323" k2="-0.2905" k3="0.3031" />
--            <vignetting model="pa" focal="246" aperture="5.6" distance="1.5" k1="-0.3560" k2="-0.0983" k3="0.0493" />
--            <vignetting model="pa" focal="246" aperture="5.6" distance="3" k1="-0.3121" k2="-0.6532" k3="0.4841" />
--            <vignetting model="pa" focal="246" aperture="5.6" distance="9" k1="-0.4411" k2="-0.4386" k3="0.3764" />
--            <vignetting model="pa" focal="246" aperture="5.6" distance="1000" k1="-0.4499" k2="-0.4224" k3="0.3656" />
--            <vignetting model="pa" focal="246" aperture="8" distance="1.5" k1="-0.0567" k2="0.1869" k3="-0.2111" />
--            <vignetting model="pa" focal="246" aperture="8" distance="3" k1="0.0166" k2="-0.0098" k3="-0.1545" />
--            <vignetting model="pa" focal="246" aperture="8" distance="9" k1="0.0361" k2="-0.1152" k3="-0.0924" />
--            <vignetting model="pa" focal="246" aperture="8" distance="1000" k1="0.0509" k2="-0.1685" k3="-0.0613" />
--            <vignetting model="pa" focal="246" aperture="11" distance="1.5" k1="-0.0395" k2="0.0412" k3="-0.0129" />
--            <vignetting model="pa" focal="246" aperture="11" distance="3" k1="-0.0274" k2="0.0361" k3="-0.0152" />
--            <vignetting model="pa" focal="246" aperture="11" distance="9" k1="-0.0420" k2="0.0741" k3="-0.0470" />
--            <vignetting model="pa" focal="246" aperture="11" distance="1000" k1="-0.0409" k2="0.0821" k3="-0.0567" />
--            <vignetting model="pa" focal="246" aperture="22" distance="1.5" k1="-0.0764" k2="0.1101" k3="-0.0541" />
--            <vignetting model="pa" focal="246" aperture="22" distance="3" k1="-0.0639" k2="0.0931" k3="-0.0446" />
--            <vignetting model="pa" focal="246" aperture="22" distance="9" k1="-0.0567" k2="0.0833" k3="-0.0406" />
--            <vignetting model="pa" focal="246" aperture="22" distance="1000" k1="-0.0654" k2="0.1020" k3="-0.0516" />
--            <vignetting model="pa" focal="300" aperture="5.6" distance="1.5" k1="-0.2600" k2="-0.7092" k3="0.5152" />
--	        <vignetting model="pa" focal="300" aperture="5.6" distance="3" k1="-0.9052" k2="0.4908" k3="-0.1330" />	
--            <vignetting model="pa" focal="300" aperture="5.6" distance="9" k1="-0.9686" k2="0.6111" k3="-0.2010" />
--            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.0075" k2="0.6822" k3="-0.2405" />
--            <vignetting model="pa" focal="300" aperture="8" distance="1.5" k1="0.0773" k2="-0.2965" k3="0.0494" />
--	        <vignetting model="pa" focal="300" aperture="8" distance="3" k1="0.0994" k2="-0.5948" k3="0.2509" />
--            <vignetting model="pa" focal="300" aperture="8" distance="9" k1="0.1010" k2="-0.6763" k3="0.3144" />
--            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0799" k2="-0.6948" k3="0.3399" />
--            <vignetting model="pa" focal="300" aperture="11" distance="1.5" k1="-0.0350" k2="0.0621" k3="-0.0416" />
--            <vignetting model="pa" focal="300" aperture="11" distance="3" k1="-0.0696" k2="0.2147" k3="-0.2020" />
--	        <vignetting model="pa" focal="300" aperture="11" distance="9" k1="-0.0449" k2="0.1895" k3="-0.2176" />
--            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0432" k2="0.1722" k3="-0.2217" />
--            <vignetting model="pa" focal="300" aperture="16" distance="1.5" k1="-0.0255" k2="0.0285" k3="-0.0106" />
--	        <vignetting model="pa" focal="300" aperture="16" distance="3" k1="-0.0331" k2="0.0567" k3="-0.0302" />
--            <vignetting model="pa" focal="300" aperture="16" distance="9" k1="-0.0193" k2="0.0222" k3="-0.0096" />
--            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0239" k2="0.0160" k3="-0.0035" />
--            <vignetting model="pa" focal="300" aperture="22" distance="1.5" k1="-0.0217" k2="0.0226" k3="-0.0074" />
--	        <vignetting model="pa" focal="300" aperture="22" distance="3" k1="-0.0431" k2="0.0849" k3="-0.0478" />
--            <vignetting model="pa" focal="300" aperture="22" distance="9" k1="-0.0379" k2="0.0532" k3="-0.0267" />
--            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.0344" k2="0.0302" k3="-0.0103" />
--	    </calibration>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario HD 14-140mm f/4.0-5.8 Asph. Mega OIS</model>
-+        <model lang="en">Lumix G Vario HD 14-140mm f/4.0-5.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal min="14" max="140"/>
-+        <aperture min="4" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.00966207" b="-0.0543377" c="-0.00740716"/>
-+            <distortion focal="18" model="ptlens" a="0.00949869" b="-0.0385525" c="0.00465051"/>
-+            <distortion focal="25" model="ptlens" a="0.00754759" b="-0.0231595" c="0.00924953"/>
-+            <distortion focal="32" model="ptlens" a="-0.000903732" b="0.00151614" c="-0.00342479"/>
-+            <distortion focal="48" model="ptlens" a="-0.000410749" b="-0.0000791434" c="-0.000958721"/>
-+            <distortion focal="70" model="ptlens" a="-0.00120315" b="0.00145905" c="-0.00120032"/>
-+            <distortion focal="99" model="ptlens" a="0.000923285" b="-0.00651435" c="0.00726719"/>
-+            <distortion focal="140" model="ptlens" a="-0.00190609" b="0.000381078" c="0.00332496"/>
-+            <tca model="poly3" focal="14" br="0.0000867" vr="1.0002346" bb="-0.0000697" vb="1.0001381"/>
-+            <tca model="poly3" focal="18" br="0.0000355" vr="1.0001169" bb="-0.0000740" vb="1.0001872"/>
-+            <tca model="poly3" focal="25" br="0.0000334" vr="1.0000834" bb="-0.0000785" vb="1.0001885"/>
-+            <tca model="poly3" focal="32" br="0.0000818" vr="0.9999374" bb="-0.0000874" vb="1.0001907"/>
-+            <tca model="poly3" focal="48" br="0.0001101" vr="0.9998177" bb="-0.0000759" vb="1.0001548"/>
-+            <tca model="poly3" focal="70" br="0.0001590" vr="0.9994949" bb="-0.0001671" vb="1.0003511"/>
-+            <tca model="poly3" focal="99" br="0.0001559" vr="0.9991839" bb="-0.0001412" vb="1.0003344"/>
-+            <tca model="poly3" focal="140" br="0.0001327" vr="0.9993829" bb="-0.0000982" vb="0.9999327"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="0.1204" k2="-1.4049" k3="0.4935"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1" k1="0.0734" k2="-1.2021" k3="0.3642"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="3" k1="0.0580" k2="-1.1566" k3="0.3308"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="0.0399" k2="-1.0417" k3="0.2322"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.4085" k2="0.6773" k3="-0.9550"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1" k1="-0.4199" k2="0.8066" k3="-1.0284"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="3" k1="-0.4353" k2="0.8178" k3="-1.0256"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.4688" k2="0.9887" k3="-1.1732"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.5555" k2="1.1158" k3="-1.1486"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1" k1="-0.5307" k2="1.1004" k3="-1.1047"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="3" k1="-0.5503" k2="1.1103" k3="-1.0962"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5681" k2="1.2335" k3="-1.2147"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.6285" k2="1.2814" k3="-1.1805"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1" k1="-0.5450" k2="1.0668" k3="-0.9869"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="3" k1="-0.5648" k2="1.0714" k3="-0.9762"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5752" k2="1.1827" k3="-1.0981"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.5163" k2="0.7997" k3="-0.7118"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1" k1="-0.4465" k2="0.6425" k3="-0.5861"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="3" k1="-0.4688" k2="0.6498" k3="-0.5772"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.4439" k2="0.6177" k3="-0.5611"/>
-+            <vignetting model="pa" focal="18" aperture="4.3" distance="0.5" k1="-0.0587" k2="-0.3087" k3="-0.0619"/>
-+            <vignetting model="pa" focal="18" aperture="4.3" distance="1" k1="-0.0649" k2="-0.3425" k3="-0.0108"/>
-+            <vignetting model="pa" focal="18" aperture="4.3" distance="3" k1="-0.0376" k2="-0.3783" k3="0.0035"/>
-+            <vignetting model="pa" focal="18" aperture="4.3" distance="1000" k1="-0.1206" k2="-0.2810" k3="-0.0211"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2639" k2="0.3225" k3="-0.2749"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2540" k2="0.2511" k3="-0.2008"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="3" k1="-0.2239" k2="0.1919" k3="-0.1675"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2989" k2="0.2729" k3="-0.1935"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2039" k2="0.0649" k3="-0.0305"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.1905" k2="0.0058" k3="0.0213"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="3" k1="-0.1749" k2="-0.0319" k3="0.0443"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2510" k2="0.0727" k3="-0.0071"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2086" k2="0.0696" k3="-0.0321"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1" k1="-0.1950" k2="0.0117" k3="0.0177"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="3" k1="-0.1774" k2="-0.0451" k3="0.0564"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2499" k2="0.0656" k3="-0.0023"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2201" k2="0.0801" k3="-0.0365"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2029" k2="0.0209" k3="0.0115"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="3" k1="-0.2022" k2="-0.0032" k3="0.0329"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2515" k2="0.0643" k3="-0.0041"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.0703" k2="-0.0678" k3="-0.1154"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="1" k1="-0.0706" k2="-0.0987" k3="-0.0819"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="3" k1="-0.1087" k2="-0.1066" k3="-0.0571"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1137" k2="-0.0185" k3="-0.1223"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1367" k2="0.2270" k3="-0.2553"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.1238" k2="0.1686" k3="-0.2106"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="3" k1="-0.1719" k2="0.1770" k3="-0.1905"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1728" k2="0.2551" k3="-0.2522"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1133" k2="0.0707" k3="-0.0359"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1" k1="-0.0909" k2="-0.0087" k3="0.0242"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="3" k1="-0.1368" k2="-0.0176" k3="0.0585"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1427" k2="0.0586" k3="0.0036"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1156" k2="0.0687" k3="-0.0341"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1" k1="-0.0924" k2="-0.0104" k3="0.0274"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="3" k1="-0.1298" k2="-0.0376" k3="0.0699"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1495" k2="0.0629" k3="0.0032"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1310" k2="0.0919" k3="-0.0482"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.1049" k2="0.0115" k3="0.0129"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="3" k1="-0.1356" k2="-0.0295" k3="0.0626"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1701" k2="0.1000" k3="-0.0187"/>
-+            <vignetting model="pa" focal="32" aperture="5" distance="0.5" k1="-0.1804" k2="0.5238" k3="-0.6403"/>
-+            <vignetting model="pa" focal="32" aperture="5" distance="1" k1="-0.1598" k2="0.4341" k3="-0.5655"/>
-+            <vignetting model="pa" focal="32" aperture="5" distance="3" k1="-0.1774" k2="0.4073" k3="-0.5354"/>
-+            <vignetting model="pa" focal="32" aperture="5" distance="1000" k1="-0.1748" k2="0.3315" k3="-0.4641"/>
-+            <vignetting model="pa" focal="32" aperture="5.6" distance="0.5" k1="-0.2181" k2="0.7421" k3="-0.7358"/>
-+            <vignetting model="pa" focal="32" aperture="5.6" distance="1" k1="-0.1993" k2="0.6651" k3="-0.6683"/>
-+            <vignetting model="pa" focal="32" aperture="5.6" distance="3" k1="-0.2262" k2="0.6720" k3="-0.6610"/>
-+            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.2204" k2="0.5827" k3="-0.5819"/>
-+            <vignetting model="pa" focal="32" aperture="8" distance="0.5" k1="-0.1110" k2="0.2759" k3="-0.2386"/>
-+            <vignetting model="pa" focal="32" aperture="8" distance="1" k1="-0.0916" k2="0.1892" k3="-0.1561"/>
-+            <vignetting model="pa" focal="32" aperture="8" distance="3" k1="-0.1274" k2="0.2199" k3="-0.1664"/>
-+            <vignetting model="pa" focal="32" aperture="8" distance="1000" k1="-0.1185" k2="0.1155" k3="-0.0746"/>
-+            <vignetting model="pa" focal="32" aperture="11" distance="0.5" k1="-0.0577" k2="0.0604" k3="-0.0446"/>
-+            <vignetting model="pa" focal="32" aperture="11" distance="1" k1="-0.0466" k2="0.0100" k3="0.0040"/>
-+            <vignetting model="pa" focal="32" aperture="11" distance="3" k1="-0.0834" k2="0.0401" k3="-0.0041"/>
-+            <vignetting model="pa" focal="32" aperture="11" distance="1000" k1="-0.0842" k2="-0.0332" k3="0.0624"/>
-+            <vignetting model="pa" focal="32" aperture="22" distance="0.5" k1="-0.0563" k2="0.0338" k3="-0.0179"/>
-+            <vignetting model="pa" focal="32" aperture="22" distance="1" k1="-0.0453" k2="-0.0003" k3="0.0132"/>
-+            <vignetting model="pa" focal="32" aperture="22" distance="3" k1="-0.0912" k2="0.0448" k3="-0.0020"/>
-+            <vignetting model="pa" focal="32" aperture="22" distance="1000" k1="-0.0912" k2="-0.0265" k3="0.0605"/>
-+            <vignetting model="pa" focal="48" aperture="5.5" distance="0.5" k1="-0.1135" k2="0.2612" k3="-0.3764"/>
-+            <vignetting model="pa" focal="48" aperture="5.5" distance="1" k1="-0.1146" k2="0.2464" k3="-0.3838"/>
-+            <vignetting model="pa" focal="48" aperture="5.5" distance="3" k1="-0.1258" k2="0.1982" k3="-0.3434"/>
-+            <vignetting model="pa" focal="48" aperture="5.5" distance="1000" k1="-0.1058" k2="0.1661" k3="-0.3322"/>
-+            <vignetting model="pa" focal="48" aperture="5.6" distance="0.5" k1="-0.0985" k2="0.2631" k3="-0.3835"/>
-+            <vignetting model="pa" focal="48" aperture="5.6" distance="1" k1="-0.0910" k2="0.2435" k3="-0.3853"/>
-+            <vignetting model="pa" focal="48" aperture="5.6" distance="3" k1="-0.1044" k2="0.2104" k3="-0.3583"/>
-+            <vignetting model="pa" focal="48" aperture="5.6" distance="1000" k1="-0.0888" k2="0.1702" k3="-0.3365"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="0.5" k1="-0.0533" k2="0.1502" k3="-0.1199"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="1" k1="-0.0400" k2="0.1107" k3="-0.0924"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="3" k1="-0.0587" k2="0.0937" k3="-0.0755"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="1000" k1="-0.0424" k2="0.0531" k3="-0.0553"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="0.5" k1="-0.0264" k2="0.0504" k3="-0.0316"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="1" k1="-0.0076" k2="-0.0098" k3="0.0127"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="3" k1="-0.0276" k2="-0.0234" k3="0.0270"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="1000" k1="-0.0100" k2="-0.0670" k3="0.0501"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="0.5" k1="-0.0150" k2="0.0008" k3="0.0043"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="1" k1="-0.0110" k2="-0.0075" k3="0.0131"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="3" k1="-0.0283" k2="-0.0270" k3="0.0299"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="1000" k1="-0.0148" k2="-0.0606" k3="0.0469"/>
-+            <vignetting model="pa" focal="48" aperture="22" distance="0.5" k1="-0.0254" k2="0.0275" k3="-0.0124"/>
-+            <vignetting model="pa" focal="48" aperture="22" distance="1" k1="-0.0172" k2="0.0038" k3="0.0061"/>
-+            <vignetting model="pa" focal="48" aperture="22" distance="3" k1="-0.0417" k2="0.0069" k3="0.0079"/>
-+            <vignetting model="pa" focal="48" aperture="22" distance="1000" k1="-0.0217" k2="-0.0465" k3="0.0378"/>
-+            <vignetting model="pa" focal="70" aperture="5.8" distance="0.5" k1="-0.2468" k2="0.5478" k3="-0.5848"/>
-+            <vignetting model="pa" focal="70" aperture="5.8" distance="1" k1="-0.2083" k2="0.4559" k3="-0.5517"/>
-+            <vignetting model="pa" focal="70" aperture="5.8" distance="3" k1="-0.2088" k2="0.3943" k3="-0.5079"/>
-+            <vignetting model="pa" focal="70" aperture="5.8" distance="1000" k1="-0.2169" k2="0.3614" k3="-0.4757"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.5" k1="-0.0527" k2="0.2241" k3="-0.1981"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.0602" k2="0.2572" k3="-0.2299"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="3" k1="-0.0702" k2="0.2278" k3="-0.2037"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0705" k2="0.2088" k3="-0.1901"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.5" k1="-0.0052" k2="0.0427" k3="-0.0391"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="0.0065" k2="0.0053" k3="-0.0057"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="3" k1="-0.0025" k2="-0.0234" k3="0.0165"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0053" k2="-0.0383" k3="0.0307"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="0.5" k1="-0.0028" k2="0.0262" k3="-0.0236"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="0.0055" k2="-0.0001" k3="0.0008"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="3" k1="-0.0050" k2="-0.0238" k3="0.0196"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.0114" k2="-0.0280" k3="0.0261"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="0.5" k1="-0.0114" k2="0.0408" k3="-0.0315"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1" k1="-0.0012" k2="0.0096" k3="-0.0034"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="3" k1="-0.0080" k2="-0.0222" k3="0.0181"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0183" k2="-0.0112" k3="0.0150"/>
-+            <vignetting model="pa" focal="99" aperture="5.8" distance="0.5" k1="-0.3418" k2="0.8556" k3="-0.9367"/>
-+            <vignetting model="pa" focal="99" aperture="5.8" distance="1" k1="-0.1814" k2="0.2439" k3="-0.4961"/>
-+            <vignetting model="pa" focal="99" aperture="5.8" distance="3" k1="-0.1118" k2="-0.0229" k3="-0.3051"/>
-+            <vignetting model="pa" focal="99" aperture="5.8" distance="1000" k1="-0.0967" k2="-0.1548" k3="-0.1961"/>
-+            <vignetting model="pa" focal="99" aperture="8" distance="0.5" k1="-0.1868" k2="0.7844" k3="-0.7327"/>
-+            <vignetting model="pa" focal="99" aperture="8" distance="1" k1="-0.1717" k2="0.6821" k3="-0.6645"/>
-+            <vignetting model="pa" focal="99" aperture="8" distance="3" k1="-0.1406" k2="0.6005" k3="-0.6117"/>
-+            <vignetting model="pa" focal="99" aperture="8" distance="1000" k1="-0.1527" k2="0.5551" k3="-0.5731"/>
-+            <vignetting model="pa" focal="99" aperture="11" distance="0.5" k1="-0.0571" k2="0.2611" k3="-0.2392"/>
-+            <vignetting model="pa" focal="99" aperture="11" distance="1" k1="-0.0651" k2="0.2200" k3="-0.1956"/>
-+            <vignetting model="pa" focal="99" aperture="11" distance="3" k1="-0.0435" k2="0.1696" k3="-0.1602"/>
-+            <vignetting model="pa" focal="99" aperture="11" distance="1000" k1="-0.0782" k2="0.1915" k3="-0.1710"/>
-+            <vignetting model="pa" focal="99" aperture="16" distance="0.5" k1="0.0036" k2="0.0202" k3="-0.0224"/>
-+            <vignetting model="pa" focal="99" aperture="16" distance="1" k1="-0.0159" k2="0.0176" k3="-0.0103"/>
-+            <vignetting model="pa" focal="99" aperture="16" distance="3" k1="0.0022" k2="-0.0133" k3="0.0077"/>
-+            <vignetting model="pa" focal="99" aperture="16" distance="1000" k1="-0.0221" k2="-0.0366" k3="0.0377"/>
-+            <vignetting model="pa" focal="99" aperture="22" distance="0.5" k1="0.0052" k2="0.0008" k3="-0.0030"/>
-+            <vignetting model="pa" focal="99" aperture="22" distance="1" k1="-0.0165" k2="0.0107" k3="-0.0031"/>
-+            <vignetting model="pa" focal="99" aperture="22" distance="3" k1="-0.0055" k2="0.0049" k3="-0.0040"/>
-+            <vignetting model="pa" focal="99" aperture="22" distance="1000" k1="-0.0262" k2="-0.0336" k3="0.0371"/>
-+            <vignetting model="pa" focal="140" aperture="5.8" distance="0.5" k1="-0.2318" k2="0.6000" k3="-0.8918"/>
-+            <vignetting model="pa" focal="140" aperture="5.8" distance="1" k1="0.0607" k2="-0.6084" k3="0.0529"/>
-+            <vignetting model="pa" focal="140" aperture="5.8" distance="3" k1="0.1067" k2="-0.9530" k3="0.3587"/>
-+            <vignetting model="pa" focal="140" aperture="5.8" distance="1000" k1="0.1003" k2="-1.0369" k3="0.4506"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="0.5" k1="-0.2470" k2="1.1758" k3="-1.2411"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="1" k1="-0.0542" k2="0.4705" k3="-0.6946"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="3" k1="0.0074" k2="0.1963" k3="-0.4765"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="0.0358" k2="0.0801" k3="-0.3855"/>
-+            <vignetting model="pa" focal="140" aperture="11" distance="0.5" k1="-0.2548" k2="1.0687" k3="-1.0002"/>
-+            <vignetting model="pa" focal="140" aperture="11" distance="1" k1="-0.1400" k2="0.6396" k3="-0.6297"/>
-+            <vignetting model="pa" focal="140" aperture="11" distance="3" k1="-0.1257" k2="0.5400" k3="-0.5388"/>
-+            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.1251" k2="0.5189" k3="-0.5126"/>
-+            <vignetting model="pa" focal="140" aperture="16" distance="0.5" k1="-0.1405" k2="0.5837" k3="-0.5246"/>
-+            <vignetting model="pa" focal="140" aperture="16" distance="1" k1="-0.0235" k2="0.1481" k3="-0.1453"/>
-+            <vignetting model="pa" focal="140" aperture="16" distance="3" k1="-0.0169" k2="0.0659" k3="-0.0620"/>
-+            <vignetting model="pa" focal="140" aperture="16" distance="1000" k1="-0.0305" k2="0.0938" k3="-0.0757"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="0.5" k1="-0.0328" k2="0.1547" k3="-0.1340"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="1" k1="0.0092" k2="0.0086" k3="-0.0156"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="3" k1="-0.0056" k2="0.0098" k3="-0.0061"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0267" k2="0.0536" k3="-0.0313"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Panasonic</maker>
--        <model>Leica DG Summilux 25/f1.4</model>
--	<mount>Micro 4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <model>Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS</model>
-+        <model lang="en">Lumix G Vario 45-200mm f/4.0-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="45" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="61" a="0" b="0.00494" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0.00645" c="0"/>
-+            <distortion model="ptlens" focal="103" a="-0.001" b="0.007" c="0.002"/>
-+            <distortion model="ptlens" focal="144" a="-0.005" b="0.023" c="-0.015"/>
-+            <distortion model="ptlens" focal="180" a="-0.003" b="0.020" c="-0.017"/>
-+            <distortion model="ptlens" focal="200" a="0.004" b="-0.007" c="0.012"/>
-+            <tca model="poly3" focal="45" br="0.0002491" cr="-0.0003291" vr="1.0003614" bb="-0.0002521" cb="0.0003911" vb="1.0001921"/>
-+            <tca model="poly3" focal="48" br="0.0002909" cr="-0.0005117" vr="1.0004838" bb="-0.0002371" cb="0.0004303" vb="1.0001433"/>
-+            <tca model="poly3" focal="51" br="0.0000570" cr="-0.0000572" vr="1.0002728" bb="-0.0002094" cb="0.0003893" vb="1.0001340"/>
-+            <tca model="poly3" focal="54" br="0.0001358" cr="-0.0002477" vr="1.0003771" bb="-0.0002789" cb="0.0005808" vb="1.0000762"/>
-+            <tca model="poly3" focal="56" br="-0.0000164" cr="-0.0000112" vr="1.0002853" bb="-0.0002080" cb="0.0004875" vb="1.0001319"/>
-+            <tca model="poly3" focal="58" br="-0.0001291" cr="0.0001690" vr="1.0002287" bb="-0.0002333" cb="0.0005439" vb="1.0000954"/>
-+            <tca model="poly3" focal="60" br="-0.0000461" cr="-0.0000129" vr="1.0002900" bb="-0.0001714" cb="0.0004801" vb="1.0000342"/>
-+            <tca model="poly3" focal="61" br="-0.0001310" cr="0.0001226" vr="1.0002525" bb="-0.0001563" cb="0.0004613" vb="1.0000603"/>
-+            <tca model="poly3" focal="64" br="-0.0001245" cr="0.0001321" vr="1.0002061" bb="-0.0001024" cb="0.0003560" vb="1.0000513"/>
-+            <tca model="poly3" focal="67" br="-0.0000861" cr="0.0000129" vr="1.0002805" bb="-0.0000366" cb="0.0002734" vb="1.0001014"/>
-+            <tca model="poly3" focal="70" br="-0.0000833" cr="-0.0000246" vr="1.0002973" bb="-0.0000276" cb="0.0002149" vb="1.0001060"/>
-+            <tca model="poly3" focal="72" br="-0.0001446" cr="0.0001549" vr="1.0001286" bb="-0.0000490" cb="0.0002554" vb="0.9999955"/>
-+            <tca model="poly3" focal="75" br="-0.0000553" cr="-0.0000917" vr="1.0002702" bb="-0.0000377" cb="0.0002348" vb="0.9999980"/>
-+            <tca model="poly3" focal="78" br="0.0000080" cr="-0.0002679" vr="1.0003734" bb="-0.0000076" cb="0.0001643" vb="1.0000291"/>
-+            <tca model="poly3" focal="84" br="-0.0000692" cr="-0.0000673" vr="1.0002094" bb="-0.0000708" cb="0.0002790" vb="0.9999036"/>
-+            <tca model="poly3" focal="87" br="-0.0000225" cr="-0.0001272" vr="1.0001567" bb="-0.0000733" cb="0.0003031" vb="0.9997940"/>
-+            <tca model="poly3" focal="91" br="-0.0000838" cr="0.0000524" vr="1.0000039" bb="-0.0000940" cb="0.0003413" vb="0.9996942"/>
-+            <tca model="poly3" focal="97" br="-0.0000760" cr="-0.0000063" vr="1.0000045" bb="-0.0000976" cb="0.0003433" vb="0.9996213"/>
-+            <tca model="poly3" focal="103" br="-0.0001313" cr="0.0001422" vr="0.9998652" bb="-0.0000656" cb="0.0003064" vb="0.9995406"/>
-+            <tca model="poly3" focal="109" br="-0.0002464" cr="0.0004299" vr="0.9996141" bb="-0.0001265" cb="0.0003912" vb="0.9994278"/>
-+            <tca model="poly3" focal="115" br="-0.0002238" cr="-0.0004029" vr="0.9995575" bb="-0.0000389" cb="0.0002367" vb="0.9994119"/>
-+            <tca model="poly3" focal="124" br="-0.0002462" cr="0.0004402" vr="0.9994769" bb="0.0000483" cb="0.0000813" vb="0.9993894"/>
-+            <tca model="poly3" focal="128" br="-0.0003208" cr="0.0005956" vr="0.9993373" bb="0.0000136" cb="0.0001659" vb="0.9993007"/>
-+            <tca model="poly3" focal="136" br="-0.0002478" cr="0.0004831" vr="0.9992168" bb="0.0002149" cb="-0.0002975" vb="0.9994873"/>
-+            <tca model="poly3" focal="144" br="-0.0003296" cr="0.0007404" vr="0.9989345" bb="0.0002767" cb="-0.0003831" vb="0.9994482"/>
-+            <tca model="poly3" focal="151" br="-0.0004167" cr="0.00084113" vr="0.9989021" bb="0.0002371" cb="-0.0002466" vb="0.9993190"/>
-+            <tca model="poly3" focal="158" br="-0.0003654" cr="0.0007633" vr="0.9988054" bb="0.0002777" cb="-0.0002939" vb="0.9992661"/>
-+            <tca model="poly3" focal="166" br="-0.0003434" cr="0.0007445" vr="0.9987393" bb="0.0002284" cb="-0.0001623" vb="0.9991666"/>
-+            <tca model="poly3" focal="171" br="-0.0003770" cr="0.0010373" vr="0.9982450" bb="0.0002746" cb="-0.0003666" vb="0.9993719"/>
-+            <tca model="poly3" focal="175" br="-0.0002354" cr="0.0007147" vr="0.9984138" bb="0.0002058" cb="-0.0001702" vb="0.9992057"/>
-+            <tca model="poly3" focal="184" br="-0.0001451" cr="0.0005013" vr="0.9984561" bb="0.0002734" cb="-0.0002731" vb="0.9991873"/>
-+            <tca model="poly3" focal="189" br="-0.0002848" cr="0.0007834" vr="0.9983149" bb="0.0002174" cb="-0.0001037" vb="0.9990331"/>
-+            <tca model="poly3" focal="195" br="-0.0003179" cr="0.0009810" vr="0.9980567" bb="0.0003163" cb="-0.0003625" vb="0.9991786"/>
-+            <tca model="poly3" focal="200" br="-0.0001336" cr="0.0006505" vr="0.9981137" bb="0.0002790" cb="-0.0003193" vb="0.9992274"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario 100-300mm f/4.0-5.6 Mega OIS</model>
-+        <model lang="en">Lumix G Vario 100-300mm f/4.0-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal min="100" max="300"/>
-+        <aperture min="4" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="100" model="ptlens" a="-0.000115873" b="0.00367061" c="0.000486072"/>
-+            <distortion focal="150" model="ptlens" a="-0.000100403" b="0.000815659" c="0.00253173"/>
-+            <distortion focal="197" model="ptlens" a="-0.0029432" b="0.0069786" c="-0.00246844"/>
-+            <distortion focal="246" model="ptlens" a="-0.00294535" b="0.0111089" c="-0.010398"/>
-+            <distortion focal="300" model="ptlens" a="0.00409853" b="-0.00799507" c="0.00980475"/>
-+            <tca focal="100" model="poly3" br="-0.0000288" vr="0.9999865" bb="-0.0000845" vb="1.0001016"/>
-+            <tca focal="150" model="poly3" br="-0.0000893" vr="0.9999362" bb="-0.0000124" vb="0.9998824"/>
-+            <tca focal="201" model="poly3" br="0.0000085" vr="0.9997969" bb="-0.0001544" vb="0.9997401"/>
-+            <tca focal="252" model="poly3" br="0.0000600" vr="0.9997044" bb="0.0000330" vb="0.9993205"/>
-+            <tca focal="300" model="poly3" br="0.0001282" vr="0.9995055" bb="0.0003644" vb="0.9989849"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1.5" k1="-1.0955" k2="1.0732" k3="-0.5374"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="3" k1="-0.8250" k2="0.6604" k3="-0.3331"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="9" k1="-0.7323" k2="0.5977" k3="-0.3260"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.6990" k2="0.6356" k3="-0.3703"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1.5" k1="0.0014" k2="-0.2276" k3="-0.0957"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="-0.0627" k2="-0.0453" k3="-0.1597"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="9" k1="-0.0531" k2="-0.1102" k3="-0.0839"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0436" k2="-0.1352" k3="-0.0643"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1.5" k1="-0.1922" k2="0.4486" k3="-0.3736"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.1932" k2="0.4408" k3="-0.3641"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="9" k1="-0.1851" k2="0.4138" k3="-0.3466"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1870" k2="0.4082" k3="-0.3438"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1.5" k1="-0.1040" k2="0.0860" k3="-0.0285"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.1000" k2="0.0686" k3="-0.0150"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="9" k1="-0.0860" k2="0.0306" k3="0.0087"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0870" k2="0.0202" k3="0.0136"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1.5" k1="-0.1171" k2="0.1076" k3="-0.0371"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.1044" k2="0.0750" k3="-0.0163"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="9" k1="-0.0819" k2="0.0231" k3="0.0146"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0742" k2="-0.0119" k3="0.0344"/>
-+            <vignetting model="pa" focal="150" aperture="4.5" distance="1.5" k1="-0.9708" k2="0.8772" k3="-0.4192"/>
-+            <vignetting model="pa" focal="150" aperture="4.5" distance="3" k1="-0.7444" k2="0.4822" k3="-0.2016"/>
-+            <vignetting model="pa" focal="150" aperture="4.5" distance="9" k1="-0.5112" k2="0.0811" k3="0.0150"/>
-+            <vignetting model="pa" focal="150" aperture="4.5" distance="1000" k1="-0.3935" k2="-0.0608" k3="0.0662"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1.5" k1="-0.0805" k2="-0.6345" k3="0.3377"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="3" k1="0.1231" k2="-0.8161" k3="0.3880"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="9" k1="0.1168" k2="-0.6028" k3="0.2276"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.0686" k2="-0.4034" k3="0.0951"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1.5" k1="-0.0917" k2="0.2725" k3="-0.2315"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="3" k1="-0.0833" k2="0.1700" k3="-0.1298"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="9" k1="-0.0783" k2="0.1582" k3="-0.1221"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0703" k2="0.1368" k3="-0.1088"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1.5" k1="-0.0323" k2="0.0383" k3="-0.0038"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="3" k1="-0.0427" k2="0.0109" k3="0.0178"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="9" k1="-0.0318" k2="-0.0089" k3="0.0299"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0299" k2="-0.0215" k3="0.0378"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1.5" k1="-0.0408" k2="0.0638" k3="-0.0213"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="3" k1="-0.0506" k2="0.0259" k3="0.0078"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="9" k1="-0.0307" k2="-0.0083" k3="0.0285"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0369" k2="-0.0062" k3="0.0267"/>
-+            <vignetting model="pa" focal="197" aperture="4.9" distance="1.5" k1="-0.3910" k2="-0.2972" k3="0.2571"/>
-+            <vignetting model="pa" focal="197" aperture="4.9" distance="3" k1="-0.4069" k2="-0.1423" k3="0.1062"/>
-+            <vignetting model="pa" focal="197" aperture="4.9" distance="9" k1="-0.0545" k2="-0.9693" k3="0.5861"/>
-+            <vignetting model="pa" focal="197" aperture="4.9" distance="1000" k1="0.0149" k2="-1.1890" k3="0.7299"/>
-+            <vignetting model="pa" focal="197" aperture="5.6" distance="1.5" k1="-0.1439" k2="-0.3976" k3="0.2078"/>
-+            <vignetting model="pa" focal="197" aperture="5.6" distance="3" k1="0.0717" k2="-0.8687" k3="0.4395"/>
-+            <vignetting model="pa" focal="197" aperture="5.6" distance="9" k1="0.2605" k2="-1.2592" k3="0.6404"/>
-+            <vignetting model="pa" focal="197" aperture="5.6" distance="1000" k1="0.2564" k2="-1.3100" k3="0.6844"/>
-+            <vignetting model="pa" focal="197" aperture="8" distance="1.5" k1="-0.0399" k2="0.1088" k3="-0.0745"/>
-+            <vignetting model="pa" focal="197" aperture="8" distance="3" k1="-0.0839" k2="0.2336" k3="-0.1938"/>
-+            <vignetting model="pa" focal="197" aperture="8" distance="9" k1="-0.0898" k2="0.2598" k3="-0.2195"/>
-+            <vignetting model="pa" focal="197" aperture="8" distance="1000" k1="-0.0907" k2="0.2745" k3="-0.2411"/>
-+            <vignetting model="pa" focal="197" aperture="11" distance="1.5" k1="-0.0201" k2="0.0404" k3="-0.0108"/>
-+            <vignetting model="pa" focal="197" aperture="11" distance="3" k1="-0.0317" k2="0.0195" k3="0.0067"/>
-+            <vignetting model="pa" focal="197" aperture="11" distance="9" k1="-0.0283" k2="0.0164" k3="0.0083"/>
-+            <vignetting model="pa" focal="197" aperture="11" distance="1000" k1="-0.0277" k2="0.0125" k3="0.0105"/>
-+            <vignetting model="pa" focal="197" aperture="22" distance="1.5" k1="-0.0286" k2="0.0613" k3="-0.0242"/>
-+            <vignetting model="pa" focal="197" aperture="22" distance="3" k1="-0.0260" k2="0.0057" k3="0.0158"/>
-+            <vignetting model="pa" focal="197" aperture="22" distance="9" k1="-0.0194" k2="-0.0003" k3="0.0170"/>
-+            <vignetting model="pa" focal="197" aperture="22" distance="1000" k1="-0.0220" k2="-0.0023" k3="0.0192"/>
-+            <vignetting model="pa" focal="246" aperture="5.3" distance="1.5" k1="-0.2608" k2="-0.5259" k3="0.3610"/>
-+            <vignetting model="pa" focal="246" aperture="5.3" distance="3" k1="-0.3991" k2="-0.5124" k3="0.4169"/>
-+            <vignetting model="pa" focal="246" aperture="5.3" distance="9" k1="-0.5003" k2="-0.3435" k3="0.3309"/>
-+            <vignetting model="pa" focal="246" aperture="5.3" distance="1000" k1="-0.5323" k2="-0.2905" k3="0.3031"/>
-+            <vignetting model="pa" focal="246" aperture="5.6" distance="1.5" k1="-0.3560" k2="-0.0983" k3="0.0493"/>
-+            <vignetting model="pa" focal="246" aperture="5.6" distance="3" k1="-0.3121" k2="-0.6532" k3="0.4841"/>
-+            <vignetting model="pa" focal="246" aperture="5.6" distance="9" k1="-0.4411" k2="-0.4386" k3="0.3764"/>
-+            <vignetting model="pa" focal="246" aperture="5.6" distance="1000" k1="-0.4499" k2="-0.4224" k3="0.3656"/>
-+            <vignetting model="pa" focal="246" aperture="8" distance="1.5" k1="-0.0567" k2="0.1869" k3="-0.2111"/>
-+            <vignetting model="pa" focal="246" aperture="8" distance="3" k1="0.0166" k2="-0.0098" k3="-0.1545"/>
-+            <vignetting model="pa" focal="246" aperture="8" distance="9" k1="0.0361" k2="-0.1152" k3="-0.0924"/>
-+            <vignetting model="pa" focal="246" aperture="8" distance="1000" k1="0.0509" k2="-0.1685" k3="-0.0613"/>
-+            <vignetting model="pa" focal="246" aperture="11" distance="1.5" k1="-0.0395" k2="0.0412" k3="-0.0129"/>
-+            <vignetting model="pa" focal="246" aperture="11" distance="3" k1="-0.0274" k2="0.0361" k3="-0.0152"/>
-+            <vignetting model="pa" focal="246" aperture="11" distance="9" k1="-0.0420" k2="0.0741" k3="-0.0470"/>
-+            <vignetting model="pa" focal="246" aperture="11" distance="1000" k1="-0.0409" k2="0.0821" k3="-0.0567"/>
-+            <vignetting model="pa" focal="246" aperture="22" distance="1.5" k1="-0.0764" k2="0.1101" k3="-0.0541"/>
-+            <vignetting model="pa" focal="246" aperture="22" distance="3" k1="-0.0639" k2="0.0931" k3="-0.0446"/>
-+            <vignetting model="pa" focal="246" aperture="22" distance="9" k1="-0.0567" k2="0.0833" k3="-0.0406"/>
-+            <vignetting model="pa" focal="246" aperture="22" distance="1000" k1="-0.0654" k2="0.1020" k3="-0.0516"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1.5" k1="-0.2600" k2="-0.7092" k3="0.5152"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="3" k1="-0.9052" k2="0.4908" k3="-0.1330"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="9" k1="-0.9686" k2="0.6111" k3="-0.2010"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.0075" k2="0.6822" k3="-0.2405"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1.5" k1="0.0773" k2="-0.2965" k3="0.0494"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="3" k1="0.0994" k2="-0.5948" k3="0.2509"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="9" k1="0.1010" k2="-0.6763" k3="0.3144"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0799" k2="-0.6948" k3="0.3399"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1.5" k1="-0.0350" k2="0.0621" k3="-0.0416"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="3" k1="-0.0696" k2="0.2147" k3="-0.2020"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="9" k1="-0.0449" k2="0.1895" k3="-0.2176"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0432" k2="0.1722" k3="-0.2217"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1.5" k1="-0.0255" k2="0.0285" k3="-0.0106"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="3" k1="-0.0331" k2="0.0567" k3="-0.0302"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="9" k1="-0.0193" k2="0.0222" k3="-0.0096"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0239" k2="0.0160" k3="-0.0035"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="1.5" k1="-0.0217" k2="0.0226" k3="-0.0074"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="3" k1="-0.0431" k2="0.0849" k3="-0.0478"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="9" k1="-0.0379" k2="0.0532" k3="-0.0267"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.0344" k2="0.0302" k3="-0.0103"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>Leica D Summilux 25mm f/1.4 Asph.</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-         <calibration>
-             <!-- Taken with Olympus OMD E-M5 -->
--            <distortion model="ptlens" focal="25" a="-0.00305" b="-0.01088" c="-0.00658" />
--            <tca model="poly3" focal="25" br="-0.0000700" vr="1.0002675" bb="0.0001262" vb="0.9998339" />
-+            <distortion model="ptlens" focal="25" a="-0.00305" b="-0.01088" c="-0.00658"/>
-+            <tca model="poly3" focal="25" br="-0.0000700" vr="1.0002675" bb="0.0001262" vb="0.9998339"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G X Vario 35-100mm f/2.8 Power OIS</model>
-+        <model lang="en">Lumix G X Vario 35-100mm f/2.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus OMD E-M5 -->
-+            <distortion model="poly3" focal="35" k1="-0.02122"/>
-+            <distortion model="poly3" focal="42" k1="-0.01741"/>
-+            <distortion model="poly3" focal="50" k1="-0.01282"/>
-+            <distortion model="poly3" focal="60" k1="-0.00907"/>
-+            <distortion model="poly3" focal="80" k1="-0.00599"/>
-+            <distortion model="poly3" focal="100" k1="-0.00245"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G X Vario 12-35mm f/2.8 Asph. Power OIS</model>
-+        <model lang="en">Lumix G X Vario 12-35mm f/2.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus OMD E-M5 -->
-+            <distortion model="ptlens" focal="12" a="0.03626" b="-0.10638" c="0.01966"/>
-+            <distortion model="ptlens" focal="14" a="0.02827" b="-0.0854" c="0.03073"/>
-+            <distortion model="ptlens" focal="16" a="0.01689" b="-0.05145" c="0.01488"/>
-+            <distortion model="ptlens" focal="18" a="0.01148" b="-0.02851" c="-0.00308"/>
-+            <distortion model="ptlens" focal="20" a="0.01696" b="-0.04944" c="0.03292"/>
-+            <distortion model="ptlens" focal="22" a="0.00991" b="-0.02582" c="0.01252"/>
-+            <distortion model="ptlens" focal="25" a="0.00656" b="-0.01302" c="0.00572"/>
-+            <distortion model="ptlens" focal="28" a="0.00728" b="-0.01959" c="0.02348"/>
-+            <distortion model="ptlens" focal="30" a="0.00348" b="-0.0034" c="0.00414"/>
-+            <distortion model="ptlens" focal="32" a="0.00427" b="-0.00676" c="0.01112"/>
-+            <distortion model="ptlens" focal="35" a="0.00938" b="-0.02043" c="0.02524"/>
-+            <tca model="poly3" focal="12" vr="1.0003736" vb="1.0000643"/>
-+            <tca model="poly3" focal="14" vr="1.0003255" vb="1.0000556"/>
-+            <tca model="poly3" focal="16" vr="1.0003447" vb="1.0000236"/>
-+            <tca model="poly3" focal="18" vr="1.0003571" vb="1.0000159"/>
-+            <tca model="poly3" focal="20" vr="1.0002871" vb="1.0000087"/>
-+            <tca model="poly3" focal="22" vr="1.0002596" vb="0.9999957"/>
-+            <tca model="poly3" focal="25" vr="1.0002534" vb="1.0000103"/>
-+            <tca model="poly3" focal="28" vr="1.0001711" vb="0.9999986"/>
-+            <tca model="poly3" focal="30" vr="1.0001151" vb="1.0000065"/>
-+            <tca model="poly3" focal="32" vr="1.0000555" vb="1.0000802"/>
-+            <tca model="poly3" focal="35" vr="1" vb="1.0003"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 20mm f/1.7 II Asph.</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with DMC-GX7 -->
-+            <distortion model="ptlens" focal="20" a="0.01169" b="-0.0533" c="0.02618"/>
-+            <tca model="poly3" focal="20" vr="1.0002" vb="1.0002"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario 35-100mm f/4.0-5.6 Asph. Mega OIS</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-PL7 -->
-+            <distortion model="ptlens" focal="35" a="0.00663258" b="-0.0185251" c="0.0134508"/>
-+            <distortion model="ptlens" focal="40" a="0.00258479" b="-0.00661156" c="0.00697864"/>
-+            <distortion model="ptlens" focal="45" a="0.000553098" b="0.00439218" c="-0.00355882"/>
-+            <distortion model="ptlens" focal="50" a="0.000346598" b="0.00614855" c="-0.00173778"/>
-+            <distortion model="ptlens" focal="62" a="-0.000115581" b="0.00511291" c="0.00988016"/>
-+            <distortion model="ptlens" focal="78" a="-0.0104497" b="0.039446" c="-0.0251468"/>
-+            <distortion model="ptlens" focal="100" a="-0.0131383" b="0.0562571" c="-0.0528326"/>
-+            <tca model="poly3" focal="35" vr="1.0001700" vb="1.0003000"/>
-+            <tca model="poly3" focal="40" vr="1.0000925" vb="1.0002249"/>
-+            <tca model="poly3" focal="45" vr="1.0000558" vb="1.0001441"/>
-+            <tca model="poly3" focal="50" vr="1.0000459" vb="1.0001676"/>
-+            <tca model="poly3" focal="62" vr="0.9999844" vb="1.0000683"/>
-+            <tca model="poly3" focal="78" vr="0.9999536" vb="0.9999292"/>
-+            <tca model="poly3" focal="100" vr="0.9999000" vb="0.9996000"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario 45-150mm f/4.0-5.6 Asph. Mega OIS</model>
-+        <model lang="en">Lumix G Vario 45-150mm f/4.0-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with DMC-GX7 -->
-+            <distortion focal="45" model="ptlens" a="-0.01139" b="0.04017" c="-0.04716"/>
-+            <distortion focal="57" model="ptlens" a="-0.00155" b="0.00515" c="0.00461"/>
-+            <distortion focal="76" model="ptlens" a="0.00308" b="-0.00023" c="-0.00171"/>
-+            <distortion focal="103" model="ptlens" a="0.00053" b="-0.00134" c="0.01016"/>
-+            <distortion focal="121" model="ptlens" a="-0.01453" b="0.05028" c="-0.04729"/>
-+            <distortion focal="150" model="ptlens" a="-0.00394" b="0.00897" c="0.00515"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="10" k1="-0.8113" k2="0.2809" k3="-0.0648"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.8113" k2="0.2809" k3="-0.0648"/>
-+            <vignetting model="pa" focal="45" aperture="4.5" distance="10" k1="-0.1597" k2="-0.9743" k3="0.6101"/>
-+            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.1597" k2="-0.9743" k3="0.6101"/>
-+            <vignetting model="pa" focal="45" aperture="5" distance="10" k1="0.0822" k2="-1.0382" k3="0.5130"/>
-+            <vignetting model="pa" focal="45" aperture="5" distance="1000" k1="0.0822" k2="-1.0382" k3="0.5130"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.0491" k2="-0.2983" k3="-0.0043"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.0491" k2="-0.2983" k3="-0.0043"/>
-+            <vignetting model="pa" focal="45" aperture="7.1" distance="10" k1="-0.2177" k2="0.2715" k3="-0.2827"/>
-+            <vignetting model="pa" focal="45" aperture="7.1" distance="1000" k1="-0.2177" k2="0.2715" k3="-0.2827"/>
-+            <vignetting model="pa" focal="45" aperture="9" distance="10" k1="-0.1629" k2="0.0549" k3="-0.0458"/>
-+            <vignetting model="pa" focal="45" aperture="9" distance="1000" k1="-0.1629" k2="0.0549" k3="-0.0458"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.1517" k2="-0.0041" k3="0.0120"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.1517" k2="-0.0041" k3="0.0120"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="10" k1="-0.1604" k2="0.0113" k3="0.0040"/>
-+            <vignetting model="pa" focal="45" aperture="16" distance="1000" k1="-0.1604" k2="0.0113" k3="0.0040"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.1957" k2="0.0829" k3="-0.0349"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.1957" k2="0.0829" k3="-0.0349"/>
-+            <vignetting model="pa" focal="57" aperture="16" distance="10" k1="-0.1308" k2="-0.0005" k3="0.0051"/>
-+            <vignetting model="pa" focal="57" aperture="16" distance="1000" k1="-0.1308" k2="-0.0005" k3="0.0051"/>
-+            <vignetting model="pa" focal="57" aperture="22" distance="10" k1="-0.1426" k2="0.0455" k3="-0.0265"/>
-+            <vignetting model="pa" focal="57" aperture="22" distance="1000" k1="-0.1426" k2="0.0455" k3="-0.0265"/>
-+            <vignetting model="pa" focal="61" aperture="4.7" distance="10" k1="-0.5208" k2="-0.0219" k3="0.0864"/>
-+            <vignetting model="pa" focal="61" aperture="4.7" distance="1000" k1="-0.5208" k2="-0.0219" k3="0.0864"/>
-+            <vignetting model="pa" focal="61" aperture="5" distance="10" k1="-0.0380" k2="-0.7691" k3="0.4329"/>
-+            <vignetting model="pa" focal="61" aperture="5" distance="1000" k1="-0.0380" k2="-0.7691" k3="0.4329"/>
-+            <vignetting model="pa" focal="61" aperture="5.6" distance="10" k1="-0.0208" k2="-0.3138" k3="0.0579"/>
-+            <vignetting model="pa" focal="61" aperture="5.6" distance="1000" k1="-0.0208" k2="-0.3138" k3="0.0579"/>
-+            <vignetting model="pa" focal="61" aperture="7.1" distance="10" k1="-0.1425" k2="0.0806" k3="-0.0721"/>
-+            <vignetting model="pa" focal="61" aperture="7.1" distance="1000" k1="-0.1425" k2="0.0806" k3="-0.0721"/>
-+            <vignetting model="pa" focal="61" aperture="9" distance="10" k1="-0.1265" k2="0.0042" k3="0.0037"/>
-+            <vignetting model="pa" focal="61" aperture="9" distance="1000" k1="-0.1265" k2="0.0042" k3="0.0037"/>
-+            <vignetting model="pa" focal="61" aperture="11" distance="10" k1="-0.1527" k2="0.0433" k3="-0.0147"/>
-+            <vignetting model="pa" focal="61" aperture="11" distance="1000" k1="-0.1527" k2="0.0433" k3="-0.0147"/>
-+            <vignetting model="pa" focal="76" aperture="5.1" distance="10" k1="-0.3467" k2="-0.2779" k3="0.2300"/>
-+            <vignetting model="pa" focal="76" aperture="5.1" distance="1000" k1="-0.3467" k2="-0.2779" k3="0.2300"/>
-+            <vignetting model="pa" focal="76" aperture="5.6" distance="10" k1="-0.0036" k2="-0.6682" k3="0.3607"/>
-+            <vignetting model="pa" focal="76" aperture="5.6" distance="1000" k1="-0.0036" k2="-0.6682" k3="0.3607"/>
-+            <vignetting model="pa" focal="76" aperture="7.1" distance="10" k1="-0.1297" k2="0.0970" k3="-0.0853"/>
-+            <vignetting model="pa" focal="76" aperture="7.1" distance="1000" k1="-0.1297" k2="0.0970" k3="-0.0853"/>
-+            <vignetting model="pa" focal="76" aperture="9" distance="10" k1="-0.1184" k2="0.0300" k3="-0.0132"/>
-+            <vignetting model="pa" focal="76" aperture="9" distance="1000" k1="-0.1184" k2="0.0300" k3="-0.0132"/>
-+            <vignetting model="pa" focal="76" aperture="11" distance="10" k1="-0.1096" k2="0.0157" k3="-0.0026"/>
-+            <vignetting model="pa" focal="76" aperture="11" distance="1000" k1="-0.1096" k2="0.0157" k3="-0.0026"/>
-+            <vignetting model="pa" focal="76" aperture="16" distance="10" k1="-0.1033" k2="0.0155" k3="-0.0057"/>
-+            <vignetting model="pa" focal="76" aperture="16" distance="1000" k1="-0.1033" k2="0.0155" k3="-0.0057"/>
-+            <vignetting model="pa" focal="76" aperture="22" distance="10" k1="-0.1518" k2="0.0869" k3="-0.0456"/>
-+            <vignetting model="pa" focal="76" aperture="22" distance="1000" k1="-0.1518" k2="0.0869" k3="-0.0456"/>
-+            <vignetting model="pa" focal="103" aperture="5.5" distance="10" k1="-0.2191" k2="-0.4425" k3="0.2961"/>
-+            <vignetting model="pa" focal="103" aperture="5.5" distance="1000" k1="-0.2191" k2="-0.4425" k3="0.2961"/>
-+            <vignetting model="pa" focal="103" aperture="5.6" distance="10" k1="-0.2171" k2="-0.4475" k3="0.3005"/>
-+            <vignetting model="pa" focal="103" aperture="5.6" distance="1000" k1="-0.2171" k2="-0.4475" k3="0.3005"/>
-+            <vignetting model="pa" focal="103" aperture="7.1" distance="10" k1="-0.1200" k2="0.2009" k3="-0.2139"/>
-+            <vignetting model="pa" focal="103" aperture="7.1" distance="1000" k1="-0.1200" k2="0.2009" k3="-0.2139"/>
-+            <vignetting model="pa" focal="103" aperture="9" distance="10" k1="-0.0890" k2="0.0302" k3="-0.0180"/>
-+            <vignetting model="pa" focal="103" aperture="9" distance="1000" k1="-0.0890" k2="0.0302" k3="-0.0180"/>
-+            <vignetting model="pa" focal="103" aperture="11" distance="10" k1="-0.0901" k2="0.0263" k3="-0.0147"/>
-+            <vignetting model="pa" focal="103" aperture="11" distance="1000" k1="-0.0901" k2="0.0263" k3="-0.0147"/>
-+            <vignetting model="pa" focal="103" aperture="16" distance="10" k1="-0.0803" k2="0.0093" k3="-0.0075"/>
-+            <vignetting model="pa" focal="103" aperture="16" distance="1000" k1="-0.0803" k2="0.0093" k3="-0.0075"/>
-+            <vignetting model="pa" focal="103" aperture="22" distance="10" k1="-0.0432" k2="-0.0635" k3="0.0342"/>
-+            <vignetting model="pa" focal="103" aperture="22" distance="1000" k1="-0.0432" k2="-0.0635" k3="0.0342"/>
-+            <vignetting model="pa" focal="121" aperture="5.6" distance="10" k1="-0.3476" k2="-0.4861" k3="0.3709"/>
-+            <vignetting model="pa" focal="121" aperture="5.6" distance="1000" k1="-0.3476" k2="-0.4861" k3="0.3709"/>
-+            <vignetting model="pa" focal="121" aperture="7.1" distance="10" k1="0.0363" k2="-0.2625" k3="-0.0035"/>
-+            <vignetting model="pa" focal="121" aperture="7.1" distance="1000" k1="0.0363" k2="-0.2625" k3="-0.0035"/>
-+            <vignetting model="pa" focal="121" aperture="9" distance="10" k1="-0.0966" k2="0.1877" k3="-0.2037"/>
-+            <vignetting model="pa" focal="121" aperture="9" distance="1000" k1="-0.0966" k2="0.1877" k3="-0.2037"/>
-+            <vignetting model="pa" focal="121" aperture="11" distance="10" k1="-0.0616" k2="0.0140" k3="-0.0071"/>
-+            <vignetting model="pa" focal="121" aperture="11" distance="1000" k1="-0.0616" k2="0.0140" k3="-0.0071"/>
-+            <vignetting model="pa" focal="121" aperture="16" distance="10" k1="-0.0877" k2="0.0429" k3="-0.0210"/>
-+            <vignetting model="pa" focal="121" aperture="16" distance="1000" k1="-0.0877" k2="0.0429" k3="-0.0210"/>
-+            <vignetting model="pa" focal="121" aperture="22" distance="10" k1="-0.0573" k2="-0.0197" k3="0.0129"/>
-+            <vignetting model="pa" focal="121" aperture="22" distance="1000" k1="-0.0573" k2="-0.0197" k3="0.0129"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="-1.3678" k2="1.4314" k3="-0.6518"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-1.3678" k2="1.4314" k3="-0.6518"/>
-+            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0401" k2="-0.8224" k3="0.5053"/>
-+            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0401" k2="-0.8224" k3="0.5053"/>
-+            <vignetting model="pa" focal="150" aperture="9" distance="10" k1="0.1582" k2="-0.7046" k3="0.2781"/>
-+            <vignetting model="pa" focal="150" aperture="9" distance="1000" k1="0.1582" k2="-0.7046" k3="0.2781"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="10" k1="-0.0523" k2="0.1544" k3="-0.2909"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0523" k2="0.1544" k3="-0.2909"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="10" k1="-0.0691" k2="0.1287" k3="-0.1243"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.0691" k2="0.1287" k3="-0.1243"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.0453" k2="0.0241" k3="-0.0193"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0453" k2="0.0241" k3="-0.0193"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario 7-14mm f/4.0 Asph.</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M1 -->
-+            <distortion model="ptlens" focal="7" a="0.02686" b="-0.10328" c="0.05484"/>
-+            <distortion model="ptlens" focal="8" a="0.02352" b="-0.08574" c="0.03957"/>
-+            <distortion model="ptlens" focal="10" a="0.01415" b="-0.05043" c="0.03089"/>
-+            <distortion model="ptlens" focal="12" a="0.0243" b="-0.07167" c="0.05591"/>
-+            <distortion model="ptlens" focal="14" a="0.01052" b="-0.02541" c="0.02886"/>
-+            <tca model="poly3" focal="7" br="0.0001073" vr="1.0002675" bb="0.0000622" vb="1.0001169"/>
-+            <tca model="poly3" focal="8" br="-0.0000141" vr="1.0002604" bb="0.0000124" vb="1.0002017"/>
-+            <tca model="poly3" focal="10" br="-0.0000143" vr="1.0000787" bb="0.0000794" vb="1.0001936"/>
-+            <tca model="poly3" focal="12" br="-0.0000316" vr="1.0001091" bb="0.0001177" vb="1.0001823"/>
-+            <tca model="poly3" focal="14" br="-0.0000962" vr="1.0002823" bb="0.0000513" vb="1.0001142"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>Leica DG Macro-Elmarit 45mm f/2.8</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M1 -->
-+            <distortion model="poly3" focal="45" k1="0.0015"/>
-+            <!-- No visible TCA -->
-+            <tca model="poly3" focal="45" vr="1.0005" vb="0.9998"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G X Vario PZ 45-175mm f/4.0-5.6 Asph. Power OIS</model>
-+        <model lang="en">Lumix G X Vario PZ 45-175mm f/4.0-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Panasonic GH2 -->
-+            <distortion model="ptlens" focal="45" a="-0.00276" b="0.01275" c="-0.01961"/>
-+            <distortion model="ptlens" focal="60" a="-0.01175" b="0.04733" c="-0.05481"/>
-+            <distortion model="ptlens" focal="75" a="0.00272" b="-0.00709" c="0.0189"/>
-+            <distortion model="ptlens" focal="100" a="0.00008" b="0.00521" c="0.00112"/>
-+            <distortion model="ptlens" focal="150" a="-0.00369" b="0.02353" c="-0.02412"/>
-+            <distortion model="ptlens" focal="175" a="0.00516" b="-0.00873" c="0.01805"/>
-+            <tca model="poly3" focal="45" br="0.0001486" vr="0.9999469" bb="-0.0001456" vb="1.0003685"/>
-+            <tca model="poly3" focal="60" br="0.0000648" vr="0.9998969" bb="-0.0001311" vb="1.0004256"/>
-+            <tca model="poly3" focal="75" br="0.0000644" vr="0.9997525" bb="-0.0001435" vb="1.0004488"/>
-+            <tca model="poly3" focal="100" br="0.0000622" vr="0.9996669" bb="-0.0000938" vb="1.0003098"/>
-+            <tca model="poly3" focal="150" br="0.0001107" vr="0.9996701" bb="-0.0001041" vb="0.9999976"/>
-+            <tca model="poly3" focal="175" br="0.0001140" vr="0.9996807" bb="-0.0001628" vb="0.9999970"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>Leica DG Summilux 15mm f/1.7 Asph.</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M10 -->
-+            <distortion model="ptlens" focal="15" a="0.01153" b="-0.05273" c="-0.00197"/>
-+            <tca model="poly3" focal="15" br="-0.0000789" vr="1.0002337" bb="0.0001277" vb="0.9999204"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G Vario 12-32mm f/3.5-5.6 Asph. Mega OIS</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Panasonic DMC-GM1 -->
-+            <distortion model="ptlens" focal="12" a="0.02222" b="-0.06354" c="-0.05077"/>
-+            <distortion model="ptlens" focal="14" a="0.02389" b="-0.07355" c="0.00922"/>
-+            <distortion model="ptlens" focal="20" a="0" b="-0.0088" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0" b="0.00353" c="0"/>
-+            <tca model="poly3" focal="12" br="-0.0000213" vr="1.0002074" bb="-0.0000183" vb="1.0002135"/>
-+            <tca model="poly3" focal="14" br="0.0000115" vr="1.0001642" bb="0.0000508" vb="1.0001012"/>
-+            <tca model="poly3" focal="20" br="-0.0000057" vr="1.0001348" bb="-0.0000052" vb="1.0001246"/>
-+            <tca model="poly3" focal="32" br="-0.0000680" vr="1.0001404" bb="-0.0000581" vb="1.0001761"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 14mm f/2.5 II</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with DMC-GM5 -->
-+            <distortion model="ptlens" focal="14" a="0.00401" b="-0.02455" c="-0.04437"/>
-+            <tca model="poly3" focal="14" br="-0.0001217" vr="1.0003687" bb="0.0002203" vb="1.0000304"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="10" k1="-1.6148" k2="1.6181" k3="-0.7258"/>
-+            <vignetting model="pa" focal="14" aperture="2.5" distance="1000" k1="-1.6148" k2="1.6181" k3="-0.7258"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-0.9789" k2="0.3617" k3="-0.0350"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-0.9789" k2="0.3617" k3="-0.0350"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.6424" k2="0.1668" k3="-0.1121"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.6424" k2="0.1668" k3="-0.1121"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.7559" k2="0.5699" k3="-0.3222"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.7559" k2="0.5699" k3="-0.3222"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.6100" k2="0.1885" k3="-0.0215"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.6100" k2="0.1885" k3="-0.0215"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.6190" k2="0.1878" k3="-0.0186"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.6190" k2="0.1878" k3="-0.0186"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="10" k1="-0.6953" k2="0.3159" k3="-0.0957"/>
-+            <vignetting model="pa" focal="14" aperture="16" distance="1000" k1="-0.6953" k2="0.3159" k3="-0.0957"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.6766" k2="0.2810" k3="-0.0748"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.6766" k2="0.2810" k3="-0.0748"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 42.5mm f/1.7</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-PM2 -->
-+            <distortion model="ptlens" focal="43" a="0.00306" b="-0.02178" c="0.01278"/>
-+            <tca model="poly3" focal="43" vr="1.0000881" vb="0.9999515"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>LUMIX G VARIO 14-140/F3.5-5.6 </model>
-+        <model lang="en">Lumix G Vario 14-140mm f/3.5-5.6</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Panasonic DMC-GH4 -->
-+            <distortion model="ptlens" focal="14" a="0.02559" b="-0.09222" c="0.02687"/>
-+            <!-- Taken with Panasonic DMC-G70 -->
-+            <distortion model="ptlens" focal="19" a="0.02193" b="-0.07774" c="0.0502"/>
-+            <distortion model="ptlens" focal="26" a="0.00635" b="-0.02395" c="0.02026"/>
-+            <distortion model="ptlens" focal="37" a="0.00188" b="-0.00037" c="-0.00532"/>
-+            <distortion model="ptlens" focal="46" a="0.00292" b="0.00204" c="-0.0141"/>
-+            <distortion model="ptlens" focal="69" a="-0.00526" b="0.02418" c="-0.02834"/>
-+            <distortion model="ptlens" focal="102" a="-0.00722" b="0.02631" c="-0.02095"/>
-+            <distortion model="ptlens" focal="140" a="0.00108" b="-0.00403" c="0.01137"/>
-+            <!-- Taken with Panasonic DMC-GH4 -->
-+            <tca model="poly3" focal="14" vr="1.0000856" vb="1.0004324"/>
-+            <tca model="poly3" focal="24" vr="1.0000727" vb="1.0004073"/>
-+            <tca model="poly3" focal="26" vr="1.0001132" vb="1.0003724"/>
-+            <tca model="poly3" focal="34" vr="1.0000340" vb="1.0002853"/>
-+            <tca model="poly3" focal="34" vr="1.0000412" vb="1.0003546"/>
-+            <tca model="poly3" focal="46" vr="1.0000161" vb="1.0001541"/>
-+            <tca model="poly3" focal="69" vr="1.0000019" vb="1.0000310"/>
-+            <tca model="poly3" focal="73" vr="0.9999638" vb="1.0000271"/>
-+            <tca model="poly3" focal="97" vr="0.9999140" vb="0.9999884"/>
-+            <tca model="poly3" focal="102" vr="0.9998732" vb="0.9999608"/>
-+            <tca model="poly3" focal="140" vr="0.9998222" vb="0.9998812"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.1984" k2="0.0739" k3="-0.5006"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.1984" k2="0.0739" k3="-0.5006"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.3859" k2="0.7125" k3="-0.7776"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3859" k2="0.7125" k3="-0.7776"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.4086" k2="0.6611" k3="-0.6115"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4086" k2="0.6611" k3="-0.6115"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.2822" k2="0.2531" k3="-0.2514"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.2822" k2="0.2531" k3="-0.2514"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.1724" k2="-0.0627" k3="-0.0089"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.1724" k2="-0.0627" k3="-0.0089"/>
-+            <vignetting model="pa" focal="26" aperture="4.2" distance="10" k1="-0.1200" k2="-0.2225" k3="0.1437"/>
-+            <vignetting model="pa" focal="26" aperture="4.2" distance="1000" k1="-0.1200" k2="-0.2225" k3="0.1437"/>
-+            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="0.0054" k2="-0.2085" k3="0.0428"/>
-+            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="0.0054" k2="-0.2085" k3="0.0428"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="10" k1="-0.0635" k2="0.0651" k3="-0.0755"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.0635" k2="0.0651" k3="-0.0755"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="10" k1="-0.0966" k2="0.1025" k3="-0.0884"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.0966" k2="0.1025" k3="-0.0884"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="10" k1="-0.0940" k2="0.0672" k3="-0.0620"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.0940" k2="0.0672" k3="-0.0620"/>
-+            <vignetting model="pa" focal="26" aperture="16" distance="10" k1="-0.0779" k2="0.0219" k3="-0.0347"/>
-+            <vignetting model="pa" focal="26" aperture="16" distance="1000" k1="-0.0779" k2="0.0219" k3="-0.0347"/>
-+            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.0761" k2="0.0283" k3="-0.0485"/>
-+            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.0761" k2="0.0283" k3="-0.0485"/>
-+            <vignetting model="pa" focal="46" aperture="4.9" distance="10" k1="-0.1879" k2="0.0396" k3="-0.0144"/>
-+            <vignetting model="pa" focal="46" aperture="4.9" distance="1000" k1="-0.1879" k2="0.0396" k3="-0.0144"/>
-+            <vignetting model="pa" focal="46" aperture="5.6" distance="10" k1="-0.0121" k2="-0.0294" k3="-0.0397"/>
-+            <vignetting model="pa" focal="46" aperture="5.6" distance="1000" k1="-0.0121" k2="-0.0294" k3="-0.0397"/>
-+            <vignetting model="pa" focal="46" aperture="8" distance="10" k1="-0.0484" k2="0.0645" k3="-0.0584"/>
-+            <vignetting model="pa" focal="46" aperture="8" distance="1000" k1="-0.0484" k2="0.0645" k3="-0.0584"/>
-+            <vignetting model="pa" focal="46" aperture="11" distance="10" k1="-0.0381" k2="0.0343" k3="-0.0310"/>
-+            <vignetting model="pa" focal="46" aperture="11" distance="1000" k1="-0.0381" k2="0.0343" k3="-0.0310"/>
-+            <vignetting model="pa" focal="46" aperture="16" distance="10" k1="-0.0218" k2="-0.0106" k3="0.0033"/>
-+            <vignetting model="pa" focal="46" aperture="16" distance="1000" k1="-0.0218" k2="-0.0106" k3="0.0033"/>
-+            <vignetting model="pa" focal="46" aperture="22" distance="10" k1="-0.0048" k2="-0.0430" k3="0.0238"/>
-+            <vignetting model="pa" focal="46" aperture="22" distance="1000" k1="-0.0048" k2="-0.0430" k3="0.0238"/>
-+            <vignetting model="pa" focal="97" aperture="5.4" distance="10" k1="0.2633" k2="-1.2100" k3="0.4991"/>
-+            <vignetting model="pa" focal="97" aperture="5.4" distance="1000" k1="0.2633" k2="-1.2100" k3="0.4991"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="0.2551" k2="-1.1910" k3="0.4876"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="0.2551" k2="-1.1910" k3="0.4876"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="10" k1="-0.0578" k2="0.4165" k3="-0.6047"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.0578" k2="0.4165" k3="-0.6047"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="10" k1="-0.1491" k2="0.6111" k3="-0.5721"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.1491" k2="0.6111" k3="-0.5721"/>
-+            <vignetting model="pa" focal="97" aperture="16" distance="10" k1="-0.0296" k2="0.1385" k3="-0.1224"/>
-+            <vignetting model="pa" focal="97" aperture="16" distance="1000" k1="-0.0296" k2="0.1385" k3="-0.1224"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="10" k1="-0.0162" k2="0.0991" k3="-0.0848"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.0162" k2="0.0991" k3="-0.0848"/>
-+            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="0.2058" k2="-1.5224" k3="0.8792"/>
-+            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="0.2058" k2="-1.5224" k3="0.8792"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="0.1280" k2="-0.2279" k3="-0.1477"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="0.1280" k2="-0.2279" k3="-0.1477"/>
-+            <vignetting model="pa" focal="140" aperture="11" distance="10" k1="-0.1093" k2="0.5428" k3="-0.5378"/>
-+            <vignetting model="pa" focal="140" aperture="11" distance="1000" k1="-0.1093" k2="0.5428" k3="-0.5378"/>
-+            <vignetting model="pa" focal="140" aperture="16" distance="10" k1="-0.0357" k2="0.1994" k3="-0.1628"/>
-+            <vignetting model="pa" focal="140" aperture="16" distance="1000" k1="-0.0357" k2="0.1994" k3="-0.1628"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="10" k1="-0.0095" k2="0.1134" k3="-0.0862"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0095" k2="0.1134" k3="-0.0862"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Panasonic</maker>
-+        <model>Lumix G 25mm f/1.7</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus OMD E-M5 -->
-+            <distortion model="ptlens" focal="25" a="0.006901" b="-0.043711" c="0.032678"/>
-+            <tca model="poly3" focal="25" br="-0.0000310" vr="1.0000464" bb="0.0000044" vb="0.9999951"/>
-+            <vignetting model="pa" focal="25" aperture="1.7" distance="0.18" k1="-1.0184" k2="0.3779" k3="0.0117"/>
-+            <vignetting model="pa" focal="25" aperture="1.7" distance="1" k1="-1.5522" k2="1.8773" k3="-0.9593"/>
-+            <vignetting model="pa" focal="25" aperture="1.7" distance="1000" k1="-1.4086" k2="1.7196" k3="-0.9633"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="0.18" k1="-0.5043" k2="-0.5273" k3="0.4690"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="1" k1="-0.6904" k2="0.1723" k3="-0.0371"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="1000" k1="-0.7355" k2="0.3826" k3="-0.2315"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="0.18" k1="-0.1273" k2="-0.3468" k3="0.1282"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1" k1="-0.2055" k2="0.2286" k3="-0.3541"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.2452" k2="0.4418" k3="-0.5389"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="0.18" k1="-0.3545" k2="0.1948" k3="-0.0930"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1" k1="-0.1103" k2="-0.1576" k3="0.1029"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.2806" k2="0.2643" k3="-0.1542"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.18" k1="-0.0582" k2="-0.4668" k3="0.3066"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1" k1="-0.5022" k2="0.5815" k3="-0.2616"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2586" k2="0.1172" k3="0.0021"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.18" k1="-0.3234" k2="0.0490" k3="0.0315"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1" k1="-0.4066" k2="0.4279" k3="-0.1961"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2680" k2="0.1473" k3="-0.0109"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-pentax.xml b/data/db/mil-pentax.xml
---- a/data/db/mil-pentax.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/mil-pentax.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,35 @@
-+<lensdatabase>
-+    <mount>
-+        <name>Pentax Q</name>
-+        <compat>Generic</compat>
-+    </mount>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax Q</model>
-+        <mount>Pentax Q</mount>
-+        <cropfactor>5.53</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax Q7</model>
-+        <mount>Pentax Q</mount>
-+        <cropfactor>4.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax Q10</model>
-+        <mount>Pentax Q</mount>
-+        <cropfactor>5.53</cropfactor>
-+    </camera>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>01 Standard Prime 8.5mm f/1.9 AL [IF]</model>
-+        <mount>Pentax Q</mount>
-+        <focal value="8.5"/>
-+        <aperture min="1.9" max="8"/>
-+        <cropfactor>5.53</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="8.5" k1="-0.01529"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/mil-samsung.xml b/data/db/mil-samsung.xml
---- a/data/db/mil-samsung.xml	2013-10-13 11:59:02.000000000 +0200
-+++ b/data/db/mil-samsung.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,132 +1,236 @@
--<!--
--MIL stands for Mirrorless Interchangeable Lens, see
--http://en.wikipedia.org/wiki/Mirrorless_interchangeable-lens_camera
---->
- <lensdatabase>
-     <mount>
-         <name>Samsung NX</name>
--        <name lang="en">Samsung NX</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>Samsung NX mini</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
--        <compat>Pentax K</compat>
-     </mount>
--
--    <!-- Samsung EK-GN120 = Samsung Galaxy NX -->
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>EK-GN120</model>
--         <model lang="en">EK-GN120</model>
-+        <model lang="en">Galaxy NX</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX10</model>
--         <model lang="en">NX10</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX11</model>
--         <model lang="en">NX11</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX100</model>
--         <model lang="en">NX100</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX1000</model>
--         <model lang="en">NX1000</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX20</model>
--         <model lang="en">NX20</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX200</model>
--         <model lang="en">NX200</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX210</model>
--         <model lang="en">NX210</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG</maker>
--        <maker lang="en">Samsung</maker>
-+        <maker>Samsung</maker>
-         <model>NX300</model>
--         <model lang="en">NX300</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX300M</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX500</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX1100</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX2000</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX3000</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX1</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX5</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX30</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Samsung</maker>
-+        <model>NX mini</model>
-+        <mount>Samsung NX mini</mount>
-+        <cropfactor>2.727</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Samsung</maker>
--        <model>Samsung NX 20-50mm F3.5-5.6 ED</model>
-+        <model>Samsung NX 20-50mm f/3.5-5.6 ED</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <!-- Average crop factor for Samsung APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="20" a="0.01347" b="-0.05952" c="0.01561" />
--            <distortion model="ptlens" focal="24" a="0.00549" b="-0.03312" c="0.00984" />
--            <distortion model="ptlens" focal="28" a="0.01064" b="-0.04256" c="0.03338" />
--            <distortion model="ptlens" focal="35" a="-0.001" b="-0.00843" c="0.02713" />
--            <distortion model="ptlens" focal="45" a="0.00716" b="-0.0379" c="0.06902" />
--            <distortion model="ptlens" focal="50" a="-0.02119" b="0.06813" c="-0.06118" />
-+            <distortion model="ptlens" focal="20" a="0.01347" b="-0.05952" c="0.01561"/>
-+            <distortion model="ptlens" focal="24" a="0.00549" b="-0.03312" c="0.00984"/>
-+            <distortion model="ptlens" focal="28" a="0.01064" b="-0.04256" c="0.03338"/>
-+            <distortion model="ptlens" focal="35" a="-0.001" b="-0.00843" c="0.02713"/>
-+            <distortion model="ptlens" focal="45" a="0.00716" b="-0.0379" c="0.06902"/>
-+            <distortion model="ptlens" focal="50" a="-0.02119" b="0.06813" c="-0.06118"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Samsung</maker>
--        <model>Samsung NX 30mm F2 Pancake</model>
-+        <model>Samsung NX 30mm f/2 Pancake</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <!-- Average crop factor for Samsung APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="30" k1="-0.00596" />
-+            <distortion model="poly3" focal="30" k1="-0.00596"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Samsung</maker>
--        <model>Samsung 16mm f/2.4</model>
-+        <model>Samsung NX 16mm f/2.4 Pancake</model>
-         <mount>Samsung NX</mount>
--        <cropfactor>1.54</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Samsung NX10 -->
--            <distortion model="ptlens" focal="16" a="0.00013" b="-0.00589" c="-0.04838" />
--            <tca model="poly3" focal="16" br="-0.0000770" vr="1.0006160" bb="0.0001654" vb="0.9997845" />
-+            <distortion model="ptlens" focal="16" a="0.00013" b="-0.00589" c="-0.04838"/>
-+            <tca model="poly3" focal="16" br="-0.0000770" vr="1.0006160" bb="0.0001654" vb="0.9997845"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samsung</maker>
-+        <model>Samsung NX 18-55mm f/3.5-5.6 OIS</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Samsung NX300 -->
-+            <distortion model="ptlens" focal="18" a="0.01917" b="-0.0495" c="-0.00128"/>
-+            <distortion model="ptlens" focal="24" a="0.01457" b="-0.03302" c="0.01717"/>
-+            <distortion model="ptlens" focal="29" a="0.00579" b="-0.00789" c="0.00912"/>
-+            <distortion model="ptlens" focal="35" a="0.01159" b="-0.02243" c="0.02113"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.01092" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0" b="0.01095" c="0"/>
-+            <distortion model="ptlens" focal="55" a="0" b="0.01144" c="0"/>
-+            <tca model="poly3" focal="18" vr="1.0007" vb="0.9999"/>
-+            <tca model="poly3" focal="24" vr="1.0006" vb="0.9996"/>
-+            <tca model="poly3" focal="29" vr="1.0004" vb="0.9999"/>
-+            <tca model="poly3" focal="35" vr="1.0006" vb="0.9998"/>
-+            <tca model="poly3" focal="40" vr="1.0003" vb="0.9999"/>
-+            <tca model="poly3" focal="45" vr="1.0003" vb="0.9997"/>
-+            <tca model="poly3" focal="55" vr="1.0002" vb="0.9996"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samsung</maker>
-+        <model>Samsung NX 45mm f/1.8 2D/3D</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Samsung NX11 -->
-+            <distortion model="poly3" focal="45" k1="-0.00974"/>
-+            <!-- Taken with Samsung NX500 -->
-+            <tca model="poly3" focal="45" br="-0.0000373" vr="1.0001884" bb="0.0000950" vb="0.9997324"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samsung</maker>
-+        <model>Samsung NX 20mm f/2.8 Pancake</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Samsung NX11 -->
-+            <distortion model="ptlens" focal="20" a="0.0065" b="-0.03633" c="0.00495"/>
-+            <tca model="poly3" focal="20" br="-0.0001595" vr="1.0006749" bb="0.0001657" vb="0.9996819"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samsung</maker>
-+        <model>Samsung NX 16-50mm f/3.5-5.6 PZ ED OIS</model>
-+        <mount>Samsung NX</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Samsung NX200 -->
-+            <distortion model="ptlens" focal="16" a="0.01687" b="-0.04326" c="-0.03389"/>
-+            <distortion model="ptlens" focal="19" a="0.00841" b="-0.01748" c="-0.03254"/>
-+            <distortion model="ptlens" focal="22" a="0.0085" b="-0.02678" c="-0.00262"/>
-+            <distortion model="ptlens" focal="30" a="0" b="-0.00441" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.00145" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samsung</maker>
-+        <model>Samsung NX 10mm f/3.5 Fisheye</model>
-+        <model lang="de">Samsung NX 10mm f/3.5 Fischauge</model>
-+        <mount>Samsung NX</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Samsung NX30 -->
-+            <distortion model="ptlens" focal="10" a="-0.0459" b="0.13431" c="-0.10789"/>
-+            <tca model="poly3" focal="10" br="0.0000529" vr="1.0002370" bb="-0.0000076" vb="1.0003018"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-samyang.xml b/data/db/mil-samyang.xml
---- a/data/db/mil-samyang.xml	2013-10-18 19:20:57.000000000 +0200
-+++ b/data/db/mil-samyang.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,67 +1,108 @@
- <lensdatabase>
--
--   <lens>
--	    <maker>Samyang</maker>
--	    <model>Samyang 7.5mm F/3.5 UMC Fish-eye MFT</model>
--	    <focal value="7.5" />
--	    <aperture min="3.5" max="22" />
--	    <mount>Micro 4/3 System</mount>
--	    <type>fisheye</type>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="7.5" model="ptlens" a="-0.0133116" b="0.00822383" c="-0.0180619" />
--            <tca model="poly3" focal="7.5" br="-0.0001120" vr="1.0003181" bb="0.0000315" vb="0.9999183" />
--            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.09" k1="-0.6898" k2="0.5629" k3="-0.2798" />
--            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.18" k1="-1.0041" k2="1.6690" k3="-0.9910" />
--            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.54" k1="-1.0954" k2="1.8097" k3="-1.0871" />
--            <vignetting model="pa" focal="7.5" aperture="3.5" distance="1000" k1="-1.1157" k2="1.9882" k3="-1.2723" />
--            <vignetting model="pa" focal="7.5" aperture="4" distance="0.09" k1="-0.6381" k2="0.4763" k3="-0.2415" />
--            <vignetting model="pa" focal="7.5" aperture="4" distance="0.18" k1="-0.8935" k2="1.3156" k3="-0.7649" />
--            <vignetting model="pa" focal="7.5" aperture="4" distance="0.54" k1="-1.0314" k2="1.6246" k3="-0.9735" />
--            <vignetting model="pa" focal="7.5" aperture="4" distance="1000" k1="-1.1245" k2="2.0645" k3="-1.3261" />
--            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.09" k1="-0.7704" k2="1.0367" k3="-0.6094" />
--            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.18" k1="-1.0225" k2="1.7532" k3="-0.9869" />
--            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.54" k1="-1.1394" k2="2.0518" k3="-1.2608" />
--            <vignetting model="pa" focal="7.5" aperture="5.6" distance="1000" k1="-1.2338" k2="2.5227" k3="-1.6312" />
--            <vignetting model="pa" focal="7.5" aperture="8" distance="0.09" k1="-0.8748" k2="1.2274" k3="-0.6025" />
--            <vignetting model="pa" focal="7.5" aperture="8" distance="0.18" k1="-0.9885" k2="1.6290" k3="-0.8701" />
--            <vignetting model="pa" focal="7.5" aperture="8" distance="0.54" k1="-0.9302" k2="1.1116" k3="-0.4253" />
--            <vignetting model="pa" focal="7.5" aperture="8" distance="1000" k1="-0.9312" k2="1.1169" k3="-0.4030" />
--            <vignetting model="pa" focal="7.5" aperture="22" distance="0.09" k1="-0.8023" k2="0.9555" k3="-0.4032" />
--            <vignetting model="pa" focal="7.5" aperture="22" distance="0.18" k1="-0.9166" k2="1.2514" k3="-0.6183" />
--            <vignetting model="pa" focal="7.5" aperture="22" distance="0.54" k1="-0.9866" k2="1.2614" k3="-0.5698" />
--            <vignetting model="pa" focal="7.5" aperture="22" distance="1000" k1="-1.0589" k2="1.5841" k3="-0.8397" />
--	    </calibration>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 7.5mm f/3.5 UMC Fish-eye MFT</model>
-+        <model lang="de">Samyang 7.5mm f/3.5 UMC Fischauge MFT</model>
-+        <mount>Micro 4/3 System</mount>
-+        <focal value="7.5"/>
-+        <aperture min="3.5" max="22"/>
-+        <type>fisheye</type>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="7.5" model="ptlens" a="-0.0133116" b="0.00822383" c="-0.0180619"/>
-+            <tca model="poly3" focal="7.5" br="-0.0001120" vr="1.0003181" bb="0.0000315" vb="0.9999183"/>
-+            <!-- Taken with Fujifilm X-T1 -->
-+            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.09" k1="-0.6898" k2="0.5629" k3="-0.2798"/>
-+            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.18" k1="-1.0041" k2="1.6690" k3="-0.9910"/>
-+            <vignetting model="pa" focal="7.5" aperture="3.5" distance="0.54" k1="-1.0954" k2="1.8097" k3="-1.0871"/>
-+            <vignetting model="pa" focal="7.5" aperture="3.5" distance="1000" k1="-1.1157" k2="1.9882" k3="-1.2723"/>
-+            <vignetting model="pa" focal="7.5" aperture="4" distance="0.09" k1="-0.6381" k2="0.4763" k3="-0.2415"/>
-+            <vignetting model="pa" focal="7.5" aperture="4" distance="0.18" k1="-0.8935" k2="1.3156" k3="-0.7649"/>
-+            <vignetting model="pa" focal="7.5" aperture="4" distance="0.54" k1="-1.0314" k2="1.6246" k3="-0.9735"/>
-+            <vignetting model="pa" focal="7.5" aperture="4" distance="1000" k1="-1.1245" k2="2.0645" k3="-1.3261"/>
-+            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.09" k1="-0.7704" k2="1.0367" k3="-0.6094"/>
-+            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.18" k1="-1.0225" k2="1.7532" k3="-0.9869"/>
-+            <vignetting model="pa" focal="7.5" aperture="5.6" distance="0.54" k1="-1.1394" k2="2.0518" k3="-1.2608"/>
-+            <vignetting model="pa" focal="7.5" aperture="5.6" distance="1000" k1="-1.2338" k2="2.5227" k3="-1.6312"/>
-+            <vignetting model="pa" focal="7.5" aperture="8" distance="0.09" k1="-0.8748" k2="1.2274" k3="-0.6025"/>
-+            <vignetting model="pa" focal="7.5" aperture="8" distance="0.18" k1="-0.9885" k2="1.6290" k3="-0.8701"/>
-+            <vignetting model="pa" focal="7.5" aperture="8" distance="0.54" k1="-0.9302" k2="1.1116" k3="-0.4253"/>
-+            <vignetting model="pa" focal="7.5" aperture="8" distance="1000" k1="-0.9312" k2="1.1169" k3="-0.4030"/>
-+            <vignetting model="pa" focal="7.5" aperture="22" distance="0.09" k1="-0.8023" k2="0.9555" k3="-0.4032"/>
-+            <vignetting model="pa" focal="7.5" aperture="22" distance="0.18" k1="-0.9166" k2="1.2514" k3="-0.6183"/>
-+            <vignetting model="pa" focal="7.5" aperture="22" distance="0.54" k1="-0.9866" k2="1.2614" k3="-0.5698"/>
-+            <vignetting model="pa" focal="7.5" aperture="22" distance="1000" k1="-1.0589" k2="1.5841" k3="-0.8397"/>
-+        </calibration>
-     </lens>
--
--
-     <lens>
-         <maker>Samyang</maker>
-         <model>Samyang 8mm f/2.8 UMC Fish-eye</model>
-+        <model lang="de">Samyang 8mm f/2.8 UMC Fischauge</model>
-         <mount>Sony E</mount>
-         <mount>Fujifilm X</mount>
-         <mount>Samsung NX</mount>
--        <!-- FixMe: Actually cropfactor 1.534 -->
--        <cropfactor>1.5</cropfactor>
-         <type>stereographic</type>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-7 -->
--            <distortion model="ptlens" focal="8" a="0.01302" b="-0.06831" c="0.02013" />
--            <vignetting model="pa" focal="8" aperture="2.8" distance="0.3" k1="-1.4924" k2="1.0081" k3="-0.3500" />
--            <vignetting model="pa" focal="8" aperture="2.8" distance="1" k1="-1.5090" k2="0.9829" k3="-0.3162" />
--            <vignetting model="pa" focal="8" aperture="2.8" distance="1000" k1="-1.5018" k2="0.9506" k3="-0.2946" />
--            <vignetting model="pa" focal="8" aperture="4" distance="0.3" k1="-0.9478" k2="0.6408" k3="-0.4329" />
--            <vignetting model="pa" focal="8" aperture="4" distance="1" k1="-1.0029" k2="0.7332" k3="-0.4824" />
--            <vignetting model="pa" focal="8" aperture="4" distance="1000" k1="-1.0418" k2="0.7092" k3="-0.4377" />
--            <vignetting model="pa" focal="8" aperture="5.6" distance="0.3" k1="-1.0401" k2="0.9822" k3="-0.5842" />
--            <vignetting model="pa" focal="8" aperture="5.6" distance="1" k1="-1.0795" k2="1.0230" k3="-0.6008" />
--            <vignetting model="pa" focal="8" aperture="5.6" distance="1000" k1="-1.1067" k2="1.0544" k3="-0.6145" />
--            <vignetting model="pa" focal="8" aperture="8" distance="0.3" k1="-1.0299" k2="0.9615" k3="-0.5692" />
--            <vignetting model="pa" focal="8" aperture="8" distance="1" k1="-1.0667" k2="0.9822" k3="-0.5667" />
--            <vignetting model="pa" focal="8" aperture="8" distance="1000" k1="-1.0408" k2="0.9345" k3="-0.5484" />
--            <vignetting model="pa" focal="8" aperture="22" distance="0.3" k1="-1.0752" k2="1.0060" k3="-0.5789" />
--            <vignetting model="pa" focal="8" aperture="22" distance="1" k1="-1.0814" k2="1.0593" k3="-0.6292" />
--            <vignetting model="pa" focal="8" aperture="22" distance="1000" k1="-1.0709" k2="0.9444" k3="-0.5355" />
-+            <!-- Measured with a 360° panorama -->
-+            <distortion model="ptlens" focal="8" a="0.02036" b="-0.08028" c="0.01446"/>
-+            <tca model="poly3" focal="8" br="-0.0000138" vr="1.0000964" bb="0.0001036" vb="1.0000325"/>
-+            <vignetting model="pa" focal="8" aperture="2.8" distance="0.3" k1="-1.4924" k2="1.0081" k3="-0.3500"/>
-+            <vignetting model="pa" focal="8" aperture="2.8" distance="1" k1="-1.5090" k2="0.9829" k3="-0.3162"/>
-+            <vignetting model="pa" focal="8" aperture="2.8" distance="1000" k1="-1.5018" k2="0.9506" k3="-0.2946"/>
-+            <vignetting model="pa" focal="8" aperture="4" distance="0.3" k1="-0.9478" k2="0.6408" k3="-0.4329"/>
-+            <vignetting model="pa" focal="8" aperture="4" distance="1" k1="-1.0029" k2="0.7332" k3="-0.4824"/>
-+            <vignetting model="pa" focal="8" aperture="4" distance="1000" k1="-1.0418" k2="0.7092" k3="-0.4377"/>
-+            <vignetting model="pa" focal="8" aperture="5.6" distance="0.3" k1="-1.0401" k2="0.9822" k3="-0.5842"/>
-+            <vignetting model="pa" focal="8" aperture="5.6" distance="1" k1="-1.0795" k2="1.0230" k3="-0.6008"/>
-+            <vignetting model="pa" focal="8" aperture="5.6" distance="1000" k1="-1.1067" k2="1.0544" k3="-0.6145"/>
-+            <vignetting model="pa" focal="8" aperture="8" distance="0.3" k1="-1.0299" k2="0.9615" k3="-0.5692"/>
-+            <vignetting model="pa" focal="8" aperture="8" distance="1" k1="-1.0667" k2="0.9822" k3="-0.5667"/>
-+            <vignetting model="pa" focal="8" aperture="8" distance="1000" k1="-1.0408" k2="0.9345" k3="-0.5484"/>
-+            <vignetting model="pa" focal="8" aperture="22" distance="0.3" k1="-1.0752" k2="1.0060" k3="-0.5789"/>
-+            <vignetting model="pa" focal="8" aperture="22" distance="1" k1="-1.0814" k2="1.0593" k3="-0.6292"/>
-+            <vignetting model="pa" focal="8" aperture="22" distance="1000" k1="-1.0709" k2="0.9444" k3="-0.5355"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 50mm f/1.4 AS UMC</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="poly3" focal="50" k1="-0.00445"/>
-+            <tca model="poly3" focal="50" vr="1.0001" vb="1.0001"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 12mm f/2.0 NCS CS</model>
-+        <mount>Sony E</mount>
-+        <mount>Fujifilm X</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="ptlens" focal="12" a="0.0097" b="-0.04108" c="0.03623"/>
-+            <tca model="poly3" focal="12" br="0.0000203" vr="1.0001380" bb="0.0002099" vb="1.0001907"/>
-+            <!-- Taken with Fujifilm X camera (cropfactor 1.529) -->
-+            <vignetting model="pa" focal="12" aperture="2" distance="10" k1="-1.6043" k2="1.4148" k3="-0.5957"/>
-+            <vignetting model="pa" focal="12" aperture="2" distance="1000" k1="-1.6043" k2="1.4148" k3="-0.5957"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-1.0849" k2="0.8287" k3="-0.4311"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-1.0849" k2="0.8287" k3="-0.4311"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-1.1396" k2="0.9654" k3="-0.4291"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-1.1396" k2="0.9654" k3="-0.4291"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-1.0997" k2="0.7894" k3="-0.2590"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-1.0997" k2="0.7894" k3="-0.2590"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-1.1070" k2="0.8060" k3="-0.2703"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-1.1070" k2="0.8060" k3="-0.2703"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="10" k1="-1.1113" k2="0.8092" k3="-0.2697"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-1.1113" k2="0.8092" k3="-0.2697"/>
-+            <vignetting model="pa" focal="12" aperture="16" distance="10" k1="-1.1239" k2="0.8343" k3="-0.2845"/>
-+            <vignetting model="pa" focal="12" aperture="16" distance="1000" k1="-1.1239" k2="0.8343" k3="-0.2845"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-1.1410" k2="0.8662" k3="-0.3026"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-1.1410" k2="0.8662" k3="-0.3026"/>
-         </calibration>
-     </lens>
- </lensdatabase>
-diff -Nurpd a/data/db/mil-sigma.xml b/data/db/mil-sigma.xml
---- a/data/db/mil-sigma.xml	2013-08-25 14:49:43.000000000 +0200
-+++ b/data/db/mil-sigma.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,23 +1,148 @@
- <lensdatabase>
--
-     <lens>
-         <maker>Sigma</maker>
--        <!-- The actual name is "Sigma 30mm F2.8 EX DN".  The following is the exiv2 name on the NEX-C3. -->
--        <model>E 30mm F2.8</model>
-+        <model>E 30mm f/2.8</model>
-+        <model lang="en">Sigma 30mm f/2.8 EX DN</model>
-         <mount>Sony E</mount>
-         <mount>Micro 4/3 System</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with NEX-C3 -->
--            <distortion model="poly3" focal="30" k1="-0.00329" />
--            <tca model="poly3" focal="30" br="-0.0000696" vr="1.0003379" bb="0.0001188" vb="0.9998102" />
--            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.7946" k2="0.5729" k3="-0.1713" />
--            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.7946" k2="0.5729" k3="-0.1713" />
--            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.3097" k2="-0.3089" k3="0.2307" />
--            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.3097" k2="-0.3089" k3="0.2307" />
--            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.6172" k2="0.5891" k3="-0.2868" />
--            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.6172" k2="0.5891" k3="-0.2868" />
-+            <distortion model="poly3" focal="30" k1="-0.00329"/>
-+            <tca model="poly3" focal="30" br="-0.0000696" vr="1.0003379" bb="0.0001188" vb="0.9998102"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.7946" k2="0.5729" k3="-0.1713"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.7946" k2="0.5729" k3="-0.1713"/>
-+            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.3097" k2="-0.3089" k3="0.2307"/>
-+            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.3097" k2="-0.3089" k3="0.2307"/>
-+            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.6172" k2="0.5891" k3="-0.2868"/>
-+            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.6172" k2="0.5891" k3="-0.2868"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 30mm f/2.8 EX DN</model>
-+        <mount>Sony E</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M5 -->
-+            <distortion model="poly3" focal="30" k1="-0.00454"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 19mm f/2.8 EX DN</model>
-+        <mount>Sony E</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M5 -->
-+            <distortion model="ptlens" focal="19" a="0.00475" b="-0.01706" c="0.00298"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 19mm f/2.8 EX DN</model>
-+        <mount>Sony E</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="ptlens" focal="19" a="0.02766" b="-0.0877" c="0.06882"/>
-+            <tca model="poly3" focal="19" br="-0.0000466" vr="1.0003817" bb="0.0000346" vb="1.0000194"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 60mm f/2.8 DN</model>
-+        <mount>Sony E</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-M5 -->
-+            <distortion model="poly3" focal="60" k1="0.00275"/>
-+            <!-- No measurable TCA -->
-+            <tca model="poly3" focal="60"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- Identifies itself at Sony cameras as “E 19mm F2.8”. -->
-+        <maker>Sigma</maker>
-+        <model>Sigma 19mm f/2.8 DN</model>
-+        <mount>Sony E</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="ptlens" focal="19" a="0.015" b="-0.046" c="0.024"/>
-+            <tca model="poly3" focal="19" br="-0.0000429" vr="1.0002002" bb="0.0000600" vb="0.9999543"/>
-+            <vignetting model="pa" focal="19" aperture="2.8" distance="10" k1="-0.9506" k2="0.8975" k3="-0.3905"/>
-+            <vignetting model="pa" focal="19" aperture="2.8" distance="1000" k1="-0.9506" k2="0.8975" k3="-0.3905"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="10" k1="-0.4777" k2="-0.1800" k3="0.2351"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-0.4777" k2="-0.1800" k3="0.2351"/>
-+            <vignetting model="pa" focal="19" aperture="8" distance="10" k1="-0.4955" k2="0.3092" k3="-0.1559"/>
-+            <vignetting model="pa" focal="19" aperture="8" distance="1000" k1="-0.4955" k2="0.3092" k3="-0.1559"/>
-+            <vignetting model="pa" focal="19" aperture="13" distance="10" k1="-0.4758" k2="0.2070" k3="-0.0488"/>
-+            <vignetting model="pa" focal="19" aperture="13" distance="1000" k1="-0.4758" k2="0.2070" k3="-0.0488"/>
-+            <vignetting model="pa" focal="19" aperture="18" distance="10" k1="-0.4840" k2="0.2244" k3="-0.0602"/>
-+            <vignetting model="pa" focal="19" aperture="18" distance="1000" k1="-0.4840" k2="0.2244" k3="-0.0602"/>
-+            <vignetting model="pa" focal="19" aperture="22" distance="10" k1="-0.4849" k2="0.2236" k3="-0.0597"/>
-+            <vignetting model="pa" focal="19" aperture="22" distance="1000" k1="-0.4849" k2="0.2236" k3="-0.0597"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 19mm f/2.8 DN</model>
-+        <mount>Micro 4/3 System</mount>
-+        <mount>Sony E</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with OMD E-PL3 -->
-+            <distortion model="poly3" focal="19" k1="-0.00656"/>
-+            <tca model="poly3" focal="19" br="0.0000179" vr="1.0004833" bb="0.0000497" vb="0.9999659"/>
-+            <vignetting model="pa" focal="19" aperture="2.8" distance="10" k1="-0.8505" k2="0.7338" k3="-0.3257"/>
-+            <vignetting model="pa" focal="19" aperture="2.8" distance="1000" k1="-0.8505" k2="0.7338" k3="-0.3257"/>
-+            <vignetting model="pa" focal="19" aperture="3.2" distance="10" k1="-0.8111" k2="0.5574" k3="-0.2042"/>
-+            <vignetting model="pa" focal="19" aperture="3.2" distance="1000" k1="-0.8111" k2="0.5574" k3="-0.2042"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="10" k1="-0.4141" k2="-0.2053" k3="0.2060"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="1000" k1="-0.4141" k2="-0.2053" k3="0.2060"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="10" k1="-0.2906" k2="-0.2445" k3="0.1612"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-0.2906" k2="-0.2445" k3="0.1612"/>
-+            <vignetting model="pa" focal="19" aperture="4.5" distance="10" k1="-0.3708" k2="0.0713" k3="-0.0506"/>
-+            <vignetting model="pa" focal="19" aperture="4.5" distance="1000" k1="-0.3708" k2="0.0713" k3="-0.0506"/>
-+            <vignetting model="pa" focal="19" aperture="5" distance="10" k1="-0.4144" k2="0.1900" k3="-0.0941"/>
-+            <vignetting model="pa" focal="19" aperture="5" distance="1000" k1="-0.4144" k2="0.1900" k3="-0.0941"/>
-+            <vignetting model="pa" focal="19" aperture="5.6" distance="10" k1="-0.3772" k2="0.0907" k3="-0.0155"/>
-+            <vignetting model="pa" focal="19" aperture="5.6" distance="1000" k1="-0.3772" k2="0.0907" k3="-0.0155"/>
-+            <vignetting model="pa" focal="19" aperture="6.3" distance="10" k1="-0.3456" k2="0.0248" k3="0.0258"/>
-+            <vignetting model="pa" focal="19" aperture="6.3" distance="1000" k1="-0.3456" k2="0.0248" k3="0.0258"/>
-+            <vignetting model="pa" focal="19" aperture="22" distance="10" k1="-0.4123" k2="0.1070" k3="-0.0016"/>
-+            <vignetting model="pa" focal="19" aperture="22" distance="1000" k1="-0.4123" k2="0.1070" k3="-0.0016"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>30mm f/1.4 DC DN</model>
-+        <mount>Sony E</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="30" a="-0.005" b="0" c="-0.013"/>
-+            <tca model="poly3" focal="30" br="-0.0000655" vr="1.0002716" bb="0.0001493" vb="0.9998514"/>
-+            <vignetting model="pa" focal="30" aperture="1.4" distance="10" k1="-0.7397" k2="0.2898" k3="-0.0725"/>
-+            <vignetting model="pa" focal="30" aperture="1.4" distance="1000" k1="-0.7397" k2="0.2898" k3="-0.0725"/>
-+            <vignetting model="pa" focal="30" aperture="2" distance="10" k1="-0.0294" k2="-0.7454" k3="0.3732"/>
-+            <vignetting model="pa" focal="30" aperture="2" distance="1000" k1="-0.0294" k2="-0.7454" k3="0.3732"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.2530" k2="0.3830" k3="-0.3861"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.2530" k2="0.3830" k3="-0.3861"/>
-+            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.2194" k2="0.1395" k3="-0.0720"/>
-+            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.2194" k2="0.1395" k3="-0.0720"/>
-+            <vignetting model="pa" focal="30" aperture="8" distance="10" k1="-0.2137" k2="0.1051" k3="-0.0333"/>
-+            <vignetting model="pa" focal="30" aperture="8" distance="1000" k1="-0.2137" k2="0.1051" k3="-0.0333"/>
-+            <vignetting model="pa" focal="30" aperture="13" distance="10" k1="-0.2189" k2="0.1170" k3="-0.0418"/>
-+            <vignetting model="pa" focal="30" aperture="13" distance="1000" k1="-0.2189" k2="0.1170" k3="-0.0418"/>
-+            <vignetting model="pa" focal="30" aperture="16" distance="10" k1="-0.2179" k2="0.1129" k3="-0.0401"/>
-+            <vignetting model="pa" focal="30" aperture="16" distance="1000" k1="-0.2179" k2="0.1129" k3="-0.0401"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-sony.xml b/data/db/mil-sony.xml
---- a/data/db/mil-sony.xml	2013-10-18 18:41:38.000000000 +0200
-+++ b/data/db/mil-sony.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,636 +1,1183 @@
- <lensdatabase>
--
-     <mount>
-         <name>Sony E</name>
--        <compat>Sony Alpha</compat>
--        <compat>Minolta AF</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-3</model>
--        <model lang="en">NEX 3</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-C3</model>
--        <model lang="en">NEX C3</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-F3</model>
--        <model lang="en">NEX F3</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-3N</model>
--        <model lang="en">NEX 3N</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-5</model>
--        <model lang="en">NEX 5</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-5N</model>
--        <model lang="en">NEX 5N</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-5R</model>
--        <model lang="en">NEX 5R</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-+        <model>NEX-5T</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-         <model>NEX-6</model>
--        <model lang="en">NEX 6</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>NEX-7</model>
--        <model lang="en">NEX 7</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-6000</model>
-+        <model lang="en">Alpha 6000</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-3000</model>
-+        <model lang="en">Alpha 3000</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-5000</model>
-+        <model lang="en">Alpha 5000</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-5100</model>
-+        <model lang="en">Alpha 5100</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-7</model>
-+        <model lang="en">Alpha 7</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-7R</model>
-+        <model lang="en">Alpha 7R</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-7S</model>
-+        <model lang="en">Alpha 7S</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-+        <model>ILCE-7M2</model>
-+        <model lang="en">Alpha 7 II</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 16mm F2.8</model>
-+        <model>E 16mm f/2.8</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-7 -->
--            <distortion model="ptlens" focal="16" a="0.01701" b="-0.02563" c="-0.0052" />
--            <tca model="poly3" focal="16" br="-0.0003027" vr="1.0010272" bb="0.0003454" vb="0.9993952" />
--            <vignetting model="pa" focal="16" aperture="2.8" distance="0.25" k1="-1.8891" k2="1.7993" k3="-0.7326" />
--            <vignetting model="pa" focal="16" aperture="2.8" distance="0.4" k1="-1.9392" k2="1.8889" k3="-0.7764" />
--            <vignetting model="pa" focal="16" aperture="2.8" distance="1.2" k1="-1.9628" k2="1.9339" k3="-0.8000" />
--            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-1.9875" k2="1.9757" k3="-0.8192" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="0.25" k1="-1.3071" k2="0.7763" k3="-0.2272" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="0.4" k1="-1.3412" k2="0.8279" k3="-0.2484" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="1.2" k1="-1.3572" k2="0.8513" k3="-0.2586" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.3774" k2="0.8764" k3="-0.2668" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="0.25" k1="-1.3080" k2="0.7762" k3="-0.2205" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="0.4" k1="-1.3371" k2="0.8175" k3="-0.2374" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="1.2" k1="-1.3507" k2="0.8405" k3="-0.2477" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-1.3740" k2="0.8727" k3="-0.2605" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="0.25" k1="-1.3479" k2="0.8292" k3="-0.2375" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="0.4" k1="-1.3770" k2="0.8692" k3="-0.2535" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="1.2" k1="-1.3950" k2="0.9019" k3="-0.2696" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.4107" k2="0.9175" k3="-0.2726" />
--            <vignetting model="pa" focal="16" aperture="22" distance="0.25" k1="-1.3377" k2="0.7923" k3="-0.2096" />
--            <vignetting model="pa" focal="16" aperture="22" distance="0.4" k1="-1.3677" k2="0.8355" k3="-0.2270" />
--            <vignetting model="pa" focal="16" aperture="22" distance="1.2" k1="-1.3818" k2="0.8585" k3="-0.2378" />
--            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.3964" k2="0.8838" k3="-0.2504" />
-+            <distortion model="ptlens" focal="16" a="0.01701" b="-0.02563" c="-0.0052"/>
-+            <tca model="poly3" focal="16" br="-0.0003027" vr="1.0010272" bb="0.0003454" vb="0.9993952"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="0.25" k1="-1.8891" k2="1.7993" k3="-0.7326"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="0.4" k1="-1.9392" k2="1.8889" k3="-0.7764"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1.2" k1="-1.9628" k2="1.9339" k3="-0.8000"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-1.9875" k2="1.9757" k3="-0.8192"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="0.25" k1="-1.3071" k2="0.7763" k3="-0.2272"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="0.4" k1="-1.3412" k2="0.8279" k3="-0.2484"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1.2" k1="-1.3572" k2="0.8513" k3="-0.2586"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.3774" k2="0.8764" k3="-0.2668"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="0.25" k1="-1.3080" k2="0.7762" k3="-0.2205"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="0.4" k1="-1.3371" k2="0.8175" k3="-0.2374"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="1.2" k1="-1.3507" k2="0.8405" k3="-0.2477"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-1.3740" k2="0.8727" k3="-0.2605"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="0.25" k1="-1.3479" k2="0.8292" k3="-0.2375"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="0.4" k1="-1.3770" k2="0.8692" k3="-0.2535"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1.2" k1="-1.3950" k2="0.9019" k3="-0.2696"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.4107" k2="0.9175" k3="-0.2726"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="0.25" k1="-1.3377" k2="0.7923" k3="-0.2096"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="0.4" k1="-1.3677" k2="0.8355" k3="-0.2270"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1.2" k1="-1.3818" k2="0.8585" k3="-0.2378"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.3964" k2="0.8838" k3="-0.2504"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 18-55mm F3.5-5.6 OSS</model>
-+        <model>E 18-55mm f/3.5-5.6 OSS</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-7 -->
--            <distortion model="ptlens" focal="18" a="0.02897" b="-0.08920" c="0.03513" />
--            <distortion model="ptlens" focal="19" a="0.02895" b="-0.08472" c="0.03749" />
--            <distortion model="ptlens" focal="20" a="0.02164" b="-0.05738" c="0.01945" />
--            <distortion model="ptlens" focal="24" a="0.01405" b="-0.02629" c="0.00229" />
--            <distortion model="ptlens" focal="30" a="0.01175" b="-0.02135" c="0.02549" />
--            <distortion model="ptlens" focal="35" a="0.00822" b="-0.00590" c="0.00973" />
--            <distortion model="ptlens" focal="55" a="0.00220" b="-0.00232" c="0.01446" />
--            <tca model="poly3" focal="18" br="-0.0001298" vr="1.0009363" bb="0.0001843" vb="0.9994347" />
--            <tca model="poly3" focal="24" br="-0.0001599" vr="1.0005502" bb="0.0001423" vb="0.9997553" />
--            <tca model="poly3" focal="35" br="-0.0001739" vr="1.0001127" bb="0.0002639" vb="0.9999761" />
--            <tca model="poly3" focal="43" br="-0.0001015" vr="1.0000697" bb="0.0001228" vb="0.9999887" />
--            <tca model="poly3" focal="55" br="-0.0000541" vr="1.0001594" bb="0.0000646" vb="0.9997465" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.2" k1="-0.9828" k2="0.7103" k3="-0.4308" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.35" k1="-0.9326" k2="0.5885" k3="-0.3601" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.95" k1="-0.9071" k2="0.5217" k3="-0.3194" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.8870" k2="0.4585" k3="-0.2777" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="0.2" k1="-0.5346" k2="0.2388" k3="-0.3160" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="0.35" k1="-0.4978" k2="0.1524" k3="-0.2720" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="0.95" k1="-0.4605" k2="0.0654" k3="-0.2237" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.4544" k2="0.0291" k3="-0.1979" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.5766" k2="0.3435" k3="-0.3199" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.35" k1="-0.5471" k2="0.3266" k3="-0.3399" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.95" k1="-0.5307" k2="0.3027" k3="-0.3380" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.5353" k2="0.3239" k3="-0.3623" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="0.2" k1="-0.5506" k2="0.2228" k3="-0.1823" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="0.35" k1="-0.5250" k2="0.2260" k3="-0.2169" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="0.95" k1="-0.5249" k2="0.2599" k3="-0.2558" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.5402" k2="0.3058" k3="-0.2960" />
--            <vignetting model="pa" focal="18" aperture="9" distance="0.2" k1="-0.4829" k2="0.0229" k3="-0.0188" />
--            <vignetting model="pa" focal="18" aperture="9" distance="0.95" k1="-0.5017" k2="0.1155" k3="-0.1024" />
--            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.4886" k2="0.1325" k3="-0.1352" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.4639" k2="-0.0257" k3="0.0186" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.35" k1="-0.4671" k2="-0.0099" k3="0.0096" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.95" k1="-0.4588" k2="-0.0179" k3="0.0102" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4486" k2="-0.0211" k3="0.0053" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.2" k1="-0.8695" k2="0.5829" k3="-0.2435" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.35" k1="-0.8684" k2="0.6061" k3="-0.2633" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.95" k1="-0.8526" k2="0.6279" k3="-0.3075" />
--            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.8595" k2="0.6867" k3="-0.3685" />
--            <vignetting model="pa" focal="24" aperture="5" distance="0.2" k1="-0.4208" k2="0.0550" k3="-0.0234" />
--            <vignetting model="pa" focal="24" aperture="5" distance="0.35" k1="-0.4317" k2="0.1071" k3="-0.0592" />
--            <vignetting model="pa" focal="24" aperture="5" distance="0.95" k1="-0.4497" k2="0.1952" k3="-0.1415" />
--            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4474" k2="0.2763" k3="-0.2323" />
--            <vignetting model="pa" focal="24" aperture="6.3" distance="0.2" k1="-0.4162" k2="0.0424" k3="-0.0094" />
--            <vignetting model="pa" focal="24" aperture="6.3" distance="0.35" k1="-0.4138" k2="0.0673" k3="-0.0268" />
--            <vignetting model="pa" focal="24" aperture="6.3" distance="0.95" k1="-0.4179" k2="0.0799" k3="-0.0342" />
--            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.4001" k2="0.0907" k3="-0.0602" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.2" k1="-0.4163" k2="0.0536" k3="-0.0187" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.35" k1="-0.3942" k2="0.0325" k3="-0.0072" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.95" k1="-0.4129" k2="0.0809" k3="-0.0350" />
--            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3920" k2="0.0540" k3="-0.0243" />
--            <vignetting model="pa" focal="24" aperture="25" distance="0.2" k1="-0.4245" k2="0.0756" k3="-0.0298" />
--            <vignetting model="pa" focal="24" aperture="25" distance="0.35" k1="-0.3874" k2="0.0265" k3="-0.0042" />
--            <vignetting model="pa" focal="24" aperture="25" distance="0.95" k1="-0.3890" k2="0.0358" k3="-0.0086" />
--            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3694" k2="0.0182" k3="-0.0039" />
--            <vignetting model="pa" focal="28" aperture="4" distance="0.2" k1="-0.8107" k2="0.5490" k3="-0.2270" />
--            <vignetting model="pa" focal="28" aperture="4" distance="0.35" k1="-0.7804" k2="0.5556" k3="-0.2613" />
--            <vignetting model="pa" focal="28" aperture="4" distance="0.95" k1="-0.7955" k2="0.6487" k3="-0.3540" />
--            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.7976" k2="0.7166" k3="-0.4340" />
--            <vignetting model="pa" focal="28" aperture="5" distance="0.2" k1="-0.3909" k2="0.0762" k3="-0.0386" />
--            <vignetting model="pa" focal="28" aperture="5" distance="0.35" k1="-0.3810" k2="0.1467" k3="-0.1191" />
--            <vignetting model="pa" focal="28" aperture="5" distance="0.95" k1="-0.4084" k2="0.2954" k3="-0.2575" />
--            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.4173" k2="0.3960" k3="-0.3671" />
--            <vignetting model="pa" focal="28" aperture="6.3" distance="0.2" k1="-0.3689" k2="0.0347" k3="-0.0086" />
--            <vignetting model="pa" focal="28" aperture="6.3" distance="0.35" k1="-0.3373" k2="0.0182" k3="-0.0095" />
--            <vignetting model="pa" focal="28" aperture="6.3" distance="0.95" k1="-0.3388" k2="0.0492" k3="-0.0361" />
--            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.3558" k2="0.1598" k3="-0.1415" />
--            <vignetting model="pa" focal="28" aperture="8" distance="0.2" k1="-0.3728" k2="0.0537" k3="-0.0207" />
--            <vignetting model="pa" focal="28" aperture="8" distance="0.35" k1="-0.3347" k2="0.0096" k3="-0.0001" />
--            <vignetting model="pa" focal="28" aperture="8" distance="0.95" k1="-0.3233" k2="-0.0049" k3="0.0120" />
--            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3109" k2="0.0142" k3="-0.0124" />
--            <vignetting model="pa" focal="28" aperture="25" distance="0.2" k1="-0.3475" k2="0.0133" k3="0.0029" />
--            <vignetting model="pa" focal="28" aperture="25" distance="0.35" k1="-0.3310" k2="0.0096" k3="0.0021" />
--            <vignetting model="pa" focal="28" aperture="25" distance="0.95" k1="-0.3105" k2="-0.0269" k3="0.0278" />
--            <vignetting model="pa" focal="28" aperture="25" distance="1000" k1="-0.3038" k2="-0.0060" k3="0.0072" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="0.2" k1="-0.6846" k2="0.5881" k3="-0.3529" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="0.35" k1="-0.6976" k2="0.7191" k3="-0.5084" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="0.95" k1="-0.6937" k2="0.7580" k3="-0.5900" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.6551" k2="0.7173" k3="-0.6114" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.3057" k2="0.1566" k3="-0.1516" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.35" k1="-0.3452" k2="0.4078" k3="-0.4017" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.95" k1="-0.3740" k2="0.5785" k3="-0.5931" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3719" k2="0.6504" k3="-0.7036" />
--            <vignetting model="pa" focal="35" aperture="7.1" distance="0.2" k1="-0.2601" k2="-0.0014" k3="-0.0094" />
--            <vignetting model="pa" focal="35" aperture="7.1" distance="0.35" k1="-0.2708" k2="0.1265" k3="-0.1376" />
--            <vignetting model="pa" focal="35" aperture="7.1" distance="0.95" k1="-0.3508" k2="0.4446" k3="-0.4189" />
--            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.3731" k2="0.6169" k3="-0.6069" />
--            <vignetting model="pa" focal="35" aperture="9" distance="0.2" k1="-0.2717" k2="0.0172" k3="-0.0151" />
--            <vignetting model="pa" focal="35" aperture="9" distance="0.35" k1="-0.2283" k2="-0.0334" k3="0.0089" />
--            <vignetting model="pa" focal="35" aperture="9" distance="0.95" k1="-0.2831" k2="0.1646" k3="-0.1530" />
--            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.3142" k2="0.3875" k3="-0.3746" />
--            <vignetting model="pa" focal="35" aperture="29" distance="0.2" k1="-0.2699" k2="0.0152" k3="-0.0108" />
--            <vignetting model="pa" focal="35" aperture="29" distance="0.35" k1="-0.2337" k2="0.0002" k3="-0.0152" />
--            <vignetting model="pa" focal="35" aperture="29" distance="0.95" k1="-0.2327" k2="-0.0122" k3="0.0049" />
--            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.2079" k2="-0.0163" k3="-0.0071" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="0.2" k1="-0.3669" k2="0.2307" k3="-0.1015" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="0.35" k1="-0.3364" k2="0.1973" k3="-0.0845" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="0.95" k1="-0.3295" k2="0.1848" k3="-0.0797" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3211" k2="0.2441" k3="-0.1550" />
--            <vignetting model="pa" focal="55" aperture="7.1" distance="0.2" k1="-0.1295" k2="0.0612" k3="-0.0495" />
--            <vignetting model="pa" focal="55" aperture="7.1" distance="0.35" k1="-0.0928" k2="0.0319" k3="-0.0331" />
--            <vignetting model="pa" focal="55" aperture="7.1" distance="0.95" k1="-0.0923" k2="0.0441" k3="-0.0381" />
--            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.0642" k2="0.0155" k3="-0.0263" />
--            <vignetting model="pa" focal="55" aperture="9" distance="0.2" k1="-0.1262" k2="0.0613" k3="-0.0513" />
--            <vignetting model="pa" focal="55" aperture="9" distance="0.35" k1="-0.0949" k2="0.0406" k3="-0.0395" />
--            <vignetting model="pa" focal="55" aperture="9" distance="0.95" k1="-0.0923" k2="0.0508" k3="-0.0427" />
--            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.0735" k2="0.0317" k3="-0.0324" />
--            <vignetting model="pa" focal="55" aperture="11" distance="0.2" k1="-0.1296" k2="0.0697" k3="-0.0561" />
--            <vignetting model="pa" focal="55" aperture="11" distance="0.35" k1="-0.1009" k2="0.0496" k3="-0.0439" />
--            <vignetting model="pa" focal="55" aperture="11" distance="0.95" k1="-0.0948" k2="0.0526" k3="-0.0434" />
--            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0637" k2="0.0307" k3="-0.0371" />
--            <vignetting model="pa" focal="55" aperture="32" distance="0.2" k1="-0.1308" k2="0.0796" k3="-0.0637" />
--            <vignetting model="pa" focal="55" aperture="32" distance="0.35" k1="-0.1208" k2="0.1068" k3="-0.0822" />
--            <vignetting model="pa" focal="55" aperture="32" distance="0.95" k1="-0.1098" k2="0.1027" k3="-0.0778" />
--            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.0719" k2="0.0761" k3="-0.0703" />
-+            <distortion model="ptlens" focal="18" a="0.02897" b="-0.08920" c="0.03513"/>
-+            <distortion model="ptlens" focal="19" a="0.02895" b="-0.08472" c="0.03749"/>
-+            <distortion model="ptlens" focal="20" a="0.02164" b="-0.05738" c="0.01945"/>
-+            <distortion model="ptlens" focal="24" a="0.01405" b="-0.02629" c="0.00229"/>
-+            <distortion model="ptlens" focal="30" a="0.01175" b="-0.02135" c="0.02549"/>
-+            <distortion model="ptlens" focal="35" a="0.00822" b="-0.00590" c="0.00973"/>
-+            <distortion model="ptlens" focal="55" a="0.00220" b="-0.00232" c="0.01446"/>
-+            <tca model="poly3" focal="18" br="-0.0001298" vr="1.0009363" bb="0.0001843" vb="0.9994347"/>
-+            <tca model="poly3" focal="24" br="-0.0001599" vr="1.0005502" bb="0.0001423" vb="0.9997553"/>
-+            <tca model="poly3" focal="35" br="-0.0001739" vr="1.0001127" bb="0.0002639" vb="0.9999761"/>
-+            <tca model="poly3" focal="43" br="-0.0001015" vr="1.0000697" bb="0.0001228" vb="0.9999887"/>
-+            <tca model="poly3" focal="55" br="-0.0000541" vr="1.0001594" bb="0.0000646" vb="0.9997465"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.2" k1="-0.9828" k2="0.7103" k3="-0.4308"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.35" k1="-0.9326" k2="0.5885" k3="-0.3601"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.95" k1="-0.9071" k2="0.5217" k3="-0.3194"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.8870" k2="0.4585" k3="-0.2777"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="0.2" k1="-0.5346" k2="0.2388" k3="-0.3160"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="0.35" k1="-0.4978" k2="0.1524" k3="-0.2720"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="0.95" k1="-0.4605" k2="0.0654" k3="-0.2237"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.4544" k2="0.0291" k3="-0.1979"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.2" k1="-0.5766" k2="0.3435" k3="-0.3199"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.35" k1="-0.5471" k2="0.3266" k3="-0.3399"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.95" k1="-0.5307" k2="0.3027" k3="-0.3380"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.5353" k2="0.3239" k3="-0.3623"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="0.2" k1="-0.5506" k2="0.2228" k3="-0.1823"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="0.35" k1="-0.5250" k2="0.2260" k3="-0.2169"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="0.95" k1="-0.5249" k2="0.2599" k3="-0.2558"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.5402" k2="0.3058" k3="-0.2960"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="0.2" k1="-0.4829" k2="0.0229" k3="-0.0188"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="0.95" k1="-0.5017" k2="0.1155" k3="-0.1024"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.4886" k2="0.1325" k3="-0.1352"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.2" k1="-0.4639" k2="-0.0257" k3="0.0186"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.35" k1="-0.4671" k2="-0.0099" k3="0.0096"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.95" k1="-0.4588" k2="-0.0179" k3="0.0102"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4486" k2="-0.0211" k3="0.0053"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.2" k1="-0.8695" k2="0.5829" k3="-0.2435"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.35" k1="-0.8684" k2="0.6061" k3="-0.2633"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.95" k1="-0.8526" k2="0.6279" k3="-0.3075"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.8595" k2="0.6867" k3="-0.3685"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="0.2" k1="-0.4208" k2="0.0550" k3="-0.0234"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="0.35" k1="-0.4317" k2="0.1071" k3="-0.0592"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="0.95" k1="-0.4497" k2="0.1952" k3="-0.1415"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4474" k2="0.2763" k3="-0.2323"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="0.2" k1="-0.4162" k2="0.0424" k3="-0.0094"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="0.35" k1="-0.4138" k2="0.0673" k3="-0.0268"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="0.95" k1="-0.4179" k2="0.0799" k3="-0.0342"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.4001" k2="0.0907" k3="-0.0602"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.2" k1="-0.4163" k2="0.0536" k3="-0.0187"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.35" k1="-0.3942" k2="0.0325" k3="-0.0072"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.95" k1="-0.4129" k2="0.0809" k3="-0.0350"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3920" k2="0.0540" k3="-0.0243"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="0.2" k1="-0.4245" k2="0.0756" k3="-0.0298"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="0.35" k1="-0.3874" k2="0.0265" k3="-0.0042"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="0.95" k1="-0.3890" k2="0.0358" k3="-0.0086"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3694" k2="0.0182" k3="-0.0039"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.2" k1="-0.8107" k2="0.5490" k3="-0.2270"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.35" k1="-0.7804" k2="0.5556" k3="-0.2613"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.95" k1="-0.7955" k2="0.6487" k3="-0.3540"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.7976" k2="0.7166" k3="-0.4340"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="0.2" k1="-0.3909" k2="0.0762" k3="-0.0386"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="0.35" k1="-0.3810" k2="0.1467" k3="-0.1191"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="0.95" k1="-0.4084" k2="0.2954" k3="-0.2575"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.4173" k2="0.3960" k3="-0.3671"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="0.2" k1="-0.3689" k2="0.0347" k3="-0.0086"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="0.35" k1="-0.3373" k2="0.0182" k3="-0.0095"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="0.95" k1="-0.3388" k2="0.0492" k3="-0.0361"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.3558" k2="0.1598" k3="-0.1415"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.2" k1="-0.3728" k2="0.0537" k3="-0.0207"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.35" k1="-0.3347" k2="0.0096" k3="-0.0001"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.95" k1="-0.3233" k2="-0.0049" k3="0.0120"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3109" k2="0.0142" k3="-0.0124"/>
-+            <vignetting model="pa" focal="28" aperture="25" distance="0.2" k1="-0.3475" k2="0.0133" k3="0.0029"/>
-+            <vignetting model="pa" focal="28" aperture="25" distance="0.35" k1="-0.3310" k2="0.0096" k3="0.0021"/>
-+            <vignetting model="pa" focal="28" aperture="25" distance="0.95" k1="-0.3105" k2="-0.0269" k3="0.0278"/>
-+            <vignetting model="pa" focal="28" aperture="25" distance="1000" k1="-0.3038" k2="-0.0060" k3="0.0072"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="0.2" k1="-0.6846" k2="0.5881" k3="-0.3529"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="0.35" k1="-0.6976" k2="0.7191" k3="-0.5084"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="0.95" k1="-0.6937" k2="0.7580" k3="-0.5900"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.6551" k2="0.7173" k3="-0.6114"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.2" k1="-0.3057" k2="0.1566" k3="-0.1516"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.35" k1="-0.3452" k2="0.4078" k3="-0.4017"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.95" k1="-0.3740" k2="0.5785" k3="-0.5931"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3719" k2="0.6504" k3="-0.7036"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="0.2" k1="-0.2601" k2="-0.0014" k3="-0.0094"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="0.35" k1="-0.2708" k2="0.1265" k3="-0.1376"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="0.95" k1="-0.3508" k2="0.4446" k3="-0.4189"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.3731" k2="0.6169" k3="-0.6069"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="0.2" k1="-0.2717" k2="0.0172" k3="-0.0151"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="0.35" k1="-0.2283" k2="-0.0334" k3="0.0089"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="0.95" k1="-0.2831" k2="0.1646" k3="-0.1530"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.3142" k2="0.3875" k3="-0.3746"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="0.2" k1="-0.2699" k2="0.0152" k3="-0.0108"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="0.35" k1="-0.2337" k2="0.0002" k3="-0.0152"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="0.95" k1="-0.2327" k2="-0.0122" k3="0.0049"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.2079" k2="-0.0163" k3="-0.0071"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="0.2" k1="-0.3669" k2="0.2307" k3="-0.1015"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="0.35" k1="-0.3364" k2="0.1973" k3="-0.0845"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="0.95" k1="-0.3295" k2="0.1848" k3="-0.0797"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3211" k2="0.2441" k3="-0.1550"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="0.2" k1="-0.1295" k2="0.0612" k3="-0.0495"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="0.35" k1="-0.0928" k2="0.0319" k3="-0.0331"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="0.95" k1="-0.0923" k2="0.0441" k3="-0.0381"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.0642" k2="0.0155" k3="-0.0263"/>
-+            <vignetting model="pa" focal="55" aperture="9" distance="0.2" k1="-0.1262" k2="0.0613" k3="-0.0513"/>
-+            <vignetting model="pa" focal="55" aperture="9" distance="0.35" k1="-0.0949" k2="0.0406" k3="-0.0395"/>
-+            <vignetting model="pa" focal="55" aperture="9" distance="0.95" k1="-0.0923" k2="0.0508" k3="-0.0427"/>
-+            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.0735" k2="0.0317" k3="-0.0324"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="0.2" k1="-0.1296" k2="0.0697" k3="-0.0561"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="0.35" k1="-0.1009" k2="0.0496" k3="-0.0439"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="0.95" k1="-0.0948" k2="0.0526" k3="-0.0434"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0637" k2="0.0307" k3="-0.0371"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="0.2" k1="-0.1308" k2="0.0796" k3="-0.0637"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="0.35" k1="-0.1208" k2="0.1068" k3="-0.0822"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="0.95" k1="-0.1098" k2="0.1027" k3="-0.0778"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.0719" k2="0.0761" k3="-0.0703"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 50mm F1.8 OSS</model>
-+        <model>E 50mm f/1.8 OSS</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-7 -->
--            <distortion model="poly3" focal="50" k1="0.00032" />
--            <tca model="poly3" focal="50" br="0.0000064" vr="1.0000819" bb="-0.0000082" vb="0.9998975" />
--            <vignetting model="pa" focal="50" aperture="1.8" distance="0.4" k1="-0.5494" k2="-0.1621" k3="0.2075" />
--            <vignetting model="pa" focal="50" aperture="1.8" distance="0.75" k1="-0.7039" k2="0.2640" k3="-0.1234" />
--            <vignetting model="pa" focal="50" aperture="1.8" distance="2.1" k1="-0.7837" k2="0.3922" k3="-0.2255" />
--            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.8304" k2="0.4363" k3="-0.2541" />
--            <vignetting model="pa" focal="50" aperture="2.2" distance="0.4" k1="-0.2865" k2="-0.0531" k3="-0.0294" />
--            <vignetting model="pa" focal="50" aperture="2.2" distance="0.75" k1="-0.1613" k2="-0.1351" k3="-0.1333" />
--            <vignetting model="pa" focal="50" aperture="2.2" distance="2.1" k1="0.0019" k2="-0.6141" k3="0.1264" />
--            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="0.1019" k2="-0.9668" k3="0.3451" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.3500" k2="0.1472" k3="-0.0622" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="0.75" k1="-0.3427" k2="0.4871" k3="-0.4224" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="2.1" k1="-0.2921" k2="0.5198" k3="-0.5526" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2286" k2="0.4372" k3="-0.5716" />
--            <vignetting model="pa" focal="50" aperture="3.5" distance="0.4" k1="-0.3341" k2="0.1086" k3="-0.0350" />
--            <vignetting model="pa" focal="50" aperture="3.5" distance="0.75" k1="-0.2820" k2="0.2153" k3="-0.1311" />
--            <vignetting model="pa" focal="50" aperture="3.5" distance="2.1" k1="-0.3183" k2="0.5129" k3="-0.4189" />
--            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3188" k2="0.6582" k3="-0.5882" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.3185" k2="0.0802" k3="-0.0190" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.75" k1="-0.2406" k2="0.0804" k3="-0.0181" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="2.1" k1="-0.2038" k2="0.0800" k3="-0.0150" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1871" k2="0.1040" k3="-0.0310" />
--            <vignetting model="pa" focal="50" aperture="9" distance="0.4" k1="-0.3239" k2="0.0932" k3="-0.0261" />
--            <vignetting model="pa" focal="50" aperture="9" distance="0.75" k1="-0.2508" k2="0.1047" k3="-0.0348" />
--            <vignetting model="pa" focal="50" aperture="9" distance="2.1" k1="-0.2173" k2="0.1025" k3="-0.0285" />
--            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2000" k2="0.1232" k3="-0.0415" />
--            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.3250" k2="0.0986" k3="-0.0315" />
--            <vignetting model="pa" focal="50" aperture="22" distance="0.75" k1="-0.2434" k2="0.0732" k3="-0.0140" />
--            <vignetting model="pa" focal="50" aperture="22" distance="2.1" k1="-0.2169" k2="0.1029" k3="-0.0324" />
--            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1829" k2="0.0877" k3="-0.0220" />
-+            <distortion model="poly3" focal="50" k1="0.00032"/>
-+            <tca model="poly3" focal="50" br="0.0000064" vr="1.0000819" bb="-0.0000082" vb="0.9998975"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="0.4" k1="-0.5494" k2="-0.1621" k3="0.2075"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="0.75" k1="-0.7039" k2="0.2640" k3="-0.1234"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="2.1" k1="-0.7837" k2="0.3922" k3="-0.2255"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.8304" k2="0.4363" k3="-0.2541"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="0.4" k1="-0.2865" k2="-0.0531" k3="-0.0294"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="0.75" k1="-0.1613" k2="-0.1351" k3="-0.1333"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="2.1" k1="0.0019" k2="-0.6141" k3="0.1264"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="0.1019" k2="-0.9668" k3="0.3451"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.3500" k2="0.1472" k3="-0.0622"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.75" k1="-0.3427" k2="0.4871" k3="-0.4224"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="2.1" k1="-0.2921" k2="0.5198" k3="-0.5526"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2286" k2="0.4372" k3="-0.5716"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="0.4" k1="-0.3341" k2="0.1086" k3="-0.0350"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="0.75" k1="-0.2820" k2="0.2153" k3="-0.1311"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="2.1" k1="-0.3183" k2="0.5129" k3="-0.4189"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3188" k2="0.6582" k3="-0.5882"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.3185" k2="0.0802" k3="-0.0190"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.75" k1="-0.2406" k2="0.0804" k3="-0.0181"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="2.1" k1="-0.2038" k2="0.0800" k3="-0.0150"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1871" k2="0.1040" k3="-0.0310"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="0.4" k1="-0.3239" k2="0.0932" k3="-0.0261"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="0.75" k1="-0.2508" k2="0.1047" k3="-0.0348"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="2.1" k1="-0.2173" k2="0.1025" k3="-0.0285"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2000" k2="0.1232" k3="-0.0415"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.3250" k2="0.0986" k3="-0.0315"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.75" k1="-0.2434" k2="0.0732" k3="-0.0140"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="2.1" k1="-0.2169" k2="0.1029" k3="-0.0324"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1829" k2="0.0877" k3="-0.0220"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 55-210mm F4.5-6.3 OSS</model>
-+        <model>E 55-210mm f/4.5-6.3 OSS</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-7 -->
--            <distortion model="ptlens" focal="55" a="0.00219" b="0.00538" c="-0.01084" />
--            <distortion model="ptlens" focal="71" a="-0.01297" b="0.06432" c="-0.07626" />
--            <distortion model="ptlens" focal="100" a="0.00774" b="-0.0129" c="0.01953" />
--            <distortion model="ptlens" focal="135" a="0.0001" b="0.01316" c="-0.01183" />
--            <distortion model="ptlens" focal="210" a="-0.01011" b="0.0489" c="-0.05962" />
--            <tca model="poly3" focal="55" br="0.0000875" vr="1.0000793" bb="-0.0001308" vb="1.0002963" />
--            <tca model="poly3" focal="70" br="0.0000662" vr="0.9999743" bb="-0.0001173" vb="1.0002967" />
--            <tca model="poly3" focal="100" br="0.0000391" vr="0.9998840" bb="-0.0000824" vb="1.0002506" />
--            <tca model="poly3" focal="135" br="-0.0000205" vr="0.9999141" bb="0.0000026" vb="1.0000650" />
--            <tca model="poly3" focal="210" br="0.0000572" vr="0.9998591" bb="-0.0001599" vb="1.0000490" />
--            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.2773" k2="-0.5412" k3="0.2434" />
--            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.2773" k2="-0.5412" k3="0.2434" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0738" k2="-0.3379" k3="-0.0444" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0738" k2="-0.3379" k3="-0.0444" />
--            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="-0.2352" k2="0.2738" k3="-0.3541" />
--            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.2352" k2="0.2738" k3="-0.3541" />
--            <vignetting model="pa" focal="55" aperture="9" distance="10" k1="-0.2663" k2="0.3115" k3="-0.2690" />
--            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.2663" k2="0.3115" k3="-0.2690" />
--            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2309" k2="0.1010" k3="-0.0452" />
--            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2309" k2="0.1010" k3="-0.0452" />
--            <vignetting model="pa" focal="68" aperture="5" distance="10" k1="-0.3697" k2="0.0319" k3="-0.2082" />
--            <vignetting model="pa" focal="68" aperture="5" distance="1000" k1="-0.3697" k2="0.0319" k3="-0.2082" />
--            <vignetting model="pa" focal="68" aperture="6.3" distance="10" k1="-0.1719" k2="0.2087" k3="-0.4150" />
--            <vignetting model="pa" focal="68" aperture="6.3" distance="1000" k1="-0.1719" k2="0.2087" k3="-0.4150" />
--            <vignetting model="pa" focal="68" aperture="8" distance="10" k1="-0.2525" k2="0.3845" k3="-0.3619" />
--            <vignetting model="pa" focal="68" aperture="8" distance="1000" k1="-0.2525" k2="0.3845" k3="-0.3619" />
--            <vignetting model="pa" focal="68" aperture="10" distance="10" k1="-0.1824" k2="0.0986" k3="-0.0618" />
--            <vignetting model="pa" focal="68" aperture="10" distance="1000" k1="-0.1824" k2="0.0986" k3="-0.0618" />
--            <vignetting model="pa" focal="68" aperture="22" distance="10" k1="-0.1871" k2="0.0736" k3="-0.0273" />
--            <vignetting model="pa" focal="68" aperture="22" distance="1000" k1="-0.1871" k2="0.0736" k3="-0.0273" />
--            <vignetting model="pa" focal="96" aperture="5.6" distance="10" k1="-0.2952" k2="-0.2940" k3="0.0603" />
--            <vignetting model="pa" focal="96" aperture="5.6" distance="1000" k1="-0.2952" k2="-0.2940" k3="0.0603" />
--            <vignetting model="pa" focal="96" aperture="7.1" distance="10" k1="-0.1378" k2="0.2585" k3="-0.4492" />
--            <vignetting model="pa" focal="96" aperture="7.1" distance="1000" k1="-0.1378" k2="0.2585" k3="-0.4492" />
--            <vignetting model="pa" focal="96" aperture="9" distance="10" k1="-0.2008" k2="0.3524" k3="-0.3120" />
--            <vignetting model="pa" focal="96" aperture="9" distance="1000" k1="-0.2008" k2="0.3524" k3="-0.3120" />
--            <vignetting model="pa" focal="96" aperture="11" distance="10" k1="-0.1247" k2="0.0369" k3="-0.0122" />
--            <vignetting model="pa" focal="96" aperture="11" distance="1000" k1="-0.1247" k2="0.0369" k3="-0.0122" />
--            <vignetting model="pa" focal="96" aperture="25" distance="10" k1="-0.1293" k2="0.0545" k3="-0.0249" />
--            <vignetting model="pa" focal="96" aperture="25" distance="1000" k1="-0.1293" k2="0.0545" k3="-0.0249" />
--            <vignetting model="pa" focal="133" aperture="5.6" distance="10" k1="-0.3756" k2="-0.4023" k3="0.2632" />
--            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="-0.3756" k2="-0.4023" k3="0.2632" />
--            <vignetting model="pa" focal="133" aperture="7.1" distance="10" k1="0.0871" k2="-0.6301" k3="0.1788" />
--            <vignetting model="pa" focal="133" aperture="7.1" distance="1000" k1="0.0871" k2="-0.6301" k3="0.1788" />
--            <vignetting model="pa" focal="133" aperture="9" distance="10" k1="-0.1736" k2="0.3913" k3="-0.4003" />
--            <vignetting model="pa" focal="133" aperture="9" distance="1000" k1="-0.1736" k2="0.3913" k3="-0.4003" />
--            <vignetting model="pa" focal="133" aperture="11" distance="10" k1="-0.0951" k2="0.0476" k3="-0.0274" />
--            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.0951" k2="0.0476" k3="-0.0274" />
--            <vignetting model="pa" focal="133" aperture="29" distance="10" k1="-0.0944" k2="0.0442" k3="-0.0234" />
--            <vignetting model="pa" focal="133" aperture="29" distance="1000" k1="-0.0944" k2="0.0442" k3="-0.0234" />
--            <vignetting model="pa" focal="210" aperture="6.3" distance="10" k1="-1.0480" k2="0.8887" k3="-0.3709" />
--            <vignetting model="pa" focal="210" aperture="6.3" distance="1000" k1="-1.0480" k2="0.8887" k3="-0.3709" />
--            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="0.1238" k2="-0.9151" k3="0.4687" />
--            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="0.1238" k2="-0.9151" k3="0.4687" />
--            <vignetting model="pa" focal="210" aperture="10" distance="10" k1="-0.0851" k2="0.1772" k3="-0.2198" />
--            <vignetting model="pa" focal="210" aperture="10" distance="1000" k1="-0.0851" k2="0.1772" k3="-0.2198" />
--            <vignetting model="pa" focal="210" aperture="13" distance="10" k1="-0.0532" k2="0.0147" k3="-0.0080" />
--            <vignetting model="pa" focal="210" aperture="13" distance="1000" k1="-0.0532" k2="0.0147" k3="-0.0080" />
--            <vignetting model="pa" focal="210" aperture="32" distance="10" k1="-0.0657" k2="0.0293" k3="-0.0148" />
--            <vignetting model="pa" focal="210" aperture="32" distance="1000" k1="-0.0657" k2="0.0293" k3="-0.0148" />
-+            <distortion model="ptlens" focal="55" a="0.00219" b="0.00538" c="-0.01084"/>
-+            <distortion model="ptlens" focal="71" a="-0.01297" b="0.06432" c="-0.07626"/>
-+            <distortion model="ptlens" focal="100" a="0.00774" b="-0.0129" c="0.01953"/>
-+            <distortion model="ptlens" focal="135" a="0.0001" b="0.01316" c="-0.01183"/>
-+            <distortion model="ptlens" focal="210" a="-0.01011" b="0.0489" c="-0.05962"/>
-+            <tca model="poly3" focal="55" br="0.0000875" vr="1.0000793" bb="-0.0001308" vb="1.0002963"/>
-+            <tca model="poly3" focal="70" br="0.0000662" vr="0.9999743" bb="-0.0001173" vb="1.0002967"/>
-+            <tca model="poly3" focal="100" br="0.0000391" vr="0.9998840" bb="-0.0000824" vb="1.0002506"/>
-+            <tca model="poly3" focal="135" br="-0.0000205" vr="0.9999141" bb="0.0000026" vb="1.0000650"/>
-+            <tca model="poly3" focal="210" br="0.0000572" vr="0.9998591" bb="-0.0001599" vb="1.0000490"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.2773" k2="-0.5412" k3="0.2434"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.2773" k2="-0.5412" k3="0.2434"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0738" k2="-0.3379" k3="-0.0444"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0738" k2="-0.3379" k3="-0.0444"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="-0.2352" k2="0.2738" k3="-0.3541"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.2352" k2="0.2738" k3="-0.3541"/>
-+            <vignetting model="pa" focal="55" aperture="9" distance="10" k1="-0.2663" k2="0.3115" k3="-0.2690"/>
-+            <vignetting model="pa" focal="55" aperture="9" distance="1000" k1="-0.2663" k2="0.3115" k3="-0.2690"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2309" k2="0.1010" k3="-0.0452"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2309" k2="0.1010" k3="-0.0452"/>
-+            <vignetting model="pa" focal="68" aperture="5" distance="10" k1="-0.3697" k2="0.0319" k3="-0.2082"/>
-+            <vignetting model="pa" focal="68" aperture="5" distance="1000" k1="-0.3697" k2="0.0319" k3="-0.2082"/>
-+            <vignetting model="pa" focal="68" aperture="6.3" distance="10" k1="-0.1719" k2="0.2087" k3="-0.4150"/>
-+            <vignetting model="pa" focal="68" aperture="6.3" distance="1000" k1="-0.1719" k2="0.2087" k3="-0.4150"/>
-+            <vignetting model="pa" focal="68" aperture="8" distance="10" k1="-0.2525" k2="0.3845" k3="-0.3619"/>
-+            <vignetting model="pa" focal="68" aperture="8" distance="1000" k1="-0.2525" k2="0.3845" k3="-0.3619"/>
-+            <vignetting model="pa" focal="68" aperture="10" distance="10" k1="-0.1824" k2="0.0986" k3="-0.0618"/>
-+            <vignetting model="pa" focal="68" aperture="10" distance="1000" k1="-0.1824" k2="0.0986" k3="-0.0618"/>
-+            <vignetting model="pa" focal="68" aperture="22" distance="10" k1="-0.1871" k2="0.0736" k3="-0.0273"/>
-+            <vignetting model="pa" focal="68" aperture="22" distance="1000" k1="-0.1871" k2="0.0736" k3="-0.0273"/>
-+            <vignetting model="pa" focal="96" aperture="5.6" distance="10" k1="-0.2952" k2="-0.2940" k3="0.0603"/>
-+            <vignetting model="pa" focal="96" aperture="5.6" distance="1000" k1="-0.2952" k2="-0.2940" k3="0.0603"/>
-+            <vignetting model="pa" focal="96" aperture="7.1" distance="10" k1="-0.1378" k2="0.2585" k3="-0.4492"/>
-+            <vignetting model="pa" focal="96" aperture="7.1" distance="1000" k1="-0.1378" k2="0.2585" k3="-0.4492"/>
-+            <vignetting model="pa" focal="96" aperture="9" distance="10" k1="-0.2008" k2="0.3524" k3="-0.3120"/>
-+            <vignetting model="pa" focal="96" aperture="9" distance="1000" k1="-0.2008" k2="0.3524" k3="-0.3120"/>
-+            <vignetting model="pa" focal="96" aperture="11" distance="10" k1="-0.1247" k2="0.0369" k3="-0.0122"/>
-+            <vignetting model="pa" focal="96" aperture="11" distance="1000" k1="-0.1247" k2="0.0369" k3="-0.0122"/>
-+            <vignetting model="pa" focal="96" aperture="25" distance="10" k1="-0.1293" k2="0.0545" k3="-0.0249"/>
-+            <vignetting model="pa" focal="96" aperture="25" distance="1000" k1="-0.1293" k2="0.0545" k3="-0.0249"/>
-+            <vignetting model="pa" focal="133" aperture="5.6" distance="10" k1="-0.3756" k2="-0.4023" k3="0.2632"/>
-+            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="-0.3756" k2="-0.4023" k3="0.2632"/>
-+            <vignetting model="pa" focal="133" aperture="7.1" distance="10" k1="0.0871" k2="-0.6301" k3="0.1788"/>
-+            <vignetting model="pa" focal="133" aperture="7.1" distance="1000" k1="0.0871" k2="-0.6301" k3="0.1788"/>
-+            <vignetting model="pa" focal="133" aperture="9" distance="10" k1="-0.1736" k2="0.3913" k3="-0.4003"/>
-+            <vignetting model="pa" focal="133" aperture="9" distance="1000" k1="-0.1736" k2="0.3913" k3="-0.4003"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="10" k1="-0.0951" k2="0.0476" k3="-0.0274"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.0951" k2="0.0476" k3="-0.0274"/>
-+            <vignetting model="pa" focal="133" aperture="29" distance="10" k1="-0.0944" k2="0.0442" k3="-0.0234"/>
-+            <vignetting model="pa" focal="133" aperture="29" distance="1000" k1="-0.0944" k2="0.0442" k3="-0.0234"/>
-+            <vignetting model="pa" focal="210" aperture="6.3" distance="10" k1="-1.0480" k2="0.8887" k3="-0.3709"/>
-+            <vignetting model="pa" focal="210" aperture="6.3" distance="1000" k1="-1.0480" k2="0.8887" k3="-0.3709"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="0.1238" k2="-0.9151" k3="0.4687"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="0.1238" k2="-0.9151" k3="0.4687"/>
-+            <vignetting model="pa" focal="210" aperture="10" distance="10" k1="-0.0851" k2="0.1772" k3="-0.2198"/>
-+            <vignetting model="pa" focal="210" aperture="10" distance="1000" k1="-0.0851" k2="0.1772" k3="-0.2198"/>
-+            <vignetting model="pa" focal="210" aperture="13" distance="10" k1="-0.0532" k2="0.0147" k3="-0.0080"/>
-+            <vignetting model="pa" focal="210" aperture="13" distance="1000" k1="-0.0532" k2="0.0147" k3="-0.0080"/>
-+            <vignetting model="pa" focal="210" aperture="32" distance="10" k1="-0.0657" k2="0.0293" k3="-0.0148"/>
-+            <vignetting model="pa" focal="210" aperture="32" distance="1000" k1="-0.0657" k2="0.0293" k3="-0.0148"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
-         <model>VCL-ECF1 fisheye converter</model>
-+        <model lang="de">VCL-ECF1 Fischauge-Vorsatz</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-         <type>fisheye</type>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-7 -->
--            <field_of_view focal="10" fov="135.12" />
--            <distortion model="ptlens" focal="10" a="-0.03545" b="0.08332" c="-0.03802" />
--            <tca model="poly3" focal="10" br="-0.0003212" vr="1.0013837" bb="0.0004205" vb="0.9993395" />
--            <vignetting model="pa" focal="10" aperture="2.8" distance="0.1" k1="-1.9395" k2="1.9128" k3="-0.8406" />
--            <vignetting model="pa" focal="10" aperture="2.8" distance="1000" k1="-2.0049" k2="1.9673" k3="-0.8164" />
--            <vignetting model="pa" focal="10" aperture="3.5" distance="0.1" k1="-1.3378" k2="0.8422" k3="-0.3161" />
--            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-1.3797" k2="0.8536" k3="-0.2682" />
--            <vignetting model="pa" focal="10" aperture="4.5" distance="0.1" k1="-1.3330" k2="0.8392" k3="-0.3129" />
--            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-1.3650" k2="0.8146" k3="-0.2391" />
--            <vignetting model="pa" focal="10" aperture="5.6" distance="0.1" k1="-1.3226" k2="0.8036" k3="-0.2865" />
--            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-1.3561" k2="0.7952" k3="-0.2269" />
--            <vignetting model="pa" focal="10" aperture="22" distance="0.1" k1="-1.3680" k2="0.8384" k3="-0.2824" />
--            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-1.4021" k2="0.8099" k3="-0.2069" />
-+            <!-- Measured with 360° panorama -->
-+            <distortion model="ptlens" focal="10" a="-0.03545" b="0.08332" c="-0.03802"/>
-+            <tca model="poly3" focal="10" br="-0.0003212" vr="1.0013837" bb="0.0004205" vb="0.9993395"/>
-+            <vignetting model="pa" focal="10" aperture="2.8" distance="0.1" k1="-1.9395" k2="1.9128" k3="-0.8406"/>
-+            <vignetting model="pa" focal="10" aperture="2.8" distance="1000" k1="-2.0049" k2="1.9673" k3="-0.8164"/>
-+            <vignetting model="pa" focal="10" aperture="3.5" distance="0.1" k1="-1.3378" k2="0.8422" k3="-0.3161"/>
-+            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-1.3797" k2="0.8536" k3="-0.2682"/>
-+            <vignetting model="pa" focal="10" aperture="4.5" distance="0.1" k1="-1.3330" k2="0.8392" k3="-0.3129"/>
-+            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-1.3650" k2="0.8146" k3="-0.2391"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="0.1" k1="-1.3226" k2="0.8036" k3="-0.2865"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-1.3561" k2="0.7952" k3="-0.2269"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="0.1" k1="-1.3680" k2="0.8384" k3="-0.2824"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-1.4021" k2="0.8099" k3="-0.2069"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
-         <model>VCL-ECU1 ultra wide converter</model>
-+        <model lang="de">VCL-ECU1 Ultraweitwinkel-Vorsatz</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-C3 -->
--            <distortion model="ptlens" focal="12" a="0.04359" b="-0.10483" c="0.04408" />
--            <tca model="poly3" focal="12" br="-0.0004381" vr="1.0013270" bb="0.0003951" vb="0.9993238" />
-+            <distortion model="ptlens" focal="12" a="0.04359" b="-0.10483" c="0.04408"/>
-+            <tca model="poly3" focal="12" br="-0.0004381" vr="1.0013270" bb="0.0003951" vb="0.9993238"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 10-18mm F4 OSS</model>
-+        <model>E 10-18mm f/4 OSS</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-C3 -->
--            <distortion model="ptlens" focal="10" a="0.03262" b="-0.08127" c="0.0223" />
--            <distortion model="ptlens" focal="12" a="0.02319" b="-0.05695" c="0.02094" />
--            <distortion model="ptlens" focal="14" a="0.01584" b="-0.03852" c="0.02566" />
--            <distortion model="ptlens" focal="16" a="0.00771" b="-0.01094" c="0.0027" />
--            <distortion model="ptlens" focal="18" a="0.01105" b="-0.02442" c="0.03158" />
--            <tca model="poly3" focal="10" br="0.0001931" vr="1.0000158" bb="-0.0000887" vb="1.0002784" />
--            <tca model="poly3" focal="12" br="0.0000920" vr="1.0000354" bb="-0.0000836" vb="1.0003099" />
--            <tca model="poly3" focal="14" br="0.0000545" vr="0.9999957" bb="-0.0000990" vb="1.0003900" />
--            <tca model="poly3" focal="16" br="0.0000580" vr="0.9999839" bb="-0.0000883" vb="1.0003771" />
--            <tca model="poly3" focal="18" br="0.0000332" vr="0.9999152" bb="-0.0000803" vb="1.0003392" />
-+            <distortion model="ptlens" focal="10" a="0.03262" b="-0.08127" c="0.0223"/>
-+            <distortion model="ptlens" focal="12" a="0.02319" b="-0.05695" c="0.02094"/>
-+            <distortion model="ptlens" focal="14" a="0.01584" b="-0.03852" c="0.02566"/>
-+            <distortion model="ptlens" focal="16" a="0.00771" b="-0.01094" c="0.0027"/>
-+            <distortion model="ptlens" focal="18" a="0.01105" b="-0.02442" c="0.03158"/>
-+            <tca model="poly3" focal="10" br="0.0001931" vr="1.0000158" bb="-0.0000887" vb="1.0002784"/>
-+            <tca model="poly3" focal="12" br="0.0000920" vr="1.0000354" bb="-0.0000836" vb="1.0003099"/>
-+            <tca model="poly3" focal="14" br="0.0000545" vr="0.9999957" bb="-0.0000990" vb="1.0003900"/>
-+            <tca model="poly3" focal="16" br="0.0000580" vr="0.9999839" bb="-0.0000883" vb="1.0003771"/>
-+            <tca model="poly3" focal="18" br="0.0000332" vr="0.9999152" bb="-0.0000803" vb="1.0003392"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 18-200mm F3.5-6.3 OSS</model>
-+        <model>E 10-18mm f/4 OSS</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Alpha 7S -->
-+            <distortion model="ptlens" focal="10" a="0.196017" b="-0.375554" c="0.167273"/>
-+            <distortion model="ptlens" focal="12" a="0.131602" b="-0.258384" c="0.136303"/>
-+            <distortion model="ptlens" focal="14" a="0.116361" b="-0.255284" c="0.189679"/>
-+            <distortion model="ptlens" focal="16" a="0.1015" b="-0.223082" c="0.169764"/>
-+            <distortion model="ptlens" focal="18" a="0.0633556" b="-0.132668" c="0.123128"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>E 18-200mm f/3.5-6.3 OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-C3 -->
--            <distortion model="ptlens" focal="18" a="0.03037" b="-0.09891" c="0.05057" />
--            <distortion model="ptlens" focal="20" a="0.0203" b="-0.05723" c="0.0216" />
--            <distortion model="ptlens" focal="23" a="0.01761" b="-0.05034" c="0.03542" />
--            <distortion model="ptlens" focal="28" a="0.01267" b="-0.03161" c="0.0263" />
--            <distortion model="ptlens" focal="33" a="0.00573" b="-0.00253" c="-0.00483" />
--            <distortion model="ptlens" focal="46" a="0.0051" b="-0.0036" c="0.00641" />
--            <distortion model="ptlens" focal="50" a="0.00533" b="-0.00597" c="0.01274" />
--            <distortion model="ptlens" focal="72" a="-0.00055" b="0.01327" c="-0.00383" />
--            <distortion model="ptlens" focal="105" a="0.00331" b="-0.00212" c="0.013" />
--            <distortion model="ptlens" focal="152" a="0.00169" b="-0.00091" c="0.01404" />
--            <distortion model="ptlens" focal="200" a="0.00073" b="0.00129" c="0.00737" />
--            <tca model="poly3" focal="18" br="-0.0000552" vr="1.0006269" bb="0.0000583" vb="0.9999573" />
--            <tca model="poly3" focal="20" br="-0.0000904" vr="1.0005624" bb="0.0000510" vb="0.9999635" />
--            <tca model="poly3" focal="23" br="-0.0000709" vr="1.0004950" bb="0.0000359" vb="0.9999966" />
--            <tca model="poly3" focal="28" br="-0.0000729" vr="1.0004139" bb="0.0000430" vb="0.9999977" />
--            <tca model="poly3" focal="33" br="-0.0000797" vr="1.0003518" bb="0.0000224" vb="1.0000245" />
--            <tca model="poly3" focal="46" br="-0.0000887" vr="1.0002652" bb="0.0000090" vb="1.0000035" />
--            <tca model="poly3" focal="50" br="-0.0000474" vr="1.0001803" bb="0.0000212" vb="0.9999889" />
--            <tca model="poly3" focal="72" br="-0.0000251" vr="1.0000899" bb="0.0000172" vb="0.9999091" />
--            <tca model="poly3" focal="105" br="-0.0000014" vr="0.9999706" bb="-0.0000672" vb="0.9999431" />
--            <tca model="poly3" focal="152" br="0.0000126" vr="0.9997273" bb="-0.0000672" vb="0.9998688" />
--            <tca model="poly3" focal="200" br="-0.0001378" vr="0.9996377" bb="-0.0000300" vb="0.9998507" />
-+            <distortion model="ptlens" focal="18" a="0.03037" b="-0.09891" c="0.05057"/>
-+            <distortion model="ptlens" focal="20" a="0.0203" b="-0.05723" c="0.0216"/>
-+            <distortion model="ptlens" focal="23" a="0.01761" b="-0.05034" c="0.03542"/>
-+            <distortion model="ptlens" focal="28" a="0.01267" b="-0.03161" c="0.0263"/>
-+            <distortion model="ptlens" focal="33" a="0.00573" b="-0.00253" c="-0.00483"/>
-+            <distortion model="ptlens" focal="46" a="0.0051" b="-0.0036" c="0.00641"/>
-+            <distortion model="ptlens" focal="50" a="0.00533" b="-0.00597" c="0.01274"/>
-+            <distortion model="ptlens" focal="72" a="-0.00055" b="0.01327" c="-0.00383"/>
-+            <distortion model="ptlens" focal="105" a="0.00331" b="-0.00212" c="0.013"/>
-+            <distortion model="ptlens" focal="152" a="0.00169" b="-0.00091" c="0.01404"/>
-+            <distortion model="ptlens" focal="200" a="0.00073" b="0.00129" c="0.00737"/>
-+            <tca model="poly3" focal="18" br="-0.0000552" vr="1.0006269" bb="0.0000583" vb="0.9999573"/>
-+            <tca model="poly3" focal="20" br="-0.0000904" vr="1.0005624" bb="0.0000510" vb="0.9999635"/>
-+            <tca model="poly3" focal="23" br="-0.0000709" vr="1.0004950" bb="0.0000359" vb="0.9999966"/>
-+            <tca model="poly3" focal="28" br="-0.0000729" vr="1.0004139" bb="0.0000430" vb="0.9999977"/>
-+            <tca model="poly3" focal="33" br="-0.0000797" vr="1.0003518" bb="0.0000224" vb="1.0000245"/>
-+            <tca model="poly3" focal="46" br="-0.0000887" vr="1.0002652" bb="0.0000090" vb="1.0000035"/>
-+            <tca model="poly3" focal="50" br="-0.0000474" vr="1.0001803" bb="0.0000212" vb="0.9999889"/>
-+            <tca model="poly3" focal="72" br="-0.0000251" vr="1.0000899" bb="0.0000172" vb="0.9999091"/>
-+            <tca model="poly3" focal="105" br="-0.0000014" vr="0.9999706" bb="-0.0000672" vb="0.9999431"/>
-+            <tca model="poly3" focal="152" br="0.0000126" vr="0.9997273" bb="-0.0000672" vb="0.9998688"/>
-+            <tca model="poly3" focal="200" br="-0.0001378" vr="0.9996377" bb="-0.0000300" vb="0.9998507"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 24mm F1.8 ZA</model>
-+        <model>E 24mm f/1.8 ZA</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-C3 -->
--            <distortion model="ptlens" focal="24" a="0.00641" b="-0.0083" c="0.00228" />
--            <tca model="linear" focal="24" kr="1.0004" kb="1.0002" />
-+            <distortion model="ptlens" focal="24" a="0.00641" b="-0.0083" c="0.00228"/>
-+            <tca model="linear" focal="24" kr="1.0004" kb="1.0002"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 30mm F3.5 Macro</model>
-+        <model>E 30mm f/3.5 Macro</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="30" a="0.00105" b="-0.00352" c="0.00057" />
--            <tca model="poly3" focal="30" br="-0.0000797" vr="1.0005827" bb="0.0000655" vb="0.9997635" />
-+            <distortion model="ptlens" focal="30" a="0.00105" b="-0.00352" c="0.00057"/>
-+            <tca model="poly3" focal="30" br="-0.0000797" vr="1.0005827" bb="0.0000655" vb="0.9997635"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E PZ 16-50mm F3.5-5.6 OSS</model>
-+        <model>E PZ 16-50mm f/3.5-5.6 OSS</model>
-+        <model lang="en">E 16-50mm f/3.5-5.6 OSS PZ</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <!-- Taken with Sony NEX-6 -->
--            <distortion model="ptlens" focal="16" a="0.00449" b="-0.0338" c="-0.0382" />
--            <distortion model="ptlens" focal="20" a="0.0033" b="-0.01638" c="-0.03795" />
--            <distortion model="ptlens" focal="24" a="0.01301" b="-0.05186" c="0.03349" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.00221" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.00438" c="0" />
--            <tca model="poly3" focal="16" vr="1.0009" vb="0.99976" />
--            <tca model="poly3" focal="20" vr="1.0004" vb="1.00000" />
--            <tca model="poly3" focal="24" vr="1.0002" vb="1.0002" />
--            <tca model="poly3" focal="35" vr="1.0002" vb="1.0002" />
--            <tca model="poly3" focal="50" vr="1.00000" vb="1.00000" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-1.2228" k2="2.2531" k3="-1.9667" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-1.2228" k2="2.2531" k3="-1.9667" />
--            <vignetting model="pa" focal="16" aperture="5" distance="10" k1="-1.2706" k2="2.4221" k3="-2.0234" />
--            <vignetting model="pa" focal="16" aperture="5" distance="1000" k1="-1.2706" k2="2.4221" k3="-2.0234" />
--            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-1.2621" k2="2.3553" k3="-1.9482" />
--            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-1.2621" k2="2.3553" k3="-1.9482" />
--            <vignetting model="pa" focal="16" aperture="10" distance="10" k1="-1.3319" k2="2.5969" k3="-2.0708" />
--            <vignetting model="pa" focal="16" aperture="10" distance="1000" k1="-1.3319" k2="2.5969" k3="-2.0708" />
--            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-1.1806" k2="1.9654" k3="-1.4656" />
--            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.1806" k2="1.9654" k3="-1.4656" />
--            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.6142" k2="0.1813" k3="0.0009" />
--            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.6142" k2="0.1813" k3="0.0009" />
--            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.5194" k2="0.1625" k3="-0.1327" />
--            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5194" k2="0.1625" k3="-0.1327" />
--            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.6200" k2="0.5517" k3="-0.4030" />
--            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.6200" k2="0.5517" k3="-0.4030" />
--            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.6582" k2="0.6120" k3="-0.3720" />
--            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.6582" k2="0.6120" k3="-0.3720" />
--            <vignetting model="pa" focal="20" aperture="25" distance="10" k1="-0.5896" k2="0.3281" k3="-0.1177" />
--            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.5896" k2="0.3281" k3="-0.1177" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.5118" k2="-0.0354" k3="0.0987" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.5118" k2="-0.0354" k3="0.0987" />
--            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.5517" k2="0.4145" k3="-0.2989" />
--            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.5517" k2="0.4145" k3="-0.2989" />
--            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.6446" k2="0.6958" k3="-0.4714" />
--            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6446" k2="0.6958" k3="-0.4714" />
--            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.5645" k2="0.3682" k3="-0.1868" />
--            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.5645" k2="0.3682" k3="-0.1868" />
--            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.5432" k2="0.2685" k3="-0.0921" />
--            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.5432" k2="0.2685" k3="-0.0921" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.0893" k2="-0.3404" k3="0.0531" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.0893" k2="-0.3404" k3="0.0531" />
--            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.4195" k2="0.6185" k3="-0.5395" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.4195" k2="0.6185" k3="-0.5395" />
--            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3794" k2="0.3497" k3="-0.2831" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3794" k2="0.3497" k3="-0.2831" />
--            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3088" k2="0.0636" k3="-0.0186" />
--            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3088" k2="0.0636" k3="-0.0186" />
--            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.3030" k2="0.0367" k3="0.0077" />
--            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.3030" k2="0.0367" k3="0.0077" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2835" k2="0.1219" k3="-0.2200" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2835" k2="0.1219" k3="-0.2200" />
--            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2745" k2="0.3636" k3="-0.4559" />
--            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2745" k2="0.3636" k3="-0.4559" />
--            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3725" k2="0.6319" k3="-0.5981" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3725" k2="0.6319" k3="-0.5981" />
--            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2896" k2="0.2645" k3="-0.2308" />
--            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2896" k2="0.2645" k3="-0.2308" />
--            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2146" k2="-0.0181" k3="0.0219" />
--            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2146" k2="-0.0181" k3="0.0219" />
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="ptlens" focal="16" a="0.0219" b="-0.10642" c="0.06233"/>
-+            <distortion model="ptlens" focal="17" a="0.02079" b="-0.1021" c="0.07393"/>
-+            <distortion model="ptlens" focal="18" a="0.01695" b="-0.08141" c="0.04383"/>
-+            <distortion model="ptlens" focal="20" a="0.01611" b="-0.07309" c="0.04369"/>
-+            <distortion model="ptlens" focal="25" a="0.00742" b="-0.03546" c="0.02961"/>
-+            <distortion model="ptlens" focal="40" a="0.00918" b="-0.02995" c="0.03028"/>
-+            <distortion model="ptlens" focal="50" a="0.00423" b="-0.00129" c="-0.00963"/>
-+            <tca model="poly3" focal="16" br="0.0002723" vr="1.0000060" bb="-0.0002083" vb="1.0003686"/>
-+            <tca model="poly3" focal="18" br="0.0001711" vr="1.0000288" bb="-0.0001363" vb="1.0003509"/>
-+            <tca model="poly3" focal="20" br="0.0001477" vr="0.9999914" bb="-0.0001091" vb="1.0003535"/>
-+            <tca model="poly3" focal="25" br="0.0000462" vr="1.0000334" bb="-0.0000764" vb="1.0003227"/>
-+            <tca model="poly3" focal="30" br="0.0000545" vr="1.0000258" bb="-0.0000653" vb="1.0002631"/>
-+            <tca model="poly3" focal="40" br="0.0000423" vr="1.0000033" bb="-0.0000459" vb="1.0002035"/>
-+            <tca model="poly3" focal="50" br="0.0000231" vr="0.9999534" bb="-0.0000443" vb="1.0002348"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.6128" k2="-0.6331" k3="0.2769"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.6128" k2="-0.6331" k3="0.2769"/>
-+            <vignetting model="pa" focal="16" aperture="5" distance="10" k1="-0.7949" k2="0.6849" k3="-0.8439"/>
-+            <vignetting model="pa" focal="16" aperture="5" distance="1000" k1="-0.7949" k2="0.6849" k3="-0.8439"/>
-+            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-1.1244" k2="1.7817" k3="-1.5484"/>
-+            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-1.1244" k2="1.7817" k3="-1.5484"/>
-+            <vignetting model="pa" focal="16" aperture="10" distance="10" k1="-1.2252" k2="2.0719" k3="-1.6702"/>
-+            <vignetting model="pa" focal="16" aperture="10" distance="1000" k1="-1.2252" k2="2.0719" k3="-1.6702"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-1.0274" k2="1.2673" k3="-0.9134"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.0274" k2="1.2673" k3="-0.9134"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.4173" k2="-0.8329" k3="0.5763"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4173" k2="-0.8329" k3="0.5763"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.5132" k2="0.0347" k3="-0.1394"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5132" k2="0.0347" k3="-0.1394"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.7177" k2="0.5996" k3="-0.4357"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.7177" k2="0.5996" k3="-0.4357"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.6634" k2="0.3624" k3="-0.1891"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.6634" k2="0.3624" k3="-0.1891"/>
-+            <vignetting model="pa" focal="20" aperture="25" distance="10" k1="-0.6382" k2="0.2480" k3="-0.0779"/>
-+            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.6382" k2="0.2480" k3="-0.0779"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.3130" k2="-0.8329" k3="0.5224"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.3130" k2="-0.8329" k3="0.5224"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.5410" k2="0.2546" k3="-0.2728"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.5410" k2="0.2546" k3="-0.2728"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.6115" k2="0.4585" k3="-0.3221"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6115" k2="0.4585" k3="-0.3221"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.5473" k2="0.1905" k3="-0.0633"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.5473" k2="0.1905" k3="-0.0633"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.5646" k2="0.2271" k3="-0.0850"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.5646" k2="0.2271" k3="-0.0850"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1887" k2="-0.4109" k3="0.1132"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1887" k2="-0.4109" k3="0.1132"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.4290" k2="0.6189" k3="-0.5852"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.4290" k2="0.6189" k3="-0.5852"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3768" k2="0.3490" k3="-0.2847"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3768" k2="0.3490" k3="-0.2847"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3181" k2="0.0894" k3="-0.0372"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3181" k2="0.0894" k3="-0.0372"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.3378" k2="0.1216" k3="-0.0527"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.3378" k2="0.1216" k3="-0.0527"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.4443" k2="0.1443" k3="-0.1834"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.4443" k2="0.1443" k3="-0.1834"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2751" k2="0.3455" k3="-0.4759"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2751" k2="0.3455" k3="-0.4759"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3741" k2="0.5982" k3="-0.5399"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3741" k2="0.5982" k3="-0.5399"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2793" k2="0.1907" k3="-0.1556"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2793" k2="0.1907" k3="-0.1556"/>
-+            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2523" k2="0.0609" k3="-0.0342"/>
-+            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2523" k2="0.0609" k3="-0.0342"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 18-200mm F3.5-6.3 OSS LE</model>
-+        <model>E 18-200mm f/3.5-6.3 OSS LE</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-6 -->
--            <distortion model="ptlens" focal="18" a="0.03823" b="-0.12894" c="0.09134" />
--            <distortion model="ptlens" focal="20" a="0.03476" b="-0.09859" c="0.05582" />
--            <distortion model="ptlens" focal="24" a="0.02008" b="-0.05406" c="0.04073" />
--            <distortion model="ptlens" focal="30" a="0" b="0.00353" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0.00373" c="0" />
--            <distortion model="ptlens" focal="52" a="0" b="0.00515" c="0" />
--            <distortion model="ptlens" focal="96" a="0" b="0.00618" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.00892" c="0" />
--            <tca model="poly3" focal="18" vr="1.00045" vb="1.0004" />
--            <tca model="poly3" focal="36" vr="1.00048" vb="1.00024" />
--            <tca model="poly3" focal="51" vr="1.00026" vb="1.00028" />
--            <tca model="poly3" focal="95" vr="1.00000" vb="0.9999" />
--            <tca model="poly3" focal="200" vr="0.99935" vb="0.99927" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.6841" k2="0.5147" k3="-0.1985" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.6841" k2="0.5147" k3="-0.1985" />
--            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.6509" k2="0.2068" k3="0.0775" />
--            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.6509" k2="0.2068" k3="0.0775" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.6427" k2="0.2723" k3="-0.0283" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.6427" k2="0.2723" k3="-0.0283" />
--            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.6536" k2="0.3190" k3="-0.1109" />
--            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.6536" k2="0.3190" k3="-0.1109" />
--            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.6448" k2="0.2973" k3="-0.0981" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.6448" k2="0.2973" k3="-0.0981" />
--            <vignetting model="pa" focal="36" aperture="4.5" distance="10" k1="-0.2447" k2="-0.3812" k3="0.2806" />
--            <vignetting model="pa" focal="36" aperture="4.5" distance="1000" k1="-0.2447" k2="-0.3812" k3="0.2806" />
--            <vignetting model="pa" focal="36" aperture="6.3" distance="10" k1="-0.3018" k2="0.0846" k3="-0.0283" />
--            <vignetting model="pa" focal="36" aperture="6.3" distance="1000" k1="-0.3018" k2="0.0846" k3="-0.0283" />
--            <vignetting model="pa" focal="36" aperture="9" distance="10" k1="-0.2855" k2="0.0315" k3="0.0195" />
--            <vignetting model="pa" focal="36" aperture="9" distance="1000" k1="-0.2855" k2="0.0315" k3="0.0195" />
--            <vignetting model="pa" focal="36" aperture="13" distance="10" k1="-0.2780" k2="0.0185" k3="0.0259" />
--            <vignetting model="pa" focal="36" aperture="13" distance="1000" k1="-0.2780" k2="0.0185" k3="0.0259" />
--            <vignetting model="pa" focal="36" aperture="29" distance="10" k1="-0.2683" k2="0.0054" k3="0.0287" />
--            <vignetting model="pa" focal="36" aperture="29" distance="1000" k1="-0.2683" k2="0.0054" k3="0.0287" />
--            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="0.0108" k2="-0.6327" k3="0.3858" />
--            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="0.0108" k2="-0.6327" k3="0.3858" />
--            <vignetting model="pa" focal="51" aperture="8" distance="10" k1="-0.1746" k2="-0.0299" k3="0.0441" />
--            <vignetting model="pa" focal="51" aperture="8" distance="1000" k1="-0.1746" k2="-0.0299" k3="0.0441" />
--            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.1690" k2="-0.0406" k3="0.0509" />
--            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.1690" k2="-0.0406" k3="0.0509" />
--            <vignetting model="pa" focal="51" aperture="16" distance="10" k1="-0.1608" k2="-0.0542" k3="0.0581" />
--            <vignetting model="pa" focal="51" aperture="16" distance="1000" k1="-0.1608" k2="-0.0542" k3="0.0581" />
--            <vignetting model="pa" focal="51" aperture="36" distance="10" k1="-0.1530" k2="-0.0656" k3="0.0630" />
--            <vignetting model="pa" focal="51" aperture="36" distance="1000" k1="-0.1530" k2="-0.0656" k3="0.0630" />
--            <vignetting model="pa" focal="98" aperture="6.3" distance="10" k1="0.0020" k2="-0.6019" k3="0.4007" />
--            <vignetting model="pa" focal="98" aperture="6.3" distance="1000" k1="0.0020" k2="-0.6019" k3="0.4007" />
--            <vignetting model="pa" focal="98" aperture="9" distance="10" k1="-0.1176" k2="-0.1346" k3="0.1048" />
--            <vignetting model="pa" focal="98" aperture="9" distance="1000" k1="-0.1176" k2="-0.1346" k3="0.1048" />
--            <vignetting model="pa" focal="98" aperture="13" distance="10" k1="-0.1075" k2="-0.1531" k3="0.1152" />
--            <vignetting model="pa" focal="98" aperture="13" distance="1000" k1="-0.1075" k2="-0.1531" k3="0.1152" />
--            <vignetting model="pa" focal="98" aperture="18" distance="10" k1="-0.0975" k2="-0.1691" k3="0.1238" />
--            <vignetting model="pa" focal="98" aperture="18" distance="1000" k1="-0.0975" k2="-0.1691" k3="0.1238" />
--            <vignetting model="pa" focal="98" aperture="40" distance="10" k1="-0.0896" k2="-0.1781" k3="0.1266" />
--            <vignetting model="pa" focal="98" aperture="40" distance="1000" k1="-0.0896" k2="-0.1781" k3="0.1266" />
--            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.1662" k2="0.0413" k3="-0.0911" />
--            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.1662" k2="0.0413" k3="-0.0911" />
--            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.2004" k2="0.1802" k3="-0.1796" />
--            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.2004" k2="0.1802" k3="-0.1796" />
--            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1368" k2="-0.0748" k3="0.0575" />
--            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1368" k2="-0.0748" k3="0.0575" />
--            <vignetting model="pa" focal="200" aperture="18" distance="10" k1="-0.1063" k2="-0.1552" k3="0.1188" />
--            <vignetting model="pa" focal="200" aperture="18" distance="1000" k1="-0.1063" k2="-0.1552" k3="0.1188" />
--            <vignetting model="pa" focal="200" aperture="40" distance="10" k1="-0.0937" k2="-0.1726" k3="0.1275" />
--            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0937" k2="-0.1726" k3="0.1275" />
-+            <distortion model="ptlens" focal="18" a="0.03823" b="-0.12894" c="0.09134"/>
-+            <distortion model="ptlens" focal="20" a="0.03476" b="-0.09859" c="0.05582"/>
-+            <distortion model="ptlens" focal="24" a="0.02008" b="-0.05406" c="0.04073"/>
-+            <distortion model="ptlens" focal="30" a="0" b="0.00353" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.00373" c="0"/>
-+            <distortion model="ptlens" focal="52" a="0" b="0.00515" c="0"/>
-+            <distortion model="ptlens" focal="96" a="0" b="0.00618" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.00892" c="0"/>
-+            <tca model="poly3" focal="18" vr="1.00045" vb="1.0004"/>
-+            <tca model="poly3" focal="36" vr="1.00048" vb="1.00024"/>
-+            <tca model="poly3" focal="51" vr="1.00026" vb="1.00028"/>
-+            <tca model="poly3" focal="95" vr="1.00000" vb="0.9999"/>
-+            <tca model="poly3" focal="200" vr="0.99935" vb="0.99927"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.6841" k2="0.5147" k3="-0.1985"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.6841" k2="0.5147" k3="-0.1985"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.6509" k2="0.2068" k3="0.0775"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.6509" k2="0.2068" k3="0.0775"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.6427" k2="0.2723" k3="-0.0283"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.6427" k2="0.2723" k3="-0.0283"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.6536" k2="0.3190" k3="-0.1109"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.6536" k2="0.3190" k3="-0.1109"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.6448" k2="0.2973" k3="-0.0981"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.6448" k2="0.2973" k3="-0.0981"/>
-+            <vignetting model="pa" focal="36" aperture="4.5" distance="10" k1="-0.2447" k2="-0.3812" k3="0.2806"/>
-+            <vignetting model="pa" focal="36" aperture="4.5" distance="1000" k1="-0.2447" k2="-0.3812" k3="0.2806"/>
-+            <vignetting model="pa" focal="36" aperture="6.3" distance="10" k1="-0.3018" k2="0.0846" k3="-0.0283"/>
-+            <vignetting model="pa" focal="36" aperture="6.3" distance="1000" k1="-0.3018" k2="0.0846" k3="-0.0283"/>
-+            <vignetting model="pa" focal="36" aperture="9" distance="10" k1="-0.2855" k2="0.0315" k3="0.0195"/>
-+            <vignetting model="pa" focal="36" aperture="9" distance="1000" k1="-0.2855" k2="0.0315" k3="0.0195"/>
-+            <vignetting model="pa" focal="36" aperture="13" distance="10" k1="-0.2780" k2="0.0185" k3="0.0259"/>
-+            <vignetting model="pa" focal="36" aperture="13" distance="1000" k1="-0.2780" k2="0.0185" k3="0.0259"/>
-+            <vignetting model="pa" focal="36" aperture="29" distance="10" k1="-0.2683" k2="0.0054" k3="0.0287"/>
-+            <vignetting model="pa" focal="36" aperture="29" distance="1000" k1="-0.2683" k2="0.0054" k3="0.0287"/>
-+            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="0.0108" k2="-0.6327" k3="0.3858"/>
-+            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="0.0108" k2="-0.6327" k3="0.3858"/>
-+            <vignetting model="pa" focal="51" aperture="8" distance="10" k1="-0.1746" k2="-0.0299" k3="0.0441"/>
-+            <vignetting model="pa" focal="51" aperture="8" distance="1000" k1="-0.1746" k2="-0.0299" k3="0.0441"/>
-+            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.1690" k2="-0.0406" k3="0.0509"/>
-+            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.1690" k2="-0.0406" k3="0.0509"/>
-+            <vignetting model="pa" focal="51" aperture="16" distance="10" k1="-0.1608" k2="-0.0542" k3="0.0581"/>
-+            <vignetting model="pa" focal="51" aperture="16" distance="1000" k1="-0.1608" k2="-0.0542" k3="0.0581"/>
-+            <vignetting model="pa" focal="51" aperture="36" distance="10" k1="-0.1530" k2="-0.0656" k3="0.0630"/>
-+            <vignetting model="pa" focal="51" aperture="36" distance="1000" k1="-0.1530" k2="-0.0656" k3="0.0630"/>
-+            <vignetting model="pa" focal="98" aperture="6.3" distance="10" k1="0.0020" k2="-0.6019" k3="0.4007"/>
-+            <vignetting model="pa" focal="98" aperture="6.3" distance="1000" k1="0.0020" k2="-0.6019" k3="0.4007"/>
-+            <vignetting model="pa" focal="98" aperture="9" distance="10" k1="-0.1176" k2="-0.1346" k3="0.1048"/>
-+            <vignetting model="pa" focal="98" aperture="9" distance="1000" k1="-0.1176" k2="-0.1346" k3="0.1048"/>
-+            <vignetting model="pa" focal="98" aperture="13" distance="10" k1="-0.1075" k2="-0.1531" k3="0.1152"/>
-+            <vignetting model="pa" focal="98" aperture="13" distance="1000" k1="-0.1075" k2="-0.1531" k3="0.1152"/>
-+            <vignetting model="pa" focal="98" aperture="18" distance="10" k1="-0.0975" k2="-0.1691" k3="0.1238"/>
-+            <vignetting model="pa" focal="98" aperture="18" distance="1000" k1="-0.0975" k2="-0.1691" k3="0.1238"/>
-+            <vignetting model="pa" focal="98" aperture="40" distance="10" k1="-0.0896" k2="-0.1781" k3="0.1266"/>
-+            <vignetting model="pa" focal="98" aperture="40" distance="1000" k1="-0.0896" k2="-0.1781" k3="0.1266"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.1662" k2="0.0413" k3="-0.0911"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.1662" k2="0.0413" k3="-0.0911"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.2004" k2="0.1802" k3="-0.1796"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.2004" k2="0.1802" k3="-0.1796"/>
-+            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1368" k2="-0.0748" k3="0.0575"/>
-+            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1368" k2="-0.0748" k3="0.0575"/>
-+            <vignetting model="pa" focal="200" aperture="18" distance="10" k1="-0.1063" k2="-0.1552" k3="0.1188"/>
-+            <vignetting model="pa" focal="200" aperture="18" distance="1000" k1="-0.1063" k2="-0.1552" k3="0.1188"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="10" k1="-0.0937" k2="-0.1726" k3="0.1275"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0937" k2="-0.1726" k3="0.1275"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>E 35mm F1.8 OSS</model>
-+        <model>E 35mm f/1.8 OSS</model>
-         <mount>Sony E</mount>
--        <cropfactor>1.534</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Sony NEX-6 -->
--            <distortion model="ptlens" focal="35" a="-0.01085" b="0.03631" c="-0.04468" />
--            <tca model="poly3" focal="35" vr="1.0002" vb="1.0002" />
--            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-0.6592" k2="0.2110" k3="0.0209" />
--            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-0.6592" k2="0.2110" k3="0.0209" />
--            <vignetting model="pa" focal="35" aperture="2.5" distance="10" k1="-0.3254" k2="-0.0868" k3="0.0015" />
--            <vignetting model="pa" focal="35" aperture="2.5" distance="1000" k1="-0.3254" k2="-0.0868" k3="0.0015" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.4488" k2="0.2554" k3="-0.1538" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.4488" k2="0.2554" k3="-0.1538" />
--            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.4778" k2="0.2424" k3="-0.0824" />
--            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.4778" k2="0.2424" k3="-0.0824" />
--            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.4891" k2="0.2020" k3="-0.0234" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.4891" k2="0.2020" k3="-0.0234" />
-+            <distortion model="ptlens" focal="35" a="-0.01085" b="0.03631" c="-0.04468"/>
-+            <tca model="poly3" focal="35" vr="1.0002" vb="1.0002"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-0.6592" k2="0.2110" k3="0.0209"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-0.6592" k2="0.2110" k3="0.0209"/>
-+            <vignetting model="pa" focal="35" aperture="2.5" distance="10" k1="-0.3254" k2="-0.0868" k3="0.0015"/>
-+            <vignetting model="pa" focal="35" aperture="2.5" distance="1000" k1="-0.3254" k2="-0.0868" k3="0.0015"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.4488" k2="0.2554" k3="-0.1538"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.4488" k2="0.2554" k3="-0.1538"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.4778" k2="0.2424" k3="-0.0824"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.4778" k2="0.2424" k3="-0.0824"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.4891" k2="0.2020" k3="-0.0234"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.4891" k2="0.2020" k3="-0.0234"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>E 20mm f/2.8</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony NEX-7 -->
-+            <!-- Measured with 360° panorama -->
-+            <distortion model="ptlens" focal="20" a="0.01609" b="-0.05179" c="0.01925"/>
-+            <tca model="poly3" focal="20" br="-0.0001183" vr="1.0003488" bb="0.0002181" vb="0.9998147"/>
-+            <!-- Measured with overlapping pictures -->
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-1.95337" k2="1.92292" k3="-0.82277"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-1.95337" k2="1.92292" k3="-0.82277"/>
-+            <vignetting model="pa" focal="20" aperture="3.5" distance="10" k1="-1.04466" k2="0.2586" k3="0.03996"/>
-+            <vignetting model="pa" focal="20" aperture="3.5" distance="1000" k1="-1.04466" k2="0.2586" k3="0.03996"/>
-+            <vignetting model="pa" focal="20" aperture="4.5" distance="10" k1="-1.0792" k2="0.62563" k3="-0.25916"/>
-+            <vignetting model="pa" focal="20" aperture="4.5" distance="1000" k1="-1.0792" k2="0.62563" k3="-0.25916"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-1.05526" k2="0.5907" k3="-0.2125"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.05526" k2="0.5907" k3="-0.2125"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-1.0367" k2="0.57998" k3="-0.20893"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-1.0367" k2="0.57998" k3="-0.20893"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="10" k1="-1.04725" k2="0.62966" k3="-0.24257"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-1.04725" k2="0.62966" k3="-0.24257"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>E 16-70mm f/4 ZA OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="ptlens" focal="16" a="0.02953" b="-0.08038" c="0.02902"/>
-+            <distortion model="ptlens" focal="19" a="0.03146" b="-0.09959" c="0.09201"/>
-+            <distortion model="ptlens" focal="24" a="0.01795" b="-0.05418" c="0.05884"/>
-+            <distortion model="ptlens" focal="53" a="0" b="0.00531" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.0044" c="0"/>
-+            <tca model="poly3" focal="16" br="-0.0000060" vr="1.0004895" bb="-0.0000034" vb="1.0000426"/>
-+            <tca model="poly3" focal="19" br="-0.0000261" vr="1.0002958" bb="0.0000171" vb="1.0000564"/>
-+            <tca model="poly3" focal="24" br="-0.0000594" vr="1.0002412" bb="0.0000076" vb="1.0001034"/>
-+            <tca model="poly3" focal="53" br="-0.0000170" vr="1.0000417" bb="0.0000067" vb="0.9999435"/>
-+            <tca model="poly3" focal="70" br="-0.0000055" vr="0.9999084" bb="0.0000026" vb="0.9999142"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>E PZ 18-105mm f/4 G OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="ptlens" focal="18" a="0.058" b="-0.14747" c="0.10212"/>
-+            <distortion model="ptlens" focal="21" a="0.0819" b="-0.19694" c="0.16895"/>
-+            <distortion model="ptlens" focal="26" a="0.05257" b="-0.0963" c="0.08288"/>
-+            <distortion model="ptlens" focal="28" a="0.03948" b="-0.05729" c="0.04944"/>
-+            <distortion model="ptlens" focal="105" a="0.01385" b="0.02022" c="-0.01695"/>
-+            <tca model="poly3" focal="18" br="-0.0000802" vr="1.0007953" bb="0.0001123" vb="0.9997721"/>
-+            <tca model="poly3" focal="21" br="-0.0001951" vr="1.0007857" bb="0.0001194" vb="0.9997885"/>
-+            <tca model="poly3" focal="26" br="-0.0001807" vr="1.0006159" bb="0.0001234" vb="0.9997867"/>
-+            <tca model="poly3" focal="28" br="-0.0001413" vr="1.0005127" bb="0.0000942" vb="0.9997947"/>
-+            <tca model="poly3" focal="105" br="0.0000407" vr="0.9996731" bb="0.0000675" vb="0.9997709"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 28-70mm f/3.5-5.6 OSS</model>
-+        <mount>Sony E</mount>
-+        <aperture min="3.5" max="5.6"/>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7 -->
-+            <distortion focal="28" model="ptlens" a="0.00900771" b="-0.0310341" c="0.00110802"/>
-+            <distortion focal="34" model="ptlens" a="0.0110131" b="-0.0342976" c="0.0325604"/>
-+            <distortion focal="49" model="ptlens" a="0.00652285" b="0.000355028" c="0.00747157"/>
-+            <distortion focal="58" model="ptlens" a="0.0106412" b="-0.0116139" c="0.0218262"/>
-+            <distortion focal="70" model="ptlens" a="0.00952653" b="-0.0142895" c="0.0363005"/>
-+            <!-- Taken with Sony A7 II -->
-+            <tca model="poly3" focal="28" br="-0.0001882" vr="1.0005795" bb="0.0001886" vb="0.9997320"/>
-+            <tca model="poly3" focal="30" br="-0.0001834" vr="1.0006067" bb="0.0001663" vb="0.9997188"/>
-+            <tca model="poly3" focal="35" br="-0.0001167" vr="1.0004457" bb="0.0001192" vb="0.9997740"/>
-+            <tca model="poly3" focal="42" br="-0.0001095" vr="1.0003811" bb="0.0000864" vb="0.9998108"/>
-+            <tca model="poly3" focal="50" br="-0.0000632" vr="1.0003667" bb="0.0000586" vb="0.9998070"/>
-+            <tca model="poly3" focal="60" br="-0.0000295" vr="1.0003004" bb="0.0000423" vb="0.9997824"/>
-+            <tca model="poly3" focal="70" br="-0.0000446" vr="1.0002475" bb="0.0000515" vb="0.9998071"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.9958" k2="0.6715" k3="-0.2346"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.9958" k2="0.6715" k3="-0.2346"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.8656" k2="0.4586" k3="-0.1295"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.8656" k2="0.4586" k3="-0.1295"/>
-+            <vignetting model="pa" focal="33" aperture="4" distance="10" k1="-0.6549" k2="0.0647" k3="0.1034"/>
-+            <vignetting model="pa" focal="33" aperture="4" distance="1000" k1="-0.6549" k2="0.0647" k3="0.1034"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.6043" k2="-0.0372" k3="0.1663"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.6043" k2="-0.0372" k3="0.1663"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.6119" k2="-0.0377" k3="0.1734"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6119" k2="-0.0377" k3="0.1734"/>
-+            <vignetting model="pa" focal="43" aperture="4.5" distance="10" k1="-0.6179" k2="0.1041" k3="0.0656"/>
-+            <vignetting model="pa" focal="43" aperture="4.5" distance="1000" k1="-0.6179" k2="0.1041" k3="0.0656"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.5598" k2="0.0335" k3="0.1017"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.5598" k2="0.0335" k3="0.1017"/>
-+            <vignetting model="pa" focal="59" aperture="5" distance="10" k1="-0.5872" k2="0.1618" k3="0.0081"/>
-+            <vignetting model="pa" focal="59" aperture="5" distance="1000" k1="-0.5872" k2="0.1618" k3="0.0081"/>
-+            <vignetting model="pa" focal="61" aperture="5.6" distance="10" k1="-0.5783" k2="0.1194" k3="0.0436"/>
-+            <vignetting model="pa" focal="61" aperture="5.6" distance="1000" k1="-0.5783" k2="0.1194" k3="0.0436"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.6097" k2="0.2252" k3="-0.0272"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.6097" k2="0.2252" k3="-0.0272"/>
-+            <!-- Taken with Sony A7R -->
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.6402" k2="0.1132" k3="0.0503"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.6402" k2="0.1132" k3="0.0503"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.5912" k2="0.1955" k3="-0.0733"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.5912" k2="0.1955" k3="-0.0733"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.6687" k2="0.2261" k3="-0.0237"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.6687" k2="0.2261" k3="-0.0237"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.6727" k2="0.2317" k3="-0.0267"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.6727" k2="0.2317" k3="-0.0267"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.6821" k2="0.2473" k3="-0.0350"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.6821" k2="0.2473" k3="-0.0350"/>
-+            <vignetting model="pa" focal="39" aperture="5.6" distance="10" k1="-0.5096" k2="-0.1688" k3="0.2299"/>
-+            <vignetting model="pa" focal="39" aperture="5.6" distance="1000" k1="-0.5096" k2="-0.1688" k3="0.2299"/>
-+            <vignetting model="pa" focal="39" aperture="8" distance="10" k1="-0.5198" k2="0.1033" k3="-0.0344"/>
-+            <vignetting model="pa" focal="39" aperture="8" distance="1000" k1="-0.5198" k2="0.1033" k3="-0.0344"/>
-+            <vignetting model="pa" focal="39" aperture="11" distance="10" k1="-0.5785" k2="0.1391" k3="0.0072"/>
-+            <vignetting model="pa" focal="39" aperture="11" distance="1000" k1="-0.5785" k2="0.1391" k3="0.0072"/>
-+            <vignetting model="pa" focal="39" aperture="16" distance="10" k1="-0.5807" k2="0.1393" k3="0.0100"/>
-+            <vignetting model="pa" focal="39" aperture="16" distance="1000" k1="-0.5807" k2="0.1393" k3="0.0100"/>
-+            <vignetting model="pa" focal="39" aperture="22" distance="10" k1="-0.5850" k2="0.1455" k3="0.0072"/>
-+            <vignetting model="pa" focal="39" aperture="22" distance="1000" k1="-0.5850" k2="0.1455" k3="0.0072"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.4237" k2="-0.2290" k3="0.2233"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.4237" k2="-0.2290" k3="0.2233"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2528" k2="-0.2318" k3="0.0530"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2528" k2="-0.2318" k3="0.0530"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.5421" k2="0.2468" k3="-0.1244"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.5421" k2="0.2468" k3="-0.1244"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.5062" k2="0.0951" k3="0.0183"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.5062" k2="0.0951" k3="0.0183"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.5067" k2="0.0943" k3="0.0197"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.5067" k2="0.0943" k3="0.0197"/>
-+            <vignetting model="pa" focal="58" aperture="5.6" distance="10" k1="-0.4700" k2="-0.1909" k3="0.2551"/>
-+            <vignetting model="pa" focal="58" aperture="5.6" distance="1000" k1="-0.4700" k2="-0.1909" k3="0.2551"/>
-+            <vignetting model="pa" focal="58" aperture="8" distance="10" k1="-0.2142" k2="-0.3229" k3="0.1187"/>
-+            <vignetting model="pa" focal="58" aperture="8" distance="1000" k1="-0.2142" k2="-0.3229" k3="0.1187"/>
-+            <vignetting model="pa" focal="58" aperture="11" distance="10" k1="-0.4904" k2="0.2571" k3="-0.1702"/>
-+            <vignetting model="pa" focal="58" aperture="11" distance="1000" k1="-0.4904" k2="0.2571" k3="-0.1702"/>
-+            <vignetting model="pa" focal="58" aperture="16" distance="10" k1="-0.4496" k2="0.0645" k3="0.0256"/>
-+            <vignetting model="pa" focal="58" aperture="16" distance="1000" k1="-0.4496" k2="0.0645" k3="0.0256"/>
-+            <vignetting model="pa" focal="58" aperture="22" distance="10" k1="-0.4532" k2="0.0707" k3="0.0230"/>
-+            <vignetting model="pa" focal="58" aperture="22" distance="1000" k1="-0.4532" k2="0.0707" k3="0.0230"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1553" k2="-0.4531" k3="0.2001"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1553" k2="-0.4531" k3="0.2001"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2888" k2="-0.0086" k3="-0.0454"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2888" k2="-0.0086" k3="-0.0454"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.4226" k2="0.1136" k3="-0.0383"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.4226" k2="0.1136" k3="-0.0383"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.4057" k2="0.0361" k3="0.0339"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.4057" k2="0.0361" k3="0.0339"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 35mm f/1.4 ZA</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Alpha 7S -->
-+            <distortion model="poly3" focal="35" k1="-0.00399"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 55mm f/1.8 ZA</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7 II -->
-+            <distortion model="ptlens" focal="55" a="-0.01142" b="0.02682" c="-0.01628"/>
-+            <tca model="poly3" focal="55" vr="1.00005" vb="0.99975"/>
-+            <vignetting model="pa" focal="55" aperture="1.8" distance="10" k1="-1.7122" k2="1.4630" k3="-0.5496"/>
-+            <vignetting model="pa" focal="55" aperture="1.8" distance="1000" k1="-1.7122" k2="1.4630" k3="-0.5496"/>
-+            <vignetting model="pa" focal="55" aperture="2" distance="10" k1="-1.0970" k2="0.1591" k3="0.1811"/>
-+            <vignetting model="pa" focal="55" aperture="2" distance="1000" k1="-1.0970" k2="0.1591" k3="0.1811"/>
-+            <vignetting model="pa" focal="55" aperture="2.2" distance="10" k1="-0.5114" k2="-0.7968" k3="0.6178"/>
-+            <vignetting model="pa" focal="55" aperture="2.2" distance="1000" k1="-0.5114" k2="-0.7968" k3="0.6178"/>
-+            <vignetting model="pa" focal="55" aperture="2.5" distance="10" k1="-0.3370" k2="-0.9220" k3="0.6109"/>
-+            <vignetting model="pa" focal="55" aperture="2.5" distance="1000" k1="-0.3370" k2="-0.9220" k3="0.6109"/>
-+            <vignetting model="pa" focal="55" aperture="2.8" distance="10" k1="-0.2019" k2="-0.9757" k3="0.5767"/>
-+            <vignetting model="pa" focal="55" aperture="2.8" distance="1000" k1="-0.2019" k2="-0.9757" k3="0.5767"/>
-+            <vignetting model="pa" focal="55" aperture="3.2" distance="10" k1="-0.2222" k2="-0.6336" k3="0.2788"/>
-+            <vignetting model="pa" focal="55" aperture="3.2" distance="1000" k1="-0.2222" k2="-0.6336" k3="0.2788"/>
-+            <vignetting model="pa" focal="55" aperture="3.5" distance="10" k1="-0.2874" k2="-0.2773" k3="0.0052"/>
-+            <vignetting model="pa" focal="55" aperture="3.5" distance="1000" k1="-0.2874" k2="-0.2773" k3="0.0052"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.3915" k2="0.1545" k3="-0.2962"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.3915" k2="0.1545" k3="-0.2962"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.5843" k2="0.7891" k3="-0.6427"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.5843" k2="0.7891" k3="-0.6427"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.5739" k2="0.6731" k3="-0.4594"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.5739" k2="0.6731" k3="-0.4594"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.4869" k2="0.2979" k3="-0.1001"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.4869" k2="0.2979" k3="-0.1001"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.4737" k2="0.2267" k3="-0.0281"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.4737" k2="0.2267" k3="-0.0281"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.3082" k2="-0.0741" k3="0.1667"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.3082" k2="-0.0741" k3="0.1667"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 24-70mm f/4 ZA OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="ptlens" focal="24" a="0.01086" b="-0.05129" c="0.0454"/>
-+            <distortion model="ptlens" focal="29" a="0" b="-0.00342" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0.00284" c="0"/>
-+            <distortion model="ptlens" focal="64" a="0" b="0.01063" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.0104" c="0"/>
-+            <tca model="poly3" focal="24" br="0.0001084" vr="1.0001830" bb="-0.0000322" vb="1.0000766"/>
-+            <tca model="poly3" focal="28" br="0.0000684" vr="1.0001879" bb="0.0000126" vb="0.9999843"/>
-+            <tca model="poly3" focal="34" br="-0.0000011" vr="1.0001999" bb="0.0000162" vb="0.9999974"/>
-+            <tca model="poly3" focal="41" br="-0.0000036" vr="1.0001795" bb="0.0000174" vb="0.9999616"/>
-+            <tca model="poly3" focal="50" br="-0.0000109" vr="1.0001446" bb="0.0000218" vb="0.9999371"/>
-+            <tca model="poly3" focal="61" br="-0.0000211" vr="1.0000951" bb="0.0000230" vb="0.9999419"/>
-+            <tca model="poly3" focal="70" br="-0.0000291" vr="1.0001021" bb="0.0000411" vb="0.9998636"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 24-70mm f/4 ZA OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7II -->
-+            <distortion model="ptlens" focal="24" a="0.02797" b="-0.09138" c="0.04487"/>
-+            <distortion model="ptlens" focal="33" a="0.01741" b="-0.03649" c="0.02297"/>
-+            <distortion model="ptlens" focal="50" a="0.01325" b="-0.0102" c="0.0103"/>
-+            <distortion model="ptlens" focal="70" a="0.01335" b="-0.01629" c="0.02605"/>
-+            <tca model="poly3" focal="24" br="0.0001620" vr="1.0002925" bb="-0.0000592" vb="1.0000445"/>
-+            <tca model="poly3" focal="29" br="0.0000520" vr="1.0002717" bb="0.0000002" vb="1.0000786"/>
-+            <tca model="poly3" focal="33" br="-0.0000376" vr="1.0003144" bb="0.0000309" vb="1.0000261"/>
-+            <tca model="poly3" focal="41" br="-0.0000745" vr="1.0002363" bb="0.0000300" vb="1.0000301"/>
-+            <tca model="poly3" focal="50" br="-0.0000721" vr="1.0001897" bb="0.0000368" vb="1.0000075"/>
-+            <tca model="poly3" focal="56" br="-0.0000572" vr="1.0000988" bb="0.0000658" vb="0.9999804"/>
-+            <tca model="poly3" focal="62" br="-0.0000671" vr="1.0001204" bb="0.0000728" vb="0.9999172"/>
-+            <tca model="poly3" focal="70" br="-0.0000563" vr="1.0001062" bb="0.0000583" vb="0.9998954"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 28mm f/2</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7s -->
-+            <distortion model="poly3" focal="28" k1="-0.02561"/>
-+            <tca model="poly3" focal="28" vr="1.0001366" vb="0.9999474"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 21mm f/2.8</model>
-+        <model lang="en">FE 28mm f/2 + Sony SEL075 UWC</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7s -->
-+            <distortion model="ptlens" focal="21" a="0.01519" b="-0.07683" c="0.00078"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 90mm f/2.8 Macro G OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7s -->
-+            <distortion model="poly3" focal="90" k1="-0.00136"/>
-+            <!-- Taken with Sony A7 -->
-+            <tca model="poly3" focal="90" br="0.0000041" vr="0.9999383" bb="-0.0000058" vb="1.0000569"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="0.28" k1="-0.0913" k2="-0.2538" k3="0.0786"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="0.35" k1="0.0306" k2="-0.6907" k3="0.3317"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="0.5" k1="-0.0459" k2="-0.7475" k3="0.4258"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="1" k1="-0.3861" k2="-0.1757" k3="0.1971"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.5570" k2="0.2280" k3="-0.0735"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="0.28" k1="-0.2303" k2="0.1201" k3="-0.1023"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="0.35" k1="-0.0846" k2="0.0546" k3="-0.2603"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="0.5" k1="0.0480" k2="-0.3073" k3="-0.0310"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="1" k1="0.0179" k2="-0.4970" k3="0.1500"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.0275" k2="-0.6320" k3="0.2776"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="0.28" k1="-0.2072" k2="-0.0157" k3="0.0373"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="0.35" k1="-0.2451" k2="0.2970" k3="-0.2519"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="0.5" k1="-0.2392" k2="0.4316" k3="-0.4271"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="1" k1="-0.2141" k2="0.3502" k3="-0.3672"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="-0.1287" k2="0.2299" k3="-0.3638"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="0.28" k1="-0.2113" k2="-0.0080" k3="0.0316"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="0.35" k1="-0.1723" k2="0.0147" k3="0.0103"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="0.5" k1="-0.1657" k2="0.0706" k3="-0.0415"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1" k1="-0.1877" k2="0.1847" k3="-0.1439"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.1703" k2="0.1418" k3="-0.1098"/>
-+            <vignetting model="pa" focal="90" aperture="11" distance="0.28" k1="-0.2060" k2="-0.0235" k3="0.0439"/>
-+            <vignetting model="pa" focal="90" aperture="11" distance="0.35" k1="-0.1771" k2="0.0231" k3="0.0072"/>
-+            <vignetting model="pa" focal="90" aperture="11" distance="0.5" k1="-0.1543" k2="0.0249" k3="0.0025"/>
-+            <vignetting model="pa" focal="90" aperture="11" distance="1" k1="-0.1449" k2="0.0315" k3="-0.0059"/>
-+            <vignetting model="pa" focal="90" aperture="11" distance="1000" k1="-0.1409" k2="0.0214" k3="0.0044"/>
-+            <vignetting model="pa" focal="90" aperture="16" distance="0.28" k1="-0.2034" k2="-0.0312" k3="0.0506"/>
-+            <vignetting model="pa" focal="90" aperture="16" distance="0.35" k1="-0.1714" k2="0.0095" k3="0.0181"/>
-+            <vignetting model="pa" focal="90" aperture="16" distance="0.5" k1="-0.1602" k2="0.0422" k3="-0.0100"/>
-+            <vignetting model="pa" focal="90" aperture="16" distance="1" k1="-0.1534" k2="0.0510" k3="-0.0176"/>
-+            <vignetting model="pa" focal="90" aperture="16" distance="1000" k1="-0.1525" k2="0.0557" k3="-0.0205"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="0.28" k1="-0.2024" k2="-0.0335" k3="0.0514"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="0.35" k1="-0.1686" k2="0.0033" k3="0.0218"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="0.5" k1="-0.1602" k2="0.0429" k3="-0.0100"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="1" k1="-0.1557" k2="0.0554" k3="-0.0193"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="1000" k1="-0.1558" k2="0.0642" k3="-0.0253"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 24-240mm f/3.5-6.3 OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony ILCE-7R (A7R) -->
-+            <distortion model="ptlens" focal="24" a="0.03845" b="-0.13772" c="0.07834"/>
-+            <distortion model="ptlens" focal="49" a="0.00446" b="0.00426" c="0.00916"/>
-+            <distortion model="ptlens" focal="100" a="-0.00732" b="0.0354" c="-0.01164"/>
-+            <distortion model="ptlens" focal="152" a="0.00205" b="0.02088" c="-0.0275"/>
-+            <distortion model="ptlens" focal="240" a="0.03214" b="-0.08025" c="0.08436"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 70-200mm f/4 G OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony ILCE-7R (A7R) -->
-+            <distortion model="ptlens" focal="70" a="-0.00998" b="0.04602" c="-0.08171"/>
-+            <distortion model="ptlens" focal="89" a="-0.0113" b="0.05113" c="-0.0724"/>
-+            <distortion model="ptlens" focal="120" a="0.00345" b="-0.00364" c="0.0002"/>
-+            <distortion model="ptlens" focal="164" a="0.01123" b="-0.03131" c="0.04108"/>
-+            <distortion model="ptlens" focal="197" a="0.01254" b="-0.0357" c="0.05244"/>
-+            <distortion model="ptlens" focal="200" a="-0.00419" b="0.03834" c="-0.0547"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-1.0432" k2="0.9344" k3="-0.4147"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-1.0432" k2="0.9344" k3="-0.4147"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2059" k2="0.2456" k3="-0.3135"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2059" k2="0.2456" k3="-0.3135"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2220" k2="0.1865" k3="-0.1538"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2220" k2="0.1865" k3="-0.1538"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1805" k2="0.0176" k3="0.0024"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1805" k2="0.0176" k3="0.0024"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1848" k2="0.0289" k3="-0.0061"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1848" k2="0.0289" k3="-0.0061"/>
-+            <vignetting model="pa" focal="104" aperture="4" distance="10" k1="-0.6344" k2="0.2813" k3="-0.0490"/>
-+            <vignetting model="pa" focal="104" aperture="4" distance="1000" k1="-0.6344" k2="0.2813" k3="-0.0490"/>
-+            <vignetting model="pa" focal="104" aperture="5.6" distance="10" k1="-0.2303" k2="0.3769" k3="-0.3908"/>
-+            <vignetting model="pa" focal="104" aperture="5.6" distance="1000" k1="-0.2303" k2="0.3769" k3="-0.3908"/>
-+            <vignetting model="pa" focal="104" aperture="8" distance="10" k1="-0.1630" k2="0.0401" k3="-0.0153"/>
-+            <vignetting model="pa" focal="104" aperture="8" distance="1000" k1="-0.1630" k2="0.0401" k3="-0.0153"/>
-+            <vignetting model="pa" focal="104" aperture="11" distance="10" k1="-0.1771" k2="0.0753" k3="-0.0373"/>
-+            <vignetting model="pa" focal="104" aperture="11" distance="1000" k1="-0.1771" k2="0.0753" k3="-0.0373"/>
-+            <vignetting model="pa" focal="104" aperture="22" distance="10" k1="-0.1875" k2="0.1006" k3="-0.0541"/>
-+            <vignetting model="pa" focal="104" aperture="22" distance="1000" k1="-0.1875" k2="0.1006" k3="-0.0541"/>
-+            <vignetting model="pa" focal="138" aperture="4" distance="10" k1="-0.6677" k2="0.3474" k3="-0.0691"/>
-+            <vignetting model="pa" focal="138" aperture="4" distance="1000" k1="-0.6677" k2="0.3474" k3="-0.0691"/>
-+            <vignetting model="pa" focal="138" aperture="5.6" distance="10" k1="0.0059" k2="-0.0090" k3="-0.2396"/>
-+            <vignetting model="pa" focal="138" aperture="5.6" distance="1000" k1="0.0059" k2="-0.0090" k3="-0.2396"/>
-+            <vignetting model="pa" focal="138" aperture="8" distance="10" k1="-0.2082" k2="0.2664" k3="-0.2316"/>
-+            <vignetting model="pa" focal="138" aperture="8" distance="1000" k1="-0.2082" k2="0.2664" k3="-0.2316"/>
-+            <vignetting model="pa" focal="138" aperture="11" distance="10" k1="-0.1643" k2="0.0665" k3="-0.0331"/>
-+            <vignetting model="pa" focal="138" aperture="11" distance="1000" k1="-0.1643" k2="0.0665" k3="-0.0331"/>
-+            <vignetting model="pa" focal="138" aperture="22" distance="10" k1="-0.1808" k2="0.1075" k3="-0.0594"/>
-+            <vignetting model="pa" focal="138" aperture="22" distance="1000" k1="-0.1808" k2="0.1075" k3="-0.0594"/>
-+            <vignetting model="pa" focal="165" aperture="4" distance="10" k1="-0.6061" k2="0.1943" k3="0.0271"/>
-+            <vignetting model="pa" focal="165" aperture="4" distance="1000" k1="-0.6061" k2="0.1943" k3="0.0271"/>
-+            <vignetting model="pa" focal="165" aperture="5.6" distance="10" k1="-0.0246" k2="-0.2812" k3="-0.0063"/>
-+            <vignetting model="pa" focal="165" aperture="5.6" distance="1000" k1="-0.0246" k2="-0.2812" k3="-0.0063"/>
-+            <vignetting model="pa" focal="165" aperture="8" distance="10" k1="-0.2136" k2="0.3397" k3="-0.3374"/>
-+            <vignetting model="pa" focal="165" aperture="8" distance="1000" k1="-0.2136" k2="0.3397" k3="-0.3374"/>
-+            <vignetting model="pa" focal="165" aperture="11" distance="10" k1="-0.1609" k2="0.0685" k3="-0.0372"/>
-+            <vignetting model="pa" focal="165" aperture="11" distance="1000" k1="-0.1609" k2="0.0685" k3="-0.0372"/>
-+            <vignetting model="pa" focal="165" aperture="22" distance="10" k1="-0.1750" k2="0.0968" k3="-0.0511"/>
-+            <vignetting model="pa" focal="165" aperture="22" distance="1000" k1="-0.1750" k2="0.0968" k3="-0.0511"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.6730" k2="0.3576" k3="-0.0828"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.6730" k2="0.3576" k3="-0.0828"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0165" k2="-0.7646" k3="0.3847"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0165" k2="-0.7646" k3="0.3847"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0572" k2="-0.0136" k3="-0.1946"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0572" k2="-0.0136" k3="-0.1946"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1871" k2="0.1571" k3="-0.1258"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1871" k2="0.1571" k3="-0.1258"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1748" k2="0.0738" k3="-0.0347"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1748" k2="0.0738" k3="-0.0347"/>
-+            <!-- Taken with Sony ILCE-7M2 (a7 II) -->
-+            <tca model="poly3" focal="70" br="0.0000469" vr="1.0001263" bb="-0.0000265" vb="1.0000676"/>
-+            <tca model="poly3" focal="88" br="0.0000178" vr="1.0000672" bb="-0.0000157" vb="1.0000716"/>
-+            <tca model="poly3" focal="100" br="0.0000241" vr="1.0000197" bb="-0.0000146" vb="1.0000653"/>
-+            <tca model="poly3" focal="137" br="0.0000001" vr="0.9999543" bb="-0.0000110" vb="1.0000296"/>
-+            <tca model="poly3" focal="171" br="-0.0000167" vr="0.9999257" bb="0.0000223" vb="0.9999265"/>
-+            <tca model="poly3" focal="200" br="-0.0000901" vr="0.9999864" bb="0.0000610" vb="0.9998220"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>FE 16-35mm F4 ZA OSS</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony ILCE-7M2 (A7 II) -->
-+            <distortion model="ptlens" focal="16" a="0.00561" b="-0.00446" c="-0.04348"/>
-+            <distortion model="ptlens" focal="17" a="0.00759" b="-0.00806" c="-0.03342"/>
-+            <distortion model="ptlens" focal="18" a="0.00592" b="0.00259" c="-0.04474"/>
-+            <distortion model="ptlens" focal="20" a="0.00529" b="0.00159" c="-0.02697"/>
-+            <distortion model="ptlens" focal="21" a="0.00498" b="0.00174" c="-0.02003"/>
-+            <distortion model="ptlens" focal="24" a="0.01239" b="-0.03614" c="0.04265"/>
-+            <distortion model="ptlens" focal="28" a="0.00646" b="-0.00652" c="0.00509"/>
-+            <distortion model="ptlens" focal="35" a="0.00326" b="0.00688" c="-0.01135"/>
-+            <tca model="poly3" focal="16" br="0.0001100" vr="1.0000279" bb="-0.0000788" vb="1.0001669"/>
-+            <tca model="poly3" focal="16" br="0.0001173" vr="1.0000297" bb="-0.0000613" vb="1.0001197"/>
-+            <tca model="poly3" focal="17" br="0.0001181" vr="0.9999968" bb="-0.0000970" vb="1.0002082"/>
-+            <tca model="poly3" focal="17" br="0.0001495" vr="0.9999498" bb="-0.0001191" vb="1.0002378"/>
-+            <tca model="poly3" focal="18" br="0.0000904" vr="0.9999805" bb="-0.0001049" vb="1.0002222"/>
-+            <tca model="poly3" focal="18" br="0.0001656" vr="0.9999090" bb="-0.0001309" vb="1.0002742"/>
-+            <tca model="poly3" focal="20" br="0.0000541" vr="0.9999948" bb="-0.0000532" vb="1.0001413"/>
-+            <tca model="poly3" focal="20" br="0.0000758" vr="0.9999790" bb="-0.0000893" vb="1.0002261"/>
-+            <tca model="poly3" focal="21" br="0.0000475" vr="0.9999920" bb="-0.0000718" vb="1.0001851"/>
-+            <tca model="poly3" focal="21" br="0.0000804" vr="0.9999492" bb="-0.0000939" vb="1.0002246"/>
-+            <tca model="poly3" focal="24" br="0.0000380" vr="0.9999854" bb="-0.0000783" vb="1.0002120"/>
-+            <tca model="poly3" focal="24" br="0.0000792" vr="0.9999630" bb="-0.0001759" vb="1.0004569"/>
-+            <tca model="poly3" focal="28" br="0.0000402" vr="0.9999753" bb="-0.0000799" vb="1.0002762"/>
-+            <tca model="poly3" focal="28" br="0.0000446" vr="0.9999759" bb="-0.0000839" vb="1.0002697"/>
-+            <tca model="poly3" focal="28" br="0.0000605" vr="0.9999748" bb="-0.0000938" vb="1.0002536"/>
-+            <tca model="poly3" focal="35" br="0.0000072" vr="0.9999953" bb="-0.0000533" vb="1.0001552"/>
-+            <tca model="poly3" focal="35" br="0.0000164" vr="0.9999902" bb="-0.0000586" vb="1.0001921"/>
-+            <tca model="poly3" focal="35" br="0.0000244" vr="1.0000242" bb="-0.0000698" vb="1.0002031"/>
-+            <tca model="poly3" focal="35" br="0.0000254" vr="0.9999852" bb="-0.0000676" vb="1.0002241"/>
-+            <tca model="poly3" focal="35" br="0.0000300" vr="0.9999976" bb="-0.0000609" vb="1.0002129"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-1.1889" k2="0.5519" k3="-0.1590"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-1.1889" k2="0.5519" k3="-0.1590"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-1.2507" k2="1.0025" k3="-0.4399"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.2507" k2="1.0025" k3="-0.4399"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-1.2684" k2="0.9596" k3="-0.3160"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-1.2684" k2="0.9596" k3="-0.3160"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-1.2745" k2="0.9701" k3="-0.3166"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-1.2745" k2="0.9701" k3="-0.3166"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-1.3186" k2="1.0848" k3="-0.3947"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-1.3186" k2="1.0848" k3="-0.3947"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-1.1827" k2="0.5834" k3="-0.1054"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-1.1827" k2="0.5834" k3="-0.1054"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-1.2566" k2="1.0555" k3="-0.4496"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-1.2566" k2="1.0555" k3="-0.4496"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-1.2714" k2="1.0548" k3="-0.3943"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-1.2714" k2="1.0548" k3="-0.3943"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="10" k1="-1.2942" k2="0.9833" k3="-0.3317"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-1.2942" k2="0.9833" k3="-0.3317"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-1.3007" k2="0.9552" k3="-0.2951"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-1.3007" k2="0.9552" k3="-0.2951"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-1.1870" k2="0.5687" k3="-0.0676"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-1.1870" k2="0.5687" k3="-0.0676"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-1.2389" k2="0.9330" k3="-0.3648"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-1.2389" k2="0.9330" k3="-0.3648"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-1.2497" k2="0.8684" k3="-0.2481"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-1.2497" k2="0.8684" k3="-0.2481"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-1.2642" k2="0.8896" k3="-0.2542"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-1.2642" k2="0.8896" k3="-0.2542"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-1.2772" k2="0.9048" k3="-0.2596"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-1.2772" k2="0.9048" k3="-0.2596"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-1.0813" k2="0.2621" k3="0.1397"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-1.0813" k2="0.2621" k3="0.1397"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-1.1213" k2="0.7022" k3="-0.2147"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.1213" k2="0.7022" k3="-0.2147"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-1.2081" k2="0.9071" k3="-0.3062"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-1.2081" k2="0.9071" k3="-0.3062"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-1.2406" k2="0.9707" k3="-0.3412"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-1.2406" k2="0.9707" k3="-0.3412"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-1.2610" k2="1.0037" k3="-0.3601"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-1.2610" k2="1.0037" k3="-0.3601"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.0065" k2="0.2460" k3="0.1074"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.0065" k2="0.2460" k3="0.1074"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.9621" k2="0.5560" k3="-0.2093"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.9621" k2="0.5560" k3="-0.2093"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-1.0363" k2="0.7353" k3="-0.2922"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-1.0363" k2="0.7353" k3="-0.2922"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-1.1090" k2="0.9120" k3="-0.4044"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-1.1090" k2="0.9120" k3="-0.4044"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-1.1554" k2="1.0329" k3="-0.4874"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-1.1554" k2="1.0329" k3="-0.4874"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-1.0744" k2="0.5359" k3="-0.0890"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-1.0744" k2="0.5359" k3="-0.0890"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.9267" k2="0.6547" k3="-0.2994"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.9267" k2="0.6547" k3="-0.2994"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-1.0458" k2="0.9599" k3="-0.4511"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-1.0458" k2="0.9599" k3="-0.4511"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-1.1218" k2="1.1329" k3="-0.5546"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-1.1218" k2="1.1329" k3="-0.5546"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-1.2189" k2="1.3518" k3="-0.6799"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-1.2189" k2="1.3518" k3="-0.6799"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-1.1240" k2="0.8817" k3="-0.3257"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-1.1240" k2="0.8817" k3="-0.3257"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.5076" k2="-0.1364" k3="0.1579"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.5076" k2="-0.1364" k3="0.1579"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.5451" k2="0.0290" k3="0.0802"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5451" k2="0.0290" k3="0.0802"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.5610" k2="0.0833" k3="0.0404"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5610" k2="0.0833" k3="0.0404"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.3400" k2="-0.9602" k3="0.9100"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3400" k2="-0.9602" k3="0.9100"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/mil-tamron.xml b/data/db/mil-tamron.xml
---- a/data/db/mil-tamron.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/mil-tamron.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,24 @@
-+<lensdatabase>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron 18-200mm f/3.5-6.3 Di III VC</model>
-+        <mount>Sony E</mount>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="ptlens" focal="18" a="0.02016" b="-0.04597" c="-0.03359"/>
-+            <distortion model="ptlens" focal="20.9" a="0.03108" b="-0.08646" c="0.04744"/>
-+            <distortion model="ptlens" focal="22.6" a="0.02567" b="-0.06728" c="0.03734"/>
-+            <distortion model="ptlens" focal="34.1" a="0.00474" b="-0.00952" c="0.00794"/>
-+            <distortion model="ptlens" focal="69.5" a="0" b="0.00596" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.00674" c="0"/>
-+            <tca model="poly3" focal="18" vr="1.0004" vb="1.0002"/>
-+            <tca model="poly3" focal="20.9" vr="1.0003" vb="1.0002"/>
-+            <tca model="poly3" focal="22.6" vr="1.0003" vb="1.0001"/>
-+            <tca model="poly3" focal="34.1" vr="1.0003" vb="1.0001"/>
-+            <tca model="poly3" focal="69.5" vr="0.9999" vb="1.0004"/>
-+            <tca model="poly3" focal="200" vr="0.9991" vb="0.9997"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/mil-zeiss.xml b/data/db/mil-zeiss.xml
---- a/data/db/mil-zeiss.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/mil-zeiss.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,103 @@
-+<lensdatabase>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>E 32mm f/1.8</model>
-+        <model lang="en">Touit 32mm f/1.8</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="poly3" focal="32" k1="-0.00792"/>
-+            <tca model="poly3" focal="32" br="-0.0000053" vr="1.0001744" bb="0.0000616" vb="0.9998421"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>E 25mm f/2</model>
-+        <model lang="en">Batis 25mm f/2</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 7R -->
-+            <distortion model="ptlens" focal="25" a="0.01403" b="-0.03257" c="0.00722"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="10" k1="-1.3135" k2="0.7812" k3="-0.1662"/>
-+            <vignetting model="pa" focal="25" aperture="2" distance="1000" k1="-1.3135" k2="0.7812" k3="-0.1662"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="10" k1="-0.8297" k2="-0.2042" k3="0.3884"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="1000" k1="-0.8297" k2="-0.2042" k3="0.3884"/>
-+            <vignetting model="pa" focal="25" aperture="2.5" distance="10" k1="-0.6639" k2="-0.1965" k3="0.2916"/>
-+            <vignetting model="pa" focal="25" aperture="2.5" distance="1000" k1="-0.6639" k2="-0.1965" k3="0.2916"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="10" k1="-0.8068" k2="0.3793" k3="-0.1003"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.8068" k2="0.3793" k3="-0.1003"/>
-+            <vignetting model="pa" focal="25" aperture="3.2" distance="10" k1="-0.7914" k2="0.3992" k3="-0.1236"/>
-+            <vignetting model="pa" focal="25" aperture="3.2" distance="1000" k1="-0.7914" k2="0.3992" k3="-0.1236"/>
-+            <vignetting model="pa" focal="25" aperture="3.5" distance="10" k1="-0.8243" k2="0.4168" k3="-0.1076"/>
-+            <vignetting model="pa" focal="25" aperture="3.5" distance="1000" k1="-0.8243" k2="0.4168" k3="-0.1076"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="10" k1="-0.8256" k2="0.3920" k3="-0.0733"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.8256" k2="0.3920" k3="-0.0733"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="10" k1="-0.8200" k2="0.3486" k3="-0.0395"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="1000" k1="-0.8200" k2="0.3486" k3="-0.0395"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="10" k1="-0.7887" k2="0.2225" k3="0.0559"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="1000" k1="-0.7887" k2="0.2225" k3="0.0559"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.7793" k2="0.2049" k3="0.0600"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.7793" k2="0.2049" k3="0.0600"/>
-+            <vignetting model="pa" focal="25" aperture="6.3" distance="10" k1="-0.7779" k2="0.2160" k3="0.0361"/>
-+            <vignetting model="pa" focal="25" aperture="6.3" distance="1000" k1="-0.7779" k2="0.2160" k3="0.0361"/>
-+            <vignetting model="pa" focal="25" aperture="7.1" distance="10" k1="-0.7759" k2="0.2166" k3="0.0253"/>
-+            <vignetting model="pa" focal="25" aperture="7.1" distance="1000" k1="-0.7759" k2="0.2166" k3="0.0253"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.7698" k2="0.2065" k3="0.0287"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.7698" k2="0.2065" k3="0.0287"/>
-+            <vignetting model="pa" focal="25" aperture="9" distance="10" k1="-0.7606" k2="0.1789" k3="0.0503"/>
-+            <vignetting model="pa" focal="25" aperture="9" distance="1000" k1="-0.7606" k2="0.1789" k3="0.0503"/>
-+            <vignetting model="pa" focal="25" aperture="10" distance="10" k1="-0.7590" k2="0.1795" k3="0.0459"/>
-+            <vignetting model="pa" focal="25" aperture="10" distance="1000" k1="-0.7590" k2="0.1795" k3="0.0459"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="10" k1="-0.7566" k2="0.1734" k3="0.0498"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.7566" k2="0.1734" k3="0.0498"/>
-+            <vignetting model="pa" focal="25" aperture="13" distance="10" k1="-0.7519" k2="0.1614" k3="0.0571"/>
-+            <vignetting model="pa" focal="25" aperture="13" distance="1000" k1="-0.7519" k2="0.1614" k3="0.0571"/>
-+            <vignetting model="pa" focal="25" aperture="14" distance="10" k1="-0.7479" k2="0.1499" k3="0.0644"/>
-+            <vignetting model="pa" focal="25" aperture="14" distance="1000" k1="-0.7479" k2="0.1499" k3="0.0644"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.7426" k2="0.1364" k3="0.0728"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.7426" k2="0.1364" k3="0.0728"/>
-+            <vignetting model="pa" focal="25" aperture="18" distance="10" k1="-0.7405" k2="0.1285" k3="0.0783"/>
-+            <vignetting model="pa" focal="25" aperture="18" distance="1000" k1="-0.7405" k2="0.1285" k3="0.0783"/>
-+            <vignetting model="pa" focal="25" aperture="20" distance="10" k1="-0.7392" k2="0.1229" k3="0.0829"/>
-+            <vignetting model="pa" focal="25" aperture="20" distance="1000" k1="-0.7392" k2="0.1229" k3="0.0829"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.7379" k2="0.1186" k3="0.0860"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.7379" k2="0.1186" k3="0.0860"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>E 85mm F1.8</model>
-+        <model lang="en">Batis 85mm f/1.8</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha a7 II (ILCE-7M2) -->
-+            <distortion model="ptlens" focal="85" a="-0.000588" b="-0.00021" c="0.024475"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>E 50mm F2</model>
-+        <model lang="en">Loxia 50mm f/2 Planar T*</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 7 II (ILCE-7M2) -->
-+            <distortion model="ptlens" focal="50" a="-0.00093" b="-0.00216" c="-0.0024"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>E 21mm F2.8</model>
-+        <model lang="en">Loxia 21mm f/2.8</model>
-+        <mount>Sony E</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 7 II (ILCE-7M2) -->
-+            <distortion model="ptlens" focal="21" a="0.02059" b="-0.05856" c="0.0302"/>
-+            <tca model="poly3" focal="21" vr="1.0000849" vb="1.0000258"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/misc.xml b/data/db/misc.xml
---- a/data/db/misc.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/misc.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,361 @@
-+<lensdatabase>
-+    <mount>
-+        <name>M42</name>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>M39/1</name>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>DKL</name>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>T2</name>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>C</name>
-+        <compat>Generic</compat>
-+    </mount>
-+    <camera>
-+        <!-- This works for 4:3 and 16:9 because crop factor is the same in
-+             both cases, no matter what Nokia's white paper says. -->
-+        <maker>Nokia</maker>
-+        <model>Lumia 1020</model>
-+        <mount>lumia1020</mount>
-+        <cropfactor>3.93</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Microsoft</maker>
-+        <model>Lumia 950</model>
-+        <mount>lumia950</mount>
-+        <cropfactor>6.02</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>SEIKO EPSON CORP.</maker>
-+        <maker lang="en">Epson</maker>
-+        <model>R-D1</model>
-+        <mount>Leica M</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>LG Mobile</maker>
-+        <maker lang="en">LG</maker>
-+        <model>LG-H815</model>
-+        <model lang="en">LG G4</model>
-+        <mount>lgH815</mount>
-+        <cropfactor>6.34</cropfactor>
-+    </camera>
-+    <!-- I think this is also known under the brand "Michael Lens" or "Movie
-+         Lens", and with f/1.6.  The correction data actually was submitted as
-+         "CCTV Movie Lens HD-MC 35mm/F1.6".  The distortion model is not perfect,
-+         test it with
-+         <https://c2.staticflickr.com/6/5530/12031215365_2fd76aa31c_z.jpg>.
-+         FixMe: It should be re-checked. -->
-+    <lens>
-+        <maker>Fujian</maker>
-+        <model>35mm f/1.7</model>
-+        <mount>C</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="35" k1="-0.0055"/>
-+            <tca model="poly3" focal="35" br="-0.0001764" vr="1.0005429" bb="0.0000786" vb="1.0008622"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- This works for 4:3 and 16:9 because crop factor is the same in
-+             both cases, no matter what Nokia's white paper says. -->
-+        <maker>Zeiss</maker>
-+        <model>Lumia 1020</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>lumia1020</mount>
-+        <cropfactor>3.93</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="6.6" a="-0.01804" b="0.06109" c="-0.05264"/>
-+            <tca model="poly3" focal="6.6" br="-0.0000439" vr="1.0001865" bb="0.0000085" vb="0.9999709"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>Lumia 950</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>lumia950</mount>
-+        <cropfactor>6.02</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="4.3" a="-0.01625" b="0.04667" c="-0.03155"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentacon</maker>
-+        <model>Pentacon 50mm f/1.8 auto multi coating</model>
-+        <mount>M42</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 -->
-+            <distortion model="poly3" focal="50" k1="-0.00197"/>
-+            <tca model="poly3" focal="50" br="-0.0000012" vr="1.0000573" bb="-0.0000011" vb="0.9999574"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Cosina</maker>
-+        <model>Cosina Cosinon-S 50mm 1:2</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="poly3" focal="50" k1="-0.00146"/>
-+            <tca model="poly3" focal="50" br="-0.0000159" vr="1.0000709" bb="0.0000131" vb="0.9999198"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Mitakon</maker>
-+        <model>Mitakon wide MC f=24mm 1:2.8</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="ptlens" focal="24" a="0.00966" b="-0.0318" c="0.01539"/>
-+            <tca model="poly3" focal="24" br="-0.0000186" vr="1.0006527" bb="0.0001034" vb="0.9995702"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zenit</maker>
-+        <model>Zenitar MC 16mm f/2.8</model>
-+        <mount>M42</mount>
-+        <mount>Nikon F</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Pentax K</mount>
-+        <type>fisheye</type>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-E2 -->
-+            <distortion model="poly3" focal="16" k1="-0.00676"/>
-+            <tca model="poly3" focal="16" vr="0.9999213" vb="1.0005960"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Fotasy</maker>
-+        <model>Fotasy M3517 35mm f/1.7</model>
-+        <mount>M42</mount>
-+        <focal value="35"/>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-E2 -->
-+            <distortion model="ptlens" focal="35" a="0.02256" b="-0.05856" c="0.07779"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Voigtländer</maker>
-+        <model>Voigtländer Skoparex 1:3,4/35</model>
-+        <mount>DKL</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <distortion model="poly3" focal="35" k1="-0.0049"/>
-+            <tca model="poly3" focal="35" vr="1.0003184" vb="0.9998060"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Voigtländer</maker>
-+        <model>Voigtländer Color-Skopar X 1:2,8/50</model>
-+        <mount>DKL</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <distortion model="poly3" focal="50" k1="-0.00238"/>
-+            <tca model="poly3" focal="50" vr="1.0000342" vb="0.9999683"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- Also branded as Tokina, Soligor, Vivitar, Voigtländer -->
-+        <maker>Cosina</maker>
-+        <model>Cosina 19-35mm f/3.5-4.5 MC</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentak K</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark -->
-+            <distortion model="ptlens" focal="19" a="0.046286" b="-0.11248" c="0.030287"/>
-+            <distortion model="ptlens" focal="22" a="0.029666" b="-0.076511" c="0.01727"/>
-+            <distortion model="ptlens" focal="24" a="0.017288" b="-0.045992" c="0.001481"/>
-+            <distortion model="ptlens" focal="27" a="0.012509" b="-0.037002" c="0.006172"/>
-+            <distortion model="ptlens" focal="35" a="0.007519" b="-0.02567" c="0.009393"/>
-+            <tca model="poly3" focal="19" br="-0.0000121" vr="1.0001193" bb="0.0001970" vb="0.9998348"/>
-+            <tca model="poly3" focal="21" br="-0.0000882" vr="1.0002251" bb="-0.0000484" vb="1.0001140"/>
-+            <tca model="poly3" focal="24" br="0.0000025" vr="1.0000987" bb="0.0001017" vb="0.9999758"/>
-+            <tca model="poly3" focal="27" br="-0.0000273" vr="1.0001400" bb="-0.0000431" vb="1.0001221"/>
-+            <tca model="poly3" focal="35" br="-0.0000414" vr="1.0001805" bb="0.0000132" vb="1.0000728"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="0.5" k1="-1.7934" k2="1.7056" k3="-0.8118"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="1" k1="-1.8555" k2="1.8447" k3="-0.8589"/>
-+            <vignetting model="pa" focal="19" aperture="3.5" distance="1000" k1="-1.7719" k2="1.7732" k3="-0.8368"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="0.5" k1="-1.6955" k2="1.5891" k3="-0.7749"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="1" k1="-1.6302" k2="1.3026" k3="-0.5181"/>
-+            <vignetting model="pa" focal="19" aperture="4" distance="1000" k1="-1.7174" k2="1.5506" k3="-0.6781"/>
-+            <vignetting model="pa" focal="19" aperture="5.6" distance="0.5" k1="-0.8260" k2="-0.0160" k3="0.0899"/>
-+            <vignetting model="pa" focal="19" aperture="5.6" distance="1" k1="-0.7476" k2="-0.5005" k3="0.5077"/>
-+            <vignetting model="pa" focal="19" aperture="5.6" distance="1000" k1="-0.6603" k2="-0.7254" k3="0.6805"/>
-+            <vignetting model="pa" focal="19" aperture="8" distance="0.5" k1="-0.8149" k2="0.3462" k3="-0.2062"/>
-+            <vignetting model="pa" focal="19" aperture="8" distance="1" k1="-0.9687" k2="0.3698" k3="-0.1058"/>
-+            <vignetting model="pa" focal="19" aperture="8" distance="1000" k1="-0.9199" k2="0.3089" k3="-0.0862"/>
-+            <vignetting model="pa" focal="19" aperture="11" distance="0.5" k1="-0.8958" k2="0.6625" k3="-0.3866"/>
-+            <vignetting model="pa" focal="19" aperture="11" distance="1" k1="-1.0589" k2="0.7245" k3="-0.3213"/>
-+            <vignetting model="pa" focal="19" aperture="11" distance="1000" k1="-1.0060" k2="0.6080" k3="-0.2582"/>
-+            <vignetting model="pa" focal="19" aperture="20" distance="0.5" k1="-0.8567" k2="0.4629" k3="-0.1486"/>
-+            <vignetting model="pa" focal="19" aperture="20" distance="1" k1="-0.9616" k2="0.4697" k3="-0.0940"/>
-+            <vignetting model="pa" focal="19" aperture="20" distance="1000" k1="-0.9667" k2="0.4235" k3="-0.0550"/>
-+            <vignetting model="pa" focal="21" aperture="3.5" distance="1" k1="-1.7104" k2="1.7418" k3="-0.7696"/>
-+            <vignetting model="pa" focal="21" aperture="3.5" distance="1000" k1="-1.8198" k2="1.8607" k3="-0.7851"/>
-+            <vignetting model="pa" focal="21" aperture="4" distance="1" k1="-1.7163" k2="1.6488" k3="-0.6855"/>
-+            <vignetting model="pa" focal="21" aperture="4" distance="1000" k1="-1.7134" k2="1.5815" k3="-0.6094"/>
-+            <vignetting model="pa" focal="21" aperture="5.6" distance="1" k1="-0.6714" k2="-0.6358" k3="0.6220"/>
-+            <vignetting model="pa" focal="21" aperture="5.6" distance="1000" k1="-0.7871" k2="-0.2363" k3="0.3568"/>
-+            <vignetting model="pa" focal="21" aperture="8" distance="1" k1="-0.7489" k2="0.1120" k3="-0.0081"/>
-+            <vignetting model="pa" focal="21" aperture="8" distance="1000" k1="-0.8327" k2="0.3211" k3="-0.1404"/>
-+            <vignetting model="pa" focal="21" aperture="11" distance="1" k1="-0.7597" k2="0.1979" k3="-0.0361"/>
-+            <vignetting model="pa" focal="21" aperture="11" distance="1000" k1="-0.8596" k2="0.4069" k3="-0.1494"/>
-+            <vignetting model="pa" focal="21" aperture="22" distance="1" k1="-0.7769" k2="0.1356" k3="0.0915"/>
-+            <vignetting model="pa" focal="21" aperture="22" distance="1000" k1="-0.8902" k2="0.4074" k3="-0.0764"/>
-+            <vignetting model="pa" focal="22" aperture="3.5" distance="0.5" k1="-1.7523" k2="1.8669" k3="-0.8644"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="0.5" k1="-1.7278" k2="1.7875" k3="-0.8047"/>
-+            <vignetting model="pa" focal="22" aperture="5.6" distance="0.5" k1="-0.7246" k2="-0.3682" k3="0.4055"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="0.5" k1="-0.7029" k2="0.1041" k3="-0.0484"/>
-+            <vignetting model="pa" focal="22" aperture="11" distance="0.5" k1="-0.8179" k2="0.4719" k3="-0.2444"/>
-+            <vignetting model="pa" focal="22" aperture="20" distance="0.5" k1="-0.8132" k2="0.3293" k3="-0.0543"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.5" k1="-1.6438" k2="1.6648" k3="-0.7305"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1" k1="-1.6238" k2="1.5047" k3="-0.5960"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.6600" k2="1.7123" k3="-0.7364"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.5" k1="-0.7203" k2="-0.2811" k3="0.3403"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1" k1="-0.7679" k2="-0.2954" k3="0.3955"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6486" k2="-0.5150" k3="0.5191"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.5" k1="-0.6953" k2="0.1981" k3="-0.1155"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1" k1="-0.6432" k2="-0.0613" k3="0.0873"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6372" k2="0.0254" k3="0.0163"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.5" k1="-0.7721" k2="0.4197" k3="-0.2040"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1" k1="-0.7989" k2="0.3444" k3="-0.1171"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7639" k2="0.3231" k3="-0.1138"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.5" k1="-0.7708" k2="0.3417" k3="-0.0937"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1" k1="-0.7474" k2="0.1428" k3="0.0732"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7602" k2="0.2101" k3="0.0240"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="0.5" k1="-1.4458" k2="1.3937" k3="-0.6045"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="1" k1="-1.4534" k2="1.3067" k3="-0.5149"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="1000" k1="-1.4388" k2="1.3979" k3="-0.5970"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="0.5" k1="-0.7767" k2="-0.0835" k3="0.2410"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="1" k1="-0.5829" k2="-0.4899" k3="0.4713"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="1000" k1="-0.6064" k2="-0.3567" k3="0.3736"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="0.5" k1="-0.5773" k2="-0.0190" k3="0.0261"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="1" k1="-0.6763" k2="0.1803" k3="-0.0642"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="1000" k1="-0.6238" k2="0.1222" k3="-0.0461"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="0.5" k1="-0.7060" k2="0.3817" k3="-0.1780"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="1" k1="-0.6722" k2="0.1940" k3="-0.0296"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="1000" k1="-0.7028" k2="0.2675" k3="-0.0600"/>
-+            <vignetting model="pa" focal="27" aperture="22" distance="0.5" k1="-0.7073" k2="0.3190" k3="-0.0987"/>
-+            <vignetting model="pa" focal="27" aperture="22" distance="1" k1="-0.6936" k2="0.1892" k3="0.0133"/>
-+            <vignetting model="pa" focal="27" aperture="22" distance="1000" k1="-0.6751" k2="0.1907" k3="-0.0024"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="0.5" k1="-1.2135" k2="1.0776" k3="-0.4515"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1" k1="-1.1998" k2="0.9479" k3="-0.3435"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-1.1993" k2="1.0065" k3="-0.3961"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.9908" k2="0.5376" k3="-0.1267"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1" k1="-0.9580" k2="0.4148" k3="-0.0403"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.9344" k2="0.3390" k3="0.0145"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.4954" k2="-0.0732" k3="0.0630"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1" k1="-0.5102" k2="-0.1399" k3="0.1347"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5095" k2="-0.0979" k3="0.0978"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.5970" k2="0.2611" k3="-0.0975"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1" k1="-0.6185" k2="0.2213" k3="-0.0520"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5903" k2="0.1883" k3="-0.0391"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.6246" k2="0.2128" k3="-0.0282"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.6246" k2="0.2128" k3="-0.0282"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="0.5" k1="-0.6201" k2="0.2764" k3="-0.0844"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1" k1="-0.6252" k2="0.1675" k3="0.0125"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Voigtländer</maker>
-+        <model>Voigtlander Ultron 40mm f/2 SLII Aspherical</model>
-+        <model lang="en">Voigtländer Ultron 40mm f/2 SL-II Aspherical</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="40" a="0.00914" b="-0.03392" c="0.02683"/>
-+            <tca model="poly3" focal="40" vr="1.0001130" vb="1.0000510"/>
-+            <!-- Taken with Nikon D810 -->
-+            <vignetting model="pa" focal="40" aperture="2" distance="10" k1="-1.4005" k2="0.9677" k3="-0.3253"/>
-+            <vignetting model="pa" focal="40" aperture="2" distance="1000" k1="-1.4005" k2="0.9677" k3="-0.3253"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="10" k1="-0.2035" k2="-0.7391" k3="0.3531"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.2035" k2="-0.7391" k3="0.3531"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="10" k1="-0.5039" k2="0.4455" k3="-0.3488"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.5039" k2="0.4455" k3="-0.3488"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="10" k1="-0.4284" k2="0.1120" k3="-0.0072"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.4284" k2="0.1120" k3="-0.0072"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="10" k1="-0.4615" k2="0.1723" k3="-0.0436"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.4615" k2="0.1723" k3="-0.0436"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>LG</maker>
-+        <model>LG G4 &amp; compatibles</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-+        <mount>lgH815</mount>
-+        <cropfactor>6.34</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="4.42" k1="0.00306"/>
-+            <tca model="poly3" focal="4.42" vr="1.0000246" vb="1.0000556"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- This is *not* the mirror lens -->
-+        <maker>Beroflex</maker>
-+        <model>Beroflex 1:8 500mm</model>
-+        <mount>T2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K10D -->
-+            <distortion model="poly3" focal="500" k1="0.00108"/>
-+            <tca model="poly3" focal="500" vr="0.9999464" vb="0.9997637"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Yongnuo</maker>
-+        <model>Yongnuo YN 35mm f/2</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS 1200D -->
-+            <distortion model="ptlens" focal="35" a="-0.00119" b="0.00329" c="-0.01831"/>
-+            <tca model="poly3" focal="35" vr="1.0001431" vb="1.0000424"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Irix</maker>
-+        <model>Irix 15mm f/2.4</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F</mount>
-+        <mount>Pentax KAF</mount>
-+        <aperture min="2.4" max="22"/>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="15" a="-0.00136" b="-0.00782" c="0.00534"/>
-+            <vignetting model="pa" focal="15" aperture="2.4" distance="10" k1="-1.73692" k2="1.78418" k3="-0.80744"/>
-+            <vignetting model="pa" focal="15" aperture="2.4" distance="1000" k1="-1.73692" k2="1.78418" k3="-0.80744"/>
-+            <vignetting model="pa" focal="15" aperture="2.8" distance="10" k1="-1.83889" k2="1.83878" k3="-0.77529"/>
-+            <vignetting model="pa" focal="15" aperture="2.8" distance="1000" k1="-1.83889" k2="1.83878" k3="-0.77529"/>
-+            <vignetting model="pa" focal="15" aperture="4" distance="10" k1="-0.66275" k2="-0.49148" k3="0.50918"/>
-+            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.66275" k2="-0.49148" k3="0.50918"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.3307" k2="-0.80537" k3="0.53069"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.3307" k2="-0.80537" k3="0.53069"/>
-+            <vignetting model="pa" focal="15" aperture="8" distance="10" k1="-0.64454" k2="0.41276" k3="-0.38224"/>
-+            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.64454" k2="0.41276" k3="-0.38224"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.54125" k2="0.01735" k3="0.0838"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.54125" k2="0.01735" k3="0.0838"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/rf-leica.xml b/data/db/rf-leica.xml
---- a/data/db/rf-leica.xml	2007-12-12 21:49:44.000000000 +0100
-+++ b/data/db/rf-leica.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,154 +1,118 @@
--<!--
--    I have created this file to have a place where I can drop all information
--    that I can find about Leica rangefinder cameras and lenses. It's far from
--    being complete; feel free to extend this file.
---->
--
- <lensdatabase>
--
-     <mount>
-         <name>Leica M</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Elmarit-M 2.8/21 ASPH</model>
--        <cci red="0" green="6" blue="5" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Elmarit-M 2.8/21</model>
--        <cci red="0" green="5" blue="2" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Elmarit-M 24mm f/2.8 ASPH</model>
--        <cci red="0" green="5" blue="5" />
--        <mount>Leica M</mount>
--    </lens>
--
--    <lens>
--        <maker>Leica</maker>
--        <model>Elmarit-M 2.8/28</model>
--        <cci red="0" green="5" blue="4" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Elmarit-M 2.8/28</model>
--        <cci red="0" green="4" blue="2" />
--        <mount>Leica M</mount>
--    </lens>
--
--    <lens>
--        <maker>Leica</maker>
--        <model>Summilux-M 1.4/35 ASPH</model>
--        <cci red="0" green="6" blue="6" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Summilux-M 1.4/35 ASPH</model>
--        <cci red="0" green="5" blue="5" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Summilux-M 1.4/35</model>
--        <cci red="0" green="4" blue="1" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Summicron-M 2/35 ASPH</model>
--        <cci red="0" green="4" blue="3" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Noctilux-M 1/50</model>
--        <cci red="0" green="8" blue="6" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Sumilux-M 1.4/50</model>
--        <cci red="0" green="5" blue="2" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Summicron-M 2/50</model>
--        <cci red="0" green="5" blue="4" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Elmar-M 2.8/50</model>
--        <cci red="0" green="6" blue="5" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Summilux-M 1.4/75</model>
--        <cci red="0" green="6" blue="3" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>APO-Summicron-M 2/90 ASPH</model>
--        <cci red="0" green="6" blue="4" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Apo-Telyt-M 3.4/135</model>
--        <cci red="0" green="5" blue="4" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Elmarit-M 2.8/135</model>
--        <cci red="0" green="6" blue="4" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Tri-Elmar 4/28</model>
--        <cci red="0" green="5" blue="3" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Leica</maker>
-         <model>Tri-Elmar 4/35</model>
--        <cci red="0" green="5" blue="3" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
-- 
-     <lens>
-         <maker>Leica</maker>
-         <model>Tri-Elmar 4/50</model>
--        <cci red="0" green="5" blue="3" />
-         <mount>Leica M</mount>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-canon.xml b/data/db/slr-canon.xml
---- a/data/db/slr-canon.xml	2013-10-18 18:41:38.000000000 +0200
-+++ b/data/db/slr-canon.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,140 +1,129 @@
- <lensdatabase>
--
-     <mount>
-         <name>Canon EF-S</name>
-         <compat>Canon EF</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Canon EF</name>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Canon FD</name>
-+        <compat>Canon FL</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>Canon FL</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 6D</model>
-         <model lang="en">EOS 6D</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1.005</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 5D Mark III</model>
-         <model lang="en">EOS 5D Mark III</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 5D Mark II</model>
-         <model lang="en">EOS 5D Mark II</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 5D</model>
-         <model lang="en">EOS 5D</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
--    <camera>
--        <maker>Canon</maker>
--        <model>Canon EOS-1DS</model>
--        <model lang="en">EOS-1DS</model>
--        <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
--    </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1Ds</model>
-         <model lang="en">EOS-1Ds</model>
--        <variant>*</variant>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1Ds Mark II</model>
-         <model lang="en">EOS-1Ds Mark II</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1D Mark II</model>
-         <model lang="en">EOS-1D Mark II</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.255</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1D Mark II N</model>
-         <model lang="en">EOS-1D Mark II N</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.255</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1Ds Mark III</model>
-         <model lang="en">EOS-1Ds Mark III</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1D Mark III</model>
-         <model lang="en">EOS-1D Mark III</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.282</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1D Mark IV</model>
-         <model lang="en">EOS-1D Mark IV</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.290</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1D</model>
-         <model lang="en">EOS-1D</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.255</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS-1D X</model>
-         <model lang="en">EOS-1D X</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 1000D</model>
-@@ -142,7 +131,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS DIGITAL REBEL XS</model>
-@@ -150,7 +138,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss Digital F</model>
-@@ -158,7 +145,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 1100D</model>
-@@ -166,7 +152,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL T3</model>
-@@ -174,7 +159,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X50</model>
-@@ -182,31 +166,27 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 300D DIGITAL</model>
-         <model lang="en">EOS 300D</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.587</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS DIGITAL REBEL</model>
-         <model lang="en">EOS Digital REBEL</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.587</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss Digital</model>
-         <model lang="en">EOS Kiss Digital</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.587</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 350D DIGITAL</model>
-@@ -214,7 +194,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS DIGITAL REBEL XT</model>
-@@ -222,7 +201,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss Digital N</model>
-@@ -230,7 +208,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 400D DIGITAL</model>
-@@ -238,7 +215,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS DIGITAL REBEL XTi</model>
-@@ -246,7 +222,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss Digital X</model>
-@@ -254,7 +229,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 450D</model>
-@@ -262,7 +236,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS DIGITAL REBEL XSi</model>
-@@ -270,7 +243,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss Digital X2</model>
-@@ -278,7 +250,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 500D</model>
-@@ -286,7 +257,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL T1i</model>
-@@ -294,7 +264,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X3</model>
-@@ -302,7 +271,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 550D</model>
-@@ -310,7 +278,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL T2i</model>
-@@ -318,7 +285,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X4</model>
-@@ -326,7 +292,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 600D</model>
-@@ -334,7 +299,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL T3i</model>
-@@ -342,7 +306,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X5</model>
-@@ -350,7 +313,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 650D</model>
-@@ -358,7 +320,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL T4i</model>
-@@ -366,7 +327,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X6i</model>
-@@ -374,7 +334,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 700D</model>
-@@ -382,7 +341,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL T5i</model>
-@@ -390,7 +348,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X7i</model>
-@@ -398,7 +355,48 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS 750D</model>
-+        <model lang="en">EOS 750D</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS 760D</model>
-+        <model lang="en">EOS 760D</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS 1200D</model>
-+        <model lang="en">EOS 1200D</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS 1300D</model>
-+        <model lang="en">EOS 1300D</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS REBEL T5</model>
-+        <model lang="en">EOS Rebel T5</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS Kiss X70</model>
-+        <model lang="en">EOS Kiss X70</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 100D</model>
-@@ -406,7 +404,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS REBEL SL1</model>
-@@ -414,7 +411,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS Kiss X7</model>
-@@ -422,7 +418,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 7D</model>
-@@ -430,15 +425,27 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS 7D Mark II</model>
-+        <model lang="en">EOS 7D Mark II</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>Canon EOS 80D</model>
-+        <model lang="en">EOS 80D</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+    </camera>
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 70D</model>
-         <model lang="en">EOS 70D</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.600</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 60D</model>
-@@ -446,7 +453,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 50D</model>
-@@ -454,7 +460,6 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 40D</model>
-@@ -462,1181 +467,4503 @@
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 30D</model>
-         <model lang="en">EOS 30D</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.600</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 20D</model>
-         <model lang="en">EOS 20D</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.600</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS 10D</model>
-         <model lang="en">EOS 10D</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.587</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS D60</model>
-         <model lang="en">EOS D60</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.587</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>Canon EOS D30</model>
-         <model lang="en">EOS D30</model>
-         <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.587</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Canon</maker>
-         <model>35mm film: full frame</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Kodak</maker>
-         <model>DCS Pro SLR/c</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Kodak</maker>
--        <model>DCS520C</model>
-+        <model>DCS520</model>
-+        <model lang="en">DCS 520</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.6</cropfactor>
-+        <cropfactor>1.593</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Canon</maker>
-+        <model>EOS D2000</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.593</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 10-22mm f/3.5-4.5 USM</model>
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="10" a="0.005371" b="-0.018303" c="0" />
--            <distortion model="ptlens" focal="12" a="0.002619" b="-0.009527" c="0" />
--            <distortion model="ptlens" focal="14" a="0.002896" b="-0.00705" c="0" />
--            <distortion model="ptlens" focal="17" a="0.005115" b="-0.010326" c="0" />
--            <distortion model="ptlens" focal="20" a="0.00512" b="-0.008414" c="0" />
--            <distortion model="ptlens" focal="22" a="0.002769" b="-0.004058" c="0" />
-+            <!-- Taken with Canon 650D -->
-+            <distortion model="ptlens" focal="10" a="0.01986" b="-0.06874" c="0.05166"/>
-+            <distortion model="ptlens" focal="12" a="0.0077" b="-0.03199" c="0.02557"/>
-+            <distortion model="ptlens" focal="14" a="0.003" b="-0.00133" c="-0.01649"/>
-+            <distortion model="ptlens" focal="22" a="0.00459" b="-0.00356" c="-0.01271"/>
-+            <tca model="poly3" focal="10" br="-0.0000025" vr="1.0003211" bb="0.0000125" vb="1.0000667"/>
-+            <tca model="poly3" focal="12" br="0.0001191" vr="1.0001500" bb="-0.0000116" vb="1.0001272"/>
-+            <tca model="poly3" focal="14" br="0.0000423" vr="1.0001293" bb="-0.0000479" vb="1.0001940"/>
-+            <tca model="poly3" focal="22" br="0.0000589" vr="0.9999979" bb="-0.0000104" vb="1.0001770"/>
-+            <!-- Taken with Canon 500D -->
-+            <vignetting model="pa" focal="10" aperture="3.5" distance="10" k1="-2.1271" k2="2.6641" k3="-1.2836"/>
-+            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-2.1271" k2="2.6641" k3="-1.2836"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-0.6724" k2="0.0578" k3="0.0247"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-0.6724" k2="0.0578" k3="0.0247"/>
-+            <vignetting model="pa" focal="10" aperture="4.5" distance="10" k1="-0.7341" k2="0.4150" k3="-0.2096"/>
-+            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-0.7341" k2="0.4150" k3="-0.2096"/>
-+            <vignetting model="pa" focal="10" aperture="5" distance="10" k1="-0.7227" k2="0.3498" k3="-0.1326"/>
-+            <vignetting model="pa" focal="10" aperture="5" distance="1000" k1="-0.7227" k2="0.3498" k3="-0.1326"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.6733" k2="0.1679" k3="0.0273"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.6733" k2="0.1679" k3="0.0273"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.6667" k2="0.1500" k3="0.0393"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.6667" k2="0.1500" k3="0.0393"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.6700" k2="0.1558" k3="0.0355"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.6700" k2="0.1558" k3="0.0355"/>
-+            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-1.5029" k2="1.4843" k3="-0.6316"/>
-+            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-1.5029" k2="1.4843" k3="-0.6316"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.5529" k2="-0.2051" k3="0.2309"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.5529" k2="-0.2051" k3="0.2309"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.6266" k2="0.1899" k3="-0.0258"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.6266" k2="0.1899" k3="-0.0258"/>
-+            <vignetting model="pa" focal="12" aperture="5" distance="10" k1="-0.6158" k2="0.1397" k3="0.0256"/>
-+            <vignetting model="pa" focal="12" aperture="5" distance="1000" k1="-0.6158" k2="0.1397" k3="0.0256"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-0.6036" k2="0.1061" k3="0.0486"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.6036" k2="0.1061" k3="0.0486"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="10" k1="-0.5986" k2="0.0915" k3="0.0581"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.5986" k2="0.0915" k3="0.0581"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.6061" k2="0.1065" k3="0.0492"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.6061" k2="0.1065" k3="0.0492"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-1.4963" k2="1.4861" k3="-0.6302"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-1.4963" k2="1.4861" k3="-0.6302"/>
-+            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.5026" k2="-0.1586" k3="0.1768"/>
-+            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.5026" k2="-0.1586" k3="0.1768"/>
-+            <vignetting model="pa" focal="14" aperture="5" distance="10" k1="-0.5464" k2="0.0704" k3="0.0331"/>
-+            <vignetting model="pa" focal="14" aperture="5" distance="1000" k1="-0.5464" k2="0.0704" k3="0.0331"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.5608" k2="0.1081" k3="0.0277"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.5608" k2="0.1081" k3="0.0277"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="10" k1="-0.5529" k2="0.0810" k3="0.0501"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.5529" k2="0.0810" k3="0.0501"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="10" k1="-0.5483" k2="0.0701" k3="0.0559"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.5483" k2="0.0701" k3="0.0559"/>
-+            <vignetting model="pa" focal="14" aperture="25" distance="10" k1="-0.5491" k2="0.0666" k3="0.0595"/>
-+            <vignetting model="pa" focal="14" aperture="25" distance="1000" k1="-0.5491" k2="0.0666" k3="0.0595"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-1.4883" k2="1.5043" k3="-0.6467"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-1.4883" k2="1.5043" k3="-0.6467"/>
-+            <vignetting model="pa" focal="17" aperture="4.5" distance="10" k1="-0.5478" k2="-0.2553" k3="0.2914"/>
-+            <vignetting model="pa" focal="17" aperture="4.5" distance="1000" k1="-0.5478" k2="-0.2553" k3="0.2914"/>
-+            <vignetting model="pa" focal="17" aperture="5" distance="10" k1="-0.4485" k2="-0.2813" k3="0.2632"/>
-+            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-0.4485" k2="-0.2813" k3="0.2632"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.4494" k2="-0.0688" k3="0.0944"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.4494" k2="-0.0688" k3="0.0944"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.4867" k2="0.0475" k3="0.0552"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.4867" k2="0.0475" k3="0.0552"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="10" k1="-0.4884" k2="0.0500" k3="0.0528"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-0.4884" k2="0.0500" k3="0.0528"/>
-+            <vignetting model="pa" focal="17" aperture="29" distance="10" k1="-0.4786" k2="0.0251" k3="0.0686"/>
-+            <vignetting model="pa" focal="17" aperture="29" distance="1000" k1="-0.4786" k2="0.0251" k3="0.0686"/>
-+            <vignetting model="pa" focal="22" aperture="4.5" distance="10" k1="-1.3450" k2="1.3739" k3="-0.6390"/>
-+            <vignetting model="pa" focal="22" aperture="4.5" distance="1000" k1="-1.3450" k2="1.3739" k3="-0.6390"/>
-+            <vignetting model="pa" focal="22" aperture="5" distance="10" k1="-0.7966" k2="0.2347" k3="0.0309"/>
-+            <vignetting model="pa" focal="22" aperture="5" distance="1000" k1="-0.7966" k2="0.2347" k3="0.0309"/>
-+            <vignetting model="pa" focal="22" aperture="5.6" distance="10" k1="-0.4158" k2="-0.3483" k3="0.3184"/>
-+            <vignetting model="pa" focal="22" aperture="5.6" distance="1000" k1="-0.4158" k2="-0.3483" k3="0.3184"/>
-+            <vignetting model="pa" focal="22" aperture="6.3" distance="10" k1="-0.3037" k2="-0.3564" k3="0.2530"/>
-+            <vignetting model="pa" focal="22" aperture="6.3" distance="1000" k1="-0.3037" k2="-0.3564" k3="0.2530"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="10" k1="-0.4070" k2="0.0794" k3="-0.0246"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="1000" k1="-0.4070" k2="0.0794" k3="-0.0246"/>
-+            <vignetting model="pa" focal="22" aperture="11" distance="10" k1="-0.4008" k2="0.0250" k3="0.0482"/>
-+            <vignetting model="pa" focal="22" aperture="11" distance="1000" k1="-0.4008" k2="0.0250" k3="0.0482"/>
-+            <vignetting model="pa" focal="22" aperture="29" distance="10" k1="-0.3994" k2="0.0175" k3="0.0532"/>
-+            <vignetting model="pa" focal="22" aperture="29" distance="1000" k1="-0.3994" k2="0.0175" k3="0.0532"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 15mm f/2.8 Fisheye</model>
-+        <model lang="de">Canon EF 15mm f/2.8 Fischauge</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-         <type>fisheye</type>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 16-35mm f/2.8L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16" a="0.023824" b="-0.058145" c="0" />
--            <distortion model="ptlens" focal="17" a="0.022268" b="-0.051156" c="0" />
--            <distortion model="ptlens" focal="20" a="0.020609" b="-0.044077" c="0" />
--            <distortion model="ptlens" focal="22" a="0.01767" b="-0.036082" c="0" />
--            <distortion model="ptlens" focal="24" a="0.016895" b="-0.032578" c="0" />
--            <distortion model="ptlens" focal="26" a="0.012716" b="-0.021973" c="0" />
--            <distortion model="ptlens" focal="30" a="0.010184" b="-0.016286" c="0" />
--            <distortion model="ptlens" focal="33" a="0.00765" b="-0.00996" c="0" />
--            <distortion model="ptlens" focal="35" a="0.007164" b="-0.010358" c="0" />
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="16" a="0.01687424" b="-0.03208409" c="-0.028794159"/>
-+            <distortion model="ptlens" focal="17" a="0.018424526" b="-0.03643579" c="-0.020559887"/>
-+            <distortion model="ptlens" focal="18" a="0.017495247" b="-0.034459507" c="-0.015300327"/>
-+            <distortion model="ptlens" focal="20" a="0.016731535" b="-0.032388456" c="-0.009986979"/>
-+            <distortion model="ptlens" focal="22" a="0.014761182" b="-0.027130847" c="0.005742111"/>
-+            <distortion model="ptlens" focal="24" a="0.014413616" b="-0.026361848" c="-0.00090247203"/>
-+            <distortion model="ptlens" focal="26" a="0.012561258" b="-0.021763202" c="-0.00027483905"/>
-+            <distortion model="ptlens" focal="28" a="0.010246756" b="-0.016053859" c="-0.000953533"/>
-+            <distortion model="ptlens" focal="30" a="0.010323046" b="-0.017679968" c="0.0047651725"/>
-+            <distortion model="ptlens" focal="35" a="0.0070163863" b="-0.010468312" c="0.0030782963"/>
-+            <tca model="poly3" focal="16" br="-0.0002000" vr="1.0013882" bb="0.0001579" vb="0.9998360"/>
-+            <tca model="poly3" focal="20" br="0.0000670" vr="1.0007432" bb="-0.0000362" vb="1.0002576"/>
-+            <tca model="poly3" focal="24" br="0.0001425" vr="1.0003809" bb="-0.0001086" vb="1.0004253"/>
-+            <tca model="poly3" focal="28" br="0.0001483" vr="1.0002688" bb="-0.0001237" vb="1.0003935"/>
-+            <tca model="poly3" focal="35" br="0.0001437" vr="1.0002374" bb="-0.0001347" vb="1.0002667"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="0.28" k1="-0.1292" k2="-1.7458" k3="1.0127"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="0.56" k1="-0.3436" k2="-0.9369" k3="0.4790"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1.68" k1="-0.3534" k2="-0.8520" k3="0.3689"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.3176" k2="-0.9708" k3="0.4369"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="0.28" k1="-0.8654" k2="0.4684" k3="-0.3700"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="0.56" k1="-0.8566" k2="0.3689" k3="-0.2046"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1.68" k1="-0.8790" k2="0.4658" k3="-0.3126"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.8848" k2="0.5114" k3="-0.3702"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="0.28" k1="-0.9730" k2="0.7548" k3="-0.4335"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="0.56" k1="-0.9157" k2="0.5247" k3="-0.2164"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1.68" k1="-0.9279" k2="0.5681" k3="-0.2523"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.9511" k2="0.6666" k3="-0.3407"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="0.28" k1="-0.8842" k2="0.3434" k3="-0.0258"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="0.56" k1="-0.8894" k2="0.3630" k3="-0.0351"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1.68" k1="-0.8906" k2="0.3655" k3="-0.0351"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.8900" k2="0.3655" k3="-0.0344"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="0.28" k1="-0.9288" k2="0.4132" k3="-0.0576"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="0.56" k1="-0.9296" k2="0.4173" k3="-0.0549"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1.68" k1="-0.9323" k2="0.4248" k3="-0.0588"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.9324" k2="0.4267" k3="-0.0603"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.28" k1="-0.3791" k2="-0.7797" k3="0.5297"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.56" k1="-0.3525" k2="-0.9052" k3="0.6601"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1.68" k1="-0.3508" k2="-0.9154" k3="0.6709"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.3499" k2="-0.9140" k3="0.6689"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.28" k1="-0.6376" k2="0.0188" k3="0.0733"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.56" k1="-0.6399" k2="0.0282" k3="0.0655"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1.68" k1="-0.6399" k2="0.0206" k3="0.0727"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.6449" k2="0.0489" k3="0.0511"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.28" k1="-0.7012" k2="0.1935" k3="0.0090"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.56" k1="-0.7015" k2="0.1943" k3="0.0103"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1.68" k1="-0.7001" k2="0.1910" k3="0.0131"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.7006" k2="0.1939" k3="0.0106"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.28" k1="-0.6990" k2="0.1480" k3="0.0581"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.56" k1="-0.6991" k2="0.1469" k3="0.0613"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1.68" k1="-0.6981" k2="0.1435" k3="0.0646"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.6986" k2="0.1468" k3="0.0621"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="0.28" k1="-0.7468" k2="0.2238" k3="0.0209"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="0.56" k1="-0.7441" k2="0.2153" k3="0.0285"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1.68" k1="-0.7444" k2="0.2159" k3="0.0286"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.7432" k2="0.2175" k3="0.0255"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="0.28" k1="-0.4345" k2="-0.7570" k3="0.6022"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="0.56" k1="-0.4377" k2="-0.7511" k3="0.5998"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1.68" k1="-0.4386" k2="-0.7498" k3="0.5992"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.4346" k2="-0.7567" k3="0.6031"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.28" k1="-0.5404" k2="0.1701" k3="-0.0800"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.56" k1="-0.5376" k2="0.1591" k3="-0.0699"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1.68" k1="-0.5428" k2="0.1782" k3="-0.0837"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.5325" k2="0.1424" k3="-0.0599"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.28" k1="-0.5284" k2="0.0572" k3="0.0608"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.56" k1="-0.5247" k2="0.0412" k3="0.0752"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1.68" k1="-0.5228" k2="0.0354" k3="0.0796"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.5250" k2="0.0407" k3="0.0770"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.28" k1="-0.5351" k2="0.0514" k3="0.0711"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.56" k1="-0.5348" k2="0.0450" k3="0.0784"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1.68" k1="-0.5323" k2="0.0421" k3="0.0787"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.5343" k2="0.0484" k3="0.0745"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.28" k1="-0.5718" k2="0.0952" k3="0.0540"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.56" k1="-0.5757" k2="0.1141" k3="0.0369"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1.68" k1="-0.5779" k2="0.1231" k3="0.0292"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.5727" k2="0.1034" k3="0.0463"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="0.28" k1="-0.6666" k2="-0.2014" k3="0.2642"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="0.56" k1="-0.6687" k2="-0.1978" k3="0.2625"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1.68" k1="-0.6681" k2="-0.1996" k3="0.2636"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.6654" k2="-0.2059" k3="0.2680"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.28" k1="-0.4754" k2="0.3098" k3="-0.2604"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.56" k1="-0.4697" k2="0.2905" k3="-0.2479"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1.68" k1="-0.4709" k2="0.2964" k3="-0.2535"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.4774" k2="0.3140" k3="-0.2608"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.28" k1="-0.4266" k2="0.0327" k3="0.0460"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.56" k1="-0.4248" k2="0.0201" k3="0.0597"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1.68" k1="-0.4272" k2="0.0343" k3="0.0447"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.4279" k2="0.0373" k3="0.0422"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.28" k1="-0.4222" k2="-0.0137" k3="0.0921"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.56" k1="-0.4236" k2="-0.0119" k3="0.0923"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1.68" k1="-0.4238" k2="-0.0107" k3="0.0912"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.4213" k2="-0.0160" k3="0.0938"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.28" k1="-0.4633" k2="0.0563" k3="0.0516"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.56" k1="-0.4638" k2="0.0600" k3="0.0485"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1.68" k1="-0.4633" k2="0.0592" k3="0.0488"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.4656" k2="0.0652" k3="0.0445"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.28" k1="-1.1205" k2="0.9931" k3="-0.5234"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.56" k1="-1.1195" k2="0.9910" k3="-0.5224"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1.68" k1="-1.1189" k2="0.9895" k3="-0.5216"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-1.1172" k2="0.9857" k3="-0.5192"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.28" k1="-0.3650" k2="0.3230" k3="-0.3872"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.56" k1="-0.3612" k2="0.3102" k3="-0.3773"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1.68" k1="-0.3641" k2="0.3151" k3="-0.3732"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3640" k2="0.3183" k3="-0.3835"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.28" k1="-0.3418" k2="0.0932" k3="-0.0333"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.56" k1="-0.3407" k2="0.0877" k3="-0.0281"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1.68" k1="-0.3421" k2="0.0945" k3="-0.0351"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3391" k2="0.0827" k3="-0.0251"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.28" k1="-0.3144" k2="-0.0344" k3="0.0846"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.56" k1="-0.3147" k2="-0.0346" k3="0.0857"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1.68" k1="-0.3136" k2="-0.0376" k3="0.0871"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3146" k2="-0.0350" k3="0.0851"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.28" k1="-0.3450" k2="0.0074" k3="0.0643"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.56" k1="-0.3485" k2="0.0189" k3="0.0557"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1.68" k1="-0.3444" k2="0.0068" k3="0.0643"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3444" k2="0.0067" k3="0.0643"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 17-35mm f/2.8L USM</model>
-+        <model>Canon EF 16-35mm f/2.8L II USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.020618" b="-0.051946" c="0" />
--            <distortion model="ptlens" focal="18" a="0.022989" b="-0.054039" c="0" />
--            <distortion model="ptlens" focal="20" a="0.021786" b="-0.050249" c="0" />
--            <distortion model="ptlens" focal="22" a="0.01785" b="-0.039447" c="0" />
--            <distortion model="ptlens" focal="24" a="0.015392" b="-0.032541" c="0" />
--            <distortion model="ptlens" focal="27" a="0.012041" b="-0.022894" c="0" />
--            <distortion model="ptlens" focal="30" a="0.008656" b="-0.01427" c="0" />
--            <distortion model="ptlens" focal="35" a="0.006328" b="-0.008464" c="0" />
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="16" a="0.0065" b="-0.01669" c="-0.01549"/>
-+            <distortion model="ptlens" focal="19" a="0.01125" b="-0.02255" c="-0.00278"/>
-+            <distortion model="ptlens" focal="23" a="0.01448" b="-0.02598" c="0.00708"/>
-+            <distortion model="ptlens" focal="29" a="0.0151" b="-0.03003" c="0.0198"/>
-+            <distortion model="ptlens" focal="35" a="0.00983" b="-0.01708" c="0.01203"/>
-+            <tca model="poly3" focal="16" br="0.0000346" vr="1.0003744" bb="0.0000537" vb="0.9998434"/>
-+            <tca model="poly3" focal="19" br="0.0001428" vr="1.0000967" bb="-0.0000753" vb="1.0000994"/>
-+            <tca model="poly3" focal="23" br="0.0001177" vr="0.9999705" bb="-0.0001226" vb="1.0002366"/>
-+            <tca model="poly3" focal="29" br="0.0000772" vr="0.9999754" bb="-0.0001150" vb="1.0002127"/>
-+            <tca model="poly3" focal="35" br="0.0001107" vr="0.9999553" bb="-0.0001430" vb="1.0001705"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2764" k2="-1.2603" k3="0.7727"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2764" k2="-1.2603" k3="0.7727"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.6197" k2="0.1018" k3="-0.1071"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.6197" k2="0.1018" k3="-0.1071"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.6727" k2="0.1945" k3="-0.0389"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.6727" k2="0.1945" k3="-0.0389"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.6444" k2="0.0485" k3="0.1125"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.6444" k2="0.0485" k3="0.1125"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.6606" k2="0.0672" k3="0.1053"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.6606" k2="0.0672" k3="0.1053"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-0.4367" k2="-0.8197" k3="0.6391"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.4367" k2="-0.8197" k3="0.6391"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.4943" k2="-0.1060" k3="0.1060"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4943" k2="-0.1060" k3="0.1060"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.5401" k2="-0.0066" k3="0.1095"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5401" k2="-0.0066" k3="0.1095"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.5397" k2="-0.0258" k3="0.1319"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.5397" k2="-0.0258" k3="0.1319"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.5614" k2="0.0013" k3="0.1196"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.5614" k2="0.0013" k3="0.1196"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.6908" k2="-0.2754" k3="0.3669"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.6908" k2="-0.2754" k3="0.3669"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.4357" k2="0.0472" k3="0.0062"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.4357" k2="0.0472" k3="0.0062"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4179" k2="-0.0698" k3="0.1298"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4179" k2="-0.0698" k3="0.1298"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.4258" k2="-0.0556" k3="0.1208"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.4258" k2="-0.0556" k3="0.1208"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.4462" k2="-0.0326" k3="0.1112"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.4462" k2="-0.0326" k3="0.1112"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.9870" k2="0.4548" k3="-0.0802"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.9870" k2="0.4548" k3="-0.0802"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3918" k2="0.2125" k3="-0.2043"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3918" k2="0.2125" k3="-0.2043"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3420" k2="-0.0621" k3="0.1087"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3420" k2="-0.0621" k3="0.1087"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3474" k2="-0.0530" k3="0.1027"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3474" k2="-0.0530" k3="0.1027"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3660" k2="-0.0343" k3="0.0938"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3660" k2="-0.0343" k3="0.0938"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-1.3188" k2="1.3339" k3="-0.6657"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-1.3188" k2="1.3339" k3="-0.6657"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2677" k2="0.0320" k3="-0.1582"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2677" k2="0.0320" k3="-0.1582"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2796" k2="-0.0234" k3="0.0700"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2796" k2="-0.0234" k3="0.0700"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2781" k2="-0.0341" k3="0.0800"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2781" k2="-0.0341" k3="0.0800"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2940" k2="-0.0107" k3="0.0656"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2940" k2="-0.0107" k3="0.0656"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 17-40mm f/4L USM</model>
-+        <model>Canon EF 17-35mm f/2.8L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.020104" b="-0.047886" c="0" />
--            <distortion model="ptlens" focal="19" a="0.016917" b="-0.039854" c="0" />
--            <distortion model="ptlens" focal="20" a="0.015352" b="-0.035125" c="0" />
--            <distortion model="ptlens" focal="22" a="0.01352" b="-0.027379" c="0" />
--            <distortion model="ptlens" focal="24" a="0.012744" b="-0.024334" c="0" />
--            <distortion model="ptlens" focal="26" a="0.012023" b="-0.02158" c="0" />
--            <distortion model="ptlens" focal="28" a="0.008491" b="-0.013858" c="0" />
--            <distortion model="ptlens" focal="32" a="0.007181" b="-0.008983" c="0" />
--            <distortion model="ptlens" focal="35" a="0.006829" b="-0.007622" c="0" />
--            <distortion model="ptlens" focal="37" a="0.006676" b="-0.007544" c="0" />
--            <distortion model="ptlens" focal="40" a="0.00464" b="-0.003826" c="0" />
-+            <distortion model="ptlens" focal="17" a="0.020618" b="-0.051946" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0.022989" b="-0.054039" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.021786" b="-0.050249" c="0"/>
-+            <distortion model="ptlens" focal="22" a="0.01785" b="-0.039447" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.015392" b="-0.032541" c="0"/>
-+            <distortion model="ptlens" focal="27" a="0.012041" b="-0.022894" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.008656" b="-0.01427" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.006328" b="-0.008464" c="0"/>
-         </calibration>
-     </lens>
--    
--     <!-- Lens is in database twice. 
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF-S 17-55mm f/2.8 IS USM</model>
--        <mount>Canon EF-S</mount>
--        <cropfactor>1.6</cropfactor>
-+        <model>Canon EF 17-40mm f/4L USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="17" k1="-0.01500" />
--            <distortion model="poly3" focal="20" k1="-0.00100" />
--            <distortion model="poly3" focal="24" k1="+0.00000" />
--            <distortion model="poly3" focal="28" k1="+0.01000" />
--            <distortion model="poly3" focal="35" k1="+0.02000" />
--            <distortion model="poly3" focal="55" k1="+0.02000" />
-+            <distortion model="ptlens" focal="17" a="0.020104" b="-0.047886" c="0"/>
-+            <distortion model="ptlens" focal="19" a="0.016917" b="-0.039854" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.015352" b="-0.035125" c="0"/>
-+            <distortion model="ptlens" focal="22" a="0.01352" b="-0.027379" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.012744" b="-0.024334" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0.012023" b="-0.02158" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.008491" b="-0.013858" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0.007181" b="-0.008983" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.006829" b="-0.007622" c="0"/>
-+            <distortion model="ptlens" focal="37" a="0.006676" b="-0.007544" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0.00464" b="-0.003826" c="0"/>
-         </calibration>
-     </lens>
--    -->
--   
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 17-55mm f/2.8 IS USM</model>
-         <mount>Canon EF-S</mount>
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.0160544" b="-0.0422842" c="0.00805163" />
--            <distortion model="ptlens" focal="20" a="0.0145107" b="-0.0318653" c="0.012966" />
--            <distortion model="ptlens" focal="23" a="0.0132784" b="-0.0244953" c="0.0194828" />
--            <distortion model="ptlens" focal="28" a="0.00120309" b="0.00979416" c="-0.00868762" />
--            <distortion model="ptlens" focal="35" a="-0.000341579" b="0.0108822" c="-0.00545481" />
--            <distortion model="ptlens" focal="55" a="0.00182321" b="0.00378863" c="0.00103256" />
-+            <!-- Taken with cropfactor 1.622 (Canon 50D or 450D) -->
-+            <distortion model="ptlens" focal="17" a="0.0160544" b="-0.0422842" c="0.00805163"/>
-+            <distortion model="ptlens" focal="20" a="0.0145107" b="-0.0318653" c="0.012966"/>
-+            <distortion model="ptlens" focal="23" a="0.0132784" b="-0.0244953" c="0.0194828"/>
-+            <distortion model="ptlens" focal="28" a="0.00120309" b="0.00979416" c="-0.00868762"/>
-+            <distortion model="ptlens" focal="35" a="-0.000341579" b="0.0108822" c="-0.00545481"/>
-+            <distortion model="ptlens" focal="55" a="0.00182321" b="0.00378863" c="0.00103256"/>
-+            <tca model="poly3" focal="17" br="0.00000027" vr="1.0003199333" bb="-0.00005237" vb="1.0000628667"/>
-+            <tca model="poly3" focal="20" br="0.00005255" vr="1.00019555" bb="-0.00009695" vb="1.0001321"/>
-+            <tca model="poly3" focal="23" br="0.0000401" vr="1.0001227" bb="-0.0001004" vb="1.0001355333"/>
-+            <tca model="poly3" focal="28" br="0.00000895" vr="1.00008565" bb="-0.00009525" vb="1.000148"/>
-+            <tca model="poly3" focal="35" br="0.00003525" vr="0.9999511" bb="-0.00006825" vb="1.00010915"/>
-+            <tca model="poly3" focal="55" br="0.0000244" vr="0.9998108667" bb="-0.00006493" vb="1.0000237667"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.3742" k2="-0.5552" k3="0.2884"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.3742" k2="-0.5552" k3="0.2884"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3977" k2="0.2072" k3="-0.2849"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3977" k2="0.2072" k3="-0.2849"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.4182" k2="0.1620" k3="-0.1155"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.4182" k2="0.1620" k3="-0.1155"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.3967" k2="0.0370" k3="0.0107"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.3967" k2="0.0370" k3="0.0107"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.4056" k2="0.0409" k3="0.0119"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.4056" k2="0.0409" k3="0.0119"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-0.3195" k2="-0.6248" k3="0.3915"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.3195" k2="-0.6248" k3="0.3915"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.3313" k2="0.0514" k3="-0.1318"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.3313" k2="0.0514" k3="-0.1318"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.3761" k2="0.1084" k3="-0.0659"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.3761" k2="0.1084" k3="-0.0659"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.3652" k2="0.0261" k3="0.0185"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.3652" k2="0.0261" k3="0.0185"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.3667" k2="0.0249" k3="0.0183"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.3667" k2="0.0249" k3="0.0183"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.4385" k2="-0.1039" k3="0.0505"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.4385" k2="-0.1039" k3="0.0505"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3052" k2="0.1496" k3="-0.1592"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3052" k2="0.1496" k3="-0.1592"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2791" k2="-0.0097" k3="0.0249"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2791" k2="-0.0097" k3="0.0249"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2892" k2="-0.0006" k3="0.0229"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2892" k2="-0.0006" k3="0.0229"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2991" k2="0.0147" k3="0.0138"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2991" k2="0.0147" k3="0.0138"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.5586" k2="0.1981" k3="-0.0943"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.5586" k2="0.1981" k3="-0.0943"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2426" k2="0.0667" k3="-0.1102"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2426" k2="0.0667" k3="-0.1102"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2415" k2="-0.0123" k3="0.0217"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2415" k2="-0.0123" k3="0.0217"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2532" k2="0.0066" k3="0.0101"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2532" k2="0.0066" k3="0.0101"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2649" k2="0.0278" k3="-0.0035"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2649" k2="0.0278" k3="-0.0035"/>
-+            <vignetting model="pa" focal="55" aperture="2.8" distance="10" k1="-0.8403" k2="1.0171" k3="-0.7026"/>
-+            <vignetting model="pa" focal="55" aperture="2.8" distance="1000" k1="-0.8403" k2="1.0171" k3="-0.7026"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.1922" k2="0.0884" k3="-0.1961"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.1922" k2="0.0884" k3="-0.1961"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1910" k2="-0.0130" k3="0.0150"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1910" k2="-0.0130" k3="0.0150"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1985" k2="-0.0044" k3="0.0129"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1985" k2="-0.0044" k3="0.0129"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.2180" k2="0.0341" k3="-0.0121"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.2180" k2="0.0341" k3="-0.0121"/>
-         </calibration>
-     </lens>
--   
--       
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 17-85mm f/4-5.6 IS USM</model>
-         <mount>Canon EF-S</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.021181" b="-0.055581" c="0" />
--            <distortion model="ptlens" focal="20" a="0.019344" b="-0.043786" c="0" />
--            <distortion model="ptlens" focal="22" a="0.015491" b="-0.026682" c="0" />
--            <distortion model="ptlens" focal="28" a="0.008084" b="-0.007472" c="0" />
--            <distortion model="ptlens" focal="30" a="0.005522" b="-0.001763" c="0" />
--            <distortion model="ptlens" focal="35" a="0.003149" b="0.002207" c="0" />
--            <distortion model="ptlens" focal="44" a="0" b="0.008269" c="0" />
--            <distortion model="ptlens" focal="53" a="0" b="0.008792" c="0" />
--            <distortion model="ptlens" focal="61" a="0" b="0.00738" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.006226" c="0" />
--            <distortion model="ptlens" focal="78" a="0" b="0.007095" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.007288" c="0" />
-+            <distortion model="ptlens" focal="17" a="0.021181" b="-0.055581" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.019344" b="-0.043786" c="0"/>
-+            <distortion model="ptlens" focal="22" a="0.015491" b="-0.026682" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.008084" b="-0.007472" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.005522" b="-0.001763" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.003149" b="0.002207" c="0"/>
-+            <distortion model="ptlens" focal="44" a="0" b="0.008269" c="0"/>
-+            <distortion model="ptlens" focal="53" a="0" b="0.008792" c="0"/>
-+            <distortion model="ptlens" focal="61" a="0" b="0.00738" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0.006226" c="0"/>
-+            <distortion model="ptlens" focal="78" a="0" b="0.007095" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0" b="0.007288" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 18-55mm f/3.5-5.6</model>
-         <mount>Canon EF-S</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0" b="0.003658" c="-0.04063" />
--            <distortion model="ptlens" focal="21" a="0" b="0.004255" c="-0.038513" />
--            <distortion model="ptlens" focal="24" a="0" b="-0.000965" c="-0.019793" />
--            <distortion model="ptlens" focal="27" a="0" b="0.001701" c="-0.014516" />
--            <distortion model="ptlens" focal="30" a="0" b="0.003199" c="-0.012047" />
--            <distortion model="ptlens" focal="33" a="0" b="3.4e-05" c="-0.005236" />
--            <distortion model="ptlens" focal="37" a="0" b="0.00556" c="-0.016032" />
--            <distortion model="ptlens" focal="41" a="0" b="0.001585" c="-0.007594" />
--            <distortion model="ptlens" focal="45" a="0" b="0.00577" c="-0.015688" />
--            <distortion model="ptlens" focal="48" a="0" b="0.001543" c="-0.003821" />
--            <distortion model="ptlens" focal="53" a="0" b="-0.001301" c="0.001515" />
--            <distortion model="ptlens" focal="55" a="0" b="0.000426" c="-0.001817" />
-+            <distortion model="ptlens" focal="18" a="0" b="0.003658" c="-0.04063"/>
-+            <distortion model="ptlens" focal="21" a="0" b="0.004255" c="-0.038513"/>
-+            <distortion model="ptlens" focal="24" a="0" b="-0.000965" c="-0.019793"/>
-+            <distortion model="ptlens" focal="27" a="0" b="0.001701" c="-0.014516"/>
-+            <distortion model="ptlens" focal="30" a="0" b="0.003199" c="-0.012047"/>
-+            <distortion model="ptlens" focal="33" a="0" b="3.4e-05" c="-0.005236"/>
-+            <distortion model="ptlens" focal="37" a="0" b="0.00556" c="-0.016032"/>
-+            <distortion model="ptlens" focal="41" a="0" b="0.001585" c="-0.007594"/>
-+            <distortion model="ptlens" focal="45" a="0" b="0.00577" c="-0.015688"/>
-+            <distortion model="ptlens" focal="48" a="0" b="0.001543" c="-0.003821"/>
-+            <distortion model="ptlens" focal="53" a="0" b="-0.001301" c="0.001515"/>
-+            <distortion model="ptlens" focal="55" a="0" b="0.000426" c="-0.001817"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 18-55mm f/3.5-5.6 IS II</model>
-         <mount>Canon EF-S</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.02504" b="-0.06883" c="0.01502" />
--            <distortion model="ptlens" focal="24" a="0.0203" b="-0.06514" c="0.04768" />
--            <distortion model="ptlens" focal="29" a="0.00854" b="-0.01505" c="-0.00639" />
--            <distortion model="ptlens" focal="35" a="-0.01582" b="0.04918" c="-0.05313" />
--            <distortion model="ptlens" focal="41" a="-0.00694" b="0.02694" c="-0.03595" />
--            <distortion model="ptlens" focal="46" a="-0.01908" b="0.07131" c="-0.08927" />
--            <distortion model="ptlens" focal="55" a="-0.00098" b="0.01803" c="-0.04704" />
-+            <distortion model="ptlens" focal="18" a="0.02504" b="-0.06883" c="0.01502"/>
-+            <distortion model="ptlens" focal="24" a="0.0203" b="-0.06514" c="0.04768"/>
-+            <distortion model="ptlens" focal="29" a="0.00854" b="-0.01505" c="-0.00639"/>
-+            <distortion model="ptlens" focal="35" a="-0.01582" b="0.04918" c="-0.05313"/>
-+            <distortion model="ptlens" focal="41" a="-0.00694" b="0.02694" c="-0.03595"/>
-+            <distortion model="ptlens" focal="46" a="-0.01908" b="0.07131" c="-0.08927"/>
-+            <distortion model="ptlens" focal="55" a="-0.00098" b="0.01803" c="-0.04704"/>
-             <tca model="poly3" focal="18" br="-0.0000920" vr="1.0002970" bb="0.0000982" vb="0.9999149"/>
-             <tca model="poly3" focal="24" br="0.0000221" vr="1.0001910" bb="0.0000350" vb="0.9999440"/>
-             <tca model="poly3" focal="35" br="-0.0000353" vr="1.0002159" bb="0.0000109" vb="1.0000923"/>
--            <tca model="poly3" focal="55" br="-0.0000040" vr="0.9999122" bb="0.0000987" vb="1.0002719"/>            
-+            <tca model="poly3" focal="55" br="-0.0000040" vr="0.9999122" bb="0.0000987" vb="1.0002719"/>
-+            <!-- Taken with Canon 60D -->
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.0561" k2="1.0344" k3="-0.5153"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.0561" k2="1.0344" k3="-0.5153"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.2220" k2="-0.1411" k3="0.0360"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.2220" k2="-0.1411" k3="0.0360"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.2592" k2="-0.0288" k3="0.0454"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.2592" k2="-0.0288" k3="0.0454"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.2481" k2="-0.0590" k3="0.0718"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.2481" k2="-0.0590" k3="0.0718"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2556" k2="-0.0362" k3="0.0561"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2556" k2="-0.0362" k3="0.0561"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.0024" k2="0.9594" k3="-0.4295"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.0024" k2="0.9594" k3="-0.4295"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2052" k2="-0.0627" k3="0.0138"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2052" k2="-0.0627" k3="0.0138"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2174" k2="-0.0355" k3="0.0507"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2174" k2="-0.0355" k3="0.0507"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2221" k2="-0.0135" k3="0.0328"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2221" k2="-0.0135" k3="0.0328"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2271" k2="-0.0013" k3="0.0264"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2271" k2="-0.0013" k3="0.0264"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.8979" k2="0.8590" k3="-0.3739"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8979" k2="0.8590" k3="-0.3739"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.1705" k2="0.0095" k3="0.0034"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1705" k2="0.0095" k3="0.0034"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.1596" k2="-0.0276" k3="0.0402"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.1596" k2="-0.0276" k3="0.0402"/>
-+            <vignetting model="pa" focal="35" aperture="13" distance="10" k1="-0.1628" k2="-0.0122" k3="0.0266"/>
-+            <vignetting model="pa" focal="35" aperture="13" distance="1000" k1="-0.1628" k2="-0.0122" k3="0.0266"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.1697" k2="-0.0014" k3="0.0232"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1697" k2="-0.0014" k3="0.0232"/>
-+            <vignetting model="pa" focal="44" aperture="5" distance="10" k1="-0.7801" k2="0.7126" k3="-0.3029"/>
-+            <vignetting model="pa" focal="44" aperture="5" distance="1000" k1="-0.7801" k2="0.7126" k3="-0.3029"/>
-+            <vignetting model="pa" focal="44" aperture="7.1" distance="10" k1="-0.1212" k2="-0.0367" k3="0.0421"/>
-+            <vignetting model="pa" focal="44" aperture="7.1" distance="1000" k1="-0.1212" k2="-0.0367" k3="0.0421"/>
-+            <vignetting model="pa" focal="44" aperture="10" distance="10" k1="-0.1182" k2="-0.0390" k3="0.0413"/>
-+            <vignetting model="pa" focal="44" aperture="10" distance="1000" k1="-0.1182" k2="-0.0390" k3="0.0413"/>
-+            <vignetting model="pa" focal="44" aperture="14" distance="10" k1="-0.1231" k2="-0.0185" k3="0.0234"/>
-+            <vignetting model="pa" focal="44" aperture="14" distance="1000" k1="-0.1231" k2="-0.0185" k3="0.0234"/>
-+            <vignetting model="pa" focal="44" aperture="32" distance="10" k1="-0.1287" k2="-0.0104" k3="0.0195"/>
-+            <vignetting model="pa" focal="44" aperture="32" distance="1000" k1="-0.1287" k2="-0.0104" k3="0.0195"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6591" k2="0.5689" k3="-0.2458"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6591" k2="0.5689" k3="-0.2458"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1094" k2="0.0203" k3="-0.0134"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1094" k2="0.0203" k3="-0.0134"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0920" k2="-0.0433" k3="0.0418"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0920" k2="-0.0433" k3="0.0418"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.0963" k2="-0.0311" k3="0.0313"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.0963" k2="-0.0311" k3="0.0313"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.1112" k2="-0.0014" k3="0.0113"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.1112" k2="-0.0014" k3="0.0113"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 18-55mm f/3.5-5.6 III</model>
-         <mount>Canon EF-S</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.00029" b="-0.00065" c="-0.04054" />
--            <distortion model="ptlens" focal="20" a="0.00913" b="-0.024255" c="-0.02326" />
--            <distortion model="ptlens" focal="21" a="0.0219" b="-0.05865" c="0.01747" />
--            <distortion model="ptlens" focal="24" a="0.02945" b="-0.07112" c="0.02358" />
--            <distortion model="ptlens" focal="27" a="-0.00225" b="0.00421" c="-0.02519" />
--            <distortion model="ptlens" focal="28" a="0.00888" b="-0.02851" c="0.00655" />
--            <distortion model="ptlens" focal="29" a="-0.00423" b="0.01103" c="-0.02517" />
--            <distortion model="ptlens" focal="30" a="-0.02064" b="0.0652" c="-0.07411" />
--            <distortion model="ptlens" focal="33" a="0.00378" b="-0.00627" c="-0.00869" />
--            <distortion model="ptlens" focal="34" a="0.00579" b="-0.01787" c="0.00697" />
--            <distortion model="ptlens" focal="36" a="0.00139" b="0.00016" c="-0.00891" />
--            <distortion model="ptlens" focal="37" a="-0.01074" b="0.01955" c="0.00324" />
--            <distortion model="ptlens" focal="40" a="-0.00209" b="-0.00426" c="-0.01103" />
--            <distortion model="ptlens" focal="41" a="-0.00308" b="0.01968" c="-0.03451" />
--            <distortion model="ptlens" focal="43" a="-0.00935" b="0.02372" c="-0.03174" />
--            <distortion model="ptlens" focal="44" a="0.00283" b="0.00211" c="-0.01406" />
--            <distortion model="ptlens" focal="47" a="-0.01247" b="0.03006" c="-0.01156" />
--            <distortion model="ptlens" focal="49" a="0.00841" b="-0.04436" c="0.06329" />
--            <distortion model="ptlens" focal="53" a="0.00359" b="-0.01264" c="0.01563" />
--            <distortion model="ptlens" focal="55" a="-0.0117" b="0.03217" c="-0.02069" />
-+            <distortion model="ptlens" focal="18" a="0.00029" b="-0.00065" c="-0.04054"/>
-+            <distortion model="ptlens" focal="20" a="0.00913" b="-0.024255" c="-0.02326"/>
-+            <distortion model="ptlens" focal="21" a="0.0219" b="-0.05865" c="0.01747"/>
-+            <distortion model="ptlens" focal="24" a="0.02945" b="-0.07112" c="0.02358"/>
-+            <distortion model="ptlens" focal="27" a="-0.00225" b="0.00421" c="-0.02519"/>
-+            <distortion model="ptlens" focal="28" a="0.00888" b="-0.02851" c="0.00655"/>
-+            <distortion model="ptlens" focal="29" a="-0.00423" b="0.01103" c="-0.02517"/>
-+            <distortion model="ptlens" focal="30" a="-0.02064" b="0.0652" c="-0.07411"/>
-+            <distortion model="ptlens" focal="33" a="0.00378" b="-0.00627" c="-0.00869"/>
-+            <distortion model="ptlens" focal="34" a="0.00579" b="-0.01787" c="0.00697"/>
-+            <distortion model="ptlens" focal="36" a="0.00139" b="0.00016" c="-0.00891"/>
-+            <distortion model="ptlens" focal="37" a="-0.01074" b="0.01955" c="0.00324"/>
-+            <distortion model="ptlens" focal="40" a="-0.00209" b="-0.00426" c="-0.01103"/>
-+            <distortion model="ptlens" focal="41" a="-0.00308" b="0.01968" c="-0.03451"/>
-+            <distortion model="ptlens" focal="43" a="-0.00935" b="0.02372" c="-0.03174"/>
-+            <distortion model="ptlens" focal="44" a="0.00283" b="0.00211" c="-0.01406"/>
-+            <distortion model="ptlens" focal="47" a="-0.01247" b="0.03006" c="-0.01156"/>
-+            <distortion model="ptlens" focal="49" a="0.00841" b="-0.04436" c="0.06329"/>
-+            <distortion model="ptlens" focal="53" a="0.00359" b="-0.01264" c="0.01563"/>
-+            <distortion model="ptlens" focal="55" a="-0.0117" b="0.03217" c="-0.02069"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 18-55mm f/3.5-5.6 IS STM</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 650D -->
-+            <distortion model="ptlens" focal="18" a="0.01786" b="-0.05378" c="0.01216"/>
-+            <distortion model="ptlens" focal="24" a="0.0064" b="-0.02273" c="0.00328"/>
-+            <distortion model="ptlens" focal="35" a="0" b="-0.00137" c="0"/>
-+            <distortion model="ptlens" focal="43" a="0" b="0.00011" c="0"/>
-+            <distortion model="ptlens" focal="55" a="0" b="-0.00012" c="0"/>
-+            <tca model="poly3" focal="18" br="-0.0003128" vr="1.0007525" bb="0.0002958" vb="0.9996711"/>
-+            <tca model="poly3" focal="24" br="-0.0001237" vr="1.0005359" bb="0.0001253" vb="0.9997927"/>
-+            <tca model="poly3" focal="35" br="-0.0000215" vr="1.0001845" bb="0.0000311" vb="0.9999607"/>
-+            <tca model="poly3" focal="43" br="-0.0000179" vr="1.0000762" bb="-0.0000077" vb="1.0000989"/>
-+            <tca model="poly3" focal="55" br="-0.0000044" vr="0.9999721" bb="0.0000116" vb="1.0001682"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.2310" k2="1.1507" k3="-0.5518"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.2310" k2="1.1507" k3="-0.5518"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.6610" k2="0.0708" k3="0.0281"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.6610" k2="0.0708" k3="0.0281"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2474" k2="-0.1020" k3="-0.0253"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2474" k2="-0.1020" k3="-0.0253"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2978" k2="0.0609" k3="-0.0342"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2978" k2="0.0609" k3="-0.0342"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2600" k2="-0.0548" k3="0.0630"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2600" k2="-0.0548" k3="0.0630"/>
-+            <vignetting model="pa" focal="20" aperture="3.5" distance="10" k1="-1.2072" k2="1.1094" k3="-0.5115"/>
-+            <vignetting model="pa" focal="20" aperture="3.5" distance="1000" k1="-1.2072" k2="1.1094" k3="-0.5115"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.5605" k2="-0.1036" k3="0.1414"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.5605" k2="-0.1036" k3="0.1414"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.2422" k2="-0.1012" k3="0.0124"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.2422" k2="-0.1012" k3="0.0124"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.2701" k2="-0.0657" k3="0.0976"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.2701" k2="-0.0657" k3="0.0976"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.2495" k2="-0.1178" k3="0.1350"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.2495" k2="-0.1178" k3="0.1350"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.2295" k2="-0.1696" k3="0.1705"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.2295" k2="-0.1696" k3="0.1705"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-1.1357" k2="1.0683" k3="-0.4894"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-1.1357" k2="1.0683" k3="-0.4894"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2295" k2="-0.0672" k3="-0.0057"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2295" k2="-0.0672" k3="-0.0057"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2905" k2="0.0785" k3="-0.0092"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2905" k2="0.0785" k3="-0.0092"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2863" k2="0.0372" k3="0.0264"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2863" k2="0.0372" k3="0.0264"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.3434" k2="0.2425" k3="-0.1344"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3434" k2="0.2425" k3="-0.1344"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.7374" k2="0.3860" k3="-0.0945"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.7374" k2="0.3860" k3="-0.0945"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.1209" k2="-0.0993" k3="0.0046"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.1209" k2="-0.0993" k3="0.0046"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.1718" k2="0.0249" k3="-0.0101"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1718" k2="0.0249" k3="-0.0101"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.1792" k2="0.0388" k3="-0.0182"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1792" k2="0.0388" k3="-0.0182"/>
-+            <vignetting model="pa" focal="34" aperture="29" distance="10" k1="-0.1847" k2="0.0566" k3="-0.0291"/>
-+            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1847" k2="0.0566" k3="-0.0291"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.5452" k2="0.3102" k3="-0.1191"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.5452" k2="0.3102" k3="-0.1191"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0469" k2="-0.1196" k3="0.0643"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0469" k2="-0.1196" k3="0.0643"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0339" k2="-0.1609" k3="0.1004"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0339" k2="-0.1609" k3="0.1004"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.1795" k2="0.1558" k3="-0.0968"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1795" k2="0.1558" k3="-0.0968"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.1913" k2="0.2738" k3="-0.2032"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.1913" k2="0.2738" k3="-0.2032"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 20mm f/2.8 USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="20" a="0.02466" b="-0.05795" c="0.0166"/>
-+            <tca model="poly3" focal="20" br="-0.0000976" vr="1.0012100" bb="0.0002552" vb="0.9997696"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.25" k1="-2.3970" k2="2.8162" k3="-1.2656"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.5" k1="-2.5125" k2="3.0085" k3="-1.3604"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1.5" k1="-2.5469" k2="3.0626" k3="-1.3862"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-2.5588" k2="3.0797" k3="-1.3937"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.25" k1="-0.5545" k2="-0.8384" k3="0.6946"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.5" k1="-0.6574" k2="-0.7715" k3="0.7019"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1.5" k1="-0.6915" k2="-0.7442" k3="0.6976"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.7031" k2="-0.7323" k3="0.6934"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.25" k1="-0.7095" k2="0.2494" k3="-0.0968"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.5" k1="-0.7336" k2="0.2004" k3="-0.0623"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1.5" k1="-0.7465" k2="0.1937" k3="-0.0548"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.7506" k2="0.1885" k3="-0.0489"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.25" k1="-0.7156" k2="0.2058" k3="0.0222"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.5" k1="-0.7709" k2="0.2694" k3="-0.0130"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1.5" k1="-0.7917" k2="0.2982" k3="-0.0330"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.7966" k2="0.2971" k3="-0.0295"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="0.25" k1="-0.7254" k2="0.2327" k3="0.0058"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="0.5" k1="-0.7662" k2="0.2539" k3="0.0043"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1.5" k1="-0.7861" k2="0.2741" k3="-0.0049"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.7929" k2="0.2800" k3="-0.0074"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 24-70mm f/2.8L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.015298" b="-0.039413" c="0" />
--            <distortion model="ptlens" focal="27" a="0.014041" b="-0.034436" c="0" />
--            <distortion model="ptlens" focal="30" a="0.013341" b="-0.031051" c="0" />
--            <distortion model="ptlens" focal="34" a="0.006539" b="-0.01539" c="0" />
--            <distortion model="ptlens" focal="38" a="0.003138" b="-0.007742" c="0" />
--            <distortion model="ptlens" focal="43" a="0" b="0.000233" c="0" />
--            <distortion model="ptlens" focal="48" a="0" b="0.00151" c="0" />
--            <distortion model="ptlens" focal="55" a="0" b="0.003988" c="0" />
--            <distortion model="ptlens" focal="64" a="0" b="0.005787" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.006294" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.015298" b="-0.039413" c="0"/>
-+            <distortion model="ptlens" focal="27" a="0.014041" b="-0.034436" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.013341" b="-0.031051" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0.006539" b="-0.01539" c="0"/>
-+            <distortion model="ptlens" focal="38" a="0.003138" b="-0.007742" c="0"/>
-+            <distortion model="ptlens" focal="43" a="0" b="0.000233" c="0"/>
-+            <distortion model="ptlens" focal="48" a="0" b="0.00151" c="0"/>
-+            <distortion model="ptlens" focal="55" a="0" b="0.003988" c="0"/>
-+            <distortion model="ptlens" focal="64" a="0" b="0.005787" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.006294" c="0"/>
-+            <!-- Taken with Canon 5D -->
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.9888" k2="-0.0305" k3="0.2650"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.9888" k2="-0.0305" k3="0.2650"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3697" k2="-0.2238" k3="-0.0067"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3697" k2="-0.2238" k3="-0.0067"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4863" k2="0.2192" k3="-0.2323"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4863" k2="0.2192" k3="-0.2323"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.4941" k2="0.1835" k3="-0.1135"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.4941" k2="0.1835" k3="-0.1135"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.4434" k2="-0.0021" k3="0.0534"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.4434" k2="-0.0021" k3="0.0534"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.4429" k2="-0.0034" k3="0.0551"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.4429" k2="-0.0034" k3="0.0551"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.4403" k2="-0.0062" k3="0.0569"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.4403" k2="-0.0062" k3="0.0569"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.8533" k2="-0.2821" k3="0.4327"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.8533" k2="-0.2821" k3="0.4327"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2937" k2="-0.3523" k3="0.1342"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2937" k2="-0.3523" k3="0.1342"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.4525" k2="0.2269" k3="-0.2190"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.4525" k2="0.2269" k3="-0.2190"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.4231" k2="0.0657" k3="-0.0169"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.4231" k2="0.0657" k3="-0.0169"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.4032" k2="-0.0039" k3="0.0439"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.4032" k2="-0.0039" k3="0.0439"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.4050" k2="0.0024" k3="0.0398"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.4050" k2="0.0024" k3="0.0398"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.4018" k2="-0.0035" k3="0.0433"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.4018" k2="-0.0035" k3="0.0433"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.7997" k2="-0.0741" k3="0.2267"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.7997" k2="-0.0741" k3="0.2267"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.2868" k2="-0.0469" k3="-0.0883"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.2868" k2="-0.0469" k3="-0.0883"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.3852" k2="0.2470" k3="-0.1909"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.3852" k2="0.2470" k3="-0.1909"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.3403" k2="0.0725" k3="-0.0229"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.3403" k2="0.0725" k3="-0.0229"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.3454" k2="0.0825" k3="-0.0281"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.3454" k2="0.0825" k3="-0.0281"/>
-+            <vignetting model="pa" focal="34" aperture="16" distance="10" k1="-0.3460" k2="0.0831" k3="-0.0274"/>
-+            <vignetting model="pa" focal="34" aperture="16" distance="1000" k1="-0.3460" k2="0.0831" k3="-0.0274"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.3503" k2="0.0927" k3="-0.0321"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.3503" k2="0.0927" k3="-0.0321"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.7645" k2="0.2124" k3="-0.0599"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.7645" k2="0.2124" k3="-0.0599"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2928" k2="0.3145" k3="-0.3958"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2928" k2="0.3145" k3="-0.3958"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2870" k2="0.1682" k3="-0.0911"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2870" k2="0.1682" k3="-0.0911"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2798" k2="0.1349" k3="-0.0553"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2798" k2="0.1349" k3="-0.0553"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2742" k2="0.1190" k3="-0.0422"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2742" k2="0.1190" k3="-0.0422"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2701" k2="0.1099" k3="-0.0360"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2701" k2="0.1099" k3="-0.0360"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2744" k2="0.1198" k3="-0.0419"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2744" k2="0.1198" k3="-0.0419"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-1.3498" k2="1.4523" k3="-0.7216"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-1.3498" k2="1.4523" k3="-0.7216"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.1385" k2="-0.4638" k3="0.2291"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1385" k2="-0.4638" k3="0.2291"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.3035" k2="0.2661" k3="-0.2199"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3035" k2="0.2661" k3="-0.2199"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2626" k2="0.0784" k3="-0.0101"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2626" k2="0.0784" k3="-0.0101"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2638" k2="0.0780" k3="-0.0078"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2638" k2="0.0780" k3="-0.0078"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.2627" k2="0.0739" k3="-0.0047"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2627" k2="0.0739" k3="-0.0047"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2704" k2="0.0892" k3="-0.0132"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2704" k2="0.0892" k3="-0.0132"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 24-85mm f/3.5-4.5 USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D -->
-+            <distortion model="ptlens" focal="24" a="0.031698" b="-0.089701" c="0.043822"/>
-+            <distortion model="ptlens" focal="28" a="0.02534" b="-0.06592" c="0.034411"/>
-+            <distortion model="ptlens" focal="37" a="0.017702" b="-0.04333" c="0.038594"/>
-+            <distortion model="ptlens" focal="48" a="0.006375" b="-0.006867" c="0.014446"/>
-+            <distortion model="ptlens" focal="68" a="0.005346" b="-0.003421" c="0.013141"/>
-+            <distortion model="ptlens" focal="85" a="0.00492" b="-0.000938" c="0.009196"/>
-+            <tca model="poly3" focal="24" br="-0.0000683" vr="1.0002047" bb="-0.0000003" vb="1.0000497"/>
-+            <tca model="poly3" focal="28" br="-0.0000673" vr="1.0001701" bb="0.0000428" vb="1.0000321"/>
-+            <tca model="poly3" focal="35" br="-0.0000631" vr="1.0001213" bb="0.0001327" vb="0.9999744"/>
-+            <tca model="poly3" focal="50" br="-0.0000764" vr="1.0000570" bb="0.0001481" vb="0.9999386"/>
-+            <tca model="poly3" focal="70" br="-0.0001230" vr="1.0000388" bb="0.0001095" vb="0.9999002"/>
-+            <tca model="poly3" focal="85" br="-0.0000913" vr="0.9999650" bb="0.0000556" vb="0.9999043"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="0.5" k1="-0.3676" k2="-1.2315" k3="0.7757"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="1" k1="-0.3807" k2="-1.1800" k3="0.7548"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.4347" k2="-1.0079" k3="0.6519"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1" k1="-0.6565" k2="-0.3662" k3="0.2147"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6520" k2="-0.2640" k3="0.1429"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.5" k1="-0.6912" k2="0.4393" k3="-0.4878"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1" k1="-0.6291" k2="0.3176" k3="-0.3660"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6719" k2="0.3679" k3="-0.3441"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.5" k1="-0.7323" k2="0.5714" k3="-0.4346"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1" k1="-0.6984" k2="0.4494" k3="-0.2828"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6233" k2="0.2334" k3="-0.1234"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.5" k1="-0.6427" k2="0.2005" k3="-0.0553"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1" k1="-0.6561" k2="0.1854" k3="-0.0052"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.6405" k2="0.1834" k3="-0.0003"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="0.5" k1="-0.6502" k2="0.1965" k3="-0.0050"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1" k1="-0.6343" k2="0.1515" k3="0.0215"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.6474" k2="0.2208" k3="-0.0092"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.5" k1="-0.6556" k2="0.1848" k3="-0.0036"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1" k1="-0.6677" k2="0.1970" k3="-0.0038"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.6526" k2="0.1755" k3="0.0009"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="0.5" k1="-0.4977" k2="-0.5601" k3="0.3353"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1" k1="-0.5408" k2="-0.2844" k3="0.1061"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.5704" k2="-0.1098" k3="-0.0196"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.5" k1="-0.6596" k2="0.4286" k3="-0.3200"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1" k1="-0.6301" k2="0.4046" k3="-0.3366"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.7033" k2="0.5406" k3="-0.4147"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.5" k1="-0.6746" k2="0.3317" k3="-0.1137"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1" k1="-0.5883" k2="0.1723" k3="-0.0368"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6693" k2="0.3287" k3="-0.1226"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="0.5" k1="-0.6223" k2="0.1751" k3="0.0182"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1" k1="-0.6055" k2="0.1353" k3="0.0389"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.6084" k2="0.1569" k3="0.0277"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="0.5" k1="-0.6125" k2="0.1402" k3="0.0374"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1" k1="-0.6102" k2="0.1484" k3="0.0297"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.6238" k2="0.1954" k3="0.0106"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.5" k1="-0.6229" k2="0.1634" k3="0.0085"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1" k1="-0.6231" k2="0.1622" k3="0.0218"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.6524" k2="0.2524" k3="-0.0150"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.5" k1="-0.7889" k2="0.8383" k3="-0.7185"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.8513" k2="1.1055" k3="-0.9170"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.6829" k2="0.7019" k3="-0.5476"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.6416" k2="0.6564" k3="-0.5353"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.5978" k2="0.2870" k3="-0.1029"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.6263" k2="0.3655" k3="-0.1481"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.5943" k2="0.2163" k3="-0.0046"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5720" k2="0.1643" k3="0.0177"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.5" k1="-0.5887" k2="0.1863" k3="0.0123"/>
-+            <vignetting model="pa" focal="35" aperture="18" distance="1" k1="-0.5844" k2="0.1880" k3="0.0133"/>
-+            <vignetting model="pa" focal="35" aperture="18" distance="1000" k1="-0.5844" k2="0.1880" k3="0.0133"/>
-+            <vignetting model="pa" focal="35" aperture="25" distance="0.5" k1="-0.6088" k2="0.2184" k3="-0.0057"/>
-+            <vignetting model="pa" focal="35" aperture="25" distance="1000" k1="-0.6062" k2="0.2269" k3="-0.0170"/>
-+            <vignetting model="pa" focal="37" aperture="4" distance="1" k1="-0.8030" k2="0.9297" k3="-0.7978"/>
-+            <vignetting model="pa" focal="37" aperture="5.6" distance="1" k1="-0.7035" k2="0.8084" k3="-0.6172"/>
-+            <vignetting model="pa" focal="37" aperture="8" distance="1" k1="-0.5872" k2="0.3046" k3="-0.1158"/>
-+            <vignetting model="pa" focal="37" aperture="11" distance="1" k1="-0.5660" k2="0.1758" k3="0.0103"/>
-+            <vignetting model="pa" focal="37" aperture="16" distance="1" k1="-0.5561" k2="0.1464" k3="0.0309"/>
-+            <vignetting model="pa" focal="37" aperture="25" distance="1" k1="-0.5610" k2="0.1636" k3="0.0127"/>
-+            <vignetting model="pa" focal="48" aperture="4" distance="1" k1="-1.0590" k2="1.4519" k3="-1.0900"/>
-+            <vignetting model="pa" focal="48" aperture="4" distance="1000" k1="-0.9853" k2="1.2257" k3="-0.9250"/>
-+            <vignetting model="pa" focal="48" aperture="5.6" distance="1" k1="-0.6396" k2="0.7028" k3="-0.6068"/>
-+            <vignetting model="pa" focal="48" aperture="5.6" distance="1000" k1="-0.5478" k2="0.4771" k3="-0.4463"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="0.5" k1="-0.6864" k2="0.8715" k3="-0.6264"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="1" k1="-0.6123" k2="0.6131" k3="-0.4082"/>
-+            <vignetting model="pa" focal="48" aperture="8" distance="1000" k1="-0.5586" k2="0.4189" k3="-0.2421"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="0.5" k1="-0.6043" k2="0.5205" k3="-0.2920"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="1" k1="-0.5327" k2="0.2636" k3="-0.0800"/>
-+            <vignetting model="pa" focal="48" aperture="11" distance="1000" k1="-0.4593" k2="0.0860" k3="0.0380"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="0.5" k1="-0.5318" k2="0.2445" k3="-0.0549"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="1" k1="-0.5263" k2="0.2065" k3="-0.0079"/>
-+            <vignetting model="pa" focal="48" aperture="16" distance="1000" k1="-0.4823" k2="0.1165" k3="0.0433"/>
-+            <vignetting model="pa" focal="48" aperture="29" distance="0.5" k1="-0.5193" k2="0.1671" k3="0.0137"/>
-+            <vignetting model="pa" focal="48" aperture="29" distance="1" k1="-0.5286" k2="0.1811" k3="0.0059"/>
-+            <vignetting model="pa" focal="48" aperture="29" distance="1000" k1="-0.5374" k2="0.2033" k3="-0.0106"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="0.5" k1="-1.1865" k2="1.8374" k3="-1.3677"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.5" k1="-0.7842" k2="1.0227" k3="-0.8452"/>
-+            <vignetting model="pa" focal="68" aperture="4.5" distance="0.5" k1="-1.2296" k2="1.8099" k3="-1.3673"/>
-+            <vignetting model="pa" focal="68" aperture="4.5" distance="1000" k1="-1.0083" k2="1.0578" k3="-0.7696"/>
-+            <vignetting model="pa" focal="68" aperture="5.6" distance="0.5" k1="-0.6903" k2="0.8803" k3="-0.8540"/>
-+            <vignetting model="pa" focal="68" aperture="5.6" distance="1000" k1="-0.5788" k2="0.4348" k3="-0.4409"/>
-+            <vignetting model="pa" focal="68" aperture="8" distance="0.5" k1="-0.7958" k2="1.3977" k3="-1.1023"/>
-+            <vignetting model="pa" focal="68" aperture="8" distance="1000" k1="-0.5959" k2="0.6501" k3="-0.4554"/>
-+            <vignetting model="pa" focal="68" aperture="11" distance="0.5" k1="-0.6902" k2="1.0298" k3="-0.7790"/>
-+            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.4788" k2="0.2282" k3="-0.0753"/>
-+            <vignetting model="pa" focal="68" aperture="16" distance="0.5" k1="-0.5679" k2="0.5611" k3="-0.3608"/>
-+            <vignetting model="pa" focal="68" aperture="16" distance="1000" k1="-0.4573" k2="0.1229" k3="0.0327"/>
-+            <vignetting model="pa" focal="68" aperture="32" distance="0.5" k1="-0.5310" k2="0.3020" k3="-0.0858"/>
-+            <vignetting model="pa" focal="68" aperture="32" distance="1000" k1="-0.5057" k2="0.2235" k3="-0.0251"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1" k1="-1.0184" k2="1.1626" k3="-0.8838"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1" k1="-0.5521" k2="0.4536" k3="-0.5040"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1" k1="-0.5571" k2="0.6718" k3="-0.5304"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1" k1="-0.5378" k2="0.4305" k3="-0.2322"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1" k1="-0.4607" k2="0.1536" k3="0.0070"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1" k1="-0.4870" k2="0.1914" k3="-0.0090"/>
-+            <vignetting model="pa" focal="85" aperture="4.5" distance="0.5" k1="-1.0155" k2="1.1996" k3="-1.0058"/>
-+            <vignetting model="pa" focal="85" aperture="4.5" distance="1" k1="-0.9227" k2="0.8165" k3="-0.6653"/>
-+            <vignetting model="pa" focal="85" aperture="4.5" distance="1000" k1="-0.8461" k2="0.4738" k3="-0.3631"/>
-+            <vignetting model="pa" focal="85" aperture="5.6" distance="0.5" k1="-0.8041" k2="0.9145" k3="-0.8693"/>
-+            <vignetting model="pa" focal="85" aperture="5.6" distance="1" k1="-0.6536" k2="0.3998" k3="-0.4548"/>
-+            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.6141" k2="0.1866" k3="-0.2361"/>
-+            <vignetting model="pa" focal="85" aperture="8" distance="0.5" k1="-0.7380" k2="1.4380" k3="-1.2802"/>
-+            <vignetting model="pa" focal="85" aperture="8" distance="1" k1="-0.6205" k2="0.9477" k3="-0.8445"/>
-+            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.5929" k2="0.7496" k3="-0.6245"/>
-+            <vignetting model="pa" focal="85" aperture="11" distance="0.5" k1="-0.7237" k2="1.3069" k3="-1.0771"/>
-+            <vignetting model="pa" focal="85" aperture="11" distance="1" k1="-0.5941" k2="0.7543" k3="-0.5645"/>
-+            <vignetting model="pa" focal="85" aperture="11" distance="1000" k1="-0.5192" k2="0.4003" k3="-0.2189"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="0.5" k1="-0.7377" k2="1.1864" k3="-0.8915"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="1" k1="-0.5054" k2="0.3828" k3="-0.2078"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.4427" k2="0.1288" k3="0.0161"/>
-+            <vignetting model="pa" focal="85" aperture="32" distance="1" k1="-0.4934" k2="0.2063" k3="-0.0192"/>
-+            <vignetting model="pa" focal="85" aperture="32" distance="1000" k1="-0.4840" k2="0.2044" k3="-0.0245"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 24-85mm f/3.5-4.5 USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.005763" b="-0.022311" c="0" />
--            <distortion model="ptlens" focal="28" a="0.002537" b="-0.01074" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="48" a="0" b="0.004254" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.005312" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.004512" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.005763" b="-0.022311" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.002537" b="-0.01074" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="48" a="0" b="0.004254" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.005312" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0" b="0.004512" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 28-70mm f/2.8L</model>
-+        <model>Canon EF 28-70mm f/2.8L USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="-0.001744" b="0.000657" c="0" />
--            <distortion model="ptlens" focal="32" a="0.003058" b="-0.013232" c="0" />
--            <distortion model="ptlens" focal="35" a="-0.004696" b="0.007063" c="0" />
--            <distortion model="ptlens" focal="39" a="0.00011" b="-0.002166" c="0" />
--            <distortion model="ptlens" focal="44" a="-0.001271" b="0.001861" c="0" />
--            <distortion model="ptlens" focal="50" a="-0.006466" b="0.014612" c="0" />
--            <distortion model="ptlens" focal="60" a="-0.001227" b="0.003723" c="0" />
--            <distortion model="ptlens" focal="70" a="-0.001929" b="0.005136" c="0" />
-+            <distortion model="ptlens" focal="28" a="-0.001744" b="0.000657" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0.003058" b="-0.013232" c="0"/>
-+            <distortion model="ptlens" focal="35" a="-0.004696" b="0.007063" c="0"/>
-+            <distortion model="ptlens" focal="39" a="0.00011" b="-0.002166" c="0"/>
-+            <distortion model="ptlens" focal="44" a="-0.001271" b="0.001861" c="0"/>
-+            <distortion model="ptlens" focal="50" a="-0.006466" b="0.014612" c="0"/>
-+            <distortion model="ptlens" focal="60" a="-0.001227" b="0.003723" c="0"/>
-+            <distortion model="ptlens" focal="70" a="-0.001929" b="0.005136" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 24-105mm f/4L IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.017263" b="-0.049244" c="0" />
--            <distortion model="ptlens" focal="28" a="0.010878" b="-0.024454" c="0" />
--            <distortion model="ptlens" focal="35" a="0.007152" b="-0.009799" c="0" />
--            <distortion model="ptlens" focal="50" a="0.002502" b="0.004803" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.009685" c="0" />
--            <distortion model="ptlens" focal="88" a="0" b="0.008781" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.009598" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.017263" b="-0.049244" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.010878" b="-0.024454" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.007152" b="-0.009799" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0.002502" b="0.004803" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.009685" c="0"/>
-+            <distortion model="ptlens" focal="88" a="0" b="0.008781" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0" b="0.009598" c="0"/>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <tca model="poly3" focal="24" br="-0.0000336" vr="1.0011673" bb="-0.0000857" vb="1.0001820"/>
-+            <tca model="poly3" focal="28" br="-0.0000198" vr="1.0009538" bb="-0.0000780" vb="1.0001947"/>
-+            <tca model="poly3" focal="35" br="0.0000238" vr="1.0006733" bb="-0.0000900" vb="1.0002139"/>
-+            <tca model="poly3" focal="45" br="0.0000790" vr="1.0003749" bb="-0.0000725" vb="1.0001305"/>
-+            <tca model="poly3" focal="50" br="0.0000550" vr="1.0001985" bb="-0.0001125" vb="1.0000939"/>
-+            <tca model="poly3" focal="60" br="0.0000537" vr="0.9999940" bb="-0.0001371" vb="1.0000645"/>
-+            <tca model="poly3" focal="70" br="0.0000545" vr="0.9998413" bb="-0.0001606" vb="0.9999358"/>
-+            <tca model="poly3" focal="88" br="0.0000129" vr="0.9995321" bb="-0.0002706" vb="0.9999391"/>
-+            <tca model="poly3" focal="105" br="0.0000381" vr="0.9991735" bb="-0.0001974" vb="0.9998595"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.45" k1="-0.4795" k2="-0.5164" k3="0.1168"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.9" k1="-0.5099" k2="-0.3593" k3="0.0100"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="2.7" k1="-0.5210" k2="-0.3005" k3="-0.0331"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.5460" k2="-0.2245" k3="-0.0825"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.45" k1="-0.5434" k2="-0.0220" k3="-0.2734"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.9" k1="-0.5925" k2="0.1920" k3="-0.4102"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="2.7" k1="-0.6105" k2="0.2702" k3="-0.4657"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.6251" k2="0.3124" k3="-0.4911"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.45" k1="-0.7341" k2="0.6702" k3="-0.7376"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.9" k1="-0.7582" k2="0.7674" k3="-0.7682"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="2.7" k1="-0.7783" k2="0.8378" k3="-0.8121"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.7823" k2="0.8454" k3="-0.8131"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.45" k1="-0.8706" k2="1.1062" k3="-1.0123"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.9" k1="-0.8371" k2="0.9860" k3="-0.8679"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="2.7" k1="-0.8344" k2="0.9810" k3="-0.8608"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.8340" k2="0.9778" k3="-0.8568"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="0.45" k1="-0.9126" k2="1.2016" k3="-1.0358"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="0.9" k1="-0.8199" k2="0.8728" k3="-0.7322"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="2.7" k1="-0.8124" k2="0.8533" k3="-0.7189"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.8099" k2="0.8471" k3="-0.7154"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.45" k1="-0.8999" k2="1.1258" k3="-0.9507"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.9" k1="-0.7940" k2="0.7596" k3="-0.6258"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="2.7" k1="-0.8030" k2="0.8024" k3="-0.6672"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.8041" k2="0.8095" k3="-0.6743"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.45" k1="-0.5671" k2="-0.1074" k3="0.0934"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.9" k1="-0.5570" k2="-0.0974" k3="0.0827"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="2.7" k1="-0.5699" k2="-0.0408" k3="0.0282"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6054" k2="0.0282" k3="-0.0163"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.45" k1="-0.6116" k2="0.3685" k3="-0.2226"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.9" k1="-0.6017" k2="0.3878" k3="-0.2407"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="2.7" k1="-0.6215" k2="0.4488" k3="-0.2954"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.6418" k2="0.5034" k3="-0.3355"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.45" k1="-0.5971" k2="0.3002" k3="-0.1550"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.9" k1="-0.5770" k2="0.2770" k3="-0.1328"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="2.7" k1="-0.5849" k2="0.2941" k3="-0.1483"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.6029" k2="0.3432" k3="-0.1836"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.45" k1="-0.5999" k2="0.2956" k3="-0.1444"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.9" k1="-0.5764" k2="0.2640" k3="-0.1160"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="2.7" k1="-0.5843" k2="0.2767" k3="-0.1257"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.6005" k2="0.3196" k3="-0.1558"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.45" k1="-0.6063" k2="0.2984" k3="-0.1399"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.9" k1="-0.5833" k2="0.2700" k3="-0.1142"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="2.7" k1="-0.5913" k2="0.2812" k3="-0.1221"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.6041" k2="0.3158" k3="-0.1462"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.45" k1="-0.6122" k2="0.3065" k3="-0.1424"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.9" k1="-0.5894" k2="0.2778" k3="-0.1160"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="2.7" k1="-0.5972" k2="0.2887" k3="-0.1240"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.6070" k2="0.3145" k3="-0.1413"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.5274" k2="-0.2110" k3="0.2123"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.9" k1="-0.5559" k2="-0.0930" k3="0.1107"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="2.7" k1="-0.5569" k2="-0.0746" k3="0.0868"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.5818" k2="-0.0162" k3="0.0425"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.45" k1="-0.3835" k2="0.0297" k3="-0.0329"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.9" k1="-0.5182" k2="0.3503" k3="-0.2346"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="2.7" k1="-0.5279" k2="0.3888" k3="-0.2717"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.5500" k2="0.4475" k3="-0.3184"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.45" k1="-0.4861" k2="0.1556" k3="-0.0270"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.9" k1="-0.4743" k2="0.1487" k3="-0.0198"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="2.7" k1="-0.4674" k2="0.1258" k3="-0.0020"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4889" k2="0.1737" k3="-0.0356"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.45" k1="-0.4856" k2="0.1481" k3="-0.0178"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.9" k1="-0.4750" k2="0.1425" k3="-0.0101"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="2.7" k1="-0.4685" k2="0.1214" k3="0.0057"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4893" k2="0.1670" k3="-0.0255"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.45" k1="-0.4905" k2="0.1537" k3="-0.0187"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.9" k1="-0.4771" k2="0.1396" k3="-0.0042"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="2.7" k1="-0.4751" k2="0.1298" k3="0.0038"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.4944" k2="0.1721" k3="-0.0253"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.5000" k2="0.1707" k3="-0.0276"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.4836" k2="0.1490" k3="-0.0077"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="2.7" k1="-0.4846" k2="0.1454" k3="-0.0035"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.5030" k2="0.1854" k3="-0.0309"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="0.45" k1="-0.7049" k2="0.2950" k3="-0.1500"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="0.9" k1="-0.7163" k2="0.3620" k3="-0.2250"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="2.7" k1="-0.6962" k2="0.3204" k3="-0.2129"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.7079" k2="0.3344" k3="-0.2278"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.45" k1="-0.4799" k2="0.3668" k3="-0.2925"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.9" k1="-0.4831" k2="0.4338" k3="-0.3717"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="2.7" k1="-0.4805" k2="0.4500" k3="-0.3919"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.5016" k2="0.4991" k3="-0.4414"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.45" k1="-0.4273" k2="0.1139" k3="0.0043"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.9" k1="-0.4138" k2="0.1045" k3="0.0093"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="2.7" k1="-0.4064" k2="0.0883" k3="0.0218"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.4297" k2="0.1397" k3="-0.0142"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.45" k1="-0.4280" k2="0.1093" k3="0.0114"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.9" k1="-0.4061" k2="0.0772" k3="0.0344"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="2.7" k1="-0.3995" k2="0.0578" k3="0.0519"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.4207" k2="0.1038" k3="0.0199"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="0.45" k1="-0.4290" k2="0.1066" k3="0.0159"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="0.9" k1="-0.4079" k2="0.0761" k3="0.0380"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="2.7" k1="-0.4021" k2="0.0578" k3="0.0551"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.4222" k2="0.1029" k3="0.0231"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="0.45" k1="-0.4335" k2="0.1101" k3="0.0166"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="0.9" k1="-0.4124" k2="0.0813" k3="0.0370"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="2.7" k1="-0.4081" k2="0.0661" k3="0.0521"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.4296" k2="0.1152" k3="0.0173"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="0.45" k1="-1.0812" k2="1.1713" k3="-0.6459"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="0.9" k1="-1.0310" k2="1.0659" k3="-0.6301"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="2.7" k1="-0.9948" k2="0.9010" k3="-0.5254"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-1.0176" k2="0.8667" k3="-0.4856"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="0.45" k1="-0.3223" k2="-0.0995" k3="0.0451"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="0.9" k1="-0.3340" k2="-0.0051" k3="-0.0805"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="2.7" k1="-0.3113" k2="-0.0072" k3="-0.1158"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.3111" k2="-0.0112" k3="-0.1305"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="0.45" k1="-0.3740" k2="0.0834" k3="0.0276"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="0.9" k1="-0.3449" k2="0.0346" k3="0.0606"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="2.7" k1="-0.3473" k2="0.0666" k3="0.0265"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.3824" k2="0.1623" k3="-0.0510"/>
-+            <vignetting model="pa" focal="105" aperture="11" distance="0.45" k1="-0.3703" k2="0.0630" k3="0.0486"/>
-+            <vignetting model="pa" focal="105" aperture="11" distance="0.9" k1="-0.3403" k2="0.0180" k3="0.0758"/>
-+            <vignetting model="pa" focal="105" aperture="11" distance="2.7" k1="-0.3352" k2="0.0101" k3="0.0818"/>
-+            <vignetting model="pa" focal="105" aperture="11" distance="1000" k1="-0.3508" k2="0.0342" k3="0.0673"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="0.45" k1="-0.3726" k2="0.0649" k3="0.0487"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="0.9" k1="-0.3408" k2="0.0156" k3="0.0789"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="2.7" k1="-0.3371" k2="0.0090" k3="0.0856"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="1000" k1="-0.3511" k2="0.0307" k3="0.0728"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="0.45" k1="-0.3752" k2="0.0669" k3="0.0488"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="0.9" k1="-0.3442" k2="0.0175" k3="0.0798"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="2.7" k1="-0.3422" k2="0.0150" k3="0.0838"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.3540" k2="0.0313" k3="0.0746"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 24-105mm f/4L IS USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.00552" b="-0.02074" c="0" />
--            <distortion model="ptlens" focal="28" a="0.00396" b="-0.01457" c="0" />
--            <distortion model="ptlens" focal="35" a="0.00091" b="-0.00171" c="0" />
--            <distortion model="ptlens" focal="50" a="0.00077" b="0.00096" c="0" />
--            <distortion model="ptlens" focal="70" a="0.0016" b="5e-05" c="0" />
--            <distortion model="ptlens" focal="88" a="0.00467" b="-0.00624" c="0" />
--            <distortion model="ptlens" focal="105" a="0.00797" b="-0.01307" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.00552" b="-0.02074" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.00396" b="-0.01457" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.00091" b="-0.00171" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0.00077" b="0.00096" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0.0016" b="5e-05" c="0"/>
-+            <distortion model="ptlens" focal="88" a="0.00467" b="-0.00624" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0.00797" b="-0.01307" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 28-105mm f/3.5-4.5 II USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.013305" b="-0.03973" c="0" />
--            <distortion model="ptlens" focal="35" a="0.005643" b="-0.012771" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.007781" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.010884" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.011749" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.013305" b="-0.03973" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.005643" b="-0.012771" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.007781" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.010884" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0" b="0.011749" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 28-300mm f/3.5-5.6L IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.013512" b="-0.044163" c="0" />
--            <distortion model="ptlens" focal="35" a="0.008844" b="-0.01773" c="0" />
--            <distortion model="ptlens" focal="40" a="0" b="0.008261" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.012093" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.012516" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.009065" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.008196" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.007773" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.008177" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.013512" b="-0.044163" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.008844" b="-0.01773" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.008261" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.012093" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.012516" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0" b="0.009065" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.008196" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.007773" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.008177" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 28-135mm f/3.5-5.6 IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.015307" b="-0.042304" c="0" />
--            <distortion model="ptlens" focal="35" a="0.009116" b="-0.020624" c="0" />
--            <distortion model="ptlens" focal="41" a="0" b="0.003439" c="0" />
--            <distortion model="ptlens" focal="53" a="0" b="0.008157" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.008848" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.009719" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.009196" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.008576" c="0" />
--            <distortion model="ptlens" focal="117" a="0" b="0.010397" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.010546" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.015307" b="-0.042304" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.009116" b="-0.020624" c="0"/>
-+            <distortion model="ptlens" focal="41" a="0" b="0.003439" c="0"/>
-+            <distortion model="ptlens" focal="53" a="0" b="0.008157" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.008848" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.009719" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0" b="0.009196" c="0"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.008576" c="0"/>
-+            <distortion model="ptlens" focal="117" a="0" b="0.010397" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.010546" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 35mm f/1.4L USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="35" a="0.01105" b="-0.02944" c="0.00633"/>
-+            <tca model="poly3" focal="35" br="-0.0004259" vr="1.0009718" bb="0.0005876" vb="0.9992816"/>
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="0.3" k1="-1.2296" k2="0.7860" k3="-0.2592"/>
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="0.6" k1="-1.6193" k2="1.4907" k3="-0.6335"/>
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="1.8" k1="-1.7496" k2="1.7258" k3="-0.7587"/>
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="1000" k1="-1.8086" k2="1.8246" k3="-0.8096"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="0.3" k1="-0.1890" k2="-0.4885" k3="0.1801"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="0.6" k1="-0.2440" k2="-0.7779" k3="0.4414"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="1.8" k1="-0.3152" k2="-0.7584" k3="0.4643"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="1000" k1="-0.3585" k2="-0.7409" k3="0.4745"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.3" k1="-0.3359" k2="0.1421" k3="-0.1330"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.6" k1="-0.3143" k2="-0.0191" k3="-0.0963"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1.8" k1="-0.2678" k2="-0.2501" k3="0.0432"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.2516" k2="-0.3607" k3="0.1119"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.3" k1="-0.2940" k2="-0.0722" k3="0.1067"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.6" k1="-0.3873" k2="0.1488" k3="-0.0896"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1.8" k1="-0.4347" k2="0.2856" k3="-0.2331"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.4484" k2="0.3163" k3="-0.2840"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.3" k1="-0.3341" k2="-0.0090" k3="0.0707"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.6" k1="-0.3758" k2="-0.0028" k3="0.0766"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1.8" k1="-0.3984" k2="0.0071" k3="0.0760"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.4126" k2="0.0142" k3="0.0744"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 35mm f/2 IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="35" a="0.0100042" b="-0.031314" c="0.019113"/>
-+            <tca model="poly3" focal="35" br="-0.0000955" vr="1.0002447" bb="0.0001070" vb="0.9998243"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 35-70mm f/3.5-4.5</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0" b="-0.005023" c="0" />
--            <distortion model="ptlens" focal="42" a="0" b="-0.002793" c="0" />
--            <distortion model="ptlens" focal="56" a="0" b="0.000982" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.001993" c="0" />
-+            <distortion model="poly3" focal="35" k1="-0.005023"/>
-+            <distortion model="poly3" focal="42" k1="-0.002793"/>
-+            <distortion model="poly3" focal="56" k1="0.000982"/>
-+            <distortion model="poly3" focal="70" k1="0.001993"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 35-80mm f/4-5.6 III</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.003148" b="-0.013071" c="0" />
--            <distortion model="ptlens" focal="40" a="0" b="-0.004903" c="0" />
--            <distortion model="ptlens" focal="44" a="0" b="-0.002625" c="0" />
--            <distortion model="ptlens" focal="53" a="0" b="0.000335" c="0" />
--            <distortion model="ptlens" focal="65" a="0" b="0.002145" c="0" />
--            <distortion model="ptlens" focal="80" a="0.00704" b="0.002809" c="0" />
-+            <distortion model="ptlens" focal="35" a="0.003148" b="-0.013071" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="-0.004903" c="0"/>
-+            <distortion model="ptlens" focal="44" a="0" b="-0.002625" c="0"/>
-+            <distortion model="ptlens" focal="53" a="0" b="0.000335" c="0"/>
-+            <distortion model="ptlens" focal="65" a="0" b="0.002145" c="0"/>
-+            <distortion model="ptlens" focal="80" a="0.00704" b="0.002809" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 35-105mm f/3.5-4.5</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.003118" b="-0.013401" c="0" />
--            <distortion model="ptlens" focal="45" a="0.003039" b="-0.007423" c="0" />
--            <distortion model="ptlens" focal="60" a="0.001309" b="0.000252" c="0" />
--            <distortion model="ptlens" focal="82" a="0.001085" b="0.002214" c="0" />
--            <distortion model="ptlens" focal="105" a="0.000575" b="0.003503" c="0" />
-+            <distortion model="ptlens" focal="35" a="0.003118" b="-0.013401" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0.003039" b="-0.007423" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0.001309" b="0.000252" c="0"/>
-+            <distortion model="ptlens" focal="82" a="0.001085" b="0.002214" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0.000575" b="0.003503" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 35-105mm f/4.5-5.6</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="-0.00202" b="0.00115" c="-0.00877" />
--            <distortion model="ptlens" focal="48" a="0.00206" b="-0.00395" c="0.00411" />
--            <distortion model="ptlens" focal="57" a="-0.00649" b="0.02493" c="-0.01898" />
--            <distortion model="ptlens" focal="62" a="-0.01071" b="0.01858" c="0.00875" />
--            <distortion model="ptlens" focal="68" a="-0.02787" b="0.07826" c="-0.05368" />
--            <distortion model="ptlens" focal="72" a="-0.03351" b="0.12504" c="-0.14162" />
--            <distortion model="ptlens" focal="76" a="0.00385" b="-0.0011" c="-0.00351" />
--            <distortion model="ptlens" focal="80" a="0.01832" b="-0.05905" c="0.07657" />
--            <distortion model="ptlens" focal="87" a="-0.03411" b="0.14077" c="-0.17993" />
--            <distortion model="ptlens" focal="98" a="0.0103" b="-0.03257" c="0.02861" />
--            <distortion model="ptlens" focal="105" a="0.03329" b="-0.012513" c="0.16021" />
-+            <distortion model="ptlens" focal="35" a="-0.00202" b="0.00115" c="-0.00877"/>
-+            <distortion model="ptlens" focal="48" a="0.00206" b="-0.00395" c="0.00411"/>
-+            <distortion model="ptlens" focal="57" a="-0.00649" b="0.02493" c="-0.01898"/>
-+            <distortion model="ptlens" focal="62" a="-0.01071" b="0.01858" c="0.00875"/>
-+            <distortion model="ptlens" focal="68" a="-0.02787" b="0.07826" c="-0.05368"/>
-+            <distortion model="ptlens" focal="72" a="-0.03351" b="0.12504" c="-0.14162"/>
-+            <distortion model="ptlens" focal="76" a="0.00385" b="-0.0011" c="-0.00351"/>
-+            <distortion model="ptlens" focal="80" a="0.01832" b="-0.05905" c="0.07657"/>
-+            <distortion model="ptlens" focal="87" a="-0.03411" b="0.14077" c="-0.17993"/>
-+            <distortion model="ptlens" focal="98" a="0.0103" b="-0.03257" c="0.02861"/>
-+            <distortion model="ptlens" focal="105" a="0.03329" b="-0.012513" c="0.16021"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 35-135mm f/4-5.6 USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.001862" b="-0.007763" c="0" />
--            <distortion model="ptlens" focal="45" a="0" b="0.001004" c="0" />
--            <distortion model="ptlens" focal="65" a="0" b="0.004211" c="0" />
--            <distortion model="ptlens" focal="80" a="0" b="0.004364" c="0" />
--            <distortion model="ptlens" focal="91" a="0" b="0.005026" c="0" />
--            <distortion model="ptlens" focal="110" a="0" b="0.005453" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.003708" c="0" />
-+            <distortion model="ptlens" focal="35" a="0.001862" b="-0.007763" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0" b="0.001004" c="0"/>
-+            <distortion model="ptlens" focal="65" a="0" b="0.004211" c="0"/>
-+            <distortion model="ptlens" focal="80" a="0" b="0.004364" c="0"/>
-+            <distortion model="ptlens" focal="91" a="0" b="0.005026" c="0"/>
-+            <distortion model="ptlens" focal="110" a="0" b="0.005453" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.003708" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 50mm f/1.4 USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="50" a="0.00225" b="-0.01104" c="0.00161"/>
-+            <tca model="poly3" focal="50" br="-0.0000816" vr="1.0002947" bb="0.0001675" vb="0.9998280"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-1.2133" k2="0.7385" k3="-0.2283"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="0.9" k1="-1.5471" k2="1.3080" k3="-0.5300"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="2.7" k1="-1.6546" k2="1.4781" k3="-0.6175"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.6987" k2="1.5340" k3="-0.6426"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="0.0561" k2="-0.9960" k3="0.4486"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.9" k1="0.1089" k2="-1.3840" k3="0.6970"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="2.7" k1="0.1071" k2="-1.5289" k3="0.8047"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="0.0948" k2="-1.5688" k3="0.8379"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.2081" k2="0.2073" k3="-0.2248"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.9" k1="-0.2781" k2="0.3881" k3="-0.4386"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="2.7" k1="-0.2821" k2="0.3808" k3="-0.4832"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2913" k2="0.3893" k3="-0.5136"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.1550" k2="-0.0639" k3="0.0839"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.9" k1="-0.1912" k2="-0.0557" k3="0.0760"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="2.7" k1="-0.2199" k2="-0.0120" k3="0.0383"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2456" k2="0.0370" k3="-0.0021"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.1764" k2="-0.0538" k3="0.0839"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.2106" k2="-0.0590" k3="0.0888"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="2.7" k1="-0.2330" k2="-0.0454" k3="0.0805"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2485" k2="-0.0389" k3="0.0790"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 55-200mm f/4.5-5.6</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="55" a="-0.002904" b="0.003678" c="0" />
--            <distortion model="ptlens" focal="65" a="-0.004584" b="0.008401" c="0" />
--            <distortion model="ptlens" focal="75" a="-0.000913" b="0.001853" c="0" />
--            <distortion model="ptlens" focal="88" a="-0.002182" b="0.007163" c="0" />
--            <distortion model="ptlens" focal="105" a="-0.002465" b="0.008767" c="0" />
--            <distortion model="ptlens" focal="130" a="-0.003219" b="0.010958" c="0" />
--            <distortion model="ptlens" focal="145" a="-0.003261" b="0.011157" c="0" />
--            <distortion model="ptlens" focal="160" a="-0.003477" b="0.011918" c="0" />
--            <distortion model="ptlens" focal="200" a="-0.00602" b="0.017552" c="0" />
-+            <distortion model="ptlens" focal="55" a="-0.002904" b="0.003678" c="0"/>
-+            <distortion model="ptlens" focal="65" a="-0.004584" b="0.008401" c="0"/>
-+            <distortion model="ptlens" focal="75" a="-0.000913" b="0.001853" c="0"/>
-+            <distortion model="ptlens" focal="88" a="-0.002182" b="0.007163" c="0"/>
-+            <distortion model="ptlens" focal="105" a="-0.002465" b="0.008767" c="0"/>
-+            <distortion model="ptlens" focal="130" a="-0.003219" b="0.010958" c="0"/>
-+            <distortion model="ptlens" focal="145" a="-0.003261" b="0.011157" c="0"/>
-+            <distortion model="ptlens" focal="160" a="-0.003477" b="0.011918" c="0"/>
-+            <distortion model="ptlens" focal="200" a="-0.00602" b="0.017552" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 55-250mm f/4-5.6 IS</model>
--        <mount>Canon EF</mount>
-+        <mount>Canon EF-S</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
--        <calibration> <!-- data gathered by Spoilerhead 2010 <spoilerhead@gmail.com> using hugin-->
--            <distortion model="ptlens" focal="55" a="-0.000303056" b="-0.00581537" c="-0.00237143" /> <!-- 15 shots-->
--            <distortion model="ptlens" focal="70" a="-0.000520255" b="2.86405e-05" c="0.00286934" />  <!-- 21 shots -->
--            <distortion model="ptlens" focal="100" a="0.00268582" b="-0.00578304" c="0.00718748" />   <!-- 17-->
--            <distortion model="ptlens" focal="135" a="0.00120309" b="0.00979416" c="-0.00868762" />    <!-- 15 -->
--            <distortion model="ptlens" focal="250" a="-0.00226069" b="0.0111545" c="-0.00536676" />    <!-- 18 -->
--            <tca model="poly3" focal="55" br="0.0001058" vr="1.0000402" bb="-0.0001107" vb="1.0002220" />
--            <tca model="poly3" focal="70" br="0.0000486" vr="1.0000622" bb="-0.0000826" vb="1.0001793" />
--            <tca model="poly3" focal="100" br="0.0000227" vr="0.9999711" bb="-0.0000374" vb="1.0000907" />
--            <tca model="poly3" focal="135" br="0.0000114" vr="0.9999012" bb="-0.0000123" vb="1.0000019" />
--            <tca model="poly3" focal="250" br="0.0000067" vr="0.9998026" bb="-0.0000349" vb="0.9999041" />
-+        <calibration>
-+            <!-- data gathered by Spoilerhead 2010 <spoilerhead@gmail.com> using hugin-->
-+            <!-- 15 shots-->
-+            <distortion model="ptlens" focal="55" a="-0.000303056" b="-0.00581537" c="-0.00237143"/>
-+            <!-- 21 shots -->
-+            <distortion model="ptlens" focal="70" a="-0.000520255" b="2.86405e-05" c="0.00286934"/>
-+            <!-- 17-->
-+            <distortion model="ptlens" focal="100" a="0.00268582" b="-0.00578304" c="0.00718748"/>
-+            <!-- 15 -->
-+            <distortion model="ptlens" focal="135" a="0.00120309" b="0.00979416" c="-0.00868762"/>
-+            <!-- 18 -->
-+            <distortion model="ptlens" focal="250" a="-0.00226069" b="0.0111545" c="-0.00536676"/>
-+            <tca model="poly3" focal="55" br="0.0001058" vr="1.0000402" bb="-0.0001107" vb="1.0002220"/>
-+            <tca model="poly3" focal="70" br="0.0000486" vr="1.0000622" bb="-0.0000826" vb="1.0001793"/>
-+            <tca model="poly3" focal="100" br="0.0000227" vr="0.9999711" bb="-0.0000374" vb="1.0000907"/>
-+            <tca model="poly3" focal="135" br="0.0000114" vr="0.9999012" bb="-0.0000123" vb="1.0000019"/>
-+            <tca model="poly3" focal="250" br="0.0000067" vr="0.9998026" bb="-0.0000349" vb="0.9999041"/>
-+            <!-- Taken with Canon EOS 550D -->
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.6290" k2="0.4091" k3="-0.2801"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.6290" k2="0.4091" k3="-0.2801"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0462" k2="0.0472" k3="-0.2275"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0462" k2="0.0472" k3="-0.2275"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0096" k2="-0.1638" k3="0.1113"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0096" k2="-0.1638" k3="0.1113"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="0.0034" k2="-0.1932" k3="0.1293"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="0.0034" k2="-0.1932" k3="0.1293"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="0.0109" k2="-0.2130" k3="0.1418"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="0.0109" k2="-0.2130" k3="0.1418"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="0.0156" k2="-0.2249" k3="0.1494"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="0.0156" k2="-0.2249" k3="0.1494"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.6730" k2="0.6146" k3="-0.3810"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.6730" k2="0.6146" k3="-0.3810"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0447" k2="0.0246" k3="-0.1055"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0447" k2="0.0246" k3="-0.1055"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0120" k2="-0.1427" k3="0.1033"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0120" k2="-0.1427" k3="0.1033"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="0.0056" k2="-0.1861" k3="0.1315"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="0.0056" k2="-0.1861" k3="0.1315"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="0.0131" k2="-0.2045" k3="0.1438"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="0.0131" k2="-0.2045" k3="0.1438"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="0.0279" k2="-0.2334" k3="0.1579"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="0.0279" k2="-0.2334" k3="0.1579"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.5671" k2="0.5259" k3="-0.3298"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.5671" k2="0.5259" k3="-0.3298"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1714" k2="-0.0770" k3="-0.0088"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1714" k2="-0.0770" k3="-0.0088"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.0284" k2="-0.0551" k3="0.0354"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0284" k2="-0.0551" k3="0.0354"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.0119" k2="-0.1113" k3="0.0816"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0119" k2="-0.1113" k3="0.0816"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.0009" k2="-0.1424" k3="0.1032"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.0009" k2="-0.1424" k3="0.1032"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="0.0148" k2="-0.1704" k3="0.1192"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="0.0148" k2="-0.1704" k3="0.1192"/>
-+            <vignetting model="pa" focal="100" aperture="29" distance="10" k1="0.0196" k2="-0.1853" k3="0.1298"/>
-+            <vignetting model="pa" focal="100" aperture="29" distance="1000" k1="0.0196" k2="-0.1853" k3="0.1298"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.3279" k2="-0.1954" k3="0.0941"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.3279" k2="-0.1954" k3="0.0941"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1084" k2="-0.3475" k3="0.1150"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1084" k2="-0.3475" k3="0.1150"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0477" k2="0.0345" k3="-0.0424"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0477" k2="0.0345" k3="-0.0424"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.0121" k2="-0.0845" k3="0.0589"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.0121" k2="-0.0845" k3="0.0589"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="0.0076" k2="-0.1332" k3="0.0907"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="0.0076" k2="-0.1332" k3="0.0907"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="0.0241" k2="-0.1711" k3="0.1140"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="0.0241" k2="-0.1711" k3="0.1140"/>
-+            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="0.0310" k2="-0.1849" k3="0.1219"/>
-+            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="0.0310" k2="-0.1849" k3="0.1219"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.8137" k2="0.3985" k3="-0.0714"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.8137" k2="0.3985" k3="-0.0714"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.0019" k2="-0.0252" k3="-0.1253"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.0019" k2="-0.0252" k3="-0.1253"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.0151" k2="-0.0661" k3="0.0452"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0151" k2="-0.0661" k3="0.0452"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.0191" k2="-0.0666" k3="0.0480"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0191" k2="-0.0666" k3="0.0480"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0161" k2="-0.0789" k3="0.0570"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0161" k2="-0.0789" k3="0.0570"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0118" k2="-0.0902" k3="0.0630"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0118" k2="-0.0902" k3="0.0630"/>
-+            <vignetting model="pa" focal="250" aperture="5.6" distance="10" k1="-1.1623" k2="1.2351" k3="-0.5658"/>
-+            <vignetting model="pa" focal="250" aperture="5.6" distance="1000" k1="-1.1623" k2="1.2351" k3="-0.5658"/>
-+            <vignetting model="pa" focal="250" aperture="8" distance="10" k1="0.0520" k2="-0.2446" k3="0.0316"/>
-+            <vignetting model="pa" focal="250" aperture="8" distance="1000" k1="0.0520" k2="-0.2446" k3="0.0316"/>
-+            <vignetting model="pa" focal="250" aperture="11" distance="10" k1="-0.0198" k2="-0.0546" k3="0.0369"/>
-+            <vignetting model="pa" focal="250" aperture="11" distance="1000" k1="-0.0198" k2="-0.0546" k3="0.0369"/>
-+            <vignetting model="pa" focal="250" aperture="16" distance="10" k1="-0.0268" k2="-0.0486" k3="0.0355"/>
-+            <vignetting model="pa" focal="250" aperture="16" distance="1000" k1="-0.0268" k2="-0.0486" k3="0.0355"/>
-+            <vignetting model="pa" focal="250" aperture="22" distance="10" k1="-0.0268" k2="-0.0573" k3="0.0423"/>
-+            <vignetting model="pa" focal="250" aperture="22" distance="1000" k1="-0.0268" k2="-0.0573" k3="0.0423"/>
-+            <vignetting model="pa" focal="250" aperture="32" distance="10" k1="-0.0125" k2="-0.0836" k3="0.0552"/>
-+            <vignetting model="pa" focal="250" aperture="32" distance="1000" k1="-0.0125" k2="-0.0836" k3="0.0552"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>EF 70-200mm f/2.8L USM</model>
-+        <model>Canon EF 70-200mm f/2.8L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0.00685" b="-0.02857" c="0.01482" />
--            <distortion model="ptlens" focal="80" a="0.00289" b="-0.0102" c="-0.00108" />
--            <distortion model="ptlens" focal="98" a="0.00649" b="-0.01829" c="0.0112" />
--            <distortion model="ptlens" focal="115" a="0.00291" b="-0.00372" c="-0.00112" />
--            <distortion model="ptlens" focal="140" a="0.00303" b="-0.00409" c="0.00218" />
--            <distortion model="ptlens" focal="160" a="0.00393" b="-0.00724" c="0.00959" />
--            <distortion model="ptlens" focal="200" a="0.00188" b="0.0023" c="-0.00101" />
--            <tca model="poly3" focal="70" br="-0.0000072" vr="1.0002433" bb="-0.0000189" vb="1.0000710" />
--            <tca model="poly3" focal="80" br="-0.0000073" vr="1.0002115" bb="-0.0000063" vb="1.0000321" />
--            <tca model="poly3" focal="98" br="-0.0000184" vr="1.0001630" bb="-0.0000178" vb="1.0000256" />
--            <tca model="poly3" focal="110" br="0.0000060" vr="1.0000837" bb="-0.0000161" vb="1.0000120" />
--            <tca model="poly3" focal="130" br="0.0000047" vr="1.0000377" bb="-0.0000165" vb="0.9999858" />
--            <tca model="poly3" focal="155" br="0.0000177" vr="0.9999569" bb="-0.0000230" vb="1.0000025" />
--            <tca model="poly3" focal="200" br="0.0000050" vr="0.9998535" bb="-0.0000540" vb="1.0000457" />
--            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.4762" k2="0.2388" k3="-0.2546" />
--            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.4762" k2="0.2388" k3="-0.2546" />
--            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="0.0816" k2="-0.2944" k3="-0.0667" />
--            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="0.0816" k2="-0.2944" k3="-0.0667" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1361" k2="0.4030" k3="-0.4138" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1361" k2="0.4030" k3="-0.4138" />
--            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0644" k2="0.0589" k3="-0.0313" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0644" k2="0.0589" k3="-0.0313" />
--            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0529" k2="-0.0029" k3="0.0285" />
--            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0529" k2="-0.0029" k3="0.0285" />
--            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.4462" k2="0.3068" k3="-0.3205" />
--            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.4462" k2="0.3068" k3="-0.3205" />
--            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0263" k2="0.0948" k3="-0.3144" />
--            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0263" k2="0.0948" k3="-0.3144" />
--            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1531" k2="0.4373" k3="-0.3971" />
--            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1531" k2="0.4373" k3="-0.3971" />
--            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0497" k2="0.0163" k3="0.0033" />
--            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0497" k2="0.0163" k3="0.0033" />
--            <vignetting model="pa" focal="80" aperture="32" distance="10" k1="-0.0477" k2="-0.0152" k3="0.0372" />
--            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.0477" k2="-0.0152" k3="0.0372" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.2815" k2="-0.0586" k3="-0.1953" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.2815" k2="-0.0586" k3="-0.1953" />
--            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="0.0717" k2="-0.1539" k3="-0.2702" />
--            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0717" k2="-0.1539" k3="-0.2702" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1713" k2="0.6308" k3="-0.6955" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1713" k2="0.6308" k3="-0.6955" />
--            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1775" k2="0.5332" k3="-0.4790" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1775" k2="0.5332" k3="-0.4790" />
--            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.0433" k2="-0.0219" k3="0.0405" />
--            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0433" k2="-0.0219" k3="0.0405" />
--            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.3282" k2="-0.6099" k3="0.3775" />
--            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.3282" k2="-0.6099" k3="0.3775" />
--            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.2872" k2="-1.2345" k3="0.5705" />
--            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.2872" k2="-1.2345" k3="0.5705" />
--            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="0.0220" k2="-0.0050" k3="-0.3018" />
--            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0220" k2="-0.0050" k3="-0.3018" />
--            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1702" k2="0.5755" k3="-0.5787" />
--            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1702" k2="0.5755" k3="-0.5787" />
--            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="-0.0424" k2="-0.0142" k3="0.0352" />
--            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.0424" k2="-0.0142" k3="0.0352" />
--            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.4350" k2="1.7567" k3="-0.9122" />
--            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.4350" k2="1.7567" k3="-0.9122" />
--            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.1855" k2="-0.7593" k3="0.5488" />
--            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.1855" k2="-0.7593" k3="0.5488" />
--            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.2013" k2="-0.8329" k3="0.3544" />
--            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.2013" k2="-0.8329" k3="0.3544" />
--            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0728" k2="0.2494" k3="-0.3457" />
--            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0728" k2="0.2494" k3="-0.3457" />
--            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0412" k2="-0.0125" k3="0.0382" />
--            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0412" k2="-0.0125" k3="0.0382" />
-+            <distortion model="ptlens" focal="70" a="0.00685" b="-0.02857" c="0.01482"/>
-+            <distortion model="ptlens" focal="80" a="0.00289" b="-0.0102" c="-0.00108"/>
-+            <distortion model="ptlens" focal="98" a="0.00649" b="-0.01829" c="0.0112"/>
-+            <distortion model="ptlens" focal="115" a="0.00291" b="-0.00372" c="-0.00112"/>
-+            <distortion model="ptlens" focal="140" a="0.00303" b="-0.00409" c="0.00218"/>
-+            <distortion model="ptlens" focal="160" a="0.00393" b="-0.00724" c="0.00959"/>
-+            <distortion model="ptlens" focal="200" a="0.00188" b="0.0023" c="-0.00101"/>
-+            <tca model="poly3" focal="70" br="-0.0000072" vr="1.0002433" bb="-0.0000189" vb="1.0000710"/>
-+            <tca model="poly3" focal="80" br="-0.0000073" vr="1.0002115" bb="-0.0000063" vb="1.0000321"/>
-+            <tca model="poly3" focal="98" br="-0.0000184" vr="1.0001630" bb="-0.0000178" vb="1.0000256"/>
-+            <tca model="poly3" focal="110" br="0.0000060" vr="1.0000837" bb="-0.0000161" vb="1.0000120"/>
-+            <tca model="poly3" focal="130" br="0.0000047" vr="1.0000377" bb="-0.0000165" vb="0.9999858"/>
-+            <tca model="poly3" focal="155" br="0.0000177" vr="0.9999569" bb="-0.0000230" vb="1.0000025"/>
-+            <tca model="poly3" focal="200" br="0.0000050" vr="0.9998535" bb="-0.0000540" vb="1.0000457"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.4762" k2="0.2388" k3="-0.2546"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.4762" k2="0.2388" k3="-0.2546"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="0.0816" k2="-0.2944" k3="-0.0667"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="0.0816" k2="-0.2944" k3="-0.0667"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1361" k2="0.4030" k3="-0.4138"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1361" k2="0.4030" k3="-0.4138"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0644" k2="0.0589" k3="-0.0313"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0644" k2="0.0589" k3="-0.0313"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0529" k2="-0.0029" k3="0.0285"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0529" k2="-0.0029" k3="0.0285"/>
-+            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.4462" k2="0.3068" k3="-0.3205"/>
-+            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.4462" k2="0.3068" k3="-0.3205"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0263" k2="0.0948" k3="-0.3144"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0263" k2="0.0948" k3="-0.3144"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1531" k2="0.4373" k3="-0.3971"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1531" k2="0.4373" k3="-0.3971"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0497" k2="0.0163" k3="0.0033"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0497" k2="0.0163" k3="0.0033"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="10" k1="-0.0477" k2="-0.0152" k3="0.0372"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.0477" k2="-0.0152" k3="0.0372"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.2815" k2="-0.0586" k3="-0.1953"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.2815" k2="-0.0586" k3="-0.1953"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="0.0717" k2="-0.1539" k3="-0.2702"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0717" k2="-0.1539" k3="-0.2702"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1713" k2="0.6308" k3="-0.6955"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1713" k2="0.6308" k3="-0.6955"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1775" k2="0.5332" k3="-0.4790"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1775" k2="0.5332" k3="-0.4790"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.0433" k2="-0.0219" k3="0.0405"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0433" k2="-0.0219" k3="0.0405"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.3282" k2="-0.6099" k3="0.3775"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.3282" k2="-0.6099" k3="0.3775"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.2872" k2="-1.2345" k3="0.5705"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.2872" k2="-1.2345" k3="0.5705"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="0.0220" k2="-0.0050" k3="-0.3018"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0220" k2="-0.0050" k3="-0.3018"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1702" k2="0.5755" k3="-0.5787"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1702" k2="0.5755" k3="-0.5787"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="-0.0424" k2="-0.0142" k3="0.0352"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.0424" k2="-0.0142" k3="0.0352"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.4350" k2="1.7567" k3="-0.9122"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.4350" k2="1.7567" k3="-0.9122"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.1855" k2="-0.7593" k3="0.5488"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.1855" k2="-0.7593" k3="0.5488"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.2013" k2="-0.8329" k3="0.3544"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.2013" k2="-0.8329" k3="0.3544"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0728" k2="0.2494" k3="-0.3457"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0728" k2="0.2494" k3="-0.3457"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0412" k2="-0.0125" k3="0.0382"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0412" k2="-0.0125" k3="0.0382"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 70-200mm f/2.8L IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.009135" c="0" />
--            <distortion model="ptlens" focal="73" a="0" b="-0.008769" c="0" />
--            <distortion model="ptlens" focal="78" a="0" b="-0.006965" c="0" />
--            <distortion model="ptlens" focal="80" a="0" b="-0.005047" c="0" />
--            <distortion model="ptlens" focal="90" a="0" b="-0.000959" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.00029" c="0" />
--            <distortion model="ptlens" focal="115" a="0" b="0.002667" c="0" />
--            <distortion model="ptlens" focal="130" a="0" b="0.004312" c="0" />
--            <distortion model="ptlens" focal="145" a="0" b="0.004809" c="0" />
--            <distortion model="ptlens" focal="160" a="0" b="0.005218" c="0" />
--            <distortion model="ptlens" focal="170" a="0" b="0.006153" c="0" />
--            <distortion model="ptlens" focal="185" a="0" b="0.006109" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.008631" c="0" />
-+            <distortion model="poly3" focal="70" k1="-0.009135"/>
-+            <distortion model="poly3" focal="73" k1="-0.008769"/>
-+            <distortion model="poly3" focal="78" k1="-0.006965"/>
-+            <distortion model="poly3" focal="80" k1="-0.005047"/>
-+            <distortion model="poly3" focal="90" k1="-0.000959"/>
-+            <distortion model="poly3" focal="100" k1="0.00029"/>
-+            <distortion model="poly3" focal="115" k1="0.002667"/>
-+            <distortion model="poly3" focal="130" k1="0.004312"/>
-+            <distortion model="poly3" focal="145" k1="0.004809"/>
-+            <distortion model="poly3" focal="160" k1="0.005218"/>
-+            <distortion model="poly3" focal="170" k1="0.006153"/>
-+            <distortion model="poly3" focal="185" k1="0.006109"/>
-+            <distortion model="poly3" focal="200" k1="0.008631"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 70-200mm f/2.8L IS USM + EF 1.4x ext</model>
-+        <model>Canon EF 70-200mm f/2.8L IS USM + EF 1.4x extender</model>
-+        <model lang="en">Canon EF 70-200mm f/2.8L IS USM + EF 1.4× ext.</model>
-+        <model lang="de">Canon EF 70-200mm f/2.8L IS USM + EF 1,4×-Konv.</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="98" a="0" b="-0.012279" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="-0.012117" c="0" />
--            <distortion model="ptlens" focal="110" a="0" b="-0.011447" c="0" />
--            <distortion model="ptlens" focal="120" a="0" b="-0.010878" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="-0.00804" c="0" />
--            <distortion model="ptlens" focal="145" a="0" b="-0.00886" c="0" />
--            <distortion model="ptlens" focal="160" a="0" b="-0.00706" c="0" />
--            <distortion model="ptlens" focal="185" a="0" b="-0.006693" c="0" />
--            <distortion model="ptlens" focal="220" a="0" b="-0.006125" c="0" />
--            <distortion model="ptlens" focal="245" a="0" b="-0.004999" c="0" />
--            <distortion model="ptlens" focal="280" a="0" b="-0.004683" c="0" />
-+            <distortion model="poly3" focal="98" k1="-0.012279"/>
-+            <distortion model="poly3" focal="105" k1="-0.012117"/>
-+            <distortion model="poly3" focal="110" k1="-0.011447"/>
-+            <distortion model="poly3" focal="120" k1="-0.010878"/>
-+            <distortion model="poly3" focal="135" k1="-0.00804"/>
-+            <distortion model="poly3" focal="145" k1="-0.00886"/>
-+            <distortion model="poly3" focal="160" k1="-0.00706"/>
-+            <distortion model="poly3" focal="185" k1="-0.006693"/>
-+            <distortion model="poly3" focal="220" k1="-0.006125"/>
-+            <distortion model="poly3" focal="245" k1="-0.004999"/>
-+            <distortion model="poly3" focal="280" k1="-0.004683"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 70-200mm f/2.8L IS II USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0.00109" b="-0.01393" c="0.00917" />
--            <distortion model="ptlens" focal="88" a="0.00034" b="-0.00584" c="0.00243" />
--            <distortion model="ptlens" focal="102" a="0.00261" b="-0.00765" c="0.00252" />
--            <distortion model="ptlens" focal="120" a="0.00426" b="-0.0109" c="0.00708" />
--            <distortion model="ptlens" focal="135" a="0.00091" b="0.00263" c="-0.00627" />
--            <distortion model="ptlens" focal="160" a="-0.00014" b="0.00502" c="-0.00361" />
--            <distortion model="ptlens" focal="200" a="0.00255" b="-0.00438" c="0.01481" />
-+            <distortion model="ptlens" focal="70" a="0.00109" b="-0.01393" c="0.00917"/>
-+            <distortion model="ptlens" focal="88" a="0.00034" b="-0.00584" c="0.00243"/>
-+            <distortion model="ptlens" focal="102" a="0.00261" b="-0.00765" c="0.00252"/>
-+            <distortion model="ptlens" focal="120" a="0.00426" b="-0.0109" c="0.00708"/>
-+            <distortion model="ptlens" focal="135" a="0.00091" b="0.00263" c="-0.00627"/>
-+            <distortion model="ptlens" focal="160" a="-0.00014" b="0.00502" c="-0.00361"/>
-+            <distortion model="ptlens" focal="200" a="0.00255" b="-0.00438" c="0.01481"/>
-+            <!-- Taken with Canon EOS 5D Mark III -->
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1.1" k1="-0.6903" k2="0.4915" k3="-0.4215"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="2.2" k1="-0.7032" k2="0.5010" k3="-0.3688"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="6.6" k1="-0.7044" k2="0.5140" k3="-0.3822"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.6992" k2="0.4928" k3="-0.3584"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1.1" k1="-0.1523" k2="0.0629" k3="-0.3971"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="2.2" k1="-0.1805" k2="0.1006" k3="-0.3310"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="6.6" k1="-0.1908" k2="0.1437" k3="-0.3707"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1751" k2="0.0818" k3="-0.3094"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1.1" k1="-0.3493" k2="0.7191" k3="-0.7897"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="2.2" k1="-0.3213" k2="0.5350" k3="-0.5394"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="6.6" k1="-0.3404" k2="0.6019" k3="-0.5957"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3198" k2="0.5243" k3="-0.5184"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1.1" k1="-0.3772" k2="0.7410" k3="-0.7060"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="2.2" k1="-0.2877" k2="0.3610" k3="-0.3299"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="6.6" k1="-0.2978" k2="0.3942" k3="-0.3545"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2864" k2="0.3514" k3="-0.3141"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1.1" k1="-0.3134" k2="0.4626" k3="-0.4231"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="2.2" k1="-0.2799" k2="0.3009" k3="-0.2530"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="6.6" k1="-0.2883" k2="0.3303" k3="-0.2752"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2804" k2="0.3049" k3="-0.2529"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1.1" k1="-0.2986" k2="0.3882" k3="-0.3436"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="2.2" k1="-0.2800" k2="0.2825" k3="-0.2246"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="6.6" k1="-0.2911" k2="0.3217" k3="-0.2563"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2819" k2="0.2923" k3="-0.2304"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1.1" k1="-0.2983" k2="0.3751" k3="-0.3249"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="2.2" k1="-0.2796" k2="0.2666" k3="-0.2031"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="6.6" k1="-0.2941" k2="0.3210" k3="-0.2496"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2864" k2="0.2932" k3="-0.2235"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1.1" k1="-0.3010" k2="0.3744" k3="-0.3195"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="2.2" k1="-0.2808" k2="0.2589" k3="-0.1912"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="6.6" k1="-0.2999" k2="0.3276" k3="-0.2489"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.2917" k2="0.2960" k3="-0.2192"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1.1" k1="-0.4127" k2="-0.8186" k3="0.5474"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="2.2" k1="-0.3584" k2="-0.5409" k3="0.2464"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="6.6" k1="-0.3842" k2="-0.3887" k3="0.1295"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.3807" k2="-0.3923" k3="0.1283"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1.1" k1="0.1766" k2="-1.3863" k3="0.6308"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="2.2" k1="0.0256" k2="-0.6318" k3="0.0693"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="6.6" k1="-0.0139" k2="-0.4667" k3="-0.0410"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0140" k2="-0.4695" k3="-0.0407"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1.1" k1="-0.0564" k2="-0.2502" k3="-0.2590"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="2.2" k1="-0.2328" k2="0.3530" k3="-0.6180"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="6.6" k1="-0.2563" k2="0.4342" k3="-0.6531"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.2521" k2="0.4154" k3="-0.6411"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1.1" k1="-0.3159" k2="0.6907" k3="-0.9083"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="2.2" k1="-0.3821" k2="0.8224" k3="-0.8810"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="6.6" k1="-0.3718" k2="0.7842" k3="-0.8262"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.3669" k2="0.7595" k3="-0.8071"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1.1" k1="-0.4569" k2="1.1204" k3="-1.1430"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="2.2" k1="-0.4052" k2="0.8352" k3="-0.8031"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="6.6" k1="-0.3698" k2="0.7073" k3="-0.6829"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.3644" k2="0.6871" k3="-0.6710"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1.1" k1="-0.4712" k2="1.1108" k3="-1.0630"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="2.2" k1="-0.3781" k2="0.6930" k3="-0.6437"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="6.6" k1="-0.3465" k2="0.5848" k3="-0.5439"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.3417" k2="0.5641" k3="-0.5299"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1.1" k1="-0.4159" k2="0.8655" k3="-0.8143"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="2.2" k1="-0.3567" k2="0.5901" k3="-0.5326"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="6.6" k1="-0.3424" k2="0.5596" k3="-0.5155"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.3323" k2="0.5078" k3="-0.4635"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1.1" k1="-0.3706" k2="0.6724" k3="-0.6293"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="2.2" k1="-0.3552" k2="0.5638" k3="-0.4961"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="6.6" k1="-0.3401" k2="0.5322" k3="-0.4787"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.3321" k2="0.4860" k3="-0.4315"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="1.1" k1="-0.9114" k2="0.1148" k3="0.1331"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="2.2" k1="-0.5217" k2="-0.6324" k3="0.5138"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="6.6" k1="-0.5075" k2="-0.6224" k3="0.4935"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.4616" k2="-0.7000" k3="0.5298"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1.1" k1="0.0836" k2="-1.4986" k3="0.8879"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="2.2" k1="0.1548" k2="-1.3879" k3="0.7263"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="6.6" k1="0.1360" k2="-1.2941" k3="0.6588"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.1264" k2="-1.2471" k3="0.6209"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1.1" k1="0.0393" k2="-0.6959" k3="0.1619"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="2.2" k1="-0.0399" k2="-0.3418" k3="-0.0873"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="6.6" k1="-0.0671" k2="-0.2549" k3="-0.1339"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0846" k2="-0.1894" k3="-0.1807"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1.1" k1="-0.2401" k2="0.3734" k3="-0.5770"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="2.2" k1="-0.2865" k2="0.5155" k3="-0.6318"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="6.6" k1="-0.2847" k2="0.4939" k3="-0.5961"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2942" k2="0.5236" k3="-0.6136"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1.1" k1="-0.3775" k2="0.7654" k3="-0.7480"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="2.2" k1="-0.3560" k2="0.6547" k3="-0.6132"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="6.6" k1="-0.3248" k2="0.5429" k3="-0.5166"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.3200" k2="0.5307" k3="-0.5093"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1.1" k1="-0.3505" k2="0.5924" k3="-0.5254"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="2.2" k1="-0.3037" k2="0.4038" k3="-0.3422"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="6.6" k1="-0.2771" k2="0.3288" k3="-0.2919"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.2794" k2="0.3395" k3="-0.3011"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1.1" k1="-0.2934" k2="0.3457" k3="-0.2829"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="2.2" k1="-0.2917" k2="0.3279" k3="-0.2543"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="6.6" k1="-0.2686" k2="0.2746" k3="-0.2265"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2745" k2="0.2974" k3="-0.2460"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1.1" k1="-0.2895" k2="0.3111" k3="-0.2395"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="2.2" k1="-0.2948" k2="0.3140" k3="-0.2270"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="6.6" k1="-0.2624" k2="0.2556" k3="-0.2102"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.2744" k2="0.2780" k3="-0.2174"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1.1" k1="-1.0106" k2="0.6461" k3="-0.2061"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="2.2" k1="-1.2689" k2="1.1306" k3="-0.4702"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="6.6" k1="-1.4187" k2="1.4460" k3="-0.6515"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.3763" k2="1.3539" k3="-0.5966"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1.1" k1="-0.4700" k2="-0.4018" k3="0.3900"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="2.2" k1="-0.2008" k2="-0.9436" k3="0.6831"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="6.6" k1="-0.1684" k2="-0.9831" k3="0.6955"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.1467" k2="-1.0150" k3="0.7087"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1.1" k1="0.0799" k2="-1.0113" k3="0.5261"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="2.2" k1="0.0745" k2="-0.8751" k3="0.4136"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="6.6" k1="0.0578" k2="-0.8091" k3="0.3684"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0523" k2="-0.7662" k3="0.3361"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1.1" k1="-0.1596" k2="0.0923" k3="-0.2576"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="2.2" k1="-0.1845" k2="0.1739" k3="-0.2892"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="6.6" k1="-0.1901" k2="0.1756" k3="-0.2789"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1936" k2="0.1920" k3="-0.2842"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1.1" k1="-0.2535" k2="0.3075" k3="-0.2632"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="2.2" k1="-0.2348" k2="0.2272" k3="-0.1771"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="6.6" k1="-0.2227" k2="0.1756" k3="-0.1347"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2164" k2="0.1547" k3="-0.1135"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1.1" k1="-0.1965" k2="0.0573" k3="-0.0079"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="2.2" k1="-0.2088" k2="0.0847" k3="-0.0200"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="6.6" k1="-0.2046" k2="0.0693" k3="-0.0136"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2059" k2="0.0741" k3="-0.0143"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1.1" k1="-0.2089" k2="0.0698" k3="-0.0029"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="2.2" k1="-0.2144" k2="0.0843" k3="-0.0087"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="6.6" k1="-0.2084" k2="0.0650" k3="-0.0001"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.2118" k2="0.0734" k3="-0.0019"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1.1" k1="-0.2151" k2="0.0762" k3="-0.0006"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="2.2" k1="-0.2250" k2="0.1005" k3="-0.0129"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="6.6" k1="-0.2227" k2="0.0901" k3="-0.0095"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.2221" k2="0.0892" k3="-0.0062"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 70-200mm f/4L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.006408" c="0" />
--            <distortion model="ptlens" focal="75" a="0" b="-0.005162" c="0" />
--            <distortion model="ptlens" focal="81" a="0" b="-0.003271" c="0" />
--            <distortion model="ptlens" focal="94" a="0" b="0.000642" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.002069" c="0" />
--            <distortion model="ptlens" focal="109" a="0" b="0.003375" c="0" />
--            <distortion model="ptlens" focal="122" a="0" b="0.004125" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.005898" c="0" />
--            <distortion model="ptlens" focal="145" a="0" b="0.006262" c="0" />
--            <distortion model="ptlens" focal="159" a="0" b="0.007369" c="0" />
--            <distortion model="ptlens" focal="168" a="0" b="0.008619" c="0" />
--            <distortion model="ptlens" focal="184" a="0" b="0.008464" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.008816" c="0" />
-+            <distortion model="poly3" focal="70" k1="-0.006408"/>
-+            <distortion model="poly3" focal="75" k1="-0.005162"/>
-+            <distortion model="poly3" focal="81" k1="-0.003271"/>
-+            <distortion model="poly3" focal="94" k1="0.000642"/>
-+            <distortion model="poly3" focal="100" k1="0.002069"/>
-+            <distortion model="poly3" focal="109" k1="0.003375"/>
-+            <distortion model="poly3" focal="122" k1="0.004125"/>
-+            <distortion model="poly3" focal="135" k1="0.005898"/>
-+            <distortion model="poly3" focal="145" k1="0.006262"/>
-+            <distortion model="poly3" focal="159" k1="0.007369"/>
-+            <distortion model="poly3" focal="168" k1="0.008619"/>
-+            <distortion model="poly3" focal="184" k1="0.008464"/>
-+            <distortion model="poly3" focal="200" k1="0.008816"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 70-200mm f/4L USM + EF 1.4x ext</model>
-+        <model>Canon EF 70-200mm f/4L USM + EF 1.4x extender</model>
-+        <model lang="en">Canon EF 70-200mm f/4L USM + EF 1.4× ext.</model>
-+        <model lang="de">Canon EF 70-200mm f/4L USM + EF 1,4×-Konv.</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="98" a="0" b="-0.011699" c="0" />
--            <distortion model="ptlens" focal="109" a="0" b="-0.010575" c="0" />
--            <distortion model="ptlens" focal="117" a="0" b="-0.008594" c="0" />
--            <distortion model="ptlens" focal="127" a="0" b="-0.008167" c="0" />
--            <distortion model="ptlens" focal="140" a="0" b="-0.007141" c="0" />
--            <distortion model="ptlens" focal="158" a="0" b="-0.005869" c="0" />
--            <distortion model="ptlens" focal="176" a="0" b="-0.00486" c="0" />
--            <distortion model="ptlens" focal="189" a="0" b="-0.005166" c="0" />
--            <distortion model="ptlens" focal="203" a="0" b="-0.004933" c="0" />
--            <distortion model="ptlens" focal="222" a="0" b="-0.004657" c="0" />
--            <distortion model="ptlens" focal="235" a="0" b="-0.004297" c="0" />
--            <distortion model="ptlens" focal="280" a="0" b="-0.002653" c="0" />
-+            <distortion model="poly3" focal="98" k1="-0.011699"/>
-+            <distortion model="poly3" focal="109" k1="-0.010575"/>
-+            <distortion model="poly3" focal="117" k1="-0.008594"/>
-+            <distortion model="poly3" focal="127" k1="-0.008167"/>
-+            <distortion model="poly3" focal="140" k1="-0.007141"/>
-+            <distortion model="poly3" focal="158" k1="-0.005869"/>
-+            <distortion model="poly3" focal="176" k1="-0.00486"/>
-+            <distortion model="poly3" focal="189" k1="-0.005166"/>
-+            <distortion model="poly3" focal="203" k1="-0.004933"/>
-+            <distortion model="poly3" focal="222" k1="-0.004657"/>
-+            <distortion model="poly3" focal="235" k1="-0.004297"/>
-+            <distortion model="poly3" focal="280" k1="-0.002653"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon 70-200mm f/4L IS USM</model>
-+        <model>Canon EF 70-200mm f/4L IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="-0.012" b="0.037" c="-0.046" />
--            <distortion model="ptlens" focal="97" a="0.008" b="-0.025" c="0.028" />
--            <distortion model="ptlens" focal="127" a="0.001" b="0.004" c="-0.001" />
--            <distortion model="ptlens" focal="200" a="-0.005" b="0.032" c="-0.031" />
-+            <distortion model="ptlens" focal="70" a="-0.012" b="0.037" c="-0.046"/>
-+            <distortion model="ptlens" focal="97" a="0.008" b="-0.025" c="0.028"/>
-+            <distortion model="ptlens" focal="127" a="0.001" b="0.004" c="-0.001"/>
-+            <distortion model="ptlens" focal="200" a="-0.005" b="0.032" c="-0.031"/>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <tca model="poly3" focal="70" br="0.0000002" vr="1.0001779" bb="-0.0000138" vb="1.0001003"/>
-+            <tca model="poly3" focal="100" br="-0.0000004" vr="1.0000236" bb="-0.0000081" vb="1.0001239"/>
-+            <tca model="poly3" focal="135" br="0.0000079" vr="0.9999147" bb="-0.0000141" vb="1.0001189"/>
-+            <tca model="poly3" focal="165" br="0.0000133" vr="0.9998324" bb="-0.0000299" vb="1.0000915"/>
-+            <tca model="poly3" focal="200" br="0.0000097" vr="0.9998125" bb="-0.0000270" vb="1.0000112"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1.2" k1="-0.5200" k2="0.1223" k3="-0.0882"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="2.4" k1="-0.5088" k2="0.0999" k3="-0.0725"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="7.2" k1="-0.5123" k2="0.1057" k3="-0.0755"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5228" k2="0.1280" k3="-0.0927"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1.2" k1="-0.1859" k2="0.0559" k3="-0.1686"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="2.4" k1="-0.1773" k2="0.0381" k3="-0.1561"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="7.2" k1="-0.1891" k2="0.0626" k3="-0.1714"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1839" k2="0.0595" k3="-0.1739"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1.2" k1="-0.2517" k2="0.1818" k3="-0.1150"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="2.4" k1="-0.2462" k2="0.1726" k3="-0.1067"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="7.2" k1="-0.2393" k2="0.1445" k3="-0.0808"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2390" k2="0.1525" k3="-0.0951"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1.2" k1="-0.2019" k2="-0.0232" k3="0.0783"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="2.4" k1="-0.1959" k2="-0.0342" k3="0.0885"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="7.2" k1="-0.1947" k2="-0.0403" k3="0.0939"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1873" k2="-0.0534" k3="0.0967"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1.2" k1="-0.2015" k2="-0.0272" k3="0.0820"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="2.4" k1="-0.1983" k2="-0.0311" k3="0.0873"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="7.2" k1="-0.1973" k2="-0.0362" k3="0.0919"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.1876" k2="-0.0553" k3="0.0986"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1.2" k1="-0.2052" k2="-0.0230" k3="0.0809"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="2.4" k1="-0.2016" k2="-0.0263" k3="0.0855"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="7.2" k1="-0.2019" k2="-0.0269" k3="0.0864"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1913" k2="-0.0489" k3="0.0954"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1.2" k1="-0.2129" k2="-0.0085" k3="0.0730"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="2.4" k1="-0.2077" k2="-0.0147" k3="0.0794"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="7.2" k1="-0.2110" k2="-0.0064" k3="0.0733"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.1961" k2="-0.0393" k3="0.0896"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1.2" k1="-0.2161" k2="-0.9770" k3="0.5708"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="2.4" k1="-0.2959" k2="-0.2855" k3="0.0499"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="7.2" k1="-0.3594" k2="-0.0599" k3="-0.0874"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.3967" k2="0.0764" k3="-0.1680"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1.2" k1="0.0697" k2="-0.8185" k3="0.2449"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="2.4" k1="-0.1880" k2="0.1425" k3="-0.3280"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="7.2" k1="-0.2320" k2="0.2708" k3="-0.3750"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.2572" k2="0.3403" k3="-0.3979"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1.2" k1="-0.2376" k2="0.3575" k3="-0.5703"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="2.4" k1="-0.3169" k2="0.4956" k3="-0.4426"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="7.2" k1="-0.2981" k2="0.3958" k3="-0.3251"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.2702" k2="0.2787" k3="-0.2090"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1.2" k1="-0.3996" k2="0.8377" k3="-0.8039"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="2.4" k1="-0.2305" k2="0.1100" k3="-0.0437"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="7.2" k1="-0.2041" k2="0.0018" k3="0.0561"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1907" k2="-0.0409" k3="0.0881"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1.2" k1="-0.3768" k2="0.6594" k3="-0.5536"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="2.4" k1="-0.1958" k2="-0.0341" k3="0.0890"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="7.2" k1="-0.1956" k2="-0.0369" k3="0.0920"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.1880" k2="-0.0529" k3="0.0985"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1.2" k1="-0.2728" k2="0.2260" k3="-0.1400"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="2.4" k1="-0.1993" k2="-0.0315" k3="0.0897"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="7.2" k1="-0.1989" k2="-0.0327" k3="0.0909"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.1897" k2="-0.0531" k3="0.1004"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1.2" k1="-0.2296" k2="0.0458" k3="0.0264"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="2.4" k1="-0.2059" k2="-0.0190" k3="0.0830"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="7.2" k1="-0.2061" k2="-0.0198" k3="0.0842"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1960" k2="-0.0421" k3="0.0946"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1.2" k1="-0.7218" k2="-0.3407" k3="0.4060"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="2.4" k1="-0.4301" k2="-0.6250" k3="0.4812"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="7.2" k1="-0.2731" k2="-0.8010" k3="0.5210"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.2639" k2="-0.7526" k3="0.4748"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1.2" k1="0.1366" k2="-1.6201" k3="0.9500"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="2.4" k1="0.0676" k2="-0.9085" k3="0.4165"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="7.2" k1="0.0087" k2="-0.6074" k3="0.1965"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0265" k2="-0.4691" k3="0.1092"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1.2" k1="0.0379" k2="-0.6698" k3="0.1309"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="2.4" k1="-0.2227" k2="0.2627" k3="-0.3791"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="7.2" k1="-0.2602" k2="0.3627" k3="-0.4059"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2729" k2="0.3859" k3="-0.3989"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1.2" k1="-0.2595" k2="0.4383" k3="-0.6210"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="2.4" k1="-0.2937" k2="0.3982" k3="-0.3308"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="7.2" k1="-0.2662" k2="0.2701" k3="-0.1967"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2353" k2="0.1478" k3="-0.0838"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1.2" k1="-0.3953" k2="0.8210" k3="-0.7791"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="2.4" k1="-0.2066" k2="0.0250" k3="0.0354"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="7.2" k1="-0.1909" k2="-0.0354" k3="0.0890"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1841" k2="-0.0515" k3="0.0965"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1.2" k1="-0.3597" k2="0.5933" k3="-0.4867"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="2.4" k1="-0.1950" k2="-0.0297" k3="0.0872"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="7.2" k1="-0.1936" k2="-0.0349" k3="0.0914"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1836" k2="-0.0570" k3="0.1018"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1.2" k1="-0.2665" k2="0.2087" k3="-0.1236"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="2.4" k1="-0.2008" k2="-0.0207" k3="0.0835"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="7.2" k1="-0.1996" k2="-0.0257" k3="0.0874"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1869" k2="-0.0541" k3="0.1019"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1.2" k1="-1.3869" k2="1.3645" k3="-0.5975"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="2.4" k1="-1.4572" k2="1.6038" k3="-0.7493"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="7.2" k1="-1.3355" k2="1.3855" k3="-0.6326"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-1.2097" k2="1.1495" k3="-0.5099"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1.2" k1="-0.5875" k2="-0.3199" k3="0.3901"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="2.4" k1="-0.1979" k2="-0.8929" k3="0.6569"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="7.2" k1="-0.0766" k2="-0.9730" k3="0.6522"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0028" k2="-1.0499" k3="0.6600"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1.2" k1="0.0953" k2="-1.2513" k3="0.7154"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="2.4" k1="0.0023" k2="-0.5947" k3="0.2501"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="7.2" k1="-0.0974" k2="-0.1938" k3="-0.0108"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1281" k2="-0.0890" k3="-0.0716"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1.2" k1="-0.1134" k2="-0.1124" k3="-0.1389"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="2.4" k1="-0.2417" k2="0.2666" k3="-0.2525"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="7.2" k1="-0.2329" k2="0.1868" k3="-0.1324"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2273" k2="0.1592" k3="-0.1016"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1.2" k1="-0.2923" k2="0.4301" k3="-0.3911"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="2.4" k1="-0.1960" k2="0.0129" k3="0.0467"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="7.2" k1="-0.1856" k2="-0.0280" k3="0.0830"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.1819" k2="-0.0335" k3="0.0817"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1.2" k1="-0.2181" k2="0.0813" k3="-0.0163"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="2.4" k1="-0.1916" k2="-0.0145" k3="0.0747"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="7.2" k1="-0.1888" k2="-0.0245" k3="0.0824"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1803" k2="-0.0404" k3="0.0870"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1.2" k1="-0.1975" k2="-0.0084" k3="0.0673"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="2.4" k1="-0.1957" k2="-0.0061" k3="0.0694"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="7.2" k1="-0.1944" k2="-0.0139" k3="0.0757"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1823" k2="-0.0364" k3="0.0843"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 70-200mm f/4L IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 650D -->
-+            <distortion model="poly3" focal="70" k1="-0.00476"/>
-+            <distortion model="poly3" focal="85" k1="-0.00094"/>
-+            <distortion model="poly3" focal="135" k1="0.00256"/>
-+            <distortion model="poly3" focal="200" k1="0.00608"/>
-+            <tca model="poly3" focal="70" vr="1.0001" vb="1.0003"/>
-+            <tca model="poly3" focal="85" vr="1.0001" vb="1.00015"/>
-+            <tca model="poly3" focal="135" vr="0.9998" vb="1.0002"/>
-+            <tca model="poly3" focal="200" vr="0.99975" vb="1"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 70-300mm f/4.5-5.6 DO IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.003445" c="0" />
--            <distortion model="ptlens" focal="75" a="0" b="-0.001549" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.004544" c="0" />
--            <distortion model="ptlens" focal="130" a="0" b="0.009179" c="0" />
--            <distortion model="ptlens" focal="150" a="0" b="0.010655" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.010972" c="0" />
--            <distortion model="ptlens" focal="230" a="0" b="0.009311" c="0" />
--            <distortion model="ptlens" focal="270" a="0" b="0.011792" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.009986" c="0" />
-+            <distortion model="poly3" focal="70" k1="-0.003445"/>
-+            <distortion model="poly3" focal="75" k1="-0.001549"/>
-+            <distortion model="poly3" focal="100" k1="0.004544"/>
-+            <distortion model="poly3" focal="130" k1="0.009179"/>
-+            <distortion model="poly3" focal="150" k1="0.010655"/>
-+            <distortion model="poly3" focal="200" k1="0.010972"/>
-+            <distortion model="poly3" focal="230" k1="0.009311"/>
-+            <distortion model="poly3" focal="270" k1="0.011792"/>
-+            <distortion model="poly3" focal="300" k1="0.009986"/>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <tca model="poly3" focal="70" br="-0.0000749" vr="1.0007175" bb="0.0002339" vb="0.9998906"/>
-+            <tca model="poly3" focal="90" br="-0.0001527" vr="1.0006139" bb="0.0003057" vb="0.9999619"/>
-+            <tca model="poly3" focal="100" br="-0.0001323" vr="1.0003968" bb="0.0003134" vb="1.0000848"/>
-+            <tca model="poly3" focal="140" br="-0.0001266" vr="1.0001416" bb="0.0003734" vb="1.0000699"/>
-+            <tca model="poly3" focal="200" br="-0.0000490" vr="0.9998971" bb="-0.0000101" vb="1.0002337"/>
-+            <tca model="poly3" focal="300" br="-0.0001831" vr="0.9997621" bb="-0.0000008" vb="0.9999507"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1.4" k1="-0.2177" k2="-0.7961" k3="0.5698"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="3" k1="-0.1991" k2="-0.8476" k3="0.6006"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.2295" k2="-0.7931" k3="0.5739"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.2517" k2="-0.7521" k3="0.5526"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1.4" k1="-0.0190" k2="-0.5247" k3="0.3056"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="3" k1="-0.0008" k2="-0.5503" k3="0.3197"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.0110" k2="-0.5109" k3="0.2925"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.0098" k2="-0.4773" k3="0.2645"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="1.4" k1="-0.1413" k2="-0.1615" k3="0.1463"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="3" k1="-0.1253" k2="-0.1888" k3="0.1634"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.1240" k2="-0.1887" k3="0.1608"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.1313" k2="-0.1701" k3="0.1510"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1.4" k1="-0.2219" k2="-0.0218" k3="0.0609"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="3" k1="-0.2127" k2="-0.0342" k3="0.0673"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.2125" k2="-0.0307" k3="0.0641"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.2166" k2="-0.0132" k3="0.0536"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="1.4" k1="-0.6243" k2="0.0458" k3="0.1081"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="3" k1="-0.6140" k2="0.0247" k3="0.1218"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.6130" k2="0.0202" k3="0.1242"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.6212" k2="0.0198" k3="0.1311"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="1.4" k1="0.0173" k2="-0.6808" k3="0.3962"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="3" k1="0.0165" k2="-0.6101" k3="0.3433"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="0.0024" k2="-0.5630" k3="0.3156"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="0.0121" k2="-0.5785" k3="0.3238"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="1.4" k1="-0.1421" k2="-0.1711" k3="0.1446"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="3" k1="-0.1219" k2="-0.1901" k3="0.1558"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="10" k1="-0.1188" k2="-0.2040" k3="0.1706"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.1299" k2="-0.1797" k3="0.1554"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1.4" k1="-0.2190" k2="-0.0457" k3="0.0779"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="3" k1="-0.2122" k2="-0.0424" k3="0.0762"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.2154" k2="-0.0329" k3="0.0703"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.2162" k2="-0.0289" k3="0.0680"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="1.4" k1="-0.6048" k2="0.0601" k3="0.0690"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="3" k1="-0.5375" k2="-0.0812" k3="0.1412"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.4898" k2="-0.1779" k3="0.1906"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.4773" k2="-0.2050" k3="0.2058"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="1.4" k1="-0.0692" k2="-0.3212" k3="0.1492"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="3" k1="-0.0975" k2="-0.1830" k3="0.0586"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.0981" k2="-0.1602" k3="0.0358"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1093" k2="-0.1170" k3="0.0142"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="1.4" k1="-0.1456" k2="-0.1706" k3="0.1478"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="3" k1="-0.1427" k2="-0.1589" k3="0.1409"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="10" k1="-0.1436" k2="-0.1555" k3="0.1424"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="1000" k1="-0.1423" k2="-0.1457" k3="0.1324"/>
-+            <vignetting model="pa" focal="135" aperture="36" distance="1.4" k1="-0.2203" k2="-0.0327" k3="0.0693"/>
-+            <vignetting model="pa" focal="135" aperture="36" distance="3" k1="-0.2127" k2="-0.0381" k3="0.0753"/>
-+            <vignetting model="pa" focal="135" aperture="36" distance="10" k1="-0.2125" k2="-0.0247" k3="0.0663"/>
-+            <vignetting model="pa" focal="135" aperture="36" distance="1000" k1="-0.2081" k2="-0.0284" k3="0.0685"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1.4" k1="0.0332" k2="-1.6820" k3="1.0824"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0230" k2="-1.5703" k3="1.0491"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1.4" k1="-0.0085" k2="-0.3796" k3="0.0252"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1187" k2="-0.8920" k3="0.4303"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1.4" k1="-0.1909" k2="0.0498" k3="-0.0618"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1677" k2="0.0927" k3="-0.1625"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="1.4" k1="-0.2017" k2="-0.0522" k3="0.0840"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.1908" k2="-0.0287" k3="0.0753"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="3" k1="0.0515" k2="-1.7762" k3="1.1680"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="10" k1="-0.0311" k2="-1.5784" k3="1.0581"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="3" k1="0.0728" k2="-0.7072" k3="0.2736"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="0.1146" k2="-0.8825" k3="0.4186"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="3" k1="-0.1859" k2="0.1268" k3="-0.1695"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="10" k1="-0.1742" k2="0.1141" k3="-0.1807"/>
-+            <vignetting model="pa" focal="210" aperture="40" distance="3" k1="-0.1982" k2="-0.0268" k3="0.0704"/>
-+            <vignetting model="pa" focal="210" aperture="40" distance="10" k1="-0.1926" k2="-0.0260" k3="0.0722"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1.4" k1="-0.3706" k2="-0.9573" k3="0.7277"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="3" k1="-0.8471" k2="0.3008" k3="-0.0316"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-1.1071" k2="0.9937" k3="-0.4506"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.1590" k2="1.1423" k3="-0.5351"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1.4" k1="0.1446" k2="-1.3957" k3="0.8227"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="3" k1="-0.0259" k2="-1.2768" k3="0.8733"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.2245" k2="-0.9258" k3="0.7015"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.3150" k2="-0.7532" k3="0.6119"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1.4" k1="-0.0160" k2="-0.3740" k3="0.0591"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="3" k1="0.0727" k2="-0.7377" k3="0.3033"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="0.1138" k2="-0.9083" k3="0.4318"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="0.1238" k2="-1.0061" k3="0.5147"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="1.4" k1="-0.1824" k2="-0.0514" k3="0.0862"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="3" k1="-0.1925" k2="-0.0004" k3="0.0608"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="10" k1="-0.1798" k2="-0.0063" k3="0.0652"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.1780" k2="-0.0063" k3="0.0679"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 70-300mm f/4-5.6 IS USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="300" a="-0.00012" b="0.00556" c="-0.00398" />
--            <distortion model="ptlens" focal="200" a="-0.00466" b="0.01801" c="-0.01557" />
--            <distortion model="ptlens" focal="135" a="-0.00371" b="0.01433" c="-0.01464" />
--            <distortion model="ptlens" focal="100" a="0" b="-0.00091" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="-0.00371" c="0" />
-+            <distortion model="ptlens" focal="300" a="-0.00012" b="0.00556" c="-0.00398"/>
-+            <distortion model="ptlens" focal="200" a="-0.00466" b="0.01801" c="-0.01557"/>
-+            <distortion model="ptlens" focal="135" a="-0.00371" b="0.01433" c="-0.01464"/>
-+            <distortion model="ptlens" focal="100" a="0" b="-0.00091" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="-0.00371" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 75-300mm f/4-5.6 IS USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="75" a="0" b="-0.004815" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="-0.004914" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.000475" c="0" />
--            <distortion model="ptlens" focal="155" a="0" b="0.001105" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.00411" c="0" />
-+            <distortion model="poly3" focal="75" k1="-0.004815"/>
-+            <distortion model="poly3" focal="100" k1="-0.004914"/>
-+            <distortion model="poly3" focal="135" k1="0.000475"/>
-+            <distortion model="poly3" focal="155" k1="0.001105"/>
-+            <distortion model="poly3" focal="300" k1="0.00411"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 80-200mm f/2.8L</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="0" b="-0.007253" c="0" />
--            <distortion model="ptlens" focal="88" a="0" b="-0.006184" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="-0.003182" c="0" />
--            <distortion model="ptlens" focal="120" a="0" b="-0.000752" c="0" />
--            <distortion model="ptlens" focal="140" a="0" b="0.001667" c="0" />
--            <distortion model="ptlens" focal="175" a="0" b="0.003535" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.004386" c="0" />
-+            <distortion model="poly3" focal="80" k1="-0.007253"/>
-+            <distortion model="poly3" focal="88" k1="-0.006184"/>
-+            <distortion model="poly3" focal="100" k1="-0.003182"/>
-+            <distortion model="poly3" focal="120" k1="-0.000752"/>
-+            <distortion model="poly3" focal="140" k1="0.001667"/>
-+            <distortion model="poly3" focal="175" k1="0.003535"/>
-+            <distortion model="poly3" focal="200" k1="0.004386"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 85mm f/1.2L II USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="85" a="0.00109" b="-0.00481" c="0.00232"/>
-+            <tca model="poly3" focal="85" br="-0.0000612" vr="0.9999389" bb="0.0000679" vb="0.9999034"/>
-+            <vignetting model="pa" focal="85" aperture="1.2" distance="0.95" k1="-1.0418" k2="0.7724" k3="-0.3658"/>
-+            <vignetting model="pa" focal="85" aperture="1.2" distance="1.9" k1="-1.3152" k2="1.2663" k3="-0.6352"/>
-+            <vignetting model="pa" focal="85" aperture="1.2" distance="5.7" k1="-1.4018" k2="1.4145" k3="-0.7202"/>
-+            <vignetting model="pa" focal="85" aperture="1.2" distance="1000" k1="-1.4120" k2="1.4164" k3="-0.7204"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="0.95" k1="-0.1046" k2="-0.0002" k3="-0.2924"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="1.9" k1="-0.0429" k2="-0.3179" k3="-0.1076"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="5.7" k1="-0.0298" k2="-0.4793" k3="0.0023"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-0.0357" k2="-0.5311" k3="0.0401"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="0.95" k1="-0.1781" k2="0.4106" k3="-0.3608"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="1.9" k1="-0.2183" k2="0.5012" k3="-0.4499"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="5.7" k1="-0.2534" k2="0.6038" k3="-0.5544"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.2697" k2="0.6545" k3="-0.6194"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="0.95" k1="-0.0423" k2="-0.0604" k3="0.0694"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="1.9" k1="-0.0606" k2="-0.0566" k3="0.0664"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="5.7" k1="-0.0709" k2="-0.0619" k3="0.0700"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.0821" k2="-0.0555" k3="0.0664"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="0.95" k1="-0.0359" k2="-0.0615" k3="0.0682"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="1.9" k1="-0.0465" k2="-0.0751" k3="0.0746"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="5.7" k1="-0.0739" k2="-0.0423" k3="0.0544"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.0790" k2="-0.0526" k3="0.0615"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 100mm f/2.8 Macro USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="100" a="-0.00126" b="0.00429" c="-0.00887"/>
-+            <tca model="poly3" focal="100" br="-0.0000316" vr="1.0003482" bb="0.0000299" vb="0.9998855"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.31" k1="-0.1368" k2="-0.5887" k3="0.4243"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.62" k1="-0.2002" k2="-0.7034" k3="0.4805"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1.86" k1="-0.9303" k2="0.4746" k3="-0.1172"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-1.3648" k2="1.3738" k3="-0.6384"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.31" k1="-0.1483" k2="0.0422" k3="-0.0494"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.62" k1="-0.0064" k2="-0.2739" k3="0.0484"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1.86" k1="0.0721" k2="-0.6608" k3="0.2908"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0949" k2="-0.9807" k3="0.4897"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.31" k1="-0.1278" k2="-0.0703" k3="0.0817"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.62" k1="-0.1242" k2="0.0594" k3="-0.0342"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1.86" k1="-0.1340" k2="0.1578" k3="-0.1604"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1127" k2="0.1457" k3="-0.2155"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.31" k1="-0.1177" k2="-0.0988" k3="0.1018"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.62" k1="-0.0954" k2="-0.0536" k3="0.0710"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1.86" k1="-0.0876" k2="-0.0566" k3="0.0718"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0855" k2="-0.0358" k3="0.0486"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.31" k1="-0.0685" k2="-0.2239" k3="0.1770"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.62" k1="-0.0498" k2="-0.1694" k3="0.1430"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1.86" k1="-0.0495" k2="-0.1537" k3="0.1345"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0442" k2="-0.1356" k3="0.1146"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 100-300mm f/5.6L</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="0" b="-0.001195" c="0" />
--            <distortion model="ptlens" focal="123" a="0" b="0.001845" c="0" />
--            <distortion model="ptlens" focal="142" a="0" b="0.00427" c="0" />
--            <distortion model="ptlens" focal="173" a="0" b="0.006821" c="0" />
--            <distortion model="ptlens" focal="210" a="0" b="0.008324" c="0" />
--            <distortion model="ptlens" focal="250" a="0" b="0.008554" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.009679" c="0" />
-+            <distortion model="poly3" focal="100" k1="-0.001195"/>
-+            <distortion model="poly3" focal="123" k1="0.001845"/>
-+            <distortion model="poly3" focal="142" k1="0.00427"/>
-+            <distortion model="poly3" focal="173" k1="0.006821"/>
-+            <distortion model="poly3" focal="210" k1="0.008324"/>
-+            <distortion model="poly3" focal="250" k1="0.008554"/>
-+            <distortion model="poly3" focal="300" k1="0.009679"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 100-400mm f/4.5-5.6L IS USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="0.001543" b="-0.003547" c="0" />
--            <distortion model="ptlens" focal="135" a="0.000471" b="-0.000408" c="0" />
--            <distortion model="ptlens" focal="150" a="0.00022" b="0.000681" c="0" />
--            <distortion model="ptlens" focal="200" a="-0.00011" b="0.00192" c="0" />
--            <distortion model="ptlens" focal="250" a="0.001326" b="-0.001117" c="0" />
--            <distortion model="ptlens" focal="300" a="-0.001773" b="0.005878" c="0" />
--            <distortion model="ptlens" focal="350" a="0.000721" b="0.000672" c="0" />
--            <distortion model="ptlens" focal="400" a="-0.000338" b="0.003752" c="0" />
-+            <distortion model="ptlens" focal="100" a="0.001543" b="-0.003547" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0.000471" b="-0.000408" c="0"/>
-+            <distortion model="ptlens" focal="150" a="0.00022" b="0.000681" c="0"/>
-+            <distortion model="ptlens" focal="200" a="-0.00011" b="0.00192" c="0"/>
-+            <distortion model="ptlens" focal="250" a="0.001326" b="-0.001117" c="0"/>
-+            <distortion model="ptlens" focal="300" a="-0.001773" b="0.005878" c="0"/>
-+            <distortion model="ptlens" focal="350" a="0.000721" b="0.000672" c="0"/>
-+            <distortion model="ptlens" focal="400" a="-0.000338" b="0.003752" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 20mm f/2.8 USM</model>
-+        <model>Canon EF 100-400mm f/4.5-5.6L IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="20" a="0.018218" b="-0.040033" c="0" />
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="100" a="0.00025675727" b="-0.00086839235" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0.00025565499" b="0.0023856892" c="0"/>
-+            <distortion model="ptlens" focal="150" a="-0.00025251856" b="0.0041025843" c="0"/>
-+            <distortion model="ptlens" focal="200" a="-0.00026568272" b="0.005564501" c="0"/>
-+            <distortion model="ptlens" focal="250" a="-0.000076806451" b="0.0056209899" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0.00028689712" b="0.0053289804" c="0"/>
-+            <distortion model="ptlens" focal="350" a="-0.00021378004" b="0.0064708104" c="0"/>
-+            <distortion model="ptlens" focal="400" a="0.00035256656" b="0.0059394729" c="0"/>
-+            <tca model="poly3" focal="100" br="-0.0000088" vr="1.0006645" bb="0.0000759" vb="1.0000395"/>
-+            <tca model="poly3" focal="135" br="-0.0000677" vr="1.0003291" bb="0.0000991" vb="1.0000728"/>
-+            <tca model="poly3" focal="150" br="-0.0000440" vr="1.0002045" bb="0.0000863" vb="1.0001036"/>
-+            <tca model="poly3" focal="200" br="-0.0000125" vr="0.9999578" bb="0.0000330" vb="1.0001366"/>
-+            <tca model="poly3" focal="250" br="-0.0001232" vr="0.9998504" bb="0.0000643" vb="1.0000649"/>
-+            <tca model="poly3" focal="300" br="-0.0001213" vr="0.9997686" bb="0.0000394" vb="0.9999256"/>
-+            <tca model="poly3" focal="400" br="-0.0000709" vr="0.9994402" bb="-0.0000643" vb="0.9996019"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="1.8" k1="-0.5781" k2="0.1116" k3="-0.0341"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="3.6" k1="-0.5857" k2="0.0899" k3="-0.0070"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="10.8" k1="-0.5856" k2="0.0633" k3="0.0181"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-0.5863" k2="0.0760" k3="0.0079"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="1.8" k1="-0.0141" k2="-0.7018" k3="0.4315"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="3.6" k1="-0.0076" k2="-0.6617" k3="0.3948"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="10.8" k1="-0.0068" k2="-0.6240" k3="0.3631"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.0097" k2="-0.5797" k3="0.3287"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="1.8" k1="-0.1769" k2="0.0997" k3="-0.0806"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="3.6" k1="-0.1681" k2="0.0623" k3="-0.0406"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="10.8" k1="-0.1633" k2="0.0432" k3="-0.0214"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.1587" k2="0.0241" k3="-0.0015"/>
-+            <vignetting model="pa" focal="100" aperture="13" distance="1.8" k1="-0.1443" k2="-0.0454" k3="0.0686"/>
-+            <vignetting model="pa" focal="100" aperture="13" distance="3.6" k1="-0.1435" k2="-0.0467" k3="0.0690"/>
-+            <vignetting model="pa" focal="100" aperture="13" distance="10.8" k1="-0.1423" k2="-0.0504" k3="0.0717"/>
-+            <vignetting model="pa" focal="100" aperture="13" distance="1000" k1="-0.1403" k2="-0.0558" k3="0.0756"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1.8" k1="-0.1705" k2="0.0097" k3="0.0364"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="3.6" k1="-0.1751" k2="0.0232" k3="0.0251"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="10.8" k1="-0.1740" k2="0.0166" k3="0.0318"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1708" k2="0.0067" k3="0.0396"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="1.8" k1="-0.5240" k2="0.0714" k3="0.0034"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="3.6" k1="-0.5252" k2="0.0294" k3="0.0423"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="10.8" k1="-0.5071" k2="-0.0414" k3="0.0949"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.4991" k2="-0.0699" k3="0.1157"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="1.8" k1="-0.0093" k2="-0.6093" k3="0.3682"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="3.6" k1="-0.0155" k2="-0.5178" k3="0.2968"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="10.8" k1="-0.0302" k2="-0.4251" k3="0.2304"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.0319" k2="-0.4127" k3="0.2217"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="1.8" k1="-0.1416" k2="-0.0282" k3="0.0502"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="3.6" k1="-0.1368" k2="-0.0461" k3="0.0661"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="10.8" k1="-0.1313" k2="-0.0644" k3="0.0818"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1311" k2="-0.0645" k3="0.0815"/>
-+            <vignetting model="pa" focal="135" aperture="13" distance="1.8" k1="-0.1390" k2="-0.0479" k3="0.0722"/>
-+            <vignetting model="pa" focal="135" aperture="13" distance="3.6" k1="-0.1382" k2="-0.0501" k3="0.0732"/>
-+            <vignetting model="pa" focal="135" aperture="13" distance="10.8" k1="-0.1374" k2="-0.0506" k3="0.0735"/>
-+            <vignetting model="pa" focal="135" aperture="13" distance="1000" k1="-0.1364" k2="-0.0533" k3="0.0752"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1.8" k1="-0.1697" k2="0.0151" k3="0.0369"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="3.6" k1="-0.1730" k2="0.0215" k3="0.0330"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="10.8" k1="-0.1680" k2="0.0088" k3="0.0416"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1675" k2="0.0084" k3="0.0410"/>
-+            <vignetting model="pa" focal="150" aperture="5" distance="1.8" k1="-0.4905" k2="0.0191" k3="0.0400"/>
-+            <vignetting model="pa" focal="150" aperture="5" distance="3.6" k1="-0.4879" k2="-0.0365" k3="0.0884"/>
-+            <vignetting model="pa" focal="150" aperture="5" distance="10.8" k1="-0.4709" k2="-0.1064" k3="0.1400"/>
-+            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.4654" k2="-0.1278" k3="0.1564"/>
-+            <vignetting model="pa" focal="150" aperture="6.3" distance="1.8" k1="-0.0121" k2="-0.5442" k3="0.3190"/>
-+            <vignetting model="pa" focal="150" aperture="6.3" distance="3.6" k1="-0.0256" k2="-0.4364" k3="0.2401"/>
-+            <vignetting model="pa" focal="150" aperture="6.3" distance="10.8" k1="-0.0431" k2="-0.3443" k3="0.1773"/>
-+            <vignetting model="pa" focal="150" aperture="6.3" distance="1000" k1="-0.0525" k2="-0.2945" k3="0.1442"/>
-+            <vignetting model="pa" focal="150" aperture="9" distance="1.8" k1="-0.1317" k2="-0.0538" k3="0.0713"/>
-+            <vignetting model="pa" focal="150" aperture="9" distance="3.6" k1="-0.1282" k2="-0.0655" k3="0.0813"/>
-+            <vignetting model="pa" focal="150" aperture="9" distance="10.8" k1="-0.1279" k2="-0.0648" k3="0.0802"/>
-+            <vignetting model="pa" focal="150" aperture="9" distance="1000" k1="-0.1261" k2="-0.0696" k3="0.0839"/>
-+            <vignetting model="pa" focal="150" aperture="13" distance="1.8" k1="-0.1358" k2="-0.0496" k3="0.0728"/>
-+            <vignetting model="pa" focal="150" aperture="13" distance="3.6" k1="-0.1340" k2="-0.0544" k3="0.0757"/>
-+            <vignetting model="pa" focal="150" aperture="13" distance="10.8" k1="-0.1336" k2="-0.0550" k3="0.0760"/>
-+            <vignetting model="pa" focal="150" aperture="13" distance="1000" k1="-0.1313" k2="-0.0607" k3="0.0802"/>
-+            <vignetting model="pa" focal="150" aperture="32" distance="1.8" k1="-0.1663" k2="0.0146" k3="0.0359"/>
-+            <vignetting model="pa" focal="150" aperture="32" distance="3.6" k1="-0.1668" k2="0.0125" k3="0.0382"/>
-+            <vignetting model="pa" focal="150" aperture="32" distance="10.8" k1="-0.1633" k2="0.0037" k3="0.0438"/>
-+            <vignetting model="pa" focal="150" aperture="32" distance="1000" k1="-0.1599" k2="-0.0026" k3="0.0474"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="1.8" k1="-0.3654" k2="-0.1908" k3="0.1736"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="3.6" k1="-0.3866" k2="-0.1860" k3="0.1786"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="10.8" k1="-0.3938" k2="-0.1896" k3="0.1819"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.3992" k2="-0.1844" k3="0.1807"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="1.8" k1="-0.0600" k2="-0.2411" k3="0.1193"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="3.6" k1="-0.0860" k2="-0.1382" k3="0.0563"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="10.8" k1="-0.1164" k2="-0.0355" k3="0.0013"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.1231" k2="-0.0162" k3="-0.0048"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="1.8" k1="-0.1204" k2="-0.0639" k3="0.0783"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="3.6" k1="-0.1200" k2="-0.0647" k3="0.0786"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="10.8" k1="-0.1209" k2="-0.0631" k3="0.0775"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1210" k2="-0.0640" k3="0.0788"/>
-+            <vignetting model="pa" focal="200" aperture="14" distance="1.8" k1="-0.1239" k2="-0.0583" k3="0.0768"/>
-+            <vignetting model="pa" focal="200" aperture="14" distance="3.6" k1="-0.1253" k2="-0.0540" k3="0.0729"/>
-+            <vignetting model="pa" focal="200" aperture="14" distance="10.8" k1="-0.1256" k2="-0.0560" k3="0.0753"/>
-+            <vignetting model="pa" focal="200" aperture="14" distance="1000" k1="-0.1264" k2="-0.0551" k3="0.0752"/>
-+            <vignetting model="pa" focal="200" aperture="36" distance="1.8" k1="-0.1498" k2="-0.0082" k3="0.0501"/>
-+            <vignetting model="pa" focal="200" aperture="36" distance="3.6" k1="-0.1464" k2="-0.0168" k3="0.0554"/>
-+            <vignetting model="pa" focal="200" aperture="36" distance="10.8" k1="-0.1467" k2="-0.0164" k3="0.0547"/>
-+            <vignetting model="pa" focal="200" aperture="36" distance="1000" k1="-0.1489" k2="-0.0118" k3="0.0522"/>
-+            <vignetting model="pa" focal="250" aperture="5" distance="1.8" k1="-0.2929" k2="-0.2625" k3="0.1358"/>
-+            <vignetting model="pa" focal="250" aperture="5" distance="3.6" k1="-0.3169" k2="-0.3045" k3="0.1823"/>
-+            <vignetting model="pa" focal="250" aperture="5" distance="10.8" k1="-0.3364" k2="-0.3259" k3="0.2121"/>
-+            <vignetting model="pa" focal="250" aperture="5" distance="1000" k1="-0.3438" k2="-0.3302" k3="0.2208"/>
-+            <vignetting model="pa" focal="250" aperture="7.1" distance="1.8" k1="-0.0984" k2="-0.0736" k3="-0.0146"/>
-+            <vignetting model="pa" focal="250" aperture="7.1" distance="3.6" k1="-0.1393" k2="0.0919" k3="-0.1430"/>
-+            <vignetting model="pa" focal="250" aperture="7.1" distance="10.8" k1="-0.1590" k2="0.1710" k3="-0.2049"/>
-+            <vignetting model="pa" focal="250" aperture="7.1" distance="1000" k1="-0.1604" k2="0.1755" k3="-0.2075"/>
-+            <vignetting model="pa" focal="250" aperture="10" distance="1.8" k1="-0.1140" k2="-0.0704" k3="0.0820"/>
-+            <vignetting model="pa" focal="250" aperture="10" distance="3.6" k1="-0.1130" k2="-0.0714" k3="0.0823"/>
-+            <vignetting model="pa" focal="250" aperture="10" distance="10.8" k1="-0.1120" k2="-0.0724" k3="0.0825"/>
-+            <vignetting model="pa" focal="250" aperture="10" distance="1000" k1="-0.1103" k2="-0.0770" k3="0.0859"/>
-+            <vignetting model="pa" focal="250" aperture="14" distance="1.8" k1="-0.1194" k2="-0.0592" k3="0.0763"/>
-+            <vignetting model="pa" focal="250" aperture="14" distance="3.6" k1="-0.1182" k2="-0.0602" k3="0.0761"/>
-+            <vignetting model="pa" focal="250" aperture="14" distance="10.8" k1="-0.1168" k2="-0.0643" k3="0.0792"/>
-+            <vignetting model="pa" focal="250" aperture="14" distance="1000" k1="-0.1173" k2="-0.0635" k3="0.0789"/>
-+            <vignetting model="pa" focal="250" aperture="36" distance="1.8" k1="-0.1414" k2="-0.0208" k3="0.0579"/>
-+            <vignetting model="pa" focal="250" aperture="36" distance="3.6" k1="-0.1356" k2="-0.0318" k3="0.0633"/>
-+            <vignetting model="pa" focal="250" aperture="36" distance="10.8" k1="-0.1312" k2="-0.0429" k3="0.0713"/>
-+            <vignetting model="pa" focal="250" aperture="36" distance="1000" k1="-0.1326" k2="-0.0383" k3="0.0676"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1.8" k1="-0.2179" k2="-0.6136" k3="0.3701"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="3.6" k1="-0.3278" k2="-0.5280" k3="0.3759"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10.8" k1="-0.3924" k2="-0.4698" k3="0.3767"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.4147" k2="-0.4409" k3="0.3702"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1.8" k1="-0.1688" k2="0.1923" k3="-0.1950"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="3.6" k1="-0.1394" k2="0.1095" k3="-0.1566"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10.8" k1="-0.0988" k2="-0.0160" k3="-0.0966"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.0808" k2="-0.0760" k3="-0.0641"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1.8" k1="-0.1120" k2="-0.0679" k3="0.0798"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="3.6" k1="-0.1092" k2="-0.0731" k3="0.0831"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10.8" k1="-0.1077" k2="-0.0742" k3="0.0832"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.1083" k2="-0.0713" k3="0.0804"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1.8" k1="-0.1179" k2="-0.0565" k3="0.0743"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="3.6" k1="-0.1144" k2="-0.0630" k3="0.0777"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="10.8" k1="-0.1125" k2="-0.0669" k3="0.0803"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.1125" k2="-0.0674" k3="0.0812"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="1.8" k1="-0.1330" k2="-0.0357" k3="0.0672"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="3.6" k1="-0.1290" k2="-0.0431" k3="0.0707"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="10.8" k1="-0.1262" k2="-0.0497" k3="0.0756"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.1278" k2="-0.0435" k3="0.0708"/>
-+            <vignetting model="pa" focal="350" aperture="5.6" distance="1.8" k1="-0.3407" k2="-0.6101" k3="0.4495"/>
-+            <vignetting model="pa" focal="350" aperture="5.6" distance="3.6" k1="-0.5713" k2="-0.2290" k3="0.2826"/>
-+            <vignetting model="pa" focal="350" aperture="5.6" distance="10.8" k1="-0.7307" k2="0.1024" k3="0.1086"/>
-+            <vignetting model="pa" focal="350" aperture="5.6" distance="1000" k1="-0.7991" k2="0.2697" k3="0.0081"/>
-+            <vignetting model="pa" focal="350" aperture="8" distance="1.8" k1="-0.0745" k2="-0.0753" k3="-0.1072"/>
-+            <vignetting model="pa" focal="350" aperture="8" distance="3.6" k1="0.0173" k2="-0.4622" k3="0.1768"/>
-+            <vignetting model="pa" focal="350" aperture="8" distance="10.8" k1="0.0553" k2="-0.7052" k3="0.3598"/>
-+            <vignetting model="pa" focal="350" aperture="8" distance="1000" k1="0.0531" k2="-0.7932" k3="0.4364"/>
-+            <vignetting model="pa" focal="350" aperture="11" distance="1.8" k1="-0.1301" k2="0.0099" k3="0.0085"/>
-+            <vignetting model="pa" focal="350" aperture="11" distance="3.6" k1="-0.1469" k2="0.0895" k3="-0.0725"/>
-+            <vignetting model="pa" focal="350" aperture="11" distance="10.8" k1="-0.1593" k2="0.1620" k3="-0.1648"/>
-+            <vignetting model="pa" focal="350" aperture="11" distance="1000" k1="-0.1563" k2="0.1621" k3="-0.1832"/>
-+            <vignetting model="pa" focal="350" aperture="16" distance="1.8" k1="-0.1145" k2="-0.0606" k3="0.0764"/>
-+            <vignetting model="pa" focal="350" aperture="16" distance="3.6" k1="-0.1113" k2="-0.0657" k3="0.0791"/>
-+            <vignetting model="pa" focal="350" aperture="16" distance="10.8" k1="-0.1138" k2="-0.0601" k3="0.0759"/>
-+            <vignetting model="pa" focal="350" aperture="16" distance="1000" k1="-0.1176" k2="-0.0529" k3="0.0721"/>
-+            <vignetting model="pa" focal="350" aperture="40" distance="1.8" k1="-0.1288" k2="-0.0408" k3="0.0698"/>
-+            <vignetting model="pa" focal="350" aperture="40" distance="3.6" k1="-0.1255" k2="-0.0489" k3="0.0746"/>
-+            <vignetting model="pa" focal="350" aperture="40" distance="10.8" k1="-0.1295" k2="-0.0394" k3="0.0694"/>
-+            <vignetting model="pa" focal="350" aperture="40" distance="1000" k1="-0.1359" k2="-0.0243" k3="0.0598"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="1.8" k1="-0.6162" k2="-0.1951" k3="0.2686"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="3.6" k1="-0.9055" k2="0.4049" k3="-0.0516"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="10.8" k1="-1.0556" k2="0.8193" k3="-0.3192"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-1.0517" k2="0.8373" k3="-0.3437"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="1.8" k1="0.0194" k2="-0.4692" k3="0.1535"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="3.6" k1="0.0644" k2="-0.8289" k3="0.4500"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="10.8" k1="-0.0141" k2="-0.8865" k3="0.5562"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="-0.0805" k2="-0.8175" k3="0.5407"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="1.8" k1="-0.1670" k2="0.1768" k3="-0.1638"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="3.6" k1="-0.1523" k2="0.1637" k3="-0.2005"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="10.8" k1="-0.1020" k2="0.0045" k3="-0.1288"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="-0.0736" k2="-0.1028" k3="-0.0676"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="1.8" k1="-0.1138" k2="-0.0600" k3="0.0754"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="3.6" k1="-0.1117" k2="-0.0637" k3="0.0776"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="10.8" k1="-0.1210" k2="-0.0428" k3="0.0639"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="1000" k1="-0.1314" k2="-0.0163" k3="0.0450"/>
-+            <vignetting model="pa" focal="400" aperture="40" distance="1.8" k1="-0.1268" k2="-0.0439" k3="0.0713"/>
-+            <vignetting model="pa" focal="400" aperture="40" distance="3.6" k1="-0.1273" k2="-0.0431" k3="0.0702"/>
-+            <vignetting model="pa" focal="400" aperture="40" distance="10.8" k1="-0.1383" k2="-0.0201" k3="0.0575"/>
-+            <vignetting model="pa" focal="400" aperture="40" distance="1000" k1="-0.1404" k2="-0.0142" k3="0.0530"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 24mm f/1.4L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.013378" b="-0.028367" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.013378" b="-0.028367" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 24mm f/2.8</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.017412" b="-0.039315" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.017412" b="-0.039315" c="0"/>
-+            <!-- Taken with Canon 5D -->
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-1.9042" k2="1.8775" k3="-0.7656"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-1.9042" k2="1.8775" k3="-0.7656"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.3786" k2="-0.8590" k3="0.5975"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.3786" k2="-0.8590" k3="0.5975"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.5720" k2="0.1848" k3="-0.0872"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.5720" k2="0.1848" k3="-0.0872"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.5534" k2="0.0775" k3="0.0466"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.5534" k2="0.0775" k3="0.0466"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.5601" k2="0.0867" k3="0.0430"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.5601" k2="0.0867" k3="0.0430"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.5673" k2="0.0970" k3="0.0386"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.5673" k2="0.0970" k3="0.0386"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.5737" k2="0.1049" k3="0.0356"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.5737" k2="0.1049" k3="0.0356"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 28mm f/1.8</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.001175" b="-0.006534" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.001175" b="-0.006534" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon 28mm f/1.8 USM</model>
-+        <model>Canon EF 28mm f/1.8 USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.018" b="-0.048" c="0.019" />
-+            <distortion model="ptlens" focal="28" a="0.018" b="-0.048" c="0.019"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 28mm f/2.8</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.003003" b="-0.011213" c="0" />
--        </calibration>
--    </lens>
--
--    <lens>
--        <maker>Canon</maker>
--        <model>Canon EF 35mm f/1.4L USM</model>
--        <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
--        <calibration>
--            <distortion model="ptlens" focal="35" a="0.007937" b="-0.021832" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.003003" b="-0.011213" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 35mm f/2</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.007768" b="-0.018685" c="0" />
-+            <distortion model="ptlens" focal="35" a="0.007768" b="-0.018685" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 50mm f/1.2L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0.00476" b="-0.01688" c="0.00748" />
-+            <distortion model="ptlens" focal="50" a="0.00476" b="-0.01688" c="0.00748"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 50mm f/1.4</model>
-+        <model>Canon EF 50mm f/1.4 USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.002987" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.002987"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 50mm f/1.4</model>
-+        <model>Canon EF 50mm f/1.8</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <!-- Average crop factor of Canon APS-H cameras -->
-+        <cropfactor>1.267</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0.002615" b="-0.01123" c="0" />
-+            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 50mm f/1.8</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0" />
-+            <!-- Taken with Canon 650D -->
-+            <distortion model="poly3" focal="50" k1="-0.00149"/>
-+            <tca model="poly3" focal="50" vr="1.0000033" vb="0.9999942"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 50mm f/1.8 II</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
-             <distortion model="ptlens" focal="50" a="0.00099" b="-0.00582" c="0.00498"/>
-             <tca model="poly3" focal="50" br="-0.0000133" vr="1.0001567" bb="-0.0000082" vb="0.9999807"/>
-         </calibration>
-     </lens>
--
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 50mm f/1.8 II</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="50" a="0.00163" b="-0.01449" c="0.01568"/>
-+            <!-- Taken with Canon 6D -->
-+            <tca model="poly3" focal="50" br="-0.0000048" vr="1.0000353" bb="-0.0000112" vb="1.0000073"/>
-+            <!-- Taken with Canon 5D -->
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-1.4745" k2="1.1285" k3="-0.4284"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-1.4745" k2="1.1285" k3="-0.4284"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.6486" k2="-0.6256" k3="0.5536"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.6486" k2="-0.6256" k3="0.5536"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1193" k2="-0.4620" k3="0.0523"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1193" k2="-0.4620" k3="0.0523"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.3777" k2="0.3437" k3="-0.2804"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.3777" k2="0.3437" k3="-0.2804"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3032" k2="0.0141" k3="0.0427"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3032" k2="0.0141" k3="0.0427"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.3008" k2="-0.0022" k3="0.0549"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3008" k2="-0.0022" k3="0.0549"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.3046" k2="-0.0055" k3="0.0597"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3046" k2="-0.0055" k3="0.0597"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.3134" k2="0.0020" k3="0.0567"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3134" k2="0.0020" k3="0.0567"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.3280" k2="0.0203" k3="0.0468"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.3280" k2="0.0203" k3="0.0468"/>
-+        </calibration>
-+    </lens>
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 50mm f/1.8 MkII</model>
-+        <model lang="en">Canon EF 50mm f/1.8 II</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <!-- Average crop factor of Canon APS-H cameras -->
-+        <cropfactor>1.267</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0" />
-+            <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 50mm f/1.8 MkII</model>
-+        <model lang="en">Canon EF 50mm f/1.8 II</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with cropfactor 1.622 (Canon 50D or 450D) -->
-+            <distortion a="0.00099" b="-0.00582" c="0.00498" focal="50" model="ptlens"/>
-+            <tca bb="-0.0000082" br="-0.0000133" focal="50" model="poly3" vb="0.9999807" vr="1.0001567"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="0.45" k1="-0.5303" k2="0.3040" k3="-0.0894"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.6075" k2="0.4041" k3="-0.1510"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="-0.1253" k2="-0.3078" k3="0.2075"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1158" k2="-0.4426" k3="0.2807"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0555" k2="-0.0933" k3="0.0895"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0709" k2="-0.0230" k3="0.0153"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.0489" k2="-0.0982" k3="0.0898"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0343" k2="-0.1369" k3="0.1000"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.45" k1="-0.0361" k2="-0.1243" k3="0.1058"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0241" k2="-0.1630" k3="0.1172"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.0257" k2="-0.1353" k3="0.1025"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0561" k2="-0.0873" k3="0.0654"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon FDn 50mm 1:1.4</model>
--	    <focal value="50" />
--	    <aperture min="1.4" max="22"/>
-         <mount>Canon FD</mount>
--        <cropfactor>2.0</cropfactor>
-+        <focal value="50"/>
-+        <aperture min="1.4" max="22"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="-0.000919817" b="0.00112022" c="-0.00289404" />
--            <tca model="poly3" focal="50" br="-0.0000338" vr="1.0002152" bb="0.0000216" vb="0.9998764" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-0.2747" k2="-0.1546" k3="0.1527" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5692" k2="0.3348" k3="-0.1042" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="3" k1="-0.6686" k2="0.5132" k3="-0.2054" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6918" k2="0.5512" k3="-0.2278" />
--            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="-0.0668" k2="0.0029" k3="-0.0171" />
--            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0725" k2="-0.0250" k3="0.0104" />
--            <vignetting model="pa" focal="50" aperture="2" distance="3" k1="-0.0748" k2="-0.0428" k3="0.0297" />
--            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0782" k2="-0.0459" k3="0.0329" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0604" k2="-0.0194" k3="0.0045" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0732" k2="-0.0241" k3="0.0120" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="3" k1="-0.0832" k2="-0.0198" k3="0.0121" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0824" k2="-0.0342" k3="0.0223" />
--            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.0694" k2="-0.0016" k3="-0.0078" />
--            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0828" k2="0.0019" k3="-0.0081" />
--            <vignetting model="pa" focal="50" aperture="4" distance="3" k1="-0.0919" k2="-0.0002" k3="-0.0022" />
--            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0919" k2="-0.0064" k3="0.0028" />
--            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.1151" k2="0.1018" k3="-0.0809" />
--            <vignetting model="pa" focal="50" aperture="22" distance="1" k1="-0.1117" k2="0.0668" k3="-0.0536" />
--            <vignetting model="pa" focal="50" aperture="22" distance="3" k1="-0.1539" k2="0.1340" k3="-0.0892" />
--            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1587" k2="0.1348" k3="-0.0874" />
-+            <distortion model="ptlens" focal="50" a="-0.000919817" b="0.00112022" c="-0.00289404"/>
-+            <tca model="poly3" focal="50" br="-0.0000338" vr="1.0002152" bb="0.0000216" vb="0.9998764"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-0.2747" k2="-0.1546" k3="0.1527"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5692" k2="0.3348" k3="-0.1042"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="3" k1="-0.6686" k2="0.5132" k3="-0.2054"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6918" k2="0.5512" k3="-0.2278"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="-0.0668" k2="0.0029" k3="-0.0171"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0725" k2="-0.0250" k3="0.0104"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="3" k1="-0.0748" k2="-0.0428" k3="0.0297"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0782" k2="-0.0459" k3="0.0329"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0604" k2="-0.0194" k3="0.0045"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0732" k2="-0.0241" k3="0.0120"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="3" k1="-0.0832" k2="-0.0198" k3="0.0121"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0824" k2="-0.0342" k3="0.0223"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.0694" k2="-0.0016" k3="-0.0078"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0828" k2="0.0019" k3="-0.0081"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="3" k1="-0.0919" k2="-0.0002" k3="-0.0022"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.0919" k2="-0.0064" k3="0.0028"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.45" k1="-0.1151" k2="0.1018" k3="-0.0809"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1" k1="-0.1117" k2="0.0668" k3="-0.0536"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="3" k1="-0.1539" k2="0.1340" k3="-0.0892"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1587" k2="0.1348" k3="-0.0874"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF-S 60mm f/2.8 Macro</model>
-+        <model>Canon FDn 50mm 1:1.4</model>
-+        <mount>Canon FD</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="poly3" focal="50" k1="-0.00193"/>
-+            <tca model="poly3" focal="50" vr="1.0000929" vb="0.9999371"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 60mm f/2.8 Macro USM</model>
-         <mount>Canon EF-S</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="60" a="0" b="0" c="0" />
-+            <distortion model="poly3" focal="60" k1="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 85mm f/1.2L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="85" a="0" b="-0.00214" c="0" />
-+            <distortion model="poly3" focal="85" k1="-0.00214"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 85mm f/1.8 USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="85" a="-0.000989" b="-0.002335" c="0" />
-+            <distortion model="ptlens" focal="85" a="-0.000989" b="-0.002335" c="0"/>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <tca model="poly3" focal="85" br="-0.0000287" vr="1.0001408" bb="0.0000182" vb="0.9998642"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="10" k1="-1.4465" k2="1.4135" k3="-0.6464"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-1.4465" k2="1.4135" k3="-0.6464"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="10" k1="-0.0062" k2="-0.9708" k3="0.5311"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.0062" k2="-0.9708" k3="0.5311"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="10" k1="0.0970" k2="-0.4142" k3="0.0058"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="0.0970" k2="-0.4142" k3="0.0058"/>
-+            <vignetting model="pa" focal="85" aperture="5" distance="10" k1="-0.1769" k2="0.5484" k3="-0.5646"/>
-+            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.1769" k2="0.5484" k3="-0.5646"/>
-+            <vignetting model="pa" focal="85" aperture="22" distance="10" k1="-0.0782" k2="-0.0006" k3="0.0650"/>
-+            <vignetting model="pa" focal="85" aperture="22" distance="1000" k1="-0.0782" k2="-0.0006" k3="0.0650"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 100mm f/2.8 USM Macro</model>
-+        <model>Canon EF 100mm f/2.8L Macro IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="0.001889" b="-0.005706" c="0" />
-+            <distortion model="ptlens" focal="100" a="0.00406" b="-0.01754" c="0.02944"/>
-+            <!-- Taken with Canon EOS 5D Mark III -->
-+            <tca model="poly3" focal="100" br="-0.0000648" vr="1.0005228" bb="0.0000895" vb="0.9997536"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.3" k1="-0.0002" k2="-0.4508" k3="0.2333"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.34" k1="0.0795" k2="-0.8174" k3="0.4748"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.39" k1="0.0625" k2="-0.8874" k3="0.5263"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.48" k1="0.0225" k2="-1.1231" k3="0.6901"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.6" k1="-0.3172" k2="-0.7844" k3="0.5853"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.67" k1="-0.5205" k2="-0.4687" k3="0.4329"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1" k1="-1.0262" k2="0.4648" k3="-0.0604"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1.8" k1="-1.0413" k2="0.5233" k3="-0.1089"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="3" k1="-1.0667" k2="0.5973" k3="-0.1587"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-1.1275" k2="0.7246" k3="-0.2352"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.3" k1="-0.1452" k2="0.0476" k3="-0.0319"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.34" k1="-0.1060" k2="0.0458" k3="-0.1091"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.39" k1="-0.0834" k2="0.0032" k3="-0.1104"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.48" k1="0.0244" k2="-0.3419" k3="0.0847"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.6" k1="0.0676" k2="-0.5887" k3="0.2536"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.67" k1="0.0954" k2="-0.7417" k3="0.3603"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1" k1="0.0793" k2="-0.8583" k3="0.4247"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1.8" k1="0.1010" k2="-0.8757" k3="0.4206"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="3" k1="0.1152" k2="-0.8881" k3="0.4203"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="0.0673" k2="-0.7994" k3="0.3554"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.3" k1="-0.1110" k2="-0.0940" k3="0.1128"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.34" k1="-0.0898" k2="-0.0923" k3="0.1076"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.39" k1="-0.0969" k2="-0.0525" k3="0.0724"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.48" k1="-0.1200" k2="0.0858" k3="-0.0692"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.6" k1="-0.1298" k2="0.1438" k3="-0.1464"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.67" k1="-0.1189" k2="0.1370" k3="-0.1654"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="-0.0890" k2="0.0591" k3="-0.1504"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1.8" k1="-0.1159" k2="0.1066" k3="-0.1696"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="3" k1="-0.1064" k2="0.0935" k3="-0.1578"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1185" k2="0.1091" k3="-0.1672"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.3" k1="-0.0940" k2="-0.1372" k3="0.1407"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.34" k1="-0.0836" k2="-0.1148" k3="0.1271"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.39" k1="-0.0781" k2="-0.1110" k3="0.1222"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.48" k1="-0.0763" k2="-0.0917" k3="0.1068"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.6" k1="-0.0697" k2="-0.1049" k3="0.1099"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.67" k1="-0.0734" k2="-0.0865" k3="0.0988"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.0829" k2="-0.0550" k3="0.0671"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1.8" k1="-0.0760" k2="-0.0870" k3="0.0920"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="3" k1="-0.0716" k2="-0.0875" k3="0.0913"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0873" k2="-0.0683" k3="0.0772"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.3" k1="-0.0761" k2="-0.1815" k3="0.1691"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.34" k1="-0.0802" k2="-0.1254" k3="0.1345"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.39" k1="-0.0734" k2="-0.1237" k3="0.1320"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.48" k1="-0.0753" k2="-0.0946" k3="0.1106"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.6" k1="-0.0608" k2="-0.1280" k3="0.1278"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="0.67" k1="-0.0778" k2="-0.0796" k3="0.0988"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1" k1="-0.0699" k2="-0.0925" k3="0.1015"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1.8" k1="-0.0620" k2="-0.1220" k3="0.1203"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="3" k1="-0.0730" k2="-0.0867" k3="0.0956"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.0653" k2="-0.1231" k3="0.1199"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.3" k1="-0.0634" k2="-0.2145" k3="0.1908"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.34" k1="-0.0756" k2="-0.1394" k3="0.1439"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.39" k1="-0.0723" k2="-0.1244" k3="0.1318"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.48" k1="-0.0770" k2="-0.0940" k3="0.1114"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.6" k1="-0.0569" k2="-0.1368" k3="0.1344"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="0.67" k1="-0.0792" k2="-0.0790" k3="0.1008"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1" k1="-0.0695" k2="-0.0939" k3="0.1051"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1.8" k1="-0.0583" k2="-0.1318" k3="0.1280"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="3" k1="-0.0720" k2="-0.0909" k3="0.1017"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.0616" k2="-0.1313" k3="0.1265"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.3" k1="-0.0595" k2="-0.2260" k3="0.1986"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.34" k1="-0.0769" k2="-0.1386" k3="0.1428"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.39" k1="-0.0744" k2="-0.1265" k3="0.1359"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.48" k1="-0.0777" k2="-0.0953" k3="0.1128"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.6" k1="-0.0592" k2="-0.1325" k3="0.1321"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="0.67" k1="-0.0834" k2="-0.0716" k3="0.0960"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1" k1="-0.0738" k2="-0.0843" k3="0.0994"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1.8" k1="-0.0566" k2="-0.1367" k3="0.1318"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="3" k1="-0.0764" k2="-0.0819" k3="0.0970"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0608" k2="-0.1331" k3="0.1287"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.3" k1="-0.0592" k2="-0.2309" k3="0.2022"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.34" k1="-0.0796" k2="-0.1385" k3="0.1436"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.39" k1="-0.0793" k2="-0.1215" k3="0.1346"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.48" k1="-0.0832" k2="-0.0849" k3="0.1060"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.6" k1="-0.0612" k2="-0.1322" k3="0.1327"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.67" k1="-0.0872" k2="-0.0689" k3="0.0967"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1" k1="-0.0783" k2="-0.0774" k3="0.0958"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1.8" k1="-0.0613" k2="-0.1310" k3="0.1301"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="3" k1="-0.0837" k2="-0.0681" k3="0.0892"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.0687" k2="-0.1199" k3="0.1222"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 100mm f/2.8L Macro IS USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="0.00406" b="-0.01754" c="0.02944" />
-+            <!-- Taken with Canon 7D Mark II -->
-+            <distortion model="ptlens" focal="100" a="0.00804" b="-0.0341" c="0.04884"/>
-+            <tca model="poly3" focal="100" br="-0.0000029" vr="1.0002069" bb="0.0000320" vb="0.9998728"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 100mm f/2.8 Macro</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="-0.001558" b="0.004225" c="0" />
-+            <distortion model="ptlens" focal="100" a="-0.001558" b="0.004225" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon FDn 100mm 1:2.8</model>
--	    <focal value="100" />
--	    <aperture min="2.8" max="32"/>
-         <mount>Canon FD</mount>
--        <cropfactor>2.0</cropfactor>
-+        <focal value="100"/>
-+        <aperture min="2.8" max="32"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="-0.000626176" b="0.00321735" c="-0.0016503" />
--            <tca model="poly3" focal="100" br="0.0000529" vr="0.9997253" bb="-0.0000227" vb="1.0000114" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="1" k1="-0.1299" k2="-0.1664" k3="0.1201" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="2" k1="-0.1223" k2="-0.2683" k3="0.1926" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="7" k1="-0.1430" k2="-0.2648" k3="0.1957" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.1617" k2="-0.2393" k3="0.1820" />
--            <vignetting model="pa" focal="100" aperture="4" distance="1" k1="-0.0317" k2="-0.0219" k3="-0.0001" />
--            <vignetting model="pa" focal="100" aperture="4" distance="2" k1="-0.0438" k2="-0.0251" k3="0.0081" />
--            <vignetting model="pa" focal="100" aperture="4" distance="7" k1="-0.0499" k2="-0.0261" k3="0.0103" />
--            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0519" k2="-0.0265" k3="0.0098" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="-0.0442" k2="-0.0086" k3="-0.0059" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="2" k1="-0.0554" k2="-0.0071" k3="-0.0046" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="7" k1="-0.0679" k2="0.0044" k3="-0.0099" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0738" k2="0.0095" k3="-0.0104" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.0474" k2="-0.0021" k3="-0.0112" />
--            <vignetting model="pa" focal="100" aperture="8" distance="2" k1="-0.0629" k2="0.0050" k3="-0.0115" />
--            <vignetting model="pa" focal="100" aperture="8" distance="7" k1="-0.0851" k2="0.0381" k3="-0.0290" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0915" k2="0.0470" k3="-0.0350" />
--            <vignetting model="pa" focal="100" aperture="32" distance="1" k1="-0.0304" k2="-0.0338" k3="0.0017" />
--            <vignetting model="pa" focal="100" aperture="32" distance="2" k1="-0.0725" k2="0.0094" k3="-0.0129" />
--            <vignetting model="pa" focal="100" aperture="32" distance="7" k1="-0.1156" k2="0.0949" k3="-0.0639" />
--            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1890" k2="0.2463" k3="-0.1528" />
-+            <distortion model="ptlens" focal="100" a="-0.000626176" b="0.00321735" c="-0.0016503"/>
-+            <tca model="poly3" focal="100" br="0.0000529" vr="0.9997253" bb="-0.0000227" vb="1.0000114"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1" k1="-0.1299" k2="-0.1664" k3="0.1201"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="2" k1="-0.1223" k2="-0.2683" k3="0.1926"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="7" k1="-0.1430" k2="-0.2648" k3="0.1957"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.1617" k2="-0.2393" k3="0.1820"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1" k1="-0.0317" k2="-0.0219" k3="-0.0001"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="2" k1="-0.0438" k2="-0.0251" k3="0.0081"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="7" k1="-0.0499" k2="-0.0261" k3="0.0103"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0519" k2="-0.0265" k3="0.0098"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1" k1="-0.0442" k2="-0.0086" k3="-0.0059"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="2" k1="-0.0554" k2="-0.0071" k3="-0.0046"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="7" k1="-0.0679" k2="0.0044" k3="-0.0099"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0738" k2="0.0095" k3="-0.0104"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1" k1="-0.0474" k2="-0.0021" k3="-0.0112"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="2" k1="-0.0629" k2="0.0050" k3="-0.0115"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="7" k1="-0.0851" k2="0.0381" k3="-0.0290"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0915" k2="0.0470" k3="-0.0350"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1" k1="-0.0304" k2="-0.0338" k3="0.0017"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="2" k1="-0.0725" k2="0.0094" k3="-0.0129"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="7" k1="-0.1156" k2="0.0949" k3="-0.0639"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1890" k2="0.2463" k3="-0.1528"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon 135mm f/2.0L USM</model>
-+        <model>Canon EF 135mm f/2.0L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="135" a="-0.007" b="0.025" c="-0.019" />
-+            <distortion model="ptlens" focal="135" a="-0.007" b="0.025" c="-0.019"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 135mm f/2.8 Soft Focus</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.3</cropfactor>
-+        <!-- Average crop factor of Canon APS-H cameras -->
-+        <cropfactor>1.267</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="135" a="0.001266" b="0.001782" c="0" />
-+            <distortion model="ptlens" focal="135" a="0.001266" b="0.001782" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 200mm f/2.8L USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="200" a="0.00082" b="-0.00169" c="0.01111" />
-+            <distortion model="ptlens" focal="200" a="0.00082" b="-0.00169" c="0.01111"/>
-         </calibration>
-     </lens>
--
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF 200mm f/2.8L II USM</model>
-         <mount>Canon EF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="200" a="0" b="0.000502" c="0" />
-+            <distortion model="poly3" focal="200" k1="0.000502"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon TS-E 24mm f/3.5L</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.006127" b="-0.018983" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.006127" b="-0.018983" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon TS-E 24mm f/3.5L</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 50D -->
-+            <distortion model="poly3" focal="24" k1="-0.00317"/>
-+            <tca model="poly3" focal="24" br="-0.0000018" vr="1.0003986" bb="-0.0000029" vb="0.9999787"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon TS-E 45mm f/2.8</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="45" a="0.00211" b="-0.007388" c="0" />
-+            <distortion model="ptlens" focal="45" a="0.00211" b="-0.007388" c="0"/>
-         </calibration>
-     </lens>
--
--
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon TS-E 90mm f/2.8</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="90" a="0" b="0.001333" c="0" />
-+            <distortion model="poly3" focal="90" k1="0.001333"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
-         <model>Canon EF-S 18-135mm f/3.5-5.6 IS</model>
-         <mount>Canon EF-S</mount>
--        <!-- FixMe: Actually cropfactor 1.613 -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
-             <!-- Taken with Canon EOS 60D -->
--            <distortion model="ptlens" focal="18" a="0.04464" b="-0.15487" c="0.13016" />
--            <distortion model="ptlens" focal="19" a="0.02996" b="-0.08814" c="0.06037" />
--            <distortion model="ptlens" focal="22" a="0.03415" b="-0.09989" c="0.08629" />
--            <distortion model="ptlens" focal="24" a="0.01991" b="-0.04847" c="0.03528" />
--            <distortion model="ptlens" focal="29" a="0.02032" b="-0.05313" c="0.05651" />
--            <distortion model="ptlens" focal="35" a="0.00632" b="-0.00789" c="0.01784" />
--            <distortion model="ptlens" focal="41" a="0.00424" b="-0.00522" c="0.0221" />
--            <distortion model="ptlens" focal="48" a="-0.00698" b="0.03031" c="-0.01303" />
--            <distortion model="ptlens" focal="50" a="0.00469" b="-0.01695" c="0.042" />
--            <distortion model="ptlens" focal="85" a="-0.00269" b="0.01092" c="0.00887" />
--            <distortion model="ptlens" focal="135" a="0.00367" b="-0.00835" c="0.02183" />
--            <tca model="poly3" focal="18" br="-0.0001730" vr="1.0009746" bb="0.0001366" vb="0.9997877" />
--            <tca model="poly3" focal="19" br="-0.0001469" vr="1.0008595" bb="0.0000849" vb="0.9998491" />
--            <tca model="poly3" focal="21" br="-0.0000978" vr="1.0007549" bb="0.0000682" vb="0.9998856" />
--            <tca model="poly3" focal="24" br="-0.0000912" vr="1.0006334" bb="0.0000658" vb="0.9999068" />
--            <tca model="poly3" focal="28" br="-0.0000969" vr="1.0004872" bb="0.0000395" vb="0.9999687" />
--            <tca model="poly3" focal="35" br="-0.0000454" vr="1.0002680" bb="0.0000255" vb="1.0000265" />
--            <tca model="poly3" focal="50" br="0.0000013" vr="0.9999972" bb="-0.0000138" vb="1.0001329" />
--            <tca model="poly3" focal="85" br="0.0000476" vr="0.9997585" bb="-0.0000551" vb="1.0000792" />
--            <tca model="poly3" focal="135" br="0.0000789" vr="0.9996590" bb="-0.0000630" vb="0.9998623" />
-+            <distortion model="ptlens" focal="18" a="0.04464" b="-0.15487" c="0.13016"/>
-+            <distortion model="ptlens" focal="19" a="0.02996" b="-0.08814" c="0.06037"/>
-+            <distortion model="ptlens" focal="22" a="0.03415" b="-0.09989" c="0.08629"/>
-+            <distortion model="ptlens" focal="24" a="0.01991" b="-0.04847" c="0.03528"/>
-+            <distortion model="ptlens" focal="29" a="0.02032" b="-0.05313" c="0.05651"/>
-+            <distortion model="ptlens" focal="35" a="0.00632" b="-0.00789" c="0.01784"/>
-+            <distortion model="ptlens" focal="41" a="0.00424" b="-0.00522" c="0.0221"/>
-+            <distortion model="ptlens" focal="48" a="-0.00698" b="0.03031" c="-0.01303"/>
-+            <distortion model="ptlens" focal="50" a="0.00469" b="-0.01695" c="0.042"/>
-+            <distortion model="ptlens" focal="85" a="-0.00269" b="0.01092" c="0.00887"/>
-+            <distortion model="ptlens" focal="135" a="0.00367" b="-0.00835" c="0.02183"/>
-+            <tca model="poly3" focal="18" br="-0.0001730" vr="1.0009746" bb="0.0001366" vb="0.9997877"/>
-+            <tca model="poly3" focal="19" br="-0.0001469" vr="1.0008595" bb="0.0000849" vb="0.9998491"/>
-+            <tca model="poly3" focal="21" br="-0.0000978" vr="1.0007549" bb="0.0000682" vb="0.9998856"/>
-+            <tca model="poly3" focal="24" br="-0.0000912" vr="1.0006334" bb="0.0000658" vb="0.9999068"/>
-+            <tca model="poly3" focal="28" br="-0.0000969" vr="1.0004872" bb="0.0000395" vb="0.9999687"/>
-+            <tca model="poly3" focal="35" br="-0.0000454" vr="1.0002680" bb="0.0000255" vb="1.0000265"/>
-+            <tca model="poly3" focal="50" br="0.0000013" vr="0.9999972" bb="-0.0000138" vb="1.0001329"/>
-+            <tca model="poly3" focal="85" br="0.0000476" vr="0.9997585" bb="-0.0000551" vb="1.0000792"/>
-+            <tca model="poly3" focal="135" br="0.0000789" vr="0.9996590" bb="-0.0000630" vb="0.9998623"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Canon</maker>
--        <model>Canon EF 85mm f/1.2L II USM</model>
-+        <model>Canon EF-S 18-135mm f/3.5-5.6 IS STM</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS-650D -->
-+            <distortion model="ptlens" focal="18" a="0.01902" b="-0.05009" c="-0.0067"/>
-+            <distortion model="ptlens" focal="24" a="0.02182" b="-0.05987" c="0.04459"/>
-+            <distortion model="ptlens" focal="35" a="0.00521" b="-0.00299" c="0.00091"/>
-+            <distortion model="ptlens" focal="50" a="-0.00078" b="0.0111" c="-0.00193"/>
-+            <distortion model="ptlens" focal="85" a="-0.0114" b="0.04561" c="-0.0336"/>
-+            <distortion model="ptlens" focal="135" a="-0.00247" b="0.02547" c="-0.02858"/>
-+            <!-- Taken with Canon EOS-700D -->
-+            <tca model="poly3" focal="18" br="-0.0000022" vr="1.0004741" bb="0.0000360" vb="0.9999922"/>
-+            <tca model="poly3" focal="20" br="0.0000027" vr="1.0003061" bb="0.0000495" vb="1.0001577"/>
-+            <tca model="poly3" focal="22" br="-0.0000178" vr="1.0002362" bb="0.0000445" vb="1.0001045"/>
-+            <tca model="poly3" focal="24" br="-0.0000436" vr="1.0002265" bb="0.0000450" vb="1.0001340"/>
-+            <tca model="poly3" focal="35" br="0.0000065" vr="1.0000848" bb="0.0000209" vb="1.0001421"/>
-+            <tca model="poly3" focal="50" br="0.0000012" vr="1.0000838" bb="0.0000227" vb="1.0000531"/>
-+            <tca model="poly3" focal="64" br="0.0000032" vr="1.0000358" bb="-0.0000286" vb="0.9999836"/>
-+            <tca model="poly3" focal="85" br="0.0000043" vr="0.9999892" bb="-0.0000588" vb="1.0000195"/>
-+            <tca model="poly3" focal="118" br="0.0000118" vr="0.9999617" bb="0.0001272" vb="0.9995419"/>
-+            <tca model="poly3" focal="135" br="-0.0000001" vr="0.9999369" bb="0.0000753" vb="0.9997197"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.7431" k2="0.0817" k3="0.0463"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.7431" k2="0.0817" k3="0.0463"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2080" k2="-0.7339" k3="0.4079"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2080" k2="-0.7339" k3="0.4079"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.0665" k2="-0.5705" k3="0.1866"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.0665" k2="-0.5705" k3="0.1866"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.1327" k2="-0.1977" k3="-0.0650"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.1327" k2="-0.1977" k3="-0.0650"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.1961" k2="0.0505" k3="-0.1723"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1961" k2="0.0505" k3="-0.1723"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.1976" k2="0.0089" k3="-0.0860"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.1976" k2="0.0089" k3="-0.0860"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.1780" k2="-0.0852" k3="0.0041"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.1780" k2="-0.0852" k3="0.0041"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.1579" k2="-0.1565" k3="0.0682"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1579" k2="-0.1565" k3="0.0682"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="10" k1="-0.1588" k2="-0.1591" k3="0.0743"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.1588" k2="-0.1591" k3="0.0743"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="10" k1="-0.1617" k2="-0.1515" k3="0.0701"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="1000" k1="-0.1617" k2="-0.1515" k3="0.0701"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1592" k2="-0.1595" k3="0.0777"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1592" k2="-0.1595" k3="0.0777"/>
-+            <vignetting model="pa" focal="18" aperture="13" distance="10" k1="-0.1606" k2="-0.1526" k3="0.0722"/>
-+            <vignetting model="pa" focal="18" aperture="13" distance="1000" k1="-0.1606" k2="-0.1526" k3="0.0722"/>
-+            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.1636" k2="-0.1471" k3="0.0700"/>
-+            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.1636" k2="-0.1471" k3="0.0700"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.1630" k2="-0.1469" k3="0.0697"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.1630" k2="-0.1469" k3="0.0697"/>
-+            <vignetting model="pa" focal="18" aperture="18" distance="10" k1="-0.1665" k2="-0.1368" k3="0.0635"/>
-+            <vignetting model="pa" focal="18" aperture="18" distance="1000" k1="-0.1665" k2="-0.1368" k3="0.0635"/>
-+            <vignetting model="pa" focal="18" aperture="20" distance="10" k1="-0.1692" k2="-0.1296" k3="0.0585"/>
-+            <vignetting model="pa" focal="18" aperture="20" distance="1000" k1="-0.1692" k2="-0.1296" k3="0.0585"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1698" k2="-0.1275" k3="0.0574"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1698" k2="-0.1275" k3="0.0574"/>
-+            <vignetting model="pa" focal="20" aperture="3.5" distance="10" k1="-0.7252" k2="0.0798" k3="0.0769"/>
-+            <vignetting model="pa" focal="20" aperture="3.5" distance="1000" k1="-0.7252" k2="0.0798" k3="0.0769"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.2011" k2="-0.7135" k3="0.4348"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.2011" k2="-0.7135" k3="0.4348"/>
-+            <vignetting model="pa" focal="20" aperture="4.5" distance="10" k1="-0.0404" k2="-0.6019" k3="0.2589"/>
-+            <vignetting model="pa" focal="20" aperture="4.5" distance="1000" k1="-0.0404" k2="-0.6019" k3="0.2589"/>
-+            <vignetting model="pa" focal="20" aperture="5" distance="10" k1="-0.0784" k2="-0.3215" k3="0.0741"/>
-+            <vignetting model="pa" focal="20" aperture="5" distance="1000" k1="-0.0784" k2="-0.3215" k3="0.0741"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.1393" k2="-0.0906" k3="-0.0238"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.1393" k2="-0.0906" k3="-0.0238"/>
-+            <vignetting model="pa" focal="20" aperture="6.3" distance="10" k1="-0.1329" k2="-0.1501" k3="0.0712"/>
-+            <vignetting model="pa" focal="20" aperture="6.3" distance="1000" k1="-0.1329" k2="-0.1501" k3="0.0712"/>
-+            <vignetting model="pa" focal="20" aperture="7.1" distance="10" k1="-0.1337" k2="-0.1677" k3="0.0942"/>
-+            <vignetting model="pa" focal="20" aperture="7.1" distance="1000" k1="-0.1337" k2="-0.1677" k3="0.0942"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.1376" k2="-0.1540" k3="0.0860"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.1376" k2="-0.1540" k3="0.0860"/>
-+            <vignetting model="pa" focal="20" aperture="9" distance="10" k1="-0.1423" k2="-0.1429" k3="0.0805"/>
-+            <vignetting model="pa" focal="20" aperture="9" distance="1000" k1="-0.1423" k2="-0.1429" k3="0.0805"/>
-+            <vignetting model="pa" focal="20" aperture="10" distance="10" k1="-0.1359" k2="-0.1590" k3="0.0909"/>
-+            <vignetting model="pa" focal="20" aperture="10" distance="1000" k1="-0.1359" k2="-0.1590" k3="0.0909"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.1442" k2="-0.1391" k3="0.0797"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.1442" k2="-0.1391" k3="0.0797"/>
-+            <vignetting model="pa" focal="20" aperture="13" distance="10" k1="-0.1407" k2="-0.1429" k3="0.0825"/>
-+            <vignetting model="pa" focal="20" aperture="13" distance="1000" k1="-0.1407" k2="-0.1429" k3="0.0825"/>
-+            <vignetting model="pa" focal="20" aperture="14" distance="10" k1="-0.1452" k2="-0.1355" k3="0.0792"/>
-+            <vignetting model="pa" focal="20" aperture="14" distance="1000" k1="-0.1452" k2="-0.1355" k3="0.0792"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="10" k1="-0.1509" k2="-0.1167" k3="0.0651"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.1509" k2="-0.1167" k3="0.0651"/>
-+            <vignetting model="pa" focal="20" aperture="18" distance="10" k1="-0.1506" k2="-0.1165" k3="0.0655"/>
-+            <vignetting model="pa" focal="20" aperture="18" distance="1000" k1="-0.1506" k2="-0.1165" k3="0.0655"/>
-+            <vignetting model="pa" focal="20" aperture="20" distance="10" k1="-0.1523" k2="-0.1123" k3="0.0629"/>
-+            <vignetting model="pa" focal="20" aperture="20" distance="1000" k1="-0.1523" k2="-0.1123" k3="0.0629"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.1510" k2="-0.1112" k3="0.0609"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.1510" k2="-0.1112" k3="0.0609"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.6771" k2="0.0468" k3="0.1067"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6771" k2="0.0468" k3="0.1067"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.0538" k2="-0.7699" k3="0.4315"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.0538" k2="-0.7699" k3="0.4315"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="10" k1="-0.0237" k2="-0.5195" k3="0.2193"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.0237" k2="-0.5195" k3="0.2193"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.0965" k2="-0.1514" k3="0.0056"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.0965" k2="-0.1514" k3="0.0056"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.1307" k2="-0.0631" k3="0.0025"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.1307" k2="-0.0631" k3="0.0025"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.1107" k2="-0.1443" k3="0.0816"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.1107" k2="-0.1443" k3="0.0816"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.1052" k2="-0.1631" k3="0.0986"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.1052" k2="-0.1631" k3="0.0986"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.1113" k2="-0.1496" k3="0.0925"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.1113" k2="-0.1496" k3="0.0925"/>
-+            <vignetting model="pa" focal="24" aperture="10" distance="10" k1="-0.1225" k2="-0.1233" k3="0.0773"/>
-+            <vignetting model="pa" focal="24" aperture="10" distance="1000" k1="-0.1225" k2="-0.1233" k3="0.0773"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.1255" k2="-0.1130" k3="0.0702"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.1255" k2="-0.1130" k3="0.0702"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="10" k1="-0.1248" k2="-0.1116" k3="0.0686"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.1248" k2="-0.1116" k3="0.0686"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.1306" k2="-0.0981" k3="0.0611"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.1306" k2="-0.0981" k3="0.0611"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.1341" k2="-0.0895" k3="0.0554"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.1341" k2="-0.0895" k3="0.0554"/>
-+            <vignetting model="pa" focal="24" aperture="18" distance="10" k1="-0.1303" k2="-0.0986" k3="0.0623"/>
-+            <vignetting model="pa" focal="24" aperture="18" distance="1000" k1="-0.1303" k2="-0.0986" k3="0.0623"/>
-+            <vignetting model="pa" focal="24" aperture="20" distance="10" k1="-0.1340" k2="-0.0889" k3="0.0561"/>
-+            <vignetting model="pa" focal="24" aperture="20" distance="1000" k1="-0.1340" k2="-0.0889" k3="0.0561"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.1337" k2="-0.0860" k3="0.0537"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.1337" k2="-0.0860" k3="0.0537"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.1391" k2="-0.0742" k3="0.0464"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.1391" k2="-0.0742" k3="0.0464"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="10" k1="-0.6127" k2="-0.0175" k3="0.1423"/>
-+            <vignetting model="pa" focal="27" aperture="4" distance="1000" k1="-0.6127" k2="-0.0175" k3="0.1423"/>
-+            <vignetting model="pa" focal="27" aperture="4.5" distance="10" k1="-0.0076" k2="-0.7595" k3="0.4154"/>
-+            <vignetting model="pa" focal="27" aperture="4.5" distance="1000" k1="-0.0076" k2="-0.7595" k3="0.4154"/>
-+            <vignetting model="pa" focal="27" aperture="5" distance="10" k1="-0.0280" k2="-0.3987" k3="0.1462"/>
-+            <vignetting model="pa" focal="27" aperture="5" distance="1000" k1="-0.0280" k2="-0.3987" k3="0.1462"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="10" k1="-0.1080" k2="-0.0517" k3="-0.0399"/>
-+            <vignetting model="pa" focal="27" aperture="5.6" distance="1000" k1="-0.1080" k2="-0.0517" k3="-0.0399"/>
-+            <vignetting model="pa" focal="27" aperture="6.3" distance="10" k1="-0.1128" k2="-0.0662" k3="0.0241"/>
-+            <vignetting model="pa" focal="27" aperture="6.3" distance="1000" k1="-0.1128" k2="-0.0662" k3="0.0241"/>
-+            <vignetting model="pa" focal="27" aperture="7.1" distance="10" k1="-0.0942" k2="-0.1290" k3="0.0778"/>
-+            <vignetting model="pa" focal="27" aperture="7.1" distance="1000" k1="-0.0942" k2="-0.1290" k3="0.0778"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="10" k1="-0.0903" k2="-0.1352" k3="0.0825"/>
-+            <vignetting model="pa" focal="27" aperture="8" distance="1000" k1="-0.0903" k2="-0.1352" k3="0.0825"/>
-+            <vignetting model="pa" focal="27" aperture="9" distance="10" k1="-0.0913" k2="-0.1390" k3="0.0889"/>
-+            <vignetting model="pa" focal="27" aperture="9" distance="1000" k1="-0.0913" k2="-0.1390" k3="0.0889"/>
-+            <vignetting model="pa" focal="27" aperture="10" distance="10" k1="-0.1020" k2="-0.1164" k3="0.0765"/>
-+            <vignetting model="pa" focal="27" aperture="10" distance="1000" k1="-0.1020" k2="-0.1164" k3="0.0765"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="10" k1="-0.1101" k2="-0.0940" k3="0.0624"/>
-+            <vignetting model="pa" focal="27" aperture="11" distance="1000" k1="-0.1101" k2="-0.0940" k3="0.0624"/>
-+            <vignetting model="pa" focal="27" aperture="13" distance="10" k1="-0.1080" k2="-0.0983" k3="0.0665"/>
-+            <vignetting model="pa" focal="27" aperture="13" distance="1000" k1="-0.1080" k2="-0.0983" k3="0.0665"/>
-+            <vignetting model="pa" focal="27" aperture="14" distance="10" k1="-0.1129" k2="-0.0863" k3="0.0595"/>
-+            <vignetting model="pa" focal="27" aperture="14" distance="1000" k1="-0.1129" k2="-0.0863" k3="0.0595"/>
-+            <vignetting model="pa" focal="27" aperture="16" distance="10" k1="-0.1201" k2="-0.0696" k3="0.0487"/>
-+            <vignetting model="pa" focal="27" aperture="16" distance="1000" k1="-0.1201" k2="-0.0696" k3="0.0487"/>
-+            <vignetting model="pa" focal="27" aperture="18" distance="10" k1="-0.1200" k2="-0.0676" k3="0.0477"/>
-+            <vignetting model="pa" focal="27" aperture="18" distance="1000" k1="-0.1200" k2="-0.0676" k3="0.0477"/>
-+            <vignetting model="pa" focal="27" aperture="20" distance="10" k1="-0.1256" k2="-0.0550" k3="0.0396"/>
-+            <vignetting model="pa" focal="27" aperture="20" distance="1000" k1="-0.1256" k2="-0.0550" k3="0.0396"/>
-+            <vignetting model="pa" focal="27" aperture="22" distance="10" k1="-0.1245" k2="-0.0571" k3="0.0409"/>
-+            <vignetting model="pa" focal="27" aperture="22" distance="1000" k1="-0.1245" k2="-0.0571" k3="0.0409"/>
-+            <vignetting model="pa" focal="27" aperture="25" distance="10" k1="-0.1225" k2="-0.0605" k3="0.0434"/>
-+            <vignetting model="pa" focal="27" aperture="25" distance="1000" k1="-0.1225" k2="-0.0605" k3="0.0434"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.5085" k2="-0.1221" k3="0.1864"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.5085" k2="-0.1221" k3="0.1864"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.0040" k2="-0.7771" k3="0.4470"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.0040" k2="-0.7771" k3="0.4470"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.0307" k2="-0.2436" k3="0.0481"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.0307" k2="-0.2436" k3="0.0481"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.1017" k2="0.0030" k3="-0.0502"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1017" k2="0.0030" k3="-0.0502"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.0972" k2="-0.0361" k3="0.0076"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.0972" k2="-0.0361" k3="0.0076"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.0795" k2="-0.0962" k3="0.0614"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.0795" k2="-0.0962" k3="0.0614"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.0652" k2="-0.1337" k3="0.0884"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.0652" k2="-0.1337" k3="0.0884"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.0654" k2="-0.1367" k3="0.0924"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.0654" k2="-0.1367" k3="0.0924"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.0772" k2="-0.1101" k3="0.0784"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.0772" k2="-0.1101" k3="0.0784"/>
-+            <vignetting model="pa" focal="35" aperture="13" distance="10" k1="-0.0865" k2="-0.0914" k3="0.0694"/>
-+            <vignetting model="pa" focal="35" aperture="13" distance="1000" k1="-0.0865" k2="-0.0914" k3="0.0694"/>
-+            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.0910" k2="-0.0802" k3="0.0626"/>
-+            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.0910" k2="-0.0802" k3="0.0626"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.0915" k2="-0.0799" k3="0.0639"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.0915" k2="-0.0799" k3="0.0639"/>
-+            <vignetting model="pa" focal="35" aperture="18" distance="10" k1="-0.0915" k2="-0.0779" k3="0.0623"/>
-+            <vignetting model="pa" focal="35" aperture="18" distance="1000" k1="-0.0915" k2="-0.0779" k3="0.0623"/>
-+            <vignetting model="pa" focal="35" aperture="20" distance="10" k1="-0.0945" k2="-0.0728" k3="0.0610"/>
-+            <vignetting model="pa" focal="35" aperture="20" distance="1000" k1="-0.0945" k2="-0.0728" k3="0.0610"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.0968" k2="-0.0655" k3="0.0552"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.0968" k2="-0.0655" k3="0.0552"/>
-+            <vignetting model="pa" focal="35" aperture="25" distance="10" k1="-0.0955" k2="-0.0691" k3="0.0583"/>
-+            <vignetting model="pa" focal="35" aperture="25" distance="1000" k1="-0.0955" k2="-0.0691" k3="0.0583"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.0957" k2="-0.0673" k3="0.0562"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.0957" k2="-0.0673" k3="0.0562"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.3907" k2="-0.1708" k3="0.1678"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.3907" k2="-0.1708" k3="0.1678"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="0.0011" k2="-0.3197" k3="0.0732"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="0.0011" k2="-0.3197" k3="0.0732"/>
-+            <vignetting model="pa" focal="50" aperture="6.3" distance="10" k1="-0.1342" k2="0.1954" k3="-0.2109"/>
-+            <vignetting model="pa" focal="50" aperture="6.3" distance="1000" k1="-0.1342" k2="0.1954" k3="-0.2109"/>
-+            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.1253" k2="0.1416" k3="-0.1323"/>
-+            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.1253" k2="0.1416" k3="-0.1323"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0835" k2="0.0018" k3="-0.0129"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0835" k2="0.0018" k3="-0.0129"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.0654" k2="-0.0601" k3="0.0409"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.0654" k2="-0.0601" k3="0.0409"/>
-+            <vignetting model="pa" focal="50" aperture="10" distance="10" k1="-0.0571" k2="-0.0858" k3="0.0631"/>
-+            <vignetting model="pa" focal="50" aperture="10" distance="1000" k1="-0.0571" k2="-0.0858" k3="0.0631"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.0487" k2="-0.1136" k3="0.0861"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.0487" k2="-0.1136" k3="0.0861"/>
-+            <vignetting model="pa" focal="50" aperture="13" distance="10" k1="-0.0430" k2="-0.1279" k3="0.0974"/>
-+            <vignetting model="pa" focal="50" aperture="13" distance="1000" k1="-0.0430" k2="-0.1279" k3="0.0974"/>
-+            <vignetting model="pa" focal="50" aperture="14" distance="10" k1="-0.0430" k2="-0.1289" k3="0.0991"/>
-+            <vignetting model="pa" focal="50" aperture="14" distance="1000" k1="-0.0430" k2="-0.1289" k3="0.0991"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.0541" k2="-0.1068" k3="0.0882"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.0541" k2="-0.1068" k3="0.0882"/>
-+            <vignetting model="pa" focal="50" aperture="18" distance="10" k1="-0.0614" k2="-0.0918" k3="0.0801"/>
-+            <vignetting model="pa" focal="50" aperture="18" distance="1000" k1="-0.0614" k2="-0.0918" k3="0.0801"/>
-+            <vignetting model="pa" focal="50" aperture="20" distance="10" k1="-0.0620" k2="-0.0887" k3="0.0779"/>
-+            <vignetting model="pa" focal="50" aperture="20" distance="1000" k1="-0.0620" k2="-0.0887" k3="0.0779"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.0702" k2="-0.0708" k3="0.0678"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0702" k2="-0.0708" k3="0.0678"/>
-+            <vignetting model="pa" focal="50" aperture="25" distance="10" k1="-0.0700" k2="-0.0686" k3="0.0651"/>
-+            <vignetting model="pa" focal="50" aperture="25" distance="1000" k1="-0.0700" k2="-0.0686" k3="0.0651"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="10" k1="-0.0741" k2="-0.0588" k3="0.0587"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.0741" k2="-0.0588" k3="0.0587"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.0738" k2="-0.0606" k3="0.0607"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.0738" k2="-0.0606" k3="0.0607"/>
-+            <vignetting model="pa" focal="62" aperture="5" distance="10" k1="-0.3899" k2="-0.0072" k3="0.0021"/>
-+            <vignetting model="pa" focal="62" aperture="5" distance="1000" k1="-0.3899" k2="-0.0072" k3="0.0021"/>
-+            <vignetting model="pa" focal="62" aperture="5.6" distance="10" k1="-0.0293" k2="-0.2405" k3="-0.0157"/>
-+            <vignetting model="pa" focal="62" aperture="5.6" distance="1000" k1="-0.0293" k2="-0.2405" k3="-0.0157"/>
-+            <vignetting model="pa" focal="62" aperture="6.3" distance="10" k1="-0.1890" k2="0.4683" k3="-0.4706"/>
-+            <vignetting model="pa" focal="62" aperture="6.3" distance="1000" k1="-0.1890" k2="0.4683" k3="-0.4706"/>
-+            <vignetting model="pa" focal="62" aperture="7.1" distance="10" k1="-0.1794" k2="0.4091" k3="-0.3806"/>
-+            <vignetting model="pa" focal="62" aperture="7.1" distance="1000" k1="-0.1794" k2="0.4091" k3="-0.3806"/>
-+            <vignetting model="pa" focal="62" aperture="8" distance="10" k1="-0.1218" k2="0.1864" k3="-0.1749"/>
-+            <vignetting model="pa" focal="62" aperture="8" distance="1000" k1="-0.1218" k2="0.1864" k3="-0.1749"/>
-+            <vignetting model="pa" focal="62" aperture="9" distance="10" k1="-0.0775" k2="0.0178" k3="-0.0223"/>
-+            <vignetting model="pa" focal="62" aperture="9" distance="1000" k1="-0.0775" k2="0.0178" k3="-0.0223"/>
-+            <vignetting model="pa" focal="62" aperture="10" distance="10" k1="-0.0698" k2="-0.0063" k3="-0.0004"/>
-+            <vignetting model="pa" focal="62" aperture="10" distance="1000" k1="-0.0698" k2="-0.0063" k3="-0.0004"/>
-+            <vignetting model="pa" focal="62" aperture="11" distance="10" k1="-0.0470" k2="-0.0833" k3="0.0640"/>
-+            <vignetting model="pa" focal="62" aperture="11" distance="1000" k1="-0.0470" k2="-0.0833" k3="0.0640"/>
-+            <vignetting model="pa" focal="62" aperture="13" distance="10" k1="-0.0393" k2="-0.1066" k3="0.0825"/>
-+            <vignetting model="pa" focal="62" aperture="13" distance="1000" k1="-0.0393" k2="-0.1066" k3="0.0825"/>
-+            <vignetting model="pa" focal="62" aperture="14" distance="10" k1="-0.0342" k2="-0.1218" k3="0.0945"/>
-+            <vignetting model="pa" focal="62" aperture="14" distance="1000" k1="-0.0342" k2="-0.1218" k3="0.0945"/>
-+            <vignetting model="pa" focal="62" aperture="16" distance="10" k1="-0.0322" k2="-0.1260" k3="0.0979"/>
-+            <vignetting model="pa" focal="62" aperture="16" distance="1000" k1="-0.0322" k2="-0.1260" k3="0.0979"/>
-+            <vignetting model="pa" focal="62" aperture="18" distance="10" k1="-0.0318" k2="-0.1284" k3="0.1012"/>
-+            <vignetting model="pa" focal="62" aperture="18" distance="1000" k1="-0.0318" k2="-0.1284" k3="0.1012"/>
-+            <vignetting model="pa" focal="62" aperture="20" distance="10" k1="-0.0381" k2="-0.1161" k3="0.0948"/>
-+            <vignetting model="pa" focal="62" aperture="20" distance="1000" k1="-0.0381" k2="-0.1161" k3="0.0948"/>
-+            <vignetting model="pa" focal="62" aperture="22" distance="10" k1="-0.0462" k2="-0.1015" k3="0.0881"/>
-+            <vignetting model="pa" focal="62" aperture="22" distance="1000" k1="-0.0462" k2="-0.1015" k3="0.0881"/>
-+            <vignetting model="pa" focal="62" aperture="25" distance="10" k1="-0.0478" k2="-0.0978" k3="0.0869"/>
-+            <vignetting model="pa" focal="62" aperture="25" distance="1000" k1="-0.0478" k2="-0.0978" k3="0.0869"/>
-+            <vignetting model="pa" focal="62" aperture="29" distance="10" k1="-0.0516" k2="-0.0888" k3="0.0806"/>
-+            <vignetting model="pa" focal="62" aperture="29" distance="1000" k1="-0.0516" k2="-0.0888" k3="0.0806"/>
-+            <vignetting model="pa" focal="62" aperture="32" distance="10" k1="-0.0536" k2="-0.0870" k3="0.0814"/>
-+            <vignetting model="pa" focal="62" aperture="32" distance="1000" k1="-0.0536" k2="-0.0870" k3="0.0814"/>
-+            <vignetting model="pa" focal="74" aperture="5" distance="10" k1="-0.4182" k2="0.1220" k3="-0.1149"/>
-+            <vignetting model="pa" focal="74" aperture="5" distance="1000" k1="-0.4182" k2="0.1220" k3="-0.1149"/>
-+            <vignetting model="pa" focal="74" aperture="5.6" distance="10" k1="-0.0893" k2="-0.2952" k3="0.0407"/>
-+            <vignetting model="pa" focal="74" aperture="5.6" distance="1000" k1="-0.0893" k2="-0.2952" k3="0.0407"/>
-+            <vignetting model="pa" focal="74" aperture="6.3" distance="10" k1="-0.1611" k2="0.4412" k3="-0.5265"/>
-+            <vignetting model="pa" focal="74" aperture="6.3" distance="1000" k1="-0.1611" k2="0.4412" k3="-0.5265"/>
-+            <vignetting model="pa" focal="74" aperture="7.1" distance="10" k1="-0.2016" k2="0.5457" k3="-0.5348"/>
-+            <vignetting model="pa" focal="74" aperture="7.1" distance="1000" k1="-0.2016" k2="0.5457" k3="-0.5348"/>
-+            <vignetting model="pa" focal="74" aperture="8" distance="10" k1="-0.1725" k2="0.4010" k3="-0.3711"/>
-+            <vignetting model="pa" focal="74" aperture="8" distance="1000" k1="-0.1725" k2="0.4010" k3="-0.3711"/>
-+            <vignetting model="pa" focal="74" aperture="9" distance="10" k1="-0.1239" k2="0.2105" k3="-0.1916"/>
-+            <vignetting model="pa" focal="74" aperture="9" distance="1000" k1="-0.1239" k2="0.2105" k3="-0.1916"/>
-+            <vignetting model="pa" focal="74" aperture="10" distance="10" k1="-0.0838" k2="0.0645" k3="-0.0632"/>
-+            <vignetting model="pa" focal="74" aperture="10" distance="1000" k1="-0.0838" k2="0.0645" k3="-0.0632"/>
-+            <vignetting model="pa" focal="74" aperture="11" distance="10" k1="-0.0601" k2="-0.0176" k3="0.0102"/>
-+            <vignetting model="pa" focal="74" aperture="11" distance="1000" k1="-0.0601" k2="-0.0176" k3="0.0102"/>
-+            <vignetting model="pa" focal="74" aperture="13" distance="10" k1="-0.0513" k2="-0.0568" k3="0.0475"/>
-+            <vignetting model="pa" focal="74" aperture="13" distance="1000" k1="-0.0513" k2="-0.0568" k3="0.0475"/>
-+            <vignetting model="pa" focal="74" aperture="14" distance="10" k1="-0.0384" k2="-0.0936" k3="0.0747"/>
-+            <vignetting model="pa" focal="74" aperture="14" distance="1000" k1="-0.0384" k2="-0.0936" k3="0.0747"/>
-+            <vignetting model="pa" focal="74" aperture="16" distance="10" k1="-0.0298" k2="-0.1182" k3="0.0936"/>
-+            <vignetting model="pa" focal="74" aperture="16" distance="1000" k1="-0.0298" k2="-0.1182" k3="0.0936"/>
-+            <vignetting model="pa" focal="74" aperture="18" distance="10" k1="-0.0249" k2="-0.1301" k3="0.1018"/>
-+            <vignetting model="pa" focal="74" aperture="18" distance="1000" k1="-0.0249" k2="-0.1301" k3="0.1018"/>
-+            <vignetting model="pa" focal="74" aperture="20" distance="10" k1="-0.0234" k2="-0.1370" k3="0.1081"/>
-+            <vignetting model="pa" focal="74" aperture="20" distance="1000" k1="-0.0234" k2="-0.1370" k3="0.1081"/>
-+            <vignetting model="pa" focal="74" aperture="22" distance="10" k1="-0.0306" k2="-0.1196" k3="0.0974"/>
-+            <vignetting model="pa" focal="74" aperture="22" distance="1000" k1="-0.0306" k2="-0.1196" k3="0.0974"/>
-+            <vignetting model="pa" focal="74" aperture="25" distance="10" k1="-0.0358" k2="-0.1115" k3="0.0947"/>
-+            <vignetting model="pa" focal="74" aperture="25" distance="1000" k1="-0.0358" k2="-0.1115" k3="0.0947"/>
-+            <vignetting model="pa" focal="74" aperture="29" distance="10" k1="-0.0394" k2="-0.1034" k3="0.0893"/>
-+            <vignetting model="pa" focal="74" aperture="29" distance="1000" k1="-0.0394" k2="-0.1034" k3="0.0893"/>
-+            <vignetting model="pa" focal="74" aperture="32" distance="10" k1="-0.0450" k2="-0.0906" k3="0.0819"/>
-+            <vignetting model="pa" focal="74" aperture="32" distance="1000" k1="-0.0450" k2="-0.0906" k3="0.0819"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="-0.5143" k2="0.3646" k3="-0.2930"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.5143" k2="0.3646" k3="-0.2930"/>
-+            <vignetting model="pa" focal="97" aperture="6.3" distance="10" k1="-0.0659" k2="0.1080" k3="-0.3563"/>
-+            <vignetting model="pa" focal="97" aperture="6.3" distance="1000" k1="-0.0659" k2="0.1080" k3="-0.3563"/>
-+            <vignetting model="pa" focal="97" aperture="7.1" distance="10" k1="-0.1705" k2="0.5267" k3="-0.6107"/>
-+            <vignetting model="pa" focal="97" aperture="7.1" distance="1000" k1="-0.1705" k2="0.5267" k3="-0.6107"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="10" k1="-0.1831" k2="0.5287" k3="-0.5450"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.1831" k2="0.5287" k3="-0.5450"/>
-+            <vignetting model="pa" focal="97" aperture="9" distance="10" k1="-0.1681" k2="0.4288" k3="-0.4098"/>
-+            <vignetting model="pa" focal="97" aperture="9" distance="1000" k1="-0.1681" k2="0.4288" k3="-0.4098"/>
-+            <vignetting model="pa" focal="97" aperture="10" distance="10" k1="-0.1431" k2="0.3190" k3="-0.2945"/>
-+            <vignetting model="pa" focal="97" aperture="10" distance="1000" k1="-0.1431" k2="0.3190" k3="-0.2945"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="10" k1="-0.0894" k2="0.1110" k3="-0.1020"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.0894" k2="0.1110" k3="-0.1020"/>
-+            <vignetting model="pa" focal="97" aperture="13" distance="10" k1="-0.0580" k2="-0.0122" k3="0.0120"/>
-+            <vignetting model="pa" focal="97" aperture="13" distance="1000" k1="-0.0580" k2="-0.0122" k3="0.0120"/>
-+            <vignetting model="pa" focal="97" aperture="14" distance="10" k1="-0.0485" k2="-0.0412" k3="0.0347"/>
-+            <vignetting model="pa" focal="97" aperture="14" distance="1000" k1="-0.0485" k2="-0.0412" k3="0.0347"/>
-+            <vignetting model="pa" focal="97" aperture="16" distance="10" k1="-0.0314" k2="-0.0923" k3="0.0759"/>
-+            <vignetting model="pa" focal="97" aperture="16" distance="1000" k1="-0.0314" k2="-0.0923" k3="0.0759"/>
-+            <vignetting model="pa" focal="97" aperture="18" distance="10" k1="-0.0220" k2="-0.1190" k3="0.0956"/>
-+            <vignetting model="pa" focal="97" aperture="18" distance="1000" k1="-0.0220" k2="-0.1190" k3="0.0956"/>
-+            <vignetting model="pa" focal="97" aperture="20" distance="10" k1="-0.0208" k2="-0.1212" k3="0.0964"/>
-+            <vignetting model="pa" focal="97" aperture="20" distance="1000" k1="-0.0208" k2="-0.1212" k3="0.0964"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="10" k1="-0.0158" k2="-0.1337" k3="0.1044"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.0158" k2="-0.1337" k3="0.1044"/>
-+            <vignetting model="pa" focal="97" aperture="25" distance="10" k1="-0.0115" k2="-0.1430" k3="0.1103"/>
-+            <vignetting model="pa" focal="97" aperture="25" distance="1000" k1="-0.0115" k2="-0.1430" k3="0.1103"/>
-+            <vignetting model="pa" focal="97" aperture="29" distance="10" k1="-0.0227" k2="-0.1213" k3="0.0984"/>
-+            <vignetting model="pa" focal="97" aperture="29" distance="1000" k1="-0.0227" k2="-0.1213" k3="0.0984"/>
-+            <vignetting model="pa" focal="97" aperture="32" distance="10" k1="-0.0287" k2="-0.1058" k3="0.0880"/>
-+            <vignetting model="pa" focal="97" aperture="32" distance="1000" k1="-0.0287" k2="-0.1058" k3="0.0880"/>
-+            <vignetting model="pa" focal="97" aperture="36" distance="10" k1="-0.0327" k2="-0.0970" k3="0.0832"/>
-+            <vignetting model="pa" focal="97" aperture="36" distance="1000" k1="-0.0327" k2="-0.0970" k3="0.0832"/>
-+            <vignetting model="pa" focal="113" aperture="5.6" distance="10" k1="-0.5714" k2="0.4623" k3="-0.3447"/>
-+            <vignetting model="pa" focal="113" aperture="5.6" distance="1000" k1="-0.5714" k2="0.4623" k3="-0.3447"/>
-+            <vignetting model="pa" focal="113" aperture="6.3" distance="10" k1="-0.0291" k2="-0.2506" k3="-0.0723"/>
-+            <vignetting model="pa" focal="113" aperture="6.3" distance="1000" k1="-0.0291" k2="-0.2506" k3="-0.0723"/>
-+            <vignetting model="pa" focal="113" aperture="7.1" distance="10" k1="-0.0718" k2="0.1907" k3="-0.4139"/>
-+            <vignetting model="pa" focal="113" aperture="7.1" distance="1000" k1="-0.0718" k2="0.1907" k3="-0.4139"/>
-+            <vignetting model="pa" focal="113" aperture="8" distance="10" k1="-0.1465" k2="0.4453" k3="-0.5275"/>
-+            <vignetting model="pa" focal="113" aperture="8" distance="1000" k1="-0.1465" k2="0.4453" k3="-0.5275"/>
-+            <vignetting model="pa" focal="113" aperture="9" distance="10" k1="-0.1713" k2="0.4840" k3="-0.4934"/>
-+            <vignetting model="pa" focal="113" aperture="9" distance="1000" k1="-0.1713" k2="0.4840" k3="-0.4934"/>
-+            <vignetting model="pa" focal="113" aperture="10" distance="10" k1="-0.1558" k2="0.4035" k3="-0.3928"/>
-+            <vignetting model="pa" focal="113" aperture="10" distance="1000" k1="-0.1558" k2="0.4035" k3="-0.3928"/>
-+            <vignetting model="pa" focal="113" aperture="11" distance="10" k1="-0.1180" k2="0.2397" k3="-0.2231"/>
-+            <vignetting model="pa" focal="113" aperture="11" distance="1000" k1="-0.1180" k2="0.2397" k3="-0.2231"/>
-+            <vignetting model="pa" focal="113" aperture="13" distance="10" k1="-0.0632" k2="0.0256" k3="-0.0261"/>
-+            <vignetting model="pa" focal="113" aperture="13" distance="1000" k1="-0.0632" k2="0.0256" k3="-0.0261"/>
-+            <vignetting model="pa" focal="113" aperture="14" distance="10" k1="-0.0504" k2="-0.0310" k3="0.0282"/>
-+            <vignetting model="pa" focal="113" aperture="14" distance="1000" k1="-0.0504" k2="-0.0310" k3="0.0282"/>
-+            <vignetting model="pa" focal="113" aperture="16" distance="10" k1="-0.0396" k2="-0.0646" k3="0.0570"/>
-+            <vignetting model="pa" focal="113" aperture="16" distance="1000" k1="-0.0396" k2="-0.0646" k3="0.0570"/>
-+            <vignetting model="pa" focal="113" aperture="18" distance="10" k1="-0.0255" k2="-0.1061" k3="0.0891"/>
-+            <vignetting model="pa" focal="113" aperture="18" distance="1000" k1="-0.0255" k2="-0.1061" k3="0.0891"/>
-+            <vignetting model="pa" focal="113" aperture="20" distance="10" k1="-0.0215" k2="-0.1166" k3="0.0959"/>
-+            <vignetting model="pa" focal="113" aperture="20" distance="1000" k1="-0.0215" k2="-0.1166" k3="0.0959"/>
-+            <vignetting model="pa" focal="113" aperture="22" distance="10" k1="-0.0146" k2="-0.1292" k3="0.1017"/>
-+            <vignetting model="pa" focal="113" aperture="22" distance="1000" k1="-0.0146" k2="-0.1292" k3="0.1017"/>
-+            <vignetting model="pa" focal="113" aperture="25" distance="10" k1="-0.0052" k2="-0.1518" k3="0.1162"/>
-+            <vignetting model="pa" focal="113" aperture="25" distance="1000" k1="-0.0052" k2="-0.1518" k3="0.1162"/>
-+            <vignetting model="pa" focal="113" aperture="29" distance="10" k1="-0.0082" k2="-0.1429" k3="0.1093"/>
-+            <vignetting model="pa" focal="113" aperture="29" distance="1000" k1="-0.0082" k2="-0.1429" k3="0.1093"/>
-+            <vignetting model="pa" focal="113" aperture="32" distance="10" k1="-0.0154" k2="-0.1270" k3="0.0995"/>
-+            <vignetting model="pa" focal="113" aperture="32" distance="1000" k1="-0.0154" k2="-0.1270" k3="0.0995"/>
-+            <vignetting model="pa" focal="113" aperture="36" distance="10" k1="-0.0237" k2="-0.1084" k3="0.0889"/>
-+            <vignetting model="pa" focal="113" aperture="36" distance="1000" k1="-0.0237" k2="-0.1084" k3="0.0889"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.5572" k2="0.4241" k3="-0.3221"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.5572" k2="0.4241" k3="-0.3221"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="10" k1="-0.0319" k2="-0.2993" k3="-0.0309"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.0319" k2="-0.2993" k3="-0.0309"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.0273" k2="0.0373" k3="-0.3128"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.0273" k2="0.0373" k3="-0.3128"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1069" k2="0.3186" k3="-0.4459"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1069" k2="0.3186" k3="-0.4459"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1513" k2="0.4345" k3="-0.4673"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1513" k2="0.4345" k3="-0.4673"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="10" k1="-0.1497" k2="0.3945" k3="-0.3934"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="1000" k1="-0.1497" k2="0.3945" k3="-0.3934"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1199" k2="0.2527" k3="-0.2341"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1199" k2="0.2527" k3="-0.2341"/>
-+            <vignetting model="pa" focal="135" aperture="13" distance="10" k1="-0.0677" k2="0.0498" k3="-0.0466"/>
-+            <vignetting model="pa" focal="135" aperture="13" distance="1000" k1="-0.0677" k2="0.0498" k3="-0.0466"/>
-+            <vignetting model="pa" focal="135" aperture="14" distance="10" k1="-0.0456" k2="-0.0352" k3="0.0308"/>
-+            <vignetting model="pa" focal="135" aperture="14" distance="1000" k1="-0.0456" k2="-0.0352" k3="0.0308"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.0331" k2="-0.0797" k3="0.0696"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.0331" k2="-0.0797" k3="0.0696"/>
-+            <vignetting model="pa" focal="135" aperture="18" distance="10" k1="-0.0240" k2="-0.1058" k3="0.0896"/>
-+            <vignetting model="pa" focal="135" aperture="18" distance="1000" k1="-0.0240" k2="-0.1058" k3="0.0896"/>
-+            <vignetting model="pa" focal="135" aperture="20" distance="10" k1="-0.0204" k2="-0.1148" k3="0.0963"/>
-+            <vignetting model="pa" focal="135" aperture="20" distance="1000" k1="-0.0204" k2="-0.1148" k3="0.0963"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.0119" k2="-0.1331" k3="0.1065"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.0119" k2="-0.1331" k3="0.1065"/>
-+            <vignetting model="pa" focal="135" aperture="25" distance="10" k1="-0.0058" k2="-0.1465" k3="0.1135"/>
-+            <vignetting model="pa" focal="135" aperture="25" distance="1000" k1="-0.0058" k2="-0.1465" k3="0.1135"/>
-+            <vignetting model="pa" focal="135" aperture="29" distance="10" k1="-0.0027" k2="-0.1528" k3="0.1175"/>
-+            <vignetting model="pa" focal="135" aperture="29" distance="1000" k1="-0.0027" k2="-0.1528" k3="0.1175"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="10" k1="0.0026" k2="-0.1635" k3="0.1234"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="0.0026" k2="-0.1635" k3="0.1234"/>
-+            <vignetting model="pa" focal="135" aperture="36" distance="10" k1="-0.0031" k2="-0.1495" k3="0.1143"/>
-+            <vignetting model="pa" focal="135" aperture="36" distance="1000" k1="-0.0031" k2="-0.1495" k3="0.1143"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 18-55mm f/3.5-5.6 IS</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with cropfactor 1.622 (Canon 50D or 450D) -->
-+            <distortion model="ptlens" focal="18" a="0.00644" b="-0.01245" c="-0.0348"/>
-+            <distortion model="ptlens" focal="21" a="0.00345" b="-0.00918" c="-0.01759"/>
-+            <distortion model="ptlens" focal="24" a="0.01705" b="-0.05405" c="0.03261"/>
-+            <distortion model="ptlens" focal="28" a="-0.00353" b="0.01826" c="-0.04406"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="44" a="0.00915" b="-0.01128" c="-0.01171"/>
-+            <distortion model="ptlens" focal="55" a="-0.02782" b="0.0964" c="-0.09883"/>
-+            <tca model="poly3" focal="18" br="-0.0003176" vr="1.0009927" bb="0.0002609" vb="0.9995018"/>
-+            <tca model="poly3" focal="21" br="-0.00017015" vr="1.00085065" bb="0.00015435" vb="0.99956185"/>
-+            <tca model="poly3" focal="24" br="-0.00005475" vr="1.0006983" bb="0.00011575" vb="0.99960995"/>
-+            <tca model="poly3" focal="28" br="0.0000031" vr="1.0005299" bb="0.0000856" vb="0.99967605"/>
-+            <tca model="poly3" focal="35" br="-0.0000414" vr="1.00034975" bb="0.00003195" vb="0.9998738"/>
-+            <tca model="poly3" focal="44" br="-0.0000039" vr="1.0001012" bb="0.000014" vb="1.0000481"/>
-+            <tca model="poly3" focal="55" br="-0.0000096" vr="0.99992965" bb="0.00000225" vb="1.0002339"/>
-+            <!-- Taken with Canon EOS 550D -->
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.0505" k2="0.9425" k3="-0.4433"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.0505" k2="0.9425" k3="-0.4433"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.3271" k2="-0.3518" k3="0.2513"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.3271" k2="-0.3518" k3="0.2513"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.3159" k2="0.0175" k3="0.0074"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3159" k2="0.0175" k3="0.0074"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2855" k2="-0.0799" k3="0.0948"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2855" k2="-0.0799" k3="0.0948"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.2723" k2="-0.1029" k3="0.1071"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2723" k2="-0.1029" k3="0.1071"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2918" k2="-0.0721" k3="0.0931"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2918" k2="-0.0721" k3="0.0931"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2909" k2="-0.0728" k3="0.0940"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2909" k2="-0.0728" k3="0.0940"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.9648" k2="0.8380" k3="-0.3522"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.9648" k2="0.8380" k3="-0.3522"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2372" k2="-0.0310" k3="0.0141"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2372" k2="-0.0310" k3="0.0141"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2212" k2="-0.0943" k3="0.0906"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2212" k2="-0.0943" k3="0.0906"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2174" k2="-0.1025" k3="0.0963"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2174" k2="-0.1025" k3="0.0963"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.2134" k2="-0.1124" k3="0.1036"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.2134" k2="-0.1124" k3="0.1036"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.2090" k2="-0.1197" k3="0.1072"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2090" k2="-0.1197" k3="0.1072"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2066" k2="-0.1294" k3="0.1140"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2066" k2="-0.1294" k3="0.1140"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.8151" k2="0.6782" k3="-0.2757"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8151" k2="0.6782" k3="-0.2757"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1285" k2="-0.1113" k3="0.0388"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1285" k2="-0.1113" k3="0.0388"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1474" k2="-0.0722" k3="0.0602"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1474" k2="-0.0722" k3="0.0602"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.1412" k2="-0.0856" k3="0.0680"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1412" k2="-0.0856" k3="0.0680"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.1365" k2="-0.0935" k3="0.0715"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1365" k2="-0.0935" k3="0.0715"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1504" k2="-0.0671" k3="0.0578"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1504" k2="-0.0671" k3="0.0578"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.1610" k2="-0.0620" k3="0.0626"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1610" k2="-0.0620" k3="0.0626"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6219" k2="0.5060" k3="-0.2165"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6219" k2="0.5060" k3="-0.2165"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0769" k2="-0.0718" k3="0.0485"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0769" k2="-0.0718" k3="0.0485"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0775" k2="-0.0813" k3="0.0605"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0775" k2="-0.0813" k3="0.0605"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.0815" k2="-0.0779" k3="0.0594"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.0815" k2="-0.0779" k3="0.0594"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.0913" k2="-0.0626" k3="0.0522"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.0913" k2="-0.0626" k3="0.0522"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="10" k1="-0.1028" k2="-0.0492" k3="0.0465"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.1028" k2="-0.0492" k3="0.0465"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.0968" k2="-0.0651" k3="0.0572"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.0968" k2="-0.0651" k3="0.0572"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 24-70mm f/2.8L II USM</model>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <!-- Taken with Canon EOS-1D X -->
--            <distortion model="poly3" focal="85" k1="-0.00412" />
-+            <!-- Taken with Canon EOS 5D Mark III -->
-+            <distortion model="ptlens" focal="24" a="0.02964" b="-0.07853" c="0.02943"/>
-+            <distortion model="ptlens" focal="28" a="0.02151" b="-0.05678" c="0.02905"/>
-+            <distortion model="ptlens" focal="35" a="0.01668" b="-0.04154" c="0.0279"/>
-+            <distortion model="ptlens" focal="50" a="-0.00223" b="0.01856" c="-0.0182"/>
-+            <distortion model="ptlens" focal="70" a="0.00907" b="-0.02015" c="0.02311"/>
-+            <tca model="poly3" focal="24" br="-0.0000220" vr="1.0002104" bb="-0.0000000" vb="1.0000529"/>
-+            <tca model="poly3" focal="28" br="-0.0000204" vr="1.0001414" bb="-0.0000079" vb="1.0000872"/>
-+            <tca model="poly3" focal="35" br="-0.0000369" vr="1.0000745" bb="-0.0000106" vb="1.0000704"/>
-+            <tca model="poly3" focal="50" br="-0.0000305" vr="0.9999836" bb="0.0000023" vb="0.9999503"/>
-+            <tca model="poly3" focal="70" br="-0.0000053" vr="0.9999048" bb="0.0000167" vb="0.9998521"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="0.38" k1="-0.5324" k2="-0.9169" k3="0.6118"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="0.76" k1="-0.5380" k2="-0.8584" k3="0.5817"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="2.28" k1="-0.5445" k2="-0.8127" k3="0.5488"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.5334" k2="-0.7926" k3="0.5243"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.38" k1="-0.6598" k2="0.4100" k3="-0.4916"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.76" k1="-0.6732" k2="0.4436" k3="-0.4767"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="2.28" k1="-0.6785" k2="0.4576" k3="-0.4765"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6889" k2="0.5049" k3="-0.5073"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.38" k1="-0.7625" k2="0.6284" k3="-0.4894"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.76" k1="-0.7068" k2="0.4429" k3="-0.3190"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="2.28" k1="-0.6955" k2="0.4015" k3="-0.2828"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.7003" k2="0.4412" k3="-0.3183"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.38" k1="-0.6918" k2="0.3336" k3="-0.2064"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.76" k1="-0.6577" k2="0.2275" k3="-0.1131"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="2.28" k1="-0.6665" k2="0.2617" k3="-0.1438"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.6826" k2="0.3334" k3="-0.2021"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.38" k1="-0.6565" k2="0.1720" k3="-0.0526"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.76" k1="-0.6611" k2="0.2171" k3="-0.0941"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="2.28" k1="-0.6695" k2="0.2517" k3="-0.1252"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.6862" k2="0.3218" k3="-0.1805"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="0.38" k1="-0.6570" k2="0.1579" k3="-0.0344"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="0.76" k1="-0.6665" k2="0.2198" k3="-0.0898"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="2.28" k1="-0.6734" k2="0.2498" k3="-0.1171"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.6920" k2="0.3238" k3="-0.1744"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.38" k1="-0.6640" k2="0.1655" k3="-0.0356"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.76" k1="-0.6717" k2="0.2228" k3="-0.0871"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="2.28" k1="-0.6788" k2="0.2532" k3="-0.1145"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.6981" k2="0.3271" k3="-0.1710"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="0.38" k1="-0.5314" k2="-0.6102" k3="0.4052"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="0.76" k1="-0.5656" k2="-0.4577" k3="0.2963"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="2.28" k1="-0.5847" k2="-0.3989" k3="0.2529"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.5796" k2="-0.3367" k3="0.1881"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.38" k1="-0.6341" k2="0.4189" k3="-0.3761"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.76" k1="-0.6373" k2="0.4549" k3="-0.3973"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="2.28" k1="-0.6428" k2="0.4833" k3="-0.4249"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.6651" k2="0.5708" k3="-0.4970"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.38" k1="-0.5964" k2="0.2054" k3="-0.1109"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.76" k1="-0.5978" k2="0.2487" k3="-0.1525"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="2.28" k1="-0.6065" k2="0.2762" k3="-0.1756"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.6168" k2="0.3284" k3="-0.2172"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.38" k1="-0.5948" k2="0.1812" k3="-0.0814"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.76" k1="-0.5948" k2="0.2158" k3="-0.1128"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="2.28" k1="-0.5977" k2="0.2299" k3="-0.1259"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6069" k2="0.2753" k3="-0.1594"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="0.38" k1="-0.6015" k2="0.1822" k3="-0.0739"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="0.76" k1="-0.5979" k2="0.2073" k3="-0.0974"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="2.28" k1="-0.6015" k2="0.2218" k3="-0.1097"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.6116" k2="0.2675" k3="-0.1422"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="0.38" k1="-0.6060" k2="0.1834" k3="-0.0692"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="0.76" k1="-0.6041" k2="0.2106" k3="-0.0929"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="2.28" k1="-0.6044" k2="0.2171" k3="-0.0995"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.6176" k2="0.2691" k3="-0.1354"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.38" k1="-0.6089" k2="0.1793" k3="-0.0616"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.76" k1="-0.6062" k2="0.2036" k3="-0.0829"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="2.28" k1="-0.6079" k2="0.2130" k3="-0.0908"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.6214" k2="0.2649" k3="-0.1264"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.38" k1="-0.6219" k2="0.0305" k3="-0.0893"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.76" k1="-0.6559" k2="0.1407" k3="-0.1797"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="2.28" k1="-0.6505" k2="0.1384" k3="-0.1870"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.6559" k2="0.1689" k3="-0.2166"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.38" k1="-0.6016" k2="0.5514" k3="-0.4750"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.76" k1="-0.6080" k2="0.6087" k3="-0.5348"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="2.28" k1="-0.6108" k2="0.6189" k3="-0.5478"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6307" k2="0.6882" k3="-0.6013"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.38" k1="-0.5466" k2="0.3128" k3="-0.2374"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.76" k1="-0.5423" k2="0.3160" k3="-0.2391"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="2.28" k1="-0.5420" k2="0.3131" k3="-0.2357"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.5577" k2="0.3719" k3="-0.2787"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.38" k1="-0.5414" k2="0.2781" k3="-0.1982"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.76" k1="-0.5279" k2="0.2506" k3="-0.1725"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="2.28" k1="-0.5276" k2="0.2399" k3="-0.1590"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5323" k2="0.2683" k3="-0.1774"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.38" k1="-0.5453" k2="0.2737" k3="-0.1863"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.76" k1="-0.5313" k2="0.2413" k3="-0.1548"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="2.28" k1="-0.5310" k2="0.2303" k3="-0.1408"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5407" k2="0.2680" k3="-0.1643"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.38" k1="-0.5498" k2="0.2744" k3="-0.1818"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="0.76" k1="-0.5395" k2="0.2492" k3="-0.1535"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="2.28" k1="-0.5361" k2="0.2309" k3="-0.1344"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.5469" k2="0.2706" k3="-0.1586"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.38" k1="-0.5541" k2="0.2792" k3="-0.1832"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.76" k1="-0.5433" k2="0.2519" k3="-0.1532"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="2.28" k1="-0.5389" k2="0.2307" k3="-0.1312"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.5510" k2="0.2723" k3="-0.1562"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.38" k1="-0.8412" k2="0.8591" k3="-0.7751"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.76" k1="-0.7442" k2="0.5381" k3="-0.5339"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="2.28" k1="-0.7013" k2="0.3674" k3="-0.4003"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.6708" k2="0.2618" k3="-0.3191"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.38" k1="-0.6288" k2="1.0150" k3="-0.9942"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.76" k1="-0.5665" k2="0.8090" k3="-0.8244"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="2.28" k1="-0.5370" k2="0.7039" k3="-0.7391"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.5376" k2="0.6855" k3="-0.7145"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.38" k1="-0.6064" k2="0.8725" k3="-0.8081"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.76" k1="-0.5597" k2="0.7110" k3="-0.6529"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="2.28" k1="-0.5430" k2="0.6455" k3="-0.5898"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.5565" k2="0.6666" k3="-0.5880"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.38" k1="-0.5483" k2="0.6334" k3="-0.5772"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.76" k1="-0.4992" k2="0.4522" k3="-0.3960"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="2.28" k1="-0.4805" k2="0.3744" k3="-0.3178"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4891" k2="0.3846" k3="-0.3060"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.38" k1="-0.5144" k2="0.4766" k3="-0.4242"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.76" k1="-0.4688" k2="0.3098" k3="-0.2545"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="2.28" k1="-0.4509" k2="0.2381" k3="-0.1817"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4631" k2="0.2604" k3="-0.1804"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.38" k1="-0.5109" k2="0.4418" k3="-0.3831"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.76" k1="-0.4731" k2="0.3028" k3="-0.2373"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="2.28" k1="-0.4576" k2="0.2410" k3="-0.1735"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.4685" k2="0.2607" k3="-0.1704"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.38" k1="-0.5117" k2="0.4357" k3="-0.3738"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.76" k1="-0.4785" k2="0.3085" k3="-0.2364"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="2.28" k1="-0.4622" k2="0.2449" k3="-0.1714"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.4742" k2="0.2654" k3="-0.1679"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="0.38" k1="-0.7965" k2="0.7982" k3="-0.6515"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="0.76" k1="-0.8490" k2="0.7522" k3="-0.5625"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="2.28" k1="-0.9092" k2="0.7947" k3="-0.5491"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.9113" k2="0.7501" k3="-0.5041"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="0.38" k1="-0.5124" k2="0.7389" k3="-0.7073"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="0.76" k1="-0.4602" k2="0.5934" k3="-0.6096"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="2.28" k1="-0.4122" k2="0.4348" k3="-0.5087"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.3981" k2="0.3671" k3="-0.4525"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.38" k1="-0.4313" k2="0.3788" k3="-0.3296"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.76" k1="-0.4253" k2="0.3796" k3="-0.3240"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="2.28" k1="-0.4202" k2="0.3627" k3="-0.3077"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.4463" k2="0.4183" k3="-0.3371"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.38" k1="-0.3725" k2="0.1437" k3="-0.1122"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.76" k1="-0.3534" k2="0.0885" k3="-0.0499"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="2.28" k1="-0.3469" k2="0.0622" k3="-0.0204"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3693" k2="0.1071" k3="-0.0375"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.38" k1="-0.3763" k2="0.1389" k3="-0.0989"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.76" k1="-0.3520" k2="0.0708" k3="-0.0269"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="2.28" k1="-0.3454" k2="0.0449" k3="0.0024"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.3739" k2="0.1023" k3="-0.0228"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="0.38" k1="-0.3844" k2="0.1522" k3="-0.1022"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="0.76" k1="-0.3650" k2="0.0943" k3="-0.0365"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="2.28" k1="-0.3567" k2="0.0652" k3="-0.0051"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.3848" k2="0.1222" k3="-0.0306"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="0.38" k1="-0.3922" k2="0.1655" k3="-0.1072"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="0.76" k1="-0.3759" k2="0.1168" k3="-0.0484"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="2.28" k1="-0.3697" k2="0.0921" k3="-0.0199"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.3970" k2="0.1468" k3="-0.0434"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 15-85mm f/3.5-5.6 IS USM</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 550D -->
-+            <distortion model="ptlens" focal="15" a="0.0184" b="-0.03224" c="-0.03581"/>
-+            <distortion model="ptlens" focal="17" a="0.02912" b="-0.08348" c="0.0641"/>
-+            <distortion model="ptlens" focal="18" a="0.02432" b="-0.06148" c="0.03995"/>
-+            <distortion model="ptlens" focal="19" a="0.01682" b="-0.04154" c="0.03783"/>
-+            <distortion model="ptlens" focal="21" a="0.01432" b="-0.03294" c="0.03046"/>
-+            <distortion model="ptlens" focal="22" a="0.00798" b="-0.01214" c="0.01256"/>
-+            <distortion model="ptlens" focal="24" a="0.00993" b="-0.01948" c="0.02317"/>
-+            <distortion model="ptlens" focal="35" a="0.00161" b="-0.00086" c="0.01326"/>
-+            <distortion model="ptlens" focal="50" a="0.0042" b="-0.00871" c="0.01862"/>
-+            <distortion model="ptlens" focal="70" a="0.00378" b="-0.0078" c="0.01051"/>
-+            <distortion model="ptlens" focal="85" a="0.00118" b="-0.00081" c="0.00592"/>
-+            <tca model="poly3" focal="15" vr="1.0003" vb="1.0003"/>
-+            <tca model="poly3" focal="17" vr="1.0004" vb="1.0002"/>
-+            <tca model="poly3" focal="18" vr="1.0004" vb="1.0002"/>
-+            <tca model="poly3" focal="18" vr="1.0005" vb="1.0000"/>
-+            <tca model="poly3" focal="21" vr="1.0003" vb="1.0003"/>
-+            <tca model="poly3" focal="22" vr="1.0004" vb="1.0001"/>
-+            <tca model="poly3" focal="24" vr="1.0002" vb="1.0001"/>
-+            <tca model="poly3" focal="70" vr="0.9999" vb="0.9997"/>
-+            <tca model="poly3" focal="85" vr="0.9998" vb="0.9995"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 50-200mm f/3.5-4.5L</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 50D -->
-+            <distortion model="poly3" focal="50" k1="-0.0059"/>
-+            <distortion model="poly3" focal="60" k1="-0.00313"/>
-+            <distortion model="poly3" focal="70" k1="-0.00103"/>
-+            <distortion model="poly3" focal="75" k1="0.00035"/>
-+            <distortion model="poly3" focal="100" k1="0.00199"/>
-+            <distortion model="poly3" focal="135" k1="0.00329"/>
-+            <distortion model="poly3" focal="157" k1="0.0032"/>
-+            <distortion model="poly3" focal="200" k1="0.00263"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 50-200mm f/3.5-4.5L</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5Dm3 -->
-+            <distortion model="poly3" focal="50" k1="-0.00757"/>
-+            <distortion model="poly3" focal="60" k1="-0.00181"/>
-+            <distortion model="poly3" focal="70" k1="0.00277"/>
-+            <distortion model="poly3" focal="80" k1="0.00803"/>
-+            <distortion model="poly3" focal="100" k1="0.01146"/>
-+            <distortion model="poly3" focal="135" k1="0.01158"/>
-+            <distortion model="poly3" focal="200" k1="0.01318"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 70-300mm f/4-5.6L IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D -->
-+            <distortion model="poly3" focal="70" k1="-0.00788"/>
-+            <distortion model="poly3" focal="78" k1="-0.00489"/>
-+            <distortion model="poly3" focal="84" k1="-0.00192"/>
-+            <distortion model="poly3" focal="100" k1="0.00174"/>
-+            <distortion model="poly3" focal="135" k1="0.00701"/>
-+            <distortion model="poly3" focal="200" k1="0.00938"/>
-+            <distortion model="poly3" focal="300" k1="0.00975"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5580" k2="-0.0998" k3="0.1127"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5580" k2="-0.0998" k3="0.1127"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.3398" k2="-0.2963" k3="0.1602"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.3398" k2="-0.2963" k3="0.1602"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1781" k2="-0.3772" k3="0.1499"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1781" k2="-0.3772" k3="0.1499"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2161" k2="0.0326" k3="-0.1140"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2161" k2="0.0326" k3="-0.1140"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2615" k2="0.1579" k3="-0.1124"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2615" k2="0.1579" k3="-0.1124"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.2498" k2="0.0902" k3="-0.0242"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.2498" k2="0.0902" k3="-0.0242"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2378" k2="0.0459" k3="0.0172"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2378" k2="0.0459" k3="0.0172"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.2419" k2="0.0527" k3="0.0135"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.2419" k2="0.0527" k3="0.0135"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2376" k2="0.0462" k3="0.0168"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2376" k2="0.0462" k3="0.0168"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.2438" k2="0.0594" k3="0.0088"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2438" k2="0.0594" k3="0.0088"/>
-+            <vignetting model="pa" focal="70" aperture="13" distance="10" k1="-0.2489" k2="0.0717" k3="0.0015"/>
-+            <vignetting model="pa" focal="70" aperture="13" distance="1000" k1="-0.2489" k2="0.0717" k3="0.0015"/>
-+            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.2492" k2="0.0704" k3="0.0025"/>
-+            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.2492" k2="0.0704" k3="0.0025"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.2517" k2="0.0800" k3="-0.0046"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2517" k2="0.0800" k3="-0.0046"/>
-+            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.2520" k2="0.0815" k3="-0.0060"/>
-+            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.2520" k2="0.0815" k3="-0.0060"/>
-+            <vignetting model="pa" focal="70" aperture="20" distance="10" k1="-0.2526" k2="0.0828" k3="-0.0063"/>
-+            <vignetting model="pa" focal="70" aperture="20" distance="1000" k1="-0.2526" k2="0.0828" k3="-0.0063"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2591" k2="0.0958" k3="-0.0137"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2591" k2="0.0958" k3="-0.0137"/>
-+            <vignetting model="pa" focal="70" aperture="25" distance="10" k1="-0.2605" k2="0.0999" k3="-0.0164"/>
-+            <vignetting model="pa" focal="70" aperture="25" distance="1000" k1="-0.2605" k2="0.0999" k3="-0.0164"/>
-+            <vignetting model="pa" focal="70" aperture="29" distance="10" k1="-0.2623" k2="0.1014" k3="-0.0158"/>
-+            <vignetting model="pa" focal="70" aperture="29" distance="1000" k1="-0.2623" k2="0.1014" k3="-0.0158"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.2642" k2="0.1068" k3="-0.0198"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.2642" k2="0.1068" k3="-0.0198"/>
-+            <vignetting model="pa" focal="81" aperture="4" distance="10" k1="-0.7181" k2="0.1841" k3="-0.0260"/>
-+            <vignetting model="pa" focal="81" aperture="4" distance="1000" k1="-0.7181" k2="0.1841" k3="-0.0260"/>
-+            <vignetting model="pa" focal="81" aperture="4.5" distance="10" k1="-0.5571" k2="-0.0624" k3="0.0885"/>
-+            <vignetting model="pa" focal="81" aperture="4.5" distance="1000" k1="-0.5571" k2="-0.0624" k3="0.0885"/>
-+            <vignetting model="pa" focal="81" aperture="5" distance="10" k1="-0.3266" k2="-0.3706" k3="0.2221"/>
-+            <vignetting model="pa" focal="81" aperture="5" distance="1000" k1="-0.3266" k2="-0.3706" k3="0.2221"/>
-+            <vignetting model="pa" focal="81" aperture="5.6" distance="10" k1="-0.1705" k2="-0.2611" k3="0.0768"/>
-+            <vignetting model="pa" focal="81" aperture="5.6" distance="1000" k1="-0.1705" k2="-0.2611" k3="0.0768"/>
-+            <vignetting model="pa" focal="81" aperture="6.3" distance="10" k1="-0.2277" k2="-0.0019" k3="-0.0549"/>
-+            <vignetting model="pa" focal="81" aperture="6.3" distance="1000" k1="-0.2277" k2="-0.0019" k3="-0.0549"/>
-+            <vignetting model="pa" focal="81" aperture="7.1" distance="10" k1="-0.2449" k2="0.0577" k3="-0.0494"/>
-+            <vignetting model="pa" focal="81" aperture="7.1" distance="1000" k1="-0.2449" k2="0.0577" k3="-0.0494"/>
-+            <vignetting model="pa" focal="81" aperture="8" distance="10" k1="-0.2278" k2="-0.0233" k3="0.0475"/>
-+            <vignetting model="pa" focal="81" aperture="8" distance="1000" k1="-0.2278" k2="-0.0233" k3="0.0475"/>
-+            <vignetting model="pa" focal="81" aperture="9" distance="10" k1="-0.2187" k2="-0.0464" k3="0.0650"/>
-+            <vignetting model="pa" focal="81" aperture="9" distance="1000" k1="-0.2187" k2="-0.0464" k3="0.0650"/>
-+            <vignetting model="pa" focal="81" aperture="32" distance="10" k1="-0.2622" k2="0.0178" k3="0.0418"/>
-+            <vignetting model="pa" focal="81" aperture="32" distance="1000" k1="-0.2622" k2="0.0178" k3="0.0418"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.7772" k2="0.3343" k3="-0.0928"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.7772" k2="0.3343" k3="-0.0928"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="10" k1="-0.5079" k2="-0.1323" k3="0.1448"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-0.5079" k2="-0.1323" k3="0.1448"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.3019" k2="-0.3678" k3="0.2369"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.3019" k2="-0.3678" k3="0.2369"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1570" k2="-0.3499" k3="0.1804"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1570" k2="-0.3499" k3="0.1804"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.2086" k2="-0.0713" k3="0.0011"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.2086" k2="-0.0713" k3="0.0011"/>
-+            <vignetting model="pa" focal="100" aperture="7.1" distance="10" k1="-0.2738" k2="0.1490" k3="-0.1211"/>
-+            <vignetting model="pa" focal="100" aperture="7.1" distance="1000" k1="-0.2738" k2="0.1490" k3="-0.1211"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.2773" k2="0.1191" k3="-0.0476"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.2773" k2="0.1191" k3="-0.0476"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="10" k1="-0.2603" k2="0.0484" k3="0.0186"/>
-+            <vignetting model="pa" focal="100" aperture="9" distance="1000" k1="-0.2603" k2="0.0484" k3="0.0186"/>
-+            <vignetting model="pa" focal="100" aperture="10" distance="10" k1="-0.2589" k2="0.0480" k3="0.0178"/>
-+            <vignetting model="pa" focal="100" aperture="10" distance="1000" k1="-0.2589" k2="0.0480" k3="0.0178"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.2634" k2="0.0560" k3="0.0130"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.2634" k2="0.0560" k3="0.0130"/>
-+            <vignetting model="pa" focal="100" aperture="13" distance="10" k1="-0.2708" k2="0.0691" k3="0.0080"/>
-+            <vignetting model="pa" focal="100" aperture="13" distance="1000" k1="-0.2708" k2="0.0691" k3="0.0080"/>
-+            <vignetting model="pa" focal="100" aperture="14" distance="10" k1="-0.2662" k2="0.0600" k3="0.0133"/>
-+            <vignetting model="pa" focal="100" aperture="14" distance="1000" k1="-0.2662" k2="0.0600" k3="0.0133"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="10" k1="-0.2717" k2="0.0697" k3="0.0093"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="1000" k1="-0.2717" k2="0.0697" k3="0.0093"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="10" k1="-0.2842" k2="0.0850" k3="0.0072"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.2842" k2="0.0850" k3="0.0072"/>
-+            <vignetting model="pa" focal="112" aperture="4.5" distance="10" k1="-0.7241" k2="0.1831" k3="0.0097"/>
-+            <vignetting model="pa" focal="112" aperture="4.5" distance="1000" k1="-0.7241" k2="0.1831" k3="0.0097"/>
-+            <vignetting model="pa" focal="112" aperture="5" distance="10" k1="-0.3295" k2="-0.3920" k3="0.2739"/>
-+            <vignetting model="pa" focal="112" aperture="5" distance="1000" k1="-0.3295" k2="-0.3920" k3="0.2739"/>
-+            <vignetting model="pa" focal="112" aperture="5.6" distance="10" k1="-0.1422" k2="-0.5599" k3="0.3353"/>
-+            <vignetting model="pa" focal="112" aperture="5.6" distance="1000" k1="-0.1422" k2="-0.5599" k3="0.3353"/>
-+            <vignetting model="pa" focal="112" aperture="6.3" distance="10" k1="-0.1636" k2="-0.2394" k3="0.0895"/>
-+            <vignetting model="pa" focal="112" aperture="6.3" distance="1000" k1="-0.1636" k2="-0.2394" k3="0.0895"/>
-+            <vignetting model="pa" focal="112" aperture="7.1" distance="10" k1="-0.2174" k2="-0.0168" k3="-0.0540"/>
-+            <vignetting model="pa" focal="112" aperture="7.1" distance="1000" k1="-0.2174" k2="-0.0168" k3="-0.0540"/>
-+            <vignetting model="pa" focal="112" aperture="8" distance="10" k1="-0.2710" k2="0.1458" k3="-0.1106"/>
-+            <vignetting model="pa" focal="112" aperture="8" distance="1000" k1="-0.2710" k2="0.1458" k3="-0.1106"/>
-+            <vignetting model="pa" focal="112" aperture="9" distance="10" k1="-0.2562" k2="0.0632" k3="-0.0098"/>
-+            <vignetting model="pa" focal="112" aperture="9" distance="1000" k1="-0.2562" k2="0.0632" k3="-0.0098"/>
-+            <vignetting model="pa" focal="112" aperture="10" distance="10" k1="-0.2388" k2="0.0133" k3="0.0313"/>
-+            <vignetting model="pa" focal="112" aperture="10" distance="1000" k1="-0.2388" k2="0.0133" k3="0.0313"/>
-+            <vignetting model="pa" focal="112" aperture="11" distance="10" k1="-0.2363" k2="0.0114" k3="0.0316"/>
-+            <vignetting model="pa" focal="112" aperture="11" distance="1000" k1="-0.2363" k2="0.0114" k3="0.0316"/>
-+            <vignetting model="pa" focal="112" aperture="13" distance="10" k1="-0.2509" k2="0.0490" k3="0.0078"/>
-+            <vignetting model="pa" focal="112" aperture="13" distance="1000" k1="-0.2509" k2="0.0490" k3="0.0078"/>
-+            <vignetting model="pa" focal="112" aperture="14" distance="10" k1="-0.2469" k2="0.0413" k3="0.0117"/>
-+            <vignetting model="pa" focal="112" aperture="14" distance="1000" k1="-0.2469" k2="0.0413" k3="0.0117"/>
-+            <vignetting model="pa" focal="112" aperture="16" distance="10" k1="-0.2560" k2="0.0667" k3="-0.0064"/>
-+            <vignetting model="pa" focal="112" aperture="16" distance="1000" k1="-0.2560" k2="0.0667" k3="-0.0064"/>
-+            <vignetting model="pa" focal="116" aperture="32" distance="10" k1="-0.2828" k2="0.1220" k3="-0.0369"/>
-+            <vignetting model="pa" focal="116" aperture="32" distance="1000" k1="-0.2828" k2="0.1220" k3="-0.0369"/>
-+            <vignetting model="pa" focal="124" aperture="36" distance="10" k1="-0.2832" k2="0.1093" k3="-0.0103"/>
-+            <vignetting model="pa" focal="124" aperture="36" distance="1000" k1="-0.2832" k2="0.1093" k3="-0.0103"/>
-+            <vignetting model="pa" focal="128" aperture="11" distance="10" k1="-0.2704" k2="0.0919" k3="-0.0034"/>
-+            <vignetting model="pa" focal="128" aperture="11" distance="1000" k1="-0.2704" k2="0.0919" k3="-0.0034"/>
-+            <vignetting model="pa" focal="128" aperture="13" distance="10" k1="-0.2697" k2="0.0893" k3="-0.0024"/>
-+            <vignetting model="pa" focal="128" aperture="13" distance="1000" k1="-0.2697" k2="0.0893" k3="-0.0024"/>
-+            <vignetting model="pa" focal="128" aperture="14" distance="10" k1="-0.2725" k2="0.0930" k3="-0.0033"/>
-+            <vignetting model="pa" focal="128" aperture="14" distance="1000" k1="-0.2725" k2="0.0930" k3="-0.0033"/>
-+            <vignetting model="pa" focal="128" aperture="16" distance="10" k1="-0.2772" k2="0.1000" k3="-0.0051"/>
-+            <vignetting model="pa" focal="128" aperture="16" distance="1000" k1="-0.2772" k2="0.1000" k3="-0.0051"/>
-+            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.6297" k2="0.0283" k3="0.0736"/>
-+            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.6297" k2="0.0283" k3="0.0736"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="10" k1="-0.3968" k2="-0.3249" k3="0.2356"/>
-+            <vignetting model="pa" focal="135" aperture="5" distance="1000" k1="-0.3968" k2="-0.3249" k3="0.2356"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1476" k2="-0.5395" k3="0.3019"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1476" k2="-0.5395" k3="0.3019"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="10" k1="-0.1245" k2="-0.3862" k3="0.1831"/>
-+            <vignetting model="pa" focal="135" aperture="6.3" distance="1000" k1="-0.1245" k2="-0.3862" k3="0.1831"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1870" k2="-0.0997" k3="-0.0126"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1870" k2="-0.0997" k3="-0.0126"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.2824" k2="0.2183" k3="-0.1902"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2824" k2="0.2183" k3="-0.1902"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.2917" k2="0.2002" k3="-0.1155"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.2917" k2="0.2002" k3="-0.1155"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="10" k1="-0.2729" k2="0.1228" k3="-0.0398"/>
-+            <vignetting model="pa" focal="135" aperture="10" distance="1000" k1="-0.2729" k2="0.1228" k3="-0.0398"/>
-+            <vignetting model="pa" focal="160" aperture="5" distance="10" k1="-0.4051" k2="-0.5051" k3="0.3449"/>
-+            <vignetting model="pa" focal="160" aperture="5" distance="1000" k1="-0.4051" k2="-0.5051" k3="0.3449"/>
-+            <vignetting model="pa" focal="160" aperture="5.6" distance="10" k1="-0.1236" k2="-0.7039" k3="0.3494"/>
-+            <vignetting model="pa" focal="160" aperture="5.6" distance="1000" k1="-0.1236" k2="-0.7039" k3="0.3494"/>
-+            <vignetting model="pa" focal="160" aperture="6.3" distance="10" k1="-0.1427" k2="-0.2875" k3="0.0572"/>
-+            <vignetting model="pa" focal="160" aperture="6.3" distance="1000" k1="-0.1427" k2="-0.2875" k3="0.0572"/>
-+            <vignetting model="pa" focal="160" aperture="7.1" distance="10" k1="-0.1884" k2="-0.1005" k3="-0.0394"/>
-+            <vignetting model="pa" focal="160" aperture="7.1" distance="1000" k1="-0.1884" k2="-0.1005" k3="-0.0394"/>
-+            <vignetting model="pa" focal="160" aperture="8" distance="10" k1="-0.2482" k2="0.0997" k3="-0.1242"/>
-+            <vignetting model="pa" focal="160" aperture="8" distance="1000" k1="-0.2482" k2="0.0997" k3="-0.1242"/>
-+            <vignetting model="pa" focal="160" aperture="40" distance="10" k1="-0.3269" k2="0.1865" k3="-0.0496"/>
-+            <vignetting model="pa" focal="160" aperture="40" distance="1000" k1="-0.3269" k2="0.1865" k3="-0.0496"/>
-+            <vignetting model="pa" focal="182" aperture="40" distance="10" k1="-0.2988" k2="0.1522" k3="-0.0489"/>
-+            <vignetting model="pa" focal="182" aperture="40" distance="1000" k1="-0.2988" k2="0.1522" k3="-0.0489"/>
-+            <vignetting model="pa" focal="188" aperture="11" distance="10" k1="-0.2707" k2="0.0944" k3="-0.0149"/>
-+            <vignetting model="pa" focal="188" aperture="11" distance="1000" k1="-0.2707" k2="0.0944" k3="-0.0149"/>
-+            <vignetting model="pa" focal="188" aperture="13" distance="10" k1="-0.2706" k2="0.0943" k3="-0.0144"/>
-+            <vignetting model="pa" focal="188" aperture="13" distance="1000" k1="-0.2706" k2="0.0943" k3="-0.0144"/>
-+            <vignetting model="pa" focal="188" aperture="14" distance="10" k1="-0.2741" k2="0.0962" k3="-0.0131"/>
-+            <vignetting model="pa" focal="188" aperture="14" distance="1000" k1="-0.2741" k2="0.0962" k3="-0.0131"/>
-+            <vignetting model="pa" focal="188" aperture="16" distance="10" k1="-0.2779" k2="0.1055" k3="-0.0190"/>
-+            <vignetting model="pa" focal="188" aperture="16" distance="1000" k1="-0.2779" k2="0.1055" k3="-0.0190"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.2152" k2="-1.0645" k3="0.6930"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.2152" k2="-1.0645" k3="0.6930"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.0010" k2="-1.1114" k3="0.5906"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0010" k2="-1.1114" k3="0.5906"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0949" k2="-0.4460" k3="0.0946"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0949" k2="-0.4460" k3="0.0946"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="-0.2151" k2="0.0283" k3="-0.1992"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.2151" k2="0.0283" k3="-0.1992"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.3066" k2="0.3116" k3="-0.3056"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.3066" k2="0.3116" k3="-0.3056"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.3050" k2="0.2448" k3="-0.1675"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.3050" k2="0.2448" k3="-0.1675"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.2842" k2="0.1507" k3="-0.0701"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.2842" k2="0.1507" k3="-0.0701"/>
-+            <vignetting model="pa" focal="236" aperture="5.6" distance="10" k1="-0.2732" k2="-0.9665" k3="0.6682"/>
-+            <vignetting model="pa" focal="236" aperture="5.6" distance="1000" k1="-0.2732" k2="-0.9665" k3="0.6682"/>
-+            <vignetting model="pa" focal="236" aperture="6.3" distance="10" k1="0.0011" k2="-1.0140" k3="0.5286"/>
-+            <vignetting model="pa" focal="236" aperture="6.3" distance="1000" k1="0.0011" k2="-1.0140" k3="0.5286"/>
-+            <vignetting model="pa" focal="236" aperture="7.1" distance="10" k1="-0.0716" k2="-0.4892" k3="0.1356"/>
-+            <vignetting model="pa" focal="236" aperture="7.1" distance="1000" k1="-0.0716" k2="-0.4892" k3="0.1356"/>
-+            <vignetting model="pa" focal="236" aperture="8" distance="10" k1="-0.2674" k2="0.2467" k3="-0.2992"/>
-+            <vignetting model="pa" focal="236" aperture="8" distance="1000" k1="-0.2674" k2="0.2467" k3="-0.2992"/>
-+            <vignetting model="pa" focal="236" aperture="9" distance="10" k1="-0.2898" k2="0.2505" k3="-0.1963"/>
-+            <vignetting model="pa" focal="236" aperture="9" distance="1000" k1="-0.2898" k2="0.2505" k3="-0.1963"/>
-+            <vignetting model="pa" focal="236" aperture="45" distance="10" k1="-0.3839" k2="0.3245" k3="-0.1407"/>
-+            <vignetting model="pa" focal="236" aperture="45" distance="1000" k1="-0.3839" k2="0.3245" k3="-0.1407"/>
-+            <vignetting model="pa" focal="260" aperture="5.6" distance="10" k1="-0.4252" k2="-0.5946" k3="0.4567"/>
-+            <vignetting model="pa" focal="260" aperture="5.6" distance="1000" k1="-0.4252" k2="-0.5946" k3="0.4567"/>
-+            <vignetting model="pa" focal="277" aperture="32" distance="10" k1="-0.2833" k2="0.1303" k3="-0.0356"/>
-+            <vignetting model="pa" focal="277" aperture="32" distance="1000" k1="-0.2833" k2="0.1303" k3="-0.0356"/>
-+            <vignetting model="pa" focal="277" aperture="45" distance="10" k1="-0.2894" k2="0.1608" k3="-0.0603"/>
-+            <vignetting model="pa" focal="277" aperture="45" distance="1000" k1="-0.2894" k2="0.1608" k3="-0.0603"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.5710" k2="-0.1995" k3="0.2138"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.5710" k2="-0.1995" k3="0.2138"/>
-+            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-0.2521" k2="-0.5731" k3="0.3459"/>
-+            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-0.2521" k2="-0.5731" k3="0.3459"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.1493" k2="-0.4790" k3="0.2215"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.1493" k2="-0.4790" k3="0.2215"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.1910" k2="-0.1128" k3="-0.0227"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.1910" k2="-0.1128" k3="-0.0227"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.2654" k2="0.1590" k3="-0.1405"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.2654" k2="0.1590" k3="-0.1405"/>
-+            <vignetting model="pa" focal="300" aperture="10" distance="10" k1="-0.2769" k2="0.1569" k3="-0.0843"/>
-+            <vignetting model="pa" focal="300" aperture="10" distance="1000" k1="-0.2769" k2="0.1569" k3="-0.0843"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.2535" k2="0.0619" k3="0.0069"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.2535" k2="0.0619" k3="0.0069"/>
-+            <vignetting model="pa" focal="300" aperture="13" distance="10" k1="-0.2594" k2="0.0764" k3="-0.0028"/>
-+            <vignetting model="pa" focal="300" aperture="13" distance="1000" k1="-0.2594" k2="0.0764" k3="-0.0028"/>
-+            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.2561" k2="0.0674" k3="0.0026"/>
-+            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.2561" k2="0.0674" k3="0.0026"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="10" k1="-0.2665" k2="0.0907" k3="-0.0122"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.2665" k2="0.0907" k3="-0.0122"/>
-+            <vignetting model="pa" focal="300" aperture="18" distance="10" k1="-0.2694" k2="0.1055" k3="-0.0233"/>
-+            <vignetting model="pa" focal="300" aperture="18" distance="1000" k1="-0.2694" k2="0.1055" k3="-0.0233"/>
-+            <vignetting model="pa" focal="300" aperture="20" distance="10" k1="-0.2689" k2="0.1025" k3="-0.0202"/>
-+            <vignetting model="pa" focal="300" aperture="20" distance="1000" k1="-0.2689" k2="0.1025" k3="-0.0202"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="10" k1="-0.2751" k2="0.1188" k3="-0.0303"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.2751" k2="0.1188" k3="-0.0303"/>
-+            <vignetting model="pa" focal="300" aperture="25" distance="10" k1="-0.2762" k2="0.1196" k3="-0.0299"/>
-+            <vignetting model="pa" focal="300" aperture="25" distance="1000" k1="-0.2762" k2="0.1196" k3="-0.0299"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="10" k1="-0.2750" k2="0.1153" k3="-0.0263"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="1000" k1="-0.2750" k2="0.1153" k3="-0.0263"/>
-+            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.2832" k2="0.1403" k3="-0.0443"/>
-+            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.2832" k2="0.1403" k3="-0.0443"/>
-+            <vignetting model="pa" focal="300" aperture="45" distance="10" k1="-0.3393" k2="0.2337" k3="-0.0925"/>
-+            <vignetting model="pa" focal="300" aperture="45" distance="1000" k1="-0.3393" k2="0.2337" k3="-0.0925"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 90-300mm f/4.5-5.6</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="90" a="-0.006" b="0.022" c="-0.02"/>
-+            <distortion model="ptlens" focal="100" a="0.003" b="-0.012" c="0.024"/>
-+            <distortion model="ptlens" focal="115" a="-0.001" b="0.016" c="-0.022"/>
-+            <distortion model="ptlens" focal="135" a="0.005" b="-0.008" c="0.014"/>
-+            <distortion model="ptlens" focal="160" a="0.011" b="-0.029" c="0.045"/>
-+            <distortion model="ptlens" focal="200" a="-0.014" b="0.064" c="-0.069"/>
-+            <distortion model="ptlens" focal="245" a="0.005" b="-0.005" c="0.017"/>
-+            <distortion model="ptlens" focal="300" a="0.001" b="0.018" c="-0.017"/>
-+            <tca model="poly3" focal="90" br="0.0001124" vr="0.9999506" bb="-0.0001772" vb="1.0001915"/>
-+            <tca model="poly3" focal="100" br="0.0000892" vr="0.9999439" bb="-0.0002141" vb="1.0002109"/>
-+            <tca model="poly3" focal="115" br="0.0000318" vr="0.9999684" bb="-0.0001839" vb="1.0000694"/>
-+            <tca model="poly3" focal="135" br="0.0000023" vr="0.9999446" bb="-0.0000763" vb="0.9998603"/>
-+            <tca model="poly3" focal="160" br="-0.0000001" vr="0.9999788" bb="-0.0000913" vb="0.9997460"/>
-+            <tca model="poly3" focal="200" br="0.0000823" vr="0.9998566" bb="-0.0003916" vb="0.9997365"/>
-+            <tca model="poly3" focal="245" br="0.0000451" vr="0.9998133" bb="-0.0004300" vb="0.9998388"/>
-+            <tca model="poly3" focal="300" br="0.0002260" vr="0.9993977" bb="0.0002063" vb="0.9996073"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 18-200mm f/3.5-5.6 IS</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 60D -->
-+            <distortion model="ptlens" focal="18" a="0.02543" b="-0.07968" c="0.03623"/>
-+            <distortion model="ptlens" focal="20" a="0.02822" b="-0.08034" c="0.04569"/>
-+            <distortion model="ptlens" focal="24" a="0.02071" b="-0.04598" c="0.02693"/>
-+            <distortion model="ptlens" focal="35" a="0.0117" b="-0.0177" c="0.01611"/>
-+            <distortion model="ptlens" focal="50" a="0.01104" b="-0.02248" c="0.03263"/>
-+            <distortion model="ptlens" focal="90" a="0" b="0.0085" c="0"/>
-+            <distortion model="ptlens" focal="130" a="0" b="0.00797" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.0066" c="0"/>
-+            <tca model="poly3" focal="20" br="-0.0000932" vr="1.0005833" bb="0.0000706" vb="0.9999406"/>
-+            <tca model="poly3" focal="24" br="-0.0000538" vr="1.0004676" bb="0.0000771" vb="0.9999306"/>
-+            <tca model="poly3" focal="40" br="-0.0000043" vr="1.0000674" bb="-0.0000084" vb="1.0001658"/>
-+            <tca model="poly3" focal="50" br="0.0000082" vr="0.9999548" bb="0.0000014" vb="1.0001986"/>
-+            <tca model="poly3" focal="90" br="0.0000416" vr="0.9996703" bb="-0.0000830" vb="1.0003595"/>
-+            <tca model="poly3" focal="135" br="0.0001072" vr="0.9993999" bb="-0.0001156" vb="1.0002326"/>
-+            <tca model="poly3" focal="200" br="0.0000742" vr="0.9993410" bb="-0.0000765" vb="1.0000445"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 28-80mm f/3.5-5.6 USM IV</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 100D -->
-+            <distortion model="ptlens" focal="28" a="0" b="-0.00843" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0.01228" b="-0.05159" c="0.05533"/>
-+            <distortion model="ptlens" focal="37" a="0" b="-0.00316" c="0"/>
-+            <distortion model="ptlens" focal="63" a="0" b="0.0017" c="0"/>
-+            <distortion model="ptlens" focal="80" a="0" b="0.00491" c="0"/>
-+            <tca model="poly3" focal="28" br="-0.0000057" vr="1.0007308" bb="0.0000485" vb="0.9995727"/>
-+            <tca model="poly3" focal="38" br="-0.0000215" vr="1.0005363" bb="0.0000312" vb="0.9997387"/>
-+            <tca model="poly3" focal="57" br="0.0000001" vr="1.0001671" bb="0.0000161" vb="0.9999092"/>
-+            <tca model="poly3" focal="63" br="-0.0000167" vr="1.0001572" bb="0.0000247" vb="0.9999346"/>
-+            <tca model="poly3" focal="73" br="-0.0000142" vr="1.0000838" bb="0.0000065" vb="0.9999950"/>
-+            <tca model="poly3" focal="80" br="-0.0000093" vr="1.0000635" bb="0.0000036" vb="1.0000023"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.1950" k2="-0.0487" k3="0.0411"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.1950" k2="-0.0487" k3="0.0411"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.1868" k2="-0.0845" k3="0.0982"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.1868" k2="-0.0845" k3="0.0982"/>
-+            <vignetting model="pa" focal="28" aperture="10" distance="10" k1="-0.1846" k2="-0.0871" k3="0.0991"/>
-+            <vignetting model="pa" focal="28" aperture="10" distance="1000" k1="-0.1846" k2="-0.0871" k3="0.0991"/>
-+            <vignetting model="pa" focal="28" aperture="14" distance="10" k1="-0.1875" k2="-0.0771" k3="0.0913"/>
-+            <vignetting model="pa" focal="28" aperture="14" distance="1000" k1="-0.1875" k2="-0.0771" k3="0.0913"/>
-+            <vignetting model="pa" focal="28" aperture="20" distance="10" k1="-0.1922" k2="-0.0613" k3="0.0782"/>
-+            <vignetting model="pa" focal="28" aperture="20" distance="1000" k1="-0.1922" k2="-0.0613" k3="0.0782"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.1925" k2="-0.0597" k3="0.0766"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.1925" k2="-0.0597" k3="0.0766"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5247" k2="0.0582" k3="0.0944"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5247" k2="0.0582" k3="0.0944"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.1475" k2="-0.0933" k3="0.0207"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.1475" k2="-0.0933" k3="0.0207"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1656" k2="-0.0648" k3="0.0799"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1656" k2="-0.0648" k3="0.0799"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.1665" k2="-0.0630" k3="0.0790"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.1665" k2="-0.0630" k3="0.0790"/>
-+            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.1690" k2="-0.0585" k3="0.0762"/>
-+            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.1690" k2="-0.0585" k3="0.0762"/>
-+            <vignetting model="pa" focal="35" aperture="20" distance="10" k1="-0.1724" k2="-0.0521" k3="0.0723"/>
-+            <vignetting model="pa" focal="35" aperture="20" distance="1000" k1="-0.1724" k2="-0.0521" k3="0.0723"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1728" k2="-0.0519" k3="0.0723"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1728" k2="-0.0519" k3="0.0723"/>
-+            <vignetting model="pa" focal="45" aperture="4.5" distance="10" k1="-0.4821" k2="0.0257" k3="0.1071"/>
-+            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.4821" k2="0.0257" k3="0.1071"/>
-+            <vignetting model="pa" focal="45" aperture="6.3" distance="10" k1="-0.1353" k2="-0.0430" k3="-0.0101"/>
-+            <vignetting model="pa" focal="45" aperture="6.3" distance="1000" k1="-0.1353" k2="-0.0430" k3="-0.0101"/>
-+            <vignetting model="pa" focal="45" aperture="9" distance="10" k1="-0.1429" k2="-0.0554" k3="0.0701"/>
-+            <vignetting model="pa" focal="45" aperture="9" distance="1000" k1="-0.1429" k2="-0.0554" k3="0.0701"/>
-+            <vignetting model="pa" focal="45" aperture="13" distance="10" k1="-0.1432" k2="-0.0555" k3="0.0708"/>
-+            <vignetting model="pa" focal="45" aperture="13" distance="1000" k1="-0.1432" k2="-0.0555" k3="0.0708"/>
-+            <vignetting model="pa" focal="45" aperture="18" distance="10" k1="-0.1447" k2="-0.0559" k3="0.0734"/>
-+            <vignetting model="pa" focal="45" aperture="18" distance="1000" k1="-0.1447" k2="-0.0559" k3="0.0734"/>
-+            <vignetting model="pa" focal="45" aperture="25" distance="10" k1="-0.1464" k2="-0.0551" k3="0.0744"/>
-+            <vignetting model="pa" focal="45" aperture="25" distance="1000" k1="-0.1464" k2="-0.0551" k3="0.0744"/>
-+            <vignetting model="pa" focal="45" aperture="29" distance="10" k1="-0.1474" k2="-0.0527" k3="0.0732"/>
-+            <vignetting model="pa" focal="45" aperture="29" distance="1000" k1="-0.1474" k2="-0.0527" k3="0.0732"/>
-+            <vignetting model="pa" focal="57" aperture="5" distance="10" k1="-0.5363" k2="0.2774" k3="-0.0520"/>
-+            <vignetting model="pa" focal="57" aperture="5" distance="1000" k1="-0.5363" k2="0.2774" k3="-0.0520"/>
-+            <vignetting model="pa" focal="57" aperture="6.3" distance="10" k1="-0.0725" k2="-0.2029" k3="0.0976"/>
-+            <vignetting model="pa" focal="57" aperture="6.3" distance="1000" k1="-0.0725" k2="-0.2029" k3="0.0976"/>
-+            <vignetting model="pa" focal="57" aperture="9" distance="10" k1="-0.1174" k2="-0.0650" k3="0.0737"/>
-+            <vignetting model="pa" focal="57" aperture="9" distance="1000" k1="-0.1174" k2="-0.0650" k3="0.0737"/>
-+            <vignetting model="pa" focal="57" aperture="13" distance="10" k1="-0.1186" k2="-0.0643" k3="0.0746"/>
-+            <vignetting model="pa" focal="57" aperture="13" distance="1000" k1="-0.1186" k2="-0.0643" k3="0.0746"/>
-+            <vignetting model="pa" focal="57" aperture="18" distance="10" k1="-0.1231" k2="-0.0574" k3="0.0714"/>
-+            <vignetting model="pa" focal="57" aperture="18" distance="1000" k1="-0.1231" k2="-0.0574" k3="0.0714"/>
-+            <vignetting model="pa" focal="57" aperture="25" distance="10" k1="-0.1294" k2="-0.0472" k3="0.0661"/>
-+            <vignetting model="pa" focal="57" aperture="25" distance="1000" k1="-0.1294" k2="-0.0472" k3="0.0661"/>
-+            <vignetting model="pa" focal="57" aperture="32" distance="10" k1="-0.1311" k2="-0.0464" k3="0.0670"/>
-+            <vignetting model="pa" focal="57" aperture="32" distance="1000" k1="-0.1311" k2="-0.0464" k3="0.0670"/>
-+            <vignetting model="pa" focal="67" aperture="5.6" distance="10" k1="-0.5623" k2="0.4129" k3="-0.1412"/>
-+            <vignetting model="pa" focal="67" aperture="5.6" distance="1000" k1="-0.5623" k2="0.4129" k3="-0.1412"/>
-+            <vignetting model="pa" focal="67" aperture="8" distance="10" k1="-0.1239" k2="-0.0183" k3="0.0070"/>
-+            <vignetting model="pa" focal="67" aperture="8" distance="1000" k1="-0.1239" k2="-0.0183" k3="0.0070"/>
-+            <vignetting model="pa" focal="67" aperture="11" distance="10" k1="-0.1333" k2="-0.0262" k3="0.0531"/>
-+            <vignetting model="pa" focal="67" aperture="11" distance="1000" k1="-0.1333" k2="-0.0262" k3="0.0531"/>
-+            <vignetting model="pa" focal="67" aperture="16" distance="10" k1="-0.1476" k2="-0.0017" k3="0.0407"/>
-+            <vignetting model="pa" focal="67" aperture="16" distance="1000" k1="-0.1476" k2="-0.0017" k3="0.0407"/>
-+            <vignetting model="pa" focal="67" aperture="22" distance="10" k1="-0.1690" k2="0.0392" k3="0.0176"/>
-+            <vignetting model="pa" focal="67" aperture="22" distance="1000" k1="-0.1690" k2="0.0392" k3="0.0176"/>
-+            <vignetting model="pa" focal="67" aperture="32" distance="10" k1="-0.1855" k2="0.0694" k3="0.0012"/>
-+            <vignetting model="pa" focal="67" aperture="32" distance="1000" k1="-0.1855" k2="0.0694" k3="0.0012"/>
-+            <vignetting model="pa" focal="67" aperture="36" distance="10" k1="-0.1878" k2="0.0737" k3="-0.0013"/>
-+            <vignetting model="pa" focal="67" aperture="36" distance="1000" k1="-0.1878" k2="0.0737" k3="-0.0013"/>
-+            <vignetting model="pa" focal="77" aperture="22" distance="10" k1="-0.1893" k2="0.0795" k3="-0.0020"/>
-+            <vignetting model="pa" focal="77" aperture="22" distance="1000" k1="-0.1893" k2="0.0795" k3="-0.0020"/>
-+            <vignetting model="pa" focal="77" aperture="32" distance="10" k1="-0.2055" k2="0.1109" k3="-0.0200"/>
-+            <vignetting model="pa" focal="77" aperture="32" distance="1000" k1="-0.2055" k2="0.1109" k3="-0.0200"/>
-+            <vignetting model="pa" focal="77" aperture="36" distance="10" k1="-0.2106" k2="0.1208" k3="-0.0260"/>
-+            <vignetting model="pa" focal="77" aperture="36" distance="1000" k1="-0.2106" k2="0.1208" k3="-0.0260"/>
-+            <vignetting model="pa" focal="79" aperture="5.6" distance="10" k1="-0.5399" k2="0.4177" k3="-0.1478"/>
-+            <vignetting model="pa" focal="79" aperture="5.6" distance="1000" k1="-0.5399" k2="0.4177" k3="-0.1478"/>
-+            <vignetting model="pa" focal="79" aperture="8" distance="10" k1="-0.1022" k2="-0.0964" k3="0.0526"/>
-+            <vignetting model="pa" focal="79" aperture="8" distance="1000" k1="-0.1022" k2="-0.0964" k3="0.0526"/>
-+            <vignetting model="pa" focal="79" aperture="11" distance="10" k1="-0.1447" k2="-0.0007" k3="0.0413"/>
-+            <vignetting model="pa" focal="79" aperture="11" distance="1000" k1="-0.1447" k2="-0.0007" k3="0.0413"/>
-+            <vignetting model="pa" focal="79" aperture="16" distance="10" k1="-0.1720" k2="0.0511" k3="0.0122"/>
-+            <vignetting model="pa" focal="79" aperture="16" distance="1000" k1="-0.1720" k2="0.0511" k3="0.0122"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 400mm f/5.6L USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="400" a="0.00429" b="-0.00425" c="-0.00493"/>
-+            <tca model="poly3" focal="400" vr="0.9999" vb="0.9998"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="10" k1="-0.6220" k2="0.7685" k3="-0.4254"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-0.6220" k2="0.7685" k3="-0.4254"/>
-+            <vignetting model="pa" focal="400" aperture="6.3" distance="10" k1="-0.0503" k2="-0.1890" k3="0.1157"/>
-+            <vignetting model="pa" focal="400" aperture="6.3" distance="1000" k1="-0.0503" k2="-0.1890" k3="0.1157"/>
-+            <vignetting model="pa" focal="400" aperture="7.1" distance="10" k1="0.0358" k2="-0.0701" k3="0.0046"/>
-+            <vignetting model="pa" focal="400" aperture="7.1" distance="1000" k1="0.0358" k2="-0.0701" k3="0.0046"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="10" k1="-0.0102" k2="0.0908" k3="-0.0503"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="-0.0102" k2="0.0908" k3="-0.0503"/>
-+            <vignetting model="pa" focal="400" aperture="9" distance="10" k1="-0.0118" k2="0.0868" k3="-0.0423"/>
-+            <vignetting model="pa" focal="400" aperture="9" distance="1000" k1="-0.0118" k2="0.0868" k3="-0.0423"/>
-+            <vignetting model="pa" focal="400" aperture="10" distance="10" k1="-0.0206" k2="0.1019" k3="-0.0514"/>
-+            <vignetting model="pa" focal="400" aperture="10" distance="1000" k1="-0.0206" k2="0.1019" k3="-0.0514"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="10" k1="-0.0145" k2="0.0822" k3="-0.0356"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="-0.0145" k2="0.0822" k3="-0.0356"/>
-+            <vignetting model="pa" focal="400" aperture="13" distance="10" k1="-0.0210" k2="0.0876" k3="-0.0350"/>
-+            <vignetting model="pa" focal="400" aperture="13" distance="1000" k1="-0.0210" k2="0.0876" k3="-0.0350"/>
-+            <vignetting model="pa" focal="400" aperture="14" distance="10" k1="-0.0264" k2="0.0959" k3="-0.0357"/>
-+            <vignetting model="pa" focal="400" aperture="14" distance="1000" k1="-0.0264" k2="0.0959" k3="-0.0357"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="10" k1="-0.0256" k2="0.0958" k3="-0.0366"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="1000" k1="-0.0256" k2="0.0958" k3="-0.0366"/>
-+            <vignetting model="pa" focal="400" aperture="18" distance="10" k1="-0.0198" k2="0.0962" k3="-0.0429"/>
-+            <vignetting model="pa" focal="400" aperture="18" distance="1000" k1="-0.0198" k2="0.0962" k3="-0.0429"/>
-+            <vignetting model="pa" focal="400" aperture="20" distance="10" k1="-0.0211" k2="0.0946" k3="-0.0425"/>
-+            <vignetting model="pa" focal="400" aperture="20" distance="1000" k1="-0.0211" k2="0.0946" k3="-0.0425"/>
-+            <vignetting model="pa" focal="400" aperture="22" distance="10" k1="-0.0052" k2="0.0563" k3="-0.0191"/>
-+            <vignetting model="pa" focal="400" aperture="22" distance="1000" k1="-0.0052" k2="0.0563" k3="-0.0191"/>
-+            <vignetting model="pa" focal="400" aperture="25" distance="10" k1="0.0006" k2="0.0340" k3="-0.0032"/>
-+            <vignetting model="pa" focal="400" aperture="25" distance="1000" k1="0.0006" k2="0.0340" k3="-0.0032"/>
-+            <vignetting model="pa" focal="400" aperture="29" distance="10" k1="0.0086" k2="-0.0205" k3="0.0419"/>
-+            <vignetting model="pa" focal="400" aperture="29" distance="1000" k1="0.0086" k2="-0.0205" k3="0.0419"/>
-+            <vignetting model="pa" focal="400" aperture="32" distance="10" k1="0.0402" k2="-0.0754" k3="0.0712"/>
-+            <vignetting model="pa" focal="400" aperture="32" distance="1000" k1="0.0402" k2="-0.0754" k3="0.0712"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 400mm f/5.6L USM + 1.4x extender</model>
-+        <model lang="en">Canon EF 400mm f/5.6L USM + EF 1.4× ext.</model>
-+        <model lang="de">Canon EF 400mm f/5.6L USM + EF 1,4×-Konv.</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="560" a="-0.00472" b="0.01271" c="-0.00812"/>
-+            <tca model="poly3" focal="560" vr="0.9998" vb="0.9996"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/2.8L IS II USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="300" k1="0.00083"/>
-+            <tca model="poly3" focal="300" vr="0.9999243" vb="0.9999730"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/2.8L IS II USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 20D -->
-+            <distortion model="poly3" focal="300" k1="-0.00038"/>
-+            <tca model="poly3" focal="300" vr="0.9999252" vb="0.9999595"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/2.8L IS II USM + EF 1.4x extender III</model>
-+        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 1.4× ext. III</model>
-+        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 1,4×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="420" k1="-0.00479"/>
-+            <tca model="poly3" focal="420" vr="0.9998668" vb="0.9999806"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/2.8L IS II USM + EF 1.4x extender III</model>
-+        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 1.4× ext. III</model>
-+        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 1,4×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 20D -->
-+            <distortion model="poly3" focal="420" k1="-0.00092"/>
-+            <tca model="poly3" focal="420" vr="0.9998605" vb="0.9999578"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/2.8L IS II USM + EF 2.0x extender III</model>
-+        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 2.0× ext. III</model>
-+        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 2,0×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="600" k1="-0.00264"/>
-+            <tca model="poly3" focal="600" vr="0.9998625" vb="0.9999894"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/2.8L IS II USM + EF 2.0x extender III</model>
-+        <model lang="en">Canon EF 300mm f/2.8L IS II USM + EF 2.0× ext. III</model>
-+        <model lang="de">Canon EF 300mm f/2.8L IS II USM + EF 2,0×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 20D -->
-+            <distortion model="poly3" focal="600" k1="-0.00067"/>
-+            <tca model="poly3" focal="600" vr="0.9998626" vb="1.0000065"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/4L IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 7D Mark II -->
-+            <distortion model="ptlens" focal="300" a="-0.00271" b="0.00945" c="-0.00645"/>
-+            <tca model="poly3" focal="300" br="0.0000114" vr="0.9999147" bb="-0.0000121" vb="0.9999900"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 300mm f/4L IS USM + 1.4x extender</model>
-+        <model lang="en">Canon EF 300mm f/4L IS USM + 1.4× ext.</model>
-+        <model lang="de">Canon EF 300mm f/4L IS USM + 1.4×-Konv.</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 7D Mark II -->
-+            <distortion model="poly3" focal="420" k1="-0.00134"/>
-+            <tca model="poly3" focal="420" vr="0.9997680" vb="1.0000126"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 500mm f/4L IS II USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="500" k1="0.00113"/>
-+            <tca model="poly3" focal="500" vr="0.9999381" vb="0.9999962"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 500mm f/4L IS II USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 20D -->
-+            <distortion model="poly3" focal="500" k1="-0.00127"/>
-+            <tca model="poly3" focal="500" vr="0.9999196" vb="1.0000391"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 500mm f/4L IS II USM + EF 1.4x extender III</model>
-+        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 1.4× ext. III</model>
-+        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 1.4×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="700" k1="-0.0045"/>
-+            <tca model="poly3" focal="700" vr="0.9998697" vb="1.0000174"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 500mm f/4L IS II USM + EF 1.4x extender III</model>
-+        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 1.4× ext. III</model>
-+        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 1.4×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 20D -->
-+            <distortion model="poly3" focal="700" k1="-0.00111"/>
-+            <tca model="poly3" focal="700" vr="0.9998967" vb="0.9999863"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 500mm f/4L IS II USM + EF 2.0x extender III</model>
-+        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 2.0× ext. III</model>
-+        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 2.0×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="1000" k1="-0.00287"/>
-+            <tca model="poly3" focal="1000" vr="0.9998205" vb="1.0000916"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 500mm f/4L IS II USM + EF 2.0x extender III</model>
-+        <model lang="en">Canon EF 500mm f/4L IS II USM + EF 2.0× ext. III</model>
-+        <model lang="de">Canon EF 500mm f/4L IS II USM + EF 2.0×-Konv. III</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 20D -->
-+            <distortion model="poly3" focal="1000" k1="-0.00073"/>
-+            <tca model="poly3" focal="1000" vr="0.9999646" vb="0.9999321"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon Lens FL 50mm F1.4</model>
-+        <mount>Canon FL</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <distortion model="poly3" focal="50" k1="-0.00306"/>
-+            <tca model="poly3" focal="50" vr="1.0001860" vb="0.9999560"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.0149" k2="0.9012" k3="-0.3954"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.0149" k2="0.9012" k3="-0.3954"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.1791" k2="0.0693" k3="-0.1195"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1791" k2="0.0693" k3="-0.1195"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.2197" k2="0.1511" k3="-0.0780"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.2197" k2="0.1511" k3="-0.0780"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2323" k2="0.1711" k3="-0.0859"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2323" k2="0.1711" k3="-0.0859"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2517" k2="0.2094" k3="-0.1072"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2517" k2="0.2094" k3="-0.1072"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2785" k2="0.2672" k3="-0.1431"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2785" k2="0.2672" k3="-0.1431"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2975" k2="0.3075" k3="-0.1673"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2975" k2="0.3075" k3="-0.1673"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.3122" k2="0.3372" k3="-0.1853"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3122" k2="0.3372" k3="-0.1853"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon Lens FL 135mm F3.5</model>
-+        <mount>Canon FL</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <vignetting model="pa" focal="135" aperture="3.5" distance="10" k1="-0.3120" k2="0.1519" k3="-0.0955"/>
-+            <vignetting model="pa" focal="135" aperture="3.5" distance="1000" k1="-0.3120" k2="0.1519" k3="-0.0955"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.1630" k2="-0.0838" k3="0.0652"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.1630" k2="-0.0838" k3="0.0652"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.2119" k2="0.1695" k3="-0.0832"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.2119" k2="0.1695" k3="-0.0832"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.2929" k2="0.2867" k3="-0.1380"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2929" k2="0.2867" k3="-0.1380"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.3969" k2="0.4685" k3="-0.2342"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.3969" k2="0.4685" k3="-0.2342"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="10" k1="-0.5191" k2="0.7016" k3="-0.3637"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.5191" k2="0.7016" k3="-0.3637"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.6249" k2="0.9125" k3="-0.4836"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.6249" k2="0.9125" k3="-0.4836"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 16-35mm f/4L IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="16" a="0.00938" b="-0.03862" c="0.01807"/>
-+            <distortion model="ptlens" focal="20" a="0.00676" b="-0.01415" c="-0.01238"/>
-+            <distortion model="ptlens" focal="24" a="0" b="0.00098" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.00444" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 70-210mm f/3.5-4.5 USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D -->
-+            <distortion model="ptlens" focal="70" a="0.002876" b="-0.015288" c="0.013076"/>
-+            <distortion model="ptlens" focal="85" a="0.003736" b="-0.012136" c="0.013108"/>
-+            <distortion model="ptlens" focal="97" a="0.002884" b="-0.005767" c="0.008626"/>
-+            <distortion model="ptlens" focal="135" a="0.000322" b="0.008325" c="-0.005967"/>
-+            <distortion model="ptlens" focal="210" a="-0.006697" b="0.04309" c="-0.047894"/>
-+            <tca model="poly3" focal="70" br="0.0000102" vr="1.0000497" bb="-0.0000245" vb="1.0000352"/>
-+            <tca model="poly3" focal="105" br="-0.0000174" vr="1.0000096" bb="-0.0000183" vb="0.9999608"/>
-+            <tca model="poly3" focal="137" br="0.0000000" vr="0.9999283" bb="-0.0000082" vb="0.9998754"/>
-+            <tca model="poly3" focal="210" br="-0.0000161" vr="0.9997241" bb="-0.0000788" vb="0.9998228"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="1.5" k1="-1.0958" k2="0.7157" k3="-0.2301"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="5" k1="-1.1390" k2="0.7892" k3="-0.2682"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="-1.1538" k2="0.8152" k3="-0.2810"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1.5" k1="-0.8384" k2="0.2147" k3="0.0405"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="5" k1="-0.8865" k2="0.2957" k3="-0.0005"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.8541" k2="0.2096" k3="0.0494"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1.5" k1="-0.2122" k2="0.1127" k3="-0.2035"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.2052" k2="0.0655" k3="-0.1778"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2044" k2="0.0247" k3="-0.1485"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1.5" k1="-0.2297" k2="-0.0043" k3="0.0632"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.2364" k2="0.0361" k3="0.0337"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2313" k2="0.0126" k3="0.0543"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1.5" k1="-0.2409" k2="0.0154" k3="0.0512"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="5" k1="-0.2216" k2="-0.0135" k3="0.0679"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.2387" k2="0.0169" k3="0.0504"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1.5" k1="-0.2426" k2="0.0137" k3="0.0531"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.2481" k2="0.0374" k3="0.0371"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.2451" k2="0.0399" k3="0.0317"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1.5" k1="-0.2497" k2="0.0506" k3="0.0229"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.2252" k2="0.0168" k3="0.0406"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2312" k2="0.0273" k3="0.0390"/>
-+            <vignetting model="pa" focal="95" aperture="16" distance="1.5" k1="-0.2359" k2="0.0789" k3="0.0026"/>
-+            <vignetting model="pa" focal="95" aperture="22" distance="1.5" k1="-0.2277" k2="0.0638" k3="0.0093"/>
-+            <vignetting model="pa" focal="97" aperture="4" distance="1.5" k1="-0.9336" k2="0.5980" k3="-0.1971"/>
-+            <vignetting model="pa" focal="97" aperture="4" distance="1000" k1="-0.9611" k2="0.5808" k3="-0.1738"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="1.5" k1="-0.1701" k2="0.0207" k3="-0.1163"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.1463" k2="-0.0361" k3="-0.0997"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="1.5" k1="-0.1938" k2="0.0177" k3="0.0295"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.2130" k2="0.0354" k3="0.0287"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="1.5" k1="-0.2449" k2="0.0778" k3="0.0163"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.2580" k2="0.0920" k3="0.0085"/>
-+            <vignetting model="pa" focal="97" aperture="16" distance="1000" k1="-0.2211" k2="0.0433" k3="0.0319"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.2422" k2="0.0912" k3="-0.0023"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="5" k1="-0.9151" k2="0.5622" k3="-0.1813"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="5" k1="-0.1644" k2="-0.0108" k3="-0.1030"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="5" k1="-0.2175" k2="0.0602" k3="0.0062"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="5" k1="-0.2287" k2="0.0684" k3="0.0136"/>
-+            <vignetting model="pa" focal="100" aperture="16" distance="5" k1="-0.2326" k2="0.0779" k3="0.0060"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="5" k1="-0.2417" k2="0.0934" k3="-0.0034"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1.5" k1="-0.6891" k2="0.3080" k3="-0.1763"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.4960" k2="-0.2198" k3="0.1216"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1.5" k1="-0.1677" k2="0.0397" k3="-0.2375"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="5" k1="-0.1066" k2="-0.1174" k3="-0.1820"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0897" k2="-0.2019" k3="-0.1351"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1.5" k1="-0.2347" k2="0.1203" k3="-0.0384"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="5" k1="-0.2544" k2="0.1707" k3="-0.0796"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2730" k2="0.2071" k3="-0.1041"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1.5" k1="-0.2654" k2="0.1258" k3="-0.0130"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="5" k1="-0.2682" k2="0.1343" k3="-0.0207"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2463" k2="0.1042" k3="-0.0064"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1.5" k1="-0.3260" k2="0.2395" k3="-0.0770"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="5" k1="-0.3021" k2="0.2058" k3="-0.0634"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.2913" k2="0.1828" k3="-0.0492"/>
-+            <vignetting model="pa" focal="135" aperture="25" distance="1.5" k1="-0.3414" k2="0.2624" k3="-0.0884"/>
-+            <vignetting model="pa" focal="135" aperture="25" distance="5" k1="-0.3524" k2="0.3012" k3="-0.1144"/>
-+            <vignetting model="pa" focal="135" aperture="25" distance="1000" k1="-0.3181" k2="0.2146" k3="-0.0605"/>
-+            <vignetting model="pa" focal="137" aperture="4" distance="5" k1="-0.5470" k2="-0.0934" k3="0.0487"/>
-+            <vignetting model="pa" focal="210" aperture="4.5" distance="1.5" k1="-0.3789" k2="-1.0784" k3="0.7960"/>
-+            <vignetting model="pa" focal="210" aperture="4.5" distance="5" k1="-0.6299" k2="-0.6743" k3="0.6066"/>
-+            <vignetting model="pa" focal="210" aperture="4.5" distance="1000" k1="-0.7529" k2="-0.4432" k3="0.4821"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="1.5" k1="0.0802" k2="-1.3774" k3="0.7501"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="5" k1="-0.0755" k2="-1.2845" k3="0.7669"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="1000" k1="-0.1826" k2="-1.1468" k3="0.7151"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="1.5" k1="-0.2313" k2="0.2456" k3="-0.3060"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="5" k1="-0.1866" k2="0.0449" k3="-0.1992"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="-0.1599" k2="-0.0698" k3="-0.1270"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="1.5" k1="-0.2653" k2="0.2219" k3="-0.1179"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="5" k1="-0.3193" k2="0.3466" k3="-0.2256"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="1000" k1="-0.3098" k2="0.3542" k3="-0.2466"/>
-+            <vignetting model="pa" focal="210" aperture="16" distance="1.5" k1="-0.2802" k2="0.1580" k3="-0.0310"/>
-+            <vignetting model="pa" focal="210" aperture="16" distance="5" k1="-0.2918" k2="0.1659" k3="-0.0315"/>
-+            <vignetting model="pa" focal="210" aperture="16" distance="1000" k1="-0.2769" k2="0.1380" k3="-0.0200"/>
-+            <vignetting model="pa" focal="210" aperture="29" distance="1.5" k1="-0.3180" k2="0.2419" k3="-0.0864"/>
-+            <vignetting model="pa" focal="210" aperture="29" distance="5" k1="-0.3350" k2="0.2654" k3="-0.0970"/>
-+            <vignetting model="pa" focal="210" aperture="29" distance="1000" k1="-0.3346" k2="0.2640" k3="-0.0997"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 24-70mm f/4L IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="24" a="0.01231" b="-0.02141" c="-0.02607"/>
-+            <distortion model="ptlens" focal="33" a="0.00008" b="0.00847" c="-0.02294"/>
-+            <distortion model="ptlens" focal="42" a="0" b="0.00302" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.00807" c="0"/>
-+            <tca model="poly3" focal="24" br="-0.0000967" vr="1.0003311" bb="0.0000579" vb="0.9999625"/>
-+            <tca model="poly3" focal="35" br="-0.0000609" vr="1.0002052" bb="0.0000471" vb="0.9999760"/>
-+            <tca model="poly3" focal="42" br="-0.0000549" vr="1.0000990" bb="0.0000341" vb="0.9999984"/>
-+            <tca model="poly3" focal="50" br="-0.0000538" vr="1.0000124" bb="0.0000396" vb="1.0000021"/>
-+            <tca model="poly3" focal="70" br="-0.0000278" vr="0.9998685" bb="0.0000294" vb="0.9999997"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 24-70mm f/4L IS USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.600</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 70D -->
-+            <distortion model="poly3" focal="24" k1="-0.00617"/>
-+            <distortion model="poly3" focal="35" k1="-0.00017"/>
-+            <distortion model="poly3" focal="70" k1="0.00069"/>
-+            <tca model="poly3" focal="24" vr="1.0002234" vb="1.0000123"/>
-+            <tca model="poly3" focal="35" vr="1.0001076" vb="0.9999995"/>
-+            <tca model="poly3" focal="70" vr="0.9998799" vb="1.0000011"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 10-18mm f/4.5-5.6 IS STM</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 60D -->
-+            <distortion model="ptlens" focal="10" a="0.00949" b="-0.05893" c="0.07285"/>
-+            <distortion model="ptlens" focal="11" a="-0.00564" b="0.00351" c="0.00207"/>
-+            <distortion model="ptlens" focal="12" a="-0.00356" b="-0.00048" c="0.0094"/>
-+            <distortion model="ptlens" focal="15" a="0" b="0.00056" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0" b="0.00148" c="0"/>
-+            <tca model="poly3" focal="10" br="0.0001349" vr="1.0002043" bb="-0.0000252" vb="1.0001449"/>
-+            <tca model="poly3" focal="11" br="0.0001467" vr="1.0000867" bb="-0.0000398" vb="1.0001593"/>
-+            <tca model="poly3" focal="12" br="0.0001790" vr="1.0000317" bb="-0.0000910" vb="1.0002721"/>
-+            <tca model="poly3" focal="15" br="0.0001485" vr="0.9999637" bb="-0.0000704" vb="1.0003160"/>
-+            <tca model="poly3" focal="18" br="0.0000770" vr="0.9999802" bb="-0.0000703" vb="1.0003253"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF-S 24mm f/2.8 STM</model>
-+        <mount>Canon EF-S</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 400D -->
-+            <distortion model="poly3" focal="24" k1="-0.00902"/>
-+            <tca model="poly3" focal="24" vr="1.0001965" vb="1.0000158"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon Lens FDn 24mm 1:2.8</model>
-+        <mount>Canon FD</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-A2 -->
-+            <distortion model="ptlens" focal="24" a="0.00827" b="-0.02833" c="0.01235"/>
-+            <tca model="poly3" focal="24" vr="1.0006247" vb="0.9998035"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon Lens FDn 50mm 1:1.8</model>
-+        <mount>Canon FD</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-A2 -->
-+            <distortion model="poly3" focal="50" k1="-0.00209"/>
-+            <tca model="poly3" focal="50" vr="1.0000463" vb="0.9999598"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 40mm f/2.8 STM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="40" a="0.01087" b="-0.02951" c="0.0162"/>
-+            <tca model="poly3" focal="40" br="-0.0001009" vr="1.0003216" bb="0.0001426" vb="0.9997719"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="0.3" k1="-1.2236" k2="0.9039" k3="-0.3077"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-1.5776" k2="1.3808" k3="-0.5311"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="0.3" k1="-0.3194" k2="-0.1724" k3="0.1008"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.3977" k2="-0.2867" k3="0.1647"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="0.3" k1="-0.3672" k2="-0.0314" k3="0.0908"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.5092" k2="0.0993" k3="0.0131"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="0.3" k1="-0.3743" k2="-0.0158" k3="0.0813"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.4955" k2="0.0370" k3="0.0743"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="0.3" k1="-0.3722" k2="-0.0237" k3="0.0875"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.4923" k2="0.0279" k3="0.0801"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 14mm f/2.8L II USM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="ptlens" focal="14" a="0.00829" b="-0.02079" c="0.00394"/>
-+            <tca model="poly3" focal="14" br="0.0000417" vr="1.0000539" bb="-0.0000840" vb="1.0003493"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="0.2" k1="-1.4013" k2="1.3991" k3="-0.7269"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="0.4" k1="-1.4276" k2="1.3662" k3="-0.6931"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1.2" k1="-1.4382" k2="1.3549" k3="-0.6829"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.4487" k2="1.3824" k3="-0.7077"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.2" k1="-0.5387" k2="0.5173" k3="-0.5389"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.4" k1="-0.4843" k2="0.2804" k3="-0.3967"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1.2" k1="-0.4918" k2="0.2896" k3="-0.4103"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.4716" k2="0.2106" k3="-0.3673"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.2" k1="-0.7426" k2="1.1921" k3="-0.8414"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.7458" k2="1.1906" k3="-0.8730"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.2" k1="-0.7510" k2="1.1970" k3="-0.8878"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.7624" k2="1.2514" k3="-0.9452"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.2" k1="-0.6949" k2="0.9570" k3="-0.5998"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.6851" k2="0.9018" k3="-0.5734"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1.2" k1="-0.6864" k2="0.8886" k3="-0.5663"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.6931" k2="0.9103" k3="-0.5837"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.2" k1="-0.7066" k2="0.9599" k3="-0.5990"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.4" k1="-0.7064" k2="0.9276" k3="-0.5847"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.2" k1="-0.7072" k2="0.9190" k3="-0.5841"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.7084" k2="0.9197" k3="-0.5869"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 8-15mm f/4L Fisheye USM</model>
-+        <model lang="de">Canon EF 8-15mm f/4L Fischauge USM</model>
-+        <mount>Canon EF</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <!-- Measured with three overlapping images -->
-+            <distortion model="ptlens" focal="8" a="0.3872" b="-0.71595" c="0.4026"/>
-+            <distortion model="ptlens" focal="10" a="-0.0544" b="0.1525" c="-0.13653"/>
-+            <distortion model="ptlens" focal="12" a="-0.03221" b="0.11073" c="-0.11648"/>
-+            <distortion model="ptlens" focal="14" a="-0.00184" b="0.02215" c="-0.03559"/>
-+            <distortion model="ptlens" focal="15" a="-0.03003" b="0.11503" c="-0.13108"/>
-+            <tca model="poly3" focal="8" br="-0.0001287" vr="1.0002094" bb="-0.0001928" vb="1.0004344"/>
-+            <tca model="poly3" focal="10" br="-0.0000833" vr="1.0002316" bb="-0.0001865" vb="1.0004452"/>
-+            <tca model="poly3" focal="12" br="-0.0000267" vr="1.0001820" bb="-0.0001625" vb="1.0004520"/>
-+            <tca model="poly3" focal="14" br="-0.0000639" vr="1.0001923" bb="-0.0001071" vb="1.0003814"/>
-+            <tca model="poly3" focal="15" br="-0.0000591" vr="1.0001947" bb="0.0000426" vb="1.0002589"/>
-+            <!--  Measured with 360 deg pano in Hugin  -->
-+            <vignetting model="pa" focal="8.0" aperture="4.0" distance="1000" k1="-0.74201" k2="2.47399" k3="-15.16489"/>
-+            <vignetting model="pa" focal="8.0" aperture="5.7" distance="1000" k1="-0.62824" k2="6.85124" k3="-27.13913"/>
-+            <vignetting model="pa" focal="8.0" aperture="8.0" distance="1000" k1="-0.62509" k2="5.64784" k3="-19.3304"/>
-+            <vignetting model="pa" focal="8.0" aperture="11.3" distance="1000" k1="-0.3516564" k2="2.082995" k3="-9.039026"/>
-+            <vignetting model="pa" focal="8.0" aperture="16.0" distance="1000" k1="-0.5003750" k2="3.737831" k3="-13.520068"/>
-+            <vignetting model="pa" focal="8.0" aperture="22.6" distance="1000" k1="-0.07041" k2="-0.69851" k3="-1.67072"/>
-+            <vignetting model="pa" focal="10.0" aperture="4.0" distance="1000" k1="-0.72746" k2="-0.09942" k3="-0.70689"/>
-+            <vignetting model="pa" focal="10.0" aperture="5.7" distance="1000" k1="-0.1931628" k2="0.7642126" k3="-3.0493423"/>
-+            <vignetting model="pa" focal="10.0" aperture="8.0" distance="1000" k1="-0.2318170" k2="1.0827161" k3="-2.9844546"/>
-+            <vignetting model="pa" focal="10.0" aperture="11.3" distance="1000" k1="-0.317637" k2="1.2442765" k3="-3.1631336"/>
-+            <vignetting model="pa" focal="10.0" aperture="16.0" distance="1000" k1="-0.3118377" k2="1.2093017" k3="-2.761616"/>
-+            <vignetting model="pa" focal="10.0" aperture="22.6" distance="1000" k1="-0.2610027" k2="1.1099748" k3="-3.1144714"/>
-+            <vignetting model="pa" focal="12.0" aperture="4.0" distance="1000" k1="-1.006427" k2="1.186514" k3="-1.2502069"/>
-+            <vignetting model="pa" focal="12.0" aperture="5.7" distance="1000" k1="-0.139657" k2="0.5266220" k3="-1.7394283"/>
-+            <vignetting model="pa" focal="12.0" aperture="8.0" distance="1000" k1="-0.2139948" k2="0.7699972" k3="-1.3814173"/>
-+            <vignetting model="pa" focal="12.0" aperture="11.3" distance="1000" k1="-0.1233946" k2="0.2285142" k3="-0.5966985"/>
-+            <vignetting model="pa" focal="12.0" aperture="16.0" distance="1000" k1="-0.0739687" k2="-0.00158203" k3="-0.434599"/>
-+            <vignetting model="pa" focal="12.0" aperture="22.6" distance="1000" k1="-0.1074894" k2="0.14376293" k3="-0.5684505"/>
-+            <vignetting model="pa" focal="14.0" aperture="4.0" distance="1000" k1="-1.004753" k2="1.0054363" k3="-0.6751333"/>
-+            <vignetting model="pa" focal="14.0" aperture="5.7" distance="1000" k1="0.09228" k2="-0.55818" k3="-0.0582"/>
-+            <vignetting model="pa" focal="14.0" aperture="8.0" distance="1000" k1="-0.1652601" k2="0.4214602" k3="-0.6094013"/>
-+            <vignetting model="pa" focal="14.0" aperture="11.3" distance="1000" k1="-0.0877947" k2="0.07377856" k3="-0.2428055"/>
-+            <vignetting model="pa" focal="14.0" aperture="16.0" distance="1000" k1="-0.0071653" k2="-0.2124960" k3="-0.0181398"/>
-+            <vignetting model="pa" focal="14.0" aperture="22.6" distance="1000" k1="-0.084905" k2="-0.03558803" k3="-0.1355752"/>
-+            <vignetting model="pa" focal="15.0" aperture="4.0" distance="1000" k1="-0.7661651" k2="0.4307923" k3="-0.2024326"/>
-+            <vignetting model="pa" focal="15.0" aperture="5.7" distance="1000" k1="0.100181" k2="-0.7786938" k3="0.33843680"/>
-+            <vignetting model="pa" focal="15.0" aperture="8.0" distance="1000" k1="-0.1866631" k2="0.4198754" k3="-0.4761803"/>
-+            <vignetting model="pa" focal="15.0" aperture="11.3" distance="1000" k1="-0.00110386" k2="-0.250853" k3="0.09027765"/>
-+            <vignetting model="pa" focal="15.0" aperture="16.0" distance="1000" k1="-0.0019172" k2="-0.3189716" k3="0.1790992"/>
-+            <vignetting model="pa" focal="15.0" aperture="22.6" distance="1000" k1="0.00896031" k2="-0.2219167" k3="0.0575111"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Canon</maker>
-+        <model>Canon EF 50mm f/1.8 STM</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="50" a="0.0061844" b="-0.0313122" c="0.0314815"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-contax.xml b/data/db/slr-contax.xml
---- a/data/db/slr-contax.xml	2013-10-11 23:54:00.000000000 +0200
-+++ b/data/db/slr-contax.xml	1970-01-01 01:00:00.000000000 +0100
-@@ -1,37 +0,0 @@
--<lensdatabase>
--
--    <mount>
--        <name>Contax/Yashica</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
--        <compat>Generic</compat>
--    </mount>
--
--    <camera>
--        <maker>Contax</maker>
--        <model>35mm film: full frame</model>
--        <mount>Contax/Yashica</mount>
--        <cropfactor>1.0</cropfactor>
--    </camera>
--
--    <lens>
--        <maker>Contax</maker>
--        <model>Zeiss 21mm f/2.8 Distagon</model>
--        <mount>Contax/Yashica</mount>
--        <cropfactor>1.0</cropfactor>
--        <calibration>
--            <distortion model="ptlens" focal="21" a="0.021925" b="-0.043445" c="0" />
--        </calibration>
--    </lens>
--
--    <lens>
--        <maker>Contax</maker>
--        <model>Zeiss 28mm f/2.8 Distagon</model>
--        <mount>Contax/Yashica</mount>
--        <cropfactor>1.0</cropfactor>
--        <calibration>
--            <distortion model="ptlens" focal="28" a="0.007448" b="-0.019182" c="0" />
--        </calibration>
--    </lens>
--
--</lensdatabase>
-diff -Nurpd a/data/db/slr-hasselblad.xml b/data/db/slr-hasselblad.xml
---- a/data/db/slr-hasselblad.xml	2010-02-18 20:34:13.000000000 +0100
-+++ b/data/db/slr-hasselblad.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,31 +1,22 @@
- <lensdatabase>
--
-     <mount>
-         <name>Hasselblad 500</name>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
--        <name>HasselbladH3D</name>
--        <compat>HasselbladHSystem</compat>
-+        <name>Hasselblad H</name>
-+        <compat>Generic</compat>
-     </mount>
--
-     <camera>
-         <maker>Hasselblad</maker>
--        <maker lang="en">Hasselblad</maker>
-         <model>Hasselblad 500 mech.</model>
--        <model lang="en">Hasselblad 500 mech.</model>
-         <mount>Hasselblad 500</mount>
-         <cropfactor>0.66</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Hasselblad</maker>
--        <maker lang="en">Hasselblad</maker>
-         <model>Hasselblad H3D</model>
--        <model lang="en">Hasselblad H3D</model>
--        <mount>HasselbladHSystem</mount>
-+        <mount>Hasselblad H</mount>
-         <cropfactor>0.72</cropfactor>
-     </camera>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-konica-minolta.xml b/data/db/slr-konica-minolta.xml
---- a/data/db/slr-konica-minolta.xml	2013-10-11 23:54:01.000000000 +0200
-+++ b/data/db/slr-konica-minolta.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,147 +1,247 @@
- <lensdatabase>
--
-     <mount>
-         <name>Minolta AF</name>
-+        <compat>Sony Alpha</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
--        <compat>Sony Alpha</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Minolta MC</name>
-+        <compat>Minolta MD</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
--	<compat>Generic</compat>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>Minolta MD</name>
-+        <compat>Minolta MC</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-+        <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
--        <model>MAXXUM 5D</model>
--        <model lang="en">Maxxum 5D</model>
-+        <maker>Konica Minolta</maker>
-+        <model>Maxxum 5D</model>
-         <mount>Minolta AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
--        <model>DYNAX 5D</model>
--        <model lang="en">Dynax 5D</model>
-+        <maker>Konica Minolta</maker>
-+        <model>Dynax 5D</model>
-         <mount>Minolta AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
--        <model>MAXXUM 7D</model>
--        <model lang="en">Maxxum 7D</model>
-+        <maker>Konica Minolta</maker>
-+        <model>Maxxum 7D</model>
-         <mount>Minolta AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>KONICA MINOLTA</maker>
--        <maker lang="en">Konica Minolta</maker>
--        <model>DYNAX 7D</model>
--        <model lang="en">Dynax 7D</model>
-+        <maker>Konica Minolta</maker>
-+        <model>Dynax 7D</model>
-         <mount>Minolta AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>KM 24-105mm 3.5-4.5 AF D</model>
-+        <model>KM 24-105mm f/3.5-4.5 AF D</model>
-         <mount>Minolta AF</mount>
-+        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.004504" b="-0.01756" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="-0.001188" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="0.001378" c="0" />
--            <distortion model="ptlens" focal="40" a="0" b="0.003241" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.003895" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.005226" c="0" />
--            <distortion model="ptlens" focal="80" a="0" b="0.005343" c="0" />
--            <distortion model="ptlens" focal="90" a="0" b="0.005201" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.005796" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.004504" b="-0.01756" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="-0.001188" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0" b="0.001378" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.003241" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.003895" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.005226" c="0"/>
-+            <distortion model="ptlens" focal="80" a="0" b="0.005343" c="0"/>
-+            <distortion model="ptlens" focal="90" a="0" b="0.005201" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0" b="0.005796" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>KM 28-100mm 3.5-5.6 AF D</model>
-+        <model>KM 28-100mm f/3.5-5.6 AF D</model>
-         <mount>Minolta AF</mount>
-+        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.005155" b="-0.020044" c="0" />
--            <distortion model="ptlens" focal="35" a="0.005248" b="-0.012857" c="0" />
--            <distortion model="ptlens" focal="40" a="0" b="-0.000766" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.001775" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.002973" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.002931" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.005155" b="-0.020044" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.005248" b="-0.012857" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="-0.000766" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.001775" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.002973" c="0"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.002931" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>KM 80-200mm 2.8</model>
-+        <model>KM 80-200mm f/2.8</model>
-         <mount>Minolta AF</mount>
-+        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="0" b="-0.004374" c="0" />
--            <distortion model="ptlens" focal="90" a="0" b="-0.002544" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="-0.000886" c="0" />
--            <distortion model="ptlens" focal="110" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.001336" c="0" />
--            <distortion model="ptlens" focal="150" a="0" b="0.002115" c="0" />
--            <distortion model="ptlens" focal="180" a="0" b="0.00279" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.001971" c="0" />
-+            <distortion model="poly3" focal="80" k1="-0.004374"/>
-+            <distortion model="poly3" focal="90" k1="-0.002544"/>
-+            <distortion model="poly3" focal="100" k1="-0.000886"/>
-+            <distortion model="poly3" focal="110" k1="0"/>
-+            <distortion model="poly3" focal="135" k1="0.001336"/>
-+            <distortion model="poly3" focal="150" k1="0.002115"/>
-+            <distortion model="poly3" focal="180" k1="0.00279"/>
-+            <distortion model="poly3" focal="200" k1="0.001971"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Konica Minolta</maker>
--        <model>KM 20mm 2.8</model>
-+        <model>KM 20mm f/2.8</model>
-         <mount>Minolta AF</mount>
-+        <!-- Average crop factor of Konica-Minolta APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="20" a="0.005548" b="-0.022552" c="0" />
-+            <distortion model="ptlens" focal="20" a="0.005548" b="-0.022552" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Minolta</maker>
-         <model>Minolta MC Rokkor-PG 50mm 1:1.4</model>
--	    <focal value="50" />
--	    <aperture min="1.4" max="16"/>
-         <mount>Minolta MC</mount>
--        <cropfactor>2.0</cropfactor>
-+        <focal value="50"/>
-+        <aperture min="1.4" max="16"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="-0.000767655" b="-0.000599186" c="-0.00129564" />
--            <tca model="poly3" focal="50" br="-0.0000228" vr="1.0001644" bb="0.0000253" vb="0.9999662" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="0.5" k1="-0.3237" k2="-0.0259" k3="0.0674" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5441" k2="0.3605" k3="-0.1449" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="5" k1="-0.6492" k2="0.5567" k3="-0.2587" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6618" k2="0.5776" k3="-0.2716" />
--            <vignetting model="pa" focal="50" aperture="2" distance="0.5" k1="-0.0745" k2="0.0154" k3="-0.0235" />
--            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0841" k2="0.0065" k3="-0.0149" />
--            <vignetting model="pa" focal="50" aperture="2" distance="5" k1="-0.0960" k2="0.0202" k3="-0.0271" />
--            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0951" k2="0.0091" k3="-0.0168" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="0.5" k1="-0.0815" k2="0.0216" k3="-0.0162" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0896" k2="0.0113" k3="-0.0080" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="5" k1="-0.1024" k2="0.0179" k3="-0.0097" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1016" k2="0.0095" k3="-0.0039" />
--            <vignetting model="pa" focal="50" aperture="4" distance="0.5" k1="-0.0775" k2="0.0023" k3="0.0004" />
--            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0974" k2="0.0184" k3="-0.0079" />
--            <vignetting model="pa" focal="50" aperture="4" distance="5" k1="-0.1077" k2="0.0272" k3="-0.0133" />
--            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1162" k2="0.0261" k3="-0.0105" />
--            <vignetting model="pa" focal="50" aperture="16" distance="0.5" k1="-0.1133" k2="0.0437" k3="-0.0170" />
--            <vignetting model="pa" focal="50" aperture="16" distance="1" k1="-0.1576" k2="0.0858" k3="-0.0295" />
--            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.1854" k2="0.1322" k3="-0.0545" />
--            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2034" k2="0.1667" k3="-0.0748" />
-+            <distortion model="ptlens" focal="50" a="-0.000767655" b="-0.000599186" c="-0.00129564"/>
-+            <tca model="poly3" focal="50" br="-0.0000228" vr="1.0001644" bb="0.0000253" vb="0.9999662"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="0.5" k1="-0.3237" k2="-0.0259" k3="0.0674"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1" k1="-0.5441" k2="0.3605" k3="-0.1449"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="5" k1="-0.6492" k2="0.5567" k3="-0.2587"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.6618" k2="0.5776" k3="-0.2716"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.5" k1="-0.0745" k2="0.0154" k3="-0.0235"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1" k1="-0.0841" k2="0.0065" k3="-0.0149"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="5" k1="-0.0960" k2="0.0202" k3="-0.0271"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0951" k2="0.0091" k3="-0.0168"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.5" k1="-0.0815" k2="0.0216" k3="-0.0162"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1" k1="-0.0896" k2="0.0113" k3="-0.0080"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="5" k1="-0.1024" k2="0.0179" k3="-0.0097"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1016" k2="0.0095" k3="-0.0039"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.5" k1="-0.0775" k2="0.0023" k3="0.0004"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1" k1="-0.0974" k2="0.0184" k3="-0.0079"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="5" k1="-0.1077" k2="0.0272" k3="-0.0133"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1162" k2="0.0261" k3="-0.0105"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.5" k1="-0.1133" k2="0.0437" k3="-0.0170"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1" k1="-0.1576" k2="0.0858" k3="-0.0295"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.1854" k2="0.1322" k3="-0.0545"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2034" k2="0.1667" k3="-0.0748"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Minolta</maker>
-+        <model>Minolta AF 35-105mm f/3.5-4.5</model>
-+        <mount>Minolta AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A77V -->
-+            <distortion model="poly3" focal="35" k1="-0.00628"/>
-+            <distortion model="poly3" focal="45" k1="0"/>
-+            <distortion model="poly3" focal="70" k1="0.00544"/>
-+            <distortion model="poly3" focal="105" k1="0.00594"/>
-+            <tca model="poly3" focal="35" br="0.0000492" vr="1.0001029" bb="0.0000029" vb="1.0002668"/>
-+            <tca model="poly3" focal="45" br="0.0000233" vr="1.0000776" bb="-0.0000306" vb="1.0003059"/>
-+            <tca model="poly3" focal="50" br="0.0000111" vr="1.0000393" bb="-0.0000469" vb="1.0002413"/>
-+            <tca model="poly3" focal="60" br="0.0000180" vr="0.9999697" bb="-0.0000579" vb="1.0001878"/>
-+            <tca model="poly3" focal="85" br="0.0000022" vr="0.9999320" bb="-0.0000385" vb="1.0001084"/>
-+            <tca model="poly3" focal="105" br="0.0000029" vr="0.9998763" bb="-0.0000435" vb="0.9999303"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.5388" k2="0.1812" k3="-0.0655"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.5388" k2="0.1812" k3="-0.0655"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.1688" k2="-0.0521" k3="-0.0198"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.1688" k2="-0.0521" k3="-0.0198"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.2317" k2="0.1238" k3="-0.0550"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.2317" k2="0.1238" k3="-0.0550"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2501" k2="0.1054" k3="-0.0423"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2501" k2="0.1054" k3="-0.0423"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="10" k1="-0.5501" k2="0.3120" k3="-0.1241"/>
-+            <vignetting model="pa" focal="45" aperture="4" distance="1000" k1="-0.5501" k2="0.3120" k3="-0.1241"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.1965" k2="0.1132" k3="-0.0998"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.1965" k2="0.1132" k3="-0.0998"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="10" k1="-0.2095" k2="0.1293" k3="-0.0603"/>
-+            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="-0.2095" k2="0.1293" k3="-0.0603"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.2248" k2="0.1048" k3="-0.0414"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.2248" k2="0.1048" k3="-0.0414"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.5141" k2="0.3251" k3="-0.1252"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.5141" k2="0.3251" k3="-0.1252"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1891" k2="0.1471" k3="-0.1083"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1891" k2="0.1471" k3="-0.1083"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1909" k2="0.1319" k3="-0.0626"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1909" k2="0.1319" k3="-0.0626"/>
-+            <vignetting model="pa" focal="60" aperture="25" distance="10" k1="-0.1991" k2="0.1077" k3="-0.0447"/>
-+            <vignetting model="pa" focal="60" aperture="25" distance="1000" k1="-0.1991" k2="0.1077" k3="-0.0447"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.4767" k2="0.3417" k3="-0.1341"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.4767" k2="0.3417" k3="-0.1341"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1669" k2="0.1381" k3="-0.0915"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1669" k2="0.1381" k3="-0.0915"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1680" k2="0.1278" k3="-0.0599"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1680" k2="0.1278" k3="-0.0599"/>
-+            <vignetting model="pa" focal="70" aperture="25" distance="10" k1="-0.1810" k2="0.1106" k3="-0.0483"/>
-+            <vignetting model="pa" focal="70" aperture="25" distance="1000" k1="-0.1810" k2="0.1106" k3="-0.0483"/>
-+            <vignetting model="pa" focal="90" aperture="4.5" distance="10" k1="-0.4445" k2="0.3378" k3="-0.1377"/>
-+            <vignetting model="pa" focal="90" aperture="4.5" distance="1000" k1="-0.4445" k2="0.3378" k3="-0.1377"/>
-+            <vignetting model="pa" focal="90" aperture="6.3" distance="10" k1="-0.1519" k2="0.1158" k3="-0.0527"/>
-+            <vignetting model="pa" focal="90" aperture="6.3" distance="1000" k1="-0.1519" k2="0.1158" k3="-0.0527"/>
-+            <vignetting model="pa" focal="90" aperture="9" distance="10" k1="-0.1591" k2="0.1399" k3="-0.0696"/>
-+            <vignetting model="pa" focal="90" aperture="9" distance="1000" k1="-0.1591" k2="0.1399" k3="-0.0696"/>
-+            <vignetting model="pa" focal="90" aperture="25" distance="10" k1="-0.1754" k2="0.1299" k3="-0.0622"/>
-+            <vignetting model="pa" focal="90" aperture="25" distance="1000" k1="-0.1754" k2="0.1299" k3="-0.0622"/>
-+            <vignetting model="pa" focal="105" aperture="4.5" distance="10" k1="-0.4100" k2="0.3089" k3="-0.1260"/>
-+            <vignetting model="pa" focal="105" aperture="4.5" distance="1000" k1="-0.4100" k2="0.3089" k3="-0.1260"/>
-+            <vignetting model="pa" focal="105" aperture="6.3" distance="10" k1="-0.1432" k2="0.1226" k3="-0.0598"/>
-+            <vignetting model="pa" focal="105" aperture="6.3" distance="1000" k1="-0.1432" k2="0.1226" k3="-0.0598"/>
-+            <vignetting model="pa" focal="105" aperture="9" distance="10" k1="-0.1453" k2="0.1244" k3="-0.0586"/>
-+            <vignetting model="pa" focal="105" aperture="9" distance="1000" k1="-0.1453" k2="0.1244" k3="-0.0586"/>
-+            <vignetting model="pa" focal="105" aperture="29" distance="10" k1="-0.1609" k2="0.1155" k3="-0.0555"/>
-+            <vignetting model="pa" focal="105" aperture="29" distance="1000" k1="-0.1609" k2="0.1155" k3="-0.0555"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Minolta</maker>
-+        <model>Minolta MD 35mm 1/2.8</model>
-+        <mount>Minolta MD</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <distortion model="ptlens" focal="35" a="0.01424" b="-0.05599" c="0.06278"/>
-+            <tca model="poly3" focal="35" vr="1.0003987" vb="0.9998001"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.9017" k2="0.7077" k3="-0.2871"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.9017" k2="0.7077" k3="-0.2871"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3212" k2="0.1698" k3="-0.1072"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3212" k2="0.1698" k3="-0.1072"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.3244" k2="0.1541" k3="-0.0597"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.3244" k2="0.1541" k3="-0.0597"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3333" k2="0.1705" k3="-0.0689"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3333" k2="0.1705" k3="-0.0689"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.3400" k2="0.1814" k3="-0.0735"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.3400" k2="0.1814" k3="-0.0735"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.3469" k2="0.1942" k3="-0.0806"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.3469" k2="0.1942" k3="-0.0806"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.3515" k2="0.2028" k3="-0.0851"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.3515" k2="0.2028" k3="-0.0851"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Minolta</maker>
-+        <model>Minolta MD Rokkor 50mm 1:1.4</model>
-+        <mount>Minolta MD</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="poly3" focal="50" k1="-0.00294"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-leica.xml b/data/db/slr-leica.xml
---- a/data/db/slr-leica.xml	2013-02-02 18:11:04.000000000 +0100
-+++ b/data/db/slr-leica.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,12 +1,39 @@
- <lensdatabase>
--
-+    <mount>
-+        <name>Leica R</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-+        <compat>Generic</compat>
-+    </mount>
-+    <mount>
-+        <name>Leica S</name>
-+        <compat>Generic</compat>
-+    </mount>
-     <camera>
--        <maker>LEICA</maker>
--        <maker lang="en">Leica</maker>
--        <model>DIGILUX 3</model>
--        <model lang="en">Digilux 3</model>
-+        <maker>Leica</maker>
-+        <model>Digilux 3</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-+    <lens>
-+        <maker>Leica</maker>
-+        <model>Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS</model>
-+        <mount>4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus OMD E-M1 -->
-+            <distortion model="ptlens" focal="14" a="0.01426" b="-0.01566" c="-0.05658"/>
-+            <distortion model="ptlens" focal="18" a="0.00643" b="-0.00588" c="-0.02274"/>
-+            <distortion model="ptlens" focal="51" a="0" b="0.00491" c="0"/>
-+            <distortion model="ptlens" focal="94" a="0" b="0.00084" c="0"/>
-+            <distortion model="ptlens" focal="150" a="0" b="-0.00129" c="0"/>
-+            <tca model="poly3" focal="14" vr="1.0002619" vb="1.0001837"/>
-+            <tca model="poly3" focal="18" vr="1.0001973" vb="1.0001705"/>
-+            <tca model="poly3" focal="51" vr="1.0001" vb="1"/>
-+            <tca model="poly3" focal="94" vr="0.9996" vb="1"/>
-+            <tca model="poly3" focal="150" vr="0.9991" vb="0.9999"/>
-+        </calibration>
-+    </lens>
- </lensdatabase>
-diff -Nurpd a/data/db/slr-nikon.xml b/data/db/slr-nikon.xml
---- a/data/db/slr-nikon.xml	2013-10-12 10:15:59.000000000 +0200
-+++ b/data/db/slr-nikon.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,1304 +1,2319 @@
- <lensdatabase>
--
-     <mount>
-         <name>Nikon F</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Nikon F AI</compat>
-         <compat>Nikon F AI-S</compat>
-         <compat>Nikon F AF</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Nikon F AI</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Nikon F</compat>
-         <compat>Nikon F AI-S</compat>
-         <compat>Nikon F AF</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Nikon F AI-S</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Nikon F</compat>
-         <compat>Nikon F AI</compat>
-         <compat>Nikon F AF</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Nikon F AF</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Nikon F</compat>
-         <compat>Nikon F AI</compat>
-         <compat>Nikon F AI-S</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D40</model>
-+        <model>Nikon D40</model>
-         <model lang="en">D40</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D40X</model>
-+        <model>Nikon D40X</model>
-         <model lang="en">D40X</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D50</model>
-+        <model>Nikon D50</model>
-         <model lang="en">D50</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D60</model>
-+        <model>Nikon D60</model>
-         <model lang="en">D60</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D70</model>
-+        <model>Nikon D70</model>
-         <model lang="en">D70</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D70s</model>
-+        <model>Nikon D70s</model>
-         <model lang="en">D70s</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D80</model>
-+        <model>Nikon D80</model>
-         <model lang="en">D80</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D90</model>
-+        <model>Nikon D90</model>
-         <model lang="en">D90</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D100</model>
-+        <model>Nikon D100</model>
-         <model lang="en">D100</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D200</model>
-+        <model>Nikon D200</model>
-         <model lang="en">D200</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D300</model>
-+        <model>Nikon D300</model>
-         <model lang="en">D300</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D300S</model>
-+        <model>Nikon D300S</model>
-         <model lang="en">D300S</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D600</model>
-+        <model>Nikon D600</model>
-         <model lang="en">D600</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D700</model>
-+        <model>Nikon D610</model>
-+        <model lang="en">D610</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D700</model>
-         <model lang="en">D700</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D800</model>
-+        <model>Nikon D750</model>
-+        <model lang="en">D750</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D800</model>
-         <model lang="en">D800</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D800E</model>
-+        <model>Nikon D800E</model>
-         <model lang="en">D800E</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D3000</model>
-+        <model>Nikon D810</model>
-+        <model lang="en">D810</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D3000</model>
-         <model lang="en">D3000</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D3100</model>
-+        <model>Nikon D3100</model>
-         <model lang="en">D3100</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D3200</model>
-+        <model>Nikon D3200</model>
-         <model lang="en">D3200</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D5000</model>
-+        <model>Nikon D3300</model>
-+        <model lang="en">D3300</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D5000</model>
-         <model lang="en">D5000</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D5100</model>
-+        <model>Nikon D5100</model>
-         <model lang="en">D5100</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D5200</model>
-+        <model>Nikon D5200</model>
-         <model lang="en">D5200</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D7000</model>
-+        <model>Nikon D5300</model>
-+        <model lang="en">D5300</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D5500</model>
-+        <model lang="en">D5500</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D7000</model>
-         <model lang="en">D7000</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D7100</model>
-+        <model>Nikon D7100</model>
-         <model lang="en">D7100</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D1</model>
-+        <model>Nikon D7200</model>
-+        <model lang="en">D7200</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D1</model>
-         <model lang="en">D1</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D1H</model>
-+        <model>Nikon D1H</model>
-         <model lang="en">D1H</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D1X</model>
-+        <model>Nikon D1X</model>
-         <model lang="en">D1X</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D2H</model>
-+        <model>Nikon D2H</model>
-         <model lang="en">D2H</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D2Hs</model>
-+        <model>Nikon D2Hs</model>
-         <model lang="en">D2Hs</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D2X</model>
-+        <model>Nikon D2X</model>
-         <model lang="en">D2X</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D2Xs</model>
-+        <model>Nikon D2Xs</model>
-         <model lang="en">D2Xs</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D3</model>
-+        <model>Nikon D3</model>
-         <model lang="en">D3</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D3X</model>
-+        <model>Nikon D3X</model>
-         <model lang="en">D3X</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D3S</model>
-+        <model>Nikon D3S</model>
-         <model lang="en">D3S</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>NIKON CORPORATION</maker>
-+        <maker>Nikon Corporation</maker>
-         <maker lang="en">Nikon</maker>
--        <model>NIKON D4</model>
-+        <model>Nikon D4</model>
-         <model lang="en">D4</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon D4s</model>
-+        <model lang="en">D4s</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Nikon Corporation</maker>
-+        <maker lang="en">Nikon</maker>
-+        <model>Nikon Df</model>
-+        <model lang="en">Df</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.001</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-         <model>FinePixS1Pro</model>
-         <model lang="en">FinePix S1 Pro</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePixS2Pro</model>
-         <model lang="en">FinePix S2 Pro</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S3Pro</model>
-         <model lang="en">FinePix S3 Pro</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>FUJIFILM</maker>
--        <maker lang="en">Fujifilm</maker>
-+        <maker>Fujifilm</maker>
-         <model>FinePix S5Pro</model>
-         <model lang="en">FinePix S5 Pro</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.5</cropfactor>
-+        <cropfactor>1.560</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Fujifilm</maker>
-+        <model>IS Pro</model>
-+        <model lang="en">FinePix IS Pro</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.560</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Kodak</maker>
-         <model>DCS Pro SLR/n</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Kodak</maker>
-         <model>DCS Pro 14nx</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Kodak</maker>
-         <model>DCS Pro 14N</model>
-         <variant>DCS-14n</variant>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Nikon</maker>
-         <model>35mm film: full frame</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 12-24mm f/4G ED-IF AF-S DX</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 12-24mm f/4G DX IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="12" a="-0.016006" b="0.024041" c="0" />
--            <distortion model="ptlens" focal="13" a="-0.017096" b="0.030498" c="0" />
--            <distortion model="ptlens" focal="14" a="-0.01773" b="0.031719" c="0" />
--            <distortion model="ptlens" focal="15" a="-0.013174" b="0.027255" c="0" />
--            <distortion model="ptlens" focal="16" a="-0.009629" b="0.021705" c="0" />
--            <distortion model="ptlens" focal="17" a="-0.006736" b="0.016621" c="0" />
--            <distortion model="ptlens" focal="18" a="-0.007763" b="0.019343" c="0" />
--            <distortion model="ptlens" focal="19" a="-0.005218" b="0.014696" c="0" />
--            <distortion model="ptlens" focal="20" a="-0.005775" b="0.015956" c="0" />
--            <distortion model="ptlens" focal="22" a="-0.005197" b="0.015329" c="0" />
--            <distortion model="ptlens" focal="24" a="-0.007101" b="0.018378" c="0" />
-+            <distortion model="ptlens" focal="12" a="-0.016006" b="0.024041" c="0"/>
-+            <distortion model="ptlens" focal="13" a="-0.017096" b="0.030498" c="0"/>
-+            <distortion model="ptlens" focal="14" a="-0.01773" b="0.031719" c="0"/>
-+            <distortion model="ptlens" focal="15" a="-0.013174" b="0.027255" c="0"/>
-+            <distortion model="ptlens" focal="16" a="-0.009629" b="0.021705" c="0"/>
-+            <distortion model="ptlens" focal="17" a="-0.006736" b="0.016621" c="0"/>
-+            <distortion model="ptlens" focal="18" a="-0.007763" b="0.019343" c="0"/>
-+            <distortion model="ptlens" focal="19" a="-0.005218" b="0.014696" c="0"/>
-+            <distortion model="ptlens" focal="20" a="-0.005775" b="0.015956" c="0"/>
-+            <distortion model="ptlens" focal="22" a="-0.005197" b="0.015329" c="0"/>
-+            <distortion model="ptlens" focal="24" a="-0.007101" b="0.018378" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 16-35mm f/4G ED-AFS VR</model>
-+        <model>Nikon AF-S Zoom-Nikkor 16-35mm f/4G ED VR</model>
-+        <model lang="en">Nikkor AF-S 16-35mm f/4G ED VR</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16" a="0.015" b="-0.08" c="0.067" />
--            <distortion model="ptlens" focal="20" a="0.013" b="-0.149" c="0.148" />
--            <distortion model="ptlens" focal="24" a="0.023" b="-0.076" c="0.078" />
--            <distortion model="ptlens" focal="28" a="-0.089" b="0.222" c="-0.176" />
--            <distortion model="ptlens" focal="35" a="-0.016" b="0.057" c="-0.048" />
--            <tca model="poly3" focal="16" br="0.0000014" vr="0.9999959" bb="0.0000008" vb="0.9999910" />
--            <tca model="poly3" focal="20" br="-0.0000247" vr="1.0000177" bb="-0.0000517" vb="1.0000583" />
--            <tca model="poly3" focal="24" br="-0.0000082" vr="0.9999821" bb="-0.0000450" vb="1.0000369" />
--            <tca model="poly3" focal="28" br="0.0000122" vr="0.9999531" bb="-0.0000058" vb="0.9999931" />
--            <tca model="poly3" focal="35" br="-0.0000239" vr="1.0000166" bb="-0.0000398" vb="1.0000519" />
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="ptlens" focal="16" a="0.01589" b="-0.08067" c="0.06712"/>
-+            <distortion model="ptlens" focal="20" a="0.00036" b="-0.01787" c="0.02308"/>
-+            <distortion model="ptlens" focal="24" a="0" b="-0.0002" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0.004" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.00551" c="0"/>
-+            <tca model="poly3" focal="16" vr="1.0000631" vb="1.0003332"/>
-+            <tca model="poly3" focal="20" vr="1.0000741" vb="1.0002447"/>
-+            <tca model="poly3" focal="24" vr="1.0000321" vb="1.0002009"/>
-+            <tca model="poly3" focal="28" vr="1.0000512" vb="1.0001421"/>
-+            <tca model="poly3" focal="35" vr="1.0000943" vb="1.0000318"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 16-85mm f/3.5-5.6G AF-S ED VR DX</model>
-+        <model>Nikon AF-S DX Nikkor 16-80mm f/2.8-4.0E ED VR</model>
-+        <model lang="en">Nikkor AF-S 16-80mm f/2.8-4E DX ED VR</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16" a="0.0199837" b="-0.0681903" c="0.0388181" />
--            <distortion model="ptlens" focal="18" a="0.0101226" b="-0.0323001" c="0.00392398" />
--            <distortion model="ptlens" focal="20" a="0.00337762" b="-0.0059244" c="-0.0160513" />
--            <distortion model="ptlens" focal="22" a="-0.00565925" b="0.0323698" c="-0.0738213" />
--            <distortion model="ptlens" focal="24" a="0.00498966" b="-0.0163608" c="0.011626" />
--            <distortion model="ptlens" focal="35" a="0.00452151" b="-0.0101545" c="0.00874731" />
--            <distortion model="ptlens" focal="50" a="0.00822439" b="-0.0246265" c="0.0257984" />
--            <distortion model="ptlens" focal="85" a="-0.00473509" b="0.0253574" c="-0.0342333" />
-+            <!-- Taken with Nikon D7200 -->
-+            <distortion model="ptlens" focal="16" a="0.01368" b="-0.04363" c="0.00904"/>
-+            <distortion model="ptlens" focal="18" a="0.03553" b="-0.06901" c="0.0202"/>
-+            <distortion model="ptlens" focal="20" a="0.00324" b="0.00545" c="-0.01603"/>
-+            <distortion model="ptlens" focal="22" a="-0.0068" b="0.03696" c="-0.03991"/>
-+            <distortion model="ptlens" focal="28" a="0.01925" b="-0.04931" c="0.05884"/>
-+            <distortion model="ptlens" focal="34" a="-0.00711" b="0.03741" c="-0.02289"/>
-+            <distortion model="ptlens" focal="40" a="0.00892" b="-0.0052" c="0.01119"/>
-+            <distortion model="ptlens" focal="44" a="0.01529" b="-0.0184" c="0.01554"/>
-+            <distortion model="ptlens" focal="50" a="0.00491" b="-0.00007" c="0.01417"/>
-+            <distortion model="ptlens" focal="55" a="0.02076" b="-0.0394" c="0.04369"/>
-+            <distortion model="ptlens" focal="58" a="0.00009" b="0.01279" c="0.00076"/>
-+            <distortion model="ptlens" focal="60" a="0.00876" b="-0.00268" c="0.00458"/>
-+            <distortion model="ptlens" focal="62" a="-0.00059" b="0.02024" c="-0.01362"/>
-+            <distortion model="ptlens" focal="66" a="-0.00417" b="0.02593" c="-0.01421"/>
-+            <distortion model="ptlens" focal="72" a="0.03333" b="-0.06751" c="0.06361"/>
-+            <distortion model="ptlens" focal="75" a="-0.00173" b="0.01554" c="-0.00392"/>
-+            <distortion model="ptlens" focal="80" a="-0.00074" b="0.01741" c="-0.01376"/>
-+            <!-- Taken with unknown camera model -->
-+            <tca model="poly3" focal="16" br="-0.0000411" vr="1.0004024" bb="0.0000383" vb="0.9999716"/>
-+            <tca model="poly3" focal="24" br="-0.0000360" vr="1.0001751" bb="0.0000671" vb="0.9999619"/>
-+            <tca model="poly3" focal="25" br="-0.0000500" vr="1.0002395" bb="0.0000739" vb="0.9999166"/>
-+            <tca model="poly3" focal="35" br="-0.0000464" vr="1.0001052" bb="0.0000301" vb="0.9999806"/>
-+            <tca model="poly3" focal="38" br="-0.0000213" vr="1.0000390" bb="-0.0000091" vb="1.0000303"/>
-+            <tca model="poly3" focal="50" br="0.0000022" vr="0.9998829" bb="-0.0000146" vb="0.9999875"/>
-+            <tca model="poly3" focal="80" br="-0.0000238" vr="0.9997903" bb="-0.0000055" vb="0.9998115"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="0.35" k1="-0.8839" k2="0.3654" k3="-0.2446"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="0.8" k1="-0.9376" k2="0.5401" k3="-0.3379"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="2.99" k1="-1.0385" k2="0.8115" k3="-0.5029"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.8988" k2="0.4834" k3="-0.2968"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="0.35" k1="-0.5092" k2="0.2886" k3="-0.3686"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="0.8" k1="-0.4627" k2="0.1615" k3="-0.2543"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="2.99" k1="-0.5547" k2="0.3727" k3="-0.3579"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.4080" k2="0.0320" k3="-0.1436"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="0.35" k1="-0.4849" k2="0.0920" k3="-0.0481"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="0.8" k1="-0.5084" k2="0.1712" k3="-0.0831"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="2.99" k1="-0.5147" k2="0.1494" k3="-0.0429"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4259" k2="-0.0384" k3="0.0656"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="0.35" k1="-0.4684" k2="0.0017" k3="0.0394"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="0.8" k1="-0.5063" k2="0.1195" k3="-0.0245"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="2.99" k1="-0.5173" k2="0.1450" k3="-0.0347"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4280" k2="-0.0421" k3="0.0719"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="0.35" k1="-0.5203" k2="0.1335" k3="-0.0444"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="0.8" k1="-0.5595" k2="0.2428" k3="-0.1004"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="2.99" k1="-0.5695" k2="0.2751" k3="-0.1178"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.4935" k2="0.1180" k3="-0.0263"/>
-+            <vignetting model="pa" focal="25" aperture="3" distance="0.35" k1="-1.0433" k2="1.0169" k3="-0.4565"/>
-+            <vignetting model="pa" focal="25" aperture="3" distance="0.8" k1="-1.0472" k2="1.0773" k3="-0.5258"/>
-+            <vignetting model="pa" focal="25" aperture="3" distance="2.99" k1="-1.0578" k2="1.1454" k3="-0.5951"/>
-+            <vignetting model="pa" focal="25" aperture="3" distance="1000" k1="-1.0880" k2="1.2529" k3="-0.6837"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="0.35" k1="-0.3623" k2="-0.1243" k3="0.1207"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="0.8" k1="-0.3568" k2="-0.1078" k3="0.0943"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="2.99" k1="-0.3464" k2="-0.1200" k3="0.1081"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.3536" k2="-0.0855" k3="0.0717"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.35" k1="-0.4511" k2="0.2230" k3="-0.0787"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.8" k1="-0.4283" k2="0.1752" k3="-0.0452"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="2.99" k1="-0.4228" k2="0.1805" k3="-0.0530"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.4412" k2="0.2474" k3="-0.1082"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.35" k1="-0.4491" k2="0.2040" k3="-0.0568"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.8" k1="-0.4269" k2="0.1685" k3="-0.0349"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="2.99" k1="-0.4240" k2="0.1764" k3="-0.0451"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.4397" k2="0.2257" k3="-0.0872"/>
-+            <vignetting model="pa" focal="25" aperture="24" distance="0.35" k1="-0.4458" k2="0.1920" k3="-0.0424"/>
-+            <vignetting model="pa" focal="25" aperture="24" distance="0.8" k1="-0.4254" k2="0.1645" k3="-0.0261"/>
-+            <vignetting model="pa" focal="25" aperture="24" distance="2.99" k1="-0.4206" k2="0.1711" k3="-0.0336"/>
-+            <vignetting model="pa" focal="26" aperture="3" distance="0.35" k1="-1.0181" k2="0.9499" k3="-0.4015"/>
-+            <vignetting model="pa" focal="26" aperture="3" distance="0.8" k1="-1.0192" k2="1.0317" k3="-0.4985"/>
-+            <vignetting model="pa" focal="26" aperture="3" distance="2.99" k1="-1.0278" k2="1.0921" k3="-0.5614"/>
-+            <vignetting model="pa" focal="26" aperture="3" distance="1000" k1="-1.0801" k2="1.2372" k3="-0.6679"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="0.35" k1="-0.3474" k2="-0.1357" k3="0.1202"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="0.8" k1="-0.3232" k2="-0.1514" k3="0.1159"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="2.99" k1="-0.2914" k2="-0.2438" k3="0.1850"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.3374" k2="-0.1311" k3="0.1110"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="0.35" k1="-0.4423" k2="0.2154" k3="-0.0635"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="0.8" k1="-0.4124" k2="0.1678" k3="-0.0399"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="2.99" k1="-0.4029" k2="0.1511" k3="-0.0309"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.4374" k2="0.2245" k3="-0.0718"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="0.35" k1="-0.4443" k2="0.2155" k3="-0.0645"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="0.8" k1="-0.4167" k2="0.1714" k3="-0.0431"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="2.99" k1="-0.4054" k2="0.1469" k3="-0.0267"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.4430" k2="0.2364" k3="-0.0824"/>
-+            <vignetting model="pa" focal="26" aperture="24" distance="0.35" k1="-0.4295" k2="0.1579" k3="-0.0210"/>
-+            <vignetting model="pa" focal="26" aperture="24" distance="0.8" k1="-0.4014" k2="0.1108" k3="0.0059"/>
-+            <vignetting model="pa" focal="26" aperture="24" distance="2.99" k1="-0.3909" k2="0.0908" k3="0.0174"/>
-+            <vignetting model="pa" focal="26" aperture="24" distance="1000" k1="-0.4206" k2="0.1579" k3="-0.0225"/>
-+            <vignetting model="pa" focal="38" aperture="3.3" distance="0.35" k1="-0.9194" k2="0.9594" k3="-0.4877"/>
-+            <vignetting model="pa" focal="38" aperture="3.3" distance="0.8" k1="-0.9355" k2="1.1463" k3="-0.7162"/>
-+            <vignetting model="pa" focal="38" aperture="3.3" distance="2.99" k1="-0.9188" k2="1.1454" k3="-0.7483"/>
-+            <vignetting model="pa" focal="38" aperture="3.3" distance="1000" k1="-0.9856" k2="1.2859" k3="-0.8395"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="0.35" k1="-0.2415" k2="-0.1767" k3="0.1105"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="2.99" k1="-0.2367" k2="-0.1219" k3="0.0279"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="1000" k1="-0.1952" k2="-0.2001" k3="0.0524"/>
-+            <vignetting model="pa" focal="38" aperture="5" distance="0.35" k1="-0.3175" k2="0.1703" k3="-0.1231"/>
-+            <vignetting model="pa" focal="38" aperture="5" distance="0.8" k1="-0.1796" k2="-0.1250" k3="0.0402"/>
-+            <vignetting model="pa" focal="38" aperture="5" distance="2.99" k1="-0.2587" k2="0.1200" k3="-0.1066"/>
-+            <vignetting model="pa" focal="38" aperture="6.3" distance="0.35" k1="-0.3499" k2="0.2404" k3="-0.1221"/>
-+            <vignetting model="pa" focal="38" aperture="6.3" distance="2.99" k1="-0.3043" k2="0.1045" k3="-0.0209"/>
-+            <vignetting model="pa" focal="38" aperture="6.3" distance="1000" k1="-0.2494" k2="-0.0096" k3="0.0475"/>
-+            <vignetting model="pa" focal="38" aperture="7.1" distance="0.35" k1="-0.3255" k2="0.1420" k3="-0.0413"/>
-+            <vignetting model="pa" focal="38" aperture="7.1" distance="0.8" k1="-0.2127" k2="-0.0783" k3="0.0818"/>
-+            <vignetting model="pa" focal="38" aperture="7.1" distance="2.99" k1="-0.2615" k2="0.0942" k3="-0.0413"/>
-+            <vignetting model="pa" focal="38" aperture="9" distance="0.35" k1="-0.3304" k2="0.1910" k3="-0.0877"/>
-+            <vignetting model="pa" focal="38" aperture="9" distance="2.99" k1="-0.2948" k2="0.0632" k3="0.0084"/>
-+            <vignetting model="pa" focal="38" aperture="9" distance="1000" k1="-0.2501" k2="-0.0139" k3="0.0503"/>
-+            <vignetting model="pa" focal="38" aperture="10" distance="0.35" k1="-0.3139" k2="0.1111" k3="-0.0231"/>
-+            <vignetting model="pa" focal="38" aperture="10" distance="0.8" k1="-0.2054" k2="-0.0893" k3="0.0840"/>
-+            <vignetting model="pa" focal="38" aperture="10" distance="2.99" k1="-0.2487" k2="0.0702" k3="-0.0309"/>
-+            <vignetting model="pa" focal="38" aperture="27" distance="0.35" k1="-0.2429" k2="-0.0386" k3="0.0568"/>
-+            <vignetting model="pa" focal="38" aperture="27" distance="0.8" k1="-0.2201" k2="-0.0666" k3="0.0689"/>
-+            <vignetting model="pa" focal="38" aperture="27" distance="2.99" k1="-0.2537" k2="0.0273" k3="0.0118"/>
-+            <vignetting model="pa" focal="38" aperture="27" distance="1000" k1="-0.2525" k2="-0.0187" k3="0.0514"/>
-+            <vignetting model="pa" focal="52" aperture="3.8" distance="0.35" k1="-0.9862" k2="1.5176" k3="-1.0571"/>
-+            <vignetting model="pa" focal="52" aperture="3.8" distance="0.8" k1="-0.9201" k2="1.3741" k3="-1.0449"/>
-+            <vignetting model="pa" focal="52" aperture="3.8" distance="2.99" k1="-0.8762" k2="1.2055" k3="-0.9318"/>
-+            <vignetting model="pa" focal="52" aperture="3.8" distance="1000" k1="-0.7985" k2="0.9920" k3="-0.8039"/>
-+            <vignetting model="pa" focal="52" aperture="5" distance="0.35" k1="-0.1400" k2="-0.0891" k3="-0.0669"/>
-+            <vignetting model="pa" focal="52" aperture="5" distance="0.8" k1="-0.2264" k2="0.2546" k3="-0.3762"/>
-+            <vignetting model="pa" focal="52" aperture="5" distance="2.99" k1="-0.2442" k2="0.2825" k3="-0.4003"/>
-+            <vignetting model="pa" focal="52" aperture="5" distance="1000" k1="-0.1924" k2="0.1805" k3="-0.3570"/>
-+            <vignetting model="pa" focal="52" aperture="7.1" distance="0.35" k1="-0.1742" k2="0.0081" k3="0.0011"/>
-+            <vignetting model="pa" focal="52" aperture="7.1" distance="0.8" k1="-0.2320" k2="0.1925" k3="-0.1316"/>
-+            <vignetting model="pa" focal="52" aperture="7.1" distance="2.99" k1="-0.2439" k2="0.2000" k3="-0.1284"/>
-+            <vignetting model="pa" focal="52" aperture="7.1" distance="1000" k1="-0.1994" k2="0.1043" k3="-0.0799"/>
-+            <vignetting model="pa" focal="52" aperture="10" distance="0.35" k1="-0.1757" k2="0.0071" k3="0.0034"/>
-+            <vignetting model="pa" focal="52" aperture="10" distance="0.8" k1="-0.2301" k2="0.1639" k3="-0.0930"/>
-+            <vignetting model="pa" focal="52" aperture="10" distance="2.99" k1="-0.2567" k2="0.2141" k3="-0.1172"/>
-+            <vignetting model="pa" focal="52" aperture="10" distance="1000" k1="-0.1917" k2="0.0589" k3="-0.0272"/>
-+            <vignetting model="pa" focal="52" aperture="30" distance="0.35" k1="-0.2153" k2="0.1282" k3="-0.0825"/>
-+            <vignetting model="pa" focal="52" aperture="30" distance="0.8" k1="-0.3277" k2="0.3847" k3="-0.2234"/>
-+            <vignetting model="pa" focal="52" aperture="30" distance="2.99" k1="-0.2613" k2="0.2269" k3="-0.1220"/>
-+            <vignetting model="pa" focal="52" aperture="30" distance="1000" k1="-0.2448" k2="0.2069" k3="-0.1295"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="0.35" k1="-1.0001" k2="1.7099" k3="-1.2508"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="0.8" k1="-0.8171" k2="1.1223" k3="-0.9048"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="2.99" k1="-0.6866" k2="0.6255" k3="-0.5542"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.6040" k2="0.3049" k3="-0.3172"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="0.35" k1="-0.2211" k2="0.3804" k3="-0.4195"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="0.8" k1="-0.2554" k2="0.5219" k3="-0.5681"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="2.99" k1="-0.2511" k2="0.5054" k3="-0.5791"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1988" k2="0.3306" k3="-0.4572"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="0.35" k1="-0.1692" k2="0.1116" k3="-0.0705"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="0.8" k1="-0.2144" k2="0.2462" k3="-0.1723"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="2.99" k1="-0.2371" k2="0.2874" k3="-0.1936"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.2016" k2="0.1824" k3="-0.1275"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="0.35" k1="-0.1934" k2="0.1962" k3="-0.1297"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="0.8" k1="-0.1820" k2="0.1394" k3="-0.0807"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="2.99" k1="-0.2342" k2="0.2463" k3="-0.1382"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.2174" k2="0.1818" k3="-0.0894"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="0.35" k1="-0.1182" k2="-0.0327" k3="0.0226"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="0.8" k1="-0.2135" k2="0.2117" k3="-0.1167"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="2.99" k1="-0.2355" k2="0.2356" k3="-0.1218"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.2462" k2="0.2443" k3="-0.1243"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 17-35mm f/2.8 ED-AFS</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 16-85mm f/3.5-5.6G ED VR</model>
-+        <model lang="en">Nikkor AF-S 16-85mm f/3.5-5.6G DX ED VR</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.005" b="-0.02" c="0" />
--            <distortion model="ptlens" focal="20" a="0" b="-0.0055" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="-0.001" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="0.0005" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0.0025" c="0" />
-+            <distortion model="ptlens" focal="16" a="0.0199837" b="-0.0681903" c="0.0388181"/>
-+            <distortion model="ptlens" focal="18" a="0.0101226" b="-0.0323001" c="0.00392398"/>
-+            <distortion model="ptlens" focal="20" a="0.00337762" b="-0.0059244" c="-0.0160513"/>
-+            <distortion model="ptlens" focal="22" a="-0.00565925" b="0.0323698" c="-0.0738213"/>
-+            <distortion model="ptlens" focal="24" a="0.00498966" b="-0.0163608" c="0.011626"/>
-+            <distortion model="ptlens" focal="35" a="0.00452151" b="-0.0101545" c="0.00874731"/>
-+            <distortion model="ptlens" focal="50" a="0.00822439" b="-0.0246265" c="0.0257984"/>
-+            <distortion model="ptlens" focal="85" a="-0.00473509" b="0.0253574" c="-0.0342333"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.7912" k2="0.4272" k3="-0.3319"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.7912" k2="0.4272" k3="-0.3319"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.5441" k2="0.0487" k3="-0.1416"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.5441" k2="0.0487" k3="-0.1416"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.4981" k2="0.2109" k3="-0.2763"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4981" k2="0.2109" k3="-0.2763"/>
-+            <vignetting model="pa" focal="16" aperture="6.3" distance="10" k1="-0.5432" k2="0.3655" k3="-0.3278"/>
-+            <vignetting model="pa" focal="16" aperture="6.3" distance="1000" k1="-0.5432" k2="0.3655" k3="-0.3278"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.4511" k2="-0.0183" k3="0.0352"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.4511" k2="-0.0183" k3="0.0352"/>
-+            <vignetting model="pa" focal="32" aperture="4.5" distance="10" k1="-0.6311" k2="0.4510" k3="-0.2609"/>
-+            <vignetting model="pa" focal="32" aperture="4.5" distance="1000" k1="-0.6311" k2="0.4510" k3="-0.2609"/>
-+            <vignetting model="pa" focal="32" aperture="5.6" distance="10" k1="-0.2248" k2="-0.3703" k3="0.2330"/>
-+            <vignetting model="pa" focal="32" aperture="5.6" distance="1000" k1="-0.2248" k2="-0.3703" k3="0.2330"/>
-+            <vignetting model="pa" focal="32" aperture="6.3" distance="10" k1="-0.1713" k2="-0.2270" k3="0.0983"/>
-+            <vignetting model="pa" focal="32" aperture="6.3" distance="1000" k1="-0.1713" k2="-0.2270" k3="0.0983"/>
-+            <vignetting model="pa" focal="32" aperture="7.1" distance="10" k1="-0.2200" k2="-0.0015" k3="-0.0304"/>
-+            <vignetting model="pa" focal="32" aperture="7.1" distance="1000" k1="-0.2200" k2="-0.0015" k3="-0.0304"/>
-+            <vignetting model="pa" focal="32" aperture="29" distance="10" k1="-0.1969" k2="-0.0880" k3="0.0588"/>
-+            <vignetting model="pa" focal="32" aperture="29" distance="1000" k1="-0.1969" k2="-0.0880" k3="0.0588"/>
-+            <vignetting model="pa" focal="46" aperture="5" distance="10" k1="-0.6289" k2="0.7325" k3="-0.5494"/>
-+            <vignetting model="pa" focal="46" aperture="5" distance="1000" k1="-0.6289" k2="0.7325" k3="-0.5494"/>
-+            <vignetting model="pa" focal="46" aperture="6.3" distance="10" k1="-0.2200" k2="-0.1204" k3="-0.0024"/>
-+            <vignetting model="pa" focal="46" aperture="6.3" distance="1000" k1="-0.2200" k2="-0.1204" k3="-0.0024"/>
-+            <vignetting model="pa" focal="46" aperture="7.1" distance="10" k1="-0.1393" k2="-0.0707" k3="-0.0409"/>
-+            <vignetting model="pa" focal="46" aperture="7.1" distance="1000" k1="-0.1393" k2="-0.0707" k3="-0.0409"/>
-+            <vignetting model="pa" focal="46" aperture="8" distance="10" k1="-0.1859" k2="0.0398" k3="-0.0495"/>
-+            <vignetting model="pa" focal="46" aperture="8" distance="1000" k1="-0.1859" k2="0.0398" k3="-0.0495"/>
-+            <vignetting model="pa" focal="46" aperture="32" distance="10" k1="-0.1404" k2="-0.0884" k3="0.0543"/>
-+            <vignetting model="pa" focal="46" aperture="32" distance="1000" k1="-0.1404" k2="-0.0884" k3="0.0543"/>
-+            <vignetting model="pa" focal="65" aperture="5.3" distance="10" k1="-0.5998" k2="0.8238" k3="-0.7024"/>
-+            <vignetting model="pa" focal="65" aperture="5.3" distance="1000" k1="-0.5998" k2="0.8238" k3="-0.7024"/>
-+            <vignetting model="pa" focal="65" aperture="6.3" distance="10" k1="-0.4462" k2="0.4906" k3="-0.4686"/>
-+            <vignetting model="pa" focal="65" aperture="6.3" distance="1000" k1="-0.4462" k2="0.4906" k3="-0.4686"/>
-+            <vignetting model="pa" focal="65" aperture="7.1" distance="10" k1="-0.2166" k2="0.1145" k3="-0.2471"/>
-+            <vignetting model="pa" focal="65" aperture="7.1" distance="1000" k1="-0.2166" k2="0.1145" k3="-0.2471"/>
-+            <vignetting model="pa" focal="65" aperture="8" distance="10" k1="-0.1573" k2="0.1342" k3="-0.2494"/>
-+            <vignetting model="pa" focal="65" aperture="8" distance="1000" k1="-0.1573" k2="0.1342" k3="-0.2494"/>
-+            <vignetting model="pa" focal="65" aperture="36" distance="10" k1="-0.0828" k2="-0.1221" k3="0.0703"/>
-+            <vignetting model="pa" focal="65" aperture="36" distance="1000" k1="-0.0828" k2="-0.1221" k3="0.0703"/>
-+            <vignetting model="pa" focal="85" aperture="5.6" distance="10" k1="-0.5044" k2="0.5812" k3="-0.5718"/>
-+            <vignetting model="pa" focal="85" aperture="5.6" distance="1000" k1="-0.5044" k2="0.5812" k3="-0.5718"/>
-+            <vignetting model="pa" focal="85" aperture="6.3" distance="10" k1="-0.4340" k2="0.4624" k3="-0.4777"/>
-+            <vignetting model="pa" focal="85" aperture="6.3" distance="1000" k1="-0.4340" k2="0.4624" k3="-0.4777"/>
-+            <vignetting model="pa" focal="85" aperture="7.1" distance="10" k1="-0.2072" k2="0.1000" k3="-0.2701"/>
-+            <vignetting model="pa" focal="85" aperture="7.1" distance="1000" k1="-0.2072" k2="0.1000" k3="-0.2701"/>
-+            <vignetting model="pa" focal="85" aperture="8" distance="10" k1="-0.1676" k2="0.2700" k3="-0.3584"/>
-+            <vignetting model="pa" focal="85" aperture="8" distance="1000" k1="-0.1676" k2="0.2700" k3="-0.3584"/>
-+            <vignetting model="pa" focal="85" aperture="36" distance="10" k1="-0.0937" k2="-0.0561" k3="0.0275"/>
-+            <vignetting model="pa" focal="85" aperture="36" distance="1000" k1="-0.0937" k2="-0.0561" k3="0.0275"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 17-55mm f/2.8G ED-IF AF-S DX</model>
-+        <model>Nikon AF-S Zoom-Nikkor 17-35mm f/2.8D IF-ED</model>
-+        <model lang="en">Nikkor AF-S 17-35mm f/2.8D IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0" b="-0.010424" c="0" />
--            <distortion model="ptlens" focal="19" a="0" b="-0.00567" c="0" />
--            <distortion model="ptlens" focal="22" a="0" b="-0.000148" c="0" />
--            <distortion model="ptlens" focal="26" a="0" b="0.004472" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="0.005657" c="0" />
--            <distortion model="ptlens" focal="38" a="0" b="0.007283" c="0" />
--            <distortion model="ptlens" focal="55" a="0" b="0.005143" c="0" />
-+            <distortion model="ptlens" focal="17" a="0.005" b="-0.02" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0" b="-0.0055" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0" b="-0.001" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0.0005" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.0025" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 18-35mm f/3.5-4.5D ED-IF AF</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 17-55mm f/2.8G DX IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.005981" b="-0.024888" c="0" />
--            <distortion model="ptlens" focal="21" a="0.005045" b="-0.019527" c="0" />
--            <distortion model="ptlens" focal="23" a="0.001429" b="-0.00989" c="0" />
--            <distortion model="ptlens" focal="26" a="0" b="-0.00509" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="-0.003797" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.002437" c="0" />
-+            <distortion model="poly3" focal="17" k1="-0.010424"/>
-+            <distortion model="poly3" focal="19" k1="-0.00567"/>
-+            <distortion model="poly3" focal="22" k1="-0.000148"/>
-+            <distortion model="poly3" focal="26" k1="0.004472"/>
-+            <distortion model="poly3" focal="30" k1="0.005657"/>
-+            <distortion model="poly3" focal="38" k1="0.007283"/>
-+            <distortion model="poly3" focal="55" k1="0.005143"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 18-55mm f/3.5-5.6G ED AF-S DX</model>
-+        <model>Nikon AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED</model>
-+        <model lang="en">Nikkor AF 18-35mm f/3.5-4.5D IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.003409" b="-0.019128" c="0" />
--            <distortion model="ptlens" focal="20" a="0.0042" b="-0.018625" c="0" />
--            <distortion model="ptlens" focal="24" a="0.001149" b="-0.008657" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="-0.003041" c="0" />
--            <distortion model="ptlens" focal="31" a="0" b="-0.003664" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.002371" c="0" />
--            <distortion model="ptlens" focal="45" a="0" b="-0.001655" c="0" />
--            <distortion model="ptlens" focal="55" a="0" b="-0.001004" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.005981" b="-0.024888" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.005045" b="-0.019527" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.001429" b="-0.00989" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0" b="-0.00509" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0" b="-0.003797" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="-0.002437" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 18-55mm f/3.5-5.6G AF-S DX VR</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED</model>
-+        <model lang="en">Nikkor AF-S 18-55mm f/3.5-5.6G DX ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.000658776" b="-0.0150048" c="-0.00123339" />
--            <distortion model="ptlens" focal="20" a="0.0154927" b="-0.0685976" c="0.0638405" />
--            <distortion model="ptlens" focal="22" a="0.00163489" b="-0.0157578" c="0.0044202" />
--            <distortion model="ptlens" focal="24" a="0.0238367" b="-0.102409" c="0.124563" />
--            <distortion model="ptlens" focal="29" a="-5.82382e-05" b="0.0021913" c="-0.0142704" />
--            <distortion model="ptlens" focal="35" a="0.00346406" b="-0.0126111" c="0.013148" />
--            <distortion model="ptlens" focal="45" a="-0.000340008" b="-0.000412014" c="0.00561741" />
--            <distortion model="ptlens" focal="55" a="-0.000340008" b="-0.000412014" c="0.00561741" />
-+            <distortion model="ptlens" focal="18" a="0.003409" b="-0.019128" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.0042" b="-0.018625" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.001149" b="-0.008657" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="-0.003041" c="0"/>
-+            <distortion model="ptlens" focal="31" a="0" b="-0.003664" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="-0.002371" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0" b="-0.001655" c="0"/>
-+            <distortion model="ptlens" focal="55" a="0" b="-0.001004" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikon AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G VR</model>
-+        <model lang="en">Nikkor AF-S 18-55mm f/3.5-5.6G DX VR</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="-0.003" b="-0.004" c="-0.018" />
--            <distortion model="ptlens" focal="24" a="0.001" b="-0.010" c="0.002" />
--            <distortion model="ptlens" focal="35" a="0.004" b="-0.012" c="0.009" />
--            <distortion model="ptlens" focal="45" a="-0.001" b="0.002" c="-0.002" />
--            <distortion model="ptlens" focal="55" a="0.000" b="0.002" c="-0.001" />
-+            <distortion model="ptlens" focal="18" a="0.000658776" b="-0.0150048" c="-0.00123339"/>
-+            <distortion model="ptlens" focal="20" a="0.0154927" b="-0.0685976" c="0.0638405"/>
-+            <distortion model="ptlens" focal="22" a="0.00163489" b="-0.0157578" c="0.0044202"/>
-+            <distortion model="ptlens" focal="24" a="0.0238367" b="-0.102409" c="0.124563"/>
-+            <distortion model="ptlens" focal="29" a="-5.82382e-05" b="0.0021913" c="-0.0142704"/>
-+            <distortion model="ptlens" focal="35" a="0.00346406" b="-0.0126111" c="0.013148"/>
-+            <distortion model="ptlens" focal="45" a="-0.000340008" b="-0.000412014" c="0.00561741"/>
-+            <distortion model="ptlens" focal="55" a="-0.000340008" b="-0.000412014" c="0.00561741"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.6969" k2="0.1514" k3="0.0042"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.6969" k2="0.1514" k3="0.0042"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2523" k2="-0.2930" k3="0.1084"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2523" k2="-0.2930" k3="0.1084"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.3275" k2="0.1982" k3="-0.2173"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3275" k2="0.1982" k3="-0.2173"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.3721" k2="0.2886" k3="-0.2333"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.3721" k2="0.2886" k3="-0.2333"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3160" k2="0.1477" k3="-0.1164"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3160" k2="0.1477" k3="-0.1164"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2541" k2="-0.0683" k3="0.0699"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2541" k2="-0.0683" k3="0.0699"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.2757" k2="-0.5245" k3="0.3889"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.2757" k2="-0.5245" k3="0.3889"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.1462" k2="-0.1231" k3="0.0071"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.1462" k2="-0.1231" k3="0.0071"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="10" k1="-0.1925" k2="0.0426" k3="-0.0306"/>
-+            <vignetting model="pa" focal="28" aperture="6.3" distance="1000" k1="-0.1925" k2="0.0426" k3="-0.0306"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.1827" k2="-0.0003" k3="0.0134"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.1827" k2="-0.0003" k3="0.0134"/>
-+            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.1765" k2="-0.0111" k3="0.0216"/>
-+            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.1765" k2="-0.0111" k3="0.0216"/>
-+            <vignetting model="pa" focal="36" aperture="5" distance="10" k1="-0.2481" k2="-0.4958" k3="0.3604"/>
-+            <vignetting model="pa" focal="36" aperture="5" distance="1000" k1="-0.2481" k2="-0.4958" k3="0.3604"/>
-+            <vignetting model="pa" focal="36" aperture="6.3" distance="10" k1="-0.0370" k2="-0.3205" k3="0.1124"/>
-+            <vignetting model="pa" focal="36" aperture="6.3" distance="1000" k1="-0.0370" k2="-0.3205" k3="0.1124"/>
-+            <vignetting model="pa" focal="36" aperture="7.1" distance="10" k1="-0.1283" k2="0.0419" k3="-0.0432"/>
-+            <vignetting model="pa" focal="36" aperture="7.1" distance="1000" k1="-0.1283" k2="0.0419" k3="-0.0432"/>
-+            <vignetting model="pa" focal="36" aperture="8" distance="10" k1="-0.1086" k2="-0.0181" k3="0.0192"/>
-+            <vignetting model="pa" focal="36" aperture="8" distance="1000" k1="-0.1086" k2="-0.0181" k3="0.0192"/>
-+            <vignetting model="pa" focal="36" aperture="32" distance="10" k1="-0.0985" k2="-0.0502" k3="0.0426"/>
-+            <vignetting model="pa" focal="36" aperture="32" distance="1000" k1="-0.0985" k2="-0.0502" k3="0.0426"/>
-+            <vignetting model="pa" focal="46" aperture="5.3" distance="10" k1="-0.7264" k2="0.3744" k3="-0.0913"/>
-+            <vignetting model="pa" focal="46" aperture="5.3" distance="1000" k1="-0.7264" k2="0.3744" k3="-0.0913"/>
-+            <vignetting model="pa" focal="46" aperture="6.3" distance="10" k1="-0.1890" k2="-0.5123" k3="0.3514"/>
-+            <vignetting model="pa" focal="46" aperture="6.3" distance="1000" k1="-0.1890" k2="-0.5123" k3="0.3514"/>
-+            <vignetting model="pa" focal="46" aperture="7.1" distance="10" k1="-0.0057" k2="-0.3085" k3="0.1097"/>
-+            <vignetting model="pa" focal="46" aperture="7.1" distance="1000" k1="-0.0057" k2="-0.3085" k3="0.1097"/>
-+            <vignetting model="pa" focal="46" aperture="8" distance="10" k1="-0.0905" k2="0.0453" k3="-0.0656"/>
-+            <vignetting model="pa" focal="46" aperture="8" distance="1000" k1="-0.0905" k2="0.0453" k3="-0.0656"/>
-+            <vignetting model="pa" focal="46" aperture="36" distance="10" k1="-0.0903" k2="0.0086" k3="0.0017"/>
-+            <vignetting model="pa" focal="46" aperture="36" distance="1000" k1="-0.0903" k2="0.0086" k3="0.0017"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.8226" k2="0.6387" k3="-0.2484"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.8226" k2="0.6387" k3="-0.2484"/>
-+            <vignetting model="pa" focal="55" aperture="6.3" distance="10" k1="-0.3127" k2="-0.2860" k3="0.2449"/>
-+            <vignetting model="pa" focal="55" aperture="6.3" distance="1000" k1="-0.3127" k2="-0.2860" k3="0.2449"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="10" k1="-0.0370" k2="-0.5520" k3="0.3181"/>
-+            <vignetting model="pa" focal="55" aperture="7.1" distance="1000" k1="-0.0370" k2="-0.5520" k3="0.3181"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0248" k2="-0.1223" k3="0.0078"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0248" k2="-0.1223" k3="0.0078"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.0567" k2="-0.0167" k3="0.0137"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.0567" k2="-0.0167" k3="0.0137"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Nikon</maker>
--	    <model>Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED</model>
--	    <focal min="18" max="70" />
--	    <aperture min="3.5" max="29" />
--	    <mount>Nikon F AF</mount>
--	    <cropfactor>1.5</cropfactor>
--	    <calibration>
--	        <distortion focal="18" model="ptlens" a="0.0266119" b="-0.0709405" c="0.0182763" />
--	        <distortion focal="24" model="ptlens" a="0.010714" b="-0.0216807" c="0.00448524" />
--	        <distortion focal="35" model="ptlens" a="0.00697599" b="-0.0102385" c="0.00602236" />
--	        <distortion focal="50" model="ptlens" a="0.00169805" b="0.00159488" c="0.0010821" />
--	        <distortion focal="70" model="ptlens" a="-0.00396747" b="0.0190794" c="-0.0154349" />
--            <tca model="poly3" focal="18" br="-0.0000685" vr="1.0004744" bb="0.0000037" vb="0.9999796" />
--            <tca model="poly3" focal="24" br="-0.0000613" vr="1.0003619" bb="0.0000118" vb="0.9999364" />
--            <tca model="poly3" focal="35" br="-0.0000395" vr="1.0001576" bb="0.0000035" vb="0.9999682" />
--            <tca model="poly3" focal="50" br="-0.0000093" vr="0.9999760" bb="0.0000071" vb="0.9998723" />
--            <tca model="poly3" focal="70" br="-0.0000251" vr="0.9996060" bb="-0.0000149" vb="0.9999705" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.4" k1="-0.4339" k2="-0.4917" k3="0.1496" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.79" k1="-0.4247" k2="-0.4148" k3="0.1097" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="2.37" k1="-0.4155" k2="-0.3594" k3="0.0752" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4157" k2="-0.3406" k3="0.0641" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.4" k1="-0.2207" k2="-0.4523" k3="-0.0436" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.79" k1="-0.1989" k2="-0.4270" k3="-0.0320" />
--            <vignetting model="pa" focal="18" aperture="4" distance="2.37" k1="-0.2246" k2="-0.3894" k3="-0.0232" />
--            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2128" k2="-0.4118" k3="-0.0042" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.4801" k2="0.6179" k3="-0.7049" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.79" k1="-0.3862" k2="0.3465" k3="-0.4484" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="2.37" k1="-0.3644" k2="0.2809" k3="-0.3633" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3390" k2="0.2206" k3="-0.3165" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.4582" k2="0.4636" k3="-0.4626" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.79" k1="-0.2977" k2="-0.0289" k3="-0.0519" />
--            <vignetting model="pa" focal="18" aperture="8" distance="2.37" k1="-0.2683" k2="-0.1113" k3="0.0322" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2466" k2="-0.1544" k3="0.0583" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.3315" k2="-0.0337" k3="-0.0027" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.79" k1="-0.2472" k2="-0.2055" k3="0.1004" />
--            <vignetting model="pa" focal="18" aperture="22" distance="2.37" k1="-0.2423" k2="-0.1967" k3="0.1024" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2262" k2="-0.2170" k3="0.1082" />
--            <vignetting model="pa" focal="24" aperture="3.8" distance="0.4" k1="-0.6454" k2="0.4598" k3="-0.3376" />
--            <vignetting model="pa" focal="24" aperture="3.8" distance="0.79" k1="-0.6110" k2="0.3951" k3="-0.2879" />
--            <vignetting model="pa" focal="24" aperture="3.8" distance="2.37" k1="-0.5970" k2="0.3914" k3="-0.2691" />
--            <vignetting model="pa" focal="24" aperture="3.8" distance="1000" k1="-0.6381" k2="0.4938" k3="-0.3324" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.4839" k2="0.2137" k3="-0.2061" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.79" k1="-0.4297" k2="0.0893" k3="-0.1172" />
--            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.4099" k2="0.0524" k3="-0.0715" />
--            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.4459" k2="0.1407" k3="-0.1254" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.3013" k2="0.0851" k3="-0.0703" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="0.79" k1="-0.2410" k2="-0.0363" k3="-0.0146" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.2262" k2="-0.0491" k3="-0.0035" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2497" k2="-0.0056" k3="-0.0238" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2701" k2="-0.0244" k3="0.0301" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.79" k1="-0.2097" k2="-0.1413" k3="0.0818" />
--            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.1974" k2="-0.1468" k3="0.0850" />
--            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2212" k2="-0.1039" k3="0.0669" />
--            <vignetting model="pa" focal="24" aperture="25" distance="0.4" k1="-0.2562" k2="-0.0549" k3="0.0432" />
--            <vignetting model="pa" focal="24" aperture="25" distance="0.79" k1="-0.1945" k2="-0.1724" k3="0.0962" />
--            <vignetting model="pa" focal="24" aperture="25" distance="2.37" k1="-0.1840" k2="-0.1712" k3="0.0944" />
--            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2040" k2="-0.1382" k3="0.0823" />
--            <vignetting model="pa" focal="34" aperture="25" distance="0.79" k1="-0.1353" k2="-0.0950" k3="0.0404" />
--            <vignetting model="pa" focal="35" aperture="4.2" distance="0.4" k1="-0.5430" k2="0.2235" k3="-0.0402" />
--            <vignetting model="pa" focal="35" aperture="4.2" distance="0.79" k1="-0.5389" k2="0.2196" k3="-0.0458" />
--            <vignetting model="pa" focal="35" aperture="4.2" distance="2.37" k1="-0.5584" k2="0.2464" k3="-0.0528" />
--            <vignetting model="pa" focal="35" aperture="4.2" distance="1000" k1="-0.5511" k2="0.2448" k3="-0.0589" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1205" k2="-0.1893" k3="0.0717" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.79" k1="-0.1153" k2="-0.2323" k3="0.0948" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1302" k2="-0.2226" k3="0.1008" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1302" k2="-0.2160" k3="0.0968" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.1460" k2="-0.0881" k3="0.0531" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.79" k1="-0.1497" k2="-0.0747" k3="0.0383" />
--            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1638" k2="-0.0669" k3="0.0463" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1623" k2="-0.0706" k3="0.0497" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.1342" k2="-0.1118" k3="0.0658" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.79" k1="-0.1386" k2="-0.0966" k3="0.0496" />
--            <vignetting model="pa" focal="35" aperture="11" distance="2.37" k1="-0.1501" k2="-0.0944" k3="0.0614" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1499" k2="-0.0941" k3="0.0615" />
--            <vignetting model="pa" focal="35" aperture="29" distance="0.4" k1="-0.1277" k2="-0.1208" k3="0.0640" />
--            <vignetting model="pa" focal="35" aperture="29" distance="2.37" k1="-0.1443" k2="-0.0998" k3="0.0570" />
--            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1425" k2="-0.1031" k3="0.0593" />
--            <vignetting model="pa" focal="50" aperture="4.5" distance="0.4" k1="-0.4919" k2="0.1239" k3="0.0183" />
--            <vignetting model="pa" focal="50" aperture="4.5" distance="0.79" k1="-0.4998" k2="0.1382" k3="0.0087" />
--            <vignetting model="pa" focal="50" aperture="4.5" distance="2.37" k1="-0.4940" k2="0.1149" k3="0.0269" />
--            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.5219" k2="0.1531" k3="0.0125" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.0465" k2="-0.4662" k3="0.2488" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.79" k1="-0.0669" k2="-0.4827" k3="0.2726" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.0596" k2="-0.5154" k3="0.2985" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0986" k2="-0.4527" k3="0.2701" />
--            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1163" k2="-0.0224" k3="-0.0228" />
--            <vignetting model="pa" focal="50" aperture="8" distance="0.79" k1="-0.1208" k2="-0.0110" k3="-0.0314" />
--            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1115" k2="-0.0445" k3="-0.0067" />
--            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1529" k2="0.0111" k3="-0.0273" />
--            <vignetting model="pa" focal="50" aperture="11" distance="0.4" k1="-0.0989" k2="-0.0897" k3="0.0486" />
--            <vignetting model="pa" focal="50" aperture="11" distance="0.79" k1="-0.1072" k2="-0.0677" k3="0.0323" />
--            <vignetting model="pa" focal="50" aperture="11" distance="2.37" k1="-0.0964" k2="-0.1058" k3="0.0599" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1370" k2="-0.0523" k3="0.0401" />
--            <vignetting model="pa" focal="50" aperture="29" distance="0.4" k1="-0.0957" k2="-0.0951" k3="0.0483" />
--            <vignetting model="pa" focal="50" aperture="29" distance="0.79" k1="-0.1020" k2="-0.0797" k3="0.0384" />
--            <vignetting model="pa" focal="50" aperture="29" distance="2.37" k1="-0.0930" k2="-0.1109" k3="0.0599" />
--            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.1289" k2="-0.0699" k3="0.0489" />
--            <vignetting model="pa" focal="70" aperture="4.5" distance="0.4" k1="-0.7126" k2="1.0859" k3="-0.9096" />
--            <vignetting model="pa" focal="70" aperture="4.5" distance="0.79" k1="-0.6525" k2="0.8721" k3="-0.7779" />
--            <vignetting model="pa" focal="70" aperture="4.5" distance="2.37" k1="-0.6184" k2="0.7293" k3="-0.6707" />
--            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.5974" k2="0.6060" k3="-0.5678" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="0.4" k1="-0.2156" k2="0.2280" k3="-0.3906" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="0.79" k1="-0.2182" k2="0.1461" k3="-0.3395" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="2.37" k1="-0.2239" k2="0.1152" k3="-0.3041" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2302" k2="0.0877" k3="-0.2681" />
--            <vignetting model="pa" focal="70" aperture="8" distance="0.4" k1="-0.1737" k2="0.2570" k3="-0.2841" />
--            <vignetting model="pa" focal="70" aperture="8" distance="0.79" k1="-0.1750" k2="0.2572" k3="-0.3145" />
--            <vignetting model="pa" focal="70" aperture="8" distance="2.37" k1="-0.1811" k2="0.2072" k3="-0.2244" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2074" k2="0.2267" k3="-0.2155" />
--            <vignetting model="pa" focal="70" aperture="11" distance="0.4" k1="-0.0935" k2="-0.0624" k3="0.0205" />
--            <vignetting model="pa" focal="70" aperture="11" distance="0.79" k1="-0.0867" k2="-0.1024" k3="0.0497" />
--            <vignetting model="pa" focal="70" aperture="11" distance="2.37" k1="-0.1057" k2="-0.0858" k3="0.0538" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1501" k2="-0.0110" k3="0.0169" />
--            <vignetting model="pa" focal="70" aperture="29" distance="0.4" k1="-0.0724" k2="-0.1272" k3="0.0692" />
--            <vignetting model="pa" focal="70" aperture="29" distance="0.79" k1="-0.0722" k2="-0.1435" k3="0.0781" />
--            <vignetting model="pa" focal="70" aperture="29" distance="2.37" k1="-0.0963" k2="-0.1079" k3="0.0657" />
--            <vignetting model="pa" focal="70" aperture="29" distance="1000" k1="-0.1466" k2="-0.0219" k3="0.0228" />
--	    </calibration>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX VR Nikkor 18-55mm f/3.5-5.6G II</model>
-+        <model lang="en">Nikkor AF-S 18-55mm f/3.5-5.6G DX VR II</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D3300 -->
-+            <distortion model="ptlens" focal="18" a="-0.00033" b="-0.007745" c="-0.015154"/>
-+            <distortion model="ptlens" focal="20" a="0.000646" b="-0.011226" c="-0.003154"/>
-+            <distortion model="ptlens" focal="21" a="0.011166" b="-0.051056" c="0.04664"/>
-+            <distortion model="ptlens" focal="25" a="0.00078" b="-0.008896" c="0.003416"/>
-+            <distortion model="ptlens" focal="32" a="0.000849" b="-0.005467" c="0.004324"/>
-+            <distortion model="ptlens" focal="40" a="0.002578" b="-0.008653" c="0.010631"/>
-+            <distortion model="ptlens" focal="46" a="-0.004517" b="0.015171" c="-0.010555"/>
-+            <distortion model="ptlens" focal="50" a="-0.00118" b="0.005271" c="-0.002504"/>
-+            <distortion model="ptlens" focal="55" a="-0.002502" b="0.009876" c="-0.007068"/>
-+            <tca model="poly3" focal="18" br="-0.0001140" vr="1.0008246" bb="0.0001631" vb="0.9995273"/>
-+            <tca model="poly3" focal="20" br="-0.0000706" vr="1.0007579" bb="0.0001198" vb="0.9995775"/>
-+            <tca model="poly3" focal="21" br="-0.0000578" vr="1.0007205" bb="0.0001100" vb="0.9995902"/>
-+            <tca model="poly3" focal="25" br="0.0000003" vr="1.0005248" bb="0.0000604" vb="0.9997175"/>
-+            <tca model="poly3" focal="32" br="-0.0000060" vr="1.0003273" bb="0.0000307" vb="0.9998234"/>
-+            <tca model="poly3" focal="40" br="-0.0000164" vr="1.0001566" bb="0.0000247" vb="0.9999039"/>
-+            <tca model="poly3" focal="46" br="-0.0000266" vr="1.0000953" bb="0.0000241" vb="0.9999198"/>
-+            <tca model="poly3" focal="50" br="-0.0000254" vr="1.0000472" bb="0.0000251" vb="0.9999325"/>
-+            <tca model="poly3" focal="55" br="-0.0000181" vr="1.0000225" bb="0.0000268" vb="0.9999503"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikon AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 18-70mm f/3.5-4.5G DX IF-ED</model>
-         <mount>Nikon F AF</mount>
--        <focal min="18" max="105" />
--        <aperture min="3.5" max="22" />
-+        <focal min="18" max="70"/>
-+        <aperture min="3.5" max="29"/>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion focal="18" model="ptlens" a="0.0266119" b="-0.0709405" c="0.0182763"/>
-+            <distortion focal="24" model="ptlens" a="0.010714" b="-0.0216807" c="0.00448524"/>
-+            <distortion focal="35" model="ptlens" a="0.00697599" b="-0.0102385" c="0.00602236"/>
-+            <distortion focal="50" model="ptlens" a="0.00169805" b="0.00159488" c="0.0010821"/>
-+            <distortion focal="70" model="ptlens" a="-0.00396747" b="0.0190794" c="-0.0154349"/>
-+            <tca model="poly3" focal="18" br="-0.0000685" vr="1.0004744" bb="0.0000037" vb="0.9999796"/>
-+            <tca model="poly3" focal="24" br="-0.0000613" vr="1.0003619" bb="0.0000118" vb="0.9999364"/>
-+            <tca model="poly3" focal="35" br="-0.0000395" vr="1.0001576" bb="0.0000035" vb="0.9999682"/>
-+            <tca model="poly3" focal="50" br="-0.0000093" vr="0.9999760" bb="0.0000071" vb="0.9998723"/>
-+            <tca model="poly3" focal="70" br="-0.0000251" vr="0.9996060" bb="-0.0000149" vb="0.9999705"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.4" k1="-0.4339" k2="-0.4917" k3="0.1496"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.79" k1="-0.4247" k2="-0.4148" k3="0.1097"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="2.37" k1="-0.4155" k2="-0.3594" k3="0.0752"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4157" k2="-0.3406" k3="0.0641"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="0.4" k1="-0.2207" k2="-0.4523" k3="-0.0436"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="0.79" k1="-0.1989" k2="-0.4270" k3="-0.0320"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="2.37" k1="-0.2246" k2="-0.3894" k3="-0.0232"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2128" k2="-0.4118" k3="-0.0042"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-0.4801" k2="0.6179" k3="-0.7049"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.79" k1="-0.3862" k2="0.3465" k3="-0.4484"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="2.37" k1="-0.3644" k2="0.2809" k3="-0.3633"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3390" k2="0.2206" k3="-0.3165"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.4582" k2="0.4636" k3="-0.4626"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.79" k1="-0.2977" k2="-0.0289" k3="-0.0519"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="2.37" k1="-0.2683" k2="-0.1113" k3="0.0322"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2466" k2="-0.1544" k3="0.0583"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.4" k1="-0.3315" k2="-0.0337" k3="-0.0027"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.79" k1="-0.2472" k2="-0.2055" k3="0.1004"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="2.37" k1="-0.2423" k2="-0.1967" k3="0.1024"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2262" k2="-0.2170" k3="0.1082"/>
-+            <vignetting model="pa" focal="24" aperture="3.8" distance="0.4" k1="-0.6454" k2="0.4598" k3="-0.3376"/>
-+            <vignetting model="pa" focal="24" aperture="3.8" distance="0.79" k1="-0.6110" k2="0.3951" k3="-0.2879"/>
-+            <vignetting model="pa" focal="24" aperture="3.8" distance="2.37" k1="-0.5970" k2="0.3914" k3="-0.2691"/>
-+            <vignetting model="pa" focal="24" aperture="3.8" distance="1000" k1="-0.6381" k2="0.4938" k3="-0.3324"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.4839" k2="0.2137" k3="-0.2061"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.79" k1="-0.4297" k2="0.0893" k3="-0.1172"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.4099" k2="0.0524" k3="-0.0715"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.4459" k2="0.1407" k3="-0.1254"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.3013" k2="0.0851" k3="-0.0703"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.79" k1="-0.2410" k2="-0.0363" k3="-0.0146"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.2262" k2="-0.0491" k3="-0.0035"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2497" k2="-0.0056" k3="-0.0238"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2701" k2="-0.0244" k3="0.0301"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.79" k1="-0.2097" k2="-0.1413" k3="0.0818"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.1974" k2="-0.1468" k3="0.0850"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2212" k2="-0.1039" k3="0.0669"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="0.4" k1="-0.2562" k2="-0.0549" k3="0.0432"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="0.79" k1="-0.1945" k2="-0.1724" k3="0.0962"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="2.37" k1="-0.1840" k2="-0.1712" k3="0.0944"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2040" k2="-0.1382" k3="0.0823"/>
-+            <vignetting model="pa" focal="34" aperture="25" distance="0.79" k1="-0.1353" k2="-0.0950" k3="0.0404"/>
-+            <vignetting model="pa" focal="35" aperture="4.2" distance="0.4" k1="-0.5430" k2="0.2235" k3="-0.0402"/>
-+            <vignetting model="pa" focal="35" aperture="4.2" distance="0.79" k1="-0.5389" k2="0.2196" k3="-0.0458"/>
-+            <vignetting model="pa" focal="35" aperture="4.2" distance="2.37" k1="-0.5584" k2="0.2464" k3="-0.0528"/>
-+            <vignetting model="pa" focal="35" aperture="4.2" distance="1000" k1="-0.5511" k2="0.2448" k3="-0.0589"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1205" k2="-0.1893" k3="0.0717"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.79" k1="-0.1153" k2="-0.2323" k3="0.0948"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1302" k2="-0.2226" k3="0.1008"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1302" k2="-0.2160" k3="0.0968"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.1460" k2="-0.0881" k3="0.0531"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.79" k1="-0.1497" k2="-0.0747" k3="0.0383"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1638" k2="-0.0669" k3="0.0463"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1623" k2="-0.0706" k3="0.0497"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.4" k1="-0.1342" k2="-0.1118" k3="0.0658"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.79" k1="-0.1386" k2="-0.0966" k3="0.0496"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="2.37" k1="-0.1501" k2="-0.0944" k3="0.0614"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1499" k2="-0.0941" k3="0.0615"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="0.4" k1="-0.1277" k2="-0.1208" k3="0.0640"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="2.37" k1="-0.1443" k2="-0.0998" k3="0.0570"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1425" k2="-0.1031" k3="0.0593"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="0.4" k1="-0.4919" k2="0.1239" k3="0.0183"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="0.79" k1="-0.4998" k2="0.1382" k3="0.0087"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="2.37" k1="-0.4940" k2="0.1149" k3="0.0269"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.5219" k2="0.1531" k3="0.0125"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.0465" k2="-0.4662" k3="0.2488"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.79" k1="-0.0669" k2="-0.4827" k3="0.2726"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.0596" k2="-0.5154" k3="0.2985"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0986" k2="-0.4527" k3="0.2701"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1163" k2="-0.0224" k3="-0.0228"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.79" k1="-0.1208" k2="-0.0110" k3="-0.0314"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1115" k2="-0.0445" k3="-0.0067"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1529" k2="0.0111" k3="-0.0273"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.4" k1="-0.0989" k2="-0.0897" k3="0.0486"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.79" k1="-0.1072" k2="-0.0677" k3="0.0323"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="2.37" k1="-0.0964" k2="-0.1058" k3="0.0599"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1370" k2="-0.0523" k3="0.0401"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="0.4" k1="-0.0957" k2="-0.0951" k3="0.0483"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="0.79" k1="-0.1020" k2="-0.0797" k3="0.0384"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="2.37" k1="-0.0930" k2="-0.1109" k3="0.0599"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.1289" k2="-0.0699" k3="0.0489"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="0.4" k1="-0.7126" k2="1.0859" k3="-0.9096"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="0.79" k1="-0.6525" k2="0.8721" k3="-0.7779"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="2.37" k1="-0.6184" k2="0.7293" k3="-0.6707"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.5974" k2="0.6060" k3="-0.5678"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.4" k1="-0.2156" k2="0.2280" k3="-0.3906"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="0.79" k1="-0.2182" k2="0.1461" k3="-0.3395"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="2.37" k1="-0.2239" k2="0.1152" k3="-0.3041"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2302" k2="0.0877" k3="-0.2681"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.4" k1="-0.1737" k2="0.2570" k3="-0.2841"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="0.79" k1="-0.1750" k2="0.2572" k3="-0.3145"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="2.37" k1="-0.1811" k2="0.2072" k3="-0.2244"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2074" k2="0.2267" k3="-0.2155"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.4" k1="-0.0935" k2="-0.0624" k3="0.0205"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="0.79" k1="-0.0867" k2="-0.1024" k3="0.0497"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="2.37" k1="-0.1057" k2="-0.0858" k3="0.0538"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1501" k2="-0.0110" k3="0.0169"/>
-+            <vignetting model="pa" focal="70" aperture="29" distance="0.4" k1="-0.0724" k2="-0.1272" k3="0.0692"/>
-+            <vignetting model="pa" focal="70" aperture="29" distance="0.79" k1="-0.0722" k2="-0.1435" k3="0.0781"/>
-+            <vignetting model="pa" focal="70" aperture="29" distance="2.37" k1="-0.0963" k2="-0.1079" k3="0.0657"/>
-+            <vignetting model="pa" focal="70" aperture="29" distance="1000" k1="-0.1466" k2="-0.0219" k3="0.0228"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX Zoom-Nikkor 18-105mm f/3.5-5.6G ED VR</model>
-+        <model lang="en">Nikkor AF-S 18-105mm f/3.5-5.6G DX ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <focal min="18" max="105"/>
-+        <aperture min="3.5" max="22"/>
-         <type>rectilinear</type>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18.0" a="0.00529" b="-0.02091" c="-0.01697" />
--            <distortion model="ptlens" focal="25.0" a="0.01542" b="-0.03457" c="0.02371" />
--            <distortion model="ptlens" focal="35.0" a="0.00716" b="-0.00354" c="0.00352" />
--            <distortion model="ptlens" focal="50.0" a="0.00477" b="-0.00182" c="0.00982" />
--            <distortion model="ptlens" focal="75.0" a="-0.0024" b="0.02231" c="-0.01516" />
--            <distortion model="ptlens" focal="105.0" a="0.00392" b="-0.00253" c="0.01061" />
-+            <!-- Taken with Nikon D7100 -->
-+            <distortion model="ptlens" focal="18.0" a="0.02437" b="-0.06486" c="0.00154"/>
-+            <distortion model="ptlens" focal="24.0" a="0.01857" b="-0.03885" c="0.01733"/>
-+            <!-- The three following lines are older data, but verified.  -->
-+            <distortion model="ptlens" focal="35.0" a="0.00716" b="-0.00354" c="0.00352"/>
-+            <distortion model="ptlens" focal="50.0" a="0.00477" b="-0.00182" c="0.00982"/>
-+            <distortion model="ptlens" focal="75.0" a="-0.0024" b="0.02231" c="-0.01516"/>
-+            <distortion model="ptlens" focal="105.0" a="-0.00026" b="0.02117" c="-0.02621"/>
-+            <tca model="poly3" focal="18" br="0.0000278" vr="1.0005774" bb="-0.0000782" vb="1.0002245"/>
-+            <tca model="poly3" focal="24" br="0.0000228" vr="1.0003575" bb="-0.0000433" vb="1.0002590"/>
-+            <tca model="poly3" focal="35" br="-0.0000268" vr="1.0001459" bb="0.0000296" vb="1.0002736"/>
-+            <tca model="poly3" focal="50" br="-0.0000121" vr="0.9999792" bb="-0.0000053" vb="1.0002278"/>
-+            <tca model="poly3" focal="70" br="-0.0000235" vr="0.9998510" bb="-0.0000448" vb="1.0001296"/>
-+            <tca model="poly3" focal="105" br="0.0000014" vr="0.9996695" bb="-0.0000464" vb="0.9998467"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-1.0091" k2="1.4434" k3="-0.9751"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-1.0091" k2="1.4434" k3="-0.9751"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.8303" k2="1.0615" k3="-0.7330"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.8303" k2="1.0615" k3="-0.7330"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.3431" k2="0.1553" k3="-0.1979"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.3431" k2="0.1553" k3="-0.1979"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="10" k1="-0.3340" k2="0.4233" k3="-0.3763"/>
-+            <vignetting model="pa" focal="18" aperture="6.3" distance="1000" k1="-0.3340" k2="0.4233" k3="-0.3763"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3721" k2="0.4754" k3="-0.3399"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3721" k2="0.4754" k3="-0.3399"/>
-+            <vignetting model="pa" focal="24" aperture="3.8" distance="10" k1="-0.9580" k2="1.2701" k3="-0.7945"/>
-+            <vignetting model="pa" focal="24" aperture="3.8" distance="1000" k1="-0.9580" k2="1.2701" k3="-0.7945"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="10" k1="-0.4599" k2="0.2245" k3="-0.1597"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="1000" k1="-0.4599" k2="0.2245" k3="-0.1597"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.3495" k2="0.3652" k3="-0.2504"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.3495" k2="0.3652" k3="-0.2504"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.3566" k2="0.3075" k3="-0.1567"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.3566" k2="0.3075" k3="-0.1567"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.9253" k2="1.0357" k3="-0.5530"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.9253" k2="1.0357" k3="-0.5530"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.4737" k2="0.0943" k3="0.0128"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.4737" k2="0.0943" k3="0.0128"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.3521" k2="0.3061" k3="-0.1936"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.3521" k2="0.3061" k3="-0.1936"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3966" k2="0.4147" k3="-0.2308"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3966" k2="0.4147" k3="-0.2308"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.3908" k2="0.3623" k3="-0.1608"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.3908" k2="0.3623" k3="-0.1608"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.9333" k2="1.0885" k3="-0.6050"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.9333" k2="1.0885" k3="-0.6050"/>
-+            <vignetting model="pa" focal="50" aperture="6.3" distance="10" k1="-0.5051" k2="0.1895" k3="-0.0579"/>
-+            <vignetting model="pa" focal="50" aperture="6.3" distance="1000" k1="-0.5051" k2="0.1895" k3="-0.0579"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.4045" k2="0.4390" k3="-0.2713"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.4045" k2="0.4390" k3="-0.2713"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.4143" k2="0.4310" k3="-0.1988"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4143" k2="0.4310" k3="-0.1988"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.4299" k2="0.4566" k3="-0.2147"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.4299" k2="0.4566" k3="-0.2147"/>
-+            <vignetting model="pa" focal="70" aperture="5.3" distance="10" k1="-0.9031" k2="1.1685" k3="-0.7825"/>
-+            <vignetting model="pa" focal="70" aperture="5.3" distance="1000" k1="-0.9031" k2="1.1685" k3="-0.7825"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.6414" k2="0.6397" k3="-0.4576"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.6414" k2="0.6397" k3="-0.4576"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.3652" k2="0.3302" k3="-0.2938"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3652" k2="0.3302" k3="-0.2938"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.4345" k2="0.5964" k3="-0.3638"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.4345" k2="0.5964" k3="-0.3638"/>
-+            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.4377" k2="0.5434" k3="-0.2778"/>
-+            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.4377" k2="0.5434" k3="-0.2778"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.6245" k2="0.4078" k3="-0.3761"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.6245" k2="0.4078" k3="-0.3761"/>
-+            <vignetting model="pa" focal="105" aperture="7.1" distance="10" k1="-0.2826" k2="-0.0908" k3="-0.1252"/>
-+            <vignetting model="pa" focal="105" aperture="7.1" distance="1000" k1="-0.2826" k2="-0.0908" k3="-0.1252"/>
-+            <vignetting model="pa" focal="105" aperture="9" distance="10" k1="-0.2430" k2="0.4217" k3="-0.4383"/>
-+            <vignetting model="pa" focal="105" aperture="9" distance="1000" k1="-0.2430" k2="0.4217" k3="-0.4383"/>
-+            <vignetting model="pa" focal="105" aperture="36" distance="10" k1="-0.2340" k2="0.1934" k3="-0.0849"/>
-+            <vignetting model="pa" focal="105" aperture="36" distance="1000" k1="-0.2340" k2="0.1934" k3="-0.0849"/>
-         </calibration>
--    </lens>    
--
-+    </lens>
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 18-135mm f/3.5-5.6G IF-ED AF-S DX</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 18-135mm f/3.5-5.6G DX IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.010516" b="-0.033415" c="0.000000" />
--            <distortion model="ptlens" focal="20" a="0.013430" b="-0.028560" c="0.000000" />
--            <distortion model="ptlens" focal="28" a="0.010740" b="-0.007090" c="0.000000" />
--            <distortion model="ptlens" focal="32" a="0.000000" b="0.013840" c="0.002600" />
--            <distortion model="ptlens" focal="40" a="0.000000" b="0.022370" c="-0.026420" />
--            <distortion model="ptlens" focal="48" a="0.000000" b="-0.006420" c="0.019040" />
--            <distortion model="ptlens" focal="58" a="0.000000" b="0.023710" c="-0.031210" />
--            <distortion model="ptlens" focal="85" a="0.000000" b="0.010900" c="-0.007660" />
--            <distortion model="ptlens" focal="105" a="0.000000" b="-0.000450" c="0.013550" />
--            <distortion model="ptlens" focal="135" a="0.000000" b="0.027500" c="-0.043800" />
-+            <distortion model="ptlens" focal="18" a="0.010516" b="-0.033415" c="0.000000"/>
-+            <distortion model="ptlens" focal="20" a="0.013430" b="-0.028560" c="0.000000"/>
-+            <distortion model="ptlens" focal="28" a="0.010740" b="-0.007090" c="0.000000"/>
-+            <distortion model="ptlens" focal="32" a="0.000000" b="0.013840" c="0.002600"/>
-+            <distortion model="ptlens" focal="40" a="0.000000" b="0.022370" c="-0.026420"/>
-+            <distortion model="ptlens" focal="48" a="0.000000" b="-0.006420" c="0.019040"/>
-+            <distortion model="ptlens" focal="58" a="0.000000" b="0.023710" c="-0.031210"/>
-+            <distortion model="ptlens" focal="85" a="0.000000" b="0.010900" c="-0.007660"/>
-+            <distortion model="ptlens" focal="105" a="0.000000" b="-0.000450" c="0.013550"/>
-+            <distortion model="ptlens" focal="135" a="0.000000" b="0.027500" c="-0.043800"/>
-+            <!-- Taken with Nikon D90 -->
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.45" k1="-0.4366" k2="-0.0049" k3="-0.2457"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.71" k1="-0.4287" k2="0.0020" k3="-0.2360"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1.5" k1="-0.4170" k2="-0.0228" k3="-0.2076"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4253" k2="-0.0042" k3="-0.2041"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="0.45" k1="-0.4965" k2="0.3730" k3="-0.5047"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="0.71" k1="-0.4959" k2="0.3644" k3="-0.4743"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1.5" k1="-0.4869" k2="0.3357" k3="-0.4391"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.4808" k2="0.3155" k3="-0.4083"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.45" k1="-0.5745" k2="0.6838" k3="-0.6216"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.71" k1="-0.5509" k2="0.6087" k3="-0.5407"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.5414" k2="0.5667" k3="-0.4991"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.5276" k2="0.5202" k3="-0.4522"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.45" k1="-0.5202" k2="0.4010" k3="-0.2697"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.71" k1="-0.5014" k2="0.3504" k3="-0.2217"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.5043" k2="0.3744" k3="-0.2431"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4890" k2="0.3444" k3="-0.2203"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.45" k1="-0.4895" k2="0.2941" k3="-0.1764"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.71" k1="-0.4800" k2="0.2827" k3="-0.1659"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1.5" k1="-0.4777" k2="0.2805" k3="-0.1619"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4801" k2="0.2996" k3="-0.1751"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="0.45" k1="-0.4959" k2="0.3079" k3="-0.1857"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="0.71" k1="-0.4825" k2="0.2874" k3="-0.1697"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1.5" k1="-0.4818" k2="0.2931" k3="-0.1724"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.4770" k2="0.2926" k3="-0.1721"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.45" k1="-0.4837" k2="0.2803" k3="-0.1696"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.71" k1="-0.4913" k2="0.3040" k3="-0.1793"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.4888" k2="0.3092" k3="-0.1827"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4857" k2="0.3092" k3="-0.1816"/>
-+            <vignetting model="pa" focal="26" aperture="3.8" distance="0.45" k1="-0.4366" k2="0.2064" k3="-0.1915"/>
-+            <vignetting model="pa" focal="26" aperture="3.8" distance="0.71" k1="-0.4641" k2="0.3208" k3="-0.2908"/>
-+            <vignetting model="pa" focal="26" aperture="3.8" distance="1.5" k1="-0.4639" k2="0.3514" k3="-0.3301"/>
-+            <vignetting model="pa" focal="26" aperture="3.8" distance="1000" k1="-0.4925" k2="0.4459" k3="-0.4118"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="0.45" k1="-0.4089" k2="0.3393" k3="-0.2456"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="0.71" k1="-0.4066" k2="0.3478" k3="-0.2564"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="1.5" k1="-0.4054" k2="0.3524" k3="-0.2636"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.4378" k2="0.4454" k3="-0.3543"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="0.45" k1="-0.3831" k2="0.2275" k3="-0.1195"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="0.71" k1="-0.3798" k2="0.2247" k3="-0.1172"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1.5" k1="-0.3711" k2="0.2064" k3="-0.1039"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.3665" k2="0.1963" k3="-0.0959"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="0.45" k1="-0.3761" k2="0.2091" k3="-0.1074"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="0.71" k1="-0.3661" k2="0.1927" k3="-0.0969"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="1.5" k1="-0.3619" k2="0.1819" k3="-0.0871"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.3590" k2="0.1767" k3="-0.0831"/>
-+            <vignetting model="pa" focal="26" aperture="16" distance="0.45" k1="-0.3707" k2="0.2019" k3="-0.1071"/>
-+            <vignetting model="pa" focal="26" aperture="16" distance="0.71" k1="-0.3602" k2="0.1832" k3="-0.0946"/>
-+            <vignetting model="pa" focal="26" aperture="16" distance="1.5" k1="-0.3565" k2="0.1744" k3="-0.0861"/>
-+            <vignetting model="pa" focal="26" aperture="16" distance="1000" k1="-0.3573" k2="0.1757" k3="-0.0854"/>
-+            <vignetting model="pa" focal="26" aperture="25" distance="0.45" k1="-0.3674" k2="0.1951" k3="-0.1017"/>
-+            <vignetting model="pa" focal="26" aperture="25" distance="0.71" k1="-0.3704" k2="0.2060" k3="-0.1089"/>
-+            <vignetting model="pa" focal="26" aperture="25" distance="1.5" k1="-0.3583" k2="0.1795" k3="-0.0905"/>
-+            <vignetting model="pa" focal="26" aperture="25" distance="1000" k1="-0.3637" k2="0.1904" k3="-0.0967"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="0.45" k1="-0.3856" k2="0.1782" k3="-0.1326"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="0.71" k1="-0.3996" k2="0.2618" k3="-0.2199"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="1.5" k1="-0.4123" k2="0.3223" k3="-0.2810"/>
-+            <vignetting model="pa" focal="38" aperture="4.5" distance="1000" k1="-0.4247" k2="0.3757" k3="-0.3386"/>
-+            <vignetting model="pa" focal="38" aperture="5.6" distance="0.45" k1="-0.2895" k2="0.1122" k3="-0.1003"/>
-+            <vignetting model="pa" focal="38" aperture="5.6" distance="0.71" k1="-0.3036" k2="0.1829" k3="-0.1666"/>
-+            <vignetting model="pa" focal="38" aperture="5.6" distance="1.5" k1="-0.3144" k2="0.2345" k3="-0.2175"/>
-+            <vignetting model="pa" focal="38" aperture="5.6" distance="1000" k1="-0.3075" k2="0.2209" k3="-0.2343"/>
-+            <vignetting model="pa" focal="38" aperture="8" distance="0.45" k1="-0.2597" k2="0.0939" k3="-0.0296"/>
-+            <vignetting model="pa" focal="38" aperture="8" distance="0.71" k1="-0.2614" k2="0.1005" k3="-0.0339"/>
-+            <vignetting model="pa" focal="38" aperture="8" distance="1.5" k1="-0.2532" k2="0.0878" k3="-0.0291"/>
-+            <vignetting model="pa" focal="38" aperture="8" distance="1000" k1="-0.2621" k2="0.1126" k3="-0.0462"/>
-+            <vignetting model="pa" focal="38" aperture="11" distance="0.45" k1="-0.2560" k2="0.0849" k3="-0.0246"/>
-+            <vignetting model="pa" focal="38" aperture="11" distance="0.71" k1="-0.2540" k2="0.0847" k3="-0.0253"/>
-+            <vignetting model="pa" focal="38" aperture="11" distance="1.5" k1="-0.2515" k2="0.0801" k3="-0.0230"/>
-+            <vignetting model="pa" focal="38" aperture="11" distance="1000" k1="-0.2477" k2="0.0757" k3="-0.0219"/>
-+            <vignetting model="pa" focal="38" aperture="16" distance="0.45" k1="-0.2596" k2="0.0949" k3="-0.0315"/>
-+            <vignetting model="pa" focal="38" aperture="16" distance="0.71" k1="-0.2437" k2="0.0601" k3="-0.0106"/>
-+            <vignetting model="pa" focal="38" aperture="16" distance="1.5" k1="-0.2499" k2="0.0760" k3="-0.0210"/>
-+            <vignetting model="pa" focal="38" aperture="16" distance="1000" k1="-0.2532" k2="0.0844" k3="-0.0264"/>
-+            <vignetting model="pa" focal="38" aperture="22" distance="0.45" k1="-0.2408" k2="0.0534" k3="-0.0081"/>
-+            <vignetting model="pa" focal="38" aperture="22" distance="0.71" k1="-0.2565" k2="0.0860" k3="-0.0260"/>
-+            <vignetting model="pa" focal="38" aperture="22" distance="1.5" k1="-0.2311" k2="0.0264" k3="0.0110"/>
-+            <vignetting model="pa" focal="38" aperture="22" distance="1000" k1="-0.2338" k2="0.0366" k3="0.0031"/>
-+            <vignetting model="pa" focal="38" aperture="29" distance="0.45" k1="-0.2610" k2="0.0949" k3="-0.0325"/>
-+            <vignetting model="pa" focal="38" aperture="29" distance="0.71" k1="-0.2468" k2="0.0662" k3="-0.0160"/>
-+            <vignetting model="pa" focal="38" aperture="29" distance="1.5" k1="-0.2422" k2="0.0578" k3="-0.0115"/>
-+            <vignetting model="pa" focal="38" aperture="29" distance="1000" k1="-0.2399" k2="0.0603" k3="-0.0153"/>
-+            <vignetting model="pa" focal="66" aperture="5.3" distance="0.45" k1="-0.2802" k2="-0.0066" k3="-0.0074"/>
-+            <vignetting model="pa" focal="66" aperture="5.3" distance="0.71" k1="-0.2908" k2="0.0716" k3="-0.0906"/>
-+            <vignetting model="pa" focal="66" aperture="5.3" distance="1.5" k1="-0.3092" k2="0.1425" k3="-0.1618"/>
-+            <vignetting model="pa" focal="66" aperture="5.3" distance="1000" k1="-0.2987" k2="0.1582" k3="-0.2062"/>
-+            <vignetting model="pa" focal="66" aperture="8" distance="0.45" k1="-0.1504" k2="0.0195" k3="-0.0373"/>
-+            <vignetting model="pa" focal="66" aperture="8" distance="0.71" k1="-0.1533" k2="0.0401" k3="-0.0567"/>
-+            <vignetting model="pa" focal="66" aperture="8" distance="1.5" k1="-0.1651" k2="0.0949" k3="-0.1072"/>
-+            <vignetting model="pa" focal="66" aperture="8" distance="1000" k1="-0.1654" k2="0.1009" k3="-0.1125"/>
-+            <vignetting model="pa" focal="66" aperture="11" distance="0.45" k1="-0.1931" k2="0.0992" k3="-0.0485"/>
-+            <vignetting model="pa" focal="66" aperture="11" distance="0.71" k1="-0.1904" k2="0.0986" k3="-0.0489"/>
-+            <vignetting model="pa" focal="66" aperture="11" distance="1.5" k1="-0.1810" k2="0.0857" k3="-0.0430"/>
-+            <vignetting model="pa" focal="66" aperture="11" distance="1000" k1="-0.1753" k2="0.0782" k3="-0.0393"/>
-+            <vignetting model="pa" focal="66" aperture="16" distance="0.45" k1="-0.1653" k2="0.0450" k3="-0.0181"/>
-+            <vignetting model="pa" focal="66" aperture="16" distance="0.71" k1="-0.1663" k2="0.0519" k3="-0.0226"/>
-+            <vignetting model="pa" focal="66" aperture="16" distance="1.5" k1="-0.1718" k2="0.0691" k3="-0.0341"/>
-+            <vignetting model="pa" focal="66" aperture="16" distance="1000" k1="-0.1698" k2="0.0691" k3="-0.0344"/>
-+            <vignetting model="pa" focal="66" aperture="22" distance="0.45" k1="-0.1773" k2="0.0786" k3="-0.0425"/>
-+            <vignetting model="pa" focal="66" aperture="22" distance="0.71" k1="-0.1685" k2="0.0545" k3="-0.0248"/>
-+            <vignetting model="pa" focal="66" aperture="22" distance="1.5" k1="-0.1648" k2="0.0477" k3="-0.0199"/>
-+            <vignetting model="pa" focal="66" aperture="22" distance="1000" k1="-0.1579" k2="0.0485" k3="-0.0257"/>
-+            <vignetting model="pa" focal="66" aperture="32" distance="0.45" k1="-0.1532" k2="0.0243" k3="-0.0114"/>
-+            <vignetting model="pa" focal="66" aperture="32" distance="0.71" k1="-0.1527" k2="0.0276" k3="-0.0137"/>
-+            <vignetting model="pa" focal="66" aperture="32" distance="1.5" k1="-0.1678" k2="0.0570" k3="-0.0272"/>
-+            <vignetting model="pa" focal="66" aperture="32" distance="1000" k1="-0.1724" k2="0.0821" k3="-0.0470"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="0.45" k1="-0.4546" k2="0.6941" k3="-0.8142"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="0.71" k1="-0.2959" k2="0.1212" k3="-0.3940"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1.5" k1="-0.1503" k2="-0.4542" k3="0.0444"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0539" k2="-1.0715" k3="0.5786"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="0.45" k1="-0.2950" k2="0.7893" k3="-0.9211"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="0.71" k1="-0.2589" k2="0.6613" k3="-0.7979"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1.5" k1="-0.1785" k2="0.4243" k3="-0.6086"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0296" k2="-0.1668" k3="-0.1797"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="0.45" k1="-0.3331" k2="0.8486" k3="-0.7755"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="0.71" k1="-0.3010" k2="0.6949" k3="-0.6338"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1.5" k1="-0.2568" k2="0.5724" k3="-0.5355"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.2196" k2="0.4151" k3="-0.3985"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="0.45" k1="-0.2619" k2="0.5253" k3="-0.4588"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="0.71" k1="-0.1872" k2="0.2860" k3="-0.2475"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1.5" k1="-0.1509" k2="0.1545" k3="-0.1294"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1263" k2="0.0668" k3="-0.0490"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="0.45" k1="-0.1560" k2="0.1344" k3="-0.1057"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="0.71" k1="-0.1220" k2="0.0327" k3="-0.0202"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1.5" k1="-0.1362" k2="0.0546" k3="-0.0252"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1347" k2="0.0732" k3="-0.0427"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="0.45" k1="-0.1322" k2="0.0409" k3="-0.0217"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="0.71" k1="-0.1412" k2="0.0646" k3="-0.0332"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1.5" k1="-0.1226" k2="0.0278" k3="-0.0134"/>
-+            <vignetting model="pa" focal="135" aperture="32" distance="1000" k1="-0.1261" k2="0.0423" k3="-0.0225"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- Also update copy at "Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II" below. -->
-         <maker>Nikon</maker>
--        <model>Nikkor 18-200mm f/3.5-5.6 G ED-IF AF-S VR DX</model>
-+        <model>Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 18-200mm f/3.5-5.6G DX VR IF-ED</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.017598" b="-0.049569" c="0" />
--            <distortion model="ptlens" focal="20" a="0.013846" b="-0.036284" c="0" />
--            <distortion model="ptlens" focal="26" a="0.014876" b="-0.023039" c="0" />
--            <distortion model="ptlens" focal="34" a="0.008669" b="-0.007258" c="0" />
--            <distortion model="ptlens" focal="38" a="0" b="0.012308" c="0" />
--            <distortion model="ptlens" focal="44" a="0" b="0.012651" c="0" />
--            <distortion model="ptlens" focal="56" a="0" b="0.010344" c="0" />
--            <distortion model="ptlens" focal="65" a="0" b="0.011336" c="0" />
--            <distortion model="ptlens" focal="82" a="0" b="0.009171" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.010009" c="0" />
--            <distortion model="ptlens" focal="130" a="0" b="0.007883" c="0" />
--            <distortion model="ptlens" focal="170" a="0" b="0.00648" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.005237" c="0" />
-+            <!-- Taken with Nikon D610 -->
-+            <distortion model="ptlens" focal="18" a="0.03144" b="-0.10111" c="0.07201"/>
-+            <distortion model="ptlens" focal="22" a="0.02892" b="-0.08487" c="0.0628"/>
-+            <distortion model="ptlens" focal="24" a="0.02181" b="-0.05683" c="0.04436"/>
-+            <distortion model="ptlens" focal="28" a="0.02153" b="-0.05332" c="0.05183"/>
-+            <distortion model="ptlens" focal="35" a="0.01273" b="-0.02637" c="0.03572"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.01185" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.00843" c="0"/>
-+            <distortion model="ptlens" focal="170" a="0" b="0.00678" c="0"/>
-+            <distortion model="ptlens" focal="200" a="-0.00506" b="0.01451" c="0.00917"/>
-+            <tca model="poly3" focal="18" br="0.0000478" vr="1.0002822" bb="-0.0000268" vb="1.0001601"/>
-+            <tca model="poly3" focal="22" br="0.0000328" vr="1.0002660" bb="-0.0000361" vb="1.0001878"/>
-+            <tca model="poly3" focal="24" br="-0.0000377" vr="1.0002759" bb="-0.0000243" vb="1.0001775"/>
-+            <tca model="poly3" focal="28" br="0.0000072" vr="1.0001592" bb="0.0000002" vb="1.0001560"/>
-+            <tca model="poly3" focal="35" br="0.0000070" vr="1.0000994" bb="-0.0000475" vb="1.0002158"/>
-+            <tca model="poly3" focal="70" br="0.0000121" vr="1.0000494" bb="-0.0000422" vb="1.0001103"/>
-+            <tca model="poly3" focal="135" br="0.0000062" vr="0.9998629" bb="0.0000084" vb="0.9998582"/>
-+            <tca model="poly3" focal="170" br="0.0000074" vr="0.9999426" bb="0.0000855" vb="0.9995827"/>
-+            <tca model="poly3" focal="200" br="-0.0000064" vr="0.9999083" bb="0.0000246" vb="0.9996926"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- Also update copy at "Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED" above. -->
-         <maker>Nikon</maker>
--        <model>Nikkor 24-50mm f/3.3-4.5D Ai AF</model>
-+        <model>Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II</model>
-+        <model lang="en">Nikkor AF-S 18-200mm f/3.5-5.6G DX VR IF-ED II</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0" b="-0.010413" c="0" />
--            <distortion model="ptlens" focal="29" a="0" b="-0.006777" c="0" />
--            <distortion model="ptlens" focal="38" a="0" b="-0.003447" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="-0.003329" c="0" />
-+            <!-- Taken with Nikon D610 -->
-+            <distortion model="ptlens" focal="18" a="0.03144" b="-0.10111" c="0.07201"/>
-+            <distortion model="ptlens" focal="22" a="0.02892" b="-0.08487" c="0.0628"/>
-+            <distortion model="ptlens" focal="24" a="0.02181" b="-0.05683" c="0.04436"/>
-+            <distortion model="ptlens" focal="28" a="0.02153" b="-0.05332" c="0.05183"/>
-+            <distortion model="ptlens" focal="35" a="0.01273" b="-0.02637" c="0.03572"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.01185" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.00843" c="0"/>
-+            <distortion model="ptlens" focal="170" a="0" b="0.00678" c="0"/>
-+            <distortion model="ptlens" focal="200" a="-0.00506" b="0.01451" c="0.00917"/>
-+            <tca model="poly3" focal="18" br="0.0000478" vr="1.0002822" bb="-0.0000268" vb="1.0001601"/>
-+            <tca model="poly3" focal="22" br="0.0000328" vr="1.0002660" bb="-0.0000361" vb="1.0001878"/>
-+            <tca model="poly3" focal="24" br="-0.0000377" vr="1.0002759" bb="-0.0000243" vb="1.0001775"/>
-+            <tca model="poly3" focal="28" br="0.0000072" vr="1.0001592" bb="0.0000002" vb="1.0001560"/>
-+            <tca model="poly3" focal="35" br="0.0000070" vr="1.0000994" bb="-0.0000475" vb="1.0002158"/>
-+            <tca model="poly3" focal="70" br="0.0000121" vr="1.0000494" bb="-0.0000422" vb="1.0001103"/>
-+            <tca model="poly3" focal="135" br="0.0000062" vr="0.9998629" bb="0.0000084" vb="0.9998582"/>
-+            <tca model="poly3" focal="170" br="0.0000074" vr="0.9999426" bb="0.0000855" vb="0.9995827"/>
-+            <tca model="poly3" focal="200" br="-0.0000064" vr="0.9999083" bb="0.0000246" vb="0.9996926"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24-85mm f/2.8-4.0D AF</model>
-+        <model>Nikon AF Zoom-Nikkor 24-50mm f/3.3-4.5D</model>
-+        <model lang="en">Nikkor AF 24-50mm f/3.3-4.5D</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.005" b="-0.022" c="0" />
--            <distortion model="ptlens" focal="28" a="0.004" b="-0.015" c="0" />
--            <distortion model="ptlens" focal="35" a="0.0008" b="-0.0025" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.0025" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.004" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.004" c="0" />
-+            <distortion model="poly3" focal="24" k1="-0.010413"/>
-+            <distortion model="poly3" focal="29" k1="-0.006777"/>
-+            <distortion model="poly3" focal="38" k1="-0.003447"/>
-+            <distortion model="poly3" focal="50" k1="-0.003329"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24-85mm f/3.5-4.5G ED-IF AF-S</model>
-+        <model>Nikon AF Zoom-Nikkor 24-85mm f/2.8-4D IF</model>
-+        <model lang="en">Nikkor AF 24-85mm f/2.8-4D IF</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.023939" b="-0.061462" c="0" />
--            <distortion model="ptlens" focal="35" a="0.013898" b="-0.018385" c="0" />
--            <distortion model="ptlens" focal="52" a="0.00715" b="-0.000592" c="0" />
--            <distortion model="ptlens" focal="70" a="0.003769" b="0.007774" c="0" />
--            <distortion model="ptlens" focal="85" a="0.003412" b="0.0089" c="0" />
-+            <!-- Taken with Nikon D700 -->
-+            <distortion model="ptlens" focal="24" a="0.07" b="-0.19609" c="0.12989"/>
-+            <distortion model="ptlens" focal="28" a="0.05574" b="-0.15106" c="0.10719"/>
-+            <distortion model="ptlens" focal="35" a="0.02315" b="-0.05159" c="0.03497"/>
-+            <distortion model="ptlens" focal="50" a="0.03875" b="-0.1185" c="0.13239"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.01224" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0.01293" b="-0.03888" c="0.06945"/>
-+            <tca model="poly3" focal="24" br="0.0001551" vr="1.0000830" bb="-0.0002466" vb="1.0004527"/>
-+            <tca model="poly3" focal="26" br="0.0001998" vr="0.9999858" bb="-0.0001978" vb="1.0003660"/>
-+            <tca model="poly3" focal="28" br="0.0002641" vr="0.9998895" bb="-0.0002754" vb="1.0005002"/>
-+            <tca model="poly3" focal="35" br="0.0000829" vr="0.9999597" bb="-0.0001594" vb="1.0003188"/>
-+            <tca model="poly3" focal="50" br="0.0000425" vr="0.9999190" bb="-0.0000953" vb="1.0002240"/>
-+            <tca model="poly3" focal="70" br="0.0000382" vr="0.9998777" bb="-0.0000390" vb="1.0000807"/>
-+            <tca model="poly3" focal="85" br="0.0000388" vr="0.9998218" bb="-0.0000124" vb="1.0000196"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24-120mm f/3.5-5.6G ED-IF AF-S VR</model>
-+        <model>Nikon AF Zoom-Nikkor 24-85mm f/2.8-4D IF</model>
-+        <model lang="en">Nikkor AF 24-85mm f/2.8-4D IF</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.004393" b="-0.01801" c="0" />
--            <distortion model="ptlens" focal="29" a="0" b="-0.003796" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0.002203" c="0" />
--            <distortion model="ptlens" focal="52" a="0" b="0.005193" c="0" />
--            <distortion model="ptlens" focal="62" a="0" b="0.005274" c="0" />
--            <distortion model="ptlens" focal="75" a="0" b="0.00512" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.005317" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.00562" c="0" />
--            <distortion model="ptlens" focal="120" a="0" b="0.005123" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.005" b="-0.022" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.004" b="-0.015" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.0008" b="-0.0025" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.0025" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.004" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0" b="0.004" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 28-200mm f/3.5-5.6G ED-IF AF</model>
-+        <model>Nikon AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 24-85mm f/3.5-4.5G IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="24" a="0.023939" b="-0.061462" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.013898" b="-0.018385" c="0"/>
-+            <distortion model="ptlens" focal="52" a="0.00715" b="-0.000592" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0.003769" b="0.007774" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0.003412" b="0.0089" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 24-120mm f/3.5-5.6G VR IF-ED</model>
-+        <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="-0.005311" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.004112" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.006691" c="0" />
--            <distortion model="ptlens" focal="90" a="0" b="0.007929" c="0" />
--            <distortion model="ptlens" focal="125" a="0" b="0.007482" c="0" />
--            <distortion model="ptlens" focal="150" a="0" b="0.007459" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.007103" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.004393" b="-0.01801" c="0"/>
-+            <distortion model="ptlens" focal="29" a="0" b="-0.003796" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.002203" c="0"/>
-+            <distortion model="ptlens" focal="52" a="0" b="0.005193" c="0"/>
-+            <distortion model="ptlens" focal="62" a="0" b="0.005274" c="0"/>
-+            <distortion model="ptlens" focal="75" a="0" b="0.00512" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0" b="0.005317" c="0"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.00562" c="0"/>
-+            <distortion model="ptlens" focal="120" a="0" b="0.005123" c="0"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 28-300mm f/3.5-5.6G ED VR AF-S</model>
-+        <model>Nikon AF-S Nikkor 24-120mm f/4G ED VR</model>
-+        <model lang="en">Nikkor AF-S 24-120mm f/4G ED VR</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="-0.02406" c="0" />
--            <distortion model="ptlens" focal="32" a="0" b="-0.01294" c="0" />
--            <distortion model="ptlens" focal="34" a="0" b="-0.00517" c="0" />
--            <distortion model="ptlens" focal="36" a="0" b="-0.00147" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.00848" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.01241" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.01124" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.00807" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.00904" c="0" />
-+            <!-- Taken with Nikon D700 -->
-+            <distortion model="ptlens" focal="24" a="0.01497" b="-0.04816" c="0.01104"/>
-+            <distortion model="ptlens" focal="28" a="0.01614" b="-0.04771" c="0.04039"/>
-+            <distortion model="ptlens" focal="35" a="0.01013" b="-0.0181" c="0.02252"/>
-+            <distortion model="ptlens" focal="50" a="-0.00625" b="0.05219" c="-0.06038"/>
-+            <distortion model="ptlens" focal="85" a="0.00892" b="-0.00361" c="0.00588"/>
-+            <distortion model="ptlens" focal="120" a="0.00886" b="-0.01374" c="0.02566"/>
-+            <tca model="poly3" focal="24" br="-0.0000026" vr="1.0004833" bb="0.0000117" vb="1.0000751"/>
-+            <tca model="poly3" focal="28" br="0.0000002" vr="1.0004185" bb="-0.0000181" vb="1.0001370"/>
-+            <tca model="poly3" focal="35" br="0.0000152" vr="1.0002567" bb="-0.0000347" vb="1.0001667"/>
-+            <tca model="poly3" focal="50" br="-0.0000101" vr="1.0001043" bb="-0.0000518" vb="1.0001772"/>
-+            <tca model="poly3" focal="85" br="0.0000209" vr="0.9998799" bb="-0.0000182" vb="0.9999789"/>
-+            <tca model="poly3" focal="120" br="-0.0000034" vr="0.9997514" bb="0.0000435" vb="0.9998576"/>
-         </calibration>
--    </lens>    
--
-+    </lens>
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 35-70mm f/2.8D AF</model>
-+        <model>Nikon AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF 28-200mm f/3.5-5.6G IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0" b="-0.005179" c="0" />
--            <distortion model="ptlens" focal="39" a="0" b="-0.003271" c="0" />
--            <distortion model="ptlens" focal="44" a="0" b="-0.001363" c="0" />
--            <distortion model="ptlens" focal="52" a="0" b="0.002606" c="0" />
--            <distortion model="ptlens" focal="62" a="0" b="0.002756" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.003679" c="0" />
-+            <distortion model="poly3" focal="28" k1="-0.005311"/>
-+            <distortion model="poly3" focal="35" k1="0"/>
-+            <distortion model="poly3" focal="50" k1="0.004112"/>
-+            <distortion model="poly3" focal="70" k1="0.006691"/>
-+            <distortion model="poly3" focal="90" k1="0.007929"/>
-+            <distortion model="poly3" focal="125" k1="0.007482"/>
-+            <distortion model="poly3" focal="150" k1="0.007459"/>
-+            <distortion model="poly3" focal="200" k1="0.007103"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 50-135mm f/3.5 AI-S</model>
-+        <model>Nikon AF-S Zoom-Nikkor 28-300mm f/3.5-5.6G ED VR</model>
-+        <model lang="en">Nikkor AF-S 28-300mm f/3.5-5.6G ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="ptlens" focal="28" a="0.02437" b="-0.07944" c="0.03221"/>
-+            <distortion model="ptlens" focal="32" a="0.02279" b="-0.05938" c="0.02075"/>
-+            <distortion model="ptlens" focal="35" a="0.02285" b="-0.05351" c="0.02656"/>
-+            <distortion model="ptlens" focal="50" a="0.00822" b="-0.00508" c="0.01128"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.01364" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.01154" c="0"/>
-+            <tca model="poly3" focal="28" br="-0.0000975" vr="1.0006202" bb="0.0001084" vb="0.9999783"/>
-+            <tca model="poly3" focal="32" br="-0.0000959" vr="1.0005671" bb="0.0000886" vb="1.0000226"/>
-+            <tca model="poly3" focal="35" br="-0.0000971" vr="1.0004956" bb="0.0000702" vb="1.0000984"/>
-+            <tca model="poly3" focal="50" br="-0.0000442" vr="1.0001869" bb="0.0000512" vb="1.0001978"/>
-+            <tca model="poly3" focal="135" br="0.0000755" vr="0.9997563" bb="-0.0000986" vb="1.0002884"/>
-+            <tca model="poly3" focal="300" br="-0.0000196" vr="0.9998476" bb="-0.0000967" vb="0.9999651"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Zoom-Nikkor 35-70mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 35-70mm f/2.8D</model>
-+        <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="35" k1="-0.005179"/>
-+            <distortion model="poly3" focal="39" k1="-0.003271"/>
-+            <distortion model="poly3" focal="44" k1="-0.001363"/>
-+            <distortion model="poly3" focal="52" k1="0.002606"/>
-+            <distortion model="poly3" focal="62" k1="0.002756"/>
-+            <distortion model="poly3" focal="70" k1="0.003679"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Zoom-Nikkor 50-135mm f/3.5</model>
-+        <model lang="en">Nikkor AI-S 50-135mm f/3.5</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.0045" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.002" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.004" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.0045"/>
-+            <distortion model="poly3" focal="85" k1="0.002"/>
-+            <distortion model="poly3" focal="135" k1="0.004"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 55-200mm f/4-5.6 G ED AF-S DX</model>
-+        <model>Nikon AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED</model>
-+        <model lang="en">Nikkor AF-S 55-200mm f/4-5.6G DX ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="55" a="0" b="-0.000404" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.004874" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.00919" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.010207" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.010639" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.008208" c="0" />
-+            <distortion model="poly3" focal="55" k1="-0.000404"/>
-+            <distortion model="poly3" focal="70" k1="0.004874"/>
-+            <distortion model="poly3" focal="85" k1="0.00919"/>
-+            <distortion model="poly3" focal="105" k1="0.010207"/>
-+            <distortion model="poly3" focal="135" k1="0.010639"/>
-+            <distortion model="poly3" focal="200" k1="0.008208"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 70-180mm f/4.5-5.6 ED-AF-D Micro</model>
-+        <model>Nikon AF Zoom-Nikkor 70-180mm f/4.5-5.6D ED Micro</model>
-+        <model lang="en">Nikkor AF 70-180mm f/4.5-5.6D ED Micro</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.0012" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.002" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.0025" c="0" />
--            <distortion model="ptlens" focal="180" a="0" b="0.0025" c="0" />
-+            <distortion model="poly3" focal="70" k1="0"/>
-+            <distortion model="poly3" focal="85" k1="0.0012"/>
-+            <distortion model="poly3" focal="105" k1="0.002"/>
-+            <distortion model="poly3" focal="135" k1="0.0025"/>
-+            <distortion model="poly3" focal="180" k1="0.0025"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 70-200mm f/2.8G ED-IF AF-S VR</model>
-+        <model>Nikon AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 70-200mm f/2.8G VR IF-ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.004652" c="0" />
--            <distortion model="ptlens" focal="80" a="0" b="-0.003298" c="0" />
--            <distortion model="ptlens" focal="90" a="0" b="-0.001805" c="0" />
--            <distortion model="ptlens" focal="120" a="0" b="0.001192" c="0" />
--            <distortion model="ptlens" focal="175" a="0" b="0.003465" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.003092" c="0" />
-+            <distortion model="poly3" focal="70" k1="-0.004652"/>
-+            <distortion model="poly3" focal="80" k1="-0.003298"/>
-+            <distortion model="poly3" focal="90" k1="-0.001805"/>
-+            <distortion model="poly3" focal="120" k1="0.001192"/>
-+            <distortion model="poly3" focal="175" k1="0.003465"/>
-+            <distortion model="poly3" focal="200" k1="0.003092"/>
-+            <!-- Taken with Nikon D200 -->
-+            <tca model="poly3" focal="70" br="-0.0000139" vr="1.0005016" bb="0.0000440" vb="0.9999365"/>
-+            <tca model="poly3" focal="105" br="-0.0000755" vr="1.0004989" bb="0.0000212" vb="0.9997837"/>
-+            <tca model="poly3" focal="200" br="-0.0000333" vr="1.0000038" bb="-0.0000116" vb="0.9998885"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.1548" k2="-0.0576" k3="0.0691"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.1548" k2="-0.0576" k3="0.0691"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0502" k2="-0.0086" k3="0.0318"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0502" k2="-0.0086" k3="0.0318"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0752" k2="0.0601" k3="-0.0098"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0752" k2="0.0601" k3="-0.0098"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0222" k2="-0.0378" k3="0.0339"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0222" k2="-0.0378" k3="0.0339"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.0779" k2="0.0479" k3="0.0008"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0779" k2="0.0479" k3="0.0008"/>
-+            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.0812" k2="-0.2020" k3="0.1569"/>
-+            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.0812" k2="-0.2020" k3="0.1569"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0804" k2="0.0396" k3="0.0114"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0804" k2="0.0396" k3="0.0114"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.0623" k2="-0.0287" k3="0.0571"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.0623" k2="-0.0287" k3="0.0571"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0873" k2="0.0007" k3="0.0506"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0873" k2="0.0007" k3="0.0506"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.0870" k2="0.0578" k3="-0.0007"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.0870" k2="0.0578" k3="-0.0007"/>
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-0.0805" k2="-0.0846" k3="0.0237"/>
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-0.0805" k2="-0.0846" k3="0.0237"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.0399" k2="-0.0181" k3="0.0355"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.0399" k2="-0.0181" k3="0.0355"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0396" k2="-0.0572" k3="0.0756"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0396" k2="-0.0572" k3="0.0756"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0297" k2="-0.1049" k3="0.1044"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0297" k2="-0.1049" k3="0.1044"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.1020" k2="0.0707" k3="-0.0067"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.1020" k2="0.0707" k3="-0.0067"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="0.0145" k2="-0.5274" k3="0.2697"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="0.0145" k2="-0.5274" k3="0.2697"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.0682" k2="0.0135" k3="0.0063"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.0682" k2="0.0135" k3="0.0063"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.0379" k2="-0.0497" k3="0.0685"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0379" k2="-0.0497" k3="0.0685"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.0447" k2="-0.0226" k3="0.0472"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.0447" k2="-0.0226" k3="0.0472"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.1378" k2="0.1011" k3="-0.0091"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1378" k2="0.1011" k3="-0.0091"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.7336" k2="0.6048" k3="-0.2446"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.7336" k2="0.6048" k3="-0.2446"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="0.0202" k2="-0.3596" k3="0.1708"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="0.0202" k2="-0.3596" k3="0.1708"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0544" k2="0.0322" k3="-0.0097"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0544" k2="0.0322" k3="-0.0097"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0500" k2="-0.0288" k3="0.0551"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0500" k2="-0.0288" k3="0.0551"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1208" k2="0.0927" k3="-0.0197"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1208" k2="0.0927" k3="-0.0197"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- This entry is odd.  I had to change the mount from AF to AI-S.
-+             Besides, it is only measured up to 200mm. -->
-         <maker>Nikon</maker>
--        <model>Nikkor 70-210mm f/4.5-5.6</model>
-+        <model>Nikon AI-S Zoom-Nikkor 70-210mm f/4.5-5.6</model>
-+        <model lang="en">Nikkor AI-S 70-210mm f/4.5-5.6</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="70" k1="-0.007958"/>
-+            <distortion model="poly3" focal="82" k1="-0.001119"/>
-+            <distortion model="poly3" focal="110" k1="0.00521"/>
-+            <distortion model="poly3" focal="125" k1="0.006972"/>
-+            <distortion model="poly3" focal="200" k1="0.006988"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Zoom-Nikkor 70-210mm f/4</model>
-+        <model lang="en">Nikkor AF 70-210mm f/4</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.007958" c="0" />
--            <distortion model="ptlens" focal="82" a="0" b="-0.001119" c="0" />
--            <distortion model="ptlens" focal="110" a="0" b="0.00521" c="0" />
--            <distortion model="ptlens" focal="125" a="0" b="0.006972" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.006988" c="0" />
-+            <distortion model="ptlens" focal="70" a="-0.002443" b="0.001936" c="0"/>
-+            <distortion model="ptlens" focal="78" a="0.000804" b="-0.004536" c="0"/>
-+            <distortion model="ptlens" focal="82" a="0.002886" b="-0.009226" c="0"/>
-+            <distortion model="ptlens" focal="90" a="9.9e-05" b="-0.002281" c="0"/>
-+            <distortion model="ptlens" focal="95" a="0.002007" b="-0.005764" c="0"/>
-+            <distortion model="ptlens" focal="102" a="0.001088" b="-0.003316" c="0"/>
-+            <distortion model="ptlens" focal="110" a="0.003534" b="-0.00822" c="0"/>
-+            <distortion model="ptlens" focal="116" a="0.003553" b="-0.008697" c="0"/>
-+            <distortion model="ptlens" focal="125" a="-0.001714" b="-0.00535" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0.002342" b="0" c="0"/>
-+            <distortion model="ptlens" focal="155" a="0.002777" b="-0.005752" c="0"/>
-+            <distortion model="ptlens" focal="165" a="0.004853" b="-0.00977" c="0"/>
-+            <distortion model="ptlens" focal="210" a="0.003682" b="-0.006324" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 70-210mm f/4 AF</model>
-+        <model>Nikon AF Nikkor 70-210mm f/4-5.6</model>
-+        <model lang="en">Nikkor AF 70-210mm f/4-5.6</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="-0.002443" b="0.001936" c="0" />
--            <distortion model="ptlens" focal="78" a="0.000804" b="-0.004536" c="0" />
--            <distortion model="ptlens" focal="82" a="0.002886" b="-0.009226" c="0" />
--            <distortion model="ptlens" focal="90" a="9.9e-05" b="-0.002281" c="0" />
--            <distortion model="ptlens" focal="95" a="0.002007" b="-0.005764" c="0" />
--            <distortion model="ptlens" focal="102" a="0.001088" b="-0.003316" c="0" />
--            <distortion model="ptlens" focal="110" a="0.003534" b="-0.00822" c="0" />
--            <distortion model="ptlens" focal="116" a="0.003553" b="-0.008697" c="0" />
--            <distortion model="ptlens" focal="125" a="-0.001714" b="-0.00535" c="0" />
--            <distortion model="ptlens" focal="135" a="0.002342" b="0" c="0" />
--            <distortion model="ptlens" focal="155" a="0.002777" b="-0.005752" c="0" />
--            <distortion model="ptlens" focal="165" a="0.004853" b="-0.00977" c="0" />
--            <distortion model="ptlens" focal="210" a="0.003682" b="-0.006324" c="0" />
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="poly3" focal="70" k1="-0.0034"/>
-+            <distortion model="poly3" focal="102" k1="0.00153"/>
-+            <distortion model="poly3" focal="210" k1="0.00341"/>
-+            <tca model="poly3" focal="70" br="0.0000373" vr="0.9998224" bb="-0.0000778" vb="1.0003677"/>
-+            <tca model="poly3" focal="102" br="0.0000144" vr="0.9997907" bb="-0.0000537" vb="1.0001547"/>
-+            <tca model="poly3" focal="210" br="0.0000270" vr="0.9997316" bb="-0.0000299" vb="0.9998035"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.2861" k2="-0.0601" k3="0.0734"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.2861" k2="-0.0601" k3="0.0734"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1225" k2="0.0837" k3="0.0004"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1225" k2="0.0837" k3="0.0004"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1345" k2="0.1328" k3="-0.0439"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1345" k2="0.1328" k3="-0.0439"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1416" k2="0.1935" k3="-0.0979"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1416" k2="0.1935" k3="-0.0979"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0502" k2="0.0245" k3="-0.0038"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0502" k2="0.0245" k3="-0.0038"/>
-+            <vignetting model="pa" focal="82" aperture="4" distance="10" k1="-0.3226" k2="-0.0064" k3="0.0431"/>
-+            <vignetting model="pa" focal="82" aperture="4" distance="1000" k1="-0.3226" k2="-0.0064" k3="0.0431"/>
-+            <vignetting model="pa" focal="82" aperture="5.6" distance="10" k1="-0.0482" k2="-0.0181" k3="0.0398"/>
-+            <vignetting model="pa" focal="82" aperture="5.6" distance="1000" k1="-0.0482" k2="-0.0181" k3="0.0398"/>
-+            <vignetting model="pa" focal="82" aperture="8" distance="10" k1="-0.0871" k2="0.0600" k3="-0.0066"/>
-+            <vignetting model="pa" focal="82" aperture="8" distance="1000" k1="-0.0871" k2="0.0600" k3="-0.0066"/>
-+            <vignetting model="pa" focal="82" aperture="11" distance="10" k1="-0.0841" k2="0.0483" k3="-0.0014"/>
-+            <vignetting model="pa" focal="82" aperture="11" distance="1000" k1="-0.0841" k2="0.0483" k3="-0.0014"/>
-+            <vignetting model="pa" focal="82" aperture="32" distance="10" k1="0.0012" k2="-0.0493" k3="0.0208"/>
-+            <vignetting model="pa" focal="82" aperture="32" distance="1000" k1="0.0012" k2="-0.0493" k3="0.0208"/>
-+            <vignetting model="pa" focal="102" aperture="4.2" distance="10" k1="-0.3053" k2="-0.0583" k3="0.0852"/>
-+            <vignetting model="pa" focal="102" aperture="4.2" distance="1000" k1="-0.3053" k2="-0.0583" k3="0.0852"/>
-+            <vignetting model="pa" focal="102" aperture="5.6" distance="10" k1="-0.0559" k2="0.0156" k3="0.0125"/>
-+            <vignetting model="pa" focal="102" aperture="5.6" distance="1000" k1="-0.0559" k2="0.0156" k3="0.0125"/>
-+            <vignetting model="pa" focal="102" aperture="8" distance="10" k1="-0.0406" k2="0.0315" k3="-0.0077"/>
-+            <vignetting model="pa" focal="102" aperture="8" distance="1000" k1="-0.0406" k2="0.0315" k3="-0.0077"/>
-+            <vignetting model="pa" focal="102" aperture="11" distance="10" k1="-0.1018" k2="0.1464" k3="-0.0746"/>
-+            <vignetting model="pa" focal="102" aperture="11" distance="1000" k1="-0.1018" k2="0.1464" k3="-0.0746"/>
-+            <vignetting model="pa" focal="102" aperture="36" distance="10" k1="-0.0872" k2="0.0461" k3="0.0096"/>
-+            <vignetting model="pa" focal="102" aperture="36" distance="1000" k1="-0.0872" k2="0.0461" k3="0.0096"/>
-+            <vignetting model="pa" focal="125" aperture="4.5" distance="10" k1="-0.2286" k2="-0.2164" k3="0.1895"/>
-+            <vignetting model="pa" focal="125" aperture="4.5" distance="1000" k1="-0.2286" k2="-0.2164" k3="0.1895"/>
-+            <vignetting model="pa" focal="125" aperture="6.3" distance="10" k1="-0.0735" k2="0.0411" k3="0.0078"/>
-+            <vignetting model="pa" focal="125" aperture="6.3" distance="1000" k1="-0.0735" k2="0.0411" k3="0.0078"/>
-+            <vignetting model="pa" focal="125" aperture="9" distance="10" k1="-0.0528" k2="0.0101" k3="0.0271"/>
-+            <vignetting model="pa" focal="125" aperture="9" distance="1000" k1="-0.0528" k2="0.0101" k3="0.0271"/>
-+            <vignetting model="pa" focal="125" aperture="13" distance="10" k1="-0.0621" k2="0.0220" k3="0.0111"/>
-+            <vignetting model="pa" focal="125" aperture="13" distance="1000" k1="-0.0621" k2="0.0220" k3="0.0111"/>
-+            <vignetting model="pa" focal="125" aperture="36" distance="10" k1="-0.0675" k2="0.0527" k3="-0.0153"/>
-+            <vignetting model="pa" focal="125" aperture="36" distance="1000" k1="-0.0675" k2="0.0527" k3="-0.0153"/>
-+            <vignetting model="pa" focal="170" aperture="5" distance="10" k1="-0.4458" k2="0.1961" k3="-0.0162"/>
-+            <vignetting model="pa" focal="170" aperture="5" distance="1000" k1="-0.4458" k2="0.1961" k3="-0.0162"/>
-+            <vignetting model="pa" focal="170" aperture="7.1" distance="10" k1="-0.0658" k2="0.0562" k3="-0.0026"/>
-+            <vignetting model="pa" focal="170" aperture="7.1" distance="1000" k1="-0.0658" k2="0.0562" k3="-0.0026"/>
-+            <vignetting model="pa" focal="170" aperture="10" distance="10" k1="-0.0612" k2="0.0642" k3="-0.0133"/>
-+            <vignetting model="pa" focal="170" aperture="10" distance="1000" k1="-0.0612" k2="0.0642" k3="-0.0133"/>
-+            <vignetting model="pa" focal="170" aperture="14" distance="10" k1="-0.0313" k2="0.0656" k3="-0.0408"/>
-+            <vignetting model="pa" focal="170" aperture="14" distance="1000" k1="-0.0313" k2="0.0656" k3="-0.0408"/>
-+            <vignetting model="pa" focal="170" aperture="40" distance="10" k1="-0.1080" k2="0.1140" k3="-0.0363"/>
-+            <vignetting model="pa" focal="170" aperture="40" distance="1000" k1="-0.1080" k2="0.1140" k3="-0.0363"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="10" k1="-0.6111" k2="0.6038" k3="-0.2677"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="1000" k1="-0.6111" k2="0.6038" k3="-0.2677"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="-0.0528" k2="0.0272" k3="0.0181"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="-0.0528" k2="0.0272" k3="0.0181"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="10" k1="-0.0371" k2="0.0583" k3="-0.0324"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="1000" k1="-0.0371" k2="0.0583" k3="-0.0324"/>
-+            <vignetting model="pa" focal="210" aperture="16" distance="10" k1="-0.0773" k2="0.0963" k3="-0.0392"/>
-+            <vignetting model="pa" focal="210" aperture="16" distance="1000" k1="-0.0773" k2="0.0963" k3="-0.0392"/>
-+            <vignetting model="pa" focal="210" aperture="45" distance="10" k1="-0.1446" k2="0.2322" k3="-0.1162"/>
-+            <vignetting model="pa" focal="210" aperture="45" distance="1000" k1="-0.1446" k2="0.2322" k3="-0.1162"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 70-300mm f/4-5.6D ED AF</model>
-+        <model>Nikon AF Zoom-Nikkor 70-300mm f/4-5.6D ED</model>
-+        <model lang="en">Nikkor AF 70-300mm f/4-5.6D ED</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.001254" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.004173" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.006434" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.005485" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.004364" c="0" />
-+            <distortion model="poly3" focal="70" k1="-0.001254"/>
-+            <distortion model="poly3" focal="100" k1="0.004173"/>
-+            <distortion model="poly3" focal="135" k1="0.006434"/>
-+            <distortion model="poly3" focal="200" k1="0.005485"/>
-+            <distortion model="poly3" focal="300" k1="0.004364"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 70-300mm f/4-5.6G AF</model>
-+        <model>Nikon AF Zoom-Nikkor 70-300mm f/4-5.6G</model>
-+        <model lang="en">Nikkor AF 70-300mm f/4-5.6G</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.001254" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.004173" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.006434" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.005485" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.004364" c="0" />
-+            <distortion model="poly3" focal="70" k1="-0.001254"/>
-+            <distortion model="poly3" focal="100" k1="0.004173"/>
-+            <distortion model="poly3" focal="135" k1="0.006434"/>
-+            <distortion model="poly3" focal="200" k1="0.005485"/>
-+            <distortion model="poly3" focal="300" k1="0.004364"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 80-200mm f/2.8D ED AF</model>
-+        <model>Nikon AF Zoom-Nikkor 80-200mm f/2.8D ED</model>
-+        <model lang="en">Nikkor AF 80-200mm f/2.8D ED</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="0" b="-0.00511" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.000515" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.004233" c="0" />
--            <distortion model="ptlens" focal="180" a="0" b="0.010432" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.010603" c="0" />
-+            <distortion model="poly3" focal="80" k1="-0.00511"/>
-+            <distortion model="poly3" focal="105" k1="0.000515"/>
-+            <distortion model="poly3" focal="135" k1="0.004233"/>
-+            <distortion model="poly3" focal="180" k1="0.010432"/>
-+            <distortion model="poly3" focal="200" k1="0.010603"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 80-400mm f/4.5-5.6 ED-AF-D-VR</model>
-+        <model>Nikon AF Zoom-Nikkor 80-200mm f/2.8 ED</model>
-+        <model lang="en">Nikkor AF 80-200mm f/2.8 ED</model>
-         <mount>Nikon F AF</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="0" b="-0.0043" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="-0.0015" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.001" c="0" />
--            <distortion model="ptlens" focal="210" a="0" b="0.0025" c="0" />
--            <distortion model="ptlens" focal="310" a="0" b="0.0035" c="0" />
--            <distortion model="ptlens" focal="400" a="0" b="0.0045" c="0" />
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="poly3" focal="80" k1="-0.00191"/>
-+            <distortion model="poly3" focal="110" k1="0.00107"/>
-+            <distortion model="poly3" focal="200" k1="0.00438"/>
-+            <tca model="poly3" focal="80" br="-0.0000366" vr="1.0002716" bb="0.0000285" vb="0.9997080"/>
-+            <tca model="poly3" focal="110" br="-0.0000221" vr="1.0000859" bb="0.0000001" vb="0.9998561"/>
-+            <tca model="poly3" focal="200" br="-0.0000060" vr="0.9998234" bb="-0.0000254" vb="0.9998604"/>
-+            <vignetting model="pa" focal="80" aperture="2.8" distance="10" k1="-0.4473" k2="0.4203" k3="-0.2007"/>
-+            <vignetting model="pa" focal="80" aperture="2.8" distance="1000" k1="-0.4473" k2="0.4203" k3="-0.2007"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.0148" k2="-0.3189" k3="0.2149"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.0148" k2="-0.3189" k3="0.2149"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.0473" k2="0.0287" k3="0.0064"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.0473" k2="0.0287" k3="0.0064"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0647" k2="0.0492" k3="0.0012"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0647" k2="0.0492" k3="0.0012"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.0761" k2="0.0601" k3="0.0006"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.0761" k2="0.0601" k3="0.0006"/>
-+            <vignetting model="pa" focal="95" aperture="2.8" distance="10" k1="-0.3782" k2="0.3353" k3="-0.1566"/>
-+            <vignetting model="pa" focal="95" aperture="2.8" distance="1000" k1="-0.3782" k2="0.3353" k3="-0.1566"/>
-+            <vignetting model="pa" focal="95" aperture="4" distance="10" k1="-0.0143" k2="-0.2479" k3="0.1636"/>
-+            <vignetting model="pa" focal="95" aperture="4" distance="1000" k1="-0.0143" k2="-0.2479" k3="0.1636"/>
-+            <vignetting model="pa" focal="95" aperture="5.6" distance="10" k1="-0.0710" k2="0.0532" k3="-0.0012"/>
-+            <vignetting model="pa" focal="95" aperture="5.6" distance="1000" k1="-0.0710" k2="0.0532" k3="-0.0012"/>
-+            <vignetting model="pa" focal="95" aperture="8" distance="10" k1="-0.0398" k2="0.0049" k3="0.0291"/>
-+            <vignetting model="pa" focal="95" aperture="8" distance="1000" k1="-0.0398" k2="0.0049" k3="0.0291"/>
-+            <vignetting model="pa" focal="95" aperture="22" distance="10" k1="-0.0874" k2="0.0937" k3="-0.0267"/>
-+            <vignetting model="pa" focal="95" aperture="22" distance="1000" k1="-0.0874" k2="0.0937" k3="-0.0267"/>
-+            <vignetting model="pa" focal="110" aperture="2.8" distance="10" k1="-0.3351" k2="0.2800" k3="-0.1310"/>
-+            <vignetting model="pa" focal="110" aperture="2.8" distance="1000" k1="-0.3351" k2="0.2800" k3="-0.1310"/>
-+            <vignetting model="pa" focal="110" aperture="4" distance="10" k1="0.0172" k2="-0.2269" k3="0.1388"/>
-+            <vignetting model="pa" focal="110" aperture="4" distance="1000" k1="0.0172" k2="-0.2269" k3="0.1388"/>
-+            <vignetting model="pa" focal="110" aperture="5.6" distance="10" k1="-0.0253" k2="-0.0061" k3="0.0264"/>
-+            <vignetting model="pa" focal="110" aperture="5.6" distance="1000" k1="-0.0253" k2="-0.0061" k3="0.0264"/>
-+            <vignetting model="pa" focal="110" aperture="8" distance="10" k1="-0.0718" k2="0.0580" k3="0.0005"/>
-+            <vignetting model="pa" focal="110" aperture="8" distance="1000" k1="-0.0718" k2="0.0580" k3="0.0005"/>
-+            <vignetting model="pa" focal="110" aperture="22" distance="10" k1="-0.0147" k2="-0.0303" k3="0.0443"/>
-+            <vignetting model="pa" focal="110" aperture="22" distance="1000" k1="-0.0147" k2="-0.0303" k3="0.0443"/>
-+            <vignetting model="pa" focal="145" aperture="2.8" distance="10" k1="-0.3485" k2="0.3714" k3="-0.2311"/>
-+            <vignetting model="pa" focal="145" aperture="2.8" distance="1000" k1="-0.3485" k2="0.3714" k3="-0.2311"/>
-+            <vignetting model="pa" focal="145" aperture="4" distance="10" k1="-0.0255" k2="-0.0465" k3="-0.0269"/>
-+            <vignetting model="pa" focal="145" aperture="4" distance="1000" k1="-0.0255" k2="-0.0465" k3="-0.0269"/>
-+            <vignetting model="pa" focal="145" aperture="5.6" distance="10" k1="-0.0549" k2="0.0362" k3="0.0084"/>
-+            <vignetting model="pa" focal="145" aperture="5.6" distance="1000" k1="-0.0549" k2="0.0362" k3="0.0084"/>
-+            <vignetting model="pa" focal="145" aperture="8" distance="10" k1="-0.0316" k2="0.0254" k3="0.0026"/>
-+            <vignetting model="pa" focal="145" aperture="8" distance="1000" k1="-0.0316" k2="0.0254" k3="0.0026"/>
-+            <vignetting model="pa" focal="145" aperture="22" distance="10" k1="-0.0966" k2="0.1129" k3="-0.0535"/>
-+            <vignetting model="pa" focal="145" aperture="22" distance="1000" k1="-0.0966" k2="0.1129" k3="-0.0535"/>
-+            <vignetting model="pa" focal="170" aperture="2.8" distance="10" k1="-0.2468" k2="-0.0488" k3="0.0365"/>
-+            <vignetting model="pa" focal="170" aperture="2.8" distance="1000" k1="-0.2468" k2="-0.0488" k3="0.0365"/>
-+            <vignetting model="pa" focal="170" aperture="4" distance="10" k1="0.0696" k2="-0.4908" k3="0.2603"/>
-+            <vignetting model="pa" focal="170" aperture="4" distance="1000" k1="0.0696" k2="-0.4908" k3="0.2603"/>
-+            <vignetting model="pa" focal="170" aperture="5.6" distance="10" k1="-0.0527" k2="0.1160" k3="-0.0997"/>
-+            <vignetting model="pa" focal="170" aperture="5.6" distance="1000" k1="-0.0527" k2="0.1160" k3="-0.0997"/>
-+            <vignetting model="pa" focal="170" aperture="8" distance="10" k1="-0.0607" k2="0.0404" k3="0.0094"/>
-+            <vignetting model="pa" focal="170" aperture="8" distance="1000" k1="-0.0607" k2="0.0404" k3="0.0094"/>
-+            <vignetting model="pa" focal="170" aperture="22" distance="10" k1="-0.0148" k2="-0.0001" k3="0.0138"/>
-+            <vignetting model="pa" focal="170" aperture="22" distance="1000" k1="-0.0148" k2="-0.0001" k3="0.0138"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.6363" k2="0.5329" k3="-0.2332"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.6363" k2="0.5329" k3="-0.2332"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.2372" k2="-0.2615" k3="0.2452"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.2372" k2="-0.2615" k3="0.2452"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.0625" k2="-0.2467" k3="0.0651"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0625" k2="-0.2467" k3="0.0651"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0299" k2="-0.0170" k3="0.0434"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0299" k2="-0.0170" k3="0.0434"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0755" k2="0.0954" k3="-0.0359"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0755" k2="0.0954" k3="-0.0359"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 14mm f/2.8D ED AF</model>
-+        <model>Nikon AF Zoom-Nikkor 80-400mm f/4.5-5.6D ED VR</model>
-+        <model lang="en">Nikkor AF 80-400mm f/4.5-5.6D ED VR</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0" />
-+            <distortion model="poly3" focal="80" k1="-0.0043"/>
-+            <distortion model="poly3" focal="105" k1="-0.0015"/>
-+            <distortion model="poly3" focal="135" k1="0.001"/>
-+            <distortion model="poly3" focal="210" k1="0.0025"/>
-+            <distortion model="poly3" focal="310" k1="0.0035"/>
-+            <distortion model="poly3" focal="400" k1="0.0045"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 15mm f/3.5 AI</model>
-+        <model>Nikon AF Nikkor 14mm f/2.8D ED</model>
-+        <model lang="en">Nikkor AF 14mm f/2.8D ED</model>
-+        <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI Nikkor 15mm f/3.5</model>
-+        <model lang="en">Nikkor AI 15mm f/3.5</model>
-         <mount>Nikon F AI</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="15" a="0.007" b="-0.021" c="0" />
-+            <distortion model="ptlens" focal="15" a="0.007" b="-0.021" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 20mm f/2.8D AF</model>
-+        <model>Nikon AF-S Nikkor 20mm f/1.8G ED</model>
-+        <model lang="en">Nikkor AF-S 20mm f/1.8G ED</model>
-         <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <tca model="poly3" focal="20" br="-0.0003228" cr="0.0006409" vr="1.0000679" bb="-0.0000913" cb="0.0003007" vb="0.9998503"/>
-+            <distortion model="ptlens" focal="20" a="0.0108146" b="-0.0341733" c="0.0157005"/>
-+            <vignetting model="pa" focal="20" aperture="1.8" distance="0.2" k1="-1.0686" k2="0.3951" k3="0.0186"/>
-+            <vignetting model="pa" focal="20" aperture="1.8" distance="0.24" k1="-1.2096" k2="0.5366" k3="-0.0236"/>
-+            <vignetting model="pa" focal="20" aperture="1.8" distance="0.38" k1="-1.5504" k2="1.2150" k3="-0.3890"/>
-+            <vignetting model="pa" focal="20" aperture="1.8" distance="1000" k1="-1.7048" k2="1.3931" k3="-0.4582"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="0.2" k1="-0.3641" k2="-0.8225" k3="0.6214"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="0.24" k1="-0.4548" k2="-0.8643" k3="0.7026"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="0.38" k1="-0.7270" k2="-0.4434" k3="0.5024"/>
-+            <vignetting model="pa" focal="20" aperture="2" distance="1000" k1="-0.8702" k2="-0.2522" k3="0.4335"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.2" k1="-0.3622" k2="-0.2167" k3="0.2116"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.24" k1="-0.4164" k2="-0.1534" k3="0.1744"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="0.38" k1="-0.6996" k2="0.4790" k3="-0.2240"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.6336" k2="0.2486" k3="-0.1033"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.2" k1="-0.3516" k2="-0.2383" k3="0.2291"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.24" k1="-0.3952" k2="-0.2131" k3="0.2275"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="0.38" k1="-0.6166" k2="0.2305" k3="0.0035"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.6475" k2="0.3006" k3="-0.0426"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.2" k1="-0.3515" k2="-0.2368" k3="0.2315"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.24" k1="-0.3966" k2="-0.1973" k3="0.2139"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.38" k1="-0.6048" k2="0.2022" k3="0.0237"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.5465" k2="0.0499" k3="0.1272"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.2" k1="-0.3512" k2="-0.2374" k3="0.2355"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.24" k1="-0.4014" k2="-0.1749" k3="0.1965"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.38" k1="-0.6057" k2="0.2036" k3="0.0249"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.5930" k2="0.1330" k3="0.0826"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.2" k1="-0.3541" k2="-0.2391" k3="0.2406"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.24" k1="-0.4074" k2="-0.1555" k3="0.1818"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.38" k1="-0.4803" k2="-0.0870" k3="0.2016"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.5851" k2="0.1049" k3="0.0964"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.2" k1="-0.3583" k2="-0.2654" k3="0.2630"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.24" k1="-0.4116" k2="-0.1414" k3="0.1713"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.38" k1="-0.6261" k2="0.2633" k3="-0.0120"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4951" k2="0.1771" k3="0.0365"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Nikkor 20mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 20mm f/2.8D</model>
-+        <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="20" a="0.0063" b="-0.021" c="0" />
-+            <distortion model="ptlens" focal="20" a="0.0063" b="-0.021" c="0"/>
-         </calibration>
-     </lens>
--
--    <!--lens>  replaced by new entry below which should give better results
-+    <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24mm f/2.8D AF</model>
-+        <model>Nikon AI-S Nikkor 24mm f/2.8</model>
-+        <model lang="en">Nikkor AI-S 24mm f/2.8</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="24" a="0.0202" b="-0.05926" c="0.03781"/>
-+            <!-- Taken with Nikon D600 -->
-+            <tca model="poly3" focal="24" br="-0.0002082" vr="1.0007055" bb="0.0001896" vb="0.9996373"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Nikkor 24mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 24mm f/2.8D</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.00112" b="-0.00753" c="-0.00379" />
-+            <distortion model="ptlens" focal="24" a="0.00112" b="-0.00753" c="-0.00379"/>
-         </calibration>
--    </lens-->
--
-+    </lens>
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24mm f/2.8D AF</model>
-+        <model>Nikon AF Nikkor 24mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 24mm f/2.8D</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.022" b="-0.056" c="0.022" />
-+            <distortion model="ptlens" focal="24" a="0.022" b="-0.056" c="0.022"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24mm f/2.0 AI-S</model>
-+        <model>Nikon AI-S Nikkor 24mm f/2.0</model>
-+        <model lang="en">Nikkor AI-S 24mm f/2.0</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0" b="-0.008" c="0" />
-+            <distortion model="poly3" focal="24" k1="-0.008"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 28mm f/2.8D AF</model>
-+        <model>Nikon AI-S Nikkor 28mm f/2.8</model>
-+        <model lang="en">Nikkor AI-S 28mm f/2.8</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="28" a="0.00929" b="-0.02155" c="0.0021"/>
-+            <tca model="poly3" focal="28" br="-0.0002306" vr="1.0006860" bb="0.0002350" vb="0.9995614"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Nikkor 28mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 28mm f/2.8D</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="0.025773" c="-0.085777" />
-+            <distortion model="ptlens" focal="28" a="0" b="0.025773" c="-0.085777"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 28mm f/2.0 AI-S</model>
-+        <model>Nikon AI-S Nikkor 28mm f/2.0</model>
-+        <model lang="en">Nikkor AI-S 28mm f/2.0</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="-0.0044" c="0" />
-+            <distortion model="poly3" focal="28" k1="-0.0044"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 28mm f/3.5 AI-S PC (unshifted)</model>
-+        <model>Nikon AI-S Nikkor 28mm f/3.5 PC (unshifted)</model>
-+        <model lang="en">Nikkor AI-S 28mm f/3.5 PC (unshifted)</model>
-+        <model lang="de">Nikkor AI-S 28mm f/3.5 PC (ungeshiftet)</model>
-         <mount>Nikon F AI-S</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.007377" b="-0.021769" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.007377" b="-0.021769" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 35mm f/1.4 AI-S</model>
--        <mount>Nikon F AI-S</mount>
--        <cropfactor>1.5</cropfactor>
-+        <model>Nikon AF-S Nikkor 28mm f/1.8G</model>
-+        <model lang="en">Nikkor AF-S 28mm f/1.8G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0" b="-0.005" c="0" />
-+            <!-- Taken with Nikon D810 -->
-+            <distortion model="ptlens" focal="28" a="0.00961" b="-0.02915" c="0.01024"/>
-+            <tca model="poly3" focal="28" br="-0.0000955" vr="1.0002765" bb="0.0000582" vb="0.9999656"/>
-         </calibration>
-     </lens>
--    
--    <!--lens>  Superseeded by the following profile. Can be removed in future.
-+    <lens>
-         <maker>Nikon</maker>
--        <model>Nikon Nikkor 35mm f/1.8G AF-S DX</model>
-+        <model>Nikon AF Nikkor 28mm f/1.4D</model>
-+        <model lang="en">Nikkor AF 28mm f/1.4D</model>
-         <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D3S -->
-+            <distortion model="ptlens" focal="28" a="0.00913976" b="-0.0245588" c="0.000542579"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Nikkor 35mm f/2.0</model>
-+        <model lang="en">Nikkor AI-S 35mm f/2.0</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="35" a="0.01447" b="-0.03949" c="0.0153"/>
-+            <tca model="poly3" focal="35" br="-0.0001699" vr="1.0005262" bb="0.0001817" vb="0.9996614"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Nikkor 35mm f/1.4</model>
-+        <model lang="en">Nikkor AI-S 35mm f/1.4</model>
-+        <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="-0.00899" b="0.02507" c="-0.04009" />
-+            <distortion model="poly3" focal="35" k1="-0.005"/>
-         </calibration>
--    </lens-->
--
-+    </lens>
-     <lens>
-         <maker>Nikon</maker>
-         <model>Nikon AF-S DX Nikkor 35mm f/1.8G</model>
-+        <model lang="en">Nikkor AF-S 35mm f/1.8G DX</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.003" b="-0.017" c="0.005" />
--            <tca model="linear" focal="35" kr="1.0003" kb="1.0003" />
-+            <distortion model="ptlens" focal="35" a="0.003" b="-0.017" c="0.005"/>
-+            <tca model="linear" focal="35" kr="1.0003" kb="1.0003"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-0.3298" k2="-0.0595" k3="0.0938"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-0.3298" k2="-0.0595" k3="0.0938"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.1367" k2="0.0656" k3="-0.0502"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.1367" k2="0.0656" k3="-0.0502"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.1170" k2="0.0027" k3="0.0072"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1170" k2="0.0027" k3="0.0072"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.1203" k2="0.0086" k3="0.0030"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.1203" k2="0.0086" k3="0.0030"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1143" k2="-0.0162" k3="0.0186"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1143" k2="-0.0162" k3="0.0186"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 35mm f/2.0D AF</model>
-+        <model>Nikon AF Nikkor 35mm f/2.0D</model>
-+        <model lang="en">Nikkor AF 35mm f/2.0D</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="35" a="0.001968" b="-0.009475" c="0" />
-+            <distortion model="ptlens" focal="35" a="0.001968" b="-0.009475" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 45mm f/2.8 AI GN</model>
-+        <model>Nikon AI Nikkor 45mm f/2.8 GN</model>
-+        <model lang="en">Nikkor AI 45mm f/2.8 GN</model>
-         <mount>Nikon F AI</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="45" a="0" b="-0.0005" c="0" />
-+            <distortion model="poly3" focal="45" k1="-0.0005"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 50mm f/1.4D AF</model>
-+        <model>Nikon AF Nikkor 50mm f/1.4D</model>
-+        <model lang="en">Nikkor AF 50mm f/1.4D</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.004672" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.004672"/>
-+            <!-- Taken with Nikon D800 -->
-+            <tca model="poly3" focal="50" br="-0.0000912" vr="1.0001917" bb="0.0001150" vb="0.9998601"/>
-+            <!-- Taken with Nikon D610 -->
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.6128" k2="1.1600" k3="-0.2864"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.6128" k2="1.1600" k3="-0.2864"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="0.0016" k2="-0.4910" k3="-0.0246"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="0.0016" k2="-0.4910" k3="-0.0246"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3729" k2="0.3408" k3="-0.2180"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3729" k2="0.3408" k3="-0.2180"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.4912" k2="0.5335" k3="-0.2775"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4912" k2="0.5335" k3="-0.2775"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 50mm f/1.4 AI-S</model>
-+        <model>Nikon AI-S Nikkor 50mm f/1.4</model>
-+        <model lang="en">Nikkor AI-S 50mm f/1.4</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.0025" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.0025"/>
-         </calibration>
-     </lens>
--    
--    <lens> <!-- http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3047&group_id=9034 -->
-+    <lens>
-+        <!-- Submitted by Ed Gomez -->
-         <maker>Nikon</maker>
-         <model>Nikon AF Nikkor 50mm f/1.8D</model>
-+        <model lang="en">Nikkor AF 50mm f/1.8D</model>
-         <mount>Nikon F AF</mount>
--        <focal value="50" />
--        <aperture min="1.8" max="22" />
-+        <focal value="50"/>
-+        <aperture min="1.8" max="22"/>
-         <type>rectilinear</type>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50.0" a="-0.00255" b="0.00841" c="-0.01107" />
-+            <distortion model="ptlens" focal="50" a="-0.00255" b="0.00841" c="-0.01107"/>
-         </calibration>
--    </lens>    
--
-+    </lens>
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 50mm f/1.8 AI-S</model>
-+        <model>Nikon AF Nikkor 50mm f/1.8D</model>
-+        <model lang="en">Nikkor AF 50mm f/1.8D</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="ptlens" focal="50" a="0.00139" b="-0.00804" c="0.00877"/>
-+            <tca model="poly3" focal="50" br="-0.0000176" vr="1.0000537" bb="0.0000226" vb="0.9998589"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-0.9908" k2="0.9074" k3="-0.3911"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-0.9908" k2="0.9074" k3="-0.3911"/>
-+            <vignetting model="pa" focal="50" aperture="2.5" distance="10" k1="-0.0795" k2="-0.6086" k3="0.3210"/>
-+            <vignetting model="pa" focal="50" aperture="2.5" distance="1000" k1="-0.0795" k2="-0.6086" k3="0.3210"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.2566" k2="0.1935" k3="-0.1485"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.2566" k2="0.1935" k3="-0.1485"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="10" k1="-0.2421" k2="0.0920" k3="-0.0371"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="1000" k1="-0.2421" k2="0.0920" k3="-0.0371"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2490" k2="0.1102" k3="-0.0426"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2490" k2="0.1102" k3="-0.0426"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Nikkor 50mm f/1.8</model>
-+        <model lang="en">Nikkor AI-S 50mm f/1.8</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.0005" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.0005"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 50mm f/2.0</model>
-+        <model>Nikon Nikkor 50mm f/2.0</model>
-+        <model lang="en">Nikkor 50mm f/2.0</model>
-         <mount>Nikon F</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.002" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.002"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 55mm f/1.2 AI</model>
-+        <model>Nikon AI Nikkor 55mm f/1.2</model>
-+        <model lang="en">Nikkor AI 55mm f/1.2</model>
-         <mount>Nikon F AI</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="55" a="0" b="-0.003" c="0" />
-+            <distortion model="poly3" focal="55" k1="-0.003"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 55mm f/2.8 AI-S Micro</model>
-+        <model>Nikon AI-S Nikkor 55mm f/2.8 Micro</model>
-+        <model lang="en">Nikkor AI-S 55mm f/2.8 Micro</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="55" a="0" b="-0.0002" c="0" />
-+            <distortion model="poly3" focal="55" k1="-0.0002"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 58mm f/1.2 Noct</model>
--        <mount>Nikon F AF</mount>
-+        <model>Nikon AI-S Nikkor 58mm f/1.2 Noct</model>
-+        <model lang="en">Nikkor AI-S 58mm f/1.2 Noct</model>
-+        <mount>Nikon F AI</mount>
-+        <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="58" a="0" b="-0.003" c="0" />
-+            <distortion model="poly3" focal="58" k1="-0.003"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 85mm f/1.8D AF</model>
-+        <model>Nikon AF Nikkor 85mm f/1.8D</model>
-+        <model lang="en">Nikkor AF 85mm f/1.8D</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="85" a="0" b="-0.000852" c="0" />
-+            <distortion model="poly3" focal="85" k1="-0.000852"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 105mm f/2.8D AF</model>
-+        <model>Nikon AF Nikkor 105mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 105mm f/2.8D</model>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="105" a="0" b="0.00142" c="0" />
-+            <distortion model="poly3" focal="105" k1="0.00142"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 135mm f/2.0 AI-S</model>
-+        <model>Nikon AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED</model>
-+        <model lang="en">Nikkor AF-S VR 105mm f/2.8G IF-ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="poly3" focal="105" k1="-0.00131"/>
-+            <tca model="poly3" focal="105" br="-0.0000282" vr="0.9999225" bb="0.0000075" vb="0.9999279"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Nikkor 135mm f/2.0</model>
-+        <model lang="en">Nikkor AI-S 135mm f/2.0</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="135" a="0" b="0.0015" c="0" />
-+            <distortion model="poly3" focal="135" k1="0.0015"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 180mm f/2.8 ED AI-S</model>
-+        <model>Nikon AI-S Nikkor 180mm f/2.8 ED</model>
-+        <model lang="en">Nikkor AI-S 180mm f/2.8 ED</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="180" a="0" b="0.001" c="0" />
-+            <distortion model="poly3" focal="180" k1="0.001"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 500mm f/8.0 Reflex</model>
-+        <model>Nikon AI-S Nikkor 500mm f/8.0 Reflex</model>
-+        <model lang="en">Nikkor AI-S 500mm f/8.0 Reflex</model>
-         <mount>Nikon F AI-S</mount>
-+        <!-- Average crop factor of Nikon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="500" a="0" b="0.001" c="0" />
-+            <distortion model="poly3" focal="500" k1="0.001"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
-         <model>Nikon AF-S Nikkor 85mm f/1.8G</model>
-+        <model lang="en">Nikkor AF-S 85mm f/1.8G</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon D800 -->
--            <distortion model="ptlens" focal="85" a="-0.00079" b="0.00341" c="-0.00179" />
--            <tca model="poly3" focal="85" br="-0.0000076" vr="0.9999780" bb="0.0000002" vb="0.9999216" />
-+            <distortion model="ptlens" focal="85" a="-0.00079" b="0.00341" c="-0.00179"/>
-+            <tca model="poly3" focal="85" br="-0.0000076" vr="0.9999780" bb="0.0000002" vb="0.9999216"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
--        <model>Nikkor 24-70mm f/2.8G ED</model>
-+        <model>Nikon AF Nikkor 85mm f/1.8</model>
-+        <model lang="en">Nikkor AF 85mm f/1.8</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="poly3" focal="85" k1="0"/>
-+            <tca model="poly3" focal="85" br="-0.0000030" vr="0.9998635" bb="-0.0000082" vb="1.0000494"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="10" k1="-0.2163" k2="-0.3005" k3="0.1754"/>
-+            <vignetting model="pa" focal="85" aperture="1.8" distance="1000" k1="-0.2163" k2="-0.3005" k3="0.1754"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="10" k1="-0.1047" k2="0.1946" k3="-0.1812"/>
-+            <vignetting model="pa" focal="85" aperture="2.5" distance="1000" k1="-0.1047" k2="0.1946" k3="-0.1812"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="10" k1="-0.0855" k2="0.0263" k3="0.0188"/>
-+            <vignetting model="pa" focal="85" aperture="3.5" distance="1000" k1="-0.0855" k2="0.0263" k3="0.0188"/>
-+            <vignetting model="pa" focal="85" aperture="5" distance="10" k1="-0.0926" k2="0.1445" k3="-0.0687"/>
-+            <vignetting model="pa" focal="85" aperture="5" distance="1000" k1="-0.0926" k2="0.1445" k3="-0.0687"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="10" k1="-0.1724" k2="0.2410" k3="-0.1074"/>
-+            <vignetting model="pa" focal="85" aperture="16" distance="1000" k1="-0.1724" k2="0.2410" k3="-0.1074"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Zoom-Nikkor 24-70mm f/2.8G ED</model>
-+        <model lang="en">Nikkor AF-S 24-70mm f/2.8G ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon D800 -->
-             <distortion model="ptlens" focal="24" a="0.01436" b="-0.06611" c="0.06436"/>
-@@ -1308,27 +2323,877 @@
-             <distortion model="ptlens" focal="70" a="0.00933" b="-0.03902" c="0.05818"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Nikon</maker>
-         <model>Nikon AF-S Zoom-Nikkor 14-24mm f/2.8G ED</model>
-+        <model lang="en">Nikkor AF-S 14-24mm f/2.8G ED</model>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon D700 -->
--            <distortion model="poly3" focal="14" k1="-0.01343" />
--            <distortion model="poly3" focal="16" k1="-0.00853" />
--            <distortion model="poly3" focal="18" k1="-0.00354" />
--            <distortion model="poly3" focal="20" k1="-0.00084" />
--            <distortion model="poly3" focal="22" k1="0.00035" />
--            <distortion model="poly3" focal="24" k1="0.00088" />
--            <tca model="poly3" focal="14" br="0.0000628" vr="1.0001266" bb="-0.0000429" vb="1.0001134" />
--            <tca model="poly3" focal="16" br="0.0001160" vr="1.0000512" bb="-0.0000490" vb="1.0001245" />
--            <tca model="poly3" focal="18" br="0.0000802" vr="1.0000736" bb="-0.0000670" vb="1.0001496" />
--            <tca model="poly3" focal="20" br="0.0001132" vr="1.0000380" bb="-0.0000470" vb="1.0001205" />
--            <tca model="poly3" focal="22" br="0.0000941" vr="1.0000766" bb="-0.0000508" vb="1.0001177" />
--            <tca model="poly3" focal="24" br="0.0000737" vr="1.0001211" bb="-0.0000343" vb="1.0000684" />
-+            <distortion model="poly3" focal="14" k1="-0.01343"/>
-+            <distortion model="poly3" focal="16" k1="-0.00853"/>
-+            <distortion model="poly3" focal="18" k1="-0.00354"/>
-+            <distortion model="poly3" focal="20" k1="-0.00084"/>
-+            <distortion model="poly3" focal="22" k1="0.00035"/>
-+            <distortion model="poly3" focal="24" k1="0.00088"/>
-+            <tca model="poly3" focal="14" br="0.0000628" vr="1.0001266" bb="-0.0000429" vb="1.0001134"/>
-+            <tca model="poly3" focal="16" br="0.0001160" vr="1.0000512" bb="-0.0000490" vb="1.0001245"/>
-+            <tca model="poly3" focal="18" br="0.0000802" vr="1.0000736" bb="-0.0000670" vb="1.0001496"/>
-+            <tca model="poly3" focal="20" br="0.0001132" vr="1.0000380" bb="-0.0000470" vb="1.0001205"/>
-+            <tca model="poly3" focal="22" br="0.0000941" vr="1.0000766" bb="-0.0000508" vb="1.0001177"/>
-+            <tca model="poly3" focal="24" br="0.0000737" vr="1.0001211" bb="-0.0000343" vb="1.0000684"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 70-300mm f/4.5-5.6G VR IF-ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="poly3" focal="70" k1="-0.00644"/>
-+            <distortion model="poly3" focal="80" k1="-0.00183"/>
-+            <distortion model="poly3" focal="92" k1="0.00496"/>
-+            <distortion model="poly3" focal="170" k1="0.01292"/>
-+            <distortion model="poly3" focal="240" k1="0.01199"/>
-+            <distortion model="poly3" focal="300" k1="0.00746"/>
-+            <tca model="poly3" focal="70" br="0.0000037" vr="1.0001035" bb="-0.0000180" vb="1.0000798"/>
-+            <tca model="poly3" focal="92" br="-0.0000381" vr="1.0000853" bb="0.0000339" vb="0.9999527"/>
-+            <tca model="poly3" focal="170" br="-0.0000355" vr="1.0000067" bb="0.0000500" vb="0.9998364"/>
-+            <tca model="poly3" focal="240" br="-0.0000075" vr="0.9999618" bb="0.0000435" vb="0.9997818"/>
-+            <tca model="poly3" focal="300" br="-0.0000515" vr="1.0000175" bb="0.0000673" vb="0.9996418"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 70-300mm f/4.5-5.6G VR IF-ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5100 -->
-+            <distortion model="poly3" focal="70" k1="-0.0033"/>
-+            <distortion model="poly3" focal="85" k1="-0.00177"/>
-+            <distortion model="poly3" focal="100" k1="0.00201"/>
-+            <distortion model="poly3" focal="200" k1="0.00316"/>
-+            <distortion model="poly3" focal="300" k1="0.00387"/>
-+            <tca model="poly3" focal="70" br="-0.0000054" vr="1.0001364" bb="0.0000012" vb="1.0000391"/>
-+            <tca model="poly3" focal="85" br="-0.0000454" vr="1.0001576" bb="-0.0000234" vb="1.0000492"/>
-+            <tca model="poly3" focal="100" br="-0.0000196" vr="1.0000860" bb="-0.0000066" vb="1.0000204"/>
-+            <tca model="poly3" focal="140" br="-0.0000306" vr="1.0000669" bb="0.0000315" vb="0.9998543"/>
-+            <tca model="poly3" focal="200" br="-0.0000460" vr="1.0000480" bb="0.0000096" vb="0.9997688"/>
-+            <tca model="poly3" focal="250" br="-0.0000180" vr="1.0000398" bb="0.0000503" vb="0.9996853"/>
-+            <tca model="poly3" focal="300" br="-0.0000299" vr="1.0000671" bb="0.0001185" vb="0.9994449"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.0671" k2="0.0055" k3="-0.0590"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.0671" k2="0.0055" k3="-0.0590"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0816" k2="0.0207" k3="-0.0141"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0816" k2="0.0207" k3="-0.0141"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.0737" k2="-0.0013" k3="0.0045"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.0737" k2="-0.0013" k3="0.0045"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.0830" k2="0.0152" k3="-0.0047"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.0830" k2="0.0152" k3="-0.0047"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.0876" k2="0.0332" k3="-0.0183"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.0876" k2="0.0332" k3="-0.0183"/>
-+            <vignetting model="pa" focal="125" aperture="4.8" distance="10" k1="-0.0386" k2="-0.1118" k3="0.0070"/>
-+            <vignetting model="pa" focal="125" aperture="4.8" distance="1000" k1="-0.0386" k2="-0.1118" k3="0.0070"/>
-+            <vignetting model="pa" focal="125" aperture="5.6" distance="10" k1="-0.0723" k2="0.0431" k3="-0.0739"/>
-+            <vignetting model="pa" focal="125" aperture="5.6" distance="1000" k1="-0.0723" k2="0.0431" k3="-0.0739"/>
-+            <vignetting model="pa" focal="125" aperture="6.3" distance="10" k1="-0.0629" k2="-0.0017" k3="-0.0023"/>
-+            <vignetting model="pa" focal="125" aperture="6.3" distance="1000" k1="-0.0629" k2="-0.0017" k3="-0.0023"/>
-+            <vignetting model="pa" focal="125" aperture="7.1" distance="10" k1="-0.0558" k2="-0.0234" k3="0.0171"/>
-+            <vignetting model="pa" focal="125" aperture="7.1" distance="1000" k1="-0.0558" k2="-0.0234" k3="0.0171"/>
-+            <vignetting model="pa" focal="125" aperture="36" distance="10" k1="-0.0665" k2="0.0182" k3="-0.0098"/>
-+            <vignetting model="pa" focal="125" aperture="36" distance="1000" k1="-0.0665" k2="0.0182" k3="-0.0098"/>
-+            <vignetting model="pa" focal="185" aperture="5" distance="10" k1="-0.0028" k2="-0.2386" k3="0.0494"/>
-+            <vignetting model="pa" focal="185" aperture="5" distance="1000" k1="-0.0028" k2="-0.2386" k3="0.0494"/>
-+            <vignetting model="pa" focal="185" aperture="6.3" distance="10" k1="-0.0774" k2="0.1226" k3="-0.1592"/>
-+            <vignetting model="pa" focal="185" aperture="6.3" distance="1000" k1="-0.0774" k2="0.1226" k3="-0.1592"/>
-+            <vignetting model="pa" focal="185" aperture="7.1" distance="10" k1="-0.0573" k2="0.0064" k3="-0.0054"/>
-+            <vignetting model="pa" focal="185" aperture="7.1" distance="1000" k1="-0.0573" k2="0.0064" k3="-0.0054"/>
-+            <vignetting model="pa" focal="185" aperture="8" distance="10" k1="-0.0530" k2="-0.0087" k3="0.0082"/>
-+            <vignetting model="pa" focal="185" aperture="8" distance="1000" k1="-0.0530" k2="-0.0087" k3="0.0082"/>
-+            <vignetting model="pa" focal="185" aperture="36" distance="10" k1="-0.0596" k2="0.0033" k3="0.0041"/>
-+            <vignetting model="pa" focal="185" aperture="36" distance="1000" k1="-0.0596" k2="0.0033" k3="0.0041"/>
-+            <vignetting model="pa" focal="240" aperture="5.6" distance="10" k1="-0.0596" k2="-0.3878" k3="0.2221"/>
-+            <vignetting model="pa" focal="240" aperture="5.6" distance="1000" k1="-0.0596" k2="-0.3878" k3="0.2221"/>
-+            <vignetting model="pa" focal="240" aperture="6.3" distance="10" k1="0.0376" k2="-0.3203" k3="0.1160"/>
-+            <vignetting model="pa" focal="240" aperture="6.3" distance="1000" k1="0.0376" k2="-0.3203" k3="0.1160"/>
-+            <vignetting model="pa" focal="240" aperture="7.1" distance="10" k1="-0.0436" k2="0.0276" k3="-0.0918"/>
-+            <vignetting model="pa" focal="240" aperture="7.1" distance="1000" k1="-0.0436" k2="0.0276" k3="-0.0918"/>
-+            <vignetting model="pa" focal="240" aperture="8" distance="10" k1="-0.0510" k2="0.0102" k3="-0.0093"/>
-+            <vignetting model="pa" focal="240" aperture="8" distance="1000" k1="-0.0510" k2="0.0102" k3="-0.0093"/>
-+            <vignetting model="pa" focal="240" aperture="40" distance="10" k1="-0.0656" k2="0.0179" k3="-0.0044"/>
-+            <vignetting model="pa" focal="240" aperture="40" distance="1000" k1="-0.0656" k2="0.0179" k3="-0.0044"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.4926" k2="0.4029" k3="-0.1830"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.4926" k2="0.4029" k3="-0.1830"/>
-+            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-0.1245" k2="-0.2125" k3="0.1338"/>
-+            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-0.1245" k2="-0.2125" k3="0.1338"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="0.0010" k2="-0.2665" k3="0.1203"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="0.0010" k2="-0.2665" k3="0.1203"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.0404" k2="0.0084" k3="-0.0388"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.0404" k2="0.0084" k3="-0.0388"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="10" k1="-0.0669" k2="0.0271" k3="-0.0091"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.0669" k2="0.0271" k3="-0.0091"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S VR Zoom-Nikkor 70-200mm f/4G IF-ED</model>
-+        <model lang="en">Nikkor AF-S 70-200mm f/4G VR IF-ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="poly3" focal="70" k1="-0.00849"/>
-+            <distortion model="poly3" focal="86" k1="-0.00295"/>
-+            <distortion model="poly3" focal="102" k1="0.00234"/>
-+            <distortion model="poly3" focal="130" k1="0.00663"/>
-+            <distortion model="poly3" focal="170" k1="0.00789"/>
-+            <distortion model="poly3" focal="200" k1="0.00789"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Nikkor 50mm f/1.2</model>
-+        <model lang="en">Nikkor AI-S 50mm f/1.2</model>
-+        <mount>Nikon F AI</mount>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="50" a="0.0042" b="-0.01715" c="0.00585"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 50mm f/1.8G</model>
-+        <model lang="en">Nikkor AF-S 50mm f/1.8G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="ptlens" focal="50" a="-0.00299" b="0.00708" c="-0.00949"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 50mm f/1.8G</model>
-+        <model lang="en">Nikkor AF-S 50mm f/1.8G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="poly3" focal="50" k1="-0.00462"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX Nikkor 10-24mm f/3.5-4.5G ED</model>
-+        <model lang="en">Nikkor AF-S 10-24mm f/3.5-4.5G DX ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D3100 -->
-+            <distortion model="ptlens" focal="10" a="0.0054" b="-0.04682" c="0.05708"/>
-+            <distortion model="ptlens" focal="12" a="-0.00189" b="-0.01666" c="0.03458"/>
-+            <distortion model="ptlens" focal="15" a="-0.00516" b="0.00567" c="0.01351"/>
-+            <distortion model="ptlens" focal="18" a="-0.0069" b="0.02453" c="-0.02009"/>
-+            <distortion model="ptlens" focal="20" a="-0.00605" b="0.02554" c="-0.02419"/>
-+            <distortion model="ptlens" focal="24" a="0.00279" b="-0.00922" c="0.01907"/>
-+            <tca model="poly3" focal="10" vr="1.00043" vb="1.00014"/>
-+            <tca model="poly3" focal="12" vr="1.00047" vb="1"/>
-+            <tca model="poly3" focal="15" vr="1.00030" vb="1"/>
-+            <tca model="poly3" focal="18" vr="1.00020" vb="1"/>
-+            <tca model="poly3" focal="20" vr="1.00020" vb="1"/>
-+            <tca model="poly3" focal="24" vr="1.00016" vb="1"/>
-+            <!-- Taken with Nikon D5100 -->
-+            <vignetting model="pa" focal="10" aperture="3.5" distance="10" k1="-0.6853" k2="0.2007" k3="-0.0649"/>
-+            <vignetting model="pa" focal="10" aperture="3.5" distance="1000" k1="-0.6853" k2="0.2007" k3="-0.0649"/>
-+            <vignetting model="pa" focal="10" aperture="4.5" distance="10" k1="-0.6419" k2="0.2700" k3="-0.1483"/>
-+            <vignetting model="pa" focal="10" aperture="4.5" distance="1000" k1="-0.6419" k2="0.2700" k3="-0.1483"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="10" k1="-0.7370" k2="0.5622" k3="-0.2863"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.7370" k2="0.5622" k3="-0.2863"/>
-+            <vignetting model="pa" focal="10" aperture="6.3" distance="10" k1="-0.7084" k2="0.4323" k3="-0.1541"/>
-+            <vignetting model="pa" focal="10" aperture="6.3" distance="1000" k1="-0.7084" k2="0.4323" k3="-0.1541"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.7137" k2="0.4318" k3="-0.1499"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.7137" k2="0.4318" k3="-0.1499"/>
-+            <vignetting model="pa" focal="13" aperture="3.8" distance="10" k1="-0.8748" k2="0.3837" k3="-0.0372"/>
-+            <vignetting model="pa" focal="13" aperture="3.8" distance="1000" k1="-0.8748" k2="0.3837" k3="-0.0372"/>
-+            <vignetting model="pa" focal="13" aperture="5" distance="10" k1="-0.5207" k2="-0.0806" k3="0.1316"/>
-+            <vignetting model="pa" focal="13" aperture="5" distance="1000" k1="-0.5207" k2="-0.0806" k3="0.1316"/>
-+            <vignetting model="pa" focal="13" aperture="5.6" distance="10" k1="-0.6026" k2="0.2867" k3="-0.1180"/>
-+            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-0.6026" k2="0.2867" k3="-0.1180"/>
-+            <vignetting model="pa" focal="13" aperture="7.1" distance="10" k1="-0.6500" k2="0.3972" k3="-0.1414"/>
-+            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.6500" k2="0.3972" k3="-0.1414"/>
-+            <vignetting model="pa" focal="13" aperture="25" distance="10" k1="-0.6453" k2="0.3623" k3="-0.1133"/>
-+            <vignetting model="pa" focal="13" aperture="25" distance="1000" k1="-0.6453" k2="0.3623" k3="-0.1133"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.8350" k2="0.2741" k3="0.0331"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.8350" k2="0.2741" k3="0.0331"/>
-+            <vignetting model="pa" focal="16" aperture="5" distance="10" k1="-0.4548" k2="-0.3554" k3="0.3268"/>
-+            <vignetting model="pa" focal="16" aperture="5" distance="1000" k1="-0.4548" k2="-0.3554" k3="0.3268"/>
-+            <vignetting model="pa" focal="16" aperture="6.3" distance="10" k1="-0.5034" k2="0.1695" k3="-0.0860"/>
-+            <vignetting model="pa" focal="16" aperture="6.3" distance="1000" k1="-0.5034" k2="0.1695" k3="-0.0860"/>
-+            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-0.5765" k2="0.3872" k3="-0.1987"/>
-+            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-0.5765" k2="0.3872" k3="-0.1987"/>
-+            <vignetting model="pa" focal="16" aperture="25" distance="10" k1="-0.5564" k2="0.2517" k3="-0.0497"/>
-+            <vignetting model="pa" focal="16" aperture="25" distance="1000" k1="-0.5564" k2="0.2517" k3="-0.0497"/>
-+            <vignetting model="pa" focal="20" aperture="4.5" distance="10" k1="-0.9957" k2="0.6301" k3="-0.1733"/>
-+            <vignetting model="pa" focal="20" aperture="4.5" distance="1000" k1="-0.9957" k2="0.6301" k3="-0.1733"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.4075" k2="-0.4930" k3="0.4120"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.4075" k2="-0.4930" k3="0.4120"/>
-+            <vignetting model="pa" focal="20" aperture="6.3" distance="10" k1="-0.3307" k2="-0.3853" k3="0.2640"/>
-+            <vignetting model="pa" focal="20" aperture="6.3" distance="1000" k1="-0.3307" k2="-0.3853" k3="0.2640"/>
-+            <vignetting model="pa" focal="20" aperture="7.1" distance="10" k1="-0.3795" k2="-0.1028" k3="0.0431"/>
-+            <vignetting model="pa" focal="20" aperture="7.1" distance="1000" k1="-0.3795" k2="-0.1028" k3="0.0431"/>
-+            <vignetting model="pa" focal="20" aperture="29" distance="10" k1="-0.3901" k2="0.0633" k3="0.0278"/>
-+            <vignetting model="pa" focal="20" aperture="29" distance="1000" k1="-0.3901" k2="0.0633" k3="0.0278"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-1.1988" k2="1.1534" k3="-0.4938"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-1.1988" k2="1.1534" k3="-0.4938"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4573" k2="-0.3947" k3="0.3748"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4573" k2="-0.3947" k3="0.3748"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="10" k1="-0.2715" k2="-0.5475" k3="0.3702"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-0.2715" k2="-0.5475" k3="0.3702"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.1928" k2="-0.6044" k3="0.3684"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.1928" k2="-0.6044" k3="0.3684"/>
-+            <vignetting model="pa" focal="24" aperture="29" distance="10" k1="-0.4338" k2="0.2285" k3="-0.0697"/>
-+            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.4338" k2="0.2285" k3="-0.0697"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX Nikkor 55-300mm f/4.5-5.6G ED VR</model>
-+        <model lang="en">Nikkor AF-S 55-300mm f/4.5-5.6G DX ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5100 -->
-+            <distortion model="poly3" focal="55" k1="-0.00476"/>
-+            <distortion model="poly3" focal="70" k1="0.00214"/>
-+            <distortion model="poly3" focal="80" k1="0.00586"/>
-+            <distortion model="poly3" focal="102" k1="0.00753"/>
-+            <distortion model="poly3" focal="120" k1="0.01046"/>
-+            <distortion model="poly3" focal="210" k1="0.00842"/>
-+            <distortion model="poly3" focal="240" k1="0.0078"/>
-+            <distortion model="poly3" focal="300" k1="0.0052"/>
-+            <tca model="poly3" focal="55" br="0.0000449" vr="1.0001027" bb="-0.0000593" vb="1.0001628"/>
-+            <tca model="poly3" focal="72" br="-0.0000018" vr="1.0000297" bb="-0.0000243" vb="1.0000969"/>
-+            <tca model="poly3" focal="85" br="-0.0000032" vr="0.9999327" bb="-0.0000219" vb="1.0001070"/>
-+            <tca model="poly3" focal="105" br="-0.0000110" vr="0.9998510" bb="-0.0000130" vb="1.0000502"/>
-+            <tca model="poly3" focal="120" br="-0.0000439" vr="0.9998686" bb="-0.0000061" vb="0.9999919"/>
-+            <tca model="poly3" focal="180" br="-0.0000425" vr="0.9996593" bb="-0.0000118" vb="0.9999718"/>
-+            <tca model="poly3" focal="240" br="-0.0000727" vr="0.9996030" bb="0.0000511" vb="0.9997629"/>
-+            <tca model="poly3" focal="300" br="-0.0000846" vr="0.9995954" bb="0.0000817" vb="0.9996456"/>
-+            <!-- Taken with Nikon D90 -->
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="1.4" k1="-0.1563" k2="-0.3853" k3="0.1925"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="2.5" k1="-0.1735" k2="-0.3557" k3="0.1750"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.1564" k2="-0.3885" k3="0.1978"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1.4" k1="-0.0310" k2="-0.5524" k3="0.2835"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="2.5" k1="-0.0288" k2="-0.5601" k3="0.2855"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0390" k2="-0.5439" k3="0.2817"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1.4" k1="-0.1775" k2="0.1813" k3="-0.1513"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="2.5" k1="-0.1828" k2="0.1651" k3="-0.1393"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1590" k2="0.1353" k3="-0.1260"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1.4" k1="-0.1346" k2="0.0096" k3="0.0074"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="2.5" k1="-0.1401" k2="0.0161" k3="0.0037"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1451" k2="0.0428" k3="-0.0228"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1.4" k1="-0.1327" k2="0.0170" k3="-0.0025"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="2.5" k1="-0.1373" k2="0.0211" k3="-0.0050"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1264" k2="-0.0069" k3="0.0072"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1.4" k1="-0.1283" k2="-0.0127" k3="0.0209"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="2.5" k1="-0.1460" k2="0.0254" k3="-0.0015"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1291" k2="0.0052" k3="-0.0024"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1.4" k1="-0.0345" k2="-0.5708" k3="0.0053"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="2.5" k1="-0.1741" k2="-0.2613" k3="0.0548"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.1408" k2="-0.4292" k3="0.2225"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1.4" k1="-0.0311" k2="-0.2050" k3="-0.2991"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="2.5" k1="-0.0535" k2="-0.3362" k3="0.0822"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0147" k2="-0.5100" k3="0.2469"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1.4" k1="-0.3110" k2="0.7826" k3="-0.7492"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="2.5" k1="-0.1528" k2="0.1013" k3="-0.0801"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1504" k2="0.0801" k3="-0.0633"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1.4" k1="-0.2062" k2="0.3240" k3="-0.2840"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="2.5" k1="-0.1310" k2="0.0148" k3="-0.0009"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1293" k2="-0.0016" k3="0.0101"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1.4" k1="-0.1342" k2="0.0136" k3="0.0040"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="2.5" k1="-0.1398" k2="0.0185" k3="0.0032"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.1454" k2="0.0315" k3="-0.0079"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1.4" k1="-0.1275" k2="0.0028" k3="0.0094"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="2.5" k1="-0.1328" k2="-0.0038" k3="0.0171"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1456" k2="0.0361" k3="-0.0134"/>
-+            <vignetting model="pa" focal="98" aperture="4.5" distance="1.4" k1="0.2852" k2="-2.0509" k3="1.0577"/>
-+            <vignetting model="pa" focal="98" aperture="4.5" distance="2.5" k1="0.0397" k2="-0.8815" k3="0.2856"/>
-+            <vignetting model="pa" focal="98" aperture="4.5" distance="1000" k1="-0.1365" k2="-0.3014" k3="0.0175"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1.4" k1="0.3610" k2="-1.9637" k3="0.9196"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="2.5" k1="0.0699" k2="-0.7321" k3="0.1417"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.0769" k2="-0.3061" k3="0.0028"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1.4" k1="-0.0312" k2="-0.0059" k3="-0.4839"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="2.5" k1="-0.2787" k2="0.6651" k3="-0.6773"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.1921" k2="0.2401" k3="-0.2093"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="1.4" k1="-0.3166" k2="0.9387" k3="-1.0118"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="2.5" k1="-0.1696" k2="0.1722" k3="-0.1320"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.1189" k2="-0.0117" k3="0.0202"/>
-+            <vignetting model="pa" focal="98" aperture="16" distance="1.4" k1="-0.3614" k2="0.9702" k3="-0.9038"/>
-+            <vignetting model="pa" focal="98" aperture="16" distance="2.5" k1="-0.1250" k2="0.0193" k3="-0.0031"/>
-+            <vignetting model="pa" focal="98" aperture="16" distance="1000" k1="-0.1317" k2="0.0209" k3="-0.0009"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="1.4" k1="-0.2500" k2="0.5202" k3="-0.4593"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="2.5" k1="-0.1172" k2="-0.0003" k3="0.0070"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.1145" k2="-0.0157" k3="0.0170"/>
-+            <vignetting model="pa" focal="135" aperture="4.8" distance="1.4" k1="-0.0000" k2="-1.7913" k3="1.1319"/>
-+            <vignetting model="pa" focal="135" aperture="4.8" distance="2.5" k1="0.0949" k2="-1.6174" k3="0.9373"/>
-+            <vignetting model="pa" focal="135" aperture="4.8" distance="1000" k1="0.0103" k2="-0.9208" k3="0.4347"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1.4" k1="0.1404" k2="-1.9681" k3="1.1876"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="2.5" k1="0.1904" k2="-1.6793" k3="0.9253"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0441" k2="-0.8698" k3="0.3728"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1.4" k1="0.1546" k2="-0.8786" k3="0.2338"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="2.5" k1="0.0175" k2="-0.2614" k3="-0.1588"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.2000" k2="0.4142" k3="-0.4362"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1.4" k1="-0.1678" k2="0.4078" k3="-0.5606"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="2.5" k1="-0.2055" k2="0.4059" k3="-0.3793"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1214" k2="0.0283" k3="-0.0043"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1.4" k1="-0.2353" k2="0.5213" k3="-0.4793"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="2.5" k1="-0.1171" k2="0.0310" k3="-0.0118"/>
-+            <vignetting model="pa" focal="135" aperture="16" distance="1000" k1="-0.1138" k2="-0.0008" k3="0.0149"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1.4" k1="-0.1065" k2="0.0031" k3="0.0017"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="2.5" k1="-0.1130" k2="0.0188" k3="-0.0028"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.1087" k2="0.0038" k3="0.0074"/>
-+            <vignetting model="pa" focal="220" aperture="5.6" distance="1.4" k1="-0.5993" k2="-0.2249" k3="0.2811"/>
-+            <vignetting model="pa" focal="220" aperture="5.6" distance="2.5" k1="-0.2959" k2="-0.7383" k3="0.5473"/>
-+            <vignetting model="pa" focal="220" aperture="5.6" distance="1000" k1="-0.0428" k2="-0.9540" k3="0.5939"/>
-+            <vignetting model="pa" focal="220" aperture="8" distance="1.4" k1="0.0860" k2="-0.8901" k3="0.4400"/>
-+            <vignetting model="pa" focal="220" aperture="8" distance="2.5" k1="0.0931" k2="-0.6291" k3="0.2267"/>
-+            <vignetting model="pa" focal="220" aperture="8" distance="1000" k1="-0.0273" k2="-0.0840" k3="-0.1169"/>
-+            <vignetting model="pa" focal="220" aperture="11" distance="1.4" k1="-0.1131" k2="0.1799" k3="-0.2257"/>
-+            <vignetting model="pa" focal="220" aperture="11" distance="2.5" k1="-0.1260" k2="0.1105" k3="-0.0784"/>
-+            <vignetting model="pa" focal="220" aperture="11" distance="1000" k1="-0.0840" k2="0.0040" k3="0.0019"/>
-+            <vignetting model="pa" focal="220" aperture="16" distance="1.4" k1="-0.0855" k2="0.0183" k3="-0.0119"/>
-+            <vignetting model="pa" focal="220" aperture="16" distance="2.5" k1="-0.1089" k2="0.0417" k3="-0.0135"/>
-+            <vignetting model="pa" focal="220" aperture="16" distance="1000" k1="-0.1070" k2="0.0324" k3="-0.0067"/>
-+            <vignetting model="pa" focal="220" aperture="22" distance="1.4" k1="-0.0830" k2="0.0047" k3="-0.0011"/>
-+            <vignetting model="pa" focal="220" aperture="22" distance="2.5" k1="-0.0846" k2="0.0011" k3="0.0032"/>
-+            <vignetting model="pa" focal="220" aperture="22" distance="1000" k1="-0.0912" k2="-0.0026" k3="0.0120"/>
-+            <vignetting model="pa" focal="220" aperture="29" distance="1.4" k1="-0.0802" k2="-0.0018" k3="0.0019"/>
-+            <vignetting model="pa" focal="220" aperture="29" distance="2.5" k1="-0.0863" k2="0.0085" k3="-0.0032"/>
-+            <vignetting model="pa" focal="220" aperture="29" distance="1000" k1="-0.0919" k2="-0.0054" k3="0.0133"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1.4" k1="-0.5887" k2="0.0474" k3="0.1009"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="2.5" k1="-0.8507" k2="0.6406" k3="-0.2427"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.8204" k2="0.6367" k3="-0.2499"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1.4" k1="-0.5460" k2="0.2197" k3="-0.0757"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="2.5" k1="-0.1622" k2="-0.4699" k3="0.2976"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0345" k2="-0.7029" k3="0.3903"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1.4" k1="-0.0276" k2="-0.0953" k3="-0.0146"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="2.5" k1="-0.0842" k2="0.0697" k3="-0.0668"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0754" k2="0.0210" k3="-0.0086"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1.4" k1="-0.0726" k2="0.0125" k3="-0.0039"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="2.5" k1="-0.0711" k2="0.0118" k3="-0.0030"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0706" k2="0.0088" k3="-0.0017"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="1.4" k1="-0.0740" k2="0.0181" k3="-0.0071"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="2.5" k1="-0.0741" k2="0.0189" k3="-0.0076"/>
-+            <vignetting model="pa" focal="300" aperture="22" distance="1000" k1="-0.0727" k2="0.0005" k3="0.0054"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="1.4" k1="-0.0831" k2="0.0162" k3="-0.0018"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="2.5" k1="-0.0730" k2="0.0111" k3="-0.0044"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="1000" k1="-0.0716" k2="0.0050" k3="-0.0002"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 50mm f/1.4G</model>
-+        <model lang="en">Nikkor AF-S 50mm f/1.4G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5200 -->
-+            <distortion model="poly3" focal="50" k1="-0.00466"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 50mm f/1.4G</model>
-+        <model lang="en">Nikkor AF-S 50mm f/1.4G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="50" a="0.0021108699879156" b="-0.0109814656926241" c="0.00166683305342055"/>
-+            <tca model="poly3" focal="50" br="-0.0001128" vr="1.0003664" bb="0.0001510" vb="0.9998457"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="0.45" k1="-1.1508" k2="0.6858" k3="-0.2132"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="0.6" k1="-1.3327" k2="1.0063" k3="-0.3855"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1.5" k1="-1.5706" k2="1.4307" k3="-0.6168"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="2.99" k1="-1.6225" k2="1.5188" k3="-0.6647"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.6501" k2="1.5753" k3="-0.6982"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.45" k1="0.0075" k2="-0.9356" k3="0.4575"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="0.6" k1="0.0366" k2="-1.1504" k3="0.5953"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1.5" k1="0.0980" k2="-1.4311" k3="0.7606"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="2.99" k1="0.1138" k2="-1.4885" k3="0.7895"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="0.1216" k2="-1.5112" k3="0.7984"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.45" k1="-0.0511" k2="0.0361" k3="-0.2110"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.6" k1="-0.0591" k2="-0.0092" k3="-0.1988"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1.5" k1="-0.0937" k2="0.1135" k3="-0.3214"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="2.99" k1="-0.0902" k2="0.1371" k3="-0.3583"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0856" k2="0.1889" k3="-0.4171"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.45" k1="-0.1066" k2="0.1854" k3="-0.1845"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.6" k1="-0.1313" k2="0.2383" k3="-0.2417"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1.5" k1="-0.1593" k2="0.3318" k3="-0.3399"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="2.99" k1="-0.1616" k2="0.3870" k3="-0.3923"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1433" k2="0.3888" k3="-0.4128"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.45" k1="-0.0713" k2="-0.0071" k3="0.0249"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.6" k1="-0.0357" k2="-0.1225" k3="0.0943"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1.5" k1="-0.0485" k2="-0.0920" k3="0.0699"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="2.99" k1="-0.0664" k2="0.0142" k3="-0.0109"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0305" k2="-0.0424" k3="0.0102"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.45" k1="-0.1125" k2="0.0950" k3="-0.0365"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.6" k1="-0.0319" k2="-0.1457" k3="0.1152"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1.5" k1="-0.0486" k2="-0.1056" k3="0.0899"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="2.99" k1="-0.0601" k2="-0.0183" k3="0.0255"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0202" k2="-0.0970" k3="0.0663"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.45" k1="0.0218" k2="-0.1851" k3="0.1239"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.6" k1="-0.0392" k2="-0.1384" k3="0.1155"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1.5" k1="-0.0619" k2="-0.0729" k3="0.0702"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="2.99" k1="-0.0747" k2="0.0265" k3="0.0000"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="0.0455" k2="-0.2304" k3="0.1535"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.45" k1="0.0783" k2="-0.3106" k3="0.1983"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="0.6" k1="-0.0320" k2="-0.1747" k3="0.1511"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1.5" k1="-0.0657" k2="-0.0560" k3="0.0583"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="2.99" k1="-0.0804" k2="0.0464" k3="-0.0147"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="0.0439" k2="-0.2233" k3="0.1462"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- Also update copy at Nikon AI-S Nikkor 20mm f/2.8 below. -->
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Nikkor 20mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 20mm f/2.8D</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="20" a="0.0346145503714303" b="-0.0771531442478898" c="0.0142974496031017"/>
-+            <tca model="poly3" focal="20" br="-0.0003153" vr="1.0011160" bb="0.0003455" vb="0.9993072"/>
-+            <!-- Taken with Nikon D750 -->
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- Also update copy at Nikon AF Nikkor 20mm f/2.8D above. -->
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Nikkor 20mm f/2.8</model>
-+        <model lang="en">Nikkor AI-S 20mm f/2.8</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="20" a="0.0346145503714303" b="-0.0771531442478898" c="0.0142974496031017"/>
-+            <tca model="poly3" focal="20" br="-0.0003153" vr="1.0011160" bb="0.0003455" vb="0.9993072"/>
-+            <!-- Taken with Nikon D750 -->
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-1.4521" k2="0.9796" k3="-0.3187"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.3889" k2="-0.0987" k3="-0.1151"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.4861" k2="0.1721" k3="-0.1289"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.4275" k2="-0.0528" k3="0.0845"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.4001" k2="-0.1161" k3="0.1251"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 24-85 mm f/3.5-4.5G ED VR</model>
-+        <model lang="en">Nikkor AF-S 24-85mm f/3.5-4.5G ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D610 -->
-+            <distortion model="ptlens" focal="24" a="0.00771" b="-0.03274" c="0.01406"/>
-+            <distortion model="ptlens" focal="28" a="0.01346" b="-0.04515" c="0.04487"/>
-+            <distortion model="ptlens" focal="32" a="0.0165" b="-0.0444" c="0.05448"/>
-+            <distortion model="ptlens" focal="42" a="0.00831" b="-0.00929" c="0.02554"/>
-+            <distortion model="ptlens" focal="58" a="0.00581" b="-0.00104" c="0.0207"/>
-+            <distortion model="ptlens" focal="68" a="0.00072" b="0.01909" c="-0.00624"/>
-+            <distortion model="ptlens" focal="85" a="0.00148" b="0.01645" c="-0.00584"/>
-+            <tca model="poly3" focal="24" br="0.0000562" vr="1.0003064" bb="-0.0000458" vb="1.0001659"/>
-+            <tca model="poly3" focal="28" br="0.0000260" vr="1.0003036" bb="-0.0000758" vb="1.0001937"/>
-+            <tca model="poly3" focal="32" br="0.0001195" vr="1.0000822" bb="-0.0000848" vb="1.0002045"/>
-+            <tca model="poly3" focal="42" br="0.0000594" vr="0.9999884" bb="-0.0000847" vb="1.0001990"/>
-+            <tca model="poly3" focal="58" br="0.0000426" vr="0.9998852" bb="-0.0000709" vb="1.0001834"/>
-+            <tca model="poly3" focal="68" br="0.0000360" vr="0.9998503" bb="-0.0000556" vb="1.0001424"/>
-+            <tca model="poly3" focal="85" br="0.0000118" vr="0.9998654" bb="-0.0000847" vb="1.0001720"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 800mm f/5.6E FL ED VR</model>
-+        <model lang="en">Nikkor AF-S 800mm f/5.6E FL ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <aperture min="5.6" max="32"/>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="800" a="0.0015" b="-0.00178" c="0.00484"/>
-+            <!-- Much vigneting data still missing -->
-+            <vignetting model="pa" focal="800" aperture="5.6" distance="100" k1="-0.60708" k2="0.24577" k3="-0.10028"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 600mm f/4G ED VR</model>
-+        <model lang="en">Nikkor AF-S 600mm f/4G ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <aperture min="4" max="22"/>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="600" a="-0.00089" b="0.00493" c="-0.00382"/>
-+            <!-- Much vignetting data still missing -->
-+            <vignetting model="pa" focal="600" aperture="4" distance="100" k1="-1.12925" k2="1.1294" k3="-0.5612"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR</model>
-+        <model lang="en">Nikkor AF-S 18-140mm f/3.5-5.6G DX ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5100 -->
-+            <distortion model="ptlens" focal="18" a="0.02" b="-0.06" c="0.006"/>
-+            <distortion model="ptlens" focal="35" a="0.01" b="-0.014" c="0.017"/>
-+            <distortion model="ptlens" focal="52" a="-0.001" b="0.02" c="-0.012"/>
-+            <distortion model="ptlens" focal="70" a="0.001" b="0.014" c="-0.004"/>
-+            <distortion model="ptlens" focal="85" a="0.002" b="0.006" c="0.007"/>
-+            <distortion model="ptlens" focal="95" a="0.002" b="0.003" c="0.016"/>
-+            <distortion model="ptlens" focal="112" a="0.002" b="0.005" c="0.007"/>
-+            <distortion model="ptlens" focal="140" a="0.004" b="0.002" c="-0.002"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AI-S Fisheye-Nikkor 6mm f/2.8</model>
-+        <model lang="en">Nikkor AI-S 6mm f/2.8 Fisheye</model>
-+        <mount>Nikon F AI-S</mount>
-+        <type>fisheye</type>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken from
-+                 http://www.mir.com.my/rb/photography/companies/nikon/nikkoresources/fisheyes/6mm_FisheyeNikkor-Manual/8.jpg
-+                 -->
-+            <distortion model="ptlens" focal="6" a="0.011705" b="-0.01815" c="-0.03936"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Zoom-Nikkor 28-80mm f/3.3-5.6G</model>
-+        <model lang="en">Nikkor AF 28-80mm f/3.3-5.6G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="28" a="0.0075" b="-0.02022" c="-0.02162"/>
-+            <distortion model="ptlens" focal="35" a="0.00186" b="-0.00107" c="-0.02354"/>
-+            <distortion model="ptlens" focal="44" a="0.00037" b="0.009" c="-0.02965"/>
-+            <distortion model="ptlens" focal="52" a="-0.00025" b="0.00971" c="-0.02007"/>
-+            <distortion model="ptlens" focal="62" a="0.00492" b="-0.01327" c="0.01487"/>
-+            <distortion model="ptlens" focal="80" a="0.00758" b="-0.02553" c="0.03355"/>
-+            <tca model="poly3" focal="28" vr="1.0002814" vb="1.0000076"/>
-+            <tca model="poly3" focal="35" vr="1.0001889" vb="1.0000354"/>
-+            <tca model="poly3" focal="44" vr="1.0001187" vb="1.0000880"/>
-+            <tca model="poly3" focal="52" vr="1.0000687" vb="1.0001018"/>
-+            <tca model="poly3" focal="62" vr="0.9999994" vb="1.0000803"/>
-+            <tca model="poly3" focal="80" vr="0.9999976" vb="1.0000594"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED</model>
-+        <model lang="en">Nikkor AF 28-200mm f/3.5-5.6G IF-ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="28" a="0.03547" b="-0.10778" c="0.08687"/>
-+            <distortion model="ptlens" focal="38" a="0.02089" b="-0.04522" c="0.02617"/>
-+            <distortion model="ptlens" focal="48" a="0.01934" b="-0.04754" c="0.04983"/>
-+            <distortion model="ptlens" focal="62" a="0.0182" b="-0.03995" c="0.04876"/>
-+            <distortion model="ptlens" focal="85" a="0.01073" b="-0.00974" c="0.0161"/>
-+            <distortion model="ptlens" focal="125" a="0.00065" b="0.03125" c="-0.03952"/>
-+            <distortion model="ptlens" focal="200" a="0.01851" b="-0.05192" c="0.08089"/>
-+            <tca model="poly3" focal="28" vr="1.0002152" vb="1.0000092"/>
-+            <tca model="poly3" focal="38" vr="1.0001291" vb="1.0000999"/>
-+            <tca model="poly3" focal="48" vr="1.0000649" vb="1.0000876"/>
-+            <tca model="poly3" focal="62" vr="0.9999990" vb="1.0001145"/>
-+            <tca model="poly3" focal="85" vr="0.9999428" vb="1.0000457"/>
-+            <tca model="poly3" focal="125" vr="0.9999015" vb="0.9999823"/>
-+            <tca model="poly3" focal="200" vr="0.9999001" vb="0.9998229"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Zoom-Nikkor 20-35mm f/2.8D IF</model>
-+        <model lang="en">Nikkor AF 20-35mm f/2.8D IF</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D700 -->
-+            <distortion model="ptlens" focal="20" a="0.01479" b="-0.03259" c="0.0026"/>
-+            <distortion model="ptlens" focal="28" a="0.01506" b="-0.03716" c="0.02036"/>
-+            <distortion model="ptlens" focal="32" a="0.01362" b="-0.03456" c="0.02473"/>
-+            <distortion model="ptlens" focal="35" a="0.01467" b="-0.03881" c="0.03203"/>
-+            <tca model="poly3" focal="20" br="0.0000771" vr="1.0004274" bb="0.0000135" vb="1.0001100"/>
-+            <tca model="poly3" focal="28" br="0.0000742" vr="1.0001392" bb="-0.0000555" vb="1.0001588"/>
-+            <tca model="poly3" focal="32" br="0.0000672" vr="1.0001007" bb="-0.0000585" vb="1.0001230"/>
-+            <tca model="poly3" focal="35" br="0.0001757" vr="0.9999669" bb="-0.0000378" vb="1.0000656"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon Nikkor AI 20mm f/3.5</model>
-+        <model lang="en">Nikkor AI 20mm f/3.5</model>
-+        <mount>Nikon F AI</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D700 -->
-+            <distortion model="ptlens" focal="20" a="0.02362" b="-0.04833" c="-0.00643"/>
-+            <tca model="poly3" focal="20" br="-0.0000578" vr="1.0005977" bb="0.0002050" vb="0.9994372"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Micro-Nikkor 60mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 60mm f/2.8D Micro</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D700 -->
-+            <distortion model="poly3" focal="60" k1="0.00198"/>
-+            <tca model="poly3" focal="60" vr="1.0001048" vb="0.9998597"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF DX Fisheye-Nikkor 10.5mm f/2.8G ED</model>
-+        <model lang="en">Nikkor AF 10.5mm f/2.8G DX ED Fisheye</model>
-+        <mount>Nikon F AF</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7000 -->
-+            <!-- Taken with panorama -->
-+            <distortion model="ptlens" focal="10.5" a="0.03347" b="-0.0964" c="0.08113"/>
-+            <tca model="poly3" focal="10.5" br="0.0001472" vr="1.0001888" bb="-0.0000942" vb="1.0006018"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR</model>
-+        <model lang="en">Nikkor AF-S 18-300mm f/3.5-6.3G DX ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="ptlens" focal="18" a="0.0325" b="-0.10956" c="0.07226"/>
-+            <distortion model="ptlens" focal="21" a="0.01497" b="-0.03351" c="0.00742"/>
-+            <distortion model="ptlens" focal="26" a="0.00744" b="-0.00928" c="0.01137"/>
-+            <distortion model="ptlens" focal="32" a="0.01341" b="-0.02006" c="0.02382"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.0134" c="0"/>
-+            <distortion model="ptlens" focal="195" a="0" b="0.00838" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.00612" c="0"/>
-+            <tca model="poly3" focal="18" vr="1.0004549" vb="1.0001378"/>
-+            <tca model="poly3" focal="21" vr="1.0004561" vb="1.0001891"/>
-+            <tca model="poly3" focal="26" vr="1.0003475" vb="1.0001747"/>
-+            <tca model="poly3" focal="32" vr="1.0002402" vb="1.0000919"/>
-+            <tca model="poly3" focal="100" vr="1.0000580" vb="0.9998655"/>
-+            <tca model="poly3" focal="195" vr="0.9999012" vb="0.9996384"/>
-+            <tca model="poly3" focal="300" vr="0.9998668" vb="0.9991122"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Micro Nikkor 60mm f/2.8G ED</model>
-+        <model lang="en">Nikkor AF-S 60mm f/2.8G ED Micro</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7000 -->
-+            <distortion model="poly3" focal="60" k1="-0.00069"/>
-+            <tca model="poly3" focal="60" vr="0.9999113" vb="1.0000999"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 85mm f/1.4G</model>
-+        <model lang="en">Nikkor AF-S 85mm f/1.4G</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="poly3" focal="85" k1="-0.00369"/>
-+            <tca model="poly3" focal="85" br="0.0000048" vr="0.9999486" bb="-0.0000248" vb="1.0000052"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon Lens Series E 28mm f/2.8</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="28" a="0.01493" b="-0.05112" c="0.02965"/>
-+            <tca model="poly3" focal="28" vr="1.0004587" vb="0.9998259"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon Lens Series E 50mm f/1.8</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="poly3" focal="50" k1="0.0007"/>
-+            <tca model="poly3" focal="50" vr="1.0000550" vb="0.9999107"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon Lens Series E 100mm f/2.8</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="poly3" focal="100" k1="0.00588"/>
-+            <tca model="poly3" focal="100" vr="0.9998270" vb="0.9999607"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF Micro-Nikkor 105mm f/2.8D</model>
-+        <model lang="en">Nikkor AF 105mm f/2.8D Micro</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="poly3" focal="105" k1="0.00083"/>
-+            <tca model="poly3" focal="105" vr="0.9999257" vb="1.0000278"/>
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-1.2984" k2="1.4994" k3="-0.7772"/>
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-1.2984" k2="1.4994" k3="-0.7772"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.0934" k2="-0.0239" k3="-0.1779"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.0934" k2="-0.0239" k3="-0.1779"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0950" k2="0.0021" k3="-0.0049"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0950" k2="0.0021" k3="-0.0049"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0866" k2="-0.0231" k3="0.0150"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0866" k2="-0.0231" k3="0.0150"/>
-+            <vignetting model="pa" focal="105" aperture="32" distance="10" k1="-0.0379" k2="-0.1418" k3="0.0891"/>
-+            <vignetting model="pa" focal="105" aperture="32" distance="1000" k1="-0.0379" k2="-0.1418" k3="0.0891"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 300mm f/4E PF ED VR</model>
-+        <model lang="en">Nikkor AF-S 300mm f/4E PF ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="poly3" focal="300" k1="0.00407"/>
-+            <tca model="poly3" focal="300" vr="0.9998" vb="0.9999"/>
-+            <vignetting model="pa" focal="300" aperture="4" distance="10" k1="-1.4831" k2="1.6895" k3="-0.7941"/>
-+            <vignetting model="pa" focal="300" aperture="4" distance="1000" k1="-1.4831" k2="1.6895" k3="-0.7941"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.0612" k2="-0.8987" k3="0.6192"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.0612" k2="-0.8987" k3="0.6192"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="0.0480" k2="-0.4219" k3="0.1247"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.0480" k2="-0.4219" k3="0.1247"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.2131" k2="0.4794" k3="-0.3938"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.2131" k2="0.4794" k3="-0.3938"/>
-+            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.1730" k2="0.2293" k3="-0.0866"/>
-+            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.1730" k2="0.2293" k3="-0.0866"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR</model>
-+        <model lang="en">Nikkor AF-S 18-300mm f/3.5-5.6G DX ED VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7200 -->
-+            <distortion model="ptlens" focal="18" a="0.02888" b="-0.09293" c="0.04919"/>
-+            <distortion model="ptlens" focal="21" a="0.02797" b="-0.07952" c="0.04821"/>
-+            <distortion model="ptlens" focal="24" a="0.02199" b="-0.05351" c="0.04359"/>
-+            <distortion model="ptlens" focal="34" a="0.00463" b="0.00143" c="0.00316"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.01465" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.00896" c="0"/>
-+            <tca model="poly3" focal="18" br="-0.0002581" vr="1.0018248" bb="0.0002104" vb="0.9995971"/>
-+            <tca model="poly3" focal="21" br="-0.0002194" vr="1.0016713" bb="0.0001272" vb="0.9997500"/>
-+            <tca model="poly3" focal="24" br="-0.0001499" vr="1.0013653" bb="0.0000950" vb="0.9998781"/>
-+            <tca model="poly3" focal="34" br="-0.0000768" vr="1.0007444" bb="0.0000410" vb="1.0001477"/>
-+            <tca model="poly3" focal="100" br="0.0000304" vr="0.9996903" bb="0.0000115" vb="1.0006660"/>
-+            <tca model="poly3" focal="300" br="-0.0000065" vr="0.9994044" bb="-0.0000318" vb="1.0000918"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-S Nikkor 35mm f/1.8G ED</model>
-+        <model lang="en">Nikkor AF-S 35mm f/1.8G ED</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="ptlens" focal="35" a="0.02498" b="-0.07793" c="0.05642"/>
-+            <tca model="poly3" focal="35" br="-0.0002043" vr="1.0006177" bb="0.0003032" vb="0.9996507"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF DC-Nikkor 135mm f/2D</model>
-+        <model lang="en">Nikkor AF 135mm f/2D DC</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D750 -->
-+            <distortion model="ptlens" focal="135" a="0.00165" b="0.0009" c="-0.01172"/>
-+            <tca model="poly3" focal="135" br="-0.0001287" vr="0.9997403" bb="-0.0000253" vb="1.0008556"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF DC-Nikkor 105mm f/2D</model>
-+        <model lang="en">Nikkor AF 105mm f/2D DC</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D600 -->
-+            <distortion model="ptlens" focal="105" a="-0.00457" b="0.01891" c="-0.02932"/>
-+            <tca model="poly3" focal="105" vr="0.9998959" vb="1.0001104"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Nikon</maker>
-+        <model>Nikon AF-P DX Nikkor 18-55mm f/3.5-5.6G VR</model>
-+        <model lang="en">Nikkor AF-P 18-55mm f/3.5-5.6G DX VR</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D3300 -->
-+            <distortion model="ptlens" focal="18" a="0.01368" b="-0.06635" c="0.05634"/>
-+            <distortion model="ptlens" focal="27" a="-0.00251" b="-0.00039" c="0.00216"/>
-+            <distortion model="ptlens" focal="38" a="0.0081" b="-0.02326" c="0.01923"/>
-+            <distortion model="ptlens" focal="42" a="0.00752" b="-0.02904" c="0.03851"/>
-+            <distortion model="ptlens" focal="55" a="-0.00143" b="0.00372" c="0.00513"/>
-+            <tca model="poly3" focal="18" vr="1.0000132" vb="0.9999439"/>
-+            <tca model="poly3" focal="27" vr="1.0004023" vb="0.9999283"/>
-+            <tca model="poly3" focal="38" vr="1.0001621" vb="0.9999533"/>
-+            <tca model="poly3" focal="42" vr="1.0000028" vb="1.0000053"/>
-+            <tca model="poly3" focal="55" vr="0.9999729" vb="1.0000319"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-olympus.xml b/data/db/slr-olympus.xml
---- a/data/db/slr-olympus.xml	2013-10-11 23:54:00.000000000 +0200
-+++ b/data/db/slr-olympus.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,735 +1,800 @@
- <lensdatabase>
--
-     <mount>
-         <name>4/3 System</name>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
--        <name>olympusE10</name>
-+        <name>Olympus OM</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-300</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-330</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-400</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-410</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-420</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-450</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-500</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-510</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-520</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-+        <maker lang="en">Olympus</maker>
-+        <model>E-600</model>
-+        <mount>4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-620</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-10</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS OPTICAL CO.,LTD</maker>
-+        <maker>Olympus Optical Co.,Ltd</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-20,E-20N,E-20P</model>
-+        <model lang="en">E-20, E-20N, E-20P</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-30</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS CORPORATION</maker>
-+        <maker>Olympus Corporation</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-1</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-3</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>OLYMPUS IMAGING CORP.</maker>
-+        <maker>Olympus Imaging Corp.</maker>
-         <maker lang="en">Olympus</maker>
-         <model>E-5</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 7-14mm f/4.0</model>
-+        <model>Olympus Zuiko Digital ED 7-14mm f/4.0</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="7" a="-0.013136" b="0.015797" c="0" />
--            <distortion model="ptlens" focal="8" a="-0.020562" b="0.041619" c="0" />
--            <distortion model="ptlens" focal="9" a="0" b="-0.00181" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="0.004183" c="0" />
--            <distortion model="ptlens" focal="14" a="0" b="0.005149" c="0" />
-+            <distortion model="ptlens" focal="7" a="-0.013136" b="0.015797" c="0"/>
-+            <distortion model="ptlens" focal="8" a="-0.020562" b="0.041619" c="0"/>
-+            <distortion model="ptlens" focal="9" a="0" b="-0.00181" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0" b="0.004183" c="0"/>
-+            <distortion model="ptlens" focal="14" a="0" b="0.005149" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital ED 9-18mm F4.0-5.6</model>
--	    <focal min="9" max="18" />
--	    <aperture min="4" max="22" />
-+        <model>Olympus Zuiko Digital ED 9-18mm f/4.0-5.6</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <focal min="9" max="18"/>
-+        <aperture min="4" max="22"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9" a="-0.00278861" b="-0.0014655" c="0.00667809" />
--            <distortion model="ptlens" focal="11" a="-0.00230113" b="0.00568337" c="0.00385418" />
--            <distortion model="ptlens" focal="14" a="0.0028023" b="-0.00664244" c="0.0122182" />
--            <distortion model="ptlens" focal="18" a="-0.0010959" b="0.00291188" c="0.00571393" />
--            <tca model="poly3" focal="9" br="-0.0000859" vr="1.0002600" bb="-0.0001253" vb="1.0001971" />
--            <tca model="poly3" focal="11" br="0.0000079" vr="1.0001843" bb="-0.0001521" vb="1.0002540" />
--            <tca model="poly3" focal="14" br="0.0000509" vr="1.0001296" bb="-0.0001716" vb="1.0003184" />
--            <tca model="poly3" focal="18" br="-0.0000076" vr="1.0001488" bb="-0.0001226" vb="1.0002276" />
--            <vignetting model="pa" focal="9" aperture="4" distance="0.25" k1="-0.4907" k2="0.3365" k3="-0.3633" />
--            <vignetting model="pa" focal="9" aperture="4" distance="0.5" k1="-0.3635" k2="-0.0437" k3="-0.1999" />
--            <vignetting model="pa" focal="9" aperture="4" distance="1.5" k1="-0.3964" k2="0.0444" k3="-0.2357" />
--            <vignetting model="pa" focal="9" aperture="4" distance="1000" k1="-0.4847" k2="0.3284" k3="-0.3659" />
--            <vignetting model="pa" focal="9" aperture="5.6" distance="0.25" k1="-0.5288" k2="0.3913" k3="-0.2548" />
--            <vignetting model="pa" focal="9" aperture="5.6" distance="0.5" k1="-0.5652" k2="0.5795" k3="-0.4992" />
--            <vignetting model="pa" focal="9" aperture="5.6" distance="1.5" k1="-0.5558" k2="0.5286" k3="-0.4291" />
--            <vignetting model="pa" focal="9" aperture="5.6" distance="1000" k1="-0.5262" k2="0.3968" k3="-0.2696" />
--            <vignetting model="pa" focal="9" aperture="8" distance="0.25" k1="-0.4780" k2="0.1844" k3="-0.0634" />
--            <vignetting model="pa" focal="9" aperture="8" distance="0.5" k1="-0.5467" k2="0.4370" k3="-0.2988" />
--            <vignetting model="pa" focal="9" aperture="8" distance="1.5" k1="-0.5108" k2="0.2994" k3="-0.1706" />
--            <vignetting model="pa" focal="9" aperture="8" distance="1000" k1="-0.4782" k2="0.1966" k3="-0.0830" />
--            <vignetting model="pa" focal="9" aperture="11" distance="0.25" k1="-0.4465" k2="0.0730" k3="0.0311" />
--            <vignetting model="pa" focal="9" aperture="11" distance="0.5" k1="-0.4664" k2="0.1210" k3="-0.0095" />
--            <vignetting model="pa" focal="9" aperture="11" distance="1.5" k1="-0.4495" k2="0.0727" k3="0.0300" />
--            <vignetting model="pa" focal="9" aperture="11" distance="1000" k1="-0.4440" k2="0.0753" k3="0.0203" />
--            <vignetting model="pa" focal="9" aperture="22" distance="0.25" k1="-0.4413" k2="0.0577" k3="0.0418" />
--            <vignetting model="pa" focal="9" aperture="22" distance="0.5" k1="-0.4435" k2="0.0396" k3="0.0603" />
--            <vignetting model="pa" focal="9" aperture="22" distance="1.5" k1="-0.4350" k2="0.0336" k3="0.0564" />
--            <vignetting model="pa" focal="9" aperture="22" distance="1000" k1="-0.4265" k2="0.0312" k3="0.0510" />
--            <vignetting model="pa" focal="11" aperture="4.2" distance="0.25" k1="-0.3302" k2="-0.1235" k3="0.1126" />
--            <vignetting model="pa" focal="11" aperture="4.2" distance="0.5" k1="-0.3220" k2="-0.1480" k3="0.1226" />
--            <vignetting model="pa" focal="11" aperture="4.2" distance="1.5" k1="-0.3706" k2="-0.0564" k3="0.0705" />
--            <vignetting model="pa" focal="11" aperture="4.2" distance="1000" k1="-0.3230" k2="-0.1432" k3="0.1203" />
--            <vignetting model="pa" focal="11" aperture="5.6" distance="0.25" k1="-0.3821" k2="0.0319" k3="0.0501" />
--            <vignetting model="pa" focal="11" aperture="5.6" distance="0.5" k1="-0.3751" k2="0.0128" k3="0.0537" />
--            <vignetting model="pa" focal="11" aperture="5.6" distance="1.5" k1="-0.4153" k2="0.0847" k3="0.0139" />
--            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.3694" k2="0.0036" k3="0.0593" />
--            <vignetting model="pa" focal="11" aperture="8" distance="0.25" k1="-0.3874" k2="0.0419" k3="0.0427" />
--            <vignetting model="pa" focal="11" aperture="8" distance="0.5" k1="-0.3802" k2="0.0288" k3="0.0419" />
--            <vignetting model="pa" focal="11" aperture="8" distance="1.5" k1="-0.4239" k2="0.1017" k3="0.0041" />
--            <vignetting model="pa" focal="11" aperture="8" distance="1000" k1="-0.3714" k2="0.0095" k3="0.0541" />
--            <vignetting model="pa" focal="11" aperture="11" distance="0.25" k1="-0.3836" k2="0.0387" k3="0.0428" />
--            <vignetting model="pa" focal="11" aperture="11" distance="0.5" k1="-0.3739" k2="0.0151" k3="0.0490" />
--            <vignetting model="pa" focal="11" aperture="11" distance="1.5" k1="-0.4236" k2="0.0961" k3="0.0081" />
--            <vignetting model="pa" focal="11" aperture="11" distance="1000" k1="-0.3638" k2="-0.0006" k3="0.0571" />
--            <vignetting model="pa" focal="11" aperture="22" distance="0.25" k1="-0.3793" k2="0.0288" k3="0.0480" />
--            <vignetting model="pa" focal="11" aperture="22" distance="0.5" k1="-0.3650" k2="-0.0044" k3="0.0596" />
--            <vignetting model="pa" focal="11" aperture="22" distance="1.5" k1="-0.4100" k2="0.0695" k3="0.0227" />
--            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.3504" k2="-0.0312" k3="0.0756" />
--            <vignetting model="pa" focal="14" aperture="4.7" distance="0.25" k1="-0.2497" k2="-0.1201" k3="0.0833" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="0.5" k1="-0.2881" k2="-0.0597" k3="0.0502" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="1.5" k1="-0.2964" k2="-0.0383" k3="0.0359" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-0.2716" k2="-0.0830" k3="0.0621" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.2901" k2="-0.0018" k3="0.0393" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.3287" k2="0.0635" k3="0.0012" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.3408" k2="0.0883" k3="-0.0130" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3173" k2="0.0512" k3="0.0065" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.2956" k2="0.0042" k3="0.0370" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3288" k2="0.0609" k3="0.0024" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3445" k2="0.0924" k3="-0.0156" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.3168" k2="0.0513" k3="0.0055" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.25" k1="-0.3001" k2="0.0137" k3="0.0309" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.3303" k2="0.0659" k3="-0.0019" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1.5" k1="-0.3453" k2="0.0929" k3="-0.0154" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.3196" k2="0.0551" k3="0.0029" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.2913" k2="-0.0059" k3="0.0427" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3194" k2="0.0412" k3="0.0123" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3252" k2="0.0484" k3="0.0110" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3027" k2="0.0193" k3="0.0229" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.1995" k2="-0.0935" k3="0.0543" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2131" k2="-0.0960" k3="0.0617" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2363" k2="-0.0228" k3="0.0109" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1973" k2="-0.0914" k3="0.0520" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2243" k2="-0.0335" k3="0.0457" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2348" k2="-0.0381" k3="0.0523" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2563" k2="0.0297" k3="0.0063" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2175" k2="-0.0370" k3="0.0450" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.25" k1="-0.2260" k2="-0.0307" k3="0.0425" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2378" k2="-0.0365" k3="0.0525" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1.5" k1="-0.2581" k2="0.0291" k3="0.0082" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2174" k2="-0.0411" k3="0.0476" />
--            <vignetting model="pa" focal="18" aperture="16" distance="0.25" k1="-0.2238" k2="-0.0346" k3="0.0442" />
--            <vignetting model="pa" focal="18" aperture="16" distance="0.5" k1="-0.2330" k2="-0.0461" k3="0.0566" />
--            <vignetting model="pa" focal="18" aperture="16" distance="1.5" k1="-0.2529" k2="0.0172" k3="0.0143" />
--            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2168" k2="-0.0395" k3="0.0457" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2231" k2="-0.0364" k3="0.0441" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2267" k2="-0.0621" k3="0.0669" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2467" k2="0.0020" k3="0.0237" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2048" k2="-0.0675" k3="0.0626" />
-+            <!-- Taken with Olympus E-M10 -->
-+            <distortion model="poly3" focal="9" k1="-0.00991"/>
-+            <distortion model="poly3" focal="11" k1="-0.00574"/>
-+            <distortion model="poly3" focal="12" k1="-0.00412"/>
-+            <distortion model="poly3" focal="13" k1="-0.00209"/>
-+            <distortion model="poly3" focal="18" k1="-0.001"/>
-+            <tca model="poly3" focal="9" vr="1.0004547" vb="0.9999902"/>
-+            <tca model="poly3" focal="11" vr="1.0003758" vb="0.9999724"/>
-+            <tca model="poly3" focal="12" vr="1.0002944" vb="0.9999781"/>
-+            <tca model="poly3" focal="13" vr="1.0003339" vb="0.9999837"/>
-+            <tca model="poly3" focal="18" vr="1.0003062" vb="0.9999625"/>
-+            <vignetting model="pa" focal="9" aperture="4" distance="0.25" k1="-0.4907" k2="0.3365" k3="-0.3633"/>
-+            <vignetting model="pa" focal="9" aperture="4" distance="0.5" k1="-0.3635" k2="-0.0437" k3="-0.1999"/>
-+            <vignetting model="pa" focal="9" aperture="4" distance="1.5" k1="-0.3964" k2="0.0444" k3="-0.2357"/>
-+            <vignetting model="pa" focal="9" aperture="4" distance="1000" k1="-0.4847" k2="0.3284" k3="-0.3659"/>
-+            <vignetting model="pa" focal="9" aperture="5.6" distance="0.25" k1="-0.5288" k2="0.3913" k3="-0.2548"/>
-+            <vignetting model="pa" focal="9" aperture="5.6" distance="0.5" k1="-0.5652" k2="0.5795" k3="-0.4992"/>
-+            <vignetting model="pa" focal="9" aperture="5.6" distance="1.5" k1="-0.5558" k2="0.5286" k3="-0.4291"/>
-+            <vignetting model="pa" focal="9" aperture="5.6" distance="1000" k1="-0.5262" k2="0.3968" k3="-0.2696"/>
-+            <vignetting model="pa" focal="9" aperture="8" distance="0.25" k1="-0.4780" k2="0.1844" k3="-0.0634"/>
-+            <vignetting model="pa" focal="9" aperture="8" distance="0.5" k1="-0.5467" k2="0.4370" k3="-0.2988"/>
-+            <vignetting model="pa" focal="9" aperture="8" distance="1.5" k1="-0.5108" k2="0.2994" k3="-0.1706"/>
-+            <vignetting model="pa" focal="9" aperture="8" distance="1000" k1="-0.4782" k2="0.1966" k3="-0.0830"/>
-+            <vignetting model="pa" focal="9" aperture="11" distance="0.25" k1="-0.4465" k2="0.0730" k3="0.0311"/>
-+            <vignetting model="pa" focal="9" aperture="11" distance="0.5" k1="-0.4664" k2="0.1210" k3="-0.0095"/>
-+            <vignetting model="pa" focal="9" aperture="11" distance="1.5" k1="-0.4495" k2="0.0727" k3="0.0300"/>
-+            <vignetting model="pa" focal="9" aperture="11" distance="1000" k1="-0.4440" k2="0.0753" k3="0.0203"/>
-+            <vignetting model="pa" focal="9" aperture="22" distance="0.25" k1="-0.4413" k2="0.0577" k3="0.0418"/>
-+            <vignetting model="pa" focal="9" aperture="22" distance="0.5" k1="-0.4435" k2="0.0396" k3="0.0603"/>
-+            <vignetting model="pa" focal="9" aperture="22" distance="1.5" k1="-0.4350" k2="0.0336" k3="0.0564"/>
-+            <vignetting model="pa" focal="9" aperture="22" distance="1000" k1="-0.4265" k2="0.0312" k3="0.0510"/>
-+            <vignetting model="pa" focal="11" aperture="4.2" distance="0.25" k1="-0.3302" k2="-0.1235" k3="0.1126"/>
-+            <vignetting model="pa" focal="11" aperture="4.2" distance="0.5" k1="-0.3220" k2="-0.1480" k3="0.1226"/>
-+            <vignetting model="pa" focal="11" aperture="4.2" distance="1.5" k1="-0.3706" k2="-0.0564" k3="0.0705"/>
-+            <vignetting model="pa" focal="11" aperture="4.2" distance="1000" k1="-0.3230" k2="-0.1432" k3="0.1203"/>
-+            <vignetting model="pa" focal="11" aperture="5.6" distance="0.25" k1="-0.3821" k2="0.0319" k3="0.0501"/>
-+            <vignetting model="pa" focal="11" aperture="5.6" distance="0.5" k1="-0.3751" k2="0.0128" k3="0.0537"/>
-+            <vignetting model="pa" focal="11" aperture="5.6" distance="1.5" k1="-0.4153" k2="0.0847" k3="0.0139"/>
-+            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.3694" k2="0.0036" k3="0.0593"/>
-+            <vignetting model="pa" focal="11" aperture="8" distance="0.25" k1="-0.3874" k2="0.0419" k3="0.0427"/>
-+            <vignetting model="pa" focal="11" aperture="8" distance="0.5" k1="-0.3802" k2="0.0288" k3="0.0419"/>
-+            <vignetting model="pa" focal="11" aperture="8" distance="1.5" k1="-0.4239" k2="0.1017" k3="0.0041"/>
-+            <vignetting model="pa" focal="11" aperture="8" distance="1000" k1="-0.3714" k2="0.0095" k3="0.0541"/>
-+            <vignetting model="pa" focal="11" aperture="11" distance="0.25" k1="-0.3836" k2="0.0387" k3="0.0428"/>
-+            <vignetting model="pa" focal="11" aperture="11" distance="0.5" k1="-0.3739" k2="0.0151" k3="0.0490"/>
-+            <vignetting model="pa" focal="11" aperture="11" distance="1.5" k1="-0.4236" k2="0.0961" k3="0.0081"/>
-+            <vignetting model="pa" focal="11" aperture="11" distance="1000" k1="-0.3638" k2="-0.0006" k3="0.0571"/>
-+            <vignetting model="pa" focal="11" aperture="22" distance="0.25" k1="-0.3793" k2="0.0288" k3="0.0480"/>
-+            <vignetting model="pa" focal="11" aperture="22" distance="0.5" k1="-0.3650" k2="-0.0044" k3="0.0596"/>
-+            <vignetting model="pa" focal="11" aperture="22" distance="1.5" k1="-0.4100" k2="0.0695" k3="0.0227"/>
-+            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.3504" k2="-0.0312" k3="0.0756"/>
-+            <vignetting model="pa" focal="14" aperture="4.7" distance="0.25" k1="-0.2497" k2="-0.1201" k3="0.0833"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="0.5" k1="-0.2881" k2="-0.0597" k3="0.0502"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="1.5" k1="-0.2964" k2="-0.0383" k3="0.0359"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-0.2716" k2="-0.0830" k3="0.0621"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.2901" k2="-0.0018" k3="0.0393"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.3287" k2="0.0635" k3="0.0012"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.3408" k2="0.0883" k3="-0.0130"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.3173" k2="0.0512" k3="0.0065"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.2956" k2="0.0042" k3="0.0370"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3288" k2="0.0609" k3="0.0024"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3445" k2="0.0924" k3="-0.0156"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.3168" k2="0.0513" k3="0.0055"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.25" k1="-0.3001" k2="0.0137" k3="0.0309"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.5" k1="-0.3303" k2="0.0659" k3="-0.0019"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1.5" k1="-0.3453" k2="0.0929" k3="-0.0154"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.3196" k2="0.0551" k3="0.0029"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.2913" k2="-0.0059" k3="0.0427"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3194" k2="0.0412" k3="0.0123"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3252" k2="0.0484" k3="0.0110"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3027" k2="0.0193" k3="0.0229"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.1995" k2="-0.0935" k3="0.0543"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2131" k2="-0.0960" k3="0.0617"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2363" k2="-0.0228" k3="0.0109"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.1973" k2="-0.0914" k3="0.0520"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2243" k2="-0.0335" k3="0.0457"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2348" k2="-0.0381" k3="0.0523"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2563" k2="0.0297" k3="0.0063"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2175" k2="-0.0370" k3="0.0450"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.25" k1="-0.2260" k2="-0.0307" k3="0.0425"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.5" k1="-0.2378" k2="-0.0365" k3="0.0525"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1.5" k1="-0.2581" k2="0.0291" k3="0.0082"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.2174" k2="-0.0411" k3="0.0476"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="0.25" k1="-0.2238" k2="-0.0346" k3="0.0442"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="0.5" k1="-0.2330" k2="-0.0461" k3="0.0566"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1.5" k1="-0.2529" k2="0.0172" k3="0.0143"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2168" k2="-0.0395" k3="0.0457"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2231" k2="-0.0364" k3="0.0441"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2267" k2="-0.0621" k3="0.0669"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2467" k2="0.0020" k3="0.0237"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2048" k2="-0.0675" k3="0.0626"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 11-22mm f/2.8-3.5</model>
-+        <model>Olympus Zuiko Digital 11-22mm f/2.8-3.5</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="11" a="0" b="-0.008811" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="-0.006178" c="0" />
--            <distortion model="ptlens" focal="13" a="0" b="-0.004701" c="0" />
--            <distortion model="ptlens" focal="14" a="0" b="-0.004665" c="0" />
--            <distortion model="ptlens" focal="16" a="0" b="-0.002232" c="0" />
--            <distortion model="ptlens" focal="20" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="22" a="0" b="0" c="0" />
-+            <distortion model="poly3" focal="11" k1="-0.008811"/>
-+            <distortion model="poly3" focal="12" k1="-0.006178"/>
-+            <distortion model="poly3" focal="13" k1="-0.004701"/>
-+            <distortion model="poly3" focal="14" k1="-0.004665"/>
-+            <distortion model="poly3" focal="16" k1="-0.002232"/>
-+            <distortion model="poly3" focal="20" k1="0"/>
-+            <distortion model="poly3" focal="22" k1="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Olympus</maker>
--	    <model>Zuiko Digital ED 14-42mm F3.5-5.6</model>
--	    <focal min="14" max="42" />
--	    <aperture min="3.5" max="22" />
--	    <mount>4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="14" model="ptlens" a="0.0100665" b="-0.0270472" c="0.0022372" />
--	        <distortion focal="18" model="ptlens" a="-0.00368686" b="0.00286171" c="-0.0102343" />
--	        <distortion focal="25" model="ptlens" a="-1.55769e-05" b="-2.09253e-05" c="-0.00318557" />
--	        <distortion focal="35" model="ptlens" a="-0.00265046" b="0.00843281" c="-0.00647169" />
--	        <distortion focal="42" model="ptlens" a="-0.00342208" b="0.0114471" c="-0.0105329" />
--            <tca model="poly3" focal="14" br="-0.0000061" vr="1.0003376" bb="-0.0000092" vb="1.0000329" />
--            <tca model="poly3" focal="18" br="-0.0001031" vr="1.0003988" bb="0.0000126" vb="0.9999971" />
--            <tca model="poly3" focal="25" br="-0.0001150" vr="1.0003942" bb="0.0000327" vb="0.9998980" />
--            <tca model="poly3" focal="35" br="-0.0000998" vr="1.0003497" bb="0.0000562" vb="0.9997683" />
--            <tca model="poly3" focal="42" br="-0.0000307" vr="1.0001997" bb="0.0000116" vb="0.9997666" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="0.25" k1="-1.1577" k2="1.1639" k3="-0.6325" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="0.5" k1="-1.1017" k2="1.0353" k3="-0.5372" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1.5" k1="-1.1102" k2="1.0456" k3="-0.5203" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-1.0734" k2="0.9650" k3="-0.4461" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.25" k1="-0.6583" k2="0.1519" k3="-0.0354" />
--            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.5834" k2="-0.0363" k3="0.0982" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1.5" k1="-0.5680" k2="-0.0885" k3="0.1539" />
--            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.5430" k2="-0.1463" k3="0.2081" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.3608" k2="-0.0980" k3="0.0591" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.2904" k2="-0.2388" k3="0.1294" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.2905" k2="-0.2288" k3="0.1233" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2709" k2="-0.2310" k3="0.1168" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.3772" k2="-0.0503" k3="0.0933" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3059" k2="-0.1861" k3="0.1573" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3039" k2="-0.1733" k3="0.1464" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.2818" k2="-0.1810" k3="0.1460" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.3753" k2="-0.0567" k3="0.0960" />
--            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3181" k2="-0.1629" k3="0.1409" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3230" k2="-0.1354" k3="0.1224" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3002" k2="-0.1549" k3="0.1328" />
--            <vignetting model="pa" focal="18" aperture="3.9" distance="0.25" k1="-0.6326" k2="0.3204" k3="-0.0775" />
--            <vignetting model="pa" focal="18" aperture="3.9" distance="0.5" k1="-0.6116" k2="0.2713" k3="-0.0527" />
--            <vignetting model="pa" focal="18" aperture="3.9" distance="1.5" k1="-0.6342" k2="0.3048" k3="-0.0662" />
--            <vignetting model="pa" focal="18" aperture="3.9" distance="1000" k1="-0.6072" k2="0.2754" k3="-0.0563" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.25" k1="-0.6448" k2="0.3530" k3="-0.0992" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.5" k1="-0.6117" k2="0.2685" k3="-0.0499" />
--            <vignetting model="pa" focal="18" aperture="4" distance="1.5" k1="-0.6344" k2="0.3047" k3="-0.0649" />
--            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.6006" k2="0.2636" k3="-0.0503" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.2873" k2="-0.0066" k3="0.0357" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2627" k2="-0.0620" k3="0.0623" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2634" k2="-0.0668" k3="0.0694" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2369" k2="-0.0848" k3="0.0703" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2776" k2="-0.0226" k3="0.0424" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2568" k2="-0.0779" k3="0.0703" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2554" k2="-0.0828" k3="0.0770" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2246" k2="-0.1115" k3="0.0867" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2682" k2="-0.0430" k3="0.0519" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2542" k2="-0.0842" k3="0.0714" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2509" k2="-0.0956" k3="0.0838" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2244" k2="-0.1167" k3="0.0887" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="0.25" k1="-0.2192" k2="-0.0991" k3="0.0854" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.1840" k2="-0.1230" k3="0.0899" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="1.5" k1="-0.1954" k2="-0.1129" k3="0.0854" />
--            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1780" k2="-0.1341" k3="0.0946" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.25" k1="-0.2087" k2="-0.0337" k3="0.0427" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1678" k2="-0.0753" k3="0.0589" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1.5" k1="-0.1802" k2="-0.0632" k3="0.0547" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1704" k2="-0.0629" k3="0.0492" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.25" k1="-0.1993" k2="-0.0546" k3="0.0532" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1729" k2="-0.0644" k3="0.0496" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1.5" k1="-0.1844" k2="-0.0506" k3="0.0426" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1692" k2="-0.0656" k3="0.0490" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.25" k1="-0.1951" k2="-0.0631" k3="0.0560" />
--            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1675" k2="-0.0746" k3="0.0534" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1.5" k1="-0.1763" k2="-0.0661" k3="0.0503" />
--            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1645" k2="-0.0695" k3="0.0480" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.25" k1="-0.1937" k2="-0.0550" k3="0.0529" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1647" k2="-0.0858" k3="0.0616" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1.5" k1="-0.1755" k2="-0.0706" k3="0.0527" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1662" k2="-0.0726" k3="0.0511" />
--            <vignetting model="pa" focal="35" aperture="5.3" distance="0.25" k1="-0.1492" k2="-0.0890" k3="0.0710" />
--            <vignetting model="pa" focal="35" aperture="5.3" distance="0.5" k1="-0.1392" k2="-0.0753" k3="0.0562" />
--            <vignetting model="pa" focal="35" aperture="5.3" distance="1.5" k1="-0.1340" k2="-0.0765" k3="0.0573" />
--            <vignetting model="pa" focal="35" aperture="5.3" distance="1000" k1="-0.1386" k2="-0.0672" k3="0.0499" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.25" k1="-0.1202" k2="-0.1164" k3="0.0828" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.1168" k2="-0.0831" k3="0.0547" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1.5" k1="-0.1126" k2="-0.0797" k3="0.0521" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1134" k2="-0.0824" k3="0.0539" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.25" k1="-0.1173" k2="-0.1203" k3="0.0831" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.1159" k2="-0.0834" k3="0.0536" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1.5" k1="-0.1117" k2="-0.0819" k3="0.0523" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1575" k2="-0.0222" k3="0.0261" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.25" k1="-0.1118" k2="-0.1289" k3="0.0870" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.1097" k2="-0.0973" k3="0.0606" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1.5" k1="-0.1072" k2="-0.0876" k3="0.0532" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1715" k2="0.0012" k3="0.0129" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.25" k1="-0.1010" k2="-0.1523" k3="0.0986" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.5" k1="-0.1038" k2="-0.1111" k3="0.0675" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1.5" k1="-0.0966" k2="-0.1117" k3="0.0666" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1663" k2="-0.0167" k3="0.0242" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="0.25" k1="-0.1647" k2="0.0714" k3="-0.0687" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="0.5" k1="-0.2096" k2="0.2566" k3="-0.2572" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="1.5" k1="-0.2607" k2="0.5266" k3="-0.5213" />
--            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.2696" k2="0.5231" k3="-0.5145" />
--            <vignetting model="pa" focal="42" aperture="8" distance="0.25" k1="-0.1154" k2="-0.0386" k3="0.0196" />
--            <vignetting model="pa" focal="42" aperture="8" distance="0.5" k1="-0.0888" k2="-0.1169" k3="0.0674" />
--            <vignetting model="pa" focal="42" aperture="8" distance="1.5" k1="-0.1220" k2="0.0535" k3="-0.0854" />
--            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.1655" k2="0.1630" k3="-0.1650" />
--            <vignetting model="pa" focal="42" aperture="11" distance="0.25" k1="-0.1119" k2="-0.0449" k3="0.0222" />
--            <vignetting model="pa" focal="42" aperture="11" distance="0.5" k1="-0.0869" k2="-0.1179" k3="0.0709" />
--            <vignetting model="pa" focal="42" aperture="11" distance="1.5" k1="-0.0765" k2="-0.1123" k3="0.0598" />
--            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.1099" k2="-0.0478" k3="0.0226" />
--            <vignetting model="pa" focal="42" aperture="16" distance="0.25" k1="-0.0950" k2="-0.0713" k3="0.0366" />
--            <vignetting model="pa" focal="42" aperture="16" distance="0.5" k1="-0.0759" k2="-0.1225" k3="0.0693" />
--            <vignetting model="pa" focal="42" aperture="16" distance="1.5" k1="-0.0611" k2="-0.1267" k3="0.0636" />
--            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.0901" k2="-0.0788" k3="0.0410" />
--            <vignetting model="pa" focal="42" aperture="22" distance="0.25" k1="-0.1066" k2="-0.0598" k3="0.0317" />
--            <vignetting model="pa" focal="42" aperture="22" distance="0.5" k1="-0.0845" k2="-0.1211" k3="0.0722" />
--            <vignetting model="pa" focal="42" aperture="22" distance="1.5" k1="-0.0755" k2="-0.1128" k3="0.0580" />
--            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1034" k2="-0.0652" k3="0.0355" />
--	    </calibration>
-+        <maker>Olympus</maker>
-+        <model>Olympus Zuiko Digital ED 14-42mm f/3.5-5.6</model>
-+        <mount>4/3 System</mount>
-+        <focal min="14" max="42"/>
-+        <aperture min="3.5" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="14" model="ptlens" a="0.0100665" b="-0.0270472" c="0.0022372"/>
-+            <distortion focal="18" model="ptlens" a="-0.00368686" b="0.00286171" c="-0.0102343"/>
-+            <distortion focal="25" model="ptlens" a="-1.55769e-05" b="-2.09253e-05" c="-0.00318557"/>
-+            <distortion focal="35" model="ptlens" a="-0.00265046" b="0.00843281" c="-0.00647169"/>
-+            <distortion focal="42" model="ptlens" a="-0.00342208" b="0.0114471" c="-0.0105329"/>
-+            <tca model="poly3" focal="14" br="-0.0000061" vr="1.0003376" bb="-0.0000092" vb="1.0000329"/>
-+            <tca model="poly3" focal="18" br="-0.0001031" vr="1.0003988" bb="0.0000126" vb="0.9999971"/>
-+            <tca model="poly3" focal="25" br="-0.0001150" vr="1.0003942" bb="0.0000327" vb="0.9998980"/>
-+            <tca model="poly3" focal="35" br="-0.0000998" vr="1.0003497" bb="0.0000562" vb="0.9997683"/>
-+            <tca model="poly3" focal="42" br="-0.0000307" vr="1.0001997" bb="0.0000116" vb="0.9997666"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="0.25" k1="-1.1577" k2="1.1639" k3="-0.6325"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="0.5" k1="-1.1017" k2="1.0353" k3="-0.5372"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1.5" k1="-1.1102" k2="1.0456" k3="-0.5203"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-1.0734" k2="0.9650" k3="-0.4461"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.25" k1="-0.6583" k2="0.1519" k3="-0.0354"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="0.5" k1="-0.5834" k2="-0.0363" k3="0.0982"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1.5" k1="-0.5680" k2="-0.0885" k3="0.1539"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.5430" k2="-0.1463" k3="0.2081"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.25" k1="-0.3608" k2="-0.0980" k3="0.0591"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.5" k1="-0.2904" k2="-0.2388" k3="0.1294"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1.5" k1="-0.2905" k2="-0.2288" k3="0.1233"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2709" k2="-0.2310" k3="0.1168"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.25" k1="-0.3772" k2="-0.0503" k3="0.0933"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.5" k1="-0.3059" k2="-0.1861" k3="0.1573"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1.5" k1="-0.3039" k2="-0.1733" k3="0.1464"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.2818" k2="-0.1810" k3="0.1460"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.25" k1="-0.3753" k2="-0.0567" k3="0.0960"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="0.5" k1="-0.3181" k2="-0.1629" k3="0.1409"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1.5" k1="-0.3230" k2="-0.1354" k3="0.1224"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.3002" k2="-0.1549" k3="0.1328"/>
-+            <vignetting model="pa" focal="18" aperture="3.9" distance="0.25" k1="-0.6326" k2="0.3204" k3="-0.0775"/>
-+            <vignetting model="pa" focal="18" aperture="3.9" distance="0.5" k1="-0.6116" k2="0.2713" k3="-0.0527"/>
-+            <vignetting model="pa" focal="18" aperture="3.9" distance="1.5" k1="-0.6342" k2="0.3048" k3="-0.0662"/>
-+            <vignetting model="pa" focal="18" aperture="3.9" distance="1000" k1="-0.6072" k2="0.2754" k3="-0.0563"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="0.25" k1="-0.6448" k2="0.3530" k3="-0.0992"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="0.5" k1="-0.6117" k2="0.2685" k3="-0.0499"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1.5" k1="-0.6344" k2="0.3047" k3="-0.0649"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.6006" k2="0.2636" k3="-0.0503"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="-0.2873" k2="-0.0066" k3="0.0357"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.5" k1="-0.2627" k2="-0.0620" k3="0.0623"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1.5" k1="-0.2634" k2="-0.0668" k3="0.0694"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2369" k2="-0.0848" k3="0.0703"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.2776" k2="-0.0226" k3="0.0424"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.5" k1="-0.2568" k2="-0.0779" k3="0.0703"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1.5" k1="-0.2554" k2="-0.0828" k3="0.0770"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2246" k2="-0.1115" k3="0.0867"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.2682" k2="-0.0430" k3="0.0519"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.5" k1="-0.2542" k2="-0.0842" k3="0.0714"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1.5" k1="-0.2509" k2="-0.0956" k3="0.0838"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2244" k2="-0.1167" k3="0.0887"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="0.25" k1="-0.2192" k2="-0.0991" k3="0.0854"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="0.5" k1="-0.1840" k2="-0.1230" k3="0.0899"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="1.5" k1="-0.1954" k2="-0.1129" k3="0.0854"/>
-+            <vignetting model="pa" focal="25" aperture="4.7" distance="1000" k1="-0.1780" k2="-0.1341" k3="0.0946"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.25" k1="-0.2087" k2="-0.0337" k3="0.0427"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.5" k1="-0.1678" k2="-0.0753" k3="0.0589"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1.5" k1="-0.1802" k2="-0.0632" k3="0.0547"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.1704" k2="-0.0629" k3="0.0492"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.25" k1="-0.1993" k2="-0.0546" k3="0.0532"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.5" k1="-0.1729" k2="-0.0644" k3="0.0496"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1.5" k1="-0.1844" k2="-0.0506" k3="0.0426"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.1692" k2="-0.0656" k3="0.0490"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.25" k1="-0.1951" k2="-0.0631" k3="0.0560"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="0.5" k1="-0.1675" k2="-0.0746" k3="0.0534"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1.5" k1="-0.1763" k2="-0.0661" k3="0.0503"/>
-+            <vignetting model="pa" focal="25" aperture="11" distance="1000" k1="-0.1645" k2="-0.0695" k3="0.0480"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.25" k1="-0.1937" k2="-0.0550" k3="0.0529"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.5" k1="-0.1647" k2="-0.0858" k3="0.0616"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1.5" k1="-0.1755" k2="-0.0706" k3="0.0527"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.1662" k2="-0.0726" k3="0.0511"/>
-+            <vignetting model="pa" focal="35" aperture="5.3" distance="0.25" k1="-0.1492" k2="-0.0890" k3="0.0710"/>
-+            <vignetting model="pa" focal="35" aperture="5.3" distance="0.5" k1="-0.1392" k2="-0.0753" k3="0.0562"/>
-+            <vignetting model="pa" focal="35" aperture="5.3" distance="1.5" k1="-0.1340" k2="-0.0765" k3="0.0573"/>
-+            <vignetting model="pa" focal="35" aperture="5.3" distance="1000" k1="-0.1386" k2="-0.0672" k3="0.0499"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.25" k1="-0.1202" k2="-0.1164" k3="0.0828"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.5" k1="-0.1168" k2="-0.0831" k3="0.0547"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1.5" k1="-0.1126" k2="-0.0797" k3="0.0521"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1134" k2="-0.0824" k3="0.0539"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.25" k1="-0.1173" k2="-0.1203" k3="0.0831"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.5" k1="-0.1159" k2="-0.0834" k3="0.0536"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1.5" k1="-0.1117" k2="-0.0819" k3="0.0523"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1575" k2="-0.0222" k3="0.0261"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.25" k1="-0.1118" k2="-0.1289" k3="0.0870"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="0.5" k1="-0.1097" k2="-0.0973" k3="0.0606"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1.5" k1="-0.1072" k2="-0.0876" k3="0.0532"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1715" k2="0.0012" k3="0.0129"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.25" k1="-0.1010" k2="-0.1523" k3="0.0986"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.5" k1="-0.1038" k2="-0.1111" k3="0.0675"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1.5" k1="-0.0966" k2="-0.1117" k3="0.0666"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1663" k2="-0.0167" k3="0.0242"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="0.25" k1="-0.1647" k2="0.0714" k3="-0.0687"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="0.5" k1="-0.2096" k2="0.2566" k3="-0.2572"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1.5" k1="-0.2607" k2="0.5266" k3="-0.5213"/>
-+            <vignetting model="pa" focal="42" aperture="5.6" distance="1000" k1="-0.2696" k2="0.5231" k3="-0.5145"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="0.25" k1="-0.1154" k2="-0.0386" k3="0.0196"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="0.5" k1="-0.0888" k2="-0.1169" k3="0.0674"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1.5" k1="-0.1220" k2="0.0535" k3="-0.0854"/>
-+            <vignetting model="pa" focal="42" aperture="8" distance="1000" k1="-0.1655" k2="0.1630" k3="-0.1650"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="0.25" k1="-0.1119" k2="-0.0449" k3="0.0222"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="0.5" k1="-0.0869" k2="-0.1179" k3="0.0709"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1.5" k1="-0.0765" k2="-0.1123" k3="0.0598"/>
-+            <vignetting model="pa" focal="42" aperture="11" distance="1000" k1="-0.1099" k2="-0.0478" k3="0.0226"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="0.25" k1="-0.0950" k2="-0.0713" k3="0.0366"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="0.5" k1="-0.0759" k2="-0.1225" k3="0.0693"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1.5" k1="-0.0611" k2="-0.1267" k3="0.0636"/>
-+            <vignetting model="pa" focal="42" aperture="16" distance="1000" k1="-0.0901" k2="-0.0788" k3="0.0410"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="0.25" k1="-0.1066" k2="-0.0598" k3="0.0317"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="0.5" k1="-0.0845" k2="-0.1211" k3="0.0722"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1.5" k1="-0.0755" k2="-0.1128" k3="0.0580"/>
-+            <vignetting model="pa" focal="42" aperture="22" distance="1000" k1="-0.1034" k2="-0.0652" k3="0.0355"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 14-45mm f/3.5-5.6</model>
-+        <model>Olympus Zuiko Digital 14-45mm f/3.5-5.6</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.015865" b="-0.045846" c="0" />
--            <distortion model="ptlens" focal="18" a="0" b="-0.012163" c="0" />
--            <distortion model="ptlens" focal="25" a="0" b="-0.007852" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.00285" c="0" />
--            <distortion model="ptlens" focal="45" a="0" b="-0.001233" c="0" />
-+            <distortion model="ptlens" focal="14" a="0.015865" b="-0.045846" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0" b="-0.012163" c="0"/>
-+            <distortion model="ptlens" focal="25" a="0" b="-0.007852" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="-0.00285" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0" b="-0.001233" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 14-54mm f/2.8-3.5</model>
-+        <model>Olympus Zuiko Digital 14-54mm f/2.8-3.5</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.019325" b="-0.040094" c="0" />
--            <distortion model="ptlens" focal="19" a="0.010371" b="-0.017732" c="0" />
--            <distortion model="ptlens" focal="25" a="0.002227" b="-0.001738" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="54" a="0" b="-0.001107" c="0" />
-+            <distortion model="ptlens" focal="14" a="0.019325" b="-0.040094" c="0"/>
-+            <distortion model="ptlens" focal="19" a="0.010371" b="-0.017732" c="0"/>
-+            <distortion model="ptlens" focal="25" a="0.002227" b="-0.001738" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="54" a="0" b="-0.001107" c="0"/>
-+            <!-- Taken with Olympus E-M10 -->
-+            <tca model="poly3" focal="14" vr="1.0004652" vb="1.0000151"/>
-+            <tca model="poly3" focal="19" vr="1.0003096" vb="1.0000367"/>
-+            <tca model="poly3" focal="25" vr="1.0001643" vb="1.0000181"/>
-+            <tca model="poly3" focal="35" vr="1.0000783" vb="0.9999489"/>
-+            <tca model="poly3" focal="54" vr="0.9998060" vb="1.0000496"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Olympus</maker>
--	    <model>Zuiko Digital 25mm F2.8</model>
--	    <focal value="25" />
--	    <aperture min="2.8" max="22"/>
--	    <mount>4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="25" model="ptlens" a="0.0011362" b="-0.011804" c="0.00114701" />
--            <tca model="poly3" focal="25" br="-0.0001559" vr="1.0006797" bb="0.0000854" vb="0.9999497" />
--            <vignetting model="pa" focal="25" aperture="2.8" distance="0.2" k1="-0.8479" k2="0.6898" k3="-0.3084" />
--            <vignetting model="pa" focal="25" aperture="2.8" distance="0.4" k1="-0.8254" k2="0.5649" k3="-0.2243" />
--            <vignetting model="pa" focal="25" aperture="2.8" distance="1.2" k1="-0.8064" k2="0.4875" k3="-0.1799" />
--            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.7963" k2="0.4332" k3="-0.1431" />
--            <vignetting model="pa" focal="25" aperture="4" distance="0.2" k1="-0.0748" k2="-0.4244" k3="0.1704" />
--            <vignetting model="pa" focal="25" aperture="4" distance="0.4" k1="-0.0741" k2="-0.4858" k3="0.2082" />
--            <vignetting model="pa" focal="25" aperture="4" distance="1.2" k1="-0.0924" k2="-0.4644" k3="0.1906" />
--            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.0801" k2="-0.5089" k3="0.2151" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2436" k2="0.1889" k3="-0.1742" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2576" k2="0.1878" k3="-0.1848" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2693" k2="0.2083" k3="-0.2068" />
--            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2801" k2="0.2143" k3="-0.2131" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2013" k2="0.0131" k3="0.0016" />
--            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2148" k2="-0.0056" k3="0.0187" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.2162" k2="-0.0150" k3="0.0234" />
--            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2257" k2="-0.0195" k3="0.0313" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1875" k2="-0.0367" k3="0.0326" />
--            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2230" k2="-0.0099" k3="0.0253" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.2387" k2="0.0085" k3="0.0141" />
--            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2340" k2="-0.0217" k3="0.0337" />
-+        <maker>Olympus</maker>
-+        <model>Olympus Zuiko Digital 25mm f/2.8</model>
-+        <mount>4/3 System</mount>
-+        <focal value="25"/>
-+        <aperture min="2.8" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="25" model="ptlens" a="0.0011362" b="-0.011804" c="0.00114701"/>
-+            <tca model="poly3" focal="25" br="-0.0001559" vr="1.0006797" bb="0.0000854" vb="0.9999497"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="0.2" k1="-0.8479" k2="0.6898" k3="-0.3084"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="0.4" k1="-0.8254" k2="0.5649" k3="-0.2243"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1.2" k1="-0.8064" k2="0.4875" k3="-0.1799"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.7963" k2="0.4332" k3="-0.1431"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="0.2" k1="-0.0748" k2="-0.4244" k3="0.1704"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="0.4" k1="-0.0741" k2="-0.4858" k3="0.2082"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1.2" k1="-0.0924" k2="-0.4644" k3="0.1906"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.0801" k2="-0.5089" k3="0.2151"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.2" k1="-0.2436" k2="0.1889" k3="-0.1742"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="0.4" k1="-0.2576" k2="0.1878" k3="-0.1848"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1.2" k1="-0.2693" k2="0.2083" k3="-0.2068"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.2801" k2="0.2143" k3="-0.2131"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.2" k1="-0.2013" k2="0.0131" k3="0.0016"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="0.4" k1="-0.2148" k2="-0.0056" k3="0.0187"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1.2" k1="-0.2162" k2="-0.0150" k3="0.0234"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.2257" k2="-0.0195" k3="0.0313"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.2" k1="-0.1875" k2="-0.0367" k3="0.0326"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="0.4" k1="-0.2230" k2="-0.0099" k3="0.0253"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1.2" k1="-0.2387" k2="0.0085" k3="0.0141"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.2340" k2="-0.0217" k3="0.0337"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Olympus</maker>
--	    <model>Zuiko Digital 35mm f/3.5 Macro</model>
--	    <focal value="35" />
--	    <aperture min="3.5" max="22" />
-+        <maker>Olympus</maker>
-+        <model>Olympus Zuiko Digital 35mm f/3.5 Macro</model>
-         <mount>4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="35" model="ptlens" a="-0.00226197" b="0.00228625" c="-0.00756547" />
--            <tca model="poly3" focal="35" br="-0.0000953" vr="1.0002105" bb="-0.0000137" vb="1.0000230" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="0.146" k1="-0.0315" k2="-0.3900" k3="0.2375" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="0.3" k1="-0.0648" k2="-0.1207" k3="-0.0010" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="0.9" k1="-0.1379" k2="0.0285" k3="-0.0643" />
--            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.1887" k2="0.0391" k3="-0.0420" />
--            <vignetting model="pa" focal="35" aperture="4" distance="0.146" k1="0.0181" k2="-0.2089" k3="0.0596" />
--            <vignetting model="pa" focal="35" aperture="4" distance="0.3" k1="-0.1297" k2="0.1533" k3="-0.1323" />
--            <vignetting model="pa" focal="35" aperture="4" distance="0.9" k1="-0.1246" k2="0.0741" k3="-0.0450" />
--            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1571" k2="0.0589" k3="-0.0179" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.146" k1="-0.0541" k2="0.0385" k3="-0.0280" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.3" k1="-0.1127" k2="0.0588" k3="-0.0289" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.9" k1="-0.1202" k2="0.0395" k3="-0.0119" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1589" k2="0.0410" k3="0.0029" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.146" k1="-0.0510" k2="0.0293" k3="-0.0231" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.3" k1="-0.1092" k2="0.0506" k3="-0.0265" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.9" k1="-0.1144" k2="0.0211" k3="-0.0006" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1545" k2="0.0208" k3="0.0166" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.146" k1="-0.0532" k2="0.0389" k3="-0.0320" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.3" k1="-0.1032" k2="0.0350" k3="-0.0216" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.9" k1="-0.0993" k2="-0.0253" k3="0.0264" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1450" k2="-0.0149" k3="0.0368" />
-+        <focal value="35"/>
-+        <aperture min="3.5" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="35" model="ptlens" a="-0.00226197" b="0.00228625" c="-0.00756547"/>
-+            <tca model="poly3" focal="35" br="-0.0000953" vr="1.0002105" bb="-0.0000137" vb="1.0000230"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="0.146" k1="-0.0315" k2="-0.3900" k3="0.2375"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="0.3" k1="-0.0648" k2="-0.1207" k3="-0.0010"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="0.9" k1="-0.1379" k2="0.0285" k3="-0.0643"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.1887" k2="0.0391" k3="-0.0420"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.146" k1="0.0181" k2="-0.2089" k3="0.0596"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.3" k1="-0.1297" k2="0.1533" k3="-0.1323"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.9" k1="-0.1246" k2="0.0741" k3="-0.0450"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1571" k2="0.0589" k3="-0.0179"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.146" k1="-0.0541" k2="0.0385" k3="-0.0280"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.3" k1="-0.1127" k2="0.0588" k3="-0.0289"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.9" k1="-0.1202" k2="0.0395" k3="-0.0119"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1589" k2="0.0410" k3="0.0029"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.146" k1="-0.0510" k2="0.0293" k3="-0.0231"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.3" k1="-0.1092" k2="0.0506" k3="-0.0265"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.9" k1="-0.1144" k2="0.0211" k3="-0.0006"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1545" k2="0.0208" k3="0.0166"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.146" k1="-0.0532" k2="0.0389" k3="-0.0320"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.3" k1="-0.1032" k2="0.0350" k3="-0.0216"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.9" k1="-0.0993" k2="-0.0253" k3="0.0264"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1450" k2="-0.0149" k3="0.0368"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 40-150mm f/3.5-4.5</model>
-+        <model>Olympus Zuiko Digital 40-150mm f/3.5-4.5</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="40" a="0" b="-0.006351" c="0" />
--            <distortion model="ptlens" focal="48" a="0" b="-0.00139" c="0" />
--            <distortion model="ptlens" focal="68" a="0" b="0.004043" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.006806" c="0" />
--            <distortion model="ptlens" focal="150" a="0" b="0.005332" c="0" />
-+            <distortion model="poly3" focal="40" k1="-0.006351"/>
-+            <distortion model="poly3" focal="48" k1="-0.00139"/>
-+            <distortion model="poly3" focal="68" k1="0.004043"/>
-+            <distortion model="poly3" focal="100" k1="0.006806"/>
-+            <distortion model="poly3" focal="150" k1="0.005332"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Zuiko Digital ED 40-150mm F4.0-5.6</model>
--	    <focal min="40" max="150" />
--	    <aperture min="4" max="22" />
-+        <model>Olympus Zuiko Digital ED 40-150mm f/4.0-5.6</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <focal min="40" max="150"/>
-+        <aperture min="4" max="22"/>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="40" a="-0.0069552" b="0.0128954" c="-0.0201501" />
--            <distortion model="ptlens" focal="50" a="-0.00328196" b="0.00547778" c="-0.00507713" />
--            <distortion model="ptlens" focal="73" a="0.00269235" b="-0.00470212" c="0.00974549" />
--            <distortion model="ptlens" focal="98" a="-0.00377975" b="0.0155413" c="-0.00903773" />
--            <distortion model="ptlens" focal="150" a="-0.000293389" b="0.00701827" c="-0.00528205" />
--            <tca model="poly3" focal="40" br="-0.0000434" vr="1.0004182" bb="0.0000176" vb="0.9998313" />
--            <tca model="poly3" focal="50" br="0.0000574" vr="1.0002451" bb="-0.0000307" vb="0.9998156" />
--            <tca model="poly3" focal="73" br="0.0000138" vr="1.0001119" bb="-0.0001086" vb="0.9997898" />
--            <tca model="poly3" focal="102" br="0.0000541" vr="0.9998625" bb="-0.0000497" vb="0.9997776" />
--            <tca model="poly3" focal="150" br="-0.0000116" vr="0.9997582" bb="0.0000182" vb="0.9997618" />
--            <tca model="poly3" focal="150" br="0.0000230" vr="0.9997236" bb="-0.0000526" vb="0.9999016" />
--            <vignetting model="pa" focal="40" aperture="4" distance="0.9" k1="-0.1908" k2="-0.3301" k3="0.1075" />
--            <vignetting model="pa" focal="40" aperture="4" distance="1.8" k1="-0.1819" k2="-0.3589" k3="0.1318" />
--            <vignetting model="pa" focal="40" aperture="4" distance="5.4" k1="-0.1970" k2="-0.3551" k3="0.1400" />
--            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1932" k2="-0.3487" k3="0.1356" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="0.9" k1="-0.1403" k2="0.1237" k3="-0.1488" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="1.8" k1="-0.1380" k2="0.1225" k3="-0.1507" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="5.4" k1="-0.1525" k2="0.1119" k3="-0.1358" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1493" k2="0.1369" k3="-0.1587" />
--            <vignetting model="pa" focal="40" aperture="8" distance="0.9" k1="-0.1116" k2="-0.0197" k3="0.0125" />
--            <vignetting model="pa" focal="40" aperture="8" distance="1.8" k1="-0.1101" k2="-0.0263" k3="0.0183" />
--            <vignetting model="pa" focal="40" aperture="8" distance="5.4" k1="-0.1184" k2="-0.0108" k3="0.0039" />
--            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1220" k2="0.0001" k3="0.0004" />
--            <vignetting model="pa" focal="40" aperture="11" distance="0.9" k1="-0.1059" k2="-0.0273" k3="0.0134" />
--            <vignetting model="pa" focal="40" aperture="11" distance="1.8" k1="-0.1059" k2="-0.0274" k3="0.0168" />
--            <vignetting model="pa" focal="40" aperture="11" distance="5.4" k1="-0.1081" k2="-0.0270" k3="0.0104" />
--            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.1148" k2="-0.0051" k3="-0.0014" />
--            <vignetting model="pa" focal="40" aperture="22" distance="0.9" k1="-0.1043" k2="-0.0328" k3="0.0155" />
--            <vignetting model="pa" focal="40" aperture="22" distance="1.8" k1="-0.1073" k2="-0.0249" k3="0.0138" />
--            <vignetting model="pa" focal="40" aperture="22" distance="5.4" k1="-0.1068" k2="-0.0302" k3="0.0117" />
--            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1107" k2="-0.0187" k3="0.0070" />
--            <vignetting model="pa" focal="50" aperture="4.2" distance="0.9" k1="-0.1315" k2="-0.3638" k3="0.1167" />
--            <vignetting model="pa" focal="50" aperture="4.2" distance="1.8" k1="-0.1096" k2="-0.4398" k3="0.1756" />
--            <vignetting model="pa" focal="50" aperture="4.2" distance="5.4" k1="-0.1017" k2="-0.4550" k3="0.1898" />
--            <vignetting model="pa" focal="50" aperture="4.2" distance="1000" k1="-0.1149" k2="-0.4205" k3="0.1688" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.9" k1="-0.1179" k2="0.0920" k3="-0.1641" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1.8" k1="-0.0944" k2="0.0160" k3="-0.1150" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="5.4" k1="-0.1060" k2="0.0378" k3="-0.1251" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1022" k2="0.0520" k3="-0.1425" />
--            <vignetting model="pa" focal="50" aperture="8" distance="0.9" k1="-0.1149" k2="0.0072" k3="-0.0053" />
--            <vignetting model="pa" focal="50" aperture="8" distance="1.8" k1="-0.0904" k2="-0.0656" k3="0.0424" />
--            <vignetting model="pa" focal="50" aperture="8" distance="5.4" k1="-0.1003" k2="-0.0519" k3="0.0384" />
--            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1035" k2="-0.0177" k3="0.0086" />
--            <vignetting model="pa" focal="50" aperture="11" distance="0.9" k1="-0.1107" k2="-0.0003" k3="-0.0014" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1.8" k1="-0.0861" k2="-0.0692" k3="0.0424" />
--            <vignetting model="pa" focal="50" aperture="11" distance="5.4" k1="-0.0937" k2="-0.0527" k3="0.0333" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1055" k2="-0.0039" k3="-0.0045" />
--            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.1026" k2="-0.0155" k3="0.0043" />
--            <vignetting model="pa" focal="50" aperture="22" distance="1.8" k1="-0.0938" k2="-0.0215" k3="0.0047" />
--            <vignetting model="pa" focal="50" aperture="22" distance="5.4" k1="-0.0877" k2="-0.0656" k3="0.0383" />
--            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0937" k2="-0.0243" k3="0.0029" />
--            <vignetting model="pa" focal="73" aperture="4.6" distance="0.9" k1="-0.0287" k2="-0.2729" k3="-0.1884" />
--            <vignetting model="pa" focal="73" aperture="4.6" distance="1.8" k1="0.0290" k2="-0.4975" k3="-0.0340" />
--            <vignetting model="pa" focal="73" aperture="4.6" distance="5.4" k1="0.0859" k2="-0.7590" k3="0.1600" />
--            <vignetting model="pa" focal="73" aperture="4.6" distance="1000" k1="0.1203" k2="-0.9424" k3="0.3031" />
--            <vignetting model="pa" focal="73" aperture="5.6" distance="0.9" k1="-0.2098" k2="0.6214" k3="-0.7298" />
--            <vignetting model="pa" focal="73" aperture="5.6" distance="1.8" k1="-0.1855" k2="0.5414" k3="-0.6897" />
--            <vignetting model="pa" focal="73" aperture="5.6" distance="5.4" k1="-0.1571" k2="0.4288" k3="-0.6162" />
--            <vignetting model="pa" focal="73" aperture="5.6" distance="1000" k1="-0.1232" k2="0.2953" k3="-0.5276" />
--            <vignetting model="pa" focal="73" aperture="8" distance="0.9" k1="-0.1425" k2="0.2271" k3="-0.2193" />
--            <vignetting model="pa" focal="73" aperture="8" distance="1.8" k1="-0.1591" k2="0.2766" k3="-0.2662" />
--            <vignetting model="pa" focal="73" aperture="8" distance="5.4" k1="-0.1741" k2="0.3142" k3="-0.2965" />
--            <vignetting model="pa" focal="73" aperture="8" distance="1000" k1="-0.1721" k2="0.3036" k3="-0.2981" />
--            <vignetting model="pa" focal="73" aperture="11" distance="0.9" k1="-0.0691" k2="-0.0437" k3="0.0225" />
--            <vignetting model="pa" focal="73" aperture="11" distance="1.8" k1="-0.0809" k2="-0.0197" k3="0.0024" />
--            <vignetting model="pa" focal="73" aperture="11" distance="5.4" k1="-0.0858" k2="-0.0150" k3="0.0041" />
--            <vignetting model="pa" focal="73" aperture="11" distance="1000" k1="-0.0966" k2="0.0009" k3="-0.0087" />
--            <vignetting model="pa" focal="73" aperture="22" distance="0.9" k1="-0.0621" k2="-0.0569" k3="0.0274" />
--            <vignetting model="pa" focal="73" aperture="22" distance="1.8" k1="-0.0749" k2="-0.0372" k3="0.0140" />
--            <vignetting model="pa" focal="73" aperture="22" distance="5.4" k1="-0.0823" k2="-0.0257" k3="0.0106" />
--            <vignetting model="pa" focal="73" aperture="22" distance="1000" k1="-0.0769" k2="-0.0485" k3="0.0244" />
--            <vignetting model="pa" focal="98" aperture="5" distance="0.9" k1="-0.1835" k2="-0.0290" k3="-0.1856" />
--            <vignetting model="pa" focal="98" aperture="5" distance="1.8" k1="-0.1099" k2="-0.2740" k3="-0.0305" />
--            <vignetting model="pa" focal="98" aperture="5" distance="5.4" k1="-0.0473" k2="-0.5586" k3="0.1726" />
--            <vignetting model="pa" focal="98" aperture="5" distance="1000" k1="0.0019" k2="-0.8142" k3="0.3669" />
--            <vignetting model="pa" focal="98" aperture="5.6" distance="0.9" k1="-0.0864" k2="0.1239" k3="-0.3224" />
--            <vignetting model="pa" focal="98" aperture="5.6" distance="1.8" k1="-0.0386" k2="-0.0035" k3="-0.2593" />
--            <vignetting model="pa" focal="98" aperture="5.6" distance="5.4" k1="0.0072" k2="-0.1462" k3="-0.1789" />
--            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="0.0660" k2="-0.3692" k3="-0.0340" />
--            <vignetting model="pa" focal="98" aperture="8" distance="0.9" k1="-0.0770" k2="-0.0171" k3="0.0049" />
--            <vignetting model="pa" focal="98" aperture="8" distance="1.8" k1="-0.0642" k2="-0.0396" k3="0.0160" />
--            <vignetting model="pa" focal="98" aperture="8" distance="5.4" k1="-0.0799" k2="0.0279" k3="-0.0389" />
--            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.0849" k2="0.0597" k3="-0.0735" />
--            <vignetting model="pa" focal="98" aperture="11" distance="0.9" k1="-0.0722" k2="-0.0278" k3="0.0128" />
--            <vignetting model="pa" focal="98" aperture="11" distance="1.8" k1="-0.0584" k2="-0.0571" k3="0.0321" />
--            <vignetting model="pa" focal="98" aperture="11" distance="5.4" k1="-0.0631" k2="-0.0290" k3="0.0118" />
--            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.0493" k2="-0.0516" k3="0.0233" />
--            <vignetting model="pa" focal="98" aperture="22" distance="0.9" k1="-0.0671" k2="-0.0364" k3="0.0165" />
--            <vignetting model="pa" focal="98" aperture="22" distance="1.8" k1="-0.0525" k2="-0.0685" k3="0.0375" />
--            <vignetting model="pa" focal="98" aperture="22" distance="5.4" k1="-0.0528" k2="-0.0455" k3="0.0179" />
--            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.0376" k2="-0.0773" k3="0.0379" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="0.9" k1="-0.3558" k2="0.3658" k3="-0.2826" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1.8" k1="-0.3367" k2="0.2887" k3="-0.2490" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="5.4" k1="-0.2592" k2="-0.0102" k3="-0.0646" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.2386" k2="-0.3227" k3="0.1913" />
--            <vignetting model="pa" focal="150" aperture="8" distance="0.9" k1="-0.0590" k2="0.0188" k3="-0.0358" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1.8" k1="-0.0630" k2="0.0075" k3="-0.0261" />
--            <vignetting model="pa" focal="150" aperture="8" distance="5.4" k1="-0.0723" k2="0.0526" k3="-0.0643" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0841" k2="0.1164" k3="-0.1405" />
--            <vignetting model="pa" focal="150" aperture="11" distance="0.9" k1="-0.0397" k2="-0.0551" k3="0.0323" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1.8" k1="-0.0418" k2="-0.0754" k3="0.0503" />
--            <vignetting model="pa" focal="150" aperture="11" distance="5.4" k1="-0.0471" k2="-0.0558" k3="0.0388" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0339" k2="-0.0852" k3="0.0580" />
--            <vignetting model="pa" focal="150" aperture="16" distance="0.9" k1="-0.0242" k2="-0.0799" k3="0.0506" />
--            <vignetting model="pa" focal="150" aperture="16" distance="1.8" k1="-0.0393" k2="-0.0912" k3="0.0650" />
--            <vignetting model="pa" focal="150" aperture="16" distance="5.4" k1="-0.0435" k2="-0.0699" k3="0.0528" />
--            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.0271" k2="-0.1145" k3="0.0840" />
--            <vignetting model="pa" focal="150" aperture="22" distance="0.9" k1="-0.0227" k2="-0.0935" k3="0.0652" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1.8" k1="-0.0345" k2="-0.1071" k3="0.0792" />
--            <vignetting model="pa" focal="150" aperture="22" distance="5.4" k1="-0.0358" k2="-0.0953" k3="0.0747" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0257" k2="-0.1300" k3="0.0997" />
-+            <distortion model="ptlens" focal="40" a="-0.0069552" b="0.0128954" c="-0.0201501"/>
-+            <distortion model="ptlens" focal="50" a="-0.00328196" b="0.00547778" c="-0.00507713"/>
-+            <distortion model="ptlens" focal="73" a="0.00269235" b="-0.00470212" c="0.00974549"/>
-+            <distortion model="ptlens" focal="98" a="-0.00377975" b="0.0155413" c="-0.00903773"/>
-+            <distortion model="ptlens" focal="150" a="-0.000293389" b="0.00701827" c="-0.00528205"/>
-+            <tca model="poly3" focal="40" br="-0.0000434" vr="1.0004182" bb="0.0000176" vb="0.9998313"/>
-+            <tca model="poly3" focal="50" br="0.0000574" vr="1.0002451" bb="-0.0000307" vb="0.9998156"/>
-+            <tca model="poly3" focal="73" br="0.0000138" vr="1.0001119" bb="-0.0001086" vb="0.9997898"/>
-+            <tca model="poly3" focal="102" br="0.0000541" vr="0.9998625" bb="-0.0000497" vb="0.9997776"/>
-+            <tca model="poly3" focal="150" br="-0.0000116" vr="0.9997582" bb="0.0000182" vb="0.9997618"/>
-+            <tca model="poly3" focal="150" br="0.0000230" vr="0.9997236" bb="-0.0000526" vb="0.9999016"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="0.9" k1="-0.1908" k2="-0.3301" k3="0.1075"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1.8" k1="-0.1819" k2="-0.3589" k3="0.1318"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="5.4" k1="-0.1970" k2="-0.3551" k3="0.1400"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1932" k2="-0.3487" k3="0.1356"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="0.9" k1="-0.1403" k2="0.1237" k3="-0.1488"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="1.8" k1="-0.1380" k2="0.1225" k3="-0.1507"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="5.4" k1="-0.1525" k2="0.1119" k3="-0.1358"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1493" k2="0.1369" k3="-0.1587"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="0.9" k1="-0.1116" k2="-0.0197" k3="0.0125"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="1.8" k1="-0.1101" k2="-0.0263" k3="0.0183"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="5.4" k1="-0.1184" k2="-0.0108" k3="0.0039"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1220" k2="0.0001" k3="0.0004"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="0.9" k1="-0.1059" k2="-0.0273" k3="0.0134"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="1.8" k1="-0.1059" k2="-0.0274" k3="0.0168"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="5.4" k1="-0.1081" k2="-0.0270" k3="0.0104"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.1148" k2="-0.0051" k3="-0.0014"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="0.9" k1="-0.1043" k2="-0.0328" k3="0.0155"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1.8" k1="-0.1073" k2="-0.0249" k3="0.0138"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="5.4" k1="-0.1068" k2="-0.0302" k3="0.0117"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1107" k2="-0.0187" k3="0.0070"/>
-+            <vignetting model="pa" focal="50" aperture="4.2" distance="0.9" k1="-0.1315" k2="-0.3638" k3="0.1167"/>
-+            <vignetting model="pa" focal="50" aperture="4.2" distance="1.8" k1="-0.1096" k2="-0.4398" k3="0.1756"/>
-+            <vignetting model="pa" focal="50" aperture="4.2" distance="5.4" k1="-0.1017" k2="-0.4550" k3="0.1898"/>
-+            <vignetting model="pa" focal="50" aperture="4.2" distance="1000" k1="-0.1149" k2="-0.4205" k3="0.1688"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.9" k1="-0.1179" k2="0.0920" k3="-0.1641"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1.8" k1="-0.0944" k2="0.0160" k3="-0.1150"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="5.4" k1="-0.1060" k2="0.0378" k3="-0.1251"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1022" k2="0.0520" k3="-0.1425"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.9" k1="-0.1149" k2="0.0072" k3="-0.0053"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1.8" k1="-0.0904" k2="-0.0656" k3="0.0424"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="5.4" k1="-0.1003" k2="-0.0519" k3="0.0384"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1035" k2="-0.0177" k3="0.0086"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="0.9" k1="-0.1107" k2="-0.0003" k3="-0.0014"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1.8" k1="-0.0861" k2="-0.0692" k3="0.0424"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="5.4" k1="-0.0937" k2="-0.0527" k3="0.0333"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1055" k2="-0.0039" k3="-0.0045"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.9" k1="-0.1026" k2="-0.0155" k3="0.0043"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1.8" k1="-0.0938" k2="-0.0215" k3="0.0047"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="5.4" k1="-0.0877" k2="-0.0656" k3="0.0383"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.0937" k2="-0.0243" k3="0.0029"/>
-+            <vignetting model="pa" focal="73" aperture="4.6" distance="0.9" k1="-0.0287" k2="-0.2729" k3="-0.1884"/>
-+            <vignetting model="pa" focal="73" aperture="4.6" distance="1.8" k1="0.0290" k2="-0.4975" k3="-0.0340"/>
-+            <vignetting model="pa" focal="73" aperture="4.6" distance="5.4" k1="0.0859" k2="-0.7590" k3="0.1600"/>
-+            <vignetting model="pa" focal="73" aperture="4.6" distance="1000" k1="0.1203" k2="-0.9424" k3="0.3031"/>
-+            <vignetting model="pa" focal="73" aperture="5.6" distance="0.9" k1="-0.2098" k2="0.6214" k3="-0.7298"/>
-+            <vignetting model="pa" focal="73" aperture="5.6" distance="1.8" k1="-0.1855" k2="0.5414" k3="-0.6897"/>
-+            <vignetting model="pa" focal="73" aperture="5.6" distance="5.4" k1="-0.1571" k2="0.4288" k3="-0.6162"/>
-+            <vignetting model="pa" focal="73" aperture="5.6" distance="1000" k1="-0.1232" k2="0.2953" k3="-0.5276"/>
-+            <vignetting model="pa" focal="73" aperture="8" distance="0.9" k1="-0.1425" k2="0.2271" k3="-0.2193"/>
-+            <vignetting model="pa" focal="73" aperture="8" distance="1.8" k1="-0.1591" k2="0.2766" k3="-0.2662"/>
-+            <vignetting model="pa" focal="73" aperture="8" distance="5.4" k1="-0.1741" k2="0.3142" k3="-0.2965"/>
-+            <vignetting model="pa" focal="73" aperture="8" distance="1000" k1="-0.1721" k2="0.3036" k3="-0.2981"/>
-+            <vignetting model="pa" focal="73" aperture="11" distance="0.9" k1="-0.0691" k2="-0.0437" k3="0.0225"/>
-+            <vignetting model="pa" focal="73" aperture="11" distance="1.8" k1="-0.0809" k2="-0.0197" k3="0.0024"/>
-+            <vignetting model="pa" focal="73" aperture="11" distance="5.4" k1="-0.0858" k2="-0.0150" k3="0.0041"/>
-+            <vignetting model="pa" focal="73" aperture="11" distance="1000" k1="-0.0966" k2="0.0009" k3="-0.0087"/>
-+            <vignetting model="pa" focal="73" aperture="22" distance="0.9" k1="-0.0621" k2="-0.0569" k3="0.0274"/>
-+            <vignetting model="pa" focal="73" aperture="22" distance="1.8" k1="-0.0749" k2="-0.0372" k3="0.0140"/>
-+            <vignetting model="pa" focal="73" aperture="22" distance="5.4" k1="-0.0823" k2="-0.0257" k3="0.0106"/>
-+            <vignetting model="pa" focal="73" aperture="22" distance="1000" k1="-0.0769" k2="-0.0485" k3="0.0244"/>
-+            <vignetting model="pa" focal="98" aperture="5" distance="0.9" k1="-0.1835" k2="-0.0290" k3="-0.1856"/>
-+            <vignetting model="pa" focal="98" aperture="5" distance="1.8" k1="-0.1099" k2="-0.2740" k3="-0.0305"/>
-+            <vignetting model="pa" focal="98" aperture="5" distance="5.4" k1="-0.0473" k2="-0.5586" k3="0.1726"/>
-+            <vignetting model="pa" focal="98" aperture="5" distance="1000" k1="0.0019" k2="-0.8142" k3="0.3669"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="0.9" k1="-0.0864" k2="0.1239" k3="-0.3224"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1.8" k1="-0.0386" k2="-0.0035" k3="-0.2593"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="5.4" k1="0.0072" k2="-0.1462" k3="-0.1789"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="0.0660" k2="-0.3692" k3="-0.0340"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="0.9" k1="-0.0770" k2="-0.0171" k3="0.0049"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1.8" k1="-0.0642" k2="-0.0396" k3="0.0160"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="5.4" k1="-0.0799" k2="0.0279" k3="-0.0389"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.0849" k2="0.0597" k3="-0.0735"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="0.9" k1="-0.0722" k2="-0.0278" k3="0.0128"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="1.8" k1="-0.0584" k2="-0.0571" k3="0.0321"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="5.4" k1="-0.0631" k2="-0.0290" k3="0.0118"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.0493" k2="-0.0516" k3="0.0233"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="0.9" k1="-0.0671" k2="-0.0364" k3="0.0165"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="1.8" k1="-0.0525" k2="-0.0685" k3="0.0375"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="5.4" k1="-0.0528" k2="-0.0455" k3="0.0179"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.0376" k2="-0.0773" k3="0.0379"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="0.9" k1="-0.3558" k2="0.3658" k3="-0.2826"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1.8" k1="-0.3367" k2="0.2887" k3="-0.2490"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="5.4" k1="-0.2592" k2="-0.0102" k3="-0.0646"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.2386" k2="-0.3227" k3="0.1913"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="0.9" k1="-0.0590" k2="0.0188" k3="-0.0358"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1.8" k1="-0.0630" k2="0.0075" k3="-0.0261"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="5.4" k1="-0.0723" k2="0.0526" k3="-0.0643"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0841" k2="0.1164" k3="-0.1405"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="0.9" k1="-0.0397" k2="-0.0551" k3="0.0323"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1.8" k1="-0.0418" k2="-0.0754" k3="0.0503"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="5.4" k1="-0.0471" k2="-0.0558" k3="0.0388"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.0339" k2="-0.0852" k3="0.0580"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="0.9" k1="-0.0242" k2="-0.0799" k3="0.0506"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="1.8" k1="-0.0393" k2="-0.0912" k3="0.0650"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="5.4" k1="-0.0435" k2="-0.0699" k3="0.0528"/>
-+            <vignetting model="pa" focal="150" aperture="16" distance="1000" k1="-0.0271" k2="-0.1145" k3="0.0840"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="0.9" k1="-0.0227" k2="-0.0935" k3="0.0652"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1.8" k1="-0.0345" k2="-0.1071" k3="0.0792"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="5.4" k1="-0.0358" k2="-0.0953" k3="0.0747"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0257" k2="-0.1300" k3="0.0997"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- Also update copy with "SWD" below. -->
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 50-200mm f/2.8-3.5</model>
-+        <model>Olympus Zuiko Digital ED 50-200mm f/2.8-3.5</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.005194" c="0" />
--            <distortion model="ptlens" focal="62" a="0" b="-0.002175" c="0" />
--            <distortion model="ptlens" focal="69" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="83" a="0" b="0.001879" c="0" />
--            <distortion model="ptlens" focal="101" a="0" b="0.00369" c="0" />
--            <distortion model="ptlens" focal="130" a="0" b="0.004293" c="0" />
--            <distortion model="ptlens" focal="158" a="0" b="0.004686" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.003465" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.005194"/>
-+            <distortion model="poly3" focal="62" k1="-0.002175"/>
-+            <distortion model="poly3" focal="69" k1="0"/>
-+            <distortion model="poly3" focal="83" k1="0.001879"/>
-+            <distortion model="poly3" focal="101" k1="0.00369"/>
-+            <distortion model="poly3" focal="130" k1="0.004293"/>
-+            <distortion model="poly3" focal="158" k1="0.004686"/>
-+            <distortion model="poly3" focal="200" k1="0.003465"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- Also update copy without "SWD" above. -->
-         <maker>Olympus</maker>
--        <model>Zuiko Digital 50mm f/2.0 Macro</model>
-+        <model>Olympus Zuiko Digital ED 50-200mm f/2.8-3.5 SWD</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0.001878" b="-0.005529" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.005194"/>
-+            <distortion model="poly3" focal="62" k1="-0.002175"/>
-+            <distortion model="poly3" focal="69" k1="0"/>
-+            <distortion model="poly3" focal="83" k1="0.001879"/>
-+            <distortion model="poly3" focal="101" k1="0.00369"/>
-+            <distortion model="poly3" focal="130" k1="0.004293"/>
-+            <distortion model="poly3" focal="158" k1="0.004686"/>
-+            <distortion model="poly3" focal="200" k1="0.003465"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>Standard</model>
-+        <model>Olympus Zuiko Digital ED 50mm f/2.0 Macro</model>
-+        <mount>4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="50" a="0.001878" b="-0.005529" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus E-10 &amp; compatibles (Standard)</model>
-+        <model lang="en">fixed lens</model>
-+        <model lang="de">festes Objektiv</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9" a="0" b="-0.015682" c="0" />
--            <distortion model="ptlens" focal="10" a="0" b="-0.011648" c="0" />
--            <distortion model="ptlens" focal="11" a="0" b="-0.006453" c="0" />
--            <distortion model="ptlens" focal="12" a="0" b="-0.003862" c="0" />
--            <distortion model="ptlens" focal="13" a="0" b="-0.002817" c="0" />
--            <distortion model="ptlens" focal="15" a="0" b="-0.000837" c="0" />
--            <distortion model="ptlens" focal="18" a="0" b="-0.000867" c="0" />
--            <distortion model="ptlens" focal="21" a="0" b="0.000116" c="0" />
--            <distortion model="ptlens" focal="26" a="0" b="-2.3e-05" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="0.000273" c="0" />
--            <distortion model="ptlens" focal="36" a="0" b="2.9e-05" c="0" />
-+            <distortion model="poly3" focal="9" k1="-0.015682"/>
-+            <distortion model="poly3" focal="10" k1="-0.011648"/>
-+            <distortion model="poly3" focal="11" k1="-0.006453"/>
-+            <distortion model="poly3" focal="12" k1="-0.003862"/>
-+            <distortion model="poly3" focal="13" k1="-0.002817"/>
-+            <distortion model="poly3" focal="15" k1="-0.000837"/>
-+            <distortion model="poly3" focal="18" k1="-0.000867"/>
-+            <distortion model="poly3" focal="21" k1="0.000116"/>
-+            <distortion model="poly3" focal="26" k1="-2.3e-05"/>
-+            <distortion model="poly3" focal="30" k1="0.000273"/>
-+            <distortion model="poly3" focal="36" k1="2.9e-05"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>WCON-08B</model>
-+        <model>Olympus E-10 &amp; compatibles, with WCON-08B</model>
-+        <model lang="en">fixed lens, with WCON-08B</model>
-+        <model lang="de">festes Objektiv, mit WCON-08B</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="9" a="0.015434" b="-0.044944" c="0" />
--            <distortion model="ptlens" focal="10" a="0.015297" b="-0.039777" c="0" />
--            <distortion model="ptlens" focal="11" a="0.011044" b="-0.029992" c="0" />
--            <distortion model="ptlens" focal="12" a="0.010271" b="-0.025622" c="0" />
--            <distortion model="ptlens" focal="13" a="0.006898" b="-0.012403" c="0" />
-+            <distortion model="ptlens" focal="9" a="0.015434" b="-0.044944" c="0"/>
-+            <distortion model="ptlens" focal="10" a="0.015297" b="-0.039777" c="0"/>
-+            <distortion model="ptlens" focal="11" a="0.011044" b="-0.029992" c="0"/>
-+            <distortion model="ptlens" focal="12" a="0.010271" b="-0.025622" c="0"/>
-+            <distortion model="ptlens" focal="13" a="0.006898" b="-0.012403" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>B-300 (full tele)</model>
-+        <model>Olympus E-10 &amp; compatibles, with B-300 (full tele)</model>
-+        <model lang="en">fixed lens, with B-300 (full tele)</model>
-+        <model lang="de">festes Objektiv, mit B-300 (längste Brennw.)</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="36" a="0.001885" b="0.002595" c="0" />
-+            <distortion model="ptlens" focal="36" a="0.001885" b="0.002595" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>macro (full tele): 8 inches lens-to-subject</model>
-+        <model>Olympus E-10 &amp; compatibles, macro (full tele): 8 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro (full tele): 8 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro (längste Brennw.): 8 Zoll Fokusabstand</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="36" a="0" b="-0.002276" c="0" />
-+            <distortion model="poly3" focal="36" k1="-0.002276"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>macro (full tele): 12 inches lens-to-subject</model>
-+        <model>Olympus E-10 &amp; compatibles, macro (full tele): 12 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro (full tele): 12 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro (längste Brennw.): 12 Zoll Fokusabstand</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="36" a="0" b="-0.0014" c="0" />
-+            <distortion model="poly3" focal="36" k1="-0.0014"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>macro (full tele): 16 inches lens-to-subject</model>
-+        <model>Olympus E-10 &amp; compatibles, macro (full tele): 16 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro (full tele): 16 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro (längste Brennw.): 16 Zoll Fokusabstand</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="36" a="0" b="-0.001229" c="0" />
-+            <distortion model="poly3" focal="36" k1="-0.001229"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Olympus</maker>
--        <model>macro (full tele): 20 inches lens-to-subject</model>
-+        <model>Olympus E-10 &amp; compatibles, macro (full tele): 20 inches lens-to-subject</model>
-+        <model lang="en">fixed lens, macro (full tele): 20 inches lens-to-subject</model>
-+        <model lang="de">festes Objektiv, Makro (längste Brennw.): 20 Zoll Fokusabstand</model>
-         <mount>olympusE10</mount>
-         <cropfactor>3.933</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="36" a="0" b="-0.001085" c="0" />
-+            <distortion model="poly3" focal="36" k1="-0.001085"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus Zuiko Digital ED 12-60mm f/2.8-4.0 SWD</model>
-+        <mount>4/3 System</mount>
-+        <focal min="12" max="60"/>
-+        <aperture min="2.8" max="4"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="12" a="0.0378606" b="-0.0903769" c="0.0209704"/>
-+            <distortion model="ptlens" focal="14" a="0.0356288" b="-0.0735374" c="0.0090992"/>
-+            <distortion model="ptlens" focal="16" a="0.0199475" b="-0.0359737" c="-0.00727696"/>
-+            <distortion model="ptlens" focal="18" a="0.0110679" b="-0.0172287" c="-0.00120671"/>
-+            <distortion model="ptlens" focal="20" a="0.0112205" b="-0.0191171" c="0.00416202"/>
-+            <distortion model="ptlens" focal="25" a="0.00924039" b="-0.0158513" c="0.00738501"/>
-+            <distortion model="ptlens" focal="30" a="0.00276997" b="0.00320495" c="-0.00998594"/>
-+            <distortion model="ptlens" focal="35" a="0.00525429" b="-0.0093383" c="0.00864948"/>
-+            <distortion model="ptlens" focal="40" a="0.00518391" b="-0.011341" c="0.0138034"/>
-+            <distortion model="ptlens" focal="45" a="0.0029713" b="-0.00562078" c="0.00965514"/>
-+            <distortion model="ptlens" focal="50" a="0.00398971" b="-0.0106269" c="0.0164902"/>
-+            <distortion model="ptlens" focal="55" a="0.00291466" b="-0.00562177" c="0.0084578"/>
-+            <distortion model="ptlens" focal="60" a="0.00155019" b="-0.00153152" c="0.0052106"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Olympus</maker>
-+        <model>Olympus Zuiko Digital ED 14-35mm F2.0 SWD</model>
-+        <mount>4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-M1 -->
-+            <distortion model="ptlens" focal="14" a="0.02286" b="-0.06336" c="0.03264"/>
-+            <distortion model="ptlens" focal="16" a="0.01596" b="-0.0447" c="0.02397"/>
-+            <distortion model="ptlens" focal="18" a="0.00819" b="-0.0231" c="0.0114"/>
-+            <distortion model="ptlens" focal="20" a="-0.00103" b="0.00768" c="-0.01591"/>
-+            <distortion model="ptlens" focal="23" a="0.00102" b="0.00424" c="-0.01246"/>
-+            <distortion model="ptlens" focal="26" a="0.00075" b="0.00295" c="-0.00626"/>
-+            <distortion model="ptlens" focal="30" a="0.00183" b="-0.00279" c="0.00304"/>
-+            <distortion model="ptlens" focal="35" a="0.00544" b="-0.01855" c="0.0247"/>
-+            <tca model="poly3" focal="14" vr="1.0001858" vb="1.0000144"/>
-+            <tca model="poly3" focal="16" vr="1.0001931" vb="0.9999968"/>
-+            <tca model="poly3" focal="18" vr="1.0002164" vb="0.9999765"/>
-+            <tca model="poly3" focal="20" vr="1.0002153" vb="0.9999632"/>
-+            <tca model="poly3" focal="23" vr="1.0002047" vb="0.9999521"/>
-+            <tca model="poly3" focal="26" vr="1.0001182" vb="0.9999707"/>
-+            <tca model="poly3" focal="30" vr="1.0000099" vb="1.0000244"/>
-+            <tca model="poly3" focal="35" vr="0.9997740" vb="1.0001929"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-panasonic.xml b/data/db/slr-panasonic.xml
---- a/data/db/slr-panasonic.xml	2013-10-12 23:20:19.000000000 +0200
-+++ b/data/db/slr-panasonic.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,17 +1,14 @@
- <lensdatabase>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-L1</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>Panasonic</maker>
-         <model>DMC-L10</model>
-         <mount>4/3 System</mount>
--        <cropfactor>2.0</cropfactor>
-+        <cropfactor>2</cropfactor>
-     </camera>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-pentax.xml b/data/db/slr-pentax.xml
---- a/data/db/slr-pentax.xml	2013-10-16 20:48:25.000000000 +0200
-+++ b/data/db/slr-pentax.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,835 +1,1534 @@
- <lensdatabase>
--
-     <mount>
-         <name>Pentax K</name>
-         <name lang="ru">Байонет K</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Pentax KA</compat>
-         <compat>Pentax KAF</compat>
-         <compat>Pentax KAF2</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Pentax KA</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Pentax K</compat>
-         <compat>Pentax KAF</compat>
-         <compat>Pentax KAF2</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Pentax KAF</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Pentax K</compat>
-         <compat>Pentax KA</compat>
-         <compat>Pentax KAF2</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Pentax KAF2</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Pentax K</compat>
-         <compat>Pentax KA</compat>
-         <compat>Pentax KAF</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <mount>
-         <name>Pentax KAF3</name>
--        <compat>M42</compat>
--        <compat>T2</compat>
-         <compat>Pentax K</compat>
-         <compat>Pentax KA</compat>
-         <compat>Pentax KAF</compat>
-         <compat>Pentax KAF2</compat>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
-         <maker>Pentax</maker>
--        <maker lang="en">Pentax</maker>
-         <model>35mm film: full frame</model>
-         <mount>Pentax KAF2</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX *ist DL2</model>
-+        <model>Pentax *ist DL2</model>
-         <model lang="en">*ist DL2</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX *ist DL</model>
-+        <model>Pentax *ist DL</model>
-         <model lang="en">*ist DL</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX *ist DS2</model>
-+        <model>Pentax *ist DS2</model>
-         <model lang="en">*ist DS2</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX *ist DS</model>
-+        <model>Pentax *ist DS</model>
-         <model lang="en">*ist DS</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX *ist D</model>
-+        <model>Pentax *ist D</model>
-         <model lang="en">*ist D</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-m</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-m</model>
-         <model lang="en">K-m</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX K100</model>
--        <model lang="en">K100</model>
-+        <model>Pentax K100D</model>
-+        <model lang="en">K100D</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX K100D Super</model>
-+        <model>Pentax K100D Super</model>
-         <model lang="en">K100D Super</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX K110</model>
--        <model lang="en">K110</model>
-+        <model>Pentax K110D</model>
-+        <model lang="en">K110D</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX K10D</model>
-+        <model>Pentax K10D</model>
-         <model lang="en">K10D</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX Corporation</maker>
-+        <maker>Pentax Corporation</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX K20D</model>
-+        <model>Pentax K20D</model>
-         <model lang="en">K20D</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-30</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-30</model>
-         <model lang="en">K-30</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-50</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-50</model>
-         <model lang="en">K-50</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-500</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-500</model>
-         <model lang="en">K-500</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-7</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-7</model>
-         <model lang="en">K-7</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-5</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-5</model>
-         <model lang="en">K-5</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-5 II</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-5 II</model>
-         <model lang="en">K-5 II</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-5 II s</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-5 II s</model>
-         <model lang="en">K-5 II s</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-3</model>
-+        <model lang="en">K-3</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-3 II</model>
-+        <model lang="en">K-3 II</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Ricoh Imaging Company, Ltd.</maker>
-         <maker lang="en">Pentax</maker>
--        <model>PENTAX K2000</model>
--        <model lang="en">K2000</model>
-+        <model>Pentax K-1</model>
-+        <model lang="en">K-1</model>
-         <mount>Pentax KAF3</mount>
-+        <cropfactor>1</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax K2000</model>
-+        <model lang="en">K2000</model>
-+        <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K200D</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K200D</model>
-         <model lang="en">K200D</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-x</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-x</model>
-         <model lang="en">K-x</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>PENTAX</maker>
--        <maker lang="en">Pentax</maker>
--        <model>PENTAX K-r</model>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-r</model>
-         <model lang="en">K-r</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-S2</model>
-+        <model lang="en">K-S2</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-S1</model>
-+        <model lang="en">K-S1</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Pentax</maker>
-+        <model>Pentax K-70</model>
-+        <model lang="en">K-70</model>
-+        <mount>Pentax KAF3</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC PENTAX DA 12-24mm f/4 ED AL IF</model>
-+        <model>smc Pentax-DA 12-24mm f/4 ED AL IF</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="12" k1="-0.01919" />
--            <distortion model="poly3" focal="15" k1="-0.00774" />
--            <distortion model="poly3" focal="18" k1="-0.00345" />
--            <distortion model="poly3" focal="21" k1="-0.00199" />
--            <distortion model="poly3" focal="24" k1="0.00061" />
--            <tca model="poly3" focal="12" br="0.0000916" vr="0.9999904" bb="-0.0002397" vb="1.0006490" />
--            <tca model="poly3" focal="15" br="0.0001253" vr="0.9999184" bb="-0.0002858" vb="1.0008241" />
--            <tca model="poly3" focal="18" br="0.0001204" vr="0.9999075" bb="-0.0001990" vb="1.0006258" />
--            <tca model="poly3" focal="21" br="0.0001063" vr="0.9999562" bb="-0.0001477" vb="1.0005692" />
--            <tca model="poly3" focal="24" br="0.0000982" vr="1.0000005" bb="-0.0001137" vb="1.0004136" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="100" k1="-0.19267" k2="0.09379" k3="-0.38938" />
--            <vignetting model="pa" focal="15" aperture="4.5" distance="100" k1="-0.08756" k2="-0.28192" k3="0.06908" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="100" k1="-0.05982" k2="-0.45748" k3="0.25039" />
--            <vignetting model="pa" focal="21" aperture="4.5" distance="100" k1="-0.28874" k2="-0.06687" k3="0.09488" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="100" k1="-0.44227" k2="0.2599" k3="-0.09436" />
-+            <distortion model="poly3" focal="12" k1="-0.01919"/>
-+            <distortion model="poly3" focal="15" k1="-0.00774"/>
-+            <distortion model="poly3" focal="18" k1="-0.00345"/>
-+            <distortion model="poly3" focal="21" k1="-0.00199"/>
-+            <distortion model="poly3" focal="24" k1="0.00061"/>
-+            <tca model="poly3" focal="12" br="0.0000916" vr="0.9999904" bb="-0.0002397" vb="1.0006490"/>
-+            <tca model="poly3" focal="15" br="0.0001253" vr="0.9999184" bb="-0.0002858" vb="1.0008241"/>
-+            <tca model="poly3" focal="18" br="0.0001204" vr="0.9999075" bb="-0.0001990" vb="1.0006258"/>
-+            <tca model="poly3" focal="21" br="0.0001063" vr="0.9999562" bb="-0.0001477" vb="1.0005692"/>
-+            <tca model="poly3" focal="24" br="0.0000982" vr="1.0000005" bb="-0.0001137" vb="1.0004136"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="100" k1="-0.19267" k2="0.09379" k3="-0.38938"/>
-+            <vignetting model="pa" focal="15" aperture="4.5" distance="100" k1="-0.08756" k2="-0.28192" k3="0.06908"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="100" k1="-0.05982" k2="-0.45748" k3="0.25039"/>
-+            <vignetting model="pa" focal="21" aperture="4.5" distance="100" k1="-0.28874" k2="-0.06687" k3="0.09488"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="100" k1="-0.44227" k2="0.2599" k3="-0.09436"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC Pentax DA 16-45mm f/4.0 ED AL</model>
-+        <model>smc Pentax-DA 16-45mm f/4 ED AL</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16" a="0.012341" b="-0.035947" c="0" />
--            <distortion model="ptlens" focal="18" a="0.009928" b="-0.02993" c="0" />
--            <distortion model="ptlens" focal="20" a="0.005774" b="-0.01641" c="0" />
--            <distortion model="ptlens" focal="23" a="0.006045" b="-0.015109" c="0" />
--            <distortion model="ptlens" focal="26" a="0" b="0.000197" c="0" />
--            <distortion model="ptlens" focal="29" a="0" b="0.002637" c="0" />
--            <distortion model="ptlens" focal="34" a="0" b="0.003505" c="0" />
--            <distortion model="ptlens" focal="40" a="0" b="0.003288" c="0" />
--            <distortion model="ptlens" focal="45" a="0" b="0.003622" c="0" />
-+            <distortion model="ptlens" focal="16" a="0.012341" b="-0.035947" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0.009928" b="-0.02993" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.005774" b="-0.01641" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.006045" b="-0.015109" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0" b="0.000197" c="0"/>
-+            <distortion model="ptlens" focal="29" a="0" b="0.002637" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0.003505" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="0.003288" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0" b="0.003622" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC Pentax DA 18-55mm f/3.5-5.6</model>
-+        <model>HD PENTAX-DA 16-85mm f/3.5-5.6 ED DC WR</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.004593" b="-0.021008" c="0" />
--            <distortion model="ptlens" focal="21" a="0.00371" b="-0.014625" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="-0.004166" c="0" />
--            <distortion model="ptlens" focal="33" a="0" b="0.000528" c="0" />
--            <distortion model="ptlens" focal="55" a="0" b="0.003215" c="0" />
-+            <!-- Taken with Pentax K5 -->
-+            <distortion model="ptlens" focal="16" a="0.0128194" b="-0.0316035" c="-0.0188219"/>
-+            <distortion model="ptlens" focal="21" a="0.00900492" b="-0.0197809" c="-0.000667816"/>
-+            <distortion model="ptlens" focal="26" a="0.000946351" b="0.00713425" c="-0.0166867"/>
-+            <distortion model="ptlens" focal="28" a="-0.0044335" b="0.0251402" c="-0.0279517"/>
-+            <distortion model="ptlens" focal="35" a="-0.00319378" b="0.0213484" c="-0.0248333"/>
-+            <distortion model="ptlens" focal="43" a="0.000425028" b="0.00919418" c="-0.0109862"/>
-+            <distortion model="ptlens" focal="68" a="-0.000323365" b="0.00551294" c="0.00186962"/>
-+            <distortion model="ptlens" focal="85" a="0.00564139" b="-0.0180164" c="0.0337795"/>
-+            <tca model="poly3" focal="16" br="-0.0000704" vr="1.0005077" bb="0.0000690" vb="0.9999805"/>
-+            <tca model="poly3" focal="21" br="-0.0000044" vr="1.0004007" bb="0.0000207" vb="0.9999686"/>
-+            <tca model="poly3" focal="26" br="0.0000063" vr="1.0003142" bb="0.0000010" vb="0.9999308"/>
-+            <tca model="poly3" focal="28" br="0.0000026" vr="1.0002490" bb="-0.0000145" vb="0.9999347"/>
-+            <tca model="poly3" focal="35" br="-0.0000295" vr="1.0002180" bb="-0.0000030" vb="0.9999106"/>
-+            <tca model="poly3" focal="43" br="-0.0000267" vr="1.0001546" bb="-0.0000031" vb="0.9998828"/>
-+            <tca model="poly3" focal="48" br="-0.0000256" vr="1.0000562" bb="0.0000067" vb="0.9998701"/>
-+            <tca model="poly3" focal="68" br="-0.0000360" vr="0.9999061" bb="0.0000238" vb="0.9998529"/>
-+            <tca model="poly3" focal="85" br="-0.0000305" vr="0.9998040" bb="0.0000295" vb="0.9997888"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC Pentax DA L 18-55mm f/3.5-5.6</model>
-+        <model>smc Pentax-DA 18-55mm f/3.5-5.6 AL</model>
-+        <!-- FixMe: According to
-+             <http://en.wikipedia.org/wiki/Pentax_DA_18-55mm_lens>, Samsung
-+             D-XENON 18-55mm 1:3.5-5.6 AL is an alias. -->
-         <mount>Pentax KAF2</mount>
-+        <focal min="18" max="55"/>
-+        <aperture min="3.5" max="40"/>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.00117" b="-0.01707" c="-0.00529" />
--            <distortion model="ptlens" focal="24" a="0" b="-0.0071" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0.0002" c="0" />
--            <distortion model="ptlens" focal="42.5" a="0.00291" b="-0.00765" c="0.00808" />
--            <distortion model="ptlens" focal="55" a="0" b="0.00333" c="0" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.26538" k2="0.5437" k3="-0.51036" />
--            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.08271" k2="0.02282" k3="-0.04481" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.05666" k2="0.02789" k3="-0.01283" />
--            <vignetting model="pa" focal="42.5" aperture="11" distance="1000" k1="-0.03675" k2="0.01041" k3="-0.00479" />
--            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.07077" k2="0.07738" k3="-0.04494" />
--            <tca model="poly3" focal="18" br="0.0000246" vr="1.0008065" bb="0.00025" vb="0.9998" />
--            <tca model="poly3" focal="24" br="0.00004" vr="1.00056" bb="0.00024" vb="0.9999" />
--            <tca model="poly3" focal="35" br="0.00001" vr="1.000127" bb="0.000022" vb="1.0001" />
--            <tca model="poly3" focal="42.5" br="0.000084" vr="1.0000218" bb="-0.0000375" vb="1.0000794" />
--            <tca model="poly3" focal="55" br="0.0000165" vr="0.99999" bb="-0.0000538" vb="1.0000742" />
-+            <distortion focal="18" model="ptlens" a="0.00606571" b="-0.0251409" c="-0.00216764"/>
-+            <distortion focal="24" model="ptlens" a="0.00100173" b="-0.0115495" c="0.00286152"/>
-+            <distortion focal="35" model="ptlens" a="-8.27771e-05" b="0.000563308" c="-0.000657665"/>
-+            <distortion focal="45" model="ptlens" a="0.00340219" b="-0.0072762" c="0.00763624"/>
-+            <distortion focal="55" model="ptlens" a="-0.000442312" b="0.00460551" c="-0.00158524"/>
-+            <tca model="poly3" focal="18" br="-0.0000871" vr="1.0004828" bb="-0.0000263" vb="1.0001433"/>
-+            <tca model="poly3" focal="20" br="-0.0006746" cr="0.0017899" vr="0.9997634" bb="0.0007446" cb="-0.0011695" vb="1.0005314"/>
-+            <tca model="poly3" focal="21" br="-0.0012575" cr="0.0022420" vr="1.0000624" bb="-0.0004657" cb="0.0009917" vb="0.9995849"/>
-+            <tca model="poly3" focal="23" br="0.0008593" cr="-0.0018130" vr="1.0014264" bb="-0.0004830" cb="0.0011743" vb="0.9995325"/>
-+            <tca model="poly3" focal="24" br="-0.0000122" vr="1.0002181" bb="0.0000383" vb="1.0002671"/>
-+            <tca model="poly3" focal="26" br="-0.0000261" cr="0.0001475" vr="1.0003238" bb="0.0002433" cb="-0.0002405" vb="1.0002520"/>
-+            <tca model="poly3" focal="28" br="-0.0000056" cr="-0.0000342" vr="1.0004965" bb="0.0001311" cb="-0.0001193" vb="1.0003247"/>
-+            <tca model="poly3" focal="31" br="-0.0000110" cr="0.0001737" vr="1.0001522" bb="-0.0004369" cb="0.0009840" vb="0.9997737"/>
-+            <tca model="poly3" focal="33" br="-0.0004712" cr="0.0008834" vr="0.9998863" bb="-0.0000441" cb="0.0002601" vb="1.0007441"/>
-+            <tca model="poly3" focal="35" br="-0.0000093" vr="1.0001056" bb="-0.0000299" vb="1.0001859"/>
-+            <tca model="poly3" focal="38" br="-0.0002914" cr="0.0006529" vr="0.9998320" bb="0.0002885" cb="-0.0004075" vb="1.0007491"/>
-+            <tca model="poly3" focal="40" br="0.0000435" cr="0.0000393" vr="1.0000392" bb="0.0000098" cb="-0.0001665" vb="1.0002437"/>
-+            <tca model="poly3" focal="43" br="-0.0000113" vr="1.0001417" bb="0.0000241" vb="1.0000489"/>
-+            <tca model="poly3" focal="50" br="-0.0001694" cr="0.0004921" vr="0.9997155" bb="0.0000873" cb="-0.0000946" vb="1.0002636"/>
-+            <tca model="poly3" focal="55" br="-0.0000059" vr="1.0000907" bb="0.0000077" vb="0.9999907"/>
-+            <!-- Taken with Pentax K20D -->
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2263" k2="-1.0015" k3="0.6598"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2263" k2="-1.0015" k3="0.6598"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.1131" k2="-1.0728" k3="0.6578"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.1131" k2="-1.0728" k3="0.6578"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.0802" k2="-0.4710" k3="0.0853"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.0802" k2="-0.4710" k3="0.0853"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.3532" k2="0.5124" k3="-0.5488"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3532" k2="0.5124" k3="-0.5488"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3444" k2="0.3737" k3="-0.3126"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3444" k2="0.3737" k3="-0.3126"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2724" k2="0.0741" k3="-0.0304"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2724" k2="0.0741" k3="-0.0304"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2612" k2="0.0255" k3="0.0105"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2612" k2="0.0255" k3="0.0105"/>
-+            <vignetting model="pa" focal="24.4" aperture="4" distance="10" k1="-0.2054" k2="-0.9019" k3="0.5965"/>
-+            <vignetting model="pa" focal="24.4" aperture="4" distance="1000" k1="-0.2054" k2="-0.9019" k3="0.5965"/>
-+            <vignetting model="pa" focal="24.4" aperture="5.6" distance="10" k1="-0.1241" k2="-0.0710" k3="-0.0923"/>
-+            <vignetting model="pa" focal="24.4" aperture="5.6" distance="1000" k1="-0.1241" k2="-0.0710" k3="-0.0923"/>
-+            <vignetting model="pa" focal="24.4" aperture="8" distance="10" k1="-0.2021" k2="0.0920" k3="-0.0522"/>
-+            <vignetting model="pa" focal="24.4" aperture="8" distance="1000" k1="-0.2021" k2="0.0920" k3="-0.0522"/>
-+            <vignetting model="pa" focal="24.4" aperture="11" distance="10" k1="-0.1982" k2="0.0453" k3="0.0005"/>
-+            <vignetting model="pa" focal="24.4" aperture="11" distance="1000" k1="-0.1982" k2="0.0453" k3="0.0005"/>
-+            <vignetting model="pa" focal="24.4" aperture="16" distance="10" k1="-0.2011" k2="0.0450" k3="0.0029"/>
-+            <vignetting model="pa" focal="24.4" aperture="16" distance="1000" k1="-0.2011" k2="0.0450" k3="0.0029"/>
-+            <vignetting model="pa" focal="24.4" aperture="29" distance="10" k1="-0.1973" k2="0.0260" k3="0.0152"/>
-+            <vignetting model="pa" focal="24.4" aperture="29" distance="1000" k1="-0.1973" k2="0.0260" k3="0.0152"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.7670" k2="0.7438" k3="-0.3915"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.7670" k2="0.7438" k3="-0.3915"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.0805" k2="-0.4983" k3="0.3216"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.0805" k2="-0.4983" k3="0.3216"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1238" k2="0.0697" k3="-0.0407"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1238" k2="0.0697" k3="-0.0407"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.1224" k2="0.0371" k3="-0.0021"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.1224" k2="0.0371" k3="-0.0021"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.1327" k2="0.0464" k3="-0.0045"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.1327" k2="0.0464" k3="-0.0045"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.1457" k2="0.0648" k3="-0.0147"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1457" k2="0.0648" k3="-0.0147"/>
-+            <vignetting model="pa" focal="47.5" aperture="5.6" distance="10" k1="-0.7362" k2="0.6621" k3="-0.2797"/>
-+            <vignetting model="pa" focal="47.5" aperture="5.6" distance="1000" k1="-0.7362" k2="0.6621" k3="-0.2797"/>
-+            <vignetting model="pa" focal="47.5" aperture="8" distance="10" k1="0.0203" k2="-0.4593" k3="0.2325"/>
-+            <vignetting model="pa" focal="47.5" aperture="8" distance="1000" k1="0.0203" k2="-0.4593" k3="0.2325"/>
-+            <vignetting model="pa" focal="47.5" aperture="11" distance="10" k1="-0.1050" k2="0.0566" k3="-0.0233"/>
-+            <vignetting model="pa" focal="47.5" aperture="11" distance="1000" k1="-0.1050" k2="0.0566" k3="-0.0233"/>
-+            <vignetting model="pa" focal="47.5" aperture="16" distance="10" k1="-0.1106" k2="0.0594" k3="-0.0195"/>
-+            <vignetting model="pa" focal="47.5" aperture="16" distance="1000" k1="-0.1106" k2="0.0594" k3="-0.0195"/>
-+            <vignetting model="pa" focal="47.5" aperture="22" distance="10" k1="-0.1220" k2="0.0828" k3="-0.0331"/>
-+            <vignetting model="pa" focal="47.5" aperture="22" distance="1000" k1="-0.1220" k2="0.0828" k3="-0.0331"/>
-+            <vignetting model="pa" focal="47.5" aperture="40" distance="10" k1="-0.1314" k2="0.1027" k3="-0.0451"/>
-+            <vignetting model="pa" focal="47.5" aperture="40" distance="1000" k1="-0.1314" k2="0.1027" k3="-0.0451"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.6413" k2="0.4960" k3="-0.1884"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6413" k2="0.4960" k3="-0.1884"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0357" k2="-0.5717" k3="0.3609"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0357" k2="-0.5717" k3="0.3609"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1113" k2="0.1211" k3="-0.0996"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1113" k2="0.1211" k3="-0.0996"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="10" k1="-0.1029" k2="0.0627" k3="-0.0232"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1029" k2="0.0627" k3="-0.0232"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1142" k2="0.0827" k3="-0.0331"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1142" k2="0.0827" k3="-0.0331"/>
-+            <vignetting model="pa" focal="55" aperture="40" distance="10" k1="-0.1198" k2="0.0906" k3="-0.0350"/>
-+            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.1198" k2="0.0906" k3="-0.0350"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Pentax</maker>
--	    <model>smc PENTAX-DA 18-55mm f/3.5-5.6 AL</model>
--	    <focal min="18" max="55" />
--	    <aperture min="3.5" max="40" />
--	    <mount>Pentax KAF2</mount>
--	    <cropfactor>1.5</cropfactor>
--	    <calibration>
--	        <distortion focal="18" model="ptlens" a="0.00606571" b="-0.0251409" c="-0.00216764" />
--	        <distortion focal="24" model="ptlens" a="0.00100173" b="-0.0115495" c="0.00286152" />
--	        <distortion focal="35" model="ptlens" a="-8.27771e-05" b="0.000563308" c="-0.000657665" />
--	        <distortion focal="45" model="ptlens" a="0.00340219" b="-0.0072762" c="0.00763624" />
--	        <distortion focal="55" model="ptlens" a="-0.000442312" b="0.00460551" c="-0.00158524" />
--            <tca model="poly3" focal="18" br="-0.0000871" vr="1.0004828" bb="-0.0000263" vb="1.0001433" />
--            <tca model="poly3" focal="24" br="-0.0000122" vr="1.0002181" bb="0.0000383" vb="1.0002671" />
--            <tca model="poly3" focal="35" br="-0.0000093" vr="1.0001056" bb="-0.0000299" vb="1.0001859" />
--            <tca model="poly3" focal="43" br="-0.0000113" vr="1.0001417" bb="0.0000241" vb="1.0000489" />
--            <tca model="poly3" focal="55" br="-0.0000059" vr="1.0000907" bb="0.0000077" vb="0.9999907" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.25" k1="-0.1755" k2="-1.3129" k3="0.8855" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.6" k1="-0.1680" k2="-1.2909" k3="0.8623" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="2" k1="-0.1445" k2="-1.3289" k3="0.8829" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.1762" k2="-1.2707" k3="0.8516" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.25" k1="-0.1983" k2="-1.1895" k3="0.7927" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.6" k1="-0.2207" k2="-1.1489" k3="0.7757" />
--            <vignetting model="pa" focal="18" aperture="4" distance="2" k1="-0.1777" k2="-1.2306" k3="0.8204" />
--            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.1999" k2="-1.1911" k3="0.8012" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.25" k1="0.0765" k2="-1.2574" k3="0.6296" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.6" k1="0.0549" k2="-1.2017" k3="0.5965" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="2" k1="0.0937" k2="-1.2993" k3="0.6556" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="0.0835" k2="-1.2746" k3="0.6417" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.25" k1="-0.1519" k2="-0.1340" k3="-0.2433" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.6" k1="-0.1737" k2="-0.0777" k3="-0.2721" />
--            <vignetting model="pa" focal="18" aperture="8" distance="2" k1="-0.1367" k2="-0.1557" k3="-0.2318" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.1785" k2="-0.0474" k3="-0.2986" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.3873" k2="0.5175" k3="-0.4627" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.6" k1="-0.3598" k2="0.3691" k3="-0.3191" />
--            <vignetting model="pa" focal="18" aperture="22" distance="2" k1="-0.3429" k2="0.3929" k3="-0.3669" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3412" k2="0.3591" k3="-0.3262" />
--            <vignetting model="pa" focal="23" aperture="4" distance="0.25" k1="-0.1083" k2="-1.3195" k3="0.8777" />
--            <vignetting model="pa" focal="23" aperture="4" distance="1000" k1="-0.1056" k2="-1.3090" k3="0.8674" />
--            <vignetting model="pa" focal="23" aperture="5.6" distance="0.25" k1="-0.0110" k2="-0.7515" k3="0.3394" />
--            <vignetting model="pa" focal="23" aperture="5.6" distance="1000" k1="0.0358" k2="-0.7844" k3="0.3455" />
--            <vignetting model="pa" focal="23" aperture="8" distance="0.25" k1="-0.2591" k2="0.2727" k3="-0.3404" />
--            <vignetting model="pa" focal="23" aperture="8" distance="1000" k1="-0.2153" k2="0.2378" k3="-0.3224" />
--            <vignetting model="pa" focal="23" aperture="11" distance="0.25" k1="-0.2709" k2="0.2130" k3="-0.1650" />
--            <vignetting model="pa" focal="23" aperture="11" distance="1000" k1="-0.2061" k2="0.1046" k3="-0.0996" />
--            <vignetting model="pa" focal="23" aperture="29" distance="0.25" k1="-0.2345" k2="0.0523" k3="-0.0149" />
--            <vignetting model="pa" focal="23" aperture="29" distance="1000" k1="-0.1561" k2="-0.0728" k3="0.0550" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.25" k1="-0.2093" k2="-1.1201" k3="0.7655" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.6" k1="-0.0825" k2="-1.3539" k3="0.8954" />
--            <vignetting model="pa" focal="24" aperture="4" distance="2" k1="-0.0815" k2="-1.3603" k3="0.8991" />
--            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.1671" k2="-1.2042" k3="0.8109" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="0.25" k1="-0.0120" k2="-0.6761" k3="0.2803" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="0.6" k1="0.0309" k2="-0.7681" k3="0.3355" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="2" k1="0.0579" k2="-0.8066" k3="0.3529" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.0097" k2="-0.6238" k3="0.2363" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.25" k1="-0.2157" k2="0.1804" k3="-0.2651" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.6" k1="-0.2366" k2="0.2562" k3="-0.3137" />
--            <vignetting model="pa" focal="24" aperture="8" distance="2" k1="-0.1931" k2="0.1963" k3="-0.2894" />
--            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2442" k2="0.2699" k3="-0.3237" />
--            <vignetting model="pa" focal="24" aperture="11" distance="0.25" k1="-0.1979" k2="0.0165" k3="-0.0209" />
--            <vignetting model="pa" focal="24" aperture="11" distance="0.6" k1="-0.2233" k2="0.1219" k3="-0.1012" />
--            <vignetting model="pa" focal="24" aperture="11" distance="2" k1="-0.1950" k2="0.0846" k3="-0.0867" />
--            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2016" k2="0.0442" k3="-0.0524" />
--            <vignetting model="pa" focal="24" aperture="29" distance="0.25" k1="-0.1734" k2="-0.0851" k3="0.0692" />
--            <vignetting model="pa" focal="24" aperture="29" distance="0.6" k1="-0.1834" k2="-0.0331" k3="0.0361" />
--            <vignetting model="pa" focal="24" aperture="29" distance="2" k1="-0.1558" k2="-0.0687" k3="0.0529" />
--            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.1658" k2="-0.0980" k3="0.0768" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="0.25" k1="-0.6412" k2="0.3774" k3="-0.1775" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="0.6" k1="-0.6045" k2="0.3120" k3="-0.1406" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="2" k1="-0.6122" k2="0.3215" k3="-0.1467" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.6298" k2="0.3768" k3="-0.1810" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.25" k1="-0.3149" k2="-0.1624" k3="0.1100" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.6" k1="-0.3071" k2="-0.1822" k3="0.1225" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="2" k1="-0.2825" k2="-0.2233" k3="0.1441" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2159" k2="-0.3123" k3="0.1960" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.25" k1="-0.0911" k2="0.0007" k3="-0.0396" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.6" k1="-0.0607" k2="-0.0467" k3="-0.0089" />
--            <vignetting model="pa" focal="35" aperture="8" distance="2" k1="-0.0670" k2="-0.0315" k3="-0.0141" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.0720" k2="-0.0183" k3="-0.0294" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.25" k1="-0.1209" k2="0.0327" k3="-0.0185" />
--            <vignetting model="pa" focal="35" aperture="11" distance="0.6" k1="-0.0763" k2="-0.0448" k3="0.0288" />
--            <vignetting model="pa" focal="35" aperture="11" distance="2" k1="-0.0855" k2="-0.0227" k3="0.0154" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.0834" k2="-0.0231" k3="0.0149" />
--            <vignetting model="pa" focal="35" aperture="32" distance="0.25" k1="-0.1378" k2="0.0655" k3="-0.0360" />
--            <vignetting model="pa" focal="35" aperture="32" distance="0.6" k1="-0.1071" k2="0.0188" k3="-0.0079" />
--            <vignetting model="pa" focal="35" aperture="32" distance="2" k1="-0.1055" k2="0.0134" k3="-0.0044" />
--            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1010" k2="0.0103" k3="-0.0032" />
--            <vignetting model="pa" focal="45" aperture="4.5" distance="0.25" k1="-0.6527" k2="0.4378" k3="-0.1586" />
--            <vignetting model="pa" focal="45" aperture="4.5" distance="0.6" k1="-0.6557" k2="0.4443" k3="-0.1603" />
--            <vignetting model="pa" focal="45" aperture="4.5" distance="2" k1="-0.6573" k2="0.4517" k3="-0.1669" />
--            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.6473" k2="0.4314" k3="-0.1548" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="0.25" k1="-0.6671" k2="0.4701" k3="-0.1797" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="0.6" k1="-0.6395" k2="0.4145" k3="-0.1436" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="2" k1="-0.6592" k2="0.4504" k3="-0.1642" />
--            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.6589" k2="0.4587" k3="-0.1722" />
--            <vignetting model="pa" focal="45" aperture="8" distance="0.25" k1="0.0410" k2="-0.6839" k3="0.4004" />
--            <vignetting model="pa" focal="45" aperture="8" distance="0.6" k1="0.0515" k2="-0.7218" k3="0.4303" />
--            <vignetting model="pa" focal="45" aperture="8" distance="2" k1="0.0541" k2="-0.7041" k3="0.4121" />
--            <vignetting model="pa" focal="45" aperture="8" distance="1000" k1="0.0404" k2="-0.6814" k3="0.4027" />
--            <vignetting model="pa" focal="45" aperture="11" distance="0.25" k1="-0.0735" k2="0.0172" k3="-0.0354" />
--            <vignetting model="pa" focal="45" aperture="11" distance="0.6" k1="-0.0648" k2="0.0113" k3="-0.0349" />
--            <vignetting model="pa" focal="45" aperture="11" distance="2" k1="-0.0679" k2="0.0085" k3="-0.0275" />
--            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.0634" k2="0.0019" k3="-0.0242" />
--            <vignetting model="pa" focal="45" aperture="32" distance="0.25" k1="-0.0777" k2="-0.0037" k3="-0.0006" />
--            <vignetting model="pa" focal="45" aperture="32" distance="0.6" k1="-0.0579" k2="-0.0349" k3="0.0201" />
--            <vignetting model="pa" focal="45" aperture="32" distance="2" k1="-0.0611" k2="-0.0232" k3="0.0112" />
--            <vignetting model="pa" focal="45" aperture="32" distance="1000" k1="-0.0634" k2="-0.0223" k3="0.0120" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="0.25" k1="-0.6061" k2="0.3914" k3="-0.1375" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="0.6" k1="-0.6044" k2="0.3888" k3="-0.1360" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="2" k1="-0.6040" k2="0.3870" k3="-0.1338" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6206" k2="0.4281" k3="-0.1610" />
--            <vignetting model="pa" focal="55" aperture="8" distance="0.25" k1="-0.1431" k2="-0.4677" k3="0.3375" />
--            <vignetting model="pa" focal="55" aperture="8" distance="0.6" k1="-0.1116" k2="-0.5205" k3="0.3666" />
--            <vignetting model="pa" focal="55" aperture="8" distance="2" k1="-0.1104" k2="-0.5172" k3="0.3621" />
--            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1133" k2="-0.5112" k3="0.3579" />
--            <vignetting model="pa" focal="55" aperture="11" distance="0.25" k1="-0.0663" k2="0.0402" k3="-0.0837" />
--            <vignetting model="pa" focal="55" aperture="11" distance="0.6" k1="-0.0440" k2="0.0033" k3="-0.0590" />
--            <vignetting model="pa" focal="55" aperture="11" distance="2" k1="-0.0486" k2="0.0093" k3="-0.0599" />
--            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0589" k2="0.0334" k3="-0.0722" />
--            <vignetting model="pa" focal="55" aperture="16" distance="0.25" k1="-0.0495" k2="-0.0346" k3="0.0184" />
--            <vignetting model="pa" focal="55" aperture="16" distance="0.6" k1="-0.0344" k2="-0.0638" k3="0.0393" />
--            <vignetting model="pa" focal="55" aperture="16" distance="2" k1="-0.0391" k2="-0.0528" k3="0.0325" />
--            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.0362" k2="-0.0538" k3="0.0282" />
--            <vignetting model="pa" focal="55" aperture="40" distance="0.25" k1="-0.0696" k2="0.0006" k3="0.0005" />
--            <vignetting model="pa" focal="55" aperture="40" distance="0.6" k1="-0.0487" k2="-0.0344" k3="0.0193" />
--            <vignetting model="pa" focal="55" aperture="40" distance="2" k1="-0.0544" k2="-0.0287" k3="0.0192" />
--            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.0620" k2="-0.0024" k3="-0.0017" />
--	        <field_of_view focal="18" fov="67.3129" />
--	        <field_of_view focal="24" fov="53.0718" />
--	        <field_of_view focal="35" fov="37.8046" />
--	        <field_of_view focal="45" fov="30.0391" />
--	        <field_of_view focal="55" fov="24.731" />
--	    </calibration>
-+        <maker>Pentax</maker>
-+        <!-- FixMe: The following is an artificial compound name.  It should be
-+             refactored in aliases.  The optical equivalence is documented on
-+             <http://en.wikipedia.org/wiki/Pentax_DA_18-55mm_lens>. -->
-+        <model>smc Pentax-DA 18-55mm f/3.5-5.6 AL II L WR</model>
-+        <model lang="en">smc Pentax-DA 18-55mm f/3.5-5.6 AL II/L/WR</model>
-+        <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="18" a="0.01335" b="-0.04723" c="0.02086"/>
-+            <distortion model="ptlens" focal="23.1" a="0.00661" b="-0.02435" c="0.01004"/>
-+            <distortion model="ptlens" focal="28.1" a="0.00284" b="-0.00551" c="-0.0061"/>
-+            <distortion model="ptlens" focal="37.5" a="-0.00268" b="0.00861" c="-0.00565"/>
-+            <distortion model="ptlens" focal="42.5" a="0.00025" b="0.00247" c="-0.00182"/>
-+            <distortion model="ptlens" focal="55" a="0.00071" b="0.00057" c="0.00481"/>
-+            <tca model="poly3" focal="18" br="-0.0001755" vr="1.0009435" bb="0.0001675" vb="0.9998249"/>
-+            <tca model="poly3" focal="23.1" br="-0.0000950" vr="1.0006570" bb="0.0001151" vb="0.9999357"/>
-+            <tca model="poly3" focal="26.2" br="-0.0000496" vr="1.0003769" bb="0.0000072" vb="1.0000781"/>
-+            <tca model="poly3" focal="28.1" br="-0.0000057" vr="1.0003676" bb="0.0000552" vb="1.0000001"/>
-+            <tca model="poly3" focal="32.5" br="0.0000248" vr="1.0002094" bb="-0.0000015" vb="1.0000721"/>
-+            <tca model="poly3" focal="37.5" br="0.0000312" vr="1.0001768" bb="-0.0000128" vb="0.9999995"/>
-+            <tca model="poly3" focal="42.5" br="0.0000284" vr="1.0001411" bb="-0.0000171" vb="0.9999667"/>
-+            <tca model="poly3" focal="55" br="-0.0000088" vr="1.0001134" bb="0.0000106" vb="0.9999101"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.25" k1="-0.5281" k2="-0.5422" k3="0.4168"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4609" k2="-0.7272" k3="0.5617"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2056" k2="-0.9233" k3="0.5627"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2056" k2="-0.9233" k3="0.5627"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="0.25" k1="-0.2576" k2="-0.5723" k3="0.2665"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2809" k2="-0.2994" k3="0.0404"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2809" k2="-0.2994" k3="0.0404"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="0.25" k1="-0.4691" k2="0.3354" k3="-0.3851"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.4828" k2="0.4576" k3="-0.4579"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4828" k2="0.4576" k3="-0.4579"/>
-+            <vignetting model="pa" focal="18" aperture="10" distance="0.25" k1="-0.5710" k2="0.6335" k3="-0.5060"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.4740" k2="0.1812" k3="-0.0413"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4238" k2="0.0931" k3="0.0117"/>
-+            <vignetting model="pa" focal="24.4" aperture="4" distance="0.25" k1="-0.3716" k2="-0.7308" k3="0.5379"/>
-+            <vignetting model="pa" focal="24.4" aperture="4" distance="1000" k1="-0.3282" k2="-0.8336" k3="0.6009"/>
-+            <vignetting model="pa" focal="24.4" aperture="5.6" distance="0.25" k1="-0.3151" k2="0.1493" k3="-0.1858"/>
-+            <vignetting model="pa" focal="24.4" aperture="5.6" distance="1000" k1="-0.2824" k2="0.0834" k3="-0.1526"/>
-+            <vignetting model="pa" focal="24.4" aperture="7.1" distance="10" k1="-0.3295" k2="0.2088" k3="-0.1640"/>
-+            <vignetting model="pa" focal="24.4" aperture="7.1" distance="1000" k1="-0.3295" k2="0.2088" k3="-0.1640"/>
-+            <vignetting model="pa" focal="24.4" aperture="8" distance="0.25" k1="-0.3386" k2="0.1627" k3="-0.0775"/>
-+            <vignetting model="pa" focal="24.4" aperture="9" distance="10" k1="-0.2816" k2="0.0108" k3="0.0353"/>
-+            <vignetting model="pa" focal="24.4" aperture="9" distance="1000" k1="-0.2816" k2="0.0108" k3="0.0353"/>
-+            <vignetting model="pa" focal="24.4" aperture="11" distance="0.25" k1="-0.3184" k2="0.0826" k3="-0.0034"/>
-+            <vignetting model="pa" focal="24.4" aperture="13" distance="10" k1="-0.2776" k2="-0.0099" k3="0.0554"/>
-+            <vignetting model="pa" focal="24.4" aperture="13" distance="1000" k1="-0.2776" k2="-0.0099" k3="0.0554"/>
-+            <vignetting model="pa" focal="24.4" aperture="22" distance="10" k1="-0.2868" k2="0.0077" k3="0.0452"/>
-+            <vignetting model="pa" focal="24.4" aperture="22" distance="1000" k1="-0.2868" k2="0.0077" k3="0.0452"/>
-+            <vignetting model="pa" focal="24.4" aperture="29" distance="0.25" k1="-0.3367" k2="0.1198" k3="-0.0267"/>
-+            <vignetting model="pa" focal="24.4" aperture="29" distance="1000" k1="-0.2755" k2="0.0089" k3="0.0409"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="0.25" k1="-0.8683" k2="0.8449" k3="-0.4290"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8083" k2="0.7058" k3="-0.3560"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="0.25" k1="-0.1840" k2="0.0280" k3="-0.0638"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1620" k2="-0.0033" k3="-0.0406"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1710" k2="-0.0044" k3="0.0292"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1710" k2="-0.0044" k3="0.0292"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="0.25" k1="-0.2228" k2="0.1188" k3="-0.0436"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.1678" k2="-0.0095" k3="0.0323"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.1678" k2="-0.0095" k3="0.0323"/>
-+            <vignetting model="pa" focal="35" aperture="13" distance="0.25" k1="-0.2337" k2="0.1526" k3="-0.0683"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="0.25" k1="-0.2843" k2="0.2684" k3="-0.1417"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2018" k2="0.0702" k3="-0.0174"/>
-+            <vignetting model="pa" focal="47.5" aperture="5.6" distance="0.25" k1="-0.7973" k2="0.6968" k3="-0.2860"/>
-+            <vignetting model="pa" focal="47.5" aperture="8" distance="0.25" k1="-0.1196" k2="-0.0810" k3="-0.0139"/>
-+            <vignetting model="pa" focal="47.5" aperture="9" distance="0.25" k1="-0.1910" k2="0.1532" k3="-0.1149"/>
-+            <vignetting model="pa" focal="47.5" aperture="11" distance="0.25" k1="-0.1745" k2="0.0635" k3="-0.0075"/>
-+            <vignetting model="pa" focal="47.5" aperture="16" distance="0.25" k1="-0.1837" k2="0.0723" k3="-0.0059"/>
-+            <vignetting model="pa" focal="47.5" aperture="32" distance="10" k1="-0.1783" k2="0.1006" k3="-0.0421"/>
-+            <vignetting model="pa" focal="47.5" aperture="32" distance="1000" k1="-0.1783" k2="0.1006" k3="-0.0421"/>
-+            <vignetting model="pa" focal="47.5" aperture="40" distance="0.25" k1="-0.2496" k2="0.2218" k3="-0.0956"/>
-+            <vignetting model="pa" focal="47.5" aperture="40" distance="1000" k1="-0.1828" k2="0.1129" k3="-0.0506"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="0.25" k1="-0.6843" k2="0.4937" k3="-0.1732"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6731" k2="0.4889" k3="-0.1775"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="0.25" k1="-0.0285" k2="-0.5030" k3="0.2810"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0107" k2="-0.4980" k3="0.2650"/>
-+            <vignetting model="pa" focal="55" aperture="10" distance="0.25" k1="-0.1616" k2="0.1161" k3="-0.1142"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1306" k2="0.0466" k3="-0.0324"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1306" k2="0.0466" k3="-0.0324"/>
-+            <vignetting model="pa" focal="55" aperture="13" distance="0.25" k1="-0.1488" k2="0.0273" k3="0.0133"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="0.25" k1="-0.1449" k2="0.0118" k3="0.0245"/>
-+            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1099" k2="-0.0250" k3="0.0301"/>
-+            <vignetting model="pa" focal="55" aperture="40" distance="0.25" k1="-0.2083" k2="0.1109" k3="-0.0162"/>
-+            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.1585" k2="0.0524" k3="0.0008"/>
-+        </calibration>
-     </lens>
--
-     <lens>
--        <maker>PENTAX</maker>
--        <model>smc PENTAX-DA 18-55mm f/3.5-5.6 AL WR</model>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA 18-135mm f/3.5-5.6 ED AL IF DC WR</model>
-+        <mount>Pentax K</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="18" k1="-0.02615"/>
-+            <distortion model="poly3" focal="24" k1="-0.00343"/>
-+            <distortion model="ptlens" focal="36" a="0.01095" b="-0.01774" c="0.01645"/>
-+            <distortion model="poly3" focal="53" k1="0.00971"/>
-+            <distortion model="ptlens" focal="68" a="-0.00032" b="0.00979" c="-0.00265"/>
-+            <distortion model="poly3" focal="100" k1="0.00771"/>
-+            <distortion model="poly3" focal="135" k1="0.00701"/>
-+            <tca model="poly3" focal="18" br="0.0001" vr="1.00017" bb="0.00005" vb="1.00048"/>
-+            <tca model="poly3" focal="24" br="0.000" vr="1.00013" bb="0.0001" vb="1.000223"/>
-+            <tca model="poly3" focal="36" br="-0.000019" vr="1.00003" bb="-0.00005" vb="1.00023"/>
-+            <tca model="poly3" focal="53" br="0.0000" vr="0.9999" bb="-0.00005" vb="1.0001"/>
-+            <tca model="poly3" focal="68" br="0.000" vr="0.9998" bb="-0.00005" vb="1.0000"/>
-+            <tca model="poly3" focal="100" br="-0.00015" vr="0.99955" bb="-0.00005" vb="0.99996"/>
-+            <tca model="poly3" focal="135" br="-0.0004" vr="0.9994" bb="-0.00007" vb="0.99991"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.0932" k2="0.02721" k3="-0.0432"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.12861" k2="0.09689" k3="-0.05551"/>
-+            <vignetting model="pa" focal="36" aperture="11" distance="1000" k1="-0.14874" k2="0.19321" k3="-0.12757"/>
-+            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.05186" k2="-0.06742" k3="0.05663"/>
-+            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.11324" k2="0.21297" k3="-0.19382"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.10339" k2="0.24899" k3="-0.28571"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.16882" k2="0.35516" k3="-0.28791"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>PENTAX-F 28-80mm f/3.5-4.5</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.01335" b="-0.04723" c="0.02086" />
--            <distortion model="ptlens" focal="23.1" a="0.00661" b="-0.02435" c="0.01004" />
--            <distortion model="ptlens" focal="28.1" a="0.00284" b="-0.00551" c="-0.0061" />
--            <distortion model="ptlens" focal="37.5" a="-0.00268" b="0.00861" c="-0.00565" />
--            <distortion model="ptlens" focal="42.5" a="0.00025" b="0.00247" c="-0.00182" />
--            <distortion model="ptlens" focal="55" a="0.00071" b="0.00057" c="0.00481" />
--            <tca model="poly3" focal="18" br="-0.0001372" vr="1.0007557" bb="0.0000782" vb="0.9999286" />
--            <tca model="poly3" focal="18" br="-0.0001440" vr="1.0007660" bb="0.0000880" vb="0.9999157" />
--            <tca model="poly3" focal="18" br="-0.0001506" vr="1.0009070" bb="0.0001677" vb="0.9998234" />
--            <tca model="poly3" focal="18" br="-0.0001750" vr="1.0008773" bb="0.0001118" vb="0.9998886" />
--            <tca model="poly3" focal="18" br="-0.0001755" vr="1.0009435" bb="0.0001675" vb="0.9998249" />
--            <tca model="poly3" focal="23.1" br="-0.0000913" vr="1.0006518" bb="0.0001042" vb="0.9999483" />
--            <tca model="poly3" focal="23.1" br="-0.0000950" vr="1.0006570" bb="0.0001151" vb="0.9999357" />
--            <tca model="poly3" focal="26.2" br="-0.0000496" vr="1.0003769" bb="0.0000072" vb="1.0000781" />
--            <tca model="poly3" focal="28.1" br="-0.0000057" vr="1.0003676" bb="0.0000552" vb="1.0000001" />
--            <tca model="poly3" focal="32.5" br="0.0000248" vr="1.0002094" bb="-0.0000015" vb="1.0000721" />
--            <tca model="poly3" focal="37.5" br="0.0000312" vr="1.0001768" bb="-0.0000128" vb="0.9999995" />
--            <tca model="poly3" focal="42.5" br="0.0000237" vr="1.0001103" bb="-0.0000313" vb="1.0000069" />
--            <tca model="poly3" focal="42.5" br="0.0000284" vr="1.0001411" bb="-0.0000171" vb="0.9999667" />
--            <tca model="poly3" focal="55" br="-0.0000088" vr="1.0001134" bb="0.0000106" vb="0.9999101" />
--            <tca model="poly3" focal="55" br="-0.0000114" vr="1.0001156" bb="0.0000172" vb="0.9999106" />
--            <tca model="poly3" focal="55" br="0.0000193" vr="1.0001092" bb="-0.0000000" vb="0.9998871" />
--            <tca model="poly3" focal="55" br="0.0000317" vr="1.0000958" bb="0.0000118" vb="0.9998816" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.25" k1="-0.5281" k2="-0.5422" k3="0.4168" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4609" k2="-0.7272" k3="0.5617" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2056" k2="-0.9233" k3="0.5627" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2056" k2="-0.9233" k3="0.5627" />
--            <vignetting model="pa" focal="18" aperture="5" distance="0.25" k1="-0.2576" k2="-0.5723" k3="0.2665" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2809" k2="-0.2994" k3="0.0404" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2809" k2="-0.2994" k3="0.0404" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="0.25" k1="-0.4691" k2="0.3354" k3="-0.3851" />
--            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.4828" k2="0.4576" k3="-0.4579" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.4828" k2="0.4576" k3="-0.4579" />
--            <vignetting model="pa" focal="18" aperture="10" distance="0.25" k1="-0.5710" k2="0.6335" k3="-0.5060" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.25" k1="-0.4740" k2="0.1812" k3="-0.0413" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.4238" k2="0.0931" k3="0.0117" />
--            <vignetting model="pa" focal="24.4" aperture="4" distance="0.25" k1="-0.3716" k2="-0.7308" k3="0.5379" />
--            <vignetting model="pa" focal="24.4" aperture="4" distance="1000" k1="-0.3282" k2="-0.8336" k3="0.6009" />
--            <vignetting model="pa" focal="24.4" aperture="5.6" distance="0.25" k1="-0.3151" k2="0.1493" k3="-0.1858" />
--            <vignetting model="pa" focal="24.4" aperture="5.6" distance="1000" k1="-0.2824" k2="0.0834" k3="-0.1526" />
--            <vignetting model="pa" focal="24.4" aperture="7.1" distance="10" k1="-0.3295" k2="0.2088" k3="-0.1640" />
--            <vignetting model="pa" focal="24.4" aperture="7.1" distance="1000" k1="-0.3295" k2="0.2088" k3="-0.1640" />
--            <vignetting model="pa" focal="24.4" aperture="8" distance="0.25" k1="-0.3386" k2="0.1627" k3="-0.0775" />
--            <vignetting model="pa" focal="24.4" aperture="9" distance="10" k1="-0.2816" k2="0.0108" k3="0.0353" />
--            <vignetting model="pa" focal="24.4" aperture="9" distance="1000" k1="-0.2816" k2="0.0108" k3="0.0353" />
--            <vignetting model="pa" focal="24.4" aperture="11" distance="0.25" k1="-0.3184" k2="0.0826" k3="-0.0034" />
--            <vignetting model="pa" focal="24.4" aperture="13" distance="10" k1="-0.2776" k2="-0.0099" k3="0.0554" />
--            <vignetting model="pa" focal="24.4" aperture="13" distance="1000" k1="-0.2776" k2="-0.0099" k3="0.0554" />
--            <vignetting model="pa" focal="24.4" aperture="22" distance="10" k1="-0.2868" k2="0.0077" k3="0.0452" />
--            <vignetting model="pa" focal="24.4" aperture="22" distance="1000" k1="-0.2868" k2="0.0077" k3="0.0452" />
--            <vignetting model="pa" focal="24.4" aperture="29" distance="0.25" k1="-0.3367" k2="0.1198" k3="-0.0267" />
--            <vignetting model="pa" focal="24.4" aperture="29" distance="1000" k1="-0.2755" k2="0.0089" k3="0.0409" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="0.25" k1="-0.8683" k2="0.8449" k3="-0.4290" />
--            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.8083" k2="0.7058" k3="-0.3560" />
--            <vignetting model="pa" focal="35" aperture="6.3" distance="0.25" k1="-0.1840" k2="0.0280" k3="-0.0638" />
--            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1620" k2="-0.0033" k3="-0.0406" />
--            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.1710" k2="-0.0044" k3="0.0292" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1710" k2="-0.0044" k3="0.0292" />
--            <vignetting model="pa" focal="35" aperture="9" distance="0.25" k1="-0.2228" k2="0.1188" k3="-0.0436" />
--            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.1678" k2="-0.0095" k3="0.0323" />
--            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.1678" k2="-0.0095" k3="0.0323" />
--            <vignetting model="pa" focal="35" aperture="13" distance="0.25" k1="-0.2337" k2="0.1526" k3="-0.0683" />
--            <vignetting model="pa" focal="35" aperture="32" distance="0.25" k1="-0.2843" k2="0.2684" k3="-0.1417" />
--            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2018" k2="0.0702" k3="-0.0174" />
--            <vignetting model="pa" focal="47.5" aperture="5.6" distance="0.25" k1="-0.7973" k2="0.6968" k3="-0.2860" />
--            <vignetting model="pa" focal="47.5" aperture="8" distance="0.25" k1="-0.1196" k2="-0.0810" k3="-0.0139" />
--            <vignetting model="pa" focal="47.5" aperture="9" distance="0.25" k1="-0.1910" k2="0.1532" k3="-0.1149" />
--            <vignetting model="pa" focal="47.5" aperture="11" distance="0.25" k1="-0.1745" k2="0.0635" k3="-0.0075" />
--            <vignetting model="pa" focal="47.5" aperture="16" distance="0.25" k1="-0.1837" k2="0.0723" k3="-0.0059" />
--            <vignetting model="pa" focal="47.5" aperture="32" distance="10" k1="-0.1783" k2="0.1006" k3="-0.0421" />
--            <vignetting model="pa" focal="47.5" aperture="32" distance="1000" k1="-0.1783" k2="0.1006" k3="-0.0421" />
--            <vignetting model="pa" focal="47.5" aperture="40" distance="0.25" k1="-0.2496" k2="0.2218" k3="-0.0956" />
--            <vignetting model="pa" focal="47.5" aperture="40" distance="1000" k1="-0.1828" k2="0.1129" k3="-0.0506" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="0.25" k1="-0.6843" k2="0.4937" k3="-0.1732" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.6731" k2="0.4889" k3="-0.1775" />
--            <vignetting model="pa" focal="55" aperture="8" distance="0.25" k1="-0.0285" k2="-0.5030" k3="0.2810" />
--            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0107" k2="-0.4980" k3="0.2650" />
--            <vignetting model="pa" focal="55" aperture="10" distance="0.25" k1="-0.1616" k2="0.1161" k3="-0.1142" />
--            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1306" k2="0.0466" k3="-0.0324" />
--            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1306" k2="0.0466" k3="-0.0324" />
--            <vignetting model="pa" focal="55" aperture="13" distance="0.25" k1="-0.1488" k2="0.0273" k3="0.0133" />
--            <vignetting model="pa" focal="55" aperture="16" distance="0.25" k1="-0.1449" k2="0.0118" k3="0.0245" />
--            <vignetting model="pa" focal="55" aperture="16" distance="1000" k1="-0.1099" k2="-0.0250" k3="0.0301" />
--            <vignetting model="pa" focal="55" aperture="40" distance="0.25" k1="-0.2083" k2="0.1109" k3="-0.0162" />
--            <vignetting model="pa" focal="55" aperture="40" distance="1000" k1="-0.1585" k2="0.0524" k3="0.0008" />
-+            <!-- Taken with Pentax K-5 -->
-+            <distortion model="ptlens" focal="28" a="0.00103457" b="-0.0104385" c="-0.00251646"/>
-+            <distortion model="ptlens" focal="36" a="-0.00951146" b="0.0384678" c="-0.0644029"/>
-+            <distortion model="ptlens" focal="50" a="0.000214314" b="0.00652746" c="-0.0189032"/>
-+            <distortion model="ptlens" focal="68" a="-0.00808015" b="0.0359238" c="-0.052148"/>
-+            <distortion model="ptlens" focal="80" a="-0.0033906" b="0.0165939" c="-0.0253379"/>
-+            <tca model="poly3" focal="28" br="0.0000000" vr="1.0003470" bb="0.0000514" vb="1.0000402"/>
-+            <tca model="poly3" focal="36" br="0.0000153" vr="1.0002037" bb="0.0000424" vb="1.0000780"/>
-+            <tca model="poly3" focal="50" br="-0.0000103" vr="1.0001007" bb="0.0000085" vb="1.0001358"/>
-+            <tca model="poly3" focal="68" br="-0.0000330" vr="1.0001177" bb="-0.0000271" vb="1.0001116"/>
-+            <tca model="poly3" focal="80" br="-0.0000109" vr="1.0000879" bb="-0.0000033" vb="1.0000849"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC PENTAX DA 18-135mm f/3.5-5.6 ED AL [IF] DC WR</model>
--        <mount>Pentax K</mount>
-+        <model>smc Pentax-DA 50-200mm f/4-5.6 DA ED</model>
-+        <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3"  focal="18" k1="-0.02615" />
--            <distortion model="poly3"  focal="24" k1="-0.00343" />
--            <distortion model="ptlens" focal="36" a="0.01095" b="-0.01774" c="0.01645" />
--            <distortion model="poly3"  focal="53" k1="0.00971" />
--            <distortion model="ptlens" focal="68" a="-0.00032" b="0.00979" c="-0.00265" />
--            <distortion model="poly3"  focal="100" k1="0.00771" />
--            <distortion model="poly3"  focal="135" k1="0.00701" />
--            <tca model="poly3" focal="18" br="0.0001" vr="1.00017" bb="0.00005" vb="1.00048" />
--            <tca model="poly3" focal="24" br="0.000" vr="1.00013" bb="0.0001" vb="1.000223" />
--            <tca model="poly3" focal="36" br="-0.000019" vr="1.00003" bb="-0.00005" vb="1.00023" />
--            <tca model="poly3" focal="53" br="0.0000" vr="0.9999" bb="-0.00005" vb="1.0001" />
--            <tca model="poly3" focal="68" br="0.000" vr="0.9998" bb="-0.00005" vb="1.0000" />
--            <tca model="poly3" focal="100" br="-0.00015" vr="0.99955" bb="-0.00005" vb="0.99996" />
--            <tca model="poly3" focal="135" br="-0.0004" vr="0.9994" bb="-0.00007" vb="0.99991" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.0932" k2="0.02721" k3="-0.0432" />
--            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.12861" k2="0.09689" k3="-0.05551" />
--            <vignetting model="pa" focal="36" aperture="11" distance="1000" k1="-0.14874" k2="0.19321" k3="-0.12757" />
--            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.05186" k2="-0.06742" k3="0.05663" />
--            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.11324" k2="0.21297" k3="-0.19382" />
--            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.10339" k2="0.24899" k3="-0.28571" />
--            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.16882" k2="0.35516" k3="-0.28791" />
-+            <distortion model="poly3" focal="50" k1="-0.004038"/>
-+            <distortion model="poly3" focal="63" k1="0.001607"/>
-+            <distortion model="poly3" focal="95" k1="0.007697"/>
-+            <distortion model="poly3" focal="125" k1="0.007991"/>
-+            <distortion model="poly3" focal="138" k1="0.008036"/>
-+            <distortion model="poly3" focal="160" k1="0.007909"/>
-+            <distortion model="poly3" focal="180" k1="0.009293"/>
-+            <distortion model="poly3" focal="200" k1="0.007685"/>
-+            <!-- Vignetting pictures taken with Pentax K20D -->
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.3248" k2="-0.4362" k3="0.2366"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.3248" k2="-0.4362" k3="0.2366"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.0309" k2="-0.5537" k3="0.1946"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.0309" k2="-0.5537" k3="0.1946"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1649" k2="0.1234" k3="-0.0901"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1649" k2="0.1234" k3="-0.0901"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1447" k2="0.0450" k3="-0.0100"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1447" k2="0.0450" k3="-0.0100"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1432" k2="0.0458" k3="-0.0110"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1432" k2="0.0458" k3="-0.0110"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1475" k2="0.0581" k3="-0.0199"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1475" k2="0.0581" k3="-0.0199"/>
-+            <vignetting model="pa" focal="80" aperture="4.5" distance="10" k1="-0.3824" k2="-0.0328" k3="0.0285"/>
-+            <vignetting model="pa" focal="80" aperture="4.5" distance="1000" k1="-0.3824" k2="-0.0328" k3="0.0285"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.2982" k2="-0.1506" k3="0.0941"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.2982" k2="-0.1506" k3="0.0941"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.1328" k2="0.1286" k3="-0.1262"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.1328" k2="0.1286" k3="-0.1262"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.1183" k2="0.0474" k3="-0.0136"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.1183" k2="0.0474" k3="-0.0136"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.1181" k2="0.0538" k3="-0.0187"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.1181" k2="0.0538" k3="-0.0187"/>
-+            <vignetting model="pa" focal="80" aperture="29" distance="10" k1="-0.1252" k2="0.0746" k3="-0.0325"/>
-+            <vignetting model="pa" focal="80" aperture="29" distance="1000" k1="-0.1252" k2="0.0746" k3="-0.0325"/>
-+            <vignetting model="pa" focal="95" aperture="4.5" distance="10" k1="-0.3324" k2="-0.0859" k3="-0.0037"/>
-+            <vignetting model="pa" focal="95" aperture="4.5" distance="1000" k1="-0.3324" k2="-0.0859" k3="-0.0037"/>
-+            <vignetting model="pa" focal="95" aperture="5.6" distance="10" k1="-0.3247" k2="-0.0748" k3="-0.0124"/>
-+            <vignetting model="pa" focal="95" aperture="5.6" distance="1000" k1="-0.3247" k2="-0.0748" k3="-0.0124"/>
-+            <vignetting model="pa" focal="95" aperture="8" distance="10" k1="-0.1183" k2="0.0992" k3="-0.0802"/>
-+            <vignetting model="pa" focal="95" aperture="8" distance="1000" k1="-0.1183" k2="0.0992" k3="-0.0802"/>
-+            <vignetting model="pa" focal="95" aperture="11" distance="10" k1="-0.1099" k2="0.0501" k3="-0.0152"/>
-+            <vignetting model="pa" focal="95" aperture="11" distance="1000" k1="-0.1099" k2="0.0501" k3="-0.0152"/>
-+            <vignetting model="pa" focal="95" aperture="16" distance="10" k1="-0.1123" k2="0.0613" k3="-0.0225"/>
-+            <vignetting model="pa" focal="95" aperture="16" distance="1000" k1="-0.1123" k2="0.0613" k3="-0.0225"/>
-+            <vignetting model="pa" focal="95" aperture="29" distance="10" k1="-0.1108" k2="0.0588" k3="-0.0192"/>
-+            <vignetting model="pa" focal="95" aperture="29" distance="1000" k1="-0.1108" k2="0.0588" k3="-0.0192"/>
-+            <vignetting model="pa" focal="138" aperture="4.5" distance="10" k1="-0.2629" k2="-0.6520" k3="0.4563"/>
-+            <vignetting model="pa" focal="138" aperture="4.5" distance="1000" k1="-0.2629" k2="-0.6520" k3="0.4563"/>
-+            <vignetting model="pa" focal="138" aperture="5.6" distance="10" k1="-0.2687" k2="-0.6321" k3="0.4415"/>
-+            <vignetting model="pa" focal="138" aperture="5.6" distance="1000" k1="-0.2687" k2="-0.6321" k3="0.4415"/>
-+            <vignetting model="pa" focal="138" aperture="8" distance="10" k1="-0.1056" k2="0.1631" k3="-0.2354"/>
-+            <vignetting model="pa" focal="138" aperture="8" distance="1000" k1="-0.1056" k2="0.1631" k3="-0.2354"/>
-+            <vignetting model="pa" focal="138" aperture="11" distance="10" k1="-0.0966" k2="0.0415" k3="-0.0081"/>
-+            <vignetting model="pa" focal="138" aperture="11" distance="1000" k1="-0.0966" k2="0.0415" k3="-0.0081"/>
-+            <vignetting model="pa" focal="138" aperture="16" distance="10" k1="-0.1000" k2="0.0559" k3="-0.0186"/>
-+            <vignetting model="pa" focal="138" aperture="16" distance="1000" k1="-0.1000" k2="0.0559" k3="-0.0186"/>
-+            <vignetting model="pa" focal="138" aperture="29" distance="10" k1="-0.1014" k2="0.0582" k3="-0.0171"/>
-+            <vignetting model="pa" focal="138" aperture="29" distance="1000" k1="-0.1014" k2="0.0582" k3="-0.0171"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.9874" k2="0.8298" k3="-0.3319"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.9874" k2="0.8298" k3="-0.3319"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.0101" k2="-0.2621" k3="0.0531"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.0101" k2="-0.2621" k3="0.0531"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.0830" k2="0.0376" k3="-0.0069"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0830" k2="0.0376" k3="-0.0069"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.0857" k2="0.0459" k3="-0.0106"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0857" k2="0.0459" k3="-0.0106"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.0787" k2="0.0275" k3="0.0014"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.0787" k2="0.0275" k3="0.0014"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- This is a copy of the smc Pentax-DA L 55-300mm f/4-5.8 ED below.
-+             Please keep in sync. -->
-         <maker>Pentax</maker>
--        <model>SMC Pentax DA 50-200mm f/4-5.6 DA ED</model>
-+        <model>smc Pentax-DA 55-300mm f/4-5.8 ED</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.004038" c="0" />
--            <distortion model="ptlens" focal="63" a="0" b="0.001607" c="0" />
--            <distortion model="ptlens" focal="95" a="0" b="0.007697" c="0" />
--            <distortion model="ptlens" focal="125" a="0" b="0.007991" c="0" />
--            <distortion model="ptlens" focal="138" a="0" b="0.008036" c="0" />
--            <distortion model="ptlens" focal="160" a="0" b="0.007909" c="0" />
--            <distortion model="ptlens" focal="180" a="0" b="0.009293" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.007685" c="0" />
-+            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824"/>
-+            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127"/>
-+            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643"/>
-+            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078"/>
-+            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102"/>
-+            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349"/>
-+            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061"/>
-+            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017"/>
-+            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925"/>
-+            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750"/>
-+            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342"/>
-+            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- This is a copy of the smc Pentax-DA 55-300mm f/4-5.8 ED above.
-+             Please keep in sync. -->
-         <maker>Pentax</maker>
--        <model>SMC PENTAX DA 55-300mm f/4-5.8 ED</model>
-+        <model>smc Pentax-DA L 55-300mm f/4-5.8 ED</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824" />
--            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127" />
--            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643" />
--            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078" />
--            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102" />
--            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349" />
--            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061" />
--            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017" />
--            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925" />
--            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750" />
--            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342" />
--            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492" />
-+            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824"/>
-+            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127"/>
-+            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643"/>
-+            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078"/>
-+            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102"/>
-+            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349"/>
-+            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061"/>
-+            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017"/>
-+            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925"/>
-+            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750"/>
-+            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342"/>
-+            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>PENTAX</maker>
--        <model>smc PENTAX-DA 15mm F4 ED AL Limited</model>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA 15mm f/4 ED AL Limited</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="15" a="0.00305" b="0.00418" c="-0.01276" />
--            <tca model="poly3" focal="15" br="-0.0000314" vr="1.0005721" bb="0.0000869" vb="0.9999889" />
--            <tca model="poly3" focal="15" br="-0.0000370" vr="1.0005702" bb="0.0000869" vb="0.9999918" />
--            <tca model="poly3" focal="15" br="-0.0001275" vr="1.0006628" bb="0.0000063" vb="1.0000738" />
--            <vignetting model="pa" focal="15" aperture="4" distance="0.18" k1="-0.5838" k2="-0.1163" k3="0.1375" />
--            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.5817" k2="-0.4431" k3="0.3722" />
--            <vignetting model="pa" focal="15" aperture="5.6" distance="0.18" k1="-0.4834" k2="0.3429" k3="-0.2120" />
--            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.5629" k2="0.5126" k3="-0.3451" />
--            <vignetting model="pa" focal="15" aperture="8" distance="0.18" k1="-0.4770" k2="0.2792" k3="-0.1004" />
--            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.5111" k2="0.2703" k3="-0.0816" />
--            <vignetting model="pa" focal="15" aperture="11" distance="0.18" k1="-0.4775" k2="0.2770" k3="-0.0985" />
--            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.5117" k2="0.2676" k3="-0.0796" />
--            <vignetting model="pa" focal="15" aperture="22" distance="0.18" k1="-0.4794" k2="0.2759" k3="-0.0990" />
--            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.5126" k2="0.2608" k3="-0.0756" />
-+            <distortion model="ptlens" focal="15" a="0.00305" b="0.00418" c="-0.01276"/>
-+            <tca model="poly3" focal="15" br="-0.0000314" vr="1.0005721" bb="0.0000869" vb="0.9999889"/>
-+            <tca model="poly3" focal="15" br="-0.0000370" vr="1.0005702" bb="0.0000869" vb="0.9999918"/>
-+            <tca model="poly3" focal="15" br="-0.0001275" vr="1.0006628" bb="0.0000063" vb="1.0000738"/>
-+            <vignetting model="pa" focal="15" aperture="4" distance="0.18" k1="-0.5838" k2="-0.1163" k3="0.1375"/>
-+            <vignetting model="pa" focal="15" aperture="4" distance="1000" k1="-0.5817" k2="-0.4431" k3="0.3722"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="0.18" k1="-0.4834" k2="0.3429" k3="-0.2120"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.5629" k2="0.5126" k3="-0.3451"/>
-+            <vignetting model="pa" focal="15" aperture="8" distance="0.18" k1="-0.4770" k2="0.2792" k3="-0.1004"/>
-+            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.5111" k2="0.2703" k3="-0.0816"/>
-+            <vignetting model="pa" focal="15" aperture="11" distance="0.18" k1="-0.4775" k2="0.2770" k3="-0.0985"/>
-+            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.5117" k2="0.2676" k3="-0.0796"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="0.18" k1="-0.4794" k2="0.2759" k3="-0.0990"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.5126" k2="0.2608" k3="-0.0756"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC PENTAX K 30mm f/2.8</model>
-+        <model>smc Pentax K 30mm f/2.8</model>
-         <mount>Pentax K</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="30" k1="-0.00537" />
--            <tca model="poly3" focal="30" br="0.0000083" vr="1.0002" bb="0.00008" vb="0.99976" />
--            <vignetting model="pa" focal="30" aperture="11" distance="1000" k1="-0.36804" k2="0.318" k3="-0.18433" />
-+            <distortion model="poly3" focal="30" k1="-0.00537"/>
-+            <tca model="poly3" focal="30" br="0.0000083" vr="1.0002" bb="0.00008" vb="0.99976"/>
-+            <vignetting model="pa" focal="30" aperture="11" distance="1000" k1="-0.36804" k2="0.318" k3="-0.18433"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC PENTAX DA 40mm f/2.8 Limited</model>
-+        <model>smc Pentax-DA 40mm f/2.8 Limited</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="40" k1="-0.00384" />
--            <tca model="poly3" focal="40" br="-0.0000230" vr="1.0001421" bb="0.0000150" vb="0.9999150" />
--            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.17248" k2="0.21247" k3="-0.13119" />
-+            <distortion model="poly3" focal="40" k1="-0.00384"/>
-+            <tca model="poly3" focal="40" br="-0.0000230" vr="1.0001421" bb="0.0000150" vb="0.9999150"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.17248" k2="0.21247" k3="-0.13119"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>PENTAX</maker>
--        <model>smc PENTAX-FA 43mm f/1.9 Limited</model>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA 40mm f/2.8 XS</model>
-         <mount>Pentax KAF2</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-1 -->
-+            <distortion model="ptlens" focal="40" a="0.00084" b="0.0026" c="-0.01446"/>
-+            <tca model="poly3" focal="40.0" br="-0.0000344" vr="1.0002530" bb="0.0000659" vb="0.9998578"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="10" k1="-1.6422" k2="1.4812" k3="-0.6072"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-1.6422" k2="1.4812" k3="-0.6072"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="10" k1="-0.4285" k2="-0.7416" k3="0.5401"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.4285" k2="-0.7416" k3="0.5401"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="10" k1="-0.5051" k2="0.1224" k3="-0.1631"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.5051" k2="0.1224" k3="-0.1631"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="10" k1="-0.5724" k2="0.3651" k3="-0.2500"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.5724" k2="0.3651" k3="-0.2500"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="10" k1="-0.5495" k2="0.0721" k3="0.0591"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.5495" k2="0.0721" k3="0.0591"/>
-+            <vignetting model="pa" focal="40" aperture="16" distance="10" k1="-0.5480" k2="0.0905" k3="0.0287"/>
-+            <vignetting model="pa" focal="40" aperture="16" distance="1000" k1="-0.5480" k2="0.0905" k3="0.0287"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="10" k1="-0.6683" k2="0.3178" k3="-0.0722"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.6683" k2="0.3178" k3="-0.0722"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-FA 43mm f/1.9 Limited</model>
-+        <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="43" a="-0.00469" b="0.01317" c="-0" />
--            <tca model="poly3" focal="43" br="-0.0000002" vr="1.0004216" bb="0.0000154" vb="0.9996758" />
--            <tca model="poly3" focal="43" br="-0.0000052" vr="1.0003816" bb="0.0000293" vb="0.9997198" />
--            <tca model="poly3" focal="43" br="-0.0000240" vr="1.0003765" bb="0.0000283" vb="0.9997431" />
--            <tca model="poly3" focal="43" br="0.0000277" vr="1.0003967" bb="-0.0000121" vb="0.9997040" />
--            <tca model="poly3" focal="43" br="0.0000411" vr="1.0003521" bb="0.0000012" vb="0.9996986" />
--            <vignetting model="pa" focal="43" aperture="1.9" distance="0.45" k1="-0.6622" k2="0.4306" k3="-0.1437" />
--            <vignetting model="pa" focal="43" aperture="1.9" distance="1000" k1="-0.8815" k2="0.7667" k3="-0.3234" />
--            <vignetting model="pa" focal="43" aperture="2.8" distance="0.45" k1="-0.1673" k2="0.0212" k3="0.0073" />
--            <vignetting model="pa" focal="43" aperture="2.8" distance="1000" k1="-0.2041" k2="0.0207" k3="0.0152" />
--            <vignetting model="pa" focal="43" aperture="4" distance="0.45" k1="-0.1679" k2="0.0215" k3="0.0114" />
--            <vignetting model="pa" focal="43" aperture="4" distance="1000" k1="-0.2129" k2="0.0349" k3="0.0118" />
--            <vignetting model="pa" focal="43" aperture="5.6" distance="0.45" k1="-0.1754" k2="0.0408" k3="-0.0015" />
--            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.2232" k2="0.0558" k3="-0.0010" />
--            <vignetting model="pa" focal="43" aperture="22" distance="0.45" k1="-0.2472" k2="0.1832" k3="-0.0817" />
--            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.2885" k2="0.1864" k3="-0.0748" />
-+            <distortion model="ptlens" focal="43" a="-0.00469" b="0.01317" c="-0"/>
-+            <tca model="poly3" focal="43" br="-0.0000002" vr="1.0004216" bb="0.0000154" vb="0.9996758"/>
-+            <tca model="poly3" focal="43" br="-0.0000052" vr="1.0003816" bb="0.0000293" vb="0.9997198"/>
-+            <tca model="poly3" focal="43" br="-0.0000240" vr="1.0003765" bb="0.0000283" vb="0.9997431"/>
-+            <tca model="poly3" focal="43" br="0.0000277" vr="1.0003967" bb="-0.0000121" vb="0.9997040"/>
-+            <tca model="poly3" focal="43" br="0.0000411" vr="1.0003521" bb="0.0000012" vb="0.9996986"/>
-+            <vignetting model="pa" focal="43" aperture="1.9" distance="0.45" k1="-0.6622" k2="0.4306" k3="-0.1437"/>
-+            <vignetting model="pa" focal="43" aperture="1.9" distance="1000" k1="-0.8815" k2="0.7667" k3="-0.3234"/>
-+            <vignetting model="pa" focal="43" aperture="2.8" distance="0.45" k1="-0.1673" k2="0.0212" k3="0.0073"/>
-+            <vignetting model="pa" focal="43" aperture="2.8" distance="1000" k1="-0.2041" k2="0.0207" k3="0.0152"/>
-+            <vignetting model="pa" focal="43" aperture="4" distance="0.45" k1="-0.1679" k2="0.0215" k3="0.0114"/>
-+            <vignetting model="pa" focal="43" aperture="4" distance="1000" k1="-0.2129" k2="0.0349" k3="0.0118"/>
-+            <vignetting model="pa" focal="43" aperture="5.6" distance="0.45" k1="-0.1754" k2="0.0408" k3="-0.0015"/>
-+            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.2232" k2="0.0558" k3="-0.0010"/>
-+            <vignetting model="pa" focal="43" aperture="22" distance="0.45" k1="-0.2472" k2="0.1832" k3="-0.0817"/>
-+            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.2885" k2="0.1864" k3="-0.0748"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
-         <model>Takumar 135mm f/2.5 Bayonet</model>
-         <mount>Pentax K</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="135" k1="0.00185" />
--            <tca model="poly3" focal="135" br="0.0000400" vr="0.999887" bb="-0.00012" vb="1.0002" />
--            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.40098" k2="0.46402" k3="-0.26756" />
-+            <distortion model="poly3" focal="135" k1="0.00185"/>
-+            <tca model="poly3" focal="135" br="0.0000400" vr="0.999887" bb="-0.00012" vb="1.0002"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.40098" k2="0.46402" k3="-0.26756"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC PENTAX M 50mm f/2</model>
-+        <model>smc Pentax-M 50mm f/1.7</model>
-         <mount>Pentax K</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="50" k1="-0.00239" />
--            <tca model="poly3" focal="50" br="0.0000100" vr="1.00005" bb="-0.0000100" vb="0.99974" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.30738" k2="0.29474" k3="-0.16389" />
-+            <!-- Taken with Pentax K-5 II -->
-+            <distortion model="ptlens" focal="50" a="0.00266415" b="-0.0099024" c="0.0120246"/>
-+            <tca model="poly3" focal="50" br="-0.0000256" vr="1.0000546" bb="-0.0000066" vb="0.9999937"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>PENTAX</maker>
--        <model>smc PENTAX-D FA Macro 100mm f/2.8 WR</model>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-M 50mm f/2</model>
-+        <mount>Pentax K</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="50" k1="-0.00239"/>
-+            <tca model="poly3" focal="50" br="0.0000100" vr="1.00005" bb="-0.0000100" vb="0.99974"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.30738" k2="0.29474" k3="-0.16389"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-D FA Macro 100mm f/2.8 WR</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="100" a="0" b="00484" c="-0.01993" />
--            <tca model="poly3" focal="100" br="0.0000044" vr="0.9999354" bb="-0.0000404" vb="0.9997796" />
--            <tca model="poly3" focal="100" br="0.0000051" vr="0.9999355" bb="-0.0000111" vb="0.9997510" />
--            <tca model="poly3" focal="100" br="0.0000135" vr="0.9999237" bb="0.0000050" vb="0.9997609" />
--            <tca model="poly3" focal="100" br="0.0000160" vr="0.9999237" bb="0.0000027" vb="0.9998788" />
--            <tca model="poly3" focal="100" br="0.0000167" vr="0.9998977" bb="0.0000079" vb="0.9998621" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="0.3" k1="-0.0519" k2="-0.0004" k3="0.0078" />
--            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.6568" k2="0.6101" k3="-0.2619" />
--            <vignetting model="pa" focal="100" aperture="4" distance="0.3" k1="-0.0530" k2="0.0032" k3="0.0058" />
--            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0160" k2="-0.4279" k3="0.2562" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="0.3" k1="-0.0558" k2="0.0059" k3="0.0055" />
--            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0952" k2="-0.0017" k3="0.0219" />
--            <vignetting model="pa" focal="100" aperture="8" distance="0.3" k1="-0.0639" k2="0.0263" k3="-0.0075" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1030" k2="0.0156" k3="0.0117" />
--            <vignetting model="pa" focal="100" aperture="32" distance="0.3" k1="-0.0485" k2="-0.0204" k3="0.0258" />
--            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1224" k2="0.0565" k3="-0.0130" />
-+            <distortion model="ptlens" focal="100" a="0.00355" b="-0.01675" c="0.02729"/>
-+            <tca model="poly3" focal="100" br="0.0000044" vr="0.9999354" bb="-0.0000404" vb="0.9997796"/>
-+            <tca model="poly3" focal="100" br="0.0000051" vr="0.9999355" bb="-0.0000111" vb="0.9997510"/>
-+            <tca model="poly3" focal="100" br="0.0000135" vr="0.9999237" bb="0.0000050" vb="0.9997609"/>
-+            <tca model="poly3" focal="100" br="0.0000160" vr="0.9999237" bb="0.0000027" vb="0.9998788"/>
-+            <tca model="poly3" focal="100" br="0.0000167" vr="0.9998977" bb="0.0000079" vb="0.9998621"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="0.3" k1="-0.0519" k2="-0.0004" k3="0.0078"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.6568" k2="0.6101" k3="-0.2619"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="0.3" k1="-0.0530" k2="0.0032" k3="0.0058"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0160" k2="-0.4279" k3="0.2562"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="0.3" k1="-0.0558" k2="0.0059" k3="0.0055"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0952" k2="-0.0017" k3="0.0219"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="0.3" k1="-0.0639" k2="0.0263" k3="-0.0075"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1030" k2="0.0156" k3="0.0117"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="0.3" k1="-0.0485" k2="-0.0204" k3="0.0258"/>
-+            <vignetting model="pa" focal="100" aperture="32" distance="1000" k1="-0.1224" k2="0.0565" k3="-0.0130"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>SMC PENTAX M 150mm f/3.5</model>
-+        <model>smc Pentax-M 150mm f/3.5</model>
-         <mount>Pentax K</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="150" k1="0.00133" />
--            <tca model="poly3" focal="150" br="-0.00001" vr="0.9999" bb="-0.00005" vb="1.00007" />
--            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.45436" k2="0.68491" k3="-0.48506" />
-+            <distortion model="poly3" focal="150" k1="0.00133"/>
-+            <tca model="poly3" focal="150" br="-0.00001" vr="0.9999" bb="-0.00005" vb="1.00007"/>
-+            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.45436" k2="0.68491" k3="-0.48506"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>smc PENTAX-DA 35mm f/2.4 AL</model>
-+        <model>smc Pentax-DA 35mm f/2.4 AL</model>
-         <mount>Pentax KAF2</mount>
--        <!-- FixMe: Actually cropfactor 1.522 -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Pentax K-30 -->
--            <distortion model="poly3" focal="35" k1="-0.0038" />
--            <tca model="poly3" focal="35" vr="1.0003130" vb="0.9998969" />
-+            <distortion model="poly3" focal="35" k1="-0.0038"/>
-+            <!-- Taken with Pentax K-20 and a crop factor of 1.538 -->
-+            <tca model="poly3" focal="35" vr="1.0003130" vb="0.9998969"/>
-+            <vignetting model="pa" focal="35" aperture="2.4" distance="10" k1="-0.8061" k2="0.4347" k3="-0.1091"/>
-+            <vignetting model="pa" focal="35" aperture="2.4" distance="1000" k1="-0.8061" k2="0.4347" k3="-0.1091"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4977" k2="-0.1214" k3="0.1835"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4977" k2="-0.1214" k3="0.1835"/>
-+            <vignetting model="pa" focal="35" aperture="3.2" distance="10" k1="-0.2246" k2="-0.4345" k3="0.2930"/>
-+            <vignetting model="pa" focal="35" aperture="3.2" distance="1000" k1="-0.2246" k2="-0.4345" k3="0.2930"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2159" k2="0.0471" k3="-0.0511"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2159" k2="0.0471" k3="-0.0511"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2181" k2="0.0344" k3="0.0057"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2181" k2="0.0344" k3="0.0057"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2257" k2="0.0476" k3="-0.0010"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2257" k2="0.0476" k3="-0.0010"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2233" k2="0.0485" k3="-0.0046"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2233" k2="0.0485" k3="-0.0046"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.2197" k2="0.0419" k3="-0.0017"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.2197" k2="0.0419" k3="-0.0017"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2166" k2="0.0363" k3="0.0025"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2166" k2="0.0363" k3="0.0025"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>smc PENTAX-DA* 50-135mm f/2.8 ED [IF] SDM</model>
-+        <model>smc Pentax-DA 70mm f/2.4 Limited</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-70 -->
-+            <distortion model="poly3" focal="70" k1="0.000985364"/>
-+            <tca model="poly3" focal="70" vr="0.9997643" vb="0.9999367"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA* 50-135mm f/2.8 ED IF SDM</model>
-         <mount>Pentax KAF2</mount>
--        <!-- FixMe: Actually cropfactor 1.522 -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Pentax K-30 -->
--            <distortion model="poly3" focal="50" k1="-0.00786" />
--            <distortion model="poly3" focal="63" k1="-0.00367" />
--            <distortion model="poly3" focal="70" k1="0.00052" />
--            <distortion model="poly3" focal="75" k1="-0.00155" />
--            <distortion model="poly3" focal="95" k1="0.00337" />
--            <distortion model="poly3" focal="108" k1="0.00464" />
--            <distortion model="poly3" focal="135" k1="0.00586" />
--            <tca model="poly3" focal="50" vr="1.0003343" vb="0.9998633" />
--            <tca model="poly3" focal="63" vr="1.0001639" vb="0.9999264" />
--            <tca model="poly3" focal="70" vr="1.0000366" vb="0.9999579" />
--            <tca model="poly3" focal="75" vr="1.0000653" vb="0.9999403" />
--            <tca model="poly3" focal="95" vr="0.9999718" vb="0.9998939" />
--            <tca model="poly3" focal="108" vr="0.9999556" vb="0.9998626" />
--            <tca model="poly3" focal="135" vr="0.9999410" vb="0.9996804" />
-+            <distortion model="poly3" focal="50" k1="-0.00786"/>
-+            <distortion model="poly3" focal="63" k1="-0.00367"/>
-+            <distortion model="poly3" focal="70" k1="0.00052"/>
-+            <distortion model="poly3" focal="75" k1="-0.00155"/>
-+            <distortion model="poly3" focal="95" k1="0.00337"/>
-+            <distortion model="poly3" focal="108" k1="0.00464"/>
-+            <distortion model="poly3" focal="135" k1="0.00586"/>
-+            <tca model="poly3" focal="50" vr="1.0003343" vb="0.9998633"/>
-+            <tca model="poly3" focal="63" vr="1.0001639" vb="0.9999264"/>
-+            <tca model="poly3" focal="70" vr="1.0000366" vb="0.9999579"/>
-+            <tca model="poly3" focal="75" vr="1.0000653" vb="0.9999403"/>
-+            <tca model="poly3" focal="95" vr="0.9999718" vb="0.9998939"/>
-+            <tca model="poly3" focal="108" vr="0.9999556" vb="0.9998626"/>
-+            <tca model="poly3" focal="135" vr="0.9999410" vb="0.9996804"/>
-+            <!-- Taken with Pentax K-5 II -->
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.5219" k2="0.3879" k3="-0.2569"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.5219" k2="0.3879" k3="-0.2569"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1032" k2="-0.1508" k3="-0.0429"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1032" k2="-0.1508" k3="-0.0429"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1785" k2="0.2736" k3="-0.3085"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1785" k2="0.2736" k3="-0.3085"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.1865" k2="0.2555" k3="-0.2344"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.1865" k2="0.2555" k3="-0.2344"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1666" k2="0.1604" k3="-0.1341"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1666" k2="0.1604" k3="-0.1341"/>
-+            <vignetting model="pa" focal="50" aperture="6.7" distance="10" k1="-0.1526" k2="0.1031" k3="-0.0798"/>
-+            <vignetting model="pa" focal="50" aperture="6.7" distance="1000" k1="-0.1526" k2="0.1031" k3="-0.0798"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1543" k2="0.1080" k3="-0.0830"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1543" k2="0.1080" k3="-0.0830"/>
-+            <vignetting model="pa" focal="50" aperture="9.5" distance="10" k1="-0.1567" k2="0.1140" k3="-0.0868"/>
-+            <vignetting model="pa" focal="50" aperture="9.5" distance="1000" k1="-0.1567" k2="0.1140" k3="-0.0868"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1579" k2="0.1180" k3="-0.0899"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1579" k2="0.1180" k3="-0.0899"/>
-+            <vignetting model="pa" focal="63" aperture="2.8" distance="10" k1="-0.4650" k2="0.4721" k3="-0.3874"/>
-+            <vignetting model="pa" focal="63" aperture="2.8" distance="1000" k1="-0.4650" k2="0.4721" k3="-0.3874"/>
-+            <vignetting model="pa" focal="63" aperture="3.5" distance="10" k1="-0.1333" k2="0.1220" k3="-0.2921"/>
-+            <vignetting model="pa" focal="63" aperture="3.5" distance="1000" k1="-0.1333" k2="0.1220" k3="-0.2921"/>
-+            <vignetting model="pa" focal="63" aperture="4" distance="10" k1="-0.2373" k2="0.5212" k3="-0.5011"/>
-+            <vignetting model="pa" focal="63" aperture="4" distance="1000" k1="-0.2373" k2="0.5212" k3="-0.5011"/>
-+            <vignetting model="pa" focal="63" aperture="4.5" distance="10" k1="-0.2130" k2="0.4030" k3="-0.3658"/>
-+            <vignetting model="pa" focal="63" aperture="4.5" distance="1000" k1="-0.2130" k2="0.4030" k3="-0.3658"/>
-+            <vignetting model="pa" focal="63" aperture="5.6" distance="10" k1="-0.1820" k2="0.2641" k3="-0.2274"/>
-+            <vignetting model="pa" focal="63" aperture="5.6" distance="1000" k1="-0.1820" k2="0.2641" k3="-0.2274"/>
-+            <vignetting model="pa" focal="63" aperture="6.7" distance="10" k1="-0.1399" k2="0.1001" k3="-0.0774"/>
-+            <vignetting model="pa" focal="63" aperture="6.7" distance="1000" k1="-0.1399" k2="0.1001" k3="-0.0774"/>
-+            <vignetting model="pa" focal="63" aperture="8" distance="10" k1="-0.1407" k2="0.0984" k3="-0.0734"/>
-+            <vignetting model="pa" focal="63" aperture="8" distance="1000" k1="-0.1407" k2="0.0984" k3="-0.0734"/>
-+            <vignetting model="pa" focal="63" aperture="9.5" distance="10" k1="-0.1416" k2="0.0996" k3="-0.0731"/>
-+            <vignetting model="pa" focal="63" aperture="9.5" distance="1000" k1="-0.1416" k2="0.0996" k3="-0.0731"/>
-+            <vignetting model="pa" focal="63" aperture="11" distance="10" k1="-0.1431" k2="0.1039" k3="-0.0766"/>
-+            <vignetting model="pa" focal="63" aperture="11" distance="1000" k1="-0.1431" k2="0.1039" k3="-0.0766"/>
-+            <vignetting model="pa" focal="75" aperture="2.8" distance="10" k1="-0.3264" k2="0.2025" k3="-0.3131"/>
-+            <vignetting model="pa" focal="75" aperture="2.8" distance="1000" k1="-0.3264" k2="0.2025" k3="-0.3131"/>
-+            <vignetting model="pa" focal="75" aperture="3.5" distance="10" k1="-0.0353" k2="-0.0719" k3="-0.2639"/>
-+            <vignetting model="pa" focal="75" aperture="3.5" distance="1000" k1="-0.0353" k2="-0.0719" k3="-0.2639"/>
-+            <vignetting model="pa" focal="75" aperture="4" distance="10" k1="-0.1978" k2="0.4842" k3="-0.5732"/>
-+            <vignetting model="pa" focal="75" aperture="4" distance="1000" k1="-0.1978" k2="0.4842" k3="-0.5732"/>
-+            <vignetting model="pa" focal="75" aperture="4.5" distance="10" k1="-0.2288" k2="0.5538" k3="-0.5654"/>
-+            <vignetting model="pa" focal="75" aperture="4.5" distance="1000" k1="-0.2288" k2="0.5538" k3="-0.5654"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="10" k1="-0.2323" k2="0.5285" k3="-0.5025"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.2323" k2="0.5285" k3="-0.5025"/>
-+            <vignetting model="pa" focal="75" aperture="6.7" distance="10" k1="-0.1877" k2="0.3202" k3="-0.2807"/>
-+            <vignetting model="pa" focal="75" aperture="6.7" distance="1000" k1="-0.1877" k2="0.3202" k3="-0.2807"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="10" k1="-0.1368" k2="0.1149" k3="-0.0896"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1368" k2="0.1149" k3="-0.0896"/>
-+            <vignetting model="pa" focal="75" aperture="9.5" distance="10" k1="-0.1342" k2="0.0964" k3="-0.0698"/>
-+            <vignetting model="pa" focal="75" aperture="9.5" distance="1000" k1="-0.1342" k2="0.0964" k3="-0.0698"/>
-+            <vignetting model="pa" focal="75" aperture="11" distance="10" k1="-0.1359" k2="0.1011" k3="-0.0731"/>
-+            <vignetting model="pa" focal="75" aperture="11" distance="1000" k1="-0.1359" k2="0.1011" k3="-0.0731"/>
-+            <vignetting model="pa" focal="95" aperture="2.8" distance="10" k1="-0.1002" k2="-0.6727" k3="0.3072"/>
-+            <vignetting model="pa" focal="95" aperture="2.8" distance="1000" k1="-0.1002" k2="-0.6727" k3="0.3072"/>
-+            <vignetting model="pa" focal="95" aperture="3.5" distance="10" k1="0.1503" k2="-0.8768" k3="0.3289"/>
-+            <vignetting model="pa" focal="95" aperture="3.5" distance="1000" k1="0.1503" k2="-0.8768" k3="0.3289"/>
-+            <vignetting model="pa" focal="95" aperture="4" distance="10" k1="-0.0157" k2="-0.1187" k3="-0.1951"/>
-+            <vignetting model="pa" focal="95" aperture="4" distance="1000" k1="-0.0157" k2="-0.1187" k3="-0.1951"/>
-+            <vignetting model="pa" focal="95" aperture="4.5" distance="10" k1="-0.1339" k2="0.2905" k3="-0.4368"/>
-+            <vignetting model="pa" focal="95" aperture="4.5" distance="1000" k1="-0.1339" k2="0.2905" k3="-0.4368"/>
-+            <vignetting model="pa" focal="95" aperture="5.6" distance="10" k1="-0.1861" k2="0.4445" k3="-0.5054"/>
-+            <vignetting model="pa" focal="95" aperture="5.6" distance="1000" k1="-0.1861" k2="0.4445" k3="-0.5054"/>
-+            <vignetting model="pa" focal="95" aperture="6.7" distance="10" k1="-0.2024" k2="0.4379" k3="-0.4178"/>
-+            <vignetting model="pa" focal="95" aperture="6.7" distance="1000" k1="-0.2024" k2="0.4379" k3="-0.4178"/>
-+            <vignetting model="pa" focal="95" aperture="8" distance="10" k1="-0.1620" k2="0.2444" k3="-0.2092"/>
-+            <vignetting model="pa" focal="95" aperture="8" distance="1000" k1="-0.1620" k2="0.2444" k3="-0.2092"/>
-+            <vignetting model="pa" focal="95" aperture="9.5" distance="10" k1="-0.1265" k2="0.0928" k3="-0.0656"/>
-+            <vignetting model="pa" focal="95" aperture="9.5" distance="1000" k1="-0.1265" k2="0.0928" k3="-0.0656"/>
-+            <vignetting model="pa" focal="95" aperture="11" distance="10" k1="-0.1311" k2="0.1012" k3="-0.0698"/>
-+            <vignetting model="pa" focal="95" aperture="11" distance="1000" k1="-0.1311" k2="0.1012" k3="-0.0698"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="10" k1="-0.4911" k2="-0.2737" k3="0.2751"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="1000" k1="-0.4911" k2="-0.2737" k3="0.2751"/>
-+            <vignetting model="pa" focal="135" aperture="3.5" distance="10" k1="-0.1401" k2="-0.8317" k3="0.5450"/>
-+            <vignetting model="pa" focal="135" aperture="3.5" distance="1000" k1="-0.1401" k2="-0.8317" k3="0.5450"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="0.1172" k2="-0.8981" k3="0.4452"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="0.1172" k2="-0.8981" k3="0.4452"/>
-+            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="0.0586" k2="-0.4735" k3="0.1209"/>
-+            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="0.0586" k2="-0.4735" k3="0.1209"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.0381" k2="-0.0710" k3="-0.1489"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.0381" k2="-0.0710" k3="-0.1489"/>
-+            <vignetting model="pa" focal="135" aperture="6.7" distance="10" k1="-0.1495" k2="0.2878" k3="-0.3328"/>
-+            <vignetting model="pa" focal="135" aperture="6.7" distance="1000" k1="-0.1495" k2="0.2878" k3="-0.3328"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1498" k2="0.2196" k3="-0.1947"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1498" k2="0.2196" k3="-0.1947"/>
-+            <vignetting model="pa" focal="135" aperture="9.5" distance="10" k1="-0.1127" k2="0.0656" k3="-0.0447"/>
-+            <vignetting model="pa" focal="135" aperture="9.5" distance="1000" k1="-0.1127" k2="0.0656" k3="-0.0447"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.1189" k2="0.0784" k3="-0.0518"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.1189" k2="0.0784" k3="-0.0518"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>smc PENTAX-FA 50mm f/1.4</model>
-+        <model>smc Pentax-FA 50mm f/1.4</model>
-         <mount>Pentax KAF2</mount>
--        <!-- FixMe: Actually cropfactor 1.522 -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Pentax K-30 -->
--            <distortion model="poly3" focal="50" k1="-0.00203" />
--            <tca model="poly3" focal="50" vr="1.0002324" vb="0.9997591" />
-+            <distortion model="poly3" focal="50" k1="-0.00203"/>
-+            <tca model="poly3" focal="50" br="-0.0000488" cr="0.0001144" vr="1.0005239" bb="0.0001427" cb="-0.0002953" vb="0.9994200"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.75531" k2="0.64285" k3="-0.26061"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.06676" k2="-0.04799" k3="0.02031"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.15783" k2="0.15089" k3="-0.01524"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1018" k2="-0.00066" k3="0.06612"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.00027" k2="-0.25301" k3="0.20985"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.13985" k2="0.13367" k3="-0.03586"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.05391" k2="-0.06313" k3="0.11027"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Pentax</maker>
--        <model>smc PENTAX-DA 21mm f/3.2 AL Limited</model>
-+        <model>smc Pentax-FA 50mm f/1.4</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-1 -->
-+            <distortion model="ptlens" focal="50" a="0.00533" b="-0.02067" c="0.02125"/>
-+            <tca model="poly3" focal="50.0" br="0.0000394" vr="1.0001857" bb="0.0000526" vb="0.9993940"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.4574" k2="1.1617" k3="-0.4518"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0461" k2="-1.2152" k3="0.6719"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3162" k2="0.3087" k3="-0.3464"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2434" k2="0.0061" k3="0.0194"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3038" k2="0.1823" k3="-0.1025"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3308" k2="0.2728" k3="-0.1756"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.3380" k2="0.2932" k3="-0.2021"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3380" k2="0.2678" k3="-0.1838"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.3555" k2="0.2764" k3="-0.1692"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA 21mm f/3.2 AL Limited</model>
-         <mount>Pentax KAF2</mount>
--        <!-- FixMe: Actually cropfactor 1.522 -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Pentax K-5 -->
--            <distortion model="poly3" focal="21" k1="-0.01388" />
-+            <distortion model="poly3" focal="21" k1="-0.01388"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-FA 28mm f/2.8 AL</model>
-+        <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="28" k1="-0.00843"/>
-+            <tca model="poly3" focal="28" br="0.0000578" cr="-0.0001581" vr="1.0005750" bb="-0.0000046" cb="0.0001367" vb="0.9996466"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="100" k1="-0.38602" k2="1.0657" k3="-0.86036"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="100" k1="-0.41027" k2="0.96832" k3="-0.79405"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="100" k1="-0.38055" k2="1.06408" k3="-0.92936"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="100" k1="-0.87866" k2="1.00009" k3="-0.5801"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-FA 28mm f/2.8 AL</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-1 -->
-+            <distortion model="ptlens" focal="28" a="0.01253" b="-0.03208" c="0.00563"/>
-+            <tca model="poly3" focal="28" br="-0.0000563" vr="1.0002879" bb="0.0001022" vb="0.9998245"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-2.0397" k2="2.1920" k3="-0.9456"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-2.0397" k2="2.1920" k3="-0.9456"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.7531" k2="0.1413" k3="0.0144"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.7531" k2="0.1413" k3="0.0144"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.7244" k2="0.0516" k3="0.1462"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.7244" k2="0.0516" k3="0.1462"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.6642" k2="-0.0844" k3="0.2290"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.6642" k2="-0.0844" k3="0.2290"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.9747" k2="0.6184" k3="-0.1904"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.9747" k2="0.6184" k3="-0.1904"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.9730" k2="0.6071" k3="-0.1809"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.9730" k2="0.6071" k3="-0.1809"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.8601" k2="0.3664" k3="-0.0386"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.8601" k2="0.3664" k3="-0.0386"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA* 16-50mm f/2.8 ED AL IF SDM</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 II -->
-+            <distortion model="ptlens" focal="16" a="0.02994" b="-0.08352" c="0.03371"/>
-+            <distortion model="ptlens" focal="19" a="0.02558" b="-0.07384" c="0.04704"/>
-+            <distortion model="ptlens" focal="28" a="0.00607" b="-0.01352" c="0.01649"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0.00495" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.00588" c="0"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.1567" k2="-0.9384" k3="0.4156"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.1567" k2="-0.9384" k3="0.4156"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.4466" k2="0.3537" k3="-0.4406"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.4466" k2="0.3537" k3="-0.4406"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.5021" k2="0.5090" k3="-0.4918"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.5021" k2="0.5090" k3="-0.4918"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.5129" k2="0.5057" k3="-0.4417"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.5129" k2="0.5057" k3="-0.4417"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.4748" k2="0.3967" k3="-0.3273"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.4748" k2="0.3967" k3="-0.3273"/>
-+            <vignetting model="pa" focal="16" aperture="6.7" distance="10" k1="-0.4447" k2="0.2538" k3="-0.1859"/>
-+            <vignetting model="pa" focal="16" aperture="6.7" distance="1000" k1="-0.4447" k2="0.2538" k3="-0.1859"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.4540" k2="0.1751" k3="-0.0932"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4540" k2="0.1751" k3="-0.0932"/>
-+            <vignetting model="pa" focal="16" aperture="9.5" distance="10" k1="-0.4308" k2="0.1450" k3="-0.0774"/>
-+            <vignetting model="pa" focal="16" aperture="9.5" distance="1000" k1="-0.4308" k2="0.1450" k3="-0.0774"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.4358" k2="0.1504" k3="-0.0787"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.4358" k2="0.1504" k3="-0.0787"/>
-+            <vignetting model="pa" focal="21" aperture="2.8" distance="10" k1="-0.4623" k2="0.4206" k3="-0.3463"/>
-+            <vignetting model="pa" focal="21" aperture="2.8" distance="1000" k1="-0.4623" k2="0.4206" k3="-0.3463"/>
-+            <vignetting model="pa" focal="21" aperture="3.5" distance="10" k1="-0.4755" k2="0.4571" k3="-0.3094"/>
-+            <vignetting model="pa" focal="21" aperture="3.5" distance="1000" k1="-0.4755" k2="0.4571" k3="-0.3094"/>
-+            <vignetting model="pa" focal="21" aperture="4" distance="10" k1="-0.4441" k2="0.3262" k3="-0.1788"/>
-+            <vignetting model="pa" focal="21" aperture="4" distance="1000" k1="-0.4441" k2="0.3262" k3="-0.1788"/>
-+            <vignetting model="pa" focal="21" aperture="4.5" distance="10" k1="-0.4724" k2="0.3480" k3="-0.1808"/>
-+            <vignetting model="pa" focal="21" aperture="4.5" distance="1000" k1="-0.4724" k2="0.3480" k3="-0.1808"/>
-+            <vignetting model="pa" focal="21" aperture="5.6" distance="10" k1="-0.4800" k2="0.3717" k3="-0.1971"/>
-+            <vignetting model="pa" focal="21" aperture="5.6" distance="1000" k1="-0.4800" k2="0.3717" k3="-0.1971"/>
-+            <vignetting model="pa" focal="21" aperture="6.7" distance="10" k1="-0.4735" k2="0.3730" k3="-0.2007"/>
-+            <vignetting model="pa" focal="21" aperture="6.7" distance="1000" k1="-0.4735" k2="0.3730" k3="-0.2007"/>
-+            <vignetting model="pa" focal="21" aperture="8" distance="10" k1="-0.4837" k2="0.3873" k3="-0.2085"/>
-+            <vignetting model="pa" focal="21" aperture="8" distance="1000" k1="-0.4837" k2="0.3873" k3="-0.2085"/>
-+            <vignetting model="pa" focal="21" aperture="9.5" distance="10" k1="-0.4879" k2="0.3922" k3="-0.2105"/>
-+            <vignetting model="pa" focal="21" aperture="9.5" distance="1000" k1="-0.4879" k2="0.3922" k3="-0.2105"/>
-+            <vignetting model="pa" focal="21" aperture="11" distance="10" k1="-0.4796" k2="0.3733" k3="-0.1987"/>
-+            <vignetting model="pa" focal="21" aperture="11" distance="1000" k1="-0.4796" k2="0.3733" k3="-0.1987"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.4431" k2="0.5819" k3="-0.5154"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.4431" k2="0.5819" k3="-0.5154"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.4463" k2="0.6478" k3="-0.5407"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.4463" k2="0.6478" k3="-0.5407"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3905" k2="0.3900" k3="-0.2633"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3905" k2="0.3900" k3="-0.2633"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.3523" k2="0.2523" k3="-0.1422"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.3523" k2="0.2523" k3="-0.1422"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3546" k2="0.2350" k3="-0.1180"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3546" k2="0.2350" k3="-0.1180"/>
-+            <vignetting model="pa" focal="28" aperture="6.7" distance="10" k1="-0.3546" k2="0.2302" k3="-0.1114"/>
-+            <vignetting model="pa" focal="28" aperture="6.7" distance="1000" k1="-0.3546" k2="0.2302" k3="-0.1114"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3633" k2="0.2473" k3="-0.1209"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3633" k2="0.2473" k3="-0.1209"/>
-+            <vignetting model="pa" focal="28" aperture="9.5" distance="10" k1="-0.3661" k2="0.2509" k3="-0.1223"/>
-+            <vignetting model="pa" focal="28" aperture="9.5" distance="1000" k1="-0.3661" k2="0.2509" k3="-0.1223"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3666" k2="0.2498" k3="-0.1207"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3666" k2="0.2498" k3="-0.1207"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.4080" k2="0.6327" k3="-0.6318"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.4080" k2="0.6327" k3="-0.6318"/>
-+            <vignetting model="pa" focal="34" aperture="3.5" distance="10" k1="-0.4155" k2="0.6923" k3="-0.6645"/>
-+            <vignetting model="pa" focal="34" aperture="3.5" distance="1000" k1="-0.4155" k2="0.6923" k3="-0.6645"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="10" k1="-0.4089" k2="0.6402" k3="-0.5230"/>
-+            <vignetting model="pa" focal="34" aperture="4" distance="1000" k1="-0.4089" k2="0.6402" k3="-0.5230"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.3500" k2="0.3962" k3="-0.2882"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.3500" k2="0.3962" k3="-0.2882"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.3225" k2="0.2645" k3="-0.1622"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.3225" k2="0.2645" k3="-0.1622"/>
-+            <vignetting model="pa" focal="34" aperture="6.7" distance="10" k1="-0.3072" k2="0.2018" k3="-0.1037"/>
-+            <vignetting model="pa" focal="34" aperture="6.7" distance="1000" k1="-0.3072" k2="0.2018" k3="-0.1037"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.3108" k2="0.2008" k3="-0.0977"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.3108" k2="0.2008" k3="-0.0977"/>
-+            <vignetting model="pa" focal="34" aperture="9.5" distance="10" k1="-0.3171" k2="0.2073" k3="-0.0989"/>
-+            <vignetting model="pa" focal="34" aperture="9.5" distance="1000" k1="-0.3171" k2="0.2073" k3="-0.0989"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.3269" k2="0.2291" k3="-0.1142"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.3269" k2="0.2291" k3="-0.1142"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.3942" k2="0.5134" k3="-0.5866"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3942" k2="0.5134" k3="-0.5866"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.3868" k2="0.5070" k3="-0.5845"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.3868" k2="0.5070" k3="-0.5845"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2986" k2="0.4743" k3="-0.5864"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2986" k2="0.4743" k3="-0.5864"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.3509" k2="0.6401" k3="-0.5701"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.3509" k2="0.6401" k3="-0.5701"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3141" k2="0.4269" k3="-0.3366"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3141" k2="0.4269" k3="-0.3366"/>
-+            <vignetting model="pa" focal="50" aperture="6.7" distance="10" k1="-0.2683" k2="0.2352" k3="-0.1556"/>
-+            <vignetting model="pa" focal="50" aperture="6.7" distance="1000" k1="-0.2683" k2="0.2352" k3="-0.1556"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2480" k2="0.1389" k3="-0.0629"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2480" k2="0.1389" k3="-0.0629"/>
-+            <vignetting model="pa" focal="50" aperture="9.5" distance="10" k1="-0.2537" k2="0.1430" k3="-0.0595"/>
-+            <vignetting model="pa" focal="50" aperture="9.5" distance="1000" k1="-0.2537" k2="0.1430" k3="-0.0595"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2615" k2="0.1624" k3="-0.0720"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2615" k2="0.1624" k3="-0.0720"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA Fish-Eye 10-17mm f/3.5-4.5 ED IF</model>
-+        <mount>Pentax KAF2</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-7 -->
-+            <distortion model="ptlens" focal="10" a="-0.03518" b="0.12586" c="-0.09198"/>
-+            <distortion model="ptlens" focal="11" a="-0.02913" b="0.12685" c="-0.07233"/>
-+            <distortion model="ptlens" focal="13" a="-0.01146" b="0.05636" c="-0.02116"/>
-+            <distortion model="ptlens" focal="15" a="-0.00892" b="0.03724" c="-0.02424"/>
-+            <distortion model="ptlens" focal="17" a="-0.00536" b="0.01752" c="-0.01391"/>
-+            <tca model="poly3" focal="10" br="0.0000405" vr="1.0004481" bb="-0.0000364" vb="1.0004715"/>
-+            <tca model="poly3" focal="11" br="0.0000400" vr="1.0004872" bb="-0.0000348" vb="1.0003633"/>
-+            <tca model="poly3" focal="13" br="0.0000281" vr="1.0005141" bb="-0.0000286" vb="1.0002823"/>
-+            <tca model="poly3" focal="15" br="0.0000214" vr="1.0005105" bb="-0.0000117" vb="1.0002102"/>
-+            <tca model="poly3" focal="17" br="0.0000094" vr="1.0005640" bb="-0.0000273" vb="1.0001892"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-A 50mm f/1.7</model>
-+        <mount>Pentax KA</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 -->
-+            <distortion model="ptlens" focal="50" a="-0.00487" b="0.01496" c="-0.01497"/>
-+            <tca model="poly3" focal="50" br="-0.0000066" vr="1.0000443" bb="0.0000030" vb="0.9999706"/>
-+            <!-- Taken with Pentax K-20 with a different crop factor of 1.538 -->
-+            <vignetting model="pa" focal="50" aperture="1.7" distance="10" k1="-0.8751" k2="0.7622" k3="-0.3250"/>
-+            <vignetting model="pa" focal="50" aperture="1.7" distance="1000" k1="-0.8751" k2="0.7622" k3="-0.3250"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.0567" k2="-0.1913" k3="0.0378"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.0567" k2="-0.1913" k3="0.0378"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1325" k2="0.0376" k3="-0.0060"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1325" k2="0.0376" k3="-0.0060"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1361" k2="0.0458" k3="-0.0117"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1361" k2="0.0458" k3="-0.0117"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1449" k2="0.0675" k3="-0.0268"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1449" k2="0.0675" k3="-0.0268"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1453" k2="0.0706" k3="-0.0297"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1453" k2="0.0706" k3="-0.0297"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1455" k2="0.0716" k3="-0.0307"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1455" k2="0.0716" k3="-0.0307"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1423" k2="0.0615" k3="-0.0240"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1423" k2="0.0615" k3="-0.0240"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1451" k2="0.0701" k3="-0.0294"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1451" k2="0.0701" k3="-0.0294"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-A 28mm 1:2.8</model>
-+        <mount>Pentax KA</mount>
-+        <aperture min="2.8" max="22"/>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="ptlens" focal="28" a="0.00207" b="-0.0073" c="-0.00479"/>
-+            <tca model="poly3" focal="28" br="-0.0000016" vr="1.0004852" bb="0.0000372" vb="0.9997864"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-1.0219" k2="0.9483" k3="-0.4035"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-1.0219" k2="0.9483" k3="-0.4035"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2157" k2="-0.3435" k3="0.2363"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2157" k2="-0.3435" k3="0.2363"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2952" k2="0.0609" k3="-0.0049"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2952" k2="0.0609" k3="-0.0049"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.3061" k2="0.0725" k3="0.0005"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.3061" k2="0.0725" k3="0.0005"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3185" k2="0.0950" k3="-0.0119"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3185" k2="0.0950" k3="-0.0119"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.3235" k2="0.1039" k3="-0.0177"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.3235" k2="0.1039" k3="-0.0177"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3305" k2="0.1152" k3="-0.0231"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3305" k2="0.1152" k3="-0.0231"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-M 28mm 1:3.5</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="ptlens" focal="28" a="0.01008" b="-0.03516" c="0.02694"/>
-+            <tca model="poly3" focal="28" br="-0.0000437" vr="1.0003568" bb="0.0000701" vb="0.9997667"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.8363" k2="0.5255" k3="-0.1650"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.8363" k2="0.5255" k3="-0.1650"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2875" k2="0.1126" k3="-0.0632"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2875" k2="0.1126" k3="-0.0632"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2926" k2="0.1061" k3="-0.0221"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2926" k2="0.1061" k3="-0.0221"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3000" k2="0.1243" k3="-0.0334"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3000" k2="0.1243" k3="-0.0334"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.3024" k2="0.1304" k3="-0.0373"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.3024" k2="0.1304" k3="-0.0373"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3028" k2="0.1272" k3="-0.0337"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3028" k2="0.1272" k3="-0.0337"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-M 35mm 1:2</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="poly3" focal="35" k1="-0.00269"/>
-+            <tca model="poly3" focal="35" br="0.0000109" vr="1.0003580" bb="0.0000502" vb="0.9997821"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-FA 31mm f/1.8 AL Limited</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 -->
-+            <distortion model="ptlens" focal="31" a="-0.000413" b="-0.000458" c="-0.007123"/>
-+            <tca model="poly3" focal="31" br="-0.0000163" vr="1.0002445" bb="0.0000185" vb="0.9999495"/>
-+            <vignetting model="pa" focal="31" aperture="1.8" distance="10" k1="-1.1124" k2="0.9087" k3="-0.3628"/>
-+            <vignetting model="pa" focal="31" aperture="1.8" distance="1000" k1="-1.1124" k2="0.9087" k3="-0.3628"/>
-+            <vignetting model="pa" focal="31" aperture="2" distance="10" k1="-1.1177" k2="0.9163" k3="-0.3658"/>
-+            <vignetting model="pa" focal="31" aperture="2" distance="1000" k1="-1.1177" k2="0.9163" k3="-0.3658"/>
-+            <vignetting model="pa" focal="31" aperture="2.2" distance="10" k1="-0.3517" k2="-0.5352" k3="0.4247"/>
-+            <vignetting model="pa" focal="31" aperture="2.2" distance="1000" k1="-0.3517" k2="-0.5352" k3="0.4247"/>
-+            <vignetting model="pa" focal="31" aperture="2.5" distance="10" k1="-0.5310" k2="0.1356" k3="-0.0662"/>
-+            <vignetting model="pa" focal="31" aperture="2.5" distance="1000" k1="-0.5310" k2="0.1356" k3="-0.0662"/>
-+            <vignetting model="pa" focal="31" aperture="2.8" distance="10" k1="-0.3663" k2="0.0886" k3="-0.0532"/>
-+            <vignetting model="pa" focal="31" aperture="2.8" distance="1000" k1="-0.3663" k2="0.0886" k3="-0.0532"/>
-+            <vignetting model="pa" focal="31" aperture="3.2" distance="10" k1="-0.7491" k2="0.8562" k3="-0.4876"/>
-+            <vignetting model="pa" focal="31" aperture="3.2" distance="1000" k1="-0.7491" k2="0.8562" k3="-0.4876"/>
-+            <vignetting model="pa" focal="31" aperture="3.5" distance="10" k1="-0.2778" k2="-0.1030" k3="0.1181"/>
-+            <vignetting model="pa" focal="31" aperture="3.5" distance="1000" k1="-0.2778" k2="-0.1030" k3="0.1181"/>
-+            <vignetting model="pa" focal="31" aperture="4" distance="10" k1="-0.7966" k2="0.9512" k3="-0.5645"/>
-+            <vignetting model="pa" focal="31" aperture="4" distance="1000" k1="-0.7966" k2="0.9512" k3="-0.5645"/>
-+            <vignetting model="pa" focal="31" aperture="4.5" distance="10" k1="-0.2722" k2="-0.1128" k3="0.1237"/>
-+            <vignetting model="pa" focal="31" aperture="4.5" distance="1000" k1="-0.2722" k2="-0.1128" k3="0.1237"/>
-+            <vignetting model="pa" focal="31" aperture="5" distance="10" k1="-0.3045" k2="-0.0517" k3="0.0850"/>
-+            <vignetting model="pa" focal="31" aperture="5" distance="1000" k1="-0.3045" k2="-0.0517" k3="0.0850"/>
-+            <vignetting model="pa" focal="31" aperture="5.6" distance="10" k1="-0.4972" k2="0.3393" k3="-0.1683"/>
-+            <vignetting model="pa" focal="31" aperture="5.6" distance="1000" k1="-0.4972" k2="0.3393" k3="-0.1683"/>
-+            <vignetting model="pa" focal="31" aperture="6.3" distance="10" k1="-0.5530" k2="0.4559" k3="-0.2438"/>
-+            <vignetting model="pa" focal="31" aperture="6.3" distance="1000" k1="-0.5530" k2="0.4559" k3="-0.2438"/>
-+            <vignetting model="pa" focal="31" aperture="7.1" distance="10" k1="-0.5660" k2="0.4708" k3="-0.2366"/>
-+            <vignetting model="pa" focal="31" aperture="7.1" distance="1000" k1="-0.5660" k2="0.4708" k3="-0.2366"/>
-+            <vignetting model="pa" focal="31" aperture="8" distance="10" k1="-0.2948" k2="-0.0669" k3="0.0932"/>
-+            <vignetting model="pa" focal="31" aperture="8" distance="1000" k1="-0.2948" k2="-0.0669" k3="0.0932"/>
-+            <vignetting model="pa" focal="31" aperture="9" distance="10" k1="-0.3206" k2="-0.0077" k3="0.0468"/>
-+            <vignetting model="pa" focal="31" aperture="9" distance="1000" k1="-0.3206" k2="-0.0077" k3="0.0468"/>
-+            <vignetting model="pa" focal="31" aperture="10" distance="10" k1="-0.5802" k2="0.5036" k3="-0.2581"/>
-+            <vignetting model="pa" focal="31" aperture="10" distance="1000" k1="-0.5802" k2="0.5036" k3="-0.2581"/>
-+            <vignetting model="pa" focal="31" aperture="11" distance="10" k1="-0.2687" k2="-0.1205" k3="0.1297"/>
-+            <vignetting model="pa" focal="31" aperture="11" distance="1000" k1="-0.2687" k2="-0.1205" k3="0.1297"/>
-+            <vignetting model="pa" focal="31" aperture="13" distance="10" k1="-0.7903" k2="0.9435" k3="-0.5628"/>
-+            <vignetting model="pa" focal="31" aperture="13" distance="1000" k1="-0.7903" k2="0.9435" k3="-0.5628"/>
-+            <vignetting model="pa" focal="31" aperture="14" distance="10" k1="-0.8053" k2="0.9830" k3="-0.5877"/>
-+            <vignetting model="pa" focal="31" aperture="14" distance="1000" k1="-0.8053" k2="0.9830" k3="-0.5877"/>
-+            <vignetting model="pa" focal="31" aperture="16" distance="10" k1="-0.4440" k2="0.2324" k3="-0.0922"/>
-+            <vignetting model="pa" focal="31" aperture="16" distance="1000" k1="-0.4440" k2="0.2324" k3="-0.0922"/>
-+            <vignetting model="pa" focal="31" aperture="18" distance="10" k1="-0.5060" k2="0.3660" k3="-0.1836"/>
-+            <vignetting model="pa" focal="31" aperture="18" distance="1000" k1="-0.5060" k2="0.3660" k3="-0.1836"/>
-+            <vignetting model="pa" focal="31" aperture="20" distance="10" k1="-0.6712" k2="0.7078" k3="-0.4131"/>
-+            <vignetting model="pa" focal="31" aperture="20" distance="1000" k1="-0.6712" k2="0.7078" k3="-0.4131"/>
-+            <vignetting model="pa" focal="31" aperture="22" distance="10" k1="-0.6138" k2="0.5839" k3="-0.3204"/>
-+            <vignetting model="pa" focal="31" aperture="22" distance="1000" k1="-0.6138" k2="0.5839" k3="-0.3204"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA 50mm f/1.8</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 II s -->
-+            <distortion model="poly3" focal="50" k1="-0.00214"/>
-+            <tca model="poly3" focal="50" vr="0.9999693" vb="1.0000394"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>HD Pentax-DA 20-40mm f/2.8-4 ED Limited DC WR</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 -->
-+            <distortion model="ptlens" focal="20" a="0.00595" b="-0.02518" c="0.00497"/>
-+            <distortion model="ptlens" focal="30" a="0" b="-0.00484" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0" b="-0.00281" c="0"/>
-+            <tca model="poly3" focal="20" br="0.0000248" vr="1.0001884" bb="-0.0000041" vb="1.0003045"/>
-+            <tca model="poly3" focal="26" br="0.0000193" vr="1.0002246" bb="0.0000465" vb="1.0001908"/>
-+            <tca model="poly3" focal="30" br="0.0000226" vr="1.0001588" bb="-0.0000522" vb="1.0002823"/>
-+            <tca model="poly3" focal="36" br="-0.0000002" vr="1.0001903" bb="-0.0000449" vb="1.0002319"/>
-+            <tca model="poly3" focal="40" br="0.0000118" vr="1.0001864" bb="-0.0000041" vb="1.0001781"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-M Macro 1:4 50mm</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <distortion model="poly3" focal="50" k1="-0.00105"/>
-+            <tca model="poly3" focal="50" vr="0.9999922" vb="1.0000026"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-M Macro 1:4 100mm</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K10D -->
-+            <!-- Really no measurable distortion -->
-+            <distortion model="poly3" focal="100" k1="0"/>
-+            <tca model="poly3" focal="100" vr="0.9998701" vb="1.0000849"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA L 18-50mm f/4-5.6 DC WR RE</model>
-+        <mount>Pentax KAF3</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-S2 -->
-+            <distortion model="ptlens" focal="18" a="0.00982" b="-0.03805" c="0.01695"/>
-+            <distortion model="ptlens" focal="24" a="0.00488" b="-0.02037" c="0.01274"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0.0009" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.00297" c="0"/>
-+            <tca model="poly3" focal="18" vr="1.0005357" vb="1.0000769"/>
-+            <tca model="poly3" focal="24" vr="1.0003696" vb="1.0000405"/>
-+            <tca model="poly3" focal="34" vr="1.0001627" vb="1.0000371"/>
-+            <tca model="poly3" focal="50" vr="1.0000870" vb="1.0000095"/>
-+            <!-- Taken with Pentax K20 -->
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.1711" k2="-0.9527" k3="0.5945"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.1711" k2="-0.9527" k3="0.5945"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.0563" k2="-0.5835" k3="0.1701"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.0563" k2="-0.5835" k3="0.1701"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="10" k1="-0.2812" k2="0.2809" k3="-0.3809"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.2812" k2="0.2809" k3="-0.3809"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.3233" k2="0.3157" k3="-0.2672"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.3233" k2="0.3157" k3="-0.2672"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2513" k2="-0.0017" k3="0.0500"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2513" k2="-0.0017" k3="0.0500"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.0623" k2="-0.9608" k3="0.5561"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.0623" k2="-0.9608" k3="0.5561"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.1184" k2="-0.1416" k3="-0.0579"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.1184" k2="-0.1416" k3="-0.0579"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.2333" k2="0.1738" k3="-0.1239"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2333" k2="0.1738" k3="-0.1239"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2046" k2="0.0233" k3="0.0363"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2046" k2="0.0233" k3="0.0363"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.2095" k2="0.0317" k3="0.0322"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2095" k2="0.0317" k3="0.0322"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.6655" k2="0.4679" k3="-0.1657"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.6655" k2="0.4679" k3="-0.1657"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.1549" k2="-0.3719" k3="0.2863"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.1549" k2="-0.3719" k3="0.2863"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="10" k1="-0.1223" k2="-0.0198" k3="0.0589"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1223" k2="-0.0198" k3="0.0589"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.1237" k2="-0.0396" k3="0.0843"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1237" k2="-0.0396" k3="0.0843"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.1258" k2="-0.0556" k3="0.1032"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.1258" k2="-0.0556" k3="0.1032"/>
-+            <vignetting model="pa" focal="43" aperture="5.6" distance="10" k1="-0.7965" k2="0.7042" k3="-0.2677"/>
-+            <vignetting model="pa" focal="43" aperture="5.6" distance="1000" k1="-0.7965" k2="0.7042" k3="-0.2677"/>
-+            <vignetting model="pa" focal="43" aperture="8" distance="10" k1="-0.0475" k2="-0.2120" k3="0.0921"/>
-+            <vignetting model="pa" focal="43" aperture="8" distance="1000" k1="-0.0475" k2="-0.2120" k3="0.0921"/>
-+            <vignetting model="pa" focal="43" aperture="11" distance="10" k1="-0.1185" k2="0.0018" k3="0.0462"/>
-+            <vignetting model="pa" focal="43" aperture="11" distance="1000" k1="-0.1185" k2="0.0018" k3="0.0462"/>
-+            <vignetting model="pa" focal="43" aperture="22" distance="10" k1="-0.1113" k2="-0.0213" k3="0.0536"/>
-+            <vignetting model="pa" focal="43" aperture="22" distance="1000" k1="-0.1113" k2="-0.0213" k3="0.0536"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.8485" k2="0.8254" k3="-0.3390"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.8485" k2="0.8254" k3="-0.3390"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.0474" k2="-0.5397" k3="0.3555"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.0474" k2="-0.5397" k3="0.3555"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1252" k2="0.0568" k3="-0.0007"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1252" k2="0.0568" k3="-0.0007"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1280" k2="0.0673" k3="-0.0116"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1280" k2="0.0673" k3="-0.0116"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA L 50-200mm f/4-5.6 ED WR</model>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-S2 -->
-+            <distortion model="poly3" focal="50" k1="-0.00627"/>
-+            <distortion model="poly3" focal="57.5" k1="-0.00403"/>
-+            <distortion model="poly3" focal="80" k1="0.0038"/>
-+            <distortion model="poly3" focal="105" k1="0.00915"/>
-+            <distortion model="poly3" focal="137.5" k1="0.00709"/>
-+            <distortion model="poly3" focal="200" k1="0.00746"/>
-+            <tca model="poly3" focal="50" vr="0.9999539" vb="1.0001903"/>
-+            <tca model="poly3" focal="57.5" vr="0.9999462" vb="1.0001701"/>
-+            <tca model="poly3" focal="80" vr="0.9998231" vb="1.0001614"/>
-+            <tca model="poly3" focal="105" vr="0.9998754" vb="1.0000401"/>
-+            <tca model="poly3" focal="137.5" vr="0.9998983" vb="0.9999943"/>
-+            <tca model="poly3" focal="200" vr="0.9999243" vb="0.9999551"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Pentax</maker>
-+        <model>smc Pentax-DA 17-70mm f/4 AL [IF] SDM</model>
-+        <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of Pentax APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="17" a="-0.01067" b="0.03945" c="-0.07039"/>
-+            <distortion model="ptlens" focal="19" a="-0.00170" b="0.01164" c="-0.02842"/>
-+            <distortion model="ptlens" focal="23" a="-0.01072" b="0.03889" c="-0.04282"/>
-+            <distortion model="ptlens" focal="28" a="-0.0133" b="0.05266" c="-0.05293"/>
-+            <distortion model="ptlens" focal="33" a="0.00167" b="0.00049" c="0.00827"/>
-+            <distortion model="ptlens" focal="39" a="-0.00545" b="0.02304" c="-0.01654"/>
-+            <distortion model="ptlens" focal="48" a="-0.00577" b="0.02136" c="-0.00938"/>
-+            <distortion model="ptlens" focal="58" a="-0.00833" b="0.0294" c="-0.01728"/>
-+            <distortion model="ptlens" focal="70" a="0.00129" b="-0.00754" c="0.02604"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-ricoh.xml b/data/db/slr-ricoh.xml
---- a/data/db/slr-ricoh.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/slr-ricoh.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,37 @@
-+<lensdatabase>
-+    <lens>
-+        <maker>Ricoh</maker>
-+        <model>Ricoh XR Rikenon 1:1.4 50mm</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-r -->
-+            <distortion model="poly3" focal="50" k1="-0.00302"/>
-+            <tca model="poly3" focal="50" br="-0.0000276" vr="1.0001338" bb="0.0000254" vb="0.9998300"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Ricoh</maker>
-+        <model>Ricoh 50mm 1:2.0</model>
-+        <mount>Pentax K</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A7 -->
-+            <distortion model="poly3" focal="50" k1="-0.00408"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-1.2841" k2="1.3206" k3="-0.5942"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-1.2841" k2="1.3206" k3="-0.5942"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.0367" k2="-0.8533" k3="0.4734"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.0367" k2="-0.8533" k3="0.4734"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2554" k2="0.3092" k3="-0.3180"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2554" k2="0.3092" k3="-0.3180"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2064" k2="0.0696" k3="-0.0244"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2064" k2="0.0696" k3="-0.0244"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1932" k2="0.0325" k3="0.0055"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1932" k2="0.0325" k3="0.0055"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1940" k2="0.0296" k3="0.0103"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1940" k2="0.0296" k3="0.0103"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1951" k2="0.0241" k3="0.0171"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1951" k2="0.0241" k3="0.0171"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/slr-samsung.xml b/data/db/slr-samsung.xml
---- a/data/db/slr-samsung.xml	2010-02-18 20:34:13.000000000 +0100
-+++ b/data/db/slr-samsung.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,30 +1,26 @@
- <lensdatabase>
--
-     <camera>
--        <maker>SAMSUNG TECHWIN Co.</maker>
-+        <maker>Samsung Techwin Co.</maker>
-         <maker lang="en">Samsung</maker>
-         <model>SAMSUNG GX10</model>
-         <model lang="en">GX10</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG TECHWIN Co.</maker>
-+        <maker>Samsung Techwin Co.</maker>
-         <maker lang="en">Samsung</maker>
-         <model>GX20</model>
-         <model lang="en">GX20</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SAMSUNG TECHWIN</maker>
-+        <maker>Samsung Techwin</maker>
-         <maker lang="en">Samsung</maker>
-         <model>GX-1S</model>
-         <model lang="en">GX-1S</model>
-         <mount>Pentax KAF2</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-samyang.xml b/data/db/slr-samyang.xml
---- a/data/db/slr-samyang.xml	2013-10-11 23:54:02.000000000 +0200
-+++ b/data/db/slr-samyang.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,31 +1,180 @@
- <lensdatabase>
--
-     <lens>
-         <maker>Samyang</maker>
--        <model>Samyang 14mm f/2.8 ED AS IF UMC</model>
-+        <model>Samyang 8mm f/3.5 Fish-Eye CS</model>
-+        <model lang="de">Samyang 8mm f/3.5 Fischauge CS</model>
-+        <mount>Pentax KAF</mount>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <mount>Nikon F AI</mount>
-+        <mount>Fujifilm X</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Sony E</mount>
-+        <mount>4/3 System</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <mount>Samsung NX</mount>
-+        <type>stereographic</type>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.04015" b="-0.07043" c="-0.05466" />
--            <tca model="poly3" focal="14" br="0.0000198" vr="0.9999690" bb="-0.0001334" vb="1.0003226" />
-+            <!-- Taken with some APS-C Pentax probably. -->
-+            <tca model="poly3" focal="8" br="-0.0007764" cr="0.0013798" vr="1.0000228" bb="-0.0002711" cb="0.0008531" vb="0.9998496"/>
-+            <!-- Taken with Nikon D7100 -->
-+            <distortion model="ptlens" focal="8" a="0.04098" b="-0.15413" c="0.11977"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <!-- The "AE" is actually only on the Nikon variant.  It should be
-+             added as an alias rather than a merged lens model name. -->
-+        <model>Samyang 14mm f/2.8 AE ED AS IF UMC</model>
-+        <mount>Pentax KAF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AI</mount>
-+        <mount>Fujifilm X</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Sony E</mount>
-+        <mount>4/3 System</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <mount>Samsung NX</mount>
-+        <mount>Nikon CX</mount>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="14" a="0.04015" b="-0.07043" c="-0.05466"/>
-+            <tca model="poly3" focal="14" br="0.0000198" vr="0.9999690" bb="-0.0001334" vb="1.0003226"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <!-- The "AE" is actually only on the Nikon variant.  It should be
-+             added as an alias rather than a merged lens model name. -->
-+        <model>Samyang 14mm f/2.8 AE ED AS IF UMC</model>
-+        <mount>Pentax KAF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AI</mount>
-+        <mount>Fujifilm X</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Sony E</mount>
-+        <mount>4/3 System</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <mount>Samsung NX</mount>
-+        <mount>Nikon CX</mount>
-+        <mount>Canon EF-M</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A77 -->
-+            <distortion model="ptlens" focal="14" a="0.01031" b="-0.02759" c="-0.0351"/>
-+            <tca model="poly3" focal="14" br="0.0000642" vr="0.9999130" bb="-0.0001012" vb="1.0003675"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-1.1454" k2="1.0122" k3="-0.4352"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-1.1454" k2="1.0122" k3="-0.4352"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="10" k1="-0.2347" k2="-0.0941" k3="-0.0002"/>
-+            <vignetting model="pa" focal="14" aperture="4" distance="1000" k1="-0.2347" k2="-0.0941" k3="-0.0002"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.2615" k2="0.0072" k3="0.0062"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.2615" k2="0.0072" k3="0.0062"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.2733" k2="0.0338" k3="-0.0093"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.2733" k2="0.0338" k3="-0.0093"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Samyang</maker>
-         <model>Samyang 500mm f/6.3 MC IF Mirror Lens</model>
-+        <model lang="de">Samyang 500mm f/6.3 MC IF Spiegelobjektiv</model>
-         <mount>T2</mount>
--        <focal value="500" />
--        <aperture value="6.3" />
--        <!-- FixMe: Actually cropfactor 1.534 -->
-+        <focal value="500"/>
-+        <aperture value="6.3"/>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with NEX-7 -->
--            <distortion model="poly3" focal="500" k1="0" />
--            <tca model="linear" focal="500" kr="1" kb="1" />
--            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-0.7756" k2="0.8291" k3="-0.3723" />
--            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-0.7756" k2="0.8291" k3="-0.3723" />
-+            <distortion model="poly3" focal="500" k1="0"/>
-+            <tca model="linear" focal="500" kr="1" kb="1"/>
-+            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-0.7756" k2="0.8291" k3="-0.3723"/>
-+            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-0.7756" k2="0.8291" k3="-0.3723"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 35mm f/1.4 AS UMC</model>
-+        <!-- This model is really only available for Nikon.  For the other
-+             brands, the 35/1.4 may have different characteristics. -->
-+        <mount>Nikon F AI</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="35" a="0.00331" b="-0.0171" c="0.00274"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang T-S 24mm f/3.5 ED AS UMC</model>
-+        <mount>Nikon F AI</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Sony E</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with D800 -->
-+            <!-- No shift, no tilt. -->
-+            <distortion model="ptlens" focal="24" a="-0.004" b="0.007" c="-0.02"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 12mm f/2.8 Fish-Eye ED AS NCS</model>
-+        <model lang="de">Samyang 12mm f/2.8 Fischauge ED AS NCS</model>
-+        <mount>Nikon F AI</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony E</mount>
-+        <type>stereographic</type>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with D800 -->
-+            <distortion model="ptlens" focal="12" a="-0.000331804" b="-0.00911417" c="-0.044237"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.90717" k2="0.58477" k3="-0.2198"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.90717" k2="0.58477" k3="-0.2198"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="10" k1="-0.17101" k2="-0.54574" k3="0.3056"/>
-+            <vignetting model="pa" focal="12" aperture="4" distance="1000" k1="-0.17101" k2="-0.54574" k3="0.3056"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1978" k2="-0.03729" k3="-0.11743"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1978" k2="-0.03729" k3="-0.11743"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="10" k1="-0.18295" k2="-0.09272" k3="0.03547"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.18295" k2="-0.09272" k3="0.03547"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 35mm T1.5 Cine Lens</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 7D -->
-+            <distortion model="poly3" focal="35" k1="-0.00449"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Samyang</maker>
-+        <model>Samyang 135mm f/2 ED UMC</model>
-+        <mount>Nikon F</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Pentax KAF</mount>
-+        <mount>Micro 4/3 System</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Sony E</mount>
-+        <mount>Fujifilm X</mount>
-+        <mount>Samsung NX</mount>
-+        <aperture min="2" max="22"/>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="135" a="0.00072" b="-0.001" c="0.00215"/>
-+            <vignetting model="pa" focal="135" aperture="2.0" distance="0.8" k1="-0.22656" k2="0.16959" k3="-0.07317"/>
-+            <vignetting model="pa" focal="135" aperture="2.0" distance="3" k1="-0.53456" k2="0.29892" k3="-0.15499"/>
-+            <vignetting model="pa" focal="135" aperture="2.0" distance="100" k1="-1.01068" k2="0.99239" k3="-0.53442"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="0.8" k1="-0.10264" k2="-0.00365" k3="0.03305"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="3" k1="-0.08784" k2="0.06134" k3="-0.08"/>
-+            <vignetting model="pa" focal="135" aperture="2.8" distance="100" k1="0.02813" k2="-0.92096" k3="0.59655"/>
-+            <vignetting model="pa" focal="135" aperture="4.0" distance="3" k1="-0.085" k2="0" k3="0"/>
-+            <vignetting model="pa" focal="135" aperture="4.0" distance="100" k1="-0.069" k2="-0.16" k3="-0.06"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="100" k1="-0.14" k2="0.11" k3="-0.15"/>
-+            <vignetting model="pa" focal="135" aperture="8.0" distance="100" k1="-0.11" k2="0" k3="0"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-schneider.xml b/data/db/slr-schneider.xml
---- a/data/db/slr-schneider.xml	2007-12-12 21:49:44.000000000 +0100
-+++ b/data/db/slr-schneider.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,45 +1,54 @@
- <lensdatabase>
--
-     <lens>
-         <maker>Schneider</maker>
-         <model>Schneider 28mm f/2.8 PC</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AI-S</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.009514" b="-0.027901" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.009514" b="-0.027901" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Schneider-KREUZNACH</maker>
--        <model>D-XENON 1:3.5-5.6 18-55mm AL</model>
-+        <maker>Schneider</maker>
-+        <model>D-Xenon 1:3.5-5.6 18-55mm AL</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.004593" b="-0.021008" c="0" />
--            <distortion model="ptlens" focal="21" a="0.00371" b="-0.014625" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="-0.004166" c="0" />
--            <distortion model="ptlens" focal="33" a="0" b="0.000528" c="0" />
--            <distortion model="ptlens" focal="55" a="0" b="0.003215" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.004593" b="-0.021008" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.00371" b="-0.014625" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0" b="-0.004166" c="0"/>
-+            <distortion model="ptlens" focal="33" a="0" b="0.000528" c="0"/>
-+            <distortion model="ptlens" focal="55" a="0" b="0.003215" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
--        <maker>Schneider-KREUZNACH</maker>
--        <model>D-XENON 1:4-5.6 50-200mm AL</model>
-+        <maker>Schneider</maker>
-+        <model>D-Xenon 1:4-5.6 50-200mm AL</model>
-         <mount>Pentax KAF2</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.004038" c="0" />
--            <distortion model="ptlens" focal="63" a="0" b="0.001607" c="0" />
--            <distortion model="ptlens" focal="95" a="0" b="0.007697" c="0" />
--            <distortion model="ptlens" focal="125" a="0" b="0.007991" c="0" />
--            <distortion model="ptlens" focal="138" a="0" b="0.008036" c="0" />
--            <distortion model="ptlens" focal="160" a="0" b="0.007909" c="0" />
--            <distortion model="ptlens" focal="180" a="0" b="0.009293" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.007685" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.004038"/>
-+            <distortion model="poly3" focal="63" k1="0.001607"/>
-+            <distortion model="poly3" focal="95" k1="0.007697"/>
-+            <distortion model="poly3" focal="125" k1="0.007991"/>
-+            <distortion model="poly3" focal="138" k1="0.008036"/>
-+            <distortion model="poly3" focal="160" k1="0.007909"/>
-+            <distortion model="poly3" focal="180" k1="0.009293"/>
-+            <distortion model="poly3" focal="200" k1="0.007685"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Schneider</maker>
-+        <model>Schneider Retina-Curtagon 1:4/28mm</model>
-+        <mount>DKL</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <distortion model="ptlens" focal="28" a="0.00591" b="-0.01953" c="0.00935"/>
-+            <tca model="poly3" focal="28" vr="1.0004290" vb="0.9997397"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-sigma.xml b/data/db/slr-sigma.xml
---- a/data/db/slr-sigma.xml	2013-10-16 20:48:25.000000000 +0200
-+++ b/data/db/slr-sigma.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,242 +1,516 @@
- <lensdatabase>
--
-     <mount>
-         <name>Sigma SA</name>
-+        <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-+        <compat>T2</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA SD1</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma SD1</model>
-         <model lang="en">SD1</model>
-         <mount>Sigma SA</mount>
--        <cropfactor>1.5</cropfactor>
-+        <cropfactor>1.500</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA SD1 Merrill</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma SD1 Merrill</model>
-         <model lang="en">SD1 Merrill</model>
-         <mount>Sigma SA</mount>
--        <cropfactor>1.5</cropfactor>
-+        <cropfactor>1.500</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA SD9</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma SD9</model>
-         <model lang="en">SD9</model>
-         <mount>Sigma SA</mount>
--        <cropfactor>1.7</cropfactor>
-+        <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA SD10</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma SD10</model>
-         <model lang="en">SD10</model>
-         <mount>Sigma SA</mount>
--        <cropfactor>1.7</cropfactor>
-+        <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA SD14</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma SD14</model>
-         <model lang="en">SD14</model>
-         <mount>Sigma SA</mount>
--        <cropfactor>1.7</cropfactor>
-+        <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SIGMA</maker>
--        <maker lang="en">Sigma</maker>
--        <model>SIGMA SD15</model>
-+        <maker>Sigma</maker>
-+        <model>Sigma SD15</model>
-         <model lang="en">SD15</model>
-         <mount>Sigma SA</mount>
--        <cropfactor>1.7</cropfactor>
-+        <cropfactor>1.739</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 10-20mm f/4-5.6 EX DC</model>
--        <mount>Sigma SA</mount>
--        <mount>Canon EF-S</mount>
-+        <model>Sigma 10-20mm f/4-5.6 EX DC HSM</model>
-+        <!-- HSM is not available for Sony and Pentax, so don't display it for
-+             avoiding confusion. -->
-+        <model lang="en">Sigma 10-20mm f/4-5.6 EX DC</model>
-         <mount>Nikon F AF</mount>
--        <mount>Pentax KAF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Sony Alpha</mount>
-         <mount>4/3 System</mount>
-+        <focal min="10" max="20"/>
-+        <aperture min="4" max="32"/>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="10" a="-0.017985" b="0.026145" c="0" />
--            <distortion model="ptlens" focal="12" a="-0.008171" b="0.018035" c="0" />
--            <distortion model="ptlens" focal="14" a="0" b="0.005868" c="0" />
--            <distortion model="ptlens" focal="17" a="0" b="0.006362" c="0" />
--            <distortion model="ptlens" focal="20" a="0" b="0.005077" c="0" />
-+            <distortion focal="10" model="ptlens" a="-0.0284207" b="0.0674528" c="-0.0484386"/>
-+            <distortion focal="12" model="ptlens" a="-0.0230294" b="0.0734247" c="-0.0568826"/>
-+            <distortion focal="14" model="ptlens" a="-0.000939631" b="0.0208626" c="-0.0198823"/>
-+            <distortion focal="17" model="ptlens" a="0.0034078" b="0.00203584" c="-0.00781656"/>
-+            <distortion focal="20" model="ptlens" a="0.000314791" b="0.0120508" c="-0.0128173"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="0.24" k1="-1.6197" k2="1.7397" k3="-0.9699"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="0.4" k1="-1.6057" k2="1.6328" k3="-0.7646"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="0.89" k1="-1.6213" k2="1.6181" k3="-0.7122"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-1.5643" k2="1.4810" k3="-0.6303"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="0.24" k1="-0.8114" k2="0.2854" k3="-0.2038"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="0.4" k1="-0.6870" k2="-0.1406" k3="0.1812"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="0.89" k1="-0.7512" k2="0.0000" k3="0.1040"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.6854" k2="-0.1364" k3="0.1778"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="0.24" k1="-0.9094" k2="0.6895" k3="-0.4041"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="0.4" k1="-0.8413" k2="0.4933" k3="-0.2457"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="0.89" k1="-0.8993" k2="0.6179" k3="-0.3158"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.8344" k2="0.4782" k3="-0.2365"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="0.24" k1="-0.8793" k2="0.5210" k3="-0.1862"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="0.4" k1="-0.8327" k2="0.4117" k3="-0.1157"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="0.89" k1="-0.8950" k2="0.5517" k3="-0.1944"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.8272" k2="0.4028" k3="-0.1093"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="0.24" k1="-0.8389" k2="0.3842" k3="-0.0714"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="0.4" k1="-0.7984" k2="0.3017" k3="-0.0274"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="0.89" k1="-0.8599" k2="0.4385" k3="-0.1027"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.7923" k2="0.2879" k3="-0.0154"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="0.24" k1="-1.6821" k2="1.7055" k3="-0.7163"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="0.4" k1="-1.6575" k2="1.6614" k3="-0.6953"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="0.89" k1="-1.6656" k2="1.6771" k3="-0.7020"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.6563" k2="1.6669" k3="-0.7004"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="0.24" k1="-0.8319" k2="-0.0859" k3="0.2929"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="0.4" k1="-0.7649" k2="-0.1949" k3="0.3405"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="0.89" k1="-0.7875" k2="-0.1559" k3="0.3239"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.7590" k2="-0.1982" k3="0.3400"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="0.24" k1="-0.7036" k2="0.1261" k3="0.0102"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="0.4" k1="-0.6869" k2="0.1319" k3="-0.0064"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="0.89" k1="-0.7050" k2="0.1755" k3="-0.0288"/>
-+            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.6771" k2="0.1167" k3="0.0009"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="0.24" k1="-0.7799" k2="0.3685" k3="-0.0868"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="0.4" k1="-0.7531" k2="0.3350" k3="-0.0787"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="0.89" k1="-0.7646" k2="0.3496" k3="-0.0813"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.7527" k2="0.3523" k3="-0.0956"/>
-+            <vignetting model="pa" focal="12" aperture="25" distance="0.24" k1="-0.7521" k2="0.2830" k3="-0.0191"/>
-+            <vignetting model="pa" focal="12" aperture="25" distance="0.4" k1="-0.7227" k2="0.2398" k3="-0.0025"/>
-+            <vignetting model="pa" focal="12" aperture="25" distance="0.89" k1="-0.7343" k2="0.2556" k3="-0.0066"/>
-+            <vignetting model="pa" focal="12" aperture="25" distance="1000" k1="-0.7175" k2="0.2394" k3="-0.0041"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="0.24" k1="-1.6349" k2="1.6451" k3="-0.6916"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="0.4" k1="-1.6138" k2="1.6118" k3="-0.6763"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="0.89" k1="-1.6242" k2="1.6261" k3="-0.6820"/>
-+            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-1.6244" k2="1.6455" k3="-0.7002"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.24" k1="-1.0354" k2="0.3250" k3="0.0742"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.8342" k2="-0.0776" k3="0.2910"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="0.89" k1="-0.8634" k2="-0.0254" k3="0.2654"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.8643" k2="-0.0006" k3="0.2431"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.24" k1="-0.4946" k2="-0.3809" k3="0.3050"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4709" k2="-0.3843" k3="0.2924"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="0.89" k1="-0.4895" k2="-0.3388" k3="0.2652"/>
-+            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4869" k2="-0.3453" k3="0.2675"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.24" k1="-0.6637" k2="0.3256" k3="-0.1634"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.4" k1="-0.6293" k2="0.2711" k3="-0.1445"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="0.89" k1="-0.6421" k2="0.2830" k3="-0.1461"/>
-+            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.6437" k2="0.3149" k3="-0.1752"/>
-+            <vignetting model="pa" focal="14" aperture="29" distance="0.24" k1="-0.6257" k2="0.1583" k3="0.0265"/>
-+            <vignetting model="pa" focal="14" aperture="29" distance="0.4" k1="-0.5964" k2="0.1154" k3="0.0488"/>
-+            <vignetting model="pa" focal="14" aperture="29" distance="0.89" k1="-0.6101" k2="0.1302" k3="0.0439"/>
-+            <vignetting model="pa" focal="14" aperture="29" distance="1000" k1="-0.6142" k2="0.1672" k3="0.0135"/>
-+            <vignetting model="pa" focal="18" aperture="5.3" distance="0.24" k1="-1.5309" k2="1.5359" k3="-0.6560"/>
-+            <vignetting model="pa" focal="18" aperture="5.3" distance="0.4" k1="-1.5295" k2="1.5343" k3="-0.6555"/>
-+            <vignetting model="pa" focal="18" aperture="5.3" distance="0.89" k1="-1.5348" k2="1.5411" k3="-0.6582"/>
-+            <vignetting model="pa" focal="18" aperture="5.3" distance="1000" k1="-1.5403" k2="1.5756" k3="-0.6846"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.24" k1="-1.3201" k2="1.0865" k3="-0.3944"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-1.2860" k2="1.0068" k3="-0.3474"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.89" k1="-1.2730" k2="0.9731" k3="-0.3262"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-1.3002" k2="1.0581" k3="-0.3826"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.24" k1="-0.3366" k2="-0.8234" k3="0.6028"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.3746" k2="-0.7961" k3="0.6081"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.89" k1="-0.3330" k2="-0.8200" k3="0.5970"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3448" k2="-0.7735" k3="0.5655"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.24" k1="-0.3860" k2="-0.1833" k3="0.0676"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.4105" k2="-0.0843" k3="0.0006"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="0.89" k1="-0.4132" k2="-0.0863" k3="0.0043"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4189" k2="-0.0543" k3="-0.0214"/>
-+            <vignetting model="pa" focal="18" aperture="32" distance="0.24" k1="-0.4528" k2="-0.0053" k3="0.0887"/>
-+            <vignetting model="pa" focal="18" aperture="32" distance="0.4" k1="-0.4503" k2="-0.0074" k3="0.0892"/>
-+            <vignetting model="pa" focal="18" aperture="32" distance="0.89" k1="-0.4553" k2="-0.0028" k3="0.0884"/>
-+            <vignetting model="pa" focal="18" aperture="32" distance="1000" k1="-0.4685" k2="0.0592" k3="0.0437"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.24" k1="-1.4777" k2="1.5040" k3="-0.6564"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.4" k1="-1.4748" k2="1.4912" k3="-0.6470"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.89" k1="-1.5090" k2="1.5523" k3="-0.6782"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.4883" k2="1.5344" k3="-0.6753"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.24" k1="-0.2801" k2="-0.8946" k3="0.6361"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.4" k1="-0.2771" k2="-0.9041" k3="0.6437"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.89" k1="-0.3166" k2="-0.8392" k3="0.6123"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.2885" k2="-0.8563" k3="0.6096"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.24" k1="-0.3069" k2="-0.2277" k3="0.0577"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.4" k1="-0.3034" k2="-0.2361" k3="0.0643"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.89" k1="-0.3461" k2="-0.1642" k3="0.0299"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.3303" k2="-0.1438" k3="0.0041"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.24" k1="-0.4507" k2="0.2503" k3="-0.1935"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.4436" k2="0.2273" k3="-0.1775"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.89" k1="-0.4819" k2="0.2816" k3="-0.1986"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4596" k2="0.2783" k3="-0.2106"/>
-+            <vignetting model="pa" focal="20" aperture="32" distance="0.24" k1="-0.3808" k2="-0.0286" k3="0.0797"/>
-+            <vignetting model="pa" focal="20" aperture="32" distance="0.4" k1="-0.3724" k2="-0.0533" k3="0.0963"/>
-+            <vignetting model="pa" focal="20" aperture="32" distance="0.89" k1="-0.4091" k2="-0.0021" k3="0.0756"/>
-+            <vignetting model="pa" focal="20" aperture="32" distance="1000" k1="-0.3893" k2="-0.0011" k3="0.0642"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Sigma</maker>
--	    <model>Sigma 10-20mm F4-5.6 EX DC HSM</model>
--	    <focal min="10" max="20" />
--	    <aperture min="4" max="32" />
--	    <mount>Nikon F AF</mount>
-+        <maker>Sigma</maker>
-+        <model>Sigma 10-20mm f/4-5.6 EX DC HSM</model>
-+        <!-- HSM is not available for Sony and Pentax, so don't display it for
-+             avoiding confusion. -->
-+        <model lang="en">Sigma 10-20mm f/4-5.6 EX DC</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>Sony Alpha</mount>
-         <mount>4/3 System</mount>
--	    <cropfactor>1.5</cropfactor>
--	    <calibration>
--	        <distortion focal="10" model="ptlens" a="-0.0284207" b="0.0674528" c="-0.0484386" />
--	        <distortion focal="12" model="ptlens" a="-0.0230294" b="0.0734247" c="-0.0568826" />
--	        <distortion focal="14" model="ptlens" a="-0.000939631" b="0.0208626" c="-0.0198823" />
--	        <distortion focal="17" model="ptlens" a="0.0034078" b="0.00203584" c="-0.00781656" />
--	        <distortion focal="20" model="ptlens" a="0.000314791" b="0.0120508" c="-0.0128173" />
--	        <vignetting model="pa" focal="10" aperture="4" distance="0.24" k1="-1.6197" k2="1.7397" k3="-0.9699" />
--            <vignetting model="pa" focal="10" aperture="4" distance="0.4" k1="-1.6057" k2="1.6328" k3="-0.7646" />
--            <vignetting model="pa" focal="10" aperture="4" distance="0.89" k1="-1.6213" k2="1.6181" k3="-0.7122" />
--            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-1.5643" k2="1.4810" k3="-0.6303" />
--            <vignetting model="pa" focal="10" aperture="5.6" distance="0.24" k1="-0.8114" k2="0.2854" k3="-0.2038" />
--            <vignetting model="pa" focal="10" aperture="5.6" distance="0.4" k1="-0.6870" k2="-0.1406" k3="0.1812" />
--            <vignetting model="pa" focal="10" aperture="5.6" distance="0.89" k1="-0.7512" k2="0.0000" k3="0.1040" />
--            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.6854" k2="-0.1364" k3="0.1778" />
--            <vignetting model="pa" focal="10" aperture="8" distance="0.24" k1="-0.9094" k2="0.6895" k3="-0.4041" />
--            <vignetting model="pa" focal="10" aperture="8" distance="0.4" k1="-0.8413" k2="0.4933" k3="-0.2457" />
--            <vignetting model="pa" focal="10" aperture="8" distance="0.89" k1="-0.8993" k2="0.6179" k3="-0.3158" />
--            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.8344" k2="0.4782" k3="-0.2365" />
--            <vignetting model="pa" focal="10" aperture="11" distance="0.24" k1="-0.8793" k2="0.5210" k3="-0.1862" />
--            <vignetting model="pa" focal="10" aperture="11" distance="0.4" k1="-0.8327" k2="0.4117" k3="-0.1157" />
--            <vignetting model="pa" focal="10" aperture="11" distance="0.89" k1="-0.8950" k2="0.5517" k3="-0.1944" />
--            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.8272" k2="0.4028" k3="-0.1093" />
--            <vignetting model="pa" focal="10" aperture="22" distance="0.24" k1="-0.8389" k2="0.3842" k3="-0.0714" />
--            <vignetting model="pa" focal="10" aperture="22" distance="0.4" k1="-0.7984" k2="0.3017" k3="-0.0274" />
--            <vignetting model="pa" focal="10" aperture="22" distance="0.89" k1="-0.8599" k2="0.4385" k3="-0.1027" />
--            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.7923" k2="0.2879" k3="-0.0154" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="0.24" k1="-1.6821" k2="1.7055" k3="-0.7163" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="0.4" k1="-1.6575" k2="1.6614" k3="-0.6953" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="0.89" k1="-1.6656" k2="1.6771" k3="-0.7020" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.6563" k2="1.6669" k3="-0.7004" />
--            <vignetting model="pa" focal="12" aperture="5.6" distance="0.24" k1="-0.8319" k2="-0.0859" k3="0.2929" />
--            <vignetting model="pa" focal="12" aperture="5.6" distance="0.4" k1="-0.7649" k2="-0.1949" k3="0.3405" />
--            <vignetting model="pa" focal="12" aperture="5.6" distance="0.89" k1="-0.7875" k2="-0.1559" k3="0.3239" />
--            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.7590" k2="-0.1982" k3="0.3400" />
--            <vignetting model="pa" focal="12" aperture="8" distance="0.24" k1="-0.7036" k2="0.1261" k3="0.0102" />
--            <vignetting model="pa" focal="12" aperture="8" distance="0.4" k1="-0.6869" k2="0.1319" k3="-0.0064" />
--            <vignetting model="pa" focal="12" aperture="8" distance="0.89" k1="-0.7050" k2="0.1755" k3="-0.0288" />
--            <vignetting model="pa" focal="12" aperture="8" distance="1000" k1="-0.6771" k2="0.1167" k3="0.0009" />
--            <vignetting model="pa" focal="12" aperture="11" distance="0.24" k1="-0.7799" k2="0.3685" k3="-0.0868" />
--            <vignetting model="pa" focal="12" aperture="11" distance="0.4" k1="-0.7531" k2="0.3350" k3="-0.0787" />
--            <vignetting model="pa" focal="12" aperture="11" distance="0.89" k1="-0.7646" k2="0.3496" k3="-0.0813" />
--            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-0.7527" k2="0.3523" k3="-0.0956" />
--            <vignetting model="pa" focal="12" aperture="25" distance="0.24" k1="-0.7521" k2="0.2830" k3="-0.0191" />
--            <vignetting model="pa" focal="12" aperture="25" distance="0.4" k1="-0.7227" k2="0.2398" k3="-0.0025" />
--            <vignetting model="pa" focal="12" aperture="25" distance="0.89" k1="-0.7343" k2="0.2556" k3="-0.0066" />
--            <vignetting model="pa" focal="12" aperture="25" distance="1000" k1="-0.7175" k2="0.2394" k3="-0.0041" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="0.24" k1="-1.6349" k2="1.6451" k3="-0.6916" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="0.4" k1="-1.6138" k2="1.6118" k3="-0.6763" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="0.89" k1="-1.6242" k2="1.6261" k3="-0.6820" />
--            <vignetting model="pa" focal="14" aperture="4.8" distance="1000" k1="-1.6244" k2="1.6455" k3="-0.7002" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.24" k1="-1.0354" k2="0.3250" k3="0.0742" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.4" k1="-0.8342" k2="-0.0776" k3="0.2910" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="0.89" k1="-0.8634" k2="-0.0254" k3="0.2654" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.8643" k2="-0.0006" k3="0.2431" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.24" k1="-0.4946" k2="-0.3809" k3="0.3050" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.4" k1="-0.4709" k2="-0.3843" k3="0.2924" />
--            <vignetting model="pa" focal="14" aperture="8" distance="0.89" k1="-0.4895" k2="-0.3388" k3="0.2652" />
--            <vignetting model="pa" focal="14" aperture="8" distance="1000" k1="-0.4869" k2="-0.3453" k3="0.2675" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.24" k1="-0.6637" k2="0.3256" k3="-0.1634" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.4" k1="-0.6293" k2="0.2711" k3="-0.1445" />
--            <vignetting model="pa" focal="14" aperture="11" distance="0.89" k1="-0.6421" k2="0.2830" k3="-0.1461" />
--            <vignetting model="pa" focal="14" aperture="11" distance="1000" k1="-0.6437" k2="0.3149" k3="-0.1752" />
--            <vignetting model="pa" focal="14" aperture="29" distance="0.24" k1="-0.6257" k2="0.1583" k3="0.0265" />
--            <vignetting model="pa" focal="14" aperture="29" distance="0.4" k1="-0.5964" k2="0.1154" k3="0.0488" />
--            <vignetting model="pa" focal="14" aperture="29" distance="0.89" k1="-0.6101" k2="0.1302" k3="0.0439" />
--            <vignetting model="pa" focal="14" aperture="29" distance="1000" k1="-0.6142" k2="0.1672" k3="0.0135" />
--            <vignetting model="pa" focal="18" aperture="5.3" distance="0.24" k1="-1.5309" k2="1.5359" k3="-0.6560" />
--            <vignetting model="pa" focal="18" aperture="5.3" distance="0.4" k1="-1.5295" k2="1.5343" k3="-0.6555" />
--            <vignetting model="pa" focal="18" aperture="5.3" distance="0.89" k1="-1.5348" k2="1.5411" k3="-0.6582" />
--            <vignetting model="pa" focal="18" aperture="5.3" distance="1000" k1="-1.5403" k2="1.5756" k3="-0.6846" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.24" k1="-1.3201" k2="1.0865" k3="-0.3944" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.4" k1="-1.2860" k2="1.0068" k3="-0.3474" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.89" k1="-1.2730" k2="0.9731" k3="-0.3262" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-1.3002" k2="1.0581" k3="-0.3826" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.24" k1="-0.3366" k2="-0.8234" k3="0.6028" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.4" k1="-0.3746" k2="-0.7961" k3="0.6081" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.89" k1="-0.3330" k2="-0.8200" k3="0.5970" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3448" k2="-0.7735" k3="0.5655" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.24" k1="-0.3860" k2="-0.1833" k3="0.0676" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.4" k1="-0.4105" k2="-0.0843" k3="0.0006" />
--            <vignetting model="pa" focal="18" aperture="11" distance="0.89" k1="-0.4132" k2="-0.0863" k3="0.0043" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.4189" k2="-0.0543" k3="-0.0214" />
--            <vignetting model="pa" focal="18" aperture="32" distance="0.24" k1="-0.4528" k2="-0.0053" k3="0.0887" />
--            <vignetting model="pa" focal="18" aperture="32" distance="0.4" k1="-0.4503" k2="-0.0074" k3="0.0892" />
--            <vignetting model="pa" focal="18" aperture="32" distance="0.89" k1="-0.4553" k2="-0.0028" k3="0.0884" />
--            <vignetting model="pa" focal="18" aperture="32" distance="1000" k1="-0.4685" k2="0.0592" k3="0.0437" />
--            <vignetting model="pa" focal="20" aperture="5.6" distance="0.24" k1="-1.4777" k2="1.5040" k3="-0.6564" />
--            <vignetting model="pa" focal="20" aperture="5.6" distance="0.4" k1="-1.4748" k2="1.4912" k3="-0.6470" />
--            <vignetting model="pa" focal="20" aperture="5.6" distance="0.89" k1="-1.5090" k2="1.5523" k3="-0.6782" />
--            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.4883" k2="1.5344" k3="-0.6753" />
--            <vignetting model="pa" focal="20" aperture="8" distance="0.24" k1="-0.2801" k2="-0.8946" k3="0.6361" />
--            <vignetting model="pa" focal="20" aperture="8" distance="0.4" k1="-0.2771" k2="-0.9041" k3="0.6437" />
--            <vignetting model="pa" focal="20" aperture="8" distance="0.89" k1="-0.3166" k2="-0.8392" k3="0.6123" />
--            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.2885" k2="-0.8563" k3="0.6096" />
--            <vignetting model="pa" focal="20" aperture="11" distance="0.24" k1="-0.3069" k2="-0.2277" k3="0.0577" />
--            <vignetting model="pa" focal="20" aperture="11" distance="0.4" k1="-0.3034" k2="-0.2361" k3="0.0643" />
--            <vignetting model="pa" focal="20" aperture="11" distance="0.89" k1="-0.3461" k2="-0.1642" k3="0.0299" />
--            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.3303" k2="-0.1438" k3="0.0041" />
--            <vignetting model="pa" focal="20" aperture="16" distance="0.24" k1="-0.4507" k2="0.2503" k3="-0.1935" />
--            <vignetting model="pa" focal="20" aperture="16" distance="0.4" k1="-0.4436" k2="0.2273" k3="-0.1775" />
--            <vignetting model="pa" focal="20" aperture="16" distance="0.89" k1="-0.4819" k2="0.2816" k3="-0.1986" />
--            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4596" k2="0.2783" k3="-0.2106" />
--            <vignetting model="pa" focal="20" aperture="32" distance="0.24" k1="-0.3808" k2="-0.0286" k3="0.0797" />
--            <vignetting model="pa" focal="20" aperture="32" distance="0.4" k1="-0.3724" k2="-0.0533" k3="0.0963" />
--            <vignetting model="pa" focal="20" aperture="32" distance="0.89" k1="-0.4091" k2="-0.0021" k3="0.0756" />
--            <vignetting model="pa" focal="20" aperture="32" distance="1000" k1="-0.3893" k2="-0.0011" k3="0.0642" />
--    	</calibration>
-+        <focal min="10" max="20"/>
-+        <aperture min="4" max="32"/>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 60D -->
-+            <vignetting model="pa" focal="10" aperture="4" distance="10" k1="-1.3352" k2="1.3068" k3="-0.5982"/>
-+            <vignetting model="pa" focal="10" aperture="4" distance="1000" k1="-1.3352" k2="1.3068" k3="-0.5982"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="10" k1="-0.5343" k2="-0.2354" k3="0.2091"/>
-+            <vignetting model="pa" focal="10" aperture="5.6" distance="1000" k1="-0.5343" k2="-0.2354" k3="0.2091"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="10" k1="-0.6191" k2="0.3599" k3="-0.2475"/>
-+            <vignetting model="pa" focal="10" aperture="8" distance="1000" k1="-0.6191" k2="0.3599" k3="-0.2475"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="10" k1="-0.6621" k2="0.4182" k3="-0.1863"/>
-+            <vignetting model="pa" focal="10" aperture="11" distance="1000" k1="-0.6621" k2="0.4182" k3="-0.1863"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="10" k1="-0.6518" k2="0.3303" k3="-0.0927"/>
-+            <vignetting model="pa" focal="10" aperture="22" distance="1000" k1="-0.6518" k2="0.3303" k3="-0.0927"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-1.4611" k2="1.4600" k3="-0.6255"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.4611" k2="1.4600" k3="-0.6255"/>
-+            <vignetting model="pa" focal="12" aperture="6.3" distance="10" k1="-0.6030" k2="-0.2819" k3="0.3354"/>
-+            <vignetting model="pa" focal="12" aperture="6.3" distance="1000" k1="-0.6030" k2="-0.2819" k3="0.3354"/>
-+            <vignetting model="pa" focal="12" aperture="9" distance="10" k1="-0.5229" k2="0.0523" k3="-0.0155"/>
-+            <vignetting model="pa" focal="12" aperture="9" distance="1000" k1="-0.5229" k2="0.0523" k3="-0.0155"/>
-+            <vignetting model="pa" focal="12" aperture="13" distance="10" k1="-0.6189" k2="0.3259" k3="-0.1147"/>
-+            <vignetting model="pa" focal="12" aperture="13" distance="1000" k1="-0.6189" k2="0.3259" k3="-0.1147"/>
-+            <vignetting model="pa" focal="12" aperture="18" distance="10" k1="-0.6114" k2="0.2735" k3="-0.0606"/>
-+            <vignetting model="pa" focal="12" aperture="18" distance="1000" k1="-0.6114" k2="0.2735" k3="-0.0606"/>
-+            <vignetting model="pa" focal="14" aperture="5" distance="10" k1="-1.4582" k2="1.4606" k3="-0.6283"/>
-+            <vignetting model="pa" focal="14" aperture="5" distance="1000" k1="-1.4582" k2="1.4606" k3="-0.6283"/>
-+            <vignetting model="pa" focal="14" aperture="7.1" distance="10" k1="-0.5729" k2="-0.3661" k3="0.3857"/>
-+            <vignetting model="pa" focal="14" aperture="7.1" distance="1000" k1="-0.5729" k2="-0.3661" k3="0.3857"/>
-+            <vignetting model="pa" focal="14" aperture="10" distance="10" k1="-0.4233" k2="-0.1688" k3="0.0986"/>
-+            <vignetting model="pa" focal="14" aperture="10" distance="1000" k1="-0.4233" k2="-0.1688" k3="0.0986"/>
-+            <vignetting model="pa" focal="14" aperture="14" distance="10" k1="-0.5856" k2="0.3839" k3="-0.2071"/>
-+            <vignetting model="pa" focal="14" aperture="14" distance="1000" k1="-0.5856" k2="0.3839" k3="-0.2071"/>
-+            <vignetting model="pa" focal="14" aperture="29" distance="10" k1="-0.5679" k2="0.2524" k3="-0.0598"/>
-+            <vignetting model="pa" focal="14" aperture="29" distance="1000" k1="-0.5679" k2="0.2524" k3="-0.0598"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-1.4173" k2="1.4522" k3="-0.6412"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-1.4173" k2="1.4522" k3="-0.6412"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.4292" k2="-0.5749" k3="0.4766"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4292" k2="-0.5749" k3="0.4766"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="10" k1="-0.3301" k2="-0.1767" k3="0.0477"/>
-+            <vignetting model="pa" focal="16" aperture="11" distance="1000" k1="-0.3301" k2="-0.1767" k3="0.0477"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="10" k1="-0.4989" k2="0.3791" k3="-0.2538"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="1000" k1="-0.4989" k2="0.3791" k3="-0.2538"/>
-+            <vignetting model="pa" focal="16" aperture="29" distance="10" k1="-0.4706" k2="0.2002" k3="-0.0546"/>
-+            <vignetting model="pa" focal="16" aperture="29" distance="1000" k1="-0.4706" k2="0.2002" k3="-0.0546"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-1.3803" k2="1.4302" k3="-0.6394"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.3803" k2="1.4302" k3="-0.6394"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.4838" k2="-0.4581" k3="0.4203"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.4838" k2="-0.4581" k3="0.4203"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.2273" k2="-0.4276" k3="0.2002"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.2273" k2="-0.4276" k3="0.2002"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="10" k1="-0.4460" k2="0.3797" k3="-0.2999"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.4460" k2="0.3797" k3="-0.2999"/>
-+            <vignetting model="pa" focal="20" aperture="32" distance="10" k1="-0.4186" k2="0.1837" k3="-0.0586"/>
-+            <vignetting model="pa" focal="20" aperture="32" distance="1000" k1="-0.4186" k2="0.1837" k3="-0.0586"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 12-24mm f/4.5-5.6 EX DG</model>
-+        <model>Sigma 12-24mm f/4.5-5.6 EX DG HSM</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="12" a="0.004893" b="-0.019407" c="0" />
--            <distortion model="ptlens" focal="15" a="0.005113" b="-0.014337" c="0" />
--            <distortion model="ptlens" focal="17" a="0.005379" b="-0.013087" c="0" />
--            <distortion model="ptlens" focal="19" a="0.006028" b="-0.012828" c="0" />
--            <distortion model="ptlens" focal="21" a="0.00375" b="-0.007426" c="0" />
--            <distortion model="ptlens" focal="24" a="0.002951" b="-0.004156" c="0" />
-+            <distortion model="ptlens" focal="12" a="0.004893" b="-0.019407" c="0"/>
-+            <distortion model="ptlens" focal="15" a="0.005113" b="-0.014337" c="0"/>
-+            <distortion model="ptlens" focal="17" a="0.005379" b="-0.013087" c="0"/>
-+            <distortion model="ptlens" focal="19" a="0.006028" b="-0.012828" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.00375" b="-0.007426" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.002951" b="-0.004156" c="0"/>
-+            <!-- Taken with Canon 5D Mark II -->
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="0.25" k1="-1.7694" k2="1.5716" k3="-0.7196"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-1.7694" k2="1.5716" k3="-0.7196"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="0.25" k1="-1.0867" k2="0.1360" k3="0.0322"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-1.0867" k2="0.1360" k3="0.0322"/>
-+            <vignetting model="pa" focal="12" aperture="7.1" distance="0.25" k1="-0.8460" k2="-0.0734" k3="0.0356"/>
-+            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.8460" k2="-0.0734" k3="0.0356"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="0.25" k1="-1.0405" k2="0.9223" k3="-0.6610"/>
-+            <vignetting model="pa" focal="12" aperture="11" distance="1000" k1="-1.0405" k2="0.9223" k3="-0.6610"/>
-+            <vignetting model="pa" focal="12" aperture="14" distance="0.25" k1="-1.0605" k2="0.9463" k3="-0.6128"/>
-+            <vignetting model="pa" focal="12" aperture="14" distance="1000" k1="-1.0605" k2="0.9463" k3="-0.6128"/>
-+            <vignetting model="pa" focal="12" aperture="18" distance="0.25" k1="-1.0168" k2="0.7322" k3="-0.3758"/>
-+            <vignetting model="pa" focal="12" aperture="18" distance="1000" k1="-1.0168" k2="0.7322" k3="-0.3758"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="0.25" k1="-0.9658" k2="0.5245" k3="-0.1826"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.9658" k2="0.5245" k3="-0.1826"/>
-+            <vignetting model="pa" focal="13" aperture="5" distance="0.25" k1="-1.8732" k2="1.9204" k3="-0.8997"/>
-+            <vignetting model="pa" focal="13" aperture="5" distance="1000" k1="-1.8732" k2="1.9204" k3="-0.8997"/>
-+            <vignetting model="pa" focal="13" aperture="5.6" distance="0.25" k1="-1.3386" k2="0.7388" k3="-0.1948"/>
-+            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-1.3386" k2="0.7388" k3="-0.1948"/>
-+            <vignetting model="pa" focal="13" aperture="6.3" distance="0.25" k1="-1.0557" k2="0.1379" k3="0.1563"/>
-+            <vignetting model="pa" focal="13" aperture="6.3" distance="1000" k1="-1.0557" k2="0.1379" k3="0.1563"/>
-+            <vignetting model="pa" focal="13" aperture="7.1" distance="0.25" k1="-0.8943" k2="-0.1434" k3="0.2998"/>
-+            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.8943" k2="-0.1434" k3="0.2998"/>
-+            <vignetting model="pa" focal="13" aperture="8" distance="0.25" k1="-0.8087" k2="-0.2016" k3="0.2927"/>
-+            <vignetting model="pa" focal="13" aperture="8" distance="1000" k1="-0.8087" k2="-0.2016" k3="0.2927"/>
-+            <vignetting model="pa" focal="13" aperture="9" distance="0.25" k1="-0.8063" k2="-0.0668" k3="0.1663"/>
-+            <vignetting model="pa" focal="13" aperture="9" distance="1000" k1="-0.8063" k2="-0.0668" k3="0.1663"/>
-+            <vignetting model="pa" focal="13" aperture="10" distance="0.25" k1="-0.8556" k2="0.1723" k3="-0.0112"/>
-+            <vignetting model="pa" focal="13" aperture="10" distance="1000" k1="-0.8556" k2="0.1723" k3="-0.0112"/>
-+            <vignetting model="pa" focal="13" aperture="11" distance="0.25" k1="-0.9047" k2="0.3641" k3="-0.1396"/>
-+            <vignetting model="pa" focal="13" aperture="11" distance="1000" k1="-0.9047" k2="0.3641" k3="-0.1396"/>
-+            <vignetting model="pa" focal="13" aperture="13" distance="0.25" k1="-0.9431" k2="0.4912" k3="-0.2116"/>
-+            <vignetting model="pa" focal="13" aperture="13" distance="1000" k1="-0.9431" k2="0.4912" k3="-0.2116"/>
-+            <vignetting model="pa" focal="13" aperture="16" distance="0.25" k1="-0.9697" k2="0.5450" k3="-0.2054"/>
-+            <vignetting model="pa" focal="13" aperture="16" distance="1000" k1="-0.9697" k2="0.5450" k3="-0.2054"/>
-+            <vignetting model="pa" focal="13" aperture="18" distance="0.25" k1="-0.9599" k2="0.4957" k3="-0.1502"/>
-+            <vignetting model="pa" focal="13" aperture="18" distance="1000" k1="-0.9599" k2="0.4957" k3="-0.1502"/>
-+            <vignetting model="pa" focal="13" aperture="20" distance="0.25" k1="-0.9570" k2="0.4624" k3="-0.1098"/>
-+            <vignetting model="pa" focal="13" aperture="20" distance="1000" k1="-0.9570" k2="0.4624" k3="-0.1098"/>
-+            <vignetting model="pa" focal="13" aperture="22" distance="0.25" k1="-0.9376" k2="0.3915" k3="-0.0465"/>
-+            <vignetting model="pa" focal="13" aperture="22" distance="1000" k1="-0.9376" k2="0.3915" k3="-0.0465"/>
-+            <vignetting model="pa" focal="15" aperture="5" distance="0.25" k1="-1.7717" k2="1.7622" k3="-0.7345"/>
-+            <vignetting model="pa" focal="15" aperture="5" distance="1000" k1="-1.7717" k2="1.7622" k3="-0.7345"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="0.25" k1="-1.4583" k2="1.0383" k3="-0.3027"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-1.4583" k2="1.0383" k3="-0.3027"/>
-+            <vignetting model="pa" focal="15" aperture="6.3" distance="0.25" k1="-1.0236" k2="0.0966" k3="0.2259"/>
-+            <vignetting model="pa" focal="15" aperture="6.3" distance="1000" k1="-1.0236" k2="0.0966" k3="0.2259"/>
-+            <vignetting model="pa" focal="15" aperture="7.1" distance="0.25" k1="-0.8817" k2="-0.1458" k3="0.3330"/>
-+            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.8817" k2="-0.1458" k3="0.3330"/>
-+            <vignetting model="pa" focal="15" aperture="8" distance="0.25" k1="-0.7884" k2="-0.2057" k3="0.3108"/>
-+            <vignetting model="pa" focal="15" aperture="8" distance="1000" k1="-0.7884" k2="-0.2057" k3="0.3108"/>
-+            <vignetting model="pa" focal="15" aperture="9" distance="0.25" k1="-0.7746" k2="-0.0312" k3="0.1358"/>
-+            <vignetting model="pa" focal="15" aperture="9" distance="1000" k1="-0.7746" k2="-0.0312" k3="0.1358"/>
-+            <vignetting model="pa" focal="15" aperture="10" distance="0.25" k1="-0.8058" k2="0.1344" k3="0.0115"/>
-+            <vignetting model="pa" focal="15" aperture="10" distance="1000" k1="-0.8058" k2="0.1344" k3="0.0115"/>
-+            <vignetting model="pa" focal="15" aperture="11" distance="0.25" k1="-0.8523" k2="0.3381" k3="-0.1321"/>
-+            <vignetting model="pa" focal="15" aperture="11" distance="1000" k1="-0.8523" k2="0.3381" k3="-0.1321"/>
-+            <vignetting model="pa" focal="15" aperture="13" distance="0.25" k1="-0.8964" k2="0.4876" k3="-0.2132"/>
-+            <vignetting model="pa" focal="15" aperture="13" distance="1000" k1="-0.8964" k2="0.4876" k3="-0.2132"/>
-+            <vignetting model="pa" focal="15" aperture="14" distance="0.25" k1="-0.9079" k2="0.5223" k3="-0.2247"/>
-+            <vignetting model="pa" focal="15" aperture="14" distance="1000" k1="-0.9079" k2="0.5223" k3="-0.2247"/>
-+            <vignetting model="pa" focal="15" aperture="16" distance="0.25" k1="-0.9061" k2="0.4892" k3="-0.1722"/>
-+            <vignetting model="pa" focal="15" aperture="16" distance="1000" k1="-0.9061" k2="0.4892" k3="-0.1722"/>
-+            <vignetting model="pa" focal="15" aperture="18" distance="0.25" k1="-0.8957" k2="0.4399" k3="-0.1161"/>
-+            <vignetting model="pa" focal="15" aperture="18" distance="1000" k1="-0.8957" k2="0.4399" k3="-0.1161"/>
-+            <vignetting model="pa" focal="15" aperture="20" distance="0.25" k1="-0.8873" k2="0.3937" k3="-0.0669"/>
-+            <vignetting model="pa" focal="15" aperture="20" distance="1000" k1="-0.8873" k2="0.3937" k3="-0.0669"/>
-+            <vignetting model="pa" focal="15" aperture="25" distance="0.25" k1="-0.8735" k2="0.3279" k3="-0.0060"/>
-+            <vignetting model="pa" focal="15" aperture="25" distance="1000" k1="-0.8735" k2="0.3279" k3="-0.0060"/>
-+            <vignetting model="pa" focal="17" aperture="5" distance="0.25" k1="-1.6712" k2="1.6519" k3="-0.6913"/>
-+            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-1.6712" k2="1.6519" k3="-0.6913"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="0.25" k1="-1.4814" k2="1.2252" k3="-0.4385"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-1.4814" k2="1.2252" k3="-0.4385"/>
-+            <vignetting model="pa" focal="17" aperture="6.3" distance="0.25" k1="-1.0361" k2="0.2284" k3="0.1350"/>
-+            <vignetting model="pa" focal="17" aperture="6.3" distance="1000" k1="-1.0361" k2="0.2284" k3="0.1350"/>
-+            <vignetting model="pa" focal="17" aperture="7.1" distance="0.25" k1="-0.9199" k2="0.0243" k3="0.2302"/>
-+            <vignetting model="pa" focal="17" aperture="7.1" distance="1000" k1="-0.9199" k2="0.0243" k3="0.2302"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="0.25" k1="-0.7710" k2="-0.1279" k3="0.2503"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.7710" k2="-0.1279" k3="0.2503"/>
-+            <vignetting model="pa" focal="17" aperture="9" distance="0.25" k1="-0.7777" k2="0.0951" k3="0.0495"/>
-+            <vignetting model="pa" focal="17" aperture="9" distance="1000" k1="-0.7777" k2="0.0951" k3="0.0495"/>
-+            <vignetting model="pa" focal="17" aperture="10" distance="0.25" k1="-0.7702" k2="0.1267" k3="0.0172"/>
-+            <vignetting model="pa" focal="17" aperture="10" distance="1000" k1="-0.7702" k2="0.1267" k3="0.0172"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="0.25" k1="-0.8448" k2="0.4349" k3="-0.1953"/>
-+            <vignetting model="pa" focal="17" aperture="11" distance="1000" k1="-0.8448" k2="0.4349" k3="-0.1953"/>
-+            <vignetting model="pa" focal="17" aperture="13" distance="0.25" k1="-0.8777" k2="0.5346" k3="-0.2351"/>
-+            <vignetting model="pa" focal="17" aperture="13" distance="1000" k1="-0.8777" k2="0.5346" k3="-0.2351"/>
-+            <vignetting model="pa" focal="17" aperture="14" distance="0.25" k1="-0.8704" k2="0.5218" k3="-0.2172"/>
-+            <vignetting model="pa" focal="17" aperture="14" distance="1000" k1="-0.8704" k2="0.5218" k3="-0.2172"/>
-+            <vignetting model="pa" focal="17" aperture="16" distance="0.25" k1="-0.8619" k2="0.4560" k3="-0.1415"/>
-+            <vignetting model="pa" focal="17" aperture="16" distance="1000" k1="-0.8619" k2="0.4560" k3="-0.1415"/>
-+            <vignetting model="pa" focal="17" aperture="18" distance="0.25" k1="-0.8612" k2="0.4356" k3="-0.1049"/>
-+            <vignetting model="pa" focal="17" aperture="18" distance="1000" k1="-0.8612" k2="0.4356" k3="-0.1049"/>
-+            <vignetting model="pa" focal="17" aperture="20" distance="0.25" k1="-0.8368" k2="0.3479" k3="-0.0387"/>
-+            <vignetting model="pa" focal="17" aperture="20" distance="1000" k1="-0.8368" k2="0.3479" k3="-0.0387"/>
-+            <vignetting model="pa" focal="17" aperture="25" distance="0.25" k1="-0.8429" k2="0.3566" k3="-0.0403"/>
-+            <vignetting model="pa" focal="17" aperture="25" distance="1000" k1="-0.8429" k2="0.3566" k3="-0.0403"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="0.25" k1="-1.4876" k2="1.3747" k3="-0.5536"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-1.4876" k2="1.3747" k3="-0.5536"/>
-+            <vignetting model="pa" focal="20" aperture="6.3" distance="0.25" k1="-1.0422" k2="0.3609" k3="0.0439"/>
-+            <vignetting model="pa" focal="20" aperture="6.3" distance="1000" k1="-1.0422" k2="0.3609" k3="0.0439"/>
-+            <vignetting model="pa" focal="20" aperture="7.1" distance="0.25" k1="-0.8406" k2="-0.0396" k3="0.2540"/>
-+            <vignetting model="pa" focal="20" aperture="7.1" distance="1000" k1="-0.8406" k2="-0.0396" k3="0.2540"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="0.25" k1="-0.7194" k2="-0.1188" k3="0.2317"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.7194" k2="-0.1188" k3="0.2317"/>
-+            <vignetting model="pa" focal="20" aperture="9" distance="0.25" k1="-0.7023" k2="0.0091" k3="0.1014"/>
-+            <vignetting model="pa" focal="20" aperture="9" distance="1000" k1="-0.7023" k2="0.0091" k3="0.1014"/>
-+            <vignetting model="pa" focal="20" aperture="10" distance="0.25" k1="-0.7472" k2="0.2153" k3="-0.0471"/>
-+            <vignetting model="pa" focal="20" aperture="10" distance="1000" k1="-0.7472" k2="0.2153" k3="-0.0471"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="0.25" k1="-0.7991" k2="0.4256" k3="-0.1818"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.7991" k2="0.4256" k3="-0.1818"/>
-+            <vignetting model="pa" focal="20" aperture="13" distance="0.25" k1="-0.8241" k2="0.4983" k3="-0.2086"/>
-+            <vignetting model="pa" focal="20" aperture="13" distance="1000" k1="-0.8241" k2="0.4983" k3="-0.2086"/>
-+            <vignetting model="pa" focal="20" aperture="14" distance="0.25" k1="-0.8094" k2="0.4441" k3="-0.1537"/>
-+            <vignetting model="pa" focal="20" aperture="14" distance="1000" k1="-0.8094" k2="0.4441" k3="-0.1537"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="0.25" k1="-0.7928" k2="0.3822" k3="-0.0872"/>
-+            <vignetting model="pa" focal="20" aperture="16" distance="1000" k1="-0.7928" k2="0.3822" k3="-0.0872"/>
-+            <vignetting model="pa" focal="20" aperture="18" distance="0.25" k1="-0.7822" k2="0.3323" k3="-0.0442"/>
-+            <vignetting model="pa" focal="20" aperture="18" distance="1000" k1="-0.7822" k2="0.3323" k3="-0.0442"/>
-+            <vignetting model="pa" focal="20" aperture="20" distance="0.25" k1="-0.7919" k2="0.3651" k3="-0.0639"/>
-+            <vignetting model="pa" focal="20" aperture="20" distance="1000" k1="-0.7919" k2="0.3651" k3="-0.0639"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="0.25" k1="-0.7887" k2="0.3400" k3="-0.0470"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.7887" k2="0.3400" k3="-0.0470"/>
-+            <vignetting model="pa" focal="20" aperture="25" distance="0.25" k1="-0.8056" k2="0.3845" k3="-0.0731"/>
-+            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.8056" k2="0.3845" k3="-0.0731"/>
-+            <vignetting model="pa" focal="20" aperture="29" distance="0.25" k1="-0.7907" k2="0.3370" k3="-0.0456"/>
-+            <vignetting model="pa" focal="20" aperture="29" distance="1000" k1="-0.7907" k2="0.3370" k3="-0.0456"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.25" k1="-1.3321" k2="1.1361" k3="-0.4297"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-1.3321" k2="1.1361" k3="-0.4297"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="0.25" k1="-1.1956" k2="0.8120" k3="-0.2352"/>
-+            <vignetting model="pa" focal="24" aperture="6.3" distance="1000" k1="-1.1956" k2="0.8120" k3="-0.2352"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="0.25" k1="-0.8522" k2="0.0699" k3="0.1837"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.8522" k2="0.0699" k3="0.1837"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.25" k1="-0.7048" k2="-0.1125" k3="0.2381"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.7048" k2="-0.1125" k3="0.2381"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="0.25" k1="-0.6788" k2="-0.0057" k3="0.1216"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6788" k2="-0.0057" k3="0.1216"/>
-+            <vignetting model="pa" focal="24" aperture="10" distance="0.25" k1="-0.7379" k2="0.2645" k3="-0.0728"/>
-+            <vignetting model="pa" focal="24" aperture="10" distance="1000" k1="-0.7379" k2="0.2645" k3="-0.0728"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="0.25" k1="-0.7776" k2="0.4425" k3="-0.1865"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7776" k2="0.4425" k3="-0.1865"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="0.25" k1="-0.8024" k2="0.4952" k3="-0.1942"/>
-+            <vignetting model="pa" focal="24" aperture="13" distance="1000" k1="-0.8024" k2="0.4952" k3="-0.1942"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="0.25" k1="-0.7824" k2="0.4222" k3="-0.1222"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.7824" k2="0.4222" k3="-0.1222"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="0.25" k1="-0.7849" k2="0.4025" k3="-0.0908"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.7849" k2="0.4025" k3="-0.0908"/>
-+            <vignetting model="pa" focal="24" aperture="18" distance="0.25" k1="-0.7711" k2="0.3708" k3="-0.0715"/>
-+            <vignetting model="pa" focal="24" aperture="18" distance="1000" k1="-0.7711" k2="0.3708" k3="-0.0715"/>
-+            <vignetting model="pa" focal="24" aperture="20" distance="0.25" k1="-0.7837" k2="0.3962" k3="-0.0845"/>
-+            <vignetting model="pa" focal="24" aperture="20" distance="1000" k1="-0.7837" k2="0.3962" k3="-0.0845"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.25" k1="-0.7804" k2="0.3907" k3="-0.0832"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7804" k2="0.3907" k3="-0.0832"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="0.25" k1="-0.7893" k2="0.4084" k3="-0.0928"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.7893" k2="0.4084" k3="-0.0928"/>
-+            <vignetting model="pa" focal="24" aperture="29" distance="0.25" k1="-0.7691" k2="0.3742" k3="-0.0778"/>
-+            <vignetting model="pa" focal="24" aperture="29" distance="1000" k1="-0.7691" k2="0.3742" k3="-0.0778"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 15-30mm f/3.5-4.5 EX DG</model>
-+        <model>Sigma 15-30mm f/3.5-4.5 EX DG Aspherical</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS 5D Mark III -->
-+            <distortion model="ptlens" focal="15" a="0.02055" b="-0.04027" c="-0.02834"/>
-+            <distortion model="ptlens" focal="17" a="0.02167" b="-0.04381" c="-0.01554"/>
-+            <distortion model="ptlens" focal="20" a="0.0205" b="-0.0443" c="0.00636"/>
-+            <distortion model="ptlens" focal="25" a="0.0146" b="-0.02831" c="0.00891"/>
-+            <distortion model="ptlens" focal="30" a="0.0126" b="-0.02092" c="0.00975"/>
-+            <tca model="poly3" focal="15" br="0.0000133" vr="1.0001606" bb="0.0000095" vb="1.0003035"/>
-+            <tca model="poly3" focal="17" br="0.0000619" vr="1.0000477" bb="-0.0000246" vb="1.0004165"/>
-+            <tca model="poly3" focal="20" br="0.0000381" vr="0.9999911" bb="-0.0000435" vb="1.0005025"/>
-+            <tca model="poly3" focal="25" br="0.0000555" vr="0.9999010" bb="-0.0000298" vb="1.0005290"/>
-+            <tca model="poly3" focal="30" br="0.0000225" vr="0.9999106" bb="-0.0000018" vb="1.0005002"/>
-+            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-2.3053" k2="2.6815" k3="-1.2003"/>
-+            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-2.3053" k2="2.6815" k3="-1.2003"/>
-+            <vignetting model="pa" focal="15" aperture="5" distance="10" k1="-0.9739" k2="-0.0556" k3="0.2982"/>
-+            <vignetting model="pa" focal="15" aperture="5" distance="1000" k1="-0.9739" k2="-0.0556" k3="0.2982"/>
-+            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.9322" k2="0.7749" k3="-0.4471"/>
-+            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.9322" k2="0.7749" k3="-0.4471"/>
-+            <vignetting model="pa" focal="15" aperture="10" distance="10" k1="-0.8190" k2="0.3867" k3="-0.0946"/>
-+            <vignetting model="pa" focal="15" aperture="10" distance="1000" k1="-0.8190" k2="0.3867" k3="-0.0946"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.8255" k2="0.2899" k3="0.0298"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.8255" k2="0.2899" k3="0.0298"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="10" k1="-2.1980" k2="2.5062" k3="-1.1151"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="1000" k1="-2.1980" k2="2.5062" k3="-1.1151"/>
-+            <vignetting model="pa" focal="17" aperture="5" distance="10" k1="-1.0095" k2="-0.0682" k3="0.3577"/>
-+            <vignetting model="pa" focal="17" aperture="5" distance="1000" k1="-1.0095" k2="-0.0682" k3="0.3577"/>
-+            <vignetting model="pa" focal="17" aperture="7.1" distance="10" k1="-0.6982" k2="0.1134" k3="0.0158"/>
-+            <vignetting model="pa" focal="17" aperture="7.1" distance="1000" k1="-0.6982" k2="0.1134" k3="0.0158"/>
-+            <vignetting model="pa" focal="17" aperture="10" distance="10" k1="-0.7328" k2="0.2436" k3="-0.0100"/>
-+            <vignetting model="pa" focal="17" aperture="10" distance="1000" k1="-0.7328" k2="0.2436" k3="-0.0100"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.7611" k2="0.3010" k3="-0.0458"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.7611" k2="0.3010" k3="-0.0458"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-1.9625" k2="2.0629" k3="-0.8657"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-1.9625" k2="2.0629" k3="-0.8657"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.6358" k2="-0.3533" k3="0.3837"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.6358" k2="-0.3533" k3="0.3837"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.6878" k2="0.1780" k3="-0.0202"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.6878" k2="0.1780" k3="-0.0202"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="10" k1="-0.6951" k2="0.1735" k3="0.0501"/>
-+            <vignetting model="pa" focal="20" aperture="11" distance="1000" k1="-0.6951" k2="0.1735" k3="0.0501"/>
-+            <vignetting model="pa" focal="20" aperture="25" distance="10" k1="-0.7462" k2="0.2192" k3="0.0423"/>
-+            <vignetting model="pa" focal="20" aperture="25" distance="1000" k1="-0.7462" k2="0.2192" k3="0.0423"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="10" k1="-1.5852" k2="1.2563" k3="-0.4023"/>
-+            <vignetting model="pa" focal="25" aperture="4.5" distance="1000" k1="-1.5852" k2="1.2563" k3="-0.4023"/>
-+            <vignetting model="pa" focal="25" aperture="6.3" distance="10" k1="-0.6276" k2="-0.5102" k3="0.5213"/>
-+            <vignetting model="pa" focal="25" aperture="6.3" distance="1000" k1="-0.6276" k2="-0.5102" k3="0.5213"/>
-+            <vignetting model="pa" focal="25" aperture="9" distance="10" k1="-0.6349" k2="0.0050" k3="0.0614"/>
-+            <vignetting model="pa" focal="25" aperture="9" distance="1000" k1="-0.6349" k2="0.0050" k3="0.0614"/>
-+            <vignetting model="pa" focal="25" aperture="13" distance="10" k1="-0.7127" k2="0.2527" k3="-0.0429"/>
-+            <vignetting model="pa" focal="25" aperture="13" distance="1000" k1="-0.7127" k2="0.2527" k3="-0.0429"/>
-+            <vignetting model="pa" focal="25" aperture="29" distance="10" k1="-0.6612" k2="0.0878" k3="0.0986"/>
-+            <vignetting model="pa" focal="25" aperture="29" distance="1000" k1="-0.6612" k2="0.0878" k3="0.0986"/>
-+            <vignetting model="pa" focal="30" aperture="4.5" distance="10" k1="-1.2491" k2="0.6445" k3="-0.0825"/>
-+            <vignetting model="pa" focal="30" aperture="4.5" distance="1000" k1="-1.2491" k2="0.6445" k3="-0.0825"/>
-+            <vignetting model="pa" focal="30" aperture="6.3" distance="10" k1="-0.6421" k2="-0.5574" k3="0.5667"/>
-+            <vignetting model="pa" focal="30" aperture="6.3" distance="1000" k1="-0.6421" k2="-0.5574" k3="0.5667"/>
-+            <vignetting model="pa" focal="30" aperture="9" distance="10" k1="-0.5351" k2="-0.3070" k3="0.2430"/>
-+            <vignetting model="pa" focal="30" aperture="9" distance="1000" k1="-0.5351" k2="-0.3070" k3="0.2430"/>
-+            <vignetting model="pa" focal="30" aperture="13" distance="10" k1="-0.7173" k2="0.3428" k3="-0.1687"/>
-+            <vignetting model="pa" focal="30" aperture="13" distance="1000" k1="-0.7173" k2="0.3428" k3="-0.1687"/>
-+            <vignetting model="pa" focal="30" aperture="29" distance="10" k1="-0.6824" k2="0.1567" k3="0.0547"/>
-+            <vignetting model="pa" focal="30" aperture="29" distance="1000" k1="-0.6824" k2="0.1567" k3="0.0547"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 15-30mm f/3.5-4.5 EX DG Aspherical</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Minolta AF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="15" a="0.009928" b="-0.033322" c="0" />
--            <distortion model="ptlens" focal="17" a="0.006714" b="-0.023166" c="0" />
--            <distortion model="ptlens" focal="18" a="0.00878" b="-0.025329" c="0" />
--            <distortion model="ptlens" focal="20" a="0.010135" b="-0.026175" c="0" />
--            <distortion model="ptlens" focal="23" a="0.007144" b="-0.018882" c="0" />
--            <distortion model="ptlens" focal="25" a="0.009469" b="-0.02075" c="0" />
--            <distortion model="ptlens" focal="26" a="0.008222" b="-0.017584" c="0" />
--            <distortion model="ptlens" focal="28" a="0.006456" b="-0.012099" c="0" />
--            <distortion model="ptlens" focal="30" a="0.004942" b="-0.008935" c="0" />
-+            <distortion model="ptlens" focal="15" a="0.009928" b="-0.033322" c="0"/>
-+            <distortion model="ptlens" focal="17" a="0.006714" b="-0.023166" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0.00878" b="-0.025329" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.010135" b="-0.026175" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.007144" b="-0.018882" c="0"/>
-+            <distortion model="ptlens" focal="25" a="0.009469" b="-0.02075" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0.008222" b="-0.017584" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.006456" b="-0.012099" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.004942" b="-0.008935" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 17-35mm f/2.8-4 EX DG</model>
-@@ -245,16 +519,16 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.007263" b="-0.02454" c="0" />
--            <distortion model="ptlens" focal="20" a="0.006421" b="-0.021536" c="0" />
--            <distortion model="ptlens" focal="24" a="0.008849" b="-0.023843" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="-0.004158" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.002715" c="0" />
-+            <distortion model="ptlens" focal="17" a="0.007263" b="-0.02454" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.006421" b="-0.021536" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.008849" b="-0.023843" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="-0.004158" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="-0.002715" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 17-70mm f/2.8-4.5 DC Macro</model>
-@@ -263,19 +537,19 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.019088" b="-0.048894" c="0" />
--            <distortion model="ptlens" focal="19" a="0.010938" b="-0.030356" c="0" />
--            <distortion model="ptlens" focal="23" a="0.01063" b="-0.026746" c="0" />
--            <distortion model="ptlens" focal="25" a="0.001877" b="-0.005367" c="0" />
--            <distortion model="ptlens" focal="30" a="-0.001844" b="0.003931" c="0" />
--            <distortion model="ptlens" focal="40" a="-0.002705" b="0.008106" c="0" />
--            <distortion model="ptlens" focal="53" a="0" b="0.003542" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.003858" c="0" />
-+            <distortion model="ptlens" focal="17" a="0.019088" b="-0.048894" c="0"/>
-+            <distortion model="ptlens" focal="19" a="0.010938" b="-0.030356" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.01063" b="-0.026746" c="0"/>
-+            <distortion model="ptlens" focal="25" a="0.001877" b="-0.005367" c="0"/>
-+            <distortion model="ptlens" focal="30" a="-0.001844" b="0.003931" c="0"/>
-+            <distortion model="ptlens" focal="40" a="-0.002705" b="0.008106" c="0"/>
-+            <distortion model="ptlens" focal="53" a="0" b="0.003542" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.003858" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 18-50mm f/2.8 EX DC</model>
-@@ -283,16 +557,16 @@
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.012979" b="-0.036394" c="0" />
--            <distortion model="ptlens" focal="23" a="0.007147" b="-0.017687" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="34" a="0" b="0.001032" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.002512" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.012979" b="-0.036394" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.007147" b="-0.017687" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0" b="0.001032" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.002512" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 18-50mm f/2.8 EX DC</model>
-@@ -300,18 +574,18 @@
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.011366" b="-0.034328" c="0" />
--            <distortion model="ptlens" focal="21" a="0.006142" b="-0.017401" c="0" />
--            <distortion model="ptlens" focal="24" a="0.0048" b="-0.013589" c="0" />
--            <distortion model="ptlens" focal="28" a="0" b="0" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0.002094" c="0" />
--            <distortion model="ptlens" focal="43" a="0" b="0.002878" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.003021" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.011366" b="-0.034328" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.006142" b="-0.017401" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.0048" b="-0.013589" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.002094" c="0"/>
-+            <distortion model="ptlens" focal="43" a="0" b="0.002878" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.003021" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 18-50mm f/3.5-5.6 DC</model>
-@@ -320,260 +594,234 @@
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.018244" b="-0.048901" c="0" />
--            <distortion model="ptlens" focal="20" a="0.013163" b="-0.038177" c="0" />
--            <distortion model="ptlens" focal="22" a="0.008797" b="-0.028701" c="0" />
--            <distortion model="ptlens" focal="26" a="0.004579" b="-0.017014" c="0" />
--            <distortion model="ptlens" focal="30" a="0.002405" b="-0.011562" c="0" />
--            <distortion model="ptlens" focal="34" a="0.002363" b="-0.00852" c="0" />
--            <distortion model="ptlens" focal="39" a="0" b="-0.002352" c="0" />
--            <distortion model="ptlens" focal="44" a="0" b="-0.002108" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="-0.00147" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.018244" b="-0.048901" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.013163" b="-0.038177" c="0"/>
-+            <distortion model="ptlens" focal="22" a="0.008797" b="-0.028701" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0.004579" b="-0.017014" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.002405" b="-0.011562" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0.002363" b="-0.00852" c="0"/>
-+            <distortion model="ptlens" focal="39" a="0" b="-0.002352" c="0"/>
-+            <distortion model="ptlens" focal="44" a="0" b="-0.002108" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="-0.00147" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 18-125mm f/3.5-5.6 (3.3-5.6) DC</model>
-+        <model>Sigma 18-125mm f/3.5-5.6 DC</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.028249" b="-0.061326" c="0" />
--            <distortion model="ptlens" focal="26" a="0.008998" b="-0.008014" c="0" />
--            <distortion model="ptlens" focal="38" a="0.004437" b="0.005654" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.011257" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.011071" c="0" />
--            <distortion model="ptlens" focal="125" a="0" b="0.010822" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.028249" b="-0.061326" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0.008998" b="-0.008014" c="0"/>
-+            <distortion model="ptlens" focal="38" a="0.004437" b="0.005654" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.011257" c="0"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.011071" c="0"/>
-+            <distortion model="ptlens" focal="125" a="0" b="0.010822" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 18-125mm f/3.5-5.6 (3.3-5.6) DC</model>
-+        <model>Sigma 18-125mm f/3.5-5.6 DC</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.02211" b="-0.050462" c="0" />
--            <distortion model="ptlens" focal="23" a="0.016565" b="-0.027307" c="0" />
--            <distortion model="ptlens" focal="30" a="0.011429" b="-0.013359" c="0" />
--            <distortion model="ptlens" focal="38" a="0" b="0.012386" c="0" />
--            <distortion model="ptlens" focal="51" a="0" b="0.013262" c="0" />
--            <distortion model="ptlens" focal="67" a="0" b="0.011758" c="0" />
--            <distortion model="ptlens" focal="87" a="0" b="0.011008" c="0" />
--            <distortion model="ptlens" focal="109" a="0" b="0.01145" c="0" />
--            <distortion model="ptlens" focal="125" a="0" b="0.009078" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.02211" b="-0.050462" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.016565" b="-0.027307" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.011429" b="-0.013359" c="0"/>
-+            <distortion model="ptlens" focal="38" a="0" b="0.012386" c="0"/>
-+            <distortion model="ptlens" focal="51" a="0" b="0.013262" c="0"/>
-+            <distortion model="ptlens" focal="67" a="0" b="0.011758" c="0"/>
-+            <distortion model="ptlens" focal="87" a="0" b="0.011008" c="0"/>
-+            <distortion model="ptlens" focal="109" a="0" b="0.01145" c="0"/>
-+            <distortion model="ptlens" focal="125" a="0" b="0.009078" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 18-200mm f/3.5-6.3 DC</model>
-         <mount>Sigma SA</mount>
--        <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
--        <mount>Pentax KAF</mount>
--        <cropfactor>1.5</cropfactor>
--        <calibration>
--            <distortion model="ptlens" focal="18" a="0.027521" b="-0.063244" c="0" />
--            <distortion model="ptlens" focal="22" a="0.016154" b="-0.029806" c="0" />
--            <distortion model="ptlens" focal="26" a="0.014824" b="-0.025689" c="0" />
--            <distortion model="ptlens" focal="34" a="0.011421" b="-0.011743" c="0" />
--            <distortion model="ptlens" focal="46" a="0" b="0.014338" c="0" />
--            <distortion model="ptlens" focal="78" a="0" b="0.009621" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.012591" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.011133" c="0" />
--        </calibration>
--    </lens>
--
--    <lens>
--	    <maker>Sigma</maker>
--	    <model>Sigma 18-200mm f/3.5-6.3 DC</model>
--	    <focal min="18" max="200" />
--	    <aperture min="3.5" max="40" />
--	    <mount>Nikon F AF</mount>
-         <mount>Canon EF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>Sony Alpha</mount>
--	    <cropfactor>1.5</cropfactor>
--	    <calibration>
--	        <distortion focal="18" model="ptlens" a="0.0228732" b="-0.0665251" c="0.0172122" />
--	        <distortion focal="26" model="ptlens" a="0.018288" b="-0.0421043" c="0.0335132" />
--	        <distortion focal="34" model="ptlens" a="0.00457497" b="-0.000870647" c="-0.00027649" />
--	        <distortion focal="53" model="ptlens" a="0.00342257" b="0.00447765" c="0.00439016" />
--	        <distortion focal="93" model="ptlens" a="0.00259922" b="0.00679448" c="0.00154937" />
--	        <distortion focal="133" model="ptlens" a="0.00133032" b="0.00707209" c="0.000924872" />
--	        <distortion focal="200" model="ptlens" a="0.00197842" b="0.00390761" c="0.00418497" />
--	        <tca model="poly3" focal="18" br="-0.0002192" vr="1.0007559" bb="-0.0000088" vb="1.0000705" />
--            <tca model="poly3" focal="26" br="-0.0000847" vr="1.0004325" bb="-0.0000104" vb="1.0001260" />
--            <tca model="poly3" focal="34" br="-0.0000453" vr="1.0002166" bb="-0.0000439" vb="1.0001923" />
--            <tca model="poly3" focal="53" br="0.0000053" vr="0.9999933" bb="-0.0000536" vb="1.0001744" />
--            <tca model="poly3" focal="75" br="0.0000586" vr="0.9996912" bb="-0.0000887" vb="1.0000717" />
--            <tca model="poly3" focal="133" br="0.0000512" vr="0.9993431" bb="-0.0000351" vb="0.9996725" />
--            <tca model="poly3" focal="200" br="0.0000367" vr="0.9991985" bb="-0.0000586" vb="0.9994523" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="0.45" k1="0.0561" k2="-1.7452" k3="1.0091" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1" k1="-0.0289" k2="-1.5905" k3="0.9372" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="4" k1="0.0715" k2="-1.7309" k3="1.0149" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="0.0139" k2="-1.5954" k3="0.9392" />
--            <vignetting model="pa" focal="18" aperture="4" distance="0.45" k1="0.0638" k2="-1.3743" k3="0.6728" />
--            <vignetting model="pa" focal="18" aperture="4" distance="1" k1="0.0830" k2="-1.3802" k3="0.6739" />
--            <vignetting model="pa" focal="18" aperture="4" distance="4" k1="0.0689" k2="-1.2806" k3="0.6209" />
--            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="0.0358" k2="-1.2033" k3="0.5857" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="0.45" k1="-0.2548" k2="0.0222" k3="-0.2917" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2558" k2="-0.0178" k3="-0.2407" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="4" k1="-0.2443" k2="-0.0219" k3="-0.2048" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3025" k2="0.1080" k3="-0.2641" />
--            <vignetting model="pa" focal="18" aperture="8" distance="0.45" k1="-0.4403" k2="0.3847" k3="-0.3988" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.3258" k2="0.1392" k3="-0.2400" />
--            <vignetting model="pa" focal="18" aperture="8" distance="4" k1="-0.2540" k2="-0.0500" k3="-0.0623" />
--            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3135" k2="0.0499" k3="-0.1005" />
--            <vignetting model="pa" focal="18" aperture="22" distance="0.45" k1="-0.3463" k2="0.0187" k3="-0.0572" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2446" k2="-0.1733" k3="0.0484" />
--            <vignetting model="pa" focal="18" aperture="22" distance="4" k1="-0.2416" k2="-0.1530" k3="0.0550" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2901" k2="-0.0814" k3="0.0170" />
--            <vignetting model="pa" focal="26" aperture="4" distance="0.45" k1="-0.0498" k2="-0.8013" k3="0.3860" />
--            <vignetting model="pa" focal="26" aperture="4" distance="1" k1="-0.0792" k2="-0.7385" k3="0.3605" />
--            <vignetting model="pa" focal="26" aperture="4" distance="4" k1="-0.0106" k2="-0.8766" k3="0.4325" />
--            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.0406" k2="-0.7830" k3="0.3862" />
--            <vignetting model="pa" focal="26" aperture="5.6" distance="0.45" k1="-0.2453" k2="-0.0120" k3="-0.0498" />
--            <vignetting model="pa" focal="26" aperture="5.6" distance="1" k1="-0.2147" k2="-0.0769" k3="0.0047" />
--            <vignetting model="pa" focal="26" aperture="5.6" distance="4" k1="-0.2064" k2="-0.0631" k3="-0.0176" />
--            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.2121" k2="-0.0436" k3="-0.0109" />
--            <vignetting model="pa" focal="26" aperture="8" distance="0.45" k1="-0.2529" k2="-0.0676" k3="0.0486" />
--            <vignetting model="pa" focal="26" aperture="8" distance="1" k1="-0.1997" k2="-0.1499" k3="0.0966" />
--            <vignetting model="pa" focal="26" aperture="8" distance="4" k1="-0.1940" k2="-0.1444" k3="0.0846" />
--            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.2108" k2="-0.0983" k3="0.0690" />
--            <vignetting model="pa" focal="26" aperture="11" distance="0.45" k1="-0.2910" k2="0.0107" k3="0.0014" />
--            <vignetting model="pa" focal="26" aperture="11" distance="1" k1="-0.2091" k2="-0.1210" k3="0.0778" />
--            <vignetting model="pa" focal="26" aperture="11" distance="4" k1="-0.2125" k2="-0.1136" k3="0.0704" />
--            <vignetting model="pa" focal="26" aperture="29" distance="0.45" k1="-0.2680" k2="-0.0298" k3="0.0224" />
--            <vignetting model="pa" focal="26" aperture="29" distance="1" k1="-0.2006" k2="-0.1373" k3="0.0859" />
--            <vignetting model="pa" focal="26" aperture="29" distance="4" k1="-0.2043" k2="-0.1184" k3="0.0709" />
--            <vignetting model="pa" focal="26" aperture="29" distance="1000" k1="-0.2036" k2="-0.1019" k3="0.0675" />
--            <vignetting model="pa" focal="34" aperture="4.5" distance="0.45" k1="-0.1521" k2="-0.1067" k3="0.0261" />
--            <vignetting model="pa" focal="34" aperture="4.5" distance="1" k1="-0.0856" k2="-0.1734" k3="0.0577" />
--            <vignetting model="pa" focal="34" aperture="4.5" distance="4" k1="-0.1080" k2="-0.1250" k3="0.0219" />
--            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.1317" k2="-0.0758" k3="-0.0125" />
--            <vignetting model="pa" focal="34" aperture="5.6" distance="0.45" k1="-0.1255" k2="-0.1221" k3="0.0843" />
--            <vignetting model="pa" focal="34" aperture="5.6" distance="1" k1="-0.0767" k2="-0.1656" k3="0.1097" />
--            <vignetting model="pa" focal="34" aperture="5.6" distance="4" k1="-0.0794" k2="-0.1560" k3="0.0993" />
--            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.0933" k2="-0.1307" k3="0.0866" />
--            <vignetting model="pa" focal="34" aperture="8" distance="0.45" k1="-0.1304" k2="-0.1192" k3="0.0905" />
--            <vignetting model="pa" focal="34" aperture="8" distance="1" k1="-0.0914" k2="-0.1484" k3="0.1039" />
--            <vignetting model="pa" focal="34" aperture="8" distance="4" k1="-0.0908" k2="-0.1404" k3="0.1016" />
--            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1366" k2="-0.0578" k3="0.0561" />
--            <vignetting model="pa" focal="34" aperture="11" distance="0.45" k1="-0.1539" k2="-0.0612" k3="0.0496" />
--            <vignetting model="pa" focal="34" aperture="11" distance="1" k1="-0.0945" k2="-0.1265" k3="0.0801" />
--            <vignetting model="pa" focal="34" aperture="11" distance="4" k1="-0.0925" k2="-0.1242" k3="0.0850" />
--            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1393" k2="-0.0444" k3="0.0411" />
--            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.2219" k2="-0.0700" k3="0.0495" />
--            <vignetting model="pa" focal="34" aperture="29" distance="0.45" k1="-0.1594" k2="-0.0507" k3="0.0416" />
--            <vignetting model="pa" focal="34" aperture="29" distance="1" k1="-0.1102" k2="-0.0951" k3="0.0620" />
--            <vignetting model="pa" focal="34" aperture="29" distance="4" k1="-0.0773" k2="-0.1457" k3="0.0952" />
--            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1253" k2="-0.0646" k3="0.0530" />
--            <vignetting model="pa" focal="53" aperture="4.5" distance="0.45" k1="-0.1613" k2="0.1467" k3="-0.1679" />
--            <vignetting model="pa" focal="53" aperture="4.5" distance="1" k1="-0.1950" k2="0.3214" k3="-0.3494" />
--            <vignetting model="pa" focal="53" aperture="4.5" distance="4" k1="-0.2448" k2="0.4748" k3="-0.4793" />
--            <vignetting model="pa" focal="53" aperture="4.5" distance="1000" k1="-0.2396" k2="0.4808" k3="-0.4952" />
--            <vignetting model="pa" focal="53" aperture="5.6" distance="0.45" k1="-0.1155" k2="0.0449" k3="-0.0848" />
--            <vignetting model="pa" focal="53" aperture="5.6" distance="1" k1="-0.1759" k2="0.2645" k3="-0.2855" />
--            <vignetting model="pa" focal="53" aperture="5.6" distance="4" k1="-0.1905" k2="0.3421" k3="-0.3569" />
--            <vignetting model="pa" focal="53" aperture="5.6" distance="1000" k1="-0.2099" k2="0.4113" k3="-0.4280" />
--            <vignetting model="pa" focal="53" aperture="8" distance="0.45" k1="-0.0637" k2="-0.1283" k3="0.0959" />
--            <vignetting model="pa" focal="53" aperture="8" distance="1" k1="-0.0361" k2="-0.1636" k3="0.1054" />
--            <vignetting model="pa" focal="53" aperture="8" distance="4" k1="-0.1037" k2="-0.0084" k3="0.0112" />
--            <vignetting model="pa" focal="53" aperture="8" distance="1000" k1="-0.0727" k2="-0.0649" k3="0.0334" />
--            <vignetting model="pa" focal="53" aperture="11" distance="0.45" k1="-0.1006" k2="-0.0635" k3="0.0547" />
--            <vignetting model="pa" focal="53" aperture="11" distance="1" k1="-0.0886" k2="-0.0670" k3="0.0537" />
--            <vignetting model="pa" focal="53" aperture="11" distance="4" k1="-0.1109" k2="-0.0054" k3="0.0251" />
--            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.0814" k2="-0.0586" k3="0.0369" />
--            <vignetting model="pa" focal="53" aperture="32" distance="0.45" k1="-0.0917" k2="-0.0796" k3="0.0647" />
--            <vignetting model="pa" focal="53" aperture="32" distance="1" k1="-0.1384" k2="0.0327" k3="-0.0111" />
--            <vignetting model="pa" focal="53" aperture="32" distance="4" k1="-0.0953" k2="-0.0356" k3="0.0352" />
--            <vignetting model="pa" focal="53" aperture="32" distance="1000" k1="-0.0811" k2="-0.0663" k3="0.0465" />
--            <vignetting model="pa" focal="75" aperture="5.6" distance="0.45" k1="-0.3058" k2="0.9778" k3="-1.0037" />
--            <vignetting model="pa" focal="75" aperture="5.6" distance="1" k1="-0.2130" k2="0.6270" k3="-0.7830" />
--            <vignetting model="pa" focal="75" aperture="5.6" distance="4" k1="-0.1325" k2="0.4262" k3="-0.6604" />
--            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.1053" k2="0.2541" k3="-0.5259" />
--            <vignetting model="pa" focal="75" aperture="8" distance="0.45" k1="-0.2084" k2="0.6863" k3="-0.6819" />
--            <vignetting model="pa" focal="75" aperture="8" distance="1" k1="-0.2381" k2="0.6803" k3="-0.6722" />
--            <vignetting model="pa" focal="75" aperture="8" distance="4" k1="-0.1854" k2="0.6112" k3="-0.6342" />
--            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1816" k2="0.5441" k3="-0.5800" />
--            <vignetting model="pa" focal="75" aperture="11" distance="0.45" k1="-0.0931" k2="0.1812" k3="-0.1995" />
--            <vignetting model="pa" focal="75" aperture="11" distance="1" k1="-0.1372" k2="0.2263" k3="-0.2030" />
--            <vignetting model="pa" focal="75" aperture="11" distance="4" k1="-0.0932" k2="0.1592" k3="-0.1629" />
--            <vignetting model="pa" focal="75" aperture="11" distance="1000" k1="-0.1029" k2="0.1502" k3="-0.1544" />
--            <vignetting model="pa" focal="75" aperture="16" distance="0.45" k1="-0.0184" k2="-0.0771" k3="0.0287" />
--            <vignetting model="pa" focal="75" aperture="16" distance="1" k1="-0.0864" k2="0.0063" k3="0.0161" />
--            <vignetting model="pa" focal="75" aperture="16" distance="4" k1="-0.0288" k2="-0.0848" k3="0.0566" />
--            <vignetting model="pa" focal="75" aperture="16" distance="1000" k1="-0.0529" k2="-0.0619" k3="0.0445" />
--            <vignetting model="pa" focal="75" aperture="32" distance="0.45" k1="0.0032" k2="-0.1516" k3="0.0901" />
--            <vignetting model="pa" focal="75" aperture="32" distance="1" k1="-0.0706" k2="-0.0341" k3="0.0431" />
--            <vignetting model="pa" focal="75" aperture="32" distance="4" k1="-0.0321" k2="-0.0891" k3="0.0636" />
--            <vignetting model="pa" focal="75" aperture="32" distance="1000" k1="-0.0623" k2="-0.0494" k3="0.0401" />
--            <vignetting model="pa" focal="133" aperture="5.6" distance="0.45" k1="-0.3444" k2="1.2741" k3="-1.4204" />
--            <vignetting model="pa" focal="133" aperture="5.6" distance="1" k1="0.0389" k2="-0.1257" k3="-0.3641" />
--            <vignetting model="pa" focal="133" aperture="5.6" distance="4" k1="0.2459" k2="-0.9960" k3="0.3105" />
--            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="0.2527" k2="-1.3451" k3="0.6534" />
--            <vignetting model="pa" focal="133" aperture="8" distance="0.45" k1="-0.3808" k2="1.4551" k3="-1.4593" />
--            <vignetting model="pa" focal="133" aperture="8" distance="1" k1="-0.2045" k2="0.7616" k3="-0.8815" />
--            <vignetting model="pa" focal="133" aperture="8" distance="4" k1="0.0064" k2="0.0581" k3="-0.3979" />
--            <vignetting model="pa" focal="133" aperture="8" distance="1000" k1="0.0437" k2="-0.1861" k3="-0.1812" />
--            <vignetting model="pa" focal="133" aperture="11" distance="0.45" k1="-0.4039" k2="1.4018" k3="-1.3022" />
--            <vignetting model="pa" focal="133" aperture="11" distance="1" k1="-0.2672" k2="0.8241" k3="-0.7684" />
--            <vignetting model="pa" focal="133" aperture="11" distance="4" k1="-0.1997" k2="0.5964" k3="-0.5871" />
--            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.1886" k2="0.4848" k3="-0.4867" />
--            <vignetting model="pa" focal="133" aperture="16" distance="0.45" k1="-0.2997" k2="1.0220" k3="-0.9494" />
--            <vignetting model="pa" focal="133" aperture="16" distance="1" k1="-0.1542" k2="0.3239" k3="-0.2737" />
--            <vignetting model="pa" focal="133" aperture="16" distance="4" k1="-0.1178" k2="0.1968" k3="-0.1668" />
--            <vignetting model="pa" focal="133" aperture="16" distance="1000" k1="-0.0878" k2="0.0416" k3="-0.0316" />
--            <vignetting model="pa" focal="133" aperture="40" distance="0.45" k1="-0.2190" k2="0.6797" k3="-0.6345" />
--            <vignetting model="pa" focal="133" aperture="40" distance="1" k1="-0.0797" k2="0.0199" k3="0.0041" />
--            <vignetting model="pa" focal="133" aperture="40" distance="4" k1="-0.0644" k2="-0.0116" k3="0.0198" />
--            <vignetting model="pa" focal="133" aperture="40" distance="1000" k1="-0.0949" k2="0.0287" k3="-0.0072" />
--            <vignetting model="pa" focal="170" aperture="6.3" distance="0.45" k1="-0.3387" k2="1.2022" k3="-1.3019" />
--            <vignetting model="pa" focal="170" aperture="6.3" distance="1" k1="0.0272" k2="-0.1576" k3="-0.3054" />
--            <vignetting model="pa" focal="170" aperture="6.3" distance="4" k1="0.2076" k2="-1.0558" k3="0.4218" />
--            <vignetting model="pa" focal="170" aperture="6.3" distance="1000" k1="0.0154" k2="-1.1798" k3="0.7404" />
--            <vignetting model="pa" focal="200" aperture="6.7" distance="0.45" k1="-0.3149" k2="1.1537" k3="-1.2549" />
--            <vignetting model="pa" focal="200" aperture="6.7" distance="1" k1="0.0545" k2="-0.2118" k3="-0.2621" />
--            <vignetting model="pa" focal="200" aperture="6.7" distance="4" k1="0.2390" k2="-1.1473" k3="0.4895" />
--            <vignetting model="pa" focal="200" aperture="6.7" distance="1000" k1="-0.0572" k2="-1.0925" k3="0.7256" />
--            <vignetting model="pa" focal="200" aperture="8" distance="0.45" k1="-0.3109" k2="1.1656" k3="-1.1653" />
--            <vignetting model="pa" focal="200" aperture="8" distance="1" k1="-0.0715" k2="0.3291" k3="-0.5879" />
--            <vignetting model="pa" focal="200" aperture="8" distance="4" k1="0.1187" k2="-0.4118" k3="-0.0379" />
--            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1998" k2="-1.1568" k3="0.6299" />
--            <vignetting model="pa" focal="200" aperture="11" distance="0.45" k1="-0.2823" k2="0.9536" k3="-0.8912" />
--            <vignetting model="pa" focal="200" aperture="11" distance="1" k1="-0.2255" k2="0.6911" k3="-0.6578" />
--            <vignetting model="pa" focal="200" aperture="11" distance="4" k1="-0.1710" k2="0.4856" k3="-0.5108" />
--            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0806" k2="0.1720" k3="-0.2760" />
--            <vignetting model="pa" focal="200" aperture="16" distance="0.45" k1="-0.1484" k2="0.4327" k3="-0.4165" />
--            <vignetting model="pa" focal="200" aperture="16" distance="1" k1="-0.1046" k2="0.1561" k3="-0.1258" />
--            <vignetting model="pa" focal="200" aperture="16" distance="4" k1="-0.0793" k2="0.0578" k3="-0.0515" />
--            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0668" k2="-0.0059" k3="0.0022" />
--            <vignetting model="pa" focal="200" aperture="40" distance="0.45" k1="0.0102" k2="-0.0920" k3="0.0335" />
--            <vignetting model="pa" focal="200" aperture="40" distance="1" k1="-0.0499" k2="-0.0351" k3="0.0417" />
--            <vignetting model="pa" focal="200" aperture="40" distance="4" k1="-0.0623" k2="-0.0135" k3="0.0199" />
--            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0744" k2="-0.0079" k3="0.0190" />
--	        <field_of_view focal="18" fov="67.3129" />
--	        <field_of_view focal="26" fov="49.4948" />
--	        <field_of_view focal="34" fov="38.8343" />
--	        <field_of_view focal="53" fov="25.6397" />
--	        <field_of_view focal="93" fov="14.7385" />
--	        <field_of_view focal="133" fov="10.3239" />
--	        <field_of_view focal="200" fov="6.85855" />
--	    </calibration>
-+        <focal min="18" max="200"/>
-+        <aperture min="3.5" max="40"/>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion focal="18" model="ptlens" a="0.0228732" b="-0.0665251" c="0.0172122"/>
-+            <distortion focal="26" model="ptlens" a="0.018288" b="-0.0421043" c="0.0335132"/>
-+            <distortion focal="34" model="ptlens" a="0.00457497" b="-0.000870647" c="-0.00027649"/>
-+            <distortion focal="53" model="ptlens" a="0.00342257" b="0.00447765" c="0.00439016"/>
-+            <distortion focal="93" model="ptlens" a="0.00259922" b="0.00679448" c="0.00154937"/>
-+            <distortion focal="133" model="ptlens" a="0.00133032" b="0.00707209" c="0.000924872"/>
-+            <distortion focal="200" model="ptlens" a="0.00197842" b="0.00390761" c="0.00418497"/>
-+            <tca model="poly3" focal="18" br="-0.0002192" vr="1.0007559" bb="-0.0000088" vb="1.0000705"/>
-+            <tca model="poly3" focal="26" br="-0.0000847" vr="1.0004325" bb="-0.0000104" vb="1.0001260"/>
-+            <tca model="poly3" focal="34" br="-0.0000453" vr="1.0002166" bb="-0.0000439" vb="1.0001923"/>
-+            <tca model="poly3" focal="53" br="0.0000053" vr="0.9999933" bb="-0.0000536" vb="1.0001744"/>
-+            <tca model="poly3" focal="75" br="0.0000586" vr="0.9996912" bb="-0.0000887" vb="1.0000717"/>
-+            <tca model="poly3" focal="133" br="0.0000512" vr="0.9993431" bb="-0.0000351" vb="0.9996725"/>
-+            <tca model="poly3" focal="200" br="0.0000367" vr="0.9991985" bb="-0.0000586" vb="0.9994523"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="0.45" k1="0.0561" k2="-1.7452" k3="1.0091"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1" k1="-0.0289" k2="-1.5905" k3="0.9372"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="4" k1="0.0715" k2="-1.7309" k3="1.0149"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="0.0139" k2="-1.5954" k3="0.9392"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="0.45" k1="0.0638" k2="-1.3743" k3="0.6728"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1" k1="0.0830" k2="-1.3802" k3="0.6739"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="4" k1="0.0689" k2="-1.2806" k3="0.6209"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="0.0358" k2="-1.2033" k3="0.5857"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="0.45" k1="-0.2548" k2="0.0222" k3="-0.2917"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1" k1="-0.2558" k2="-0.0178" k3="-0.2407"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="4" k1="-0.2443" k2="-0.0219" k3="-0.2048"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.3025" k2="0.1080" k3="-0.2641"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="0.45" k1="-0.4403" k2="0.3847" k3="-0.3988"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1" k1="-0.3258" k2="0.1392" k3="-0.2400"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="4" k1="-0.2540" k2="-0.0500" k3="-0.0623"/>
-+            <vignetting model="pa" focal="18" aperture="8" distance="1000" k1="-0.3135" k2="0.0499" k3="-0.1005"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="0.45" k1="-0.3463" k2="0.0187" k3="-0.0572"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1" k1="-0.2446" k2="-0.1733" k3="0.0484"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="4" k1="-0.2416" k2="-0.1530" k3="0.0550"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2901" k2="-0.0814" k3="0.0170"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="0.45" k1="-0.0498" k2="-0.8013" k3="0.3860"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="1" k1="-0.0792" k2="-0.7385" k3="0.3605"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="4" k1="-0.0106" k2="-0.8766" k3="0.4325"/>
-+            <vignetting model="pa" focal="26" aperture="4" distance="1000" k1="-0.0406" k2="-0.7830" k3="0.3862"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="0.45" k1="-0.2453" k2="-0.0120" k3="-0.0498"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="1" k1="-0.2147" k2="-0.0769" k3="0.0047"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="4" k1="-0.2064" k2="-0.0631" k3="-0.0176"/>
-+            <vignetting model="pa" focal="26" aperture="5.6" distance="1000" k1="-0.2121" k2="-0.0436" k3="-0.0109"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="0.45" k1="-0.2529" k2="-0.0676" k3="0.0486"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1" k1="-0.1997" k2="-0.1499" k3="0.0966"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="4" k1="-0.1940" k2="-0.1444" k3="0.0846"/>
-+            <vignetting model="pa" focal="26" aperture="8" distance="1000" k1="-0.2108" k2="-0.0983" k3="0.0690"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="0.45" k1="-0.2910" k2="0.0107" k3="0.0014"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="1" k1="-0.2091" k2="-0.1210" k3="0.0778"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="4" k1="-0.2125" k2="-0.1136" k3="0.0704"/>
-+            <vignetting model="pa" focal="26" aperture="29" distance="0.45" k1="-0.2680" k2="-0.0298" k3="0.0224"/>
-+            <vignetting model="pa" focal="26" aperture="29" distance="1" k1="-0.2006" k2="-0.1373" k3="0.0859"/>
-+            <vignetting model="pa" focal="26" aperture="29" distance="4" k1="-0.2043" k2="-0.1184" k3="0.0709"/>
-+            <vignetting model="pa" focal="26" aperture="29" distance="1000" k1="-0.2036" k2="-0.1019" k3="0.0675"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="0.45" k1="-0.1521" k2="-0.1067" k3="0.0261"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1" k1="-0.0856" k2="-0.1734" k3="0.0577"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="4" k1="-0.1080" k2="-0.1250" k3="0.0219"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.1317" k2="-0.0758" k3="-0.0125"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="0.45" k1="-0.1255" k2="-0.1221" k3="0.0843"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1" k1="-0.0767" k2="-0.1656" k3="0.1097"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="4" k1="-0.0794" k2="-0.1560" k3="0.0993"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.0933" k2="-0.1307" k3="0.0866"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="0.45" k1="-0.1304" k2="-0.1192" k3="0.0905"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1" k1="-0.0914" k2="-0.1484" k3="0.1039"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="4" k1="-0.0908" k2="-0.1404" k3="0.1016"/>
-+            <vignetting model="pa" focal="34" aperture="8" distance="1000" k1="-0.1366" k2="-0.0578" k3="0.0561"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="0.45" k1="-0.1539" k2="-0.0612" k3="0.0496"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1" k1="-0.0945" k2="-0.1265" k3="0.0801"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="4" k1="-0.0925" k2="-0.1242" k3="0.0850"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.1393" k2="-0.0444" k3="0.0411"/>
-+            <vignetting model="pa" focal="26" aperture="11" distance="1000" k1="-0.2219" k2="-0.0700" k3="0.0495"/>
-+            <vignetting model="pa" focal="34" aperture="29" distance="0.45" k1="-0.1594" k2="-0.0507" k3="0.0416"/>
-+            <vignetting model="pa" focal="34" aperture="29" distance="1" k1="-0.1102" k2="-0.0951" k3="0.0620"/>
-+            <vignetting model="pa" focal="34" aperture="29" distance="4" k1="-0.0773" k2="-0.1457" k3="0.0952"/>
-+            <vignetting model="pa" focal="34" aperture="29" distance="1000" k1="-0.1253" k2="-0.0646" k3="0.0530"/>
-+            <vignetting model="pa" focal="53" aperture="4.5" distance="0.45" k1="-0.1613" k2="0.1467" k3="-0.1679"/>
-+            <vignetting model="pa" focal="53" aperture="4.5" distance="1" k1="-0.1950" k2="0.3214" k3="-0.3494"/>
-+            <vignetting model="pa" focal="53" aperture="4.5" distance="4" k1="-0.2448" k2="0.4748" k3="-0.4793"/>
-+            <vignetting model="pa" focal="53" aperture="4.5" distance="1000" k1="-0.2396" k2="0.4808" k3="-0.4952"/>
-+            <vignetting model="pa" focal="53" aperture="5.6" distance="0.45" k1="-0.1155" k2="0.0449" k3="-0.0848"/>
-+            <vignetting model="pa" focal="53" aperture="5.6" distance="1" k1="-0.1759" k2="0.2645" k3="-0.2855"/>
-+            <vignetting model="pa" focal="53" aperture="5.6" distance="4" k1="-0.1905" k2="0.3421" k3="-0.3569"/>
-+            <vignetting model="pa" focal="53" aperture="5.6" distance="1000" k1="-0.2099" k2="0.4113" k3="-0.4280"/>
-+            <vignetting model="pa" focal="53" aperture="8" distance="0.45" k1="-0.0637" k2="-0.1283" k3="0.0959"/>
-+            <vignetting model="pa" focal="53" aperture="8" distance="1" k1="-0.0361" k2="-0.1636" k3="0.1054"/>
-+            <vignetting model="pa" focal="53" aperture="8" distance="4" k1="-0.1037" k2="-0.0084" k3="0.0112"/>
-+            <vignetting model="pa" focal="53" aperture="8" distance="1000" k1="-0.0727" k2="-0.0649" k3="0.0334"/>
-+            <vignetting model="pa" focal="53" aperture="11" distance="0.45" k1="-0.1006" k2="-0.0635" k3="0.0547"/>
-+            <vignetting model="pa" focal="53" aperture="11" distance="1" k1="-0.0886" k2="-0.0670" k3="0.0537"/>
-+            <vignetting model="pa" focal="53" aperture="11" distance="4" k1="-0.1109" k2="-0.0054" k3="0.0251"/>
-+            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.0814" k2="-0.0586" k3="0.0369"/>
-+            <vignetting model="pa" focal="53" aperture="32" distance="0.45" k1="-0.0917" k2="-0.0796" k3="0.0647"/>
-+            <vignetting model="pa" focal="53" aperture="32" distance="1" k1="-0.1384" k2="0.0327" k3="-0.0111"/>
-+            <vignetting model="pa" focal="53" aperture="32" distance="4" k1="-0.0953" k2="-0.0356" k3="0.0352"/>
-+            <vignetting model="pa" focal="53" aperture="32" distance="1000" k1="-0.0811" k2="-0.0663" k3="0.0465"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="0.45" k1="-0.3058" k2="0.9778" k3="-1.0037"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="1" k1="-0.2130" k2="0.6270" k3="-0.7830"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="4" k1="-0.1325" k2="0.4262" k3="-0.6604"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="1000" k1="-0.1053" k2="0.2541" k3="-0.5259"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="0.45" k1="-0.2084" k2="0.6863" k3="-0.6819"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="1" k1="-0.2381" k2="0.6803" k3="-0.6722"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="4" k1="-0.1854" k2="0.6112" k3="-0.6342"/>
-+            <vignetting model="pa" focal="75" aperture="8" distance="1000" k1="-0.1816" k2="0.5441" k3="-0.5800"/>
-+            <vignetting model="pa" focal="75" aperture="11" distance="0.45" k1="-0.0931" k2="0.1812" k3="-0.1995"/>
-+            <vignetting model="pa" focal="75" aperture="11" distance="1" k1="-0.1372" k2="0.2263" k3="-0.2030"/>
-+            <vignetting model="pa" focal="75" aperture="11" distance="4" k1="-0.0932" k2="0.1592" k3="-0.1629"/>
-+            <vignetting model="pa" focal="75" aperture="11" distance="1000" k1="-0.1029" k2="0.1502" k3="-0.1544"/>
-+            <vignetting model="pa" focal="75" aperture="16" distance="0.45" k1="-0.0184" k2="-0.0771" k3="0.0287"/>
-+            <vignetting model="pa" focal="75" aperture="16" distance="1" k1="-0.0864" k2="0.0063" k3="0.0161"/>
-+            <vignetting model="pa" focal="75" aperture="16" distance="4" k1="-0.0288" k2="-0.0848" k3="0.0566"/>
-+            <vignetting model="pa" focal="75" aperture="16" distance="1000" k1="-0.0529" k2="-0.0619" k3="0.0445"/>
-+            <vignetting model="pa" focal="75" aperture="32" distance="0.45" k1="0.0032" k2="-0.1516" k3="0.0901"/>
-+            <vignetting model="pa" focal="75" aperture="32" distance="1" k1="-0.0706" k2="-0.0341" k3="0.0431"/>
-+            <vignetting model="pa" focal="75" aperture="32" distance="4" k1="-0.0321" k2="-0.0891" k3="0.0636"/>
-+            <vignetting model="pa" focal="75" aperture="32" distance="1000" k1="-0.0623" k2="-0.0494" k3="0.0401"/>
-+            <vignetting model="pa" focal="133" aperture="5.6" distance="0.45" k1="-0.3444" k2="1.2741" k3="-1.4204"/>
-+            <vignetting model="pa" focal="133" aperture="5.6" distance="1" k1="0.0389" k2="-0.1257" k3="-0.3641"/>
-+            <vignetting model="pa" focal="133" aperture="5.6" distance="4" k1="0.2459" k2="-0.9960" k3="0.3105"/>
-+            <vignetting model="pa" focal="133" aperture="5.6" distance="1000" k1="0.2527" k2="-1.3451" k3="0.6534"/>
-+            <vignetting model="pa" focal="133" aperture="8" distance="0.45" k1="-0.3808" k2="1.4551" k3="-1.4593"/>
-+            <vignetting model="pa" focal="133" aperture="8" distance="1" k1="-0.2045" k2="0.7616" k3="-0.8815"/>
-+            <vignetting model="pa" focal="133" aperture="8" distance="4" k1="0.0064" k2="0.0581" k3="-0.3979"/>
-+            <vignetting model="pa" focal="133" aperture="8" distance="1000" k1="0.0437" k2="-0.1861" k3="-0.1812"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="0.45" k1="-0.4039" k2="1.4018" k3="-1.3022"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="1" k1="-0.2672" k2="0.8241" k3="-0.7684"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="4" k1="-0.1997" k2="0.5964" k3="-0.5871"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.1886" k2="0.4848" k3="-0.4867"/>
-+            <vignetting model="pa" focal="133" aperture="16" distance="0.45" k1="-0.2997" k2="1.0220" k3="-0.9494"/>
-+            <vignetting model="pa" focal="133" aperture="16" distance="1" k1="-0.1542" k2="0.3239" k3="-0.2737"/>
-+            <vignetting model="pa" focal="133" aperture="16" distance="4" k1="-0.1178" k2="0.1968" k3="-0.1668"/>
-+            <vignetting model="pa" focal="133" aperture="16" distance="1000" k1="-0.0878" k2="0.0416" k3="-0.0316"/>
-+            <vignetting model="pa" focal="133" aperture="40" distance="0.45" k1="-0.2190" k2="0.6797" k3="-0.6345"/>
-+            <vignetting model="pa" focal="133" aperture="40" distance="1" k1="-0.0797" k2="0.0199" k3="0.0041"/>
-+            <vignetting model="pa" focal="133" aperture="40" distance="4" k1="-0.0644" k2="-0.0116" k3="0.0198"/>
-+            <vignetting model="pa" focal="133" aperture="40" distance="1000" k1="-0.0949" k2="0.0287" k3="-0.0072"/>
-+            <vignetting model="pa" focal="170" aperture="6.3" distance="0.45" k1="-0.3387" k2="1.2022" k3="-1.3019"/>
-+            <vignetting model="pa" focal="170" aperture="6.3" distance="1" k1="0.0272" k2="-0.1576" k3="-0.3054"/>
-+            <vignetting model="pa" focal="170" aperture="6.3" distance="4" k1="0.2076" k2="-1.0558" k3="0.4218"/>
-+            <vignetting model="pa" focal="170" aperture="6.3" distance="1000" k1="0.0154" k2="-1.1798" k3="0.7404"/>
-+            <vignetting model="pa" focal="200" aperture="6.7" distance="0.45" k1="-0.3149" k2="1.1537" k3="-1.2549"/>
-+            <vignetting model="pa" focal="200" aperture="6.7" distance="1" k1="0.0545" k2="-0.2118" k3="-0.2621"/>
-+            <vignetting model="pa" focal="200" aperture="6.7" distance="4" k1="0.2390" k2="-1.1473" k3="0.4895"/>
-+            <vignetting model="pa" focal="200" aperture="6.7" distance="1000" k1="-0.0572" k2="-1.0925" k3="0.7256"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="0.45" k1="-0.3109" k2="1.1656" k3="-1.1653"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1" k1="-0.0715" k2="0.3291" k3="-0.5879"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="4" k1="0.1187" k2="-0.4118" k3="-0.0379"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1998" k2="-1.1568" k3="0.6299"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="0.45" k1="-0.2823" k2="0.9536" k3="-0.8912"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1" k1="-0.2255" k2="0.6911" k3="-0.6578"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="4" k1="-0.1710" k2="0.4856" k3="-0.5108"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.0806" k2="0.1720" k3="-0.2760"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="0.45" k1="-0.1484" k2="0.4327" k3="-0.4165"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1" k1="-0.1046" k2="0.1561" k3="-0.1258"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="4" k1="-0.0793" k2="0.0578" k3="-0.0515"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.0668" k2="-0.0059" k3="0.0022"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="0.45" k1="0.0102" k2="-0.0920" k3="0.0335"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="1" k1="-0.0499" k2="-0.0351" k3="0.0417"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="4" k1="-0.0623" k2="-0.0135" k3="0.0199"/>
-+            <vignetting model="pa" focal="200" aperture="40" distance="1000" k1="-0.0744" k2="-0.0079" k3="0.0190"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 18-200mm f/3.5-6.3 II DC OS HSM</model>
-@@ -581,41 +829,16 @@
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.00427" b="-0.0189" c="0.0199" />
--            <distortion model="ptlens" focal="29" a="-0.00878" b="0.04582" c="-0.04997" />
--            <distortion model="ptlens" focal="33" a="-0.015" b="0.0433" c="-0.02646" />
--            <distortion model="ptlens" focal="53" a="0.004" b="0.01572" c="-0.01989" />
--            <distortion model="ptlens" focal="73" a="-0.002" b="0.00731" c="0.00191" />
--            <distortion model="ptlens" focal="120" a="0.00862" b="-0.0111" c="0.01151" />
--            <distortion model="ptlens" focal="200" a="-0.00027" b="0.01069" c="-0.0044" />
--            <tca model="poly3" focal="18" br="-0.0005080" vr="1.0000355" bb="0.0007723" vb="1.0003445" />
--            <tca model="poly3" focal="29" br="-0.0001485" vr="1.0000892" bb="-0.0001011" vb="1.0000511" />
--            <tca model="poly3" focal="33" br="-0.0012735" vr="0.9996817" bb="-0.0015426" vb="0.9995056" />
--            <tca model="poly3" focal="53" br="-0.0007872" vr="0.9997973" bb="-0.0023220" vb="0.9992620" />
--            <tca model="poly3" focal="73" br="0.0005988" vr="1.0002021" bb="-0.0029494" vb="0.9990878" />
--            <tca model="poly3" focal="140" br="0.0016138" vr="1.0003730" bb="-0.0011673" vb="0.9997042" />
--            <tca model="poly3" focal="200" br="0.0013865" vr="1.0003137" bb="-0.0000482" vb="0.9999454" />
--        </calibration>
--    </lens>
--
--    <!-- new profile above is said to be more accurate. below one may be removed in future. -->
--    <!--lens>
--        <maker>Sigma</maker>
--        <model>Sigma 18-200mm f/3.5-6.3 II DC OS HSM</model>
--        <mount>Sigma SA</mount>
--        <mount>Canon EF</mount>
--        <mount>Nikon F AF</mount>
--        <cropfactor>1.6</cropfactor>
--        <calibration>
--            <distortion model="ptlens" focal="18" a="0.02199" b="-0.06697" c="0.0302"/>
--            <distortion model="ptlens" focal="29" a="0.02095" b="-0.05013" c="0.03415"/>
--            <distortion model="ptlens" focal="33" a="0.00943" b="-0.01445" c="0.01804"/>
--            <distortion model="ptlens" focal="45" a="0.01436" b="-0.02979" c="0.03583"/>
--            <distortion model="ptlens" focal="73" a="0.00248" b="0.00171" c="0.00877"/>
--            <distortion model="ptlens" focal="120" a="0.00678" b="-0.0146" c="0.0234"/>
--            <distortion model="ptlens" focal="200" a="-0.00193" b="0.01252" c="-0.00228"/>
-+            <distortion model="ptlens" focal="18" a="0.00427" b="-0.0189" c="0.0199"/>
-+            <distortion model="ptlens" focal="29" a="-0.00878" b="0.04582" c="-0.04997"/>
-+            <distortion model="ptlens" focal="33" a="-0.015" b="0.0433" c="-0.02646"/>
-+            <distortion model="ptlens" focal="53" a="0.004" b="0.01572" c="-0.01989"/>
-+            <distortion model="ptlens" focal="73" a="-0.002" b="0.00731" c="0.00191"/>
-+            <distortion model="ptlens" focal="120" a="0.00862" b="-0.0111" c="0.01151"/>
-+            <distortion model="ptlens" focal="200" a="-0.00027" b="0.01069" c="-0.0044"/>
-             <tca model="poly3" focal="18" br="0.0001235" vr="1.0001382" bb="-0.0000306" vb="1.0001851"/>
-             <tca model="poly3" focal="29" br="-0.0000458" vr="1.0002713" bb="-0.0000635" vb="1.0003369"/>
-             <tca model="poly3" focal="33" br="-0.0000240" vr="1.0001460" bb="-0.0000599" vb="1.0002709"/>
-@@ -625,154 +848,153 @@
-             <tca model="poly3" focal="120" br="-0.0001589" vr="0.9997609" bb="0.0001706" vb="1.0003043"/>
-             <tca model="poly3" focal="200" br="-0.0002666" vr="0.9997012" bb="0.0002502" vb="1.0001707"/>
-         </calibration>
--    </lens-->
--
-+    </lens>
-     <lens>
--	    <maker>Sigma</maker>
--	    <model>Sigma 24-60mm F2.8 EX DG</model>
--	    <focal min="24" max="60" />
--	    <aperture min="2.8" max="22"/>
--	    <mount>Nikon F AF</mount>
-+        <maker>Sigma</maker>
-+        <model>Sigma 24-60mm f/2.8 EX DG</model>
-+        <mount>Nikon F AF</mount>
-         <mount>Canon EF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>Sony Alpha</mount>
--	    <cropfactor>1.5</cropfactor>
--	    <calibration>
--	        <distortion focal="24" model="ptlens" a="0.00598105" b="-0.0230051" c="0.00638311" />
--	        <distortion focal="28" model="ptlens" a="0.00558326" b="-0.0188843" c="0.00805504" />
--	        <distortion focal="35" model="ptlens" a="0.00105679" b="-0.00290772" c="-0.000127626" />
--	        <distortion focal="40" model="ptlens" a="0.00194388" b="-0.00479192" c="0.00409093" />
--	        <distortion focal="50" model="ptlens" a="-0.00101476" b="0.00591386" c="-0.00390913" />
--	        <distortion focal="60" model="ptlens" a="-0.00252993" b="0.0114386" c="-0.00867133" />
--            <tca model="poly3" focal="24" br="0.0000518" vr="1.0003617" bb="0.0000124" vb="0.9999809" />
--            <tca model="poly3" focal="28" br="-0.0000000" vr="1.0003475" bb="-0.0000079" vb="1.0000145" />
--            <tca model="poly3" focal="35" br="-0.0000090" vr="1.0002416" bb="-0.0000040" vb="1.0000203" />
--            <tca model="poly3" focal="40" br="0.0000073" vr="1.0001672" bb="0.0000042" vb="1.0000001" />
--            <tca model="poly3" focal="50" br="0.0000065" vr="1.0000559" bb="-0.0000058" vb="0.9999767" />
--            <tca model="poly3" focal="60" br="-0.0000066" vr="0.9999967" bb="-0.0000024" vb="0.9999388" />
--            <vignetting model="pa" focal="24" aperture="2.8" distance="0.4" k1="-0.1361" k2="-0.6538" k3="0.3496" />
--            <vignetting model="pa" focal="24" aperture="2.8" distance="0.71" k1="-0.1631" k2="-0.6204" k3="0.3510" />
--            <vignetting model="pa" focal="24" aperture="2.8" distance="2.37" k1="-0.2077" k2="-0.5294" k3="0.3000" />
--            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.1500" k2="-0.6219" k3="0.3524" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.2524" k2="-0.0660" k3="0.0738" />
--            <vignetting model="pa" focal="24" aperture="4" distance="0.71" k1="-0.2644" k2="-0.0574" k3="0.0781" />
--            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.2995" k2="0.0159" k3="0.0343" />
--            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2568" k2="-0.0201" k3="0.0444" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.2465" k2="-0.0720" k3="0.0698" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="0.71" k1="-0.2578" k2="-0.0640" k3="0.0736" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.3116" k2="0.0406" k3="0.0168" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2549" k2="-0.0155" k3="0.0331" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2491" k2="-0.0620" k3="0.0592" />
--            <vignetting model="pa" focal="24" aperture="8" distance="0.71" k1="-0.2612" k2="-0.0530" k3="0.0629" />
--            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.3051" k2="0.0309" k3="0.0196" />
--            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2582" k2="-0.0005" k3="0.0184" />
--            <vignetting model="pa" focal="24" aperture="22" distance="0.4" k1="-0.2571" k2="-0.0464" k3="0.0503" />
--            <vignetting model="pa" focal="24" aperture="22" distance="0.71" k1="-0.2750" k2="-0.0211" k3="0.0424" />
--            <vignetting model="pa" focal="24" aperture="22" distance="2.37" k1="-0.3113" k2="0.0422" k3="0.0137" />
--            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2691" k2="0.0232" k3="0.0032" />
--            <vignetting model="pa" focal="28" aperture="2.8" distance="0.4" k1="-0.2227" k2="-0.4306" k3="0.2609" />
--            <vignetting model="pa" focal="28" aperture="2.8" distance="0.71" k1="-0.2137" k2="-0.4799" k3="0.3189" />
--            <vignetting model="pa" focal="28" aperture="2.8" distance="2.37" k1="-0.1944" k2="-0.4724" k3="0.2980" />
--            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.1887" k2="-0.4920" k3="0.3118" />
--            <vignetting model="pa" focal="28" aperture="4" distance="0.4" k1="-0.2339" k2="-0.0596" k3="0.0757" />
--            <vignetting model="pa" focal="28" aperture="4" distance="0.71" k1="-0.2211" k2="-0.0911" k3="0.1047" />
--            <vignetting model="pa" focal="28" aperture="4" distance="2.37" k1="-0.2015" k2="-0.0586" k3="0.0635" />
--            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2144" k2="-0.0501" k3="0.0653" />
--            <vignetting model="pa" focal="28" aperture="5.6" distance="0.4" k1="-0.2233" k2="-0.0717" k3="0.0749" />
--            <vignetting model="pa" focal="28" aperture="5.6" distance="0.71" k1="-0.2085" k2="-0.1077" k3="0.1053" />
--            <vignetting model="pa" focal="28" aperture="5.6" distance="2.37" k1="-0.1960" k2="-0.0585" k3="0.0547" />
--            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2171" k2="-0.0340" k3="0.0461" />
--            <vignetting model="pa" focal="28" aperture="8" distance="0.4" k1="-0.2324" k2="-0.0511" k3="0.0575" />
--            <vignetting model="pa" focal="28" aperture="8" distance="0.71" k1="-0.2231" k2="-0.0773" k3="0.0821" />
--            <vignetting model="pa" focal="28" aperture="8" distance="2.37" k1="-0.2045" k2="-0.0398" k3="0.0400" />
--            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2267" k2="-0.0112" k3="0.0266" />
--            <vignetting model="pa" focal="28" aperture="22" distance="0.4" k1="-0.2345" k2="-0.0487" k3="0.0550" />
--            <vignetting model="pa" focal="28" aperture="22" distance="0.71" k1="-0.2270" k2="-0.0732" k3="0.0796" />
--            <vignetting model="pa" focal="28" aperture="22" distance="2.37" k1="-0.2123" k2="-0.0264" k3="0.0310" />
--            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2284" k2="-0.0089" k3="0.0234" />
--            <vignetting model="pa" focal="35" aperture="2.8" distance="0.4" k1="-0.4223" k2="0.0256" k3="0.0438" />
--            <vignetting model="pa" focal="35" aperture="2.8" distance="0.71" k1="-0.3763" k2="-0.1180" k3="0.1505" />
--            <vignetting model="pa" focal="35" aperture="2.8" distance="2.37" k1="-0.3812" k2="-0.0910" k3="0.1298" />
--            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3829" k2="-0.0904" k3="0.1334" />
--            <vignetting model="pa" focal="35" aperture="4" distance="0.4" k1="-0.2043" k2="-0.0235" k3="0.0527" />
--            <vignetting model="pa" focal="35" aperture="4" distance="0.71" k1="-0.1698" k2="-0.1130" k3="0.1160" />
--            <vignetting model="pa" focal="35" aperture="4" distance="2.37" k1="-0.1630" k2="-0.0732" k3="0.0788" />
--            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1548" k2="-0.0665" k3="0.0696" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1970" k2="-0.0279" k3="0.0462" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="0.71" k1="-0.1593" k2="-0.1253" k3="0.1129" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1509" k2="-0.0857" k3="0.0751" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1547" k2="-0.0558" k3="0.0526" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2065" k2="-0.0071" k3="0.0294" />
--            <vignetting model="pa" focal="35" aperture="8" distance="0.71" k1="-0.1680" k2="-0.1083" k3="0.0988" />
--            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1597" k2="-0.0674" k3="0.0608" />
--            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1644" k2="-0.0312" k3="0.0318" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2132" k2="0.0065" k3="0.0187" />
--            <vignetting model="pa" focal="35" aperture="22" distance="0.71" k1="-0.1691" k2="-0.1081" k3="0.0966" />
--            <vignetting model="pa" focal="35" aperture="22" distance="2.37" k1="-0.1657" k2="-0.0557" k3="0.0511" />
--            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1671" k2="-0.0271" k3="0.0267" />
--            <vignetting model="pa" focal="40" aperture="2.8" distance="0.4" k1="-0.4394" k2="0.1536" k3="-0.0391" />
--            <vignetting model="pa" focal="40" aperture="2.8" distance="0.71" k1="-0.3938" k2="0.0372" k3="0.0369" />
--            <vignetting model="pa" focal="40" aperture="2.8" distance="2.37" k1="-0.3876" k2="0.0135" k3="0.0584" />
--            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.3921" k2="-0.0071" k3="0.0815" />
--            <vignetting model="pa" focal="40" aperture="4" distance="0.4" k1="-0.1883" k2="0.0055" k3="0.0245" />
--            <vignetting model="pa" focal="40" aperture="4" distance="0.71" k1="-0.1447" k2="-0.0484" k3="0.0505" />
--            <vignetting model="pa" focal="40" aperture="4" distance="2.37" k1="-0.1446" k2="-0.0237" k3="0.0318" />
--            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1429" k2="-0.0352" k3="0.0415" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="0.4" k1="-0.1956" k2="0.0180" k3="0.0134" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="0.71" k1="-0.1499" k2="-0.0358" k3="0.0369" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="2.37" k1="-0.1531" k2="0.0001" k3="0.0095" />
--            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1294" k2="-0.0441" k3="0.0345" />
--            <vignetting model="pa" focal="40" aperture="8" distance="0.4" k1="-0.1905" k2="0.0111" k3="0.0146" />
--            <vignetting model="pa" focal="40" aperture="8" distance="0.71" k1="-0.1451" k2="-0.0396" k3="0.0350" />
--            <vignetting model="pa" focal="40" aperture="8" distance="2.37" k1="-0.1472" k2="-0.0065" k3="0.0097" />
--            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1270" k2="-0.0418" k3="0.0289" />
--            <vignetting model="pa" focal="40" aperture="22" distance="0.4" k1="-0.1949" k2="0.0190" k3="0.0080" />
--            <vignetting model="pa" focal="40" aperture="22" distance="0.71" k1="-0.1438" k2="-0.0453" k3="0.0381" />
--            <vignetting model="pa" focal="40" aperture="22" distance="2.37" k1="-0.1510" k2="0.0019" k3="0.0030" />
--            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1283" k2="-0.0419" k3="0.0283" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.4062" k2="0.1858" k3="-0.0587" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="0.71" k1="-0.3679" k2="0.0649" k3="0.0244" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="2.37" k1="-0.4101" k2="0.1125" k3="0.0141" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4730" k2="0.2005" k3="-0.0227" />
--            <vignetting model="pa" focal="50" aperture="4" distance="0.4" k1="-0.1285" k2="-0.0402" k3="0.0234" />
--            <vignetting model="pa" focal="50" aperture="4" distance="0.71" k1="-0.0886" k2="-0.0798" k3="0.0375" />
--            <vignetting model="pa" focal="50" aperture="4" distance="2.37" k1="-0.0861" k2="-0.0953" k3="0.0431" />
--            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1119" k2="-0.0506" k3="0.0295" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.1384" k2="-0.0264" k3="0.0345" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="0.71" k1="-0.1006" k2="-0.0480" k3="0.0333" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.1142" k2="-0.0145" k3="0.0141" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1140" k2="-0.0548" k3="0.0473" />
--            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1381" k2="-0.0241" k3="0.0294" />
--            <vignetting model="pa" focal="50" aperture="8" distance="0.71" k1="-0.1010" k2="-0.0425" k3="0.0261" />
--            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1154" k2="-0.0058" k3="0.0045" />
--            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1131" k2="-0.0546" k3="0.0437" />
--            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.1335" k2="-0.0337" k3="0.0331" />
--            <vignetting model="pa" focal="50" aperture="22" distance="0.71" k1="-0.0960" k2="-0.0519" k3="0.0290" />
--            <vignetting model="pa" focal="50" aperture="22" distance="2.37" k1="-0.1176" k2="0.0014" k3="-0.0023" />
--            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1087" k2="-0.0641" k3="0.0465" />
--            <vignetting model="pa" focal="60" aperture="2.8" distance="0.4" k1="-0.3724" k2="0.1542" k3="-0.0365" />
--            <vignetting model="pa" focal="60" aperture="2.8" distance="0.71" k1="-0.3570" k2="0.0595" k3="0.0388" />
--            <vignetting model="pa" focal="60" aperture="2.8" distance="2.37" k1="-0.4564" k2="0.2348" k3="-0.0511" />
--            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.4297" k2="0.2083" k3="-0.0366" />
--            <vignetting model="pa" focal="60" aperture="4" distance="0.4" k1="-0.0915" k2="-0.2215" k3="0.1498" />
--            <vignetting model="pa" focal="60" aperture="4" distance="0.71" k1="-0.0525" k2="-0.2704" k3="0.1695" />
--            <vignetting model="pa" focal="60" aperture="4" distance="2.37" k1="-0.0448" k2="-0.2233" k3="0.1273" />
--            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.0602" k2="-0.2663" k3="0.1689" />
--            <vignetting model="pa" focal="60" aperture="5.6" distance="0.4" k1="-0.1207" k2="-0.0347" k3="0.0400" />
--            <vignetting model="pa" focal="60" aperture="5.6" distance="0.71" k1="-0.0801" k2="-0.0559" k3="0.0365" />
--            <vignetting model="pa" focal="60" aperture="5.6" distance="2.37" k1="-0.0757" k2="-0.0722" k3="0.0489" />
--            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0756" k2="-0.0576" k3="0.0387" />
--            <vignetting model="pa" focal="60" aperture="8" distance="0.4" k1="-0.1227" k2="-0.0299" k3="0.0338" />
--            <vignetting model="pa" focal="60" aperture="8" distance="0.71" k1="-0.0783" k2="-0.0548" k3="0.0314" />
--            <vignetting model="pa" focal="60" aperture="8" distance="2.37" k1="-0.0773" k2="-0.0628" k3="0.0377" />
--            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.0850" k2="-0.0339" k3="0.0199" />
--            <vignetting model="pa" focal="60" aperture="22" distance="0.4" k1="-0.1199" k2="-0.0400" k3="0.0385" />
--            <vignetting model="pa" focal="60" aperture="22" distance="0.71" k1="-0.0780" k2="-0.0556" k3="0.0290" />
--            <vignetting model="pa" focal="60" aperture="22" distance="2.37" k1="-0.0760" k2="-0.0649" k3="0.0356" />
--            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="-0.0908" k2="-0.0174" k3="0.0055" />
--	    </calibration>
-+        <focal min="24" max="60"/>
-+        <aperture min="2.8" max="22"/>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion focal="24" model="ptlens" a="0.00598105" b="-0.0230051" c="0.00638311"/>
-+            <distortion focal="28" model="ptlens" a="0.00558326" b="-0.0188843" c="0.00805504"/>
-+            <distortion focal="35" model="ptlens" a="0.00105679" b="-0.00290772" c="-0.000127626"/>
-+            <distortion focal="40" model="ptlens" a="0.00194388" b="-0.00479192" c="0.00409093"/>
-+            <distortion focal="50" model="ptlens" a="-0.00101476" b="0.00591386" c="-0.00390913"/>
-+            <distortion focal="60" model="ptlens" a="-0.00252993" b="0.0114386" c="-0.00867133"/>
-+            <tca model="poly3" focal="24" br="0.0000518" vr="1.0003617" bb="0.0000124" vb="0.9999809"/>
-+            <tca model="poly3" focal="28" br="-0.0000000" vr="1.0003475" bb="-0.0000079" vb="1.0000145"/>
-+            <tca model="poly3" focal="35" br="-0.0000090" vr="1.0002416" bb="-0.0000040" vb="1.0000203"/>
-+            <tca model="poly3" focal="40" br="0.0000073" vr="1.0001672" bb="0.0000042" vb="1.0000001"/>
-+            <tca model="poly3" focal="50" br="0.0000065" vr="1.0000559" bb="-0.0000058" vb="0.9999767"/>
-+            <tca model="poly3" focal="60" br="-0.0000066" vr="0.9999967" bb="-0.0000024" vb="0.9999388"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="0.4" k1="-0.1361" k2="-0.6538" k3="0.3496"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="0.71" k1="-0.1631" k2="-0.6204" k3="0.3510"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="2.37" k1="-0.2077" k2="-0.5294" k3="0.3000"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.1500" k2="-0.6219" k3="0.3524"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.4" k1="-0.2524" k2="-0.0660" k3="0.0738"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="0.71" k1="-0.2644" k2="-0.0574" k3="0.0781"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="2.37" k1="-0.2995" k2="0.0159" k3="0.0343"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2568" k2="-0.0201" k3="0.0444"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.4" k1="-0.2465" k2="-0.0720" k3="0.0698"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="0.71" k1="-0.2578" k2="-0.0640" k3="0.0736"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="2.37" k1="-0.3116" k2="0.0406" k3="0.0168"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2549" k2="-0.0155" k3="0.0331"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.4" k1="-0.2491" k2="-0.0620" k3="0.0592"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="0.71" k1="-0.2612" k2="-0.0530" k3="0.0629"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="2.37" k1="-0.3051" k2="0.0309" k3="0.0196"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.2582" k2="-0.0005" k3="0.0184"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.4" k1="-0.2571" k2="-0.0464" k3="0.0503"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="0.71" k1="-0.2750" k2="-0.0211" k3="0.0424"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="2.37" k1="-0.3113" k2="0.0422" k3="0.0137"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2691" k2="0.0232" k3="0.0032"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="0.4" k1="-0.2227" k2="-0.4306" k3="0.2609"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="0.71" k1="-0.2137" k2="-0.4799" k3="0.3189"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="2.37" k1="-0.1944" k2="-0.4724" k3="0.2980"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.1887" k2="-0.4920" k3="0.3118"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.4" k1="-0.2339" k2="-0.0596" k3="0.0757"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="0.71" k1="-0.2211" k2="-0.0911" k3="0.1047"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="2.37" k1="-0.2015" k2="-0.0586" k3="0.0635"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2144" k2="-0.0501" k3="0.0653"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.4" k1="-0.2233" k2="-0.0717" k3="0.0749"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="0.71" k1="-0.2085" k2="-0.1077" k3="0.1053"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="2.37" k1="-0.1960" k2="-0.0585" k3="0.0547"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2171" k2="-0.0340" k3="0.0461"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.4" k1="-0.2324" k2="-0.0511" k3="0.0575"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="0.71" k1="-0.2231" k2="-0.0773" k3="0.0821"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="2.37" k1="-0.2045" k2="-0.0398" k3="0.0400"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2267" k2="-0.0112" k3="0.0266"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.4" k1="-0.2345" k2="-0.0487" k3="0.0550"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="0.71" k1="-0.2270" k2="-0.0732" k3="0.0796"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="2.37" k1="-0.2123" k2="-0.0264" k3="0.0310"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2284" k2="-0.0089" k3="0.0234"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.4" k1="-0.4223" k2="0.0256" k3="0.0438"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="0.71" k1="-0.3763" k2="-0.1180" k3="0.1505"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="2.37" k1="-0.3812" k2="-0.0910" k3="0.1298"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3829" k2="-0.0904" k3="0.1334"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.4" k1="-0.2043" k2="-0.0235" k3="0.0527"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="0.71" k1="-0.1698" k2="-0.1130" k3="0.1160"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="2.37" k1="-0.1630" k2="-0.0732" k3="0.0788"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1548" k2="-0.0665" k3="0.0696"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.4" k1="-0.1970" k2="-0.0279" k3="0.0462"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="0.71" k1="-0.1593" k2="-0.1253" k3="0.1129"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="2.37" k1="-0.1509" k2="-0.0857" k3="0.0751"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1547" k2="-0.0558" k3="0.0526"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.4" k1="-0.2065" k2="-0.0071" k3="0.0294"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="0.71" k1="-0.1680" k2="-0.1083" k3="0.0988"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="2.37" k1="-0.1597" k2="-0.0674" k3="0.0608"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.1644" k2="-0.0312" k3="0.0318"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.4" k1="-0.2132" k2="0.0065" k3="0.0187"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="0.71" k1="-0.1691" k2="-0.1081" k3="0.0966"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="2.37" k1="-0.1657" k2="-0.0557" k3="0.0511"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1671" k2="-0.0271" k3="0.0267"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="0.4" k1="-0.4394" k2="0.1536" k3="-0.0391"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="0.71" k1="-0.3938" k2="0.0372" k3="0.0369"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="2.37" k1="-0.3876" k2="0.0135" k3="0.0584"/>
-+            <vignetting model="pa" focal="40" aperture="2.8" distance="1000" k1="-0.3921" k2="-0.0071" k3="0.0815"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="0.4" k1="-0.1883" k2="0.0055" k3="0.0245"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="0.71" k1="-0.1447" k2="-0.0484" k3="0.0505"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="2.37" k1="-0.1446" k2="-0.0237" k3="0.0318"/>
-+            <vignetting model="pa" focal="40" aperture="4" distance="1000" k1="-0.1429" k2="-0.0352" k3="0.0415"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="0.4" k1="-0.1956" k2="0.0180" k3="0.0134"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="0.71" k1="-0.1499" k2="-0.0358" k3="0.0369"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="2.37" k1="-0.1531" k2="0.0001" k3="0.0095"/>
-+            <vignetting model="pa" focal="40" aperture="5.6" distance="1000" k1="-0.1294" k2="-0.0441" k3="0.0345"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="0.4" k1="-0.1905" k2="0.0111" k3="0.0146"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="0.71" k1="-0.1451" k2="-0.0396" k3="0.0350"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="2.37" k1="-0.1472" k2="-0.0065" k3="0.0097"/>
-+            <vignetting model="pa" focal="40" aperture="8" distance="1000" k1="-0.1270" k2="-0.0418" k3="0.0289"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="0.4" k1="-0.1949" k2="0.0190" k3="0.0080"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="0.71" k1="-0.1438" k2="-0.0453" k3="0.0381"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="2.37" k1="-0.1510" k2="0.0019" k3="0.0030"/>
-+            <vignetting model="pa" focal="40" aperture="22" distance="1000" k1="-0.1283" k2="-0.0419" k3="0.0283"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.4" k1="-0.4062" k2="0.1858" k3="-0.0587"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="0.71" k1="-0.3679" k2="0.0649" k3="0.0244"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="2.37" k1="-0.4101" k2="0.1125" k3="0.0141"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4730" k2="0.2005" k3="-0.0227"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.4" k1="-0.1285" k2="-0.0402" k3="0.0234"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="0.71" k1="-0.0886" k2="-0.0798" k3="0.0375"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="2.37" k1="-0.0861" k2="-0.0953" k3="0.0431"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1119" k2="-0.0506" k3="0.0295"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.4" k1="-0.1384" k2="-0.0264" k3="0.0345"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="0.71" k1="-0.1006" k2="-0.0480" k3="0.0333"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="2.37" k1="-0.1142" k2="-0.0145" k3="0.0141"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1140" k2="-0.0548" k3="0.0473"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.4" k1="-0.1381" k2="-0.0241" k3="0.0294"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="0.71" k1="-0.1010" k2="-0.0425" k3="0.0261"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="2.37" k1="-0.1154" k2="-0.0058" k3="0.0045"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1131" k2="-0.0546" k3="0.0437"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.4" k1="-0.1335" k2="-0.0337" k3="0.0331"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="0.71" k1="-0.0960" k2="-0.0519" k3="0.0290"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="2.37" k1="-0.1176" k2="0.0014" k3="-0.0023"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1087" k2="-0.0641" k3="0.0465"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="0.4" k1="-0.3724" k2="0.1542" k3="-0.0365"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="0.71" k1="-0.3570" k2="0.0595" k3="0.0388"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="2.37" k1="-0.4564" k2="0.2348" k3="-0.0511"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="-0.4297" k2="0.2083" k3="-0.0366"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="0.4" k1="-0.0915" k2="-0.2215" k3="0.1498"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="0.71" k1="-0.0525" k2="-0.2704" k3="0.1695"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="2.37" k1="-0.0448" k2="-0.2233" k3="0.1273"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.0602" k2="-0.2663" k3="0.1689"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="0.4" k1="-0.1207" k2="-0.0347" k3="0.0400"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="0.71" k1="-0.0801" k2="-0.0559" k3="0.0365"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="2.37" k1="-0.0757" k2="-0.0722" k3="0.0489"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0756" k2="-0.0576" k3="0.0387"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="0.4" k1="-0.1227" k2="-0.0299" k3="0.0338"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="0.71" k1="-0.0783" k2="-0.0548" k3="0.0314"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="2.37" k1="-0.0773" k2="-0.0628" k3="0.0377"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.0850" k2="-0.0339" k3="0.0199"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="0.4" k1="-0.1199" k2="-0.0400" k3="0.0385"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="0.71" k1="-0.0780" k2="-0.0556" k3="0.0290"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="2.37" k1="-0.0760" k2="-0.0649" k3="0.0356"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="-0.0908" k2="-0.0174" k3="0.0055"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 24-70mm f/2.8 EX DG Macro</model>
-@@ -781,18 +1003,185 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0" b="-0.006096" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="-0.001546" c="0" />
--            <distortion model="ptlens" focal="36" a="0" b="0.001392" c="0" />
--            <distortion model="ptlens" focal="42" a="0" b="0.002318" c="0" />
--            <distortion model="ptlens" focal="52" a="0" b="0.003994" c="0" />
--            <distortion model="ptlens" focal="64" a="0" b="0.004329" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.006728" c="0" />
-+            <distortion model="poly3" focal="24" k1="-0.006096"/>
-+            <distortion model="poly3" focal="30" k1="-0.001546"/>
-+            <distortion model="poly3" focal="36" k1="0.001392"/>
-+            <distortion model="poly3" focal="42" k1="0.002318"/>
-+            <distortion model="poly3" focal="52" k1="0.003994"/>
-+            <distortion model="poly3" focal="64" k1="0.004329"/>
-+            <distortion model="poly3" focal="70" k1="0.006728"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 24-70mm f/2.8 IF EX DG HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Minolta AF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-30 -->
-+            <distortion model="ptlens" focal="24" a="-0.00125" b="-0.00574" c="-0.00426"/>
-+            <distortion model="ptlens" focal="27" a="-0.00953" b="0.02092" c="-0.02295"/>
-+            <distortion model="ptlens" focal="35" a="-0.0011" b="0.00117" c="-0.0029"/>
-+            <distortion model="ptlens" focal="48" a="0.00383" b="-0.01224" c="0.01544"/>
-+            <distortion model="ptlens" focal="70" a="-0.00141" b="0.00991" c="-0.00803"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 24-70mm f/2.8 IF EX DG HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="24" a="0.02883" b="-0.07661" c="0.03144"/>
-+            <distortion model="ptlens" focal="28" a="0.01895" b="-0.05346" c="0.02209"/>
-+            <distortion model="ptlens" focal="34" a="0.00955" b="-0.02443" c="0.01226"/>
-+            <distortion model="ptlens" focal="48" a="0" b="0.00687" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.00904" c="0"/>
-+            <tca model="poly3" focal="24" br="-0.0002369" vr="1.0005456" bb="0.0001640" vb="0.9998293"/>
-+            <tca model="poly3" focal="24" br="-0.0002503" vr="1.0005584" bb="0.0002163" vb="0.9997724"/>
-+            <tca model="poly3" focal="28" br="-0.0001219" vr="1.0003667" bb="0.0001085" vb="0.9998949"/>
-+            <tca model="poly3" focal="28" br="-0.0001347" vr="1.0004106" bb="0.0001295" vb="0.9998750"/>
-+            <tca model="poly3" focal="34" br="-0.0000910" vr="1.0002764" bb="0.0000816" vb="0.9999336"/>
-+            <tca model="poly3" focal="34" br="-0.0001126" vr="1.0003192" bb="0.0000824" vb="0.9999361"/>
-+            <tca model="poly3" focal="48" br="-0.0000551" vr="1.0000890" bb="0.0000440" vb="0.9999359"/>
-+            <tca model="poly3" focal="48" br="-0.0000553" vr="1.0000899" bb="0.0000408" vb="0.9999434"/>
-+            <tca model="poly3" focal="70" br="-0.0000226" vr="0.9999188" bb="0.0000333" vb="0.9998799"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="0.0646" k2="-2.1036" k3="1.2184"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="0.0646" k2="-2.1036" k3="1.2184"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="10" k1="-0.0810" k2="-1.1691" k3="0.4777"/>
-+            <vignetting model="pa" focal="24" aperture="3.5" distance="1000" k1="-0.0810" k2="-1.1691" k3="0.4777"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.2304" k2="-0.4946" k3="-0.0083"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.2304" k2="-0.4946" k3="-0.0083"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4112" k2="0.1995" k3="-0.5108"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4112" k2="0.1995" k3="-0.5108"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.5588" k2="0.7055" k3="-0.8533"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.5588" k2="0.7055" k3="-0.8533"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.6679" k2="1.0550" k3="-1.0732"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.6679" k2="1.0550" k3="-1.0732"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.7181" k2="1.1926" k3="-1.1418"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.7181" k2="1.1926" k3="-1.1418"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.7390" k2="1.2447" k3="-1.1574"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.7390" k2="1.2447" k3="-1.1574"/>
-+            <vignetting model="pa" focal="24" aperture="18" distance="10" k1="-0.7537" k2="1.2634" k3="-1.1382"/>
-+            <vignetting model="pa" focal="24" aperture="18" distance="1000" k1="-0.7537" k2="1.2634" k3="-1.1382"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.7364" k2="1.1806" k3="-1.0505"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.7364" k2="1.1806" k3="-1.0505"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.0656" k2="-1.2461" k3="0.6569"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.0656" k2="-1.2461" k3="0.6569"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.3036" k2="-0.1197" k3="-0.1384"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.3036" k2="-0.1197" k3="-0.1384"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.4375" k2="0.2935" k3="-0.3221"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.4375" k2="0.2935" k3="-0.3221"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.4467" k2="0.2556" k3="-0.2046"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.4467" k2="0.2556" k3="-0.2046"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.3868" k2="0.0117" k3="0.0259"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.3868" k2="0.0117" k3="0.0259"/>
-+            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.3851" k2="0.0013" k3="0.0379"/>
-+            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.3851" k2="0.0013" k3="0.0379"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.3893" k2="0.0091" k3="0.0349"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.3893" k2="0.0091" k3="0.0349"/>
-+            <vignetting model="pa" focal="28" aperture="14" distance="10" k1="-0.3917" k2="0.0150" k3="0.0306"/>
-+            <vignetting model="pa" focal="28" aperture="14" distance="1000" k1="-0.3917" k2="0.0150" k3="0.0306"/>
-+            <vignetting model="pa" focal="28" aperture="18" distance="10" k1="-0.3917" k2="0.0105" k3="0.0350"/>
-+            <vignetting model="pa" focal="28" aperture="18" distance="1000" k1="-0.3917" k2="0.0105" k3="0.0350"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.3952" k2="0.0099" k3="0.0391"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.3952" k2="0.0099" k3="0.0391"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="10" k1="-0.2085" k2="-0.6108" k3="0.3248"/>
-+            <vignetting model="pa" focal="34" aperture="2.8" distance="1000" k1="-0.2085" k2="-0.6108" k3="0.3248"/>
-+            <vignetting model="pa" focal="34" aperture="3.5" distance="10" k1="-0.3358" k2="0.1417" k3="-0.1656"/>
-+            <vignetting model="pa" focal="34" aperture="3.5" distance="1000" k1="-0.3358" k2="0.1417" k3="-0.1656"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.3119" k2="-0.0065" k3="0.0432"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.3119" k2="-0.0065" k3="0.0432"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="10" k1="-0.3138" k2="-0.0047" k3="0.0434"/>
-+            <vignetting model="pa" focal="34" aperture="5.6" distance="1000" k1="-0.3138" k2="-0.0047" k3="0.0434"/>
-+            <vignetting model="pa" focal="34" aperture="7.1" distance="10" k1="-0.3144" k2="-0.0036" k3="0.0431"/>
-+            <vignetting model="pa" focal="34" aperture="7.1" distance="1000" k1="-0.3144" k2="-0.0036" k3="0.0431"/>
-+            <vignetting model="pa" focal="34" aperture="9" distance="10" k1="-0.3156" k2="-0.0013" k3="0.0419"/>
-+            <vignetting model="pa" focal="34" aperture="9" distance="1000" k1="-0.3156" k2="-0.0013" k3="0.0419"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="10" k1="-0.3220" k2="0.0122" k3="0.0341"/>
-+            <vignetting model="pa" focal="34" aperture="11" distance="1000" k1="-0.3220" k2="0.0122" k3="0.0341"/>
-+            <vignetting model="pa" focal="34" aperture="14" distance="10" k1="-0.3284" k2="0.0330" k3="0.0176"/>
-+            <vignetting model="pa" focal="34" aperture="14" distance="1000" k1="-0.3284" k2="0.0330" k3="0.0176"/>
-+            <vignetting model="pa" focal="34" aperture="18" distance="10" k1="-0.3340" k2="0.0435" k3="0.0127"/>
-+            <vignetting model="pa" focal="34" aperture="18" distance="1000" k1="-0.3340" k2="0.0435" k3="0.0127"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.3324" k2="0.0336" k3="0.0213"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.3324" k2="0.0336" k3="0.0213"/>
-+            <vignetting model="pa" focal="45" aperture="3.5" distance="10" k1="-0.2403" k2="-0.0584" k3="0.0123"/>
-+            <vignetting model="pa" focal="45" aperture="3.5" distance="1000" k1="-0.2403" k2="-0.0584" k3="0.0123"/>
-+            <vignetting model="pa" focal="45" aperture="4.5" distance="10" k1="-0.2811" k2="0.0573" k3="-0.0052"/>
-+            <vignetting model="pa" focal="45" aperture="4.5" distance="1000" k1="-0.2811" k2="0.0573" k3="-0.0052"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="10" k1="-0.2807" k2="0.0502" k3="0.0018"/>
-+            <vignetting model="pa" focal="45" aperture="5.6" distance="1000" k1="-0.2807" k2="0.0502" k3="0.0018"/>
-+            <vignetting model="pa" focal="45" aperture="7.1" distance="10" k1="-0.2828" k2="0.0508" k3="0.0013"/>
-+            <vignetting model="pa" focal="45" aperture="7.1" distance="1000" k1="-0.2828" k2="0.0508" k3="0.0013"/>
-+            <vignetting model="pa" focal="45" aperture="9" distance="10" k1="-0.2834" k2="0.0482" k3="0.0043"/>
-+            <vignetting model="pa" focal="45" aperture="9" distance="1000" k1="-0.2834" k2="0.0482" k3="0.0043"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="10" k1="-0.2872" k2="0.0542" k3="0.0018"/>
-+            <vignetting model="pa" focal="45" aperture="11" distance="1000" k1="-0.2872" k2="0.0542" k3="0.0018"/>
-+            <vignetting model="pa" focal="45" aperture="14" distance="10" k1="-0.2938" k2="0.0699" k3="-0.0089"/>
-+            <vignetting model="pa" focal="45" aperture="14" distance="1000" k1="-0.2938" k2="0.0699" k3="-0.0089"/>
-+            <vignetting model="pa" focal="45" aperture="18" distance="10" k1="-0.2996" k2="0.0800" k3="-0.0144"/>
-+            <vignetting model="pa" focal="45" aperture="18" distance="1000" k1="-0.2996" k2="0.0800" k3="-0.0144"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="10" k1="-0.3056" k2="0.0908" k3="-0.0203"/>
-+            <vignetting model="pa" focal="45" aperture="22" distance="1000" k1="-0.3056" k2="0.0908" k3="-0.0203"/>
-+            <vignetting model="pa" focal="48" aperture="2.8" distance="10" k1="-0.4855" k2="0.0016" k3="0.0381"/>
-+            <vignetting model="pa" focal="48" aperture="2.8" distance="1000" k1="-0.4855" k2="0.0016" k3="0.0381"/>
-+            <vignetting model="pa" focal="51" aperture="2.8" distance="10" k1="-0.4918" k2="0.0490" k3="-0.0009"/>
-+            <vignetting model="pa" focal="51" aperture="2.8" distance="1000" k1="-0.4918" k2="0.0490" k3="-0.0009"/>
-+            <vignetting model="pa" focal="51" aperture="3.5" distance="10" k1="-0.2297" k2="-0.0875" k3="0.0209"/>
-+            <vignetting model="pa" focal="51" aperture="3.5" distance="1000" k1="-0.2297" k2="-0.0875" k3="0.0209"/>
-+            <vignetting model="pa" focal="51" aperture="4.5" distance="10" k1="-0.2547" k2="0.0146" k3="0.0224"/>
-+            <vignetting model="pa" focal="51" aperture="4.5" distance="1000" k1="-0.2547" k2="0.0146" k3="0.0224"/>
-+            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="-0.2544" k2="0.0080" k3="0.0297"/>
-+            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="-0.2544" k2="0.0080" k3="0.0297"/>
-+            <vignetting model="pa" focal="51" aperture="7.1" distance="10" k1="-0.2579" k2="0.0128" k3="0.0286"/>
-+            <vignetting model="pa" focal="51" aperture="7.1" distance="1000" k1="-0.2579" k2="0.0128" k3="0.0286"/>
-+            <vignetting model="pa" focal="51" aperture="9" distance="10" k1="-0.2589" k2="0.0106" k3="0.0315"/>
-+            <vignetting model="pa" focal="51" aperture="9" distance="1000" k1="-0.2589" k2="0.0106" k3="0.0315"/>
-+            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.2462" k2="-0.0152" k3="0.0448"/>
-+            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.2462" k2="-0.0152" k3="0.0448"/>
-+            <vignetting model="pa" focal="51" aperture="14" distance="10" k1="-0.2507" k2="-0.0113" k3="0.0454"/>
-+            <vignetting model="pa" focal="51" aperture="14" distance="1000" k1="-0.2507" k2="-0.0113" k3="0.0454"/>
-+            <vignetting model="pa" focal="51" aperture="18" distance="10" k1="-0.2552" k2="-0.0031" k3="0.0424"/>
-+            <vignetting model="pa" focal="51" aperture="18" distance="1000" k1="-0.2552" k2="-0.0031" k3="0.0424"/>
-+            <vignetting model="pa" focal="51" aperture="22" distance="10" k1="-0.2550" k2="-0.0173" k3="0.0571"/>
-+            <vignetting model="pa" focal="51" aperture="22" distance="1000" k1="-0.2550" k2="-0.0173" k3="0.0571"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.7389" k2="0.9939" k3="-0.9924"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.7389" k2="0.9939" k3="-0.9924"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="10" k1="-0.3384" k2="0.6024" k3="-0.8949"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="-0.3384" k2="0.6024" k3="-0.8949"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.4280" k2="1.0287" k3="-1.1764"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.4280" k2="1.0287" k3="-1.1764"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.5249" k2="1.2842" k3="-1.2411"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.5249" k2="1.2842" k3="-1.2411"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.5409" k2="1.2755" k3="-1.1641"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.5409" k2="1.2755" k3="-1.1641"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.5157" k2="1.1507" k3="-1.0198"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.5157" k2="1.1507" k3="-1.0198"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.4541" k2="0.8984" k3="-0.7784"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.4541" k2="0.8984" k3="-0.7784"/>
-+            <vignetting model="pa" focal="70" aperture="13" distance="10" k1="-0.3805" k2="0.5998" k3="-0.5029"/>
-+            <vignetting model="pa" focal="70" aperture="13" distance="1000" k1="-0.3805" k2="0.5998" k3="-0.5029"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="10" k1="-0.3053" k2="0.2966" k3="-0.2304"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="1000" k1="-0.3053" k2="0.2966" k3="-0.2304"/>
-+            <vignetting model="pa" focal="70" aperture="20" distance="10" k1="-0.2914" k2="0.2132" k3="-0.1456"/>
-+            <vignetting model="pa" focal="70" aperture="20" distance="1000" k1="-0.2914" k2="0.2132" k3="-0.1456"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2798" k2="0.1557" k3="-0.0906"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2798" k2="0.1557" k3="-0.0906"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 28-70mm f/2.8 EX DG</model>
-@@ -800,19 +1189,18 @@
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.01508" b="-0.036446" c="0" />
--            <distortion model="ptlens" focal="30" a="0.01328" b="-0.02956" c="0" />
--            <distortion model="ptlens" focal="34" a="0.001964" b="-0.003604" c="0" />
--            <distortion model="ptlens" focal="40" a="0.006628" b="-0.009598" c="0" />
--            <distortion model="ptlens" focal="45" a="0.004477" b="-0.003544" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.006595" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.0078" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.008656" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.01508" b="-0.036446" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.01328" b="-0.02956" c="0"/>
-+            <distortion model="ptlens" focal="34" a="0.001964" b="-0.003604" c="0"/>
-+            <distortion model="ptlens" focal="40" a="0.006628" b="-0.009598" c="0"/>
-+            <distortion model="ptlens" focal="45" a="0.004477" b="-0.003544" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.006595" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.0078" c="0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.008656" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 28-300mm f/3.5-6.3 Macro ASP IF</model>
-@@ -821,19 +1209,19 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="-0.009837" c="-0.008234" />
--            <distortion model="ptlens" focal="34" a="0" b="-0.004678" c="0.000517" />
--            <distortion model="ptlens" focal="55" a="0" b="0.005687" c="-0.005159" />
--            <distortion model="ptlens" focal="75" a="0" b="0.008223" c="-0.004279" />
--            <distortion model="ptlens" focal="100" a="0" b="0.005137" c="0.00146" />
--            <distortion model="ptlens" focal="135" a="0" b="0.00675" c="-0.000965" />
--            <distortion model="ptlens" focal="200" a="0" b="0.007188" c="-0.003544" />
--            <distortion model="ptlens" focal="300" a="0" b="0.00471" c="8.5e-05" />
-+            <distortion model="ptlens" focal="28" a="0" b="-0.009837" c="-0.008234"/>
-+            <distortion model="ptlens" focal="34" a="0" b="-0.004678" c="0.000517"/>
-+            <distortion model="ptlens" focal="55" a="0" b="0.005687" c="-0.005159"/>
-+            <distortion model="ptlens" focal="75" a="0" b="0.008223" c="-0.004279"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.005137" c="0.00146"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.00675" c="-0.000965"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.007188" c="-0.003544"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.00471" c="8.5e-05"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 50-500mm f/4-6.3 EX DG HSM</model>
-@@ -843,41 +1231,40 @@
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.00059" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.004149" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.005115" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.005001" c="0" />
--            <distortion model="ptlens" focal="195" a="0" b="0.004957" c="0" />
--            <distortion model="ptlens" focal="270" a="0" b="0.004639" c="0" />
--            <distortion model="ptlens" focal="320" a="0" b="0.005982" c="0" />
--            <distortion model="ptlens" focal="420" a="0" b="0.005397" c="0" />
--            <distortion model="ptlens" focal="500" a="0" b="0.004857" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.00059"/>
-+            <distortion model="poly3" focal="72" k1="0.004149"/>
-+            <distortion model="poly3" focal="100" k1="0.005115"/>
-+            <distortion model="poly3" focal="135" k1="0.005001"/>
-+            <distortion model="poly3" focal="195" k1="0.004957"/>
-+            <distortion model="poly3" focal="270" k1="0.004639"/>
-+            <distortion model="poly3" focal="320" k1="0.005982"/>
-+            <distortion model="poly3" focal="420" k1="0.005397"/>
-+            <distortion model="poly3" focal="500" k1="0.004857"/>
-         </calibration>
-     </lens>
--    
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 50-500mm F/4.5-6.3 DG OS HSM</model>
-+        <model>Sigma 50-500mm f/4.5-6.3 APO DG OS HSM</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0" b="-0.00525" c="0" />
--            <distortion model="ptlens" focal="78" a="0" b="0.00114" c="0" />
--            <distortion model="ptlens" focal="95" a="0" b="0.00552" c="0" />
--            <distortion model="ptlens" focal="140" a="0" b="0.0067" c="0" />
--            <distortion model="ptlens" focal="210" a="0" b="0.00701" c="0" />
--            <distortion model="ptlens" focal="290" a="0" b="0.00686" c="0" />
--            <distortion model="ptlens" focal="420" a="0" b="0.00731" c="0" />
--            <distortion model="ptlens" focal="500" a="0" b="0.00766" c="0" />
-+            <distortion model="poly3" focal="50" k1="-0.00525"/>
-+            <distortion model="poly3" focal="78" k1="0.00114"/>
-+            <distortion model="poly3" focal="95" k1="0.00552"/>
-+            <distortion model="poly3" focal="140" k1="0.0067"/>
-+            <distortion model="poly3" focal="210" k1="0.00701"/>
-+            <distortion model="poly3" focal="290" k1="0.00686"/>
-+            <distortion model="poly3" focal="420" k1="0.00731"/>
-+            <distortion model="poly3" focal="500" k1="0.00766"/>
-         </calibration>
--    </lens>    
--
-+    </lens>
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 55-200mm f/4-5.6 DC</model>
-@@ -885,20 +1272,18 @@
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>4/3 System</mount>
--        <!-- FixMe: Actually cropfactor 1.531 -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Pentax *ist DL -->
--            <distortion model="poly3" focal="55" k1="-0.00341" />
--            <distortion model="poly3" focal="73" k1="0.00308" />
--            <distortion model="poly3" focal="85" k1="0.00606" />
--            <distortion model="poly3" focal="103" k1="0.00766" />
--            <distortion model="poly3" focal="123" k1="0.0072" />
--            <distortion model="poly3" focal="160" k1="0.00643" />
--            <distortion model="poly3" focal="200" k1="0.00594" />
-+            <distortion model="poly3" focal="55" k1="-0.00341"/>
-+            <distortion model="poly3" focal="73" k1="0.00308"/>
-+            <distortion model="poly3" focal="85" k1="0.00606"/>
-+            <distortion model="poly3" focal="103" k1="0.00766"/>
-+            <distortion model="poly3" focal="123" k1="0.0072"/>
-+            <distortion model="poly3" focal="160" k1="0.00643"/>
-+            <distortion model="poly3" focal="200" k1="0.00594"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 70-300mm f/4-5.6 APO Macro Super II</model>
-@@ -907,98 +1292,98 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0.002522" b="-0.005913" c="0" />
--            <distortion model="ptlens" focal="81" a="-0.000431" b="0.003404" c="0" />
--            <distortion model="ptlens" focal="92" a="-0.001379" b="0.006159" c="0" />
--            <distortion model="ptlens" focal="100" a="-0.001226" b="0.006912" c="0" />
--            <distortion model="ptlens" focal="119" a="0.001445" b="0.002936" c="0" />
--            <distortion model="ptlens" focal="133" a="0.000359" b="0.005212" c="0" />
--            <distortion model="ptlens" focal="149" a="0.000193" b="0.005672" c="0" />
--            <distortion model="ptlens" focal="168" a="0.000533" b="0.005172" c="0" />
--            <distortion model="ptlens" focal="190" a="0.000317" b="0.005522" c="0" />
--            <distortion model="ptlens" focal="214" a="-4.9e-05" b="0.005661" c="0" />
--            <distortion model="ptlens" focal="238" a="-0.000247" b="0.005706" c="0" />
--            <distortion model="ptlens" focal="263" a="0.000491" b="0.003667" c="0" />
--            <distortion model="ptlens" focal="300" a="0.001061" b="0.001597" c="0" />
-+            <distortion model="ptlens" focal="70" a="0.002522" b="-0.005913" c="0"/>
-+            <distortion model="ptlens" focal="81" a="-0.000431" b="0.003404" c="0"/>
-+            <distortion model="ptlens" focal="92" a="-0.001379" b="0.006159" c="0"/>
-+            <distortion model="ptlens" focal="100" a="-0.001226" b="0.006912" c="0"/>
-+            <distortion model="ptlens" focal="119" a="0.001445" b="0.002936" c="0"/>
-+            <distortion model="ptlens" focal="133" a="0.000359" b="0.005212" c="0"/>
-+            <distortion model="ptlens" focal="149" a="0.000193" b="0.005672" c="0"/>
-+            <distortion model="ptlens" focal="168" a="0.000533" b="0.005172" c="0"/>
-+            <distortion model="ptlens" focal="190" a="0.000317" b="0.005522" c="0"/>
-+            <distortion model="ptlens" focal="214" a="-4.9e-05" b="0.005661" c="0"/>
-+            <distortion model="ptlens" focal="238" a="-0.000247" b="0.005706" c="0"/>
-+            <distortion model="ptlens" focal="263" a="0.000491" b="0.003667" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0.001061" b="0.001597" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 70-300mm F4-5.6 DL Macro</model>
-+        <model>Sigma 70-300mm f/4-5.6 DL Macro</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="-0.00291" b="0.00834" c="-0.00971" />
--            <distortion model="ptlens" focal="100" a="-0.00296" b="0.0116" c="-0.00449" />
--            <distortion model="ptlens" focal="135" a="-0.0029" b="0.01687" c="-0.01545" />
--            <distortion model="ptlens" focal="200" a="-0.00219" b="0.01513" c="-0.01147" />
--            <distortion model="ptlens" focal="300" a="-0.00382" b="0.02103" c="-0.01538" />
--            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5339" k2="0.2603" k3="-0.0804" />
--            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5339" k2="0.2603" k3="-0.0804" />
--            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1134" k2="-0.0711" k3="-0.0220" />
--            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1134" k2="-0.0711" k3="-0.0220" />
--            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2059" k2="0.1615" k3="-0.1053" />
--            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2059" k2="0.1615" k3="-0.1053" />
--            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2160" k2="0.1671" k3="-0.1054" />
--            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2160" k2="0.1671" k3="-0.1054" />
--            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2393" k2="0.2034" k3="-0.1265" />
--            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2393" k2="0.2034" k3="-0.1265" />
--            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2449" k2="0.2257" k3="-0.1361" />
--            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2449" k2="0.2257" k3="-0.1361" />
--            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.5418" k2="0.2964" k3="-0.0942" />
--            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.5418" k2="0.2964" k3="-0.0942" />
--            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.1245" k2="-0.2661" k3="0.1532" />
--            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.1245" k2="-0.2661" k3="0.1532" />
--            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.1789" k2="0.1612" k3="-0.1008" />
--            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.1789" k2="0.1612" k3="-0.1008" />
--            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1974" k2="0.1709" k3="-0.0983" />
--            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1974" k2="0.1709" k3="-0.0983" />
--            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.2196" k2="0.2274" k3="-0.1269" />
--            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.2196" k2="0.2274" k3="-0.1269" />
--            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.5472" k2="0.4149" k3="-0.1968" />
--            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.5472" k2="0.4149" k3="-0.1968" />
--            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1663" k2="0.2056" k3="-0.1957" />
--            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1663" k2="0.2056" k3="-0.1957" />
--            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1665" k2="0.1322" k3="-0.0744" />
--            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1665" k2="0.1322" k3="-0.0744" />
--            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1736" k2="0.1411" k3="-0.0754" />
--            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1736" k2="0.1411" k3="-0.0754" />
--            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.2012" k2="0.1940" k3="-0.0998" />
--            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2012" k2="0.1940" k3="-0.0998" />
--            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.4230" k2="0.0406" k3="0.0298" />
--            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.4230" k2="0.0406" k3="0.0298" />
--            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0624" k2="-0.0794" k3="-0.0365" />
--            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0624" k2="-0.0794" k3="-0.0365" />
--            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1161" k2="0.0689" k3="-0.0492" />
--            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1161" k2="0.0689" k3="-0.0492" />
--            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.1115" k2="0.0722" k3="-0.0388" />
--            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1115" k2="0.0722" k3="-0.0388" />
--            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1098" k2="0.0615" k3="-0.0289" />
--            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1098" k2="0.0615" k3="-0.0289" />
--            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.1194" k2="0.0752" k3="-0.0242" />
--            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.1194" k2="0.0752" k3="-0.0242" />
--            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.7348" k2="0.6441" k3="-0.2653" />
--            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.7348" k2="0.6441" k3="-0.2653" />
--            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.0752" k2="-0.3913" k3="0.2445" />
--            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.0752" k2="-0.3913" k3="0.2445" />
--            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0770" k2="0.0718" k3="-0.0707" />
--            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0770" k2="0.0718" k3="-0.0707" />
--            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0799" k2="0.0542" k3="-0.0297" />
--            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0799" k2="0.0542" k3="-0.0297" />
--            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.0885" k2="0.0597" k3="-0.0282" />
--            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.0885" k2="0.0597" k3="-0.0282" />
--            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.0889" k2="0.0432" k3="0.0027" />
--            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.0889" k2="0.0432" k3="0.0027" />
-+            <distortion model="ptlens" focal="70" a="-0.00291" b="0.00834" c="-0.00971"/>
-+            <distortion model="ptlens" focal="100" a="-0.00296" b="0.0116" c="-0.00449"/>
-+            <distortion model="ptlens" focal="135" a="-0.0029" b="0.01687" c="-0.01545"/>
-+            <distortion model="ptlens" focal="200" a="-0.00219" b="0.01513" c="-0.01147"/>
-+            <distortion model="ptlens" focal="300" a="-0.00382" b="0.02103" c="-0.01538"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5339" k2="0.2603" k3="-0.0804"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5339" k2="0.2603" k3="-0.0804"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.1134" k2="-0.0711" k3="-0.0220"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.1134" k2="-0.0711" k3="-0.0220"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="10" k1="-0.2059" k2="0.1615" k3="-0.1053"/>
-+            <vignetting model="pa" focal="70" aperture="6.3" distance="1000" k1="-0.2059" k2="0.1615" k3="-0.1053"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2160" k2="0.1671" k3="-0.1054"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2160" k2="0.1671" k3="-0.1054"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.2393" k2="0.2034" k3="-0.1265"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.2393" k2="0.2034" k3="-0.1265"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.2449" k2="0.2257" k3="-0.1361"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.2449" k2="0.2257" k3="-0.1361"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.5418" k2="0.2964" k3="-0.0942"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.5418" k2="0.2964" k3="-0.0942"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="10" k1="-0.1245" k2="-0.2661" k3="0.1532"/>
-+            <vignetting model="pa" focal="100" aperture="5" distance="1000" k1="-0.1245" k2="-0.2661" k3="0.1532"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="10" k1="-0.1789" k2="0.1612" k3="-0.1008"/>
-+            <vignetting model="pa" focal="100" aperture="6.3" distance="1000" k1="-0.1789" k2="0.1612" k3="-0.1008"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1974" k2="0.1709" k3="-0.0983"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1974" k2="0.1709" k3="-0.0983"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.2196" k2="0.2274" k3="-0.1269"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.2196" k2="0.2274" k3="-0.1269"/>
-+            <vignetting model="pa" focal="135" aperture="4.5" distance="10" k1="-0.5472" k2="0.4149" k3="-0.1968"/>
-+            <vignetting model="pa" focal="135" aperture="4.5" distance="1000" k1="-0.5472" k2="0.4149" k3="-0.1968"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.1663" k2="0.2056" k3="-0.1957"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.1663" k2="0.2056" k3="-0.1957"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="10" k1="-0.1665" k2="0.1322" k3="-0.0744"/>
-+            <vignetting model="pa" focal="135" aperture="7.1" distance="1000" k1="-0.1665" k2="0.1322" k3="-0.0744"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="10" k1="-0.1736" k2="0.1411" k3="-0.0754"/>
-+            <vignetting model="pa" focal="135" aperture="9" distance="1000" k1="-0.1736" k2="0.1411" k3="-0.0754"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.2012" k2="0.1940" k3="-0.0998"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.2012" k2="0.1940" k3="-0.0998"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.4230" k2="0.0406" k3="0.0298"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.4230" k2="0.0406" k3="0.0298"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0624" k2="-0.0794" k3="-0.0365"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0624" k2="-0.0794" k3="-0.0365"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1161" k2="0.0689" k3="-0.0492"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1161" k2="0.0689" k3="-0.0492"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.1115" k2="0.0722" k3="-0.0388"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.1115" k2="0.0722" k3="-0.0388"/>
-+            <vignetting model="pa" focal="200" aperture="13" distance="10" k1="-0.1098" k2="0.0615" k3="-0.0289"/>
-+            <vignetting model="pa" focal="200" aperture="13" distance="1000" k1="-0.1098" k2="0.0615" k3="-0.0289"/>
-+            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.1194" k2="0.0752" k3="-0.0242"/>
-+            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.1194" k2="0.0752" k3="-0.0242"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.7348" k2="0.6441" k3="-0.2653"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.7348" k2="0.6441" k3="-0.2653"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="10" k1="-0.0752" k2="-0.3913" k3="0.2445"/>
-+            <vignetting model="pa" focal="300" aperture="7.1" distance="1000" k1="-0.0752" k2="-0.3913" k3="0.2445"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="-0.0770" k2="0.0718" k3="-0.0707"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="-0.0770" k2="0.0718" k3="-0.0707"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0799" k2="0.0542" k3="-0.0297"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0799" k2="0.0542" k3="-0.0297"/>
-+            <vignetting model="pa" focal="300" aperture="14" distance="10" k1="-0.0885" k2="0.0597" k3="-0.0282"/>
-+            <vignetting model="pa" focal="300" aperture="14" distance="1000" k1="-0.0885" k2="0.0597" k3="-0.0282"/>
-+            <vignetting model="pa" focal="300" aperture="32" distance="10" k1="-0.0889" k2="0.0432" k3="0.0027"/>
-+            <vignetting model="pa" focal="300" aperture="32" distance="1000" k1="-0.0889" k2="0.0432" k3="0.0027"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 150-500mm f/5-6.3 APO DG OS HSM</model>
-@@ -1007,87 +1392,86 @@
-         <mount>Canon EF</mount>
-         <mount>Sony Alpha</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="150" a="0.06903" b="-0.2138" c="0.22959" />
--            <distortion model="ptlens" focal="198" a="0" b="0.00332" c="0" />
--            <distortion model="ptlens" focal="247" a="0.00059" b="0.00686" c="-0.01012" />
--            <distortion model="ptlens" focal="289" a="-0.00051" b="0.00293" c="0.00733" />
--            <distortion model="ptlens" focal="403" a="-0.00065" b="0.0073" c="-0.00406" />
--            <distortion model="ptlens" focal="500" a="-0.00143" b="0.02062" c="-0.03175" />
--            <tca model="poly3" focal="150" br="0.0000564" vr="0.9998528" bb="-0.0000710" vb="1.0001432" />
--            <tca model="poly3" focal="174" br="0.0000566" vr="0.9998422" bb="-0.0000673" vb="1.0001337" />
--            <tca model="poly3" focal="198" br="0.0000745" vr="0.9997846" bb="-0.0000750" vb="1.0001414" />
--            <tca model="poly3" focal="229" br="0.0000482" vr="0.9998259" bb="-0.0000559" vb="1.0000967" />
--            <tca model="poly3" focal="247" br="0.0000492" vr="0.9997920" bb="-0.0000667" vb="1.0001128" />
--            <tca model="poly3" focal="289" br="0.0000477" vr="0.9997628" bb="-0.0000512" vb="1.0000808" />
--            <tca model="poly3" focal="403" br="-0.0000402" vr="0.9997650" bb="-0.0000248" vb="1.0000442" />
--            <tca model="poly3" focal="500" br="0.0000144" vr="0.9997674" bb="-0.0000066" vb="1.0000035" />
--            <vignetting model="pa" focal="150" aperture="5" distance="10" k1="-0.1304" k2="-0.7223" k3="0.2681" />
--            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.1304" k2="-0.7223" k3="0.2681" />
--            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0813" k2="0.3026" k3="-0.5990" />
--            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0813" k2="0.3026" k3="-0.5990" />
--            <vignetting model="pa" focal="150" aperture="10" distance="10" k1="-0.2643" k2="0.8388" k3="-0.8724" />
--            <vignetting model="pa" focal="150" aperture="10" distance="1000" k1="-0.2643" k2="0.8388" k3="-0.8724" />
--            <vignetting model="pa" focal="150" aperture="14" distance="10" k1="-0.2703" k2="0.6179" k3="-0.5882" />
--            <vignetting model="pa" focal="150" aperture="14" distance="1000" k1="-0.2703" k2="0.6179" k3="-0.5882" />
--            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.1359" k2="0.1046" k3="-0.0893" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.1359" k2="0.1046" k3="-0.0893" />
--            <vignetting model="pa" focal="198" aperture="5.6" distance="10" k1="0.1740" k2="-1.4906" k3="0.7154" />
--            <vignetting model="pa" focal="198" aperture="5.6" distance="1000" k1="0.1740" k2="-1.4906" k3="0.7154" />
--            <vignetting model="pa" focal="198" aperture="8" distance="10" k1="0.1009" k2="-0.2197" k3="-0.3024" />
--            <vignetting model="pa" focal="198" aperture="8" distance="1000" k1="0.1009" k2="-0.2197" k3="-0.3024" />
--            <vignetting model="pa" focal="198" aperture="11" distance="10" k1="-0.2110" k2="0.8249" k3="-0.9775" />
--            <vignetting model="pa" focal="198" aperture="11" distance="1000" k1="-0.2110" k2="0.8249" k3="-0.9775" />
--            <vignetting model="pa" focal="198" aperture="16" distance="10" k1="-0.3274" k2="1.1119" k3="-1.0611" />
--            <vignetting model="pa" focal="198" aperture="16" distance="1000" k1="-0.3274" k2="1.1119" k3="-1.0611" />
--            <vignetting model="pa" focal="198" aperture="22" distance="10" k1="-0.2913" k2="0.8743" k3="-0.7632" />
--            <vignetting model="pa" focal="198" aperture="22" distance="1000" k1="-0.2913" k2="0.8743" k3="-0.7632" />
--            <vignetting model="pa" focal="198" aperture="25" distance="10" k1="-0.2552" k2="0.7230" k3="-0.6192" />
--            <vignetting model="pa" focal="198" aperture="25" distance="1000" k1="-0.2552" k2="0.7230" k3="-0.6192" />
--            <vignetting model="pa" focal="247" aperture="5.6" distance="10" k1="0.2984" k2="-2.0448" k3="1.1619" />
--            <vignetting model="pa" focal="247" aperture="5.6" distance="1000" k1="0.2984" k2="-2.0448" k3="1.1619" />
--            <vignetting model="pa" focal="247" aperture="8" distance="10" k1="0.3270" k2="-1.1767" k3="0.4107" />
--            <vignetting model="pa" focal="247" aperture="8" distance="1000" k1="0.3270" k2="-1.1767" k3="0.4107" />
--            <vignetting model="pa" focal="247" aperture="11" distance="10" k1="0.0028" k2="0.1215" k3="-0.5231" />
--            <vignetting model="pa" focal="247" aperture="11" distance="1000" k1="0.0028" k2="0.1215" k3="-0.5231" />
--            <vignetting model="pa" focal="247" aperture="16" distance="10" k1="-0.2433" k2="0.9021" k3="-0.9782" />
--            <vignetting model="pa" focal="247" aperture="16" distance="1000" k1="-0.2433" k2="0.9021" k3="-0.9782" />
--            <vignetting model="pa" focal="247" aperture="29" distance="10" k1="-0.2601" k2="0.7628" k3="-0.6651" />
--            <vignetting model="pa" focal="247" aperture="29" distance="1000" k1="-0.2601" k2="0.7628" k3="-0.6651" />
--            <vignetting model="pa" focal="313" aperture="6.3" distance="10" k1="0.1026" k2="-1.7999" k3="1.1249" />
--            <vignetting model="pa" focal="313" aperture="6.3" distance="1000" k1="0.1026" k2="-1.7999" k3="1.1249" />
--            <vignetting model="pa" focal="313" aperture="9" distance="10" k1="0.3396" k2="-1.2808" k3="0.5093" />
--            <vignetting model="pa" focal="313" aperture="9" distance="1000" k1="0.3396" k2="-1.2808" k3="0.5093" />
--            <vignetting model="pa" focal="313" aperture="13" distance="10" k1="0.0166" k2="0.0599" k3="-0.4619" />
--            <vignetting model="pa" focal="313" aperture="13" distance="1000" k1="0.0166" k2="0.0599" k3="-0.4619" />
--            <vignetting model="pa" focal="313" aperture="18" distance="10" k1="-0.2351" k2="0.8566" k3="-0.9204" />
--            <vignetting model="pa" focal="313" aperture="18" distance="1000" k1="-0.2351" k2="0.8566" k3="-0.9204" />
--            <vignetting model="pa" focal="313" aperture="29" distance="10" k1="-0.2432" k2="0.7067" k3="-0.6224" />
--            <vignetting model="pa" focal="313" aperture="29" distance="1000" k1="-0.2432" k2="0.7067" k3="-0.6224" />
--            <vignetting model="pa" focal="403" aperture="6.3" distance="10" k1="-0.7060" k2="-0.0781" k3="0.1993" />
--            <vignetting model="pa" focal="403" aperture="6.3" distance="1000" k1="-0.7060" k2="-0.0781" k3="0.1993" />
--            <vignetting model="pa" focal="403" aperture="9" distance="10" k1="0.3267" k2="-1.7838" k3="1.0013" />
--            <vignetting model="pa" focal="403" aperture="9" distance="1000" k1="0.3267" k2="-1.7838" k3="1.0013" />
--            <vignetting model="pa" focal="403" aperture="13" distance="10" k1="0.2276" k2="-0.7672" k3="0.1200" />
--            <vignetting model="pa" focal="403" aperture="13" distance="1000" k1="0.2276" k2="-0.7672" k3="0.1200" />
--            <vignetting model="pa" focal="403" aperture="18" distance="10" k1="-0.1027" k2="0.4638" k3="-0.7137" />
--            <vignetting model="pa" focal="403" aperture="18" distance="1000" k1="-0.1027" k2="0.4638" k3="-0.7137" />
--            <vignetting model="pa" focal="403" aperture="29" distance="10" k1="-0.2507" k2="0.8024" k3="-0.7660" />
--            <vignetting model="pa" focal="403" aperture="29" distance="1000" k1="-0.2507" k2="0.8024" k3="-0.7660" />
--            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-1.3351" k2="1.4459" k3="-0.7008" />
--            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-1.3351" k2="1.4459" k3="-0.7008" />
--            <vignetting model="pa" focal="500" aperture="9" distance="10" k1="0.0423" k2="-1.5433" k3="1.0126" />
--            <vignetting model="pa" focal="500" aperture="9" distance="1000" k1="0.0423" k2="-1.5433" k3="1.0126" />
--            <vignetting model="pa" focal="500" aperture="13" distance="10" k1="0.3681" k2="-1.5087" k3="0.6907" />
--            <vignetting model="pa" focal="500" aperture="13" distance="1000" k1="0.3681" k2="-1.5087" k3="0.6907" />
--            <vignetting model="pa" focal="500" aperture="18" distance="10" k1="0.0717" k2="-0.1175" k3="-0.3541" />
--            <vignetting model="pa" focal="500" aperture="18" distance="1000" k1="0.0717" k2="-0.1175" k3="-0.3541" />
--            <vignetting model="pa" focal="500" aperture="29" distance="10" k1="-0.2368" k2="0.8641" k3="-0.9183" />
--            <vignetting model="pa" focal="500" aperture="29" distance="1000" k1="-0.2368" k2="0.8641" k3="-0.9183" />
-+            <distortion model="ptlens" focal="150" a="0.06903" b="-0.2138" c="0.22959"/>
-+            <distortion model="ptlens" focal="198" a="0" b="0.00332" c="0"/>
-+            <distortion model="ptlens" focal="247" a="0.00059" b="0.00686" c="-0.01012"/>
-+            <distortion model="ptlens" focal="289" a="-0.00051" b="0.00293" c="0.00733"/>
-+            <distortion model="ptlens" focal="403" a="-0.00065" b="0.0073" c="-0.00406"/>
-+            <distortion model="ptlens" focal="500" a="-0.00143" b="0.02062" c="-0.03175"/>
-+            <tca model="poly3" focal="150" br="0.0000564" vr="0.9998528" bb="-0.0000710" vb="1.0001432"/>
-+            <tca model="poly3" focal="174" br="0.0000566" vr="0.9998422" bb="-0.0000673" vb="1.0001337"/>
-+            <tca model="poly3" focal="198" br="0.0000745" vr="0.9997846" bb="-0.0000750" vb="1.0001414"/>
-+            <tca model="poly3" focal="229" br="0.0000482" vr="0.9998259" bb="-0.0000559" vb="1.0000967"/>
-+            <tca model="poly3" focal="247" br="0.0000492" vr="0.9997920" bb="-0.0000667" vb="1.0001128"/>
-+            <tca model="poly3" focal="289" br="0.0000477" vr="0.9997628" bb="-0.0000512" vb="1.0000808"/>
-+            <tca model="poly3" focal="403" br="-0.0000402" vr="0.9997650" bb="-0.0000248" vb="1.0000442"/>
-+            <tca model="poly3" focal="500" br="0.0000144" vr="0.9997674" bb="-0.0000066" vb="1.0000035"/>
-+            <vignetting model="pa" focal="150" aperture="5" distance="10" k1="-0.1304" k2="-0.7223" k3="0.2681"/>
-+            <vignetting model="pa" focal="150" aperture="5" distance="1000" k1="-0.1304" k2="-0.7223" k3="0.2681"/>
-+            <vignetting model="pa" focal="150" aperture="7.1" distance="10" k1="-0.0813" k2="0.3026" k3="-0.5990"/>
-+            <vignetting model="pa" focal="150" aperture="7.1" distance="1000" k1="-0.0813" k2="0.3026" k3="-0.5990"/>
-+            <vignetting model="pa" focal="150" aperture="10" distance="10" k1="-0.2643" k2="0.8388" k3="-0.8724"/>
-+            <vignetting model="pa" focal="150" aperture="10" distance="1000" k1="-0.2643" k2="0.8388" k3="-0.8724"/>
-+            <vignetting model="pa" focal="150" aperture="14" distance="10" k1="-0.2703" k2="0.6179" k3="-0.5882"/>
-+            <vignetting model="pa" focal="150" aperture="14" distance="1000" k1="-0.2703" k2="0.6179" k3="-0.5882"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.1359" k2="0.1046" k3="-0.0893"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.1359" k2="0.1046" k3="-0.0893"/>
-+            <vignetting model="pa" focal="198" aperture="5.6" distance="10" k1="0.1740" k2="-1.4906" k3="0.7154"/>
-+            <vignetting model="pa" focal="198" aperture="5.6" distance="1000" k1="0.1740" k2="-1.4906" k3="0.7154"/>
-+            <vignetting model="pa" focal="198" aperture="8" distance="10" k1="0.1009" k2="-0.2197" k3="-0.3024"/>
-+            <vignetting model="pa" focal="198" aperture="8" distance="1000" k1="0.1009" k2="-0.2197" k3="-0.3024"/>
-+            <vignetting model="pa" focal="198" aperture="11" distance="10" k1="-0.2110" k2="0.8249" k3="-0.9775"/>
-+            <vignetting model="pa" focal="198" aperture="11" distance="1000" k1="-0.2110" k2="0.8249" k3="-0.9775"/>
-+            <vignetting model="pa" focal="198" aperture="16" distance="10" k1="-0.3274" k2="1.1119" k3="-1.0611"/>
-+            <vignetting model="pa" focal="198" aperture="16" distance="1000" k1="-0.3274" k2="1.1119" k3="-1.0611"/>
-+            <vignetting model="pa" focal="198" aperture="22" distance="10" k1="-0.2913" k2="0.8743" k3="-0.7632"/>
-+            <vignetting model="pa" focal="198" aperture="22" distance="1000" k1="-0.2913" k2="0.8743" k3="-0.7632"/>
-+            <vignetting model="pa" focal="198" aperture="25" distance="10" k1="-0.2552" k2="0.7230" k3="-0.6192"/>
-+            <vignetting model="pa" focal="198" aperture="25" distance="1000" k1="-0.2552" k2="0.7230" k3="-0.6192"/>
-+            <vignetting model="pa" focal="247" aperture="5.6" distance="10" k1="0.2984" k2="-2.0448" k3="1.1619"/>
-+            <vignetting model="pa" focal="247" aperture="5.6" distance="1000" k1="0.2984" k2="-2.0448" k3="1.1619"/>
-+            <vignetting model="pa" focal="247" aperture="8" distance="10" k1="0.3270" k2="-1.1767" k3="0.4107"/>
-+            <vignetting model="pa" focal="247" aperture="8" distance="1000" k1="0.3270" k2="-1.1767" k3="0.4107"/>
-+            <vignetting model="pa" focal="247" aperture="11" distance="10" k1="0.0028" k2="0.1215" k3="-0.5231"/>
-+            <vignetting model="pa" focal="247" aperture="11" distance="1000" k1="0.0028" k2="0.1215" k3="-0.5231"/>
-+            <vignetting model="pa" focal="247" aperture="16" distance="10" k1="-0.2433" k2="0.9021" k3="-0.9782"/>
-+            <vignetting model="pa" focal="247" aperture="16" distance="1000" k1="-0.2433" k2="0.9021" k3="-0.9782"/>
-+            <vignetting model="pa" focal="247" aperture="29" distance="10" k1="-0.2601" k2="0.7628" k3="-0.6651"/>
-+            <vignetting model="pa" focal="247" aperture="29" distance="1000" k1="-0.2601" k2="0.7628" k3="-0.6651"/>
-+            <vignetting model="pa" focal="313" aperture="6.3" distance="10" k1="0.1026" k2="-1.7999" k3="1.1249"/>
-+            <vignetting model="pa" focal="313" aperture="6.3" distance="1000" k1="0.1026" k2="-1.7999" k3="1.1249"/>
-+            <vignetting model="pa" focal="313" aperture="9" distance="10" k1="0.3396" k2="-1.2808" k3="0.5093"/>
-+            <vignetting model="pa" focal="313" aperture="9" distance="1000" k1="0.3396" k2="-1.2808" k3="0.5093"/>
-+            <vignetting model="pa" focal="313" aperture="13" distance="10" k1="0.0166" k2="0.0599" k3="-0.4619"/>
-+            <vignetting model="pa" focal="313" aperture="13" distance="1000" k1="0.0166" k2="0.0599" k3="-0.4619"/>
-+            <vignetting model="pa" focal="313" aperture="18" distance="10" k1="-0.2351" k2="0.8566" k3="-0.9204"/>
-+            <vignetting model="pa" focal="313" aperture="18" distance="1000" k1="-0.2351" k2="0.8566" k3="-0.9204"/>
-+            <vignetting model="pa" focal="313" aperture="29" distance="10" k1="-0.2432" k2="0.7067" k3="-0.6224"/>
-+            <vignetting model="pa" focal="313" aperture="29" distance="1000" k1="-0.2432" k2="0.7067" k3="-0.6224"/>
-+            <vignetting model="pa" focal="403" aperture="6.3" distance="10" k1="-0.7060" k2="-0.0781" k3="0.1993"/>
-+            <vignetting model="pa" focal="403" aperture="6.3" distance="1000" k1="-0.7060" k2="-0.0781" k3="0.1993"/>
-+            <vignetting model="pa" focal="403" aperture="9" distance="10" k1="0.3267" k2="-1.7838" k3="1.0013"/>
-+            <vignetting model="pa" focal="403" aperture="9" distance="1000" k1="0.3267" k2="-1.7838" k3="1.0013"/>
-+            <vignetting model="pa" focal="403" aperture="13" distance="10" k1="0.2276" k2="-0.7672" k3="0.1200"/>
-+            <vignetting model="pa" focal="403" aperture="13" distance="1000" k1="0.2276" k2="-0.7672" k3="0.1200"/>
-+            <vignetting model="pa" focal="403" aperture="18" distance="10" k1="-0.1027" k2="0.4638" k3="-0.7137"/>
-+            <vignetting model="pa" focal="403" aperture="18" distance="1000" k1="-0.1027" k2="0.4638" k3="-0.7137"/>
-+            <vignetting model="pa" focal="403" aperture="29" distance="10" k1="-0.2507" k2="0.8024" k3="-0.7660"/>
-+            <vignetting model="pa" focal="403" aperture="29" distance="1000" k1="-0.2507" k2="0.8024" k3="-0.7660"/>
-+            <vignetting model="pa" focal="500" aperture="6.3" distance="10" k1="-1.3351" k2="1.4459" k3="-0.7008"/>
-+            <vignetting model="pa" focal="500" aperture="6.3" distance="1000" k1="-1.3351" k2="1.4459" k3="-0.7008"/>
-+            <vignetting model="pa" focal="500" aperture="9" distance="10" k1="0.0423" k2="-1.5433" k3="1.0126"/>
-+            <vignetting model="pa" focal="500" aperture="9" distance="1000" k1="0.0423" k2="-1.5433" k3="1.0126"/>
-+            <vignetting model="pa" focal="500" aperture="13" distance="10" k1="0.3681" k2="-1.5087" k3="0.6907"/>
-+            <vignetting model="pa" focal="500" aperture="13" distance="1000" k1="0.3681" k2="-1.5087" k3="0.6907"/>
-+            <vignetting model="pa" focal="500" aperture="18" distance="10" k1="0.0717" k2="-0.1175" k3="-0.3541"/>
-+            <vignetting model="pa" focal="500" aperture="18" distance="1000" k1="0.0717" k2="-0.1175" k3="-0.3541"/>
-+            <vignetting model="pa" focal="500" aperture="29" distance="10" k1="-0.2368" k2="0.8641" k3="-0.9183"/>
-+            <vignetting model="pa" focal="500" aperture="29" distance="1000" k1="-0.2368" k2="0.8641" k3="-0.9183"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 14mm f/2.8 EX</model>
-@@ -1096,12 +1480,11 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.031106" b="-0.059086" c="0" />
-+            <distortion model="ptlens" focal="14" a="0.031106" b="-0.059086" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 14mm f/3.5 EX</model>
-@@ -1110,12 +1493,12 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0" />
-+            <distortion model="ptlens" focal="14" a="0.013209" b="-0.036529" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 20mm f/1.8 EX DG</model>
-@@ -1124,12 +1507,11 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="20" a="0.034347" b="-0.066549" c="0" />
-+            <distortion model="ptlens" focal="20" a="0.034347" b="-0.066549" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 28mm f/1.8 EX DG</model>
-@@ -1138,12 +1520,12 @@
-         <mount>Minolta AF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.002854" b="-0.010067" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.002854" b="-0.010067" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 30mm f/1.4 EX DC HSM</model>
-@@ -1153,13 +1535,38 @@
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="30" a="0.003926" b="-0.013819" c="0" />
--            <tca model="poly3" focal="30" br="-0.0000193" vr="1.0004990" bb="0.0000694" vb="0.9998978" />
-+            <distortion model="ptlens" focal="30" a="0.003926" b="-0.013819" c="0"/>
-+            <tca model="poly3" focal="30" br="-0.0000193" vr="1.0004990" bb="0.0000694" vb="0.9998978"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 30mm f/1.4 EX DC HSM</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 60D -->
-+            <vignetting model="pa" focal="30" aperture="1.4" distance="10" k1="-0.9623" k2="1.0182" k3="-0.5874"/>
-+            <vignetting model="pa" focal="30" aperture="1.4" distance="1000" k1="-0.9623" k2="1.0182" k3="-0.5874"/>
-+            <vignetting model="pa" focal="30" aperture="2" distance="10" k1="-0.3314" k2="-0.3310" k3="0.1852"/>
-+            <vignetting model="pa" focal="30" aperture="2" distance="1000" k1="-0.3314" k2="-0.3310" k3="0.1852"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-0.1365" k2="-0.2132" k3="-0.0798"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-0.1365" k2="-0.2132" k3="-0.0798"/>
-+            <vignetting model="pa" focal="30" aperture="4" distance="10" k1="-0.2736" k2="0.4235" k3="-0.4892"/>
-+            <vignetting model="pa" focal="30" aperture="4" distance="1000" k1="-0.2736" k2="0.4235" k3="-0.4892"/>
-+            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.2277" k2="0.1873" k3="-0.1811"/>
-+            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.2277" k2="0.1873" k3="-0.1811"/>
-+            <vignetting model="pa" focal="30" aperture="16" distance="10" k1="-0.1794" k2="-0.0665" k3="0.0549"/>
-+            <vignetting model="pa" focal="30" aperture="16" distance="1000" k1="-0.1794" k2="-0.0665" k3="0.0549"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 50mm f/1.4 EX DG HSM</model>
-@@ -1167,97 +1574,207 @@
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="-0.008" b="0.012" c="-0.002" />
-+            <!-- Taken with Canon EOS 5D Mark III -->
-+            <distortion model="ptlens" focal="50" a="0.00772" b="-0.02395" c="0.00956"/>
-+            <tca model="poly3" focal="50" br="-0.0001133" vr="1.0002913" bb="0.0002133" vb="0.9998273"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.1384" k2="0.9834" k3="-0.4448"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.1384" k2="0.9834" k3="-0.4448"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.2557" k2="-0.4501" k3="0.2767"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.2557" k2="-0.4501" k3="0.2767"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1774" k2="0.0340" k3="-0.1780"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1774" k2="0.0340" k3="-0.1780"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2435" k2="0.2137" k3="-0.1663"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2435" k2="0.2137" k3="-0.1663"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.2363" k2="0.1055" k3="-0.0520"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.2363" k2="0.1055" k3="-0.0520"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 50mm F1.4 EX DG HSM</model>
-+        <model>Sigma 50mm f/1.4 EX DG HSM</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-         <mount>4/3 System</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="50" a="0.00055" b="-0.00799" c="0.00993" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.5491" k2="0.2293" k3="-0.0540" />
--            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.5491" k2="0.2293" k3="-0.0540" />
--            <vignetting model="pa" focal="50" aperture="1.7" distance="10" k1="-0.0950" k2="-0.3674" k3="0.1974" />
--            <vignetting model="pa" focal="50" aperture="1.7" distance="1000" k1="-0.0950" k2="-0.3674" k3="0.1974" />
--            <vignetting model="pa" focal="50" aperture="2.2" distance="10" k1="-0.1370" k2="0.0074" k3="0.0052" />
--            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="-0.1370" k2="0.0074" k3="0.0052" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1324" k2="-0.0046" k3="0.0190" />
--            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1324" k2="-0.0046" k3="0.0190" />
--            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1303" k2="-0.0097" k3="0.0256" />
--            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1303" k2="-0.0097" k3="0.0256" />
--            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1414" k2="0.0090" k3="0.0253" />
--            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1414" k2="0.0090" k3="0.0253" />
-+            <distortion model="ptlens" focal="50" a="0.00055" b="-0.00799" c="0.00993"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.5491" k2="0.2293" k3="-0.0540"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.5491" k2="0.2293" k3="-0.0540"/>
-+            <vignetting model="pa" focal="50" aperture="1.7" distance="10" k1="-0.0950" k2="-0.3674" k3="0.1974"/>
-+            <vignetting model="pa" focal="50" aperture="1.7" distance="1000" k1="-0.0950" k2="-0.3674" k3="0.1974"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="10" k1="-0.1370" k2="0.0074" k3="0.0052"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="-0.1370" k2="0.0074" k3="0.0052"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1324" k2="-0.0046" k3="0.0190"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1324" k2="-0.0046" k3="0.0190"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1303" k2="-0.0097" k3="0.0256"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1303" k2="-0.0097" k3="0.0256"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.1414" k2="0.0090" k3="0.0253"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.1414" k2="0.0090" k3="0.0253"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Sigma</maker>
--	    <model>SIGMA 150mm F2.8 MACRO HSM</model>
--	    <focal value="150" />
--	    <aperture min="2.8" max="22" />
-+        <maker>Sigma</maker>
-+        <model>Sigma 70mm f/2.8 EX DG Macro</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7200 -->
-+            <tca model="poly3" focal="70" vr="1.0002393" vb="0.9998053"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 85mm f/1.4 EX DG HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7200 -->
-+            <distortion model="poly3" focal="85" k1="0.00017"/>
-+            <tca model="poly3" focal="85" br="-0.0000282" vr="0.9997791" bb="-0.0000002" vb="0.9999363"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 150mm f/2.8 EX DG APO HSM Macro</model>
-         <mount>4/3 System</mount>
--	    <cropfactor>2</cropfactor>
--	    <calibration>
--	        <distortion focal="150" model="ptlens" a="-0.00472839" b="0.0149475" c="-0.0142996" />
--            <tca model="poly3" focal="150" br="-0.0000907" vr="1.0002304" bb="-0.0000342" vb="0.9999827" />
--	        <vignetting model="pa" focal="150" aperture="2.8" distance="0.38" k1="-0.0056" k2="-0.1198" k3="0.0358" />
--            <vignetting model="pa" focal="150" aperture="2.8" distance="0.7" k1="-0.1310" k2="-0.1905" k3="0.1496" />
--            <vignetting model="pa" focal="150" aperture="2.8" distance="2" k1="-0.5020" k2="0.4247" k3="-0.1839" />
--            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.4838" k2="0.3738" k3="-0.1584" />
--            <vignetting model="pa" focal="150" aperture="4" distance="0.38" k1="-0.0487" k2="0.0384" k3="-0.0292" />
--            <vignetting model="pa" focal="150" aperture="4" distance="0.7" k1="-0.0352" k2="0.0438" k3="-0.0358" />
--            <vignetting model="pa" focal="150" aperture="4" distance="2" k1="-0.0247" k2="0.0366" k3="-0.0823" />
--            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="0.0485" k2="-0.2792" k3="0.1142" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="0.38" k1="-0.0600" k2="0.0608" k3="-0.0440" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="0.7" k1="-0.0385" k2="0.0515" k3="-0.0384" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="2" k1="-0.0307" k2="0.0334" k3="-0.0251" />
--            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.0314" k2="0.0251" k3="-0.0182" />
--            <vignetting model="pa" focal="150" aperture="8" distance="0.38" k1="-0.0684" k2="0.0714" k3="-0.0493" />
--            <vignetting model="pa" focal="150" aperture="8" distance="0.7" k1="-0.0439" k2="0.0702" k3="-0.0532" />
--            <vignetting model="pa" focal="150" aperture="8" distance="2" k1="-0.0368" k2="0.0535" k3="-0.0399" />
--            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0340" k2="0.0338" k3="-0.0251" />
--            <vignetting model="pa" focal="150" aperture="22" distance="0.38" k1="-0.0755" k2="0.0678" k3="-0.0464" />
--            <vignetting model="pa" focal="150" aperture="22" distance="0.7" k1="-0.0346" k2="0.0554" k3="-0.0481" />
--            <vignetting model="pa" focal="150" aperture="22" distance="2" k1="-0.0400" k2="0.0672" k3="-0.0514" />
--            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0357" k2="0.0411" k3="-0.0325" />
--	    </calibration>
-+        <focal value="150"/>
-+        <aperture min="2.8" max="22"/>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <distortion focal="150" model="ptlens" a="-0.00472839" b="0.0149475" c="-0.0142996"/>
-+            <tca model="poly3" focal="150" br="-0.0000907" vr="1.0002304" bb="-0.0000342" vb="0.9999827"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="0.38" k1="-0.0056" k2="-0.1198" k3="0.0358"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="0.7" k1="-0.1310" k2="-0.1905" k3="0.1496"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="2" k1="-0.5020" k2="0.4247" k3="-0.1839"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.4838" k2="0.3738" k3="-0.1584"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="0.38" k1="-0.0487" k2="0.0384" k3="-0.0292"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="0.7" k1="-0.0352" k2="0.0438" k3="-0.0358"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="2" k1="-0.0247" k2="0.0366" k3="-0.0823"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="0.0485" k2="-0.2792" k3="0.1142"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="0.38" k1="-0.0600" k2="0.0608" k3="-0.0440"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="0.7" k1="-0.0385" k2="0.0515" k3="-0.0384"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="2" k1="-0.0307" k2="0.0334" k3="-0.0251"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.0314" k2="0.0251" k3="-0.0182"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="0.38" k1="-0.0684" k2="0.0714" k3="-0.0493"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="0.7" k1="-0.0439" k2="0.0702" k3="-0.0532"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="2" k1="-0.0368" k2="0.0535" k3="-0.0399"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0340" k2="0.0338" k3="-0.0251"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="0.38" k1="-0.0755" k2="0.0678" k3="-0.0464"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="0.7" k1="-0.0346" k2="0.0554" k3="-0.0481"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="2" k1="-0.0400" k2="0.0672" k3="-0.0514"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.0357" k2="0.0411" k3="-0.0325"/>
-+        </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 17-50mm F2.8 EX DC OS HSM</model>
-+        <model>Sigma 150mm f/2.8 EX DG APO HSM Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- This lens really has no reliably measurable distortion. -->
-+            <distortion model="poly3" focal="150" k1="0"/>
-+            <!-- Taken with Canon EOS 5D Mark III -->
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="10" k1="-1.3884" k2="1.3762" k3="-0.6260"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-1.3884" k2="1.3762" k3="-0.6260"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="10" k1="-0.3044" k2="-0.7273" k3="0.5442"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="-0.3044" k2="-0.7273" k3="0.5442"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="0.2119" k2="-1.2276" k3="0.5732"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="0.2119" k2="-1.2276" k3="0.5732"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="10" k1="-0.0564" k2="0.0325" k3="-0.3802"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.0564" k2="0.0325" k3="-0.3802"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.2709" k2="0.4731" k3="-0.3333"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.2709" k2="0.4731" k3="-0.3333"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 17-50mm f/2.8 EX DC OS HSM</model>
-         <mount>Sigma SA</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Canon EF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>Sony Alpha</mount>
--        <!-- FixMe: Must be 1.523 instead -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon D7000 -->
--            <distortion model="ptlens" focal="17" a="0.03046" b="-0.085" c="0.04461" />
--            <distortion model="ptlens" focal="20" a="0.01724" b="-0.04004" c="0.01079" />
--            <distortion model="ptlens" focal="24" a="0.01936" b="-0.05404" c="0.04106" />
--            <distortion model="ptlens" focal="38" a="0.00479" b="-0.00681" c="0.00866" />
--            <distortion model="ptlens" focal="50" a="0.00161" b="0.00176" c="0.00235" />
--            <tca model="poly3" focal="17" br="-0.0000069" vr="1.0005013" bb="-0.0000010" vb="1.0000428" />
--            <tca model="poly3" focal="20" br="-0.0001173" vr="1.0005459" bb="-0.0000000" vb="1.0000432" />
--            <tca model="poly3" focal="24" br="-0.0000116" vr="1.0003051" bb="0.0000272" vb="1.0000239" />
--            <tca model="poly3" focal="38" br="-0.0000502" vr="1.0001111" bb="-0.0000002" vb="1.0000809" />
--            <tca model="poly3" focal="50" br="-0.0000123" vr="0.9999535" bb="-0.0000053" vb="1.0000740" />
-+            <distortion model="ptlens" focal="17" a="0.03046" b="-0.085" c="0.04461"/>
-+            <distortion model="ptlens" focal="20" a="0.01724" b="-0.04004" c="0.01079"/>
-+            <distortion model="ptlens" focal="24" a="0.01936" b="-0.05404" c="0.04106"/>
-+            <distortion model="ptlens" focal="38" a="0.00479" b="-0.00681" c="0.00866"/>
-+            <distortion model="ptlens" focal="50" a="0.00161" b="0.00176" c="0.00235"/>
-+            <tca model="poly3" focal="17" br="-0.0000069" vr="1.0005013" bb="-0.0000010" vb="1.0000428"/>
-+            <tca model="poly3" focal="20" br="-0.0001173" vr="1.0005459" bb="-0.0000000" vb="1.0000432"/>
-+            <tca model="poly3" focal="24" br="-0.0000116" vr="1.0003051" bb="0.0000272" vb="1.0000239"/>
-+            <tca model="poly3" focal="38" br="-0.0000502" vr="1.0001111" bb="-0.0000002" vb="1.0000809"/>
-+            <tca model="poly3" focal="50" br="-0.0000123" vr="0.9999535" bb="-0.0000053" vb="1.0000740"/>
-+            <!-- Taken with Canon 550D -->
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2563" k2="-0.2256" k3="-0.0574"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2563" k2="-0.2256" k3="-0.0574"/>
-+            <vignetting model="pa" focal="17" aperture="3.2" distance="10" k1="-0.3403" k2="0.2047" k3="-0.3241"/>
-+            <vignetting model="pa" focal="17" aperture="3.2" distance="1000" k1="-0.3403" k2="0.2047" k3="-0.3241"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="10" k1="-0.3521" k2="0.2734" k3="-0.3402"/>
-+            <vignetting model="pa" focal="17" aperture="3.5" distance="1000" k1="-0.3521" k2="0.2734" k3="-0.3402"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3535" k2="0.2196" k3="-0.2071"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3535" k2="0.2196" k3="-0.2071"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.3338" k2="0.0389" k3="-0.0052"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.3338" k2="0.0389" k3="-0.0052"/>
-+            <vignetting model="pa" focal="21" aperture="2.8" distance="10" k1="-0.2191" k2="-0.2445" k3="0.0755"/>
-+            <vignetting model="pa" focal="21" aperture="2.8" distance="1000" k1="-0.2191" k2="-0.2445" k3="0.0755"/>
-+            <vignetting model="pa" focal="21" aperture="3.2" distance="10" k1="-0.2087" k2="-0.1093" k3="-0.0078"/>
-+            <vignetting model="pa" focal="21" aperture="3.2" distance="1000" k1="-0.2087" k2="-0.1093" k3="-0.0078"/>
-+            <vignetting model="pa" focal="21" aperture="3.5" distance="10" k1="-0.2437" k2="0.0136" k3="-0.0781"/>
-+            <vignetting model="pa" focal="21" aperture="3.5" distance="1000" k1="-0.2437" k2="0.0136" k3="-0.0781"/>
-+            <vignetting model="pa" focal="21" aperture="4" distance="10" k1="-0.2737" k2="0.0921" k3="-0.0840"/>
-+            <vignetting model="pa" focal="21" aperture="4" distance="1000" k1="-0.2737" k2="0.0921" k3="-0.0840"/>
-+            <vignetting model="pa" focal="21" aperture="22" distance="10" k1="-0.2815" k2="0.0322" k3="-0.0015"/>
-+            <vignetting model="pa" focal="21" aperture="22" distance="1000" k1="-0.2815" k2="0.0322" k3="-0.0015"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.1868" k2="-0.3125" k3="0.1893"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.1868" k2="-0.3125" k3="0.1893"/>
-+            <vignetting model="pa" focal="28" aperture="3.2" distance="10" k1="-0.1265" k2="-0.2237" k3="0.0808"/>
-+            <vignetting model="pa" focal="28" aperture="3.2" distance="1000" k1="-0.1265" k2="-0.2237" k3="0.0808"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.1592" k2="-0.0766" k3="-0.0175"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.1592" k2="-0.0766" k3="-0.0175"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.1989" k2="0.0706" k3="-0.0759"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.1989" k2="0.0706" k3="-0.0759"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2140" k2="0.0338" k3="-0.0083"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2140" k2="0.0338" k3="-0.0083"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4512" k2="0.3298" k3="-0.2143"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4512" k2="0.3298" k3="-0.2143"/>
-+            <vignetting model="pa" focal="35" aperture="3.2" distance="10" k1="-0.1104" k2="-0.2574" k3="0.1153"/>
-+            <vignetting model="pa" focal="35" aperture="3.2" distance="1000" k1="-0.1104" k2="-0.2574" k3="0.1153"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="10" k1="-0.1185" k2="-0.1299" k3="0.0203"/>
-+            <vignetting model="pa" focal="35" aperture="3.5" distance="1000" k1="-0.1185" k2="-0.1299" k3="0.0203"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.1675" k2="0.0716" k3="-0.0787"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1675" k2="0.0716" k3="-0.0787"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1780" k2="0.0312" k3="-0.0092"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1780" k2="0.0312" k3="-0.0092"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.6768" k2="1.0342" k3="-0.8034"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.6768" k2="1.0342" k3="-0.8034"/>
-+            <vignetting model="pa" focal="50" aperture="3.2" distance="10" k1="-0.3589" k2="0.3936" k3="-0.3936"/>
-+            <vignetting model="pa" focal="50" aperture="3.2" distance="1000" k1="-0.3589" k2="0.3936" k3="-0.3936"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="10" k1="-0.1904" k2="0.1252" k3="-0.2321"/>
-+            <vignetting model="pa" focal="50" aperture="3.5" distance="1000" k1="-0.1904" k2="0.1252" k3="-0.2321"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1627" k2="0.2136" k3="-0.2345"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1627" k2="0.2136" k3="-0.2345"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 35mm f/1.4 DG HSM</model>
-@@ -1266,74 +1783,1217 @@
-         <mount>Canon EF</mount>
-         <mount>Sony Alpha</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon D800 -->
--            <distortion model="ptlens" focal="35" a="0.00542" b="-0.01856" c="0.017" />
--            <tca model="poly3" focal="35" br="-0.0000475" vr="1.0001547" bb="0.0000608" vb="0.9999185" />
-+            <distortion model="ptlens" focal="35" a="0.00542" b="-0.01856" c="0.017"/>
-+            <tca model="poly3" focal="35" br="-0.0000475" vr="1.0001547" bb="0.0000608" vb="0.9999185"/>
-+            <!-- Taken with Canon 6D -->
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="10" k1="-2.1367" k2="2.3253" k3="-1.0155"/>
-+            <vignetting model="pa" focal="35" aperture="1.4" distance="1000" k1="-2.1367" k2="2.3253" k3="-1.0155"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="10" k1="-0.2772" k2="-1.1942" k3="0.8120"/>
-+            <vignetting model="pa" focal="35" aperture="2" distance="1000" k1="-0.2772" k2="-1.1942" k3="0.8120"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.5975" k2="0.2676" k3="-0.2046"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.5975" k2="0.2676" k3="-0.2046"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.5539" k2="0.2873" k3="-0.1231"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.5539" k2="0.2873" k3="-0.1231"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.5513" k2="0.1752" k3="0.0213"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.5513" k2="0.1752" k3="0.0213"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.5912" k2="0.2608" k3="-0.0360"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5912" k2="0.2608" k3="-0.0360"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.5909" k2="0.2573" k3="-0.0330"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.5909" k2="0.2573" k3="-0.0330"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.6089" k2="0.2932" k3="-0.0565"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.6089" k2="0.2932" k3="-0.0565"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
-         <model>Sigma 8mm f/3.5 EX DG Circular</model>
-+        <model lang="en">Sigma 8mm f/3.5 EX DG circular fisheye</model>
-+        <model lang="de">Sigma 8mm f/3.5 EX DG zirkulares Fischauge</model>
-         <mount>Nikon F AF</mount>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
--        <!-- FixMe: Must be 1.523 instead -->
--        <cropfactor>1.5</cropfactor>
-         <type>equisolid</type>
-+        <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Nikon D5100 -->
--            <distortion model="ptlens" focal="8" a="-0.18485" b="0.5218" c="-0.42534" />
--            <tca model="linear" focal="8" kr="1.0006" kb="1.0004" />
-+            <distortion model="ptlens" focal="8" a="-0.18485" b="0.5218" c="-0.42534"/>
-+            <tca model="linear" focal="8" kr="1.0006" kb="1.0004"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 8-16mm f/4.5-5.6mm DC HSM</model>
-+        <model>Sigma 8mm f/3.5 EX DG Circular</model>
-+        <model lang="en">Sigma 8mm f/3.5 EX DG circular fisheye</model>
-+        <model lang="de">Sigma 8mm f/3.5 EX DG zirkulares Fischauge</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 7D -->
-+            <distortion model="poly3" focal="8" k1="0.00553"/>
-+            <tca model="poly3" focal="8" br="-0.0000454" vr="1.0003735" bb="-0.0000002" vb="1.0001634"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 8mm f/3.5 EX DG Circular</model>
-+        <model lang="en">Sigma 8mm f/3.5 EX DG circular fisheye</model>
-+        <model lang="de">Sigma 8mm f/3.5 EX DG zirkulares Fischauge</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <!-- Measured with 360° panorama -->
-+            <distortion model="ptlens" focal="8" a="-0.08165" b="-0.09515" c="0.28621"/>
-+            <tca model="poly3" focal="8" br="-0.0000252" vr="1.0005234" bb="0.0003099" vb="1.0001467"/>
-+            <!-- Measured with 360° panorama in Hugin -->
-+            <vignetting model="pa" focal="8" aperture="3.5" distance="0.135" k1="-2.06639" k2="4.6395" k3="-11.25983"/>
-+            <vignetting model="pa" focal="8" aperture="3.5" distance="0.3" k1="-2.03723" k2="4.24517" k3="-11.51688"/>
-+            <vignetting model="pa" focal="8" aperture="3.5" distance="1000" k1="-2.55411" k2="9.10148" k3="-23.34727"/>
-+            <vignetting model="pa" focal="8" aperture="4" distance="0.135" k1="-0.62851" k2="-1.7506" k3="-1.93559"/>
-+            <vignetting model="pa" focal="8" aperture="4" distance="0.5" k1="-0.82165" k2="-0.52554" k3="-5.83513"/>
-+            <vignetting model="pa" focal="8" aperture="4" distance="1000" k1="-0.96382" k2="1.34283" k3="-10.93141"/>
-+            <vignetting model="pa" focal="8" aperture="5.6" distance="0.135" k1="-0.6275941" k2="4.042223" k3="-16.52534"/>
-+            <vignetting model="pa" focal="8" aperture="5.6" distance="0.5" k1="-0.3513" k2="2.12019" k3="-15.07874"/>
-+            <vignetting model="pa" focal="8" aperture="5.6" distance="1000" k1="-0.68014" k2="6.25943" k3="-25.73073"/>
-+            <vignetting model="pa" focal="8" aperture="8" distance="0.135" k1="-1.110118" k2="7.2120167" k3="-21.19665"/>
-+            <vignetting model="pa" focal="8" aperture="8" distance="0.5" k1="-0.47062799" k2="2.034975" k3="-10.22632"/>
-+            <vignetting model="pa" focal="8" aperture="8" distance="1000" k1="-0.74838" k2="5.52904" k3="-20.08166"/>
-+            <vignetting model="pa" focal="8" aperture="11" distance="0.135" k1="-0.6633932" k2="3.5276" k3="-12.61028"/>
-+            <vignetting model="pa" focal="8" aperture="11" distance="0.5" k1="-0.7216194" k2="4.24935" k3="-16.064766"/>
-+            <vignetting model="pa" focal="8" aperture="11" distance="1000" k1="-0.70390" k2="5.56987" k3="-22.17712"/>
-+            <vignetting model="pa" focal="8" aperture="16" distance="0.135" k1="-0.398477" k2="1.7415422" k3="-8.945511"/>
-+            <vignetting model="pa" focal="8" aperture="16" distance="0.5" k1="-1.172114" k2="8.385246" k3="-26.267674"/>
-+            <vignetting model="pa" focal="8" aperture="16" distance="1000" k1="-0.47509" k2="3.09074" k3="-14.00044"/>
-+            <vignetting model="pa" focal="8" aperture="22" distance="0.135" k1="-0.333753" k2="0.7417004" k3="-6.758181"/>
-+            <vignetting model="pa" focal="8" aperture="22" distance="0.5" k1="-0.688855" k2="3.6348324" k3="-14.01661"/>
-+            <vignetting model="pa" focal="8" aperture="22" distance="1000" k1="-0.67013" k2="4.20115" k3="-16.00076"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 8-16mm f/4.5-5.6 DC HSM</model>
-         <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
--        <!-- FixMe: Actually cropfactor 1.613 -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
-             <!-- Taken with Canon 50D -->
--            <distortion model="ptlens" focal="8" a="0.02364" b="-0.13856" c="0.19092" />
--            <distortion model="ptlens" focal="10" a="-0.00766" b="0.00319" c="0.00208" />
--            <distortion model="ptlens" focal="12" a="-0.00826" b="-0.00321" c="0.04216" />
--            <distortion model="ptlens" focal="13" a="-0.00831" b="0.02128" c="-0.00924" />
--            <distortion model="ptlens" focal="16" b="0.0033" />
--            <tca model="poly3" focal="8" br="0.0000456" vr="1.0000029" bb="-0.0000656" vb="1.0001880" />
--            <tca model="poly3" focal="10" vr="1.0002" vb="1" />
--            <tca model="poly3" focal="12" vr="1.0002" vb="1" />
--            <tca model="poly3" focal="13" br="0.0000404" vr="1.0000986" bb="-0.0000936" vb="1.0001406" />
--            <tca model="poly3" focal="16" br="0.0000285" vr="1.0001326" bb="-0.0000943" vb="1.0001116" />
-+            <distortion model="ptlens" focal="8" a="0.02364" b="-0.13856" c="0.19092"/>
-+            <distortion model="ptlens" focal="10" a="-0.00766" b="0.00319" c="0.00208"/>
-+            <distortion model="ptlens" focal="12" a="-0.00826" b="-0.00321" c="0.04216"/>
-+            <distortion model="ptlens" focal="13" a="-0.00831" b="0.02128" c="-0.00924"/>
-+            <distortion model="ptlens" focal="16" b="0.0033"/>
-+            <tca model="poly3" focal="8" br="0.0000456" vr="1.0000029" bb="-0.0000656" vb="1.0001880"/>
-+            <tca model="poly3" focal="10" vr="1.0002" vb="1"/>
-+            <tca model="poly3" focal="12" vr="1.0002" vb="1"/>
-+            <tca model="poly3" focal="13" br="0.0000404" vr="1.0000986" bb="-0.0000936" vb="1.0001406"/>
-+            <tca model="poly3" focal="16" br="0.0000285" vr="1.0001326" bb="-0.0000943" vb="1.0001116"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sigma</maker>
--        <model>Sigma 10-20mm f/3.5 EX DC HSM</model>
-+        <model>Sigma 8-16mm f/4.5-5.6 DC HSM</model>
-+        <mount>Sigma SA</mount>
-         <mount>Canon EF</mount>
--        <!-- FixMe: Actually cropfactor 1.613 -->
-+        <mount>Nikon F AF</mount>
-+        <mount>Pentax KAF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7100 -->
-+            <distortion model="ptlens" focal="8" a="0.00985" b="-0.07668" c="0.09452"/>
-+            <distortion model="ptlens" focal="9" a="-0.0073" b="-0.00074" c="-0.00329"/>
-+            <distortion model="ptlens" focal="10" a="-0.00608" b="-0.00881" c="0.02021"/>
-+            <distortion model="ptlens" focal="12" a="-0.02662" b="0.07817" c="-0.08027"/>
-+            <distortion model="ptlens" focal="14" a="-0.01289" b="0.0306" c="-0.01315"/>
-+            <distortion model="ptlens" focal="16" a="-0.0184" b="0.05749" c="-0.04454"/>
-+            <tca model="poly3" focal="8" br="-0.0000141" vr="1.0001963" bb="-0.0000573" vb="1.0001735"/>
-+            <tca model="poly3" focal="9" br="0.0000277" vr="1.0000937" bb="-0.0000535" vb="1.0002340"/>
-+            <tca model="poly3" focal="10" br="0.0000257" vr="1.0000862" bb="-0.0000679" vb="1.0002823"/>
-+            <tca model="poly3" focal="12" br="0.0000717" vr="1.0000453" bb="-0.0000847" vb="1.0002906"/>
-+            <tca model="poly3" focal="14" br="0.0001034" vr="1.0000726" bb="-0.0000992" vb="1.0002334"/>
-+            <tca model="poly3" focal="16" br="0.0001132" vr="1.0001441" bb="-0.0001015" vb="1.0001906"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 10-20mm f/3.5 EX DC HSM</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF-S</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-         <cropfactor>1.6</cropfactor>
-         <calibration>
-             <!-- Taken with Canon 7D -->
--            <distortion model="ptlens" focal="10" a="0.02278" b="-0.0794" c="0.05484" />
--            <distortion model="ptlens" focal="12" a="0" b="-0.00643" c="0" />
--            <distortion model="ptlens" focal="15" a="0" b="0.00016" c="0" />
--            <distortion model="ptlens" focal="17" a="0.00645" b="-0.01179" c="0.00284" />
--            <distortion model="ptlens" focal="20" a="0" b="0.00321" c="0" />
--            <tca model="poly3" focal="10" br="0.0002606" vr="1.0001530" bb="-0.0001349" vb="1.0002823" />
--            <tca model="poly3" focal="12" br="0.0001459" vr="0.9999845" bb="-0.0001436" vb="1.0004044" />
--            <tca model="poly3" focal="15" br="0.0000907" vr="0.9999725" bb="-0.0001845" vb="1.0005339" />
--            <tca model="poly3" focal="17" br="0.0000683" vr="1.0000128" bb="-0.0001434" vb="1.0003791" />
--            <tca model="poly3" focal="20" br="0.0001555" vr="0.9999808" bb="-0.0001463" vb="1.0003311" />
-+            <!-- Real focal length measured with a 360° panorama -->
-+            <distortion model="ptlens" focal="10" a="0.02278" b="-0.0794" c="0.05484"/>
-+            <distortion model="ptlens" focal="12" a="0" b="-0.00643" c="0"/>
-+            <distortion model="ptlens" focal="15" a="0" b="0.00016" c="0"/>
-+            <distortion model="ptlens" focal="17" a="0.00645" b="-0.01179" c="0.00284"/>
-+            <distortion model="ptlens" focal="20" a="0" b="0.00321" c="0"/>
-+            <tca model="poly3" focal="10" br="0.0002606" vr="1.0001530" bb="-0.0001349" vb="1.0002823"/>
-+            <tca model="poly3" focal="12" br="0.0001459" vr="0.9999845" bb="-0.0001436" vb="1.0004044"/>
-+            <tca model="poly3" focal="15" br="0.0000907" vr="0.9999725" bb="-0.0001845" vb="1.0005339"/>
-+            <tca model="poly3" focal="17" br="0.0000683" vr="1.0000128" bb="-0.0001434" vb="1.0003791"/>
-+            <tca model="poly3" focal="20" br="0.0001555" vr="0.9999808" bb="-0.0001463" vb="1.0003311"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 10-20mm f/3.5 EX DC HSM</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF-S</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5300 -->
-+            <distortion model="ptlens" focal="10" a="-0.00146205" b="-0.00282501" c="-0.00694692"/>
-+            <distortion model="ptlens" focal="11" a="0.0282063" b="-0.0989236" c="0.0843501"/>
-+            <distortion model="ptlens" focal="12" a="0.0227213" b="-0.0914936" c="0.101055"/>
-+            <distortion model="ptlens" focal="13" a="0.0252605" b="-0.10769" c="0.135309"/>
-+            <distortion model="ptlens" focal="14" a="0.0116422" b="-0.0475321" c="0.0596043"/>
-+            <distortion model="ptlens" focal="15" a="0.0210822" b="-0.0845071" c="0.114456"/>
-+            <distortion model="ptlens" focal="16" a="0.021271" b="-0.070938" c="0.0781483"/>
-+            <distortion model="ptlens" focal="17" a="-0.00248171" b="0.0157054" c="-0.0212513"/>
-+            <distortion model="ptlens" focal="18" a="-0.00363957" b="0.00196858" c="0.0169272"/>
-+            <distortion model="ptlens" focal="19" a="0.0281811" b="-0.0867922" c="0.0880965"/>
-+            <distortion model="ptlens" focal="20" a="0.00197062" b="0.00221418" c="-0.00762991"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 17-70mm f/2.8-4 DC Macro OS HSM</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D90 -->
-+            <distortion model="ptlens" focal="17" a="0.01587" b="-0.03928" c="-0.00282"/>
-+            <distortion model="ptlens" focal="19" a="0.02927" b="-0.09256" c="0.08464"/>
-+            <distortion model="ptlens" focal="21" a="0.03571" b="-0.10663" c="0.09304"/>
-+            <distortion model="ptlens" focal="24" a="0.02701" b="-0.09229" c="0.10835"/>
-+            <distortion model="ptlens" focal="28" a="0.01642" b="-0.0481" c="0.05279"/>
-+            <!-- lens was decentred -->
-+            <distortion model="ptlens" focal="35" a="-0.00095" b="0.01248" c="-0.00171"/>
-+            <!-- lens was decentred -->
-+            <distortion model="ptlens" focal="50" a="0.0082" b="-0.01866" c="0.02391"/>
-+            <distortion model="ptlens" focal="70" a="-0.01251" b="0.05374" c="-0.05675"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 70-200mm f/2.8 EX DG Macro HSM II</model>
-+        <mount>4/3 System</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-5 -->
-+            <distortion model="poly3" focal="70" k1="-0.00323"/>
-+            <distortion model="poly3" focal="88" k1="-0.00161"/>
-+            <distortion model="poly3" focal="105" k1="-0.00007"/>
-+            <distortion model="poly3" focal="135" k1="0.00284"/>
-+            <distortion model="poly3" focal="200" k1="0.00517"/>
-+            <tca model="poly3" focal="70" br="-0.0000200" vr="1.0001748" bb="0.0000049" vb="0.9999277"/>
-+            <tca model="poly3" focal="88" br="-0.0000162" vr="1.0000776" bb="-0.0000001" vb="0.9999852"/>
-+            <tca model="poly3" focal="105" br="-0.0000043" vr="0.9999509" bb="-0.0000005" vb="1.0000260"/>
-+            <tca model="poly3" focal="135" br="-0.0000038" vr="0.9997666" bb="-0.0000237" vb="1.0000597"/>
-+            <tca model="poly3" focal="200" br="-0.0000467" vr="0.9996960" bb="-0.0000021" vb="0.9999433"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <!-- FixMe: The "APO" is reported by exiv2 but it's superfluous. -->
-+        <model>Sigma 70-200mm f/2.8 EX DG APO OS HSM</model>
-+        <model lang="en">Sigma 70-200mm f/2.8 EX DG OS HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="70" a="0.00236" b="-0.00978" c="-0.00264"/>
-+            <distortion model="ptlens" focal="104" a="0.00563" b="-0.01131" c="0.00589"/>
-+            <distortion model="ptlens" focal="137" a="0" b="0.00701" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.00897" c="0"/>
-+            <tca model="poly3" focal="70" br="-0.0000025" vr="1.0000793" bb="-0.0000580" vb="1.0001293"/>
-+            <tca model="poly3" focal="86" br="0.0000437" vr="0.9999629" bb="-0.0000657" vb="1.0001863"/>
-+            <tca model="poly3" focal="104" br="0.0000566" vr="0.9998860" bb="-0.0001032" vb="1.0002729"/>
-+            <tca model="poly3" focal="137" br="0.0000700" vr="0.9998057" bb="-0.0001210" vb="1.0002555"/>
-+            <tca model="poly3" focal="200" br="0.0000883" vr="0.9997431" bb="-0.0000989" vb="1.0001402"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.8893" k2="0.5873" k3="-0.3046"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.8893" k2="0.5873" k3="-0.3046"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="10" k1="0.1910" k2="-1.0670" k3="0.4327"/>
-+            <vignetting model="pa" focal="70" aperture="3.5" distance="1000" k1="0.1910" k2="-1.0670" k3="0.4327"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="0.0101" k2="-0.0154" k3="-0.2987"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="0.0101" k2="-0.0154" k3="-0.2987"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1511" k2="0.4913" k3="-0.5698"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1511" k2="0.4913" k3="-0.5698"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.2194" k2="0.6371" k3="-0.5789"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.2194" k2="0.6371" k3="-0.5789"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.1515" k2="0.3243" k3="-0.2431"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.1515" k2="0.3243" k3="-0.2431"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.0928" k2="0.1002" k3="-0.0402"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0928" k2="0.1002" k3="-0.0402"/>
-+            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.1342" k2="0.1769" k3="-0.0882"/>
-+            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.1342" k2="0.1769" k3="-0.0882"/>
-+            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.1435" k2="0.2049" k3="-0.1052"/>
-+            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.1435" k2="0.2049" k3="-0.1052"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1564" k2="0.2277" k3="-0.1180"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1564" k2="0.2277" k3="-0.1180"/>
-+            <vignetting model="pa" focal="86" aperture="2.8" distance="10" k1="-0.8011" k2="0.5025" k3="-0.2612"/>
-+            <vignetting model="pa" focal="86" aperture="2.8" distance="1000" k1="-0.8011" k2="0.5025" k3="-0.2612"/>
-+            <vignetting model="pa" focal="86" aperture="3.5" distance="10" k1="0.1776" k2="-0.9126" k3="0.3512"/>
-+            <vignetting model="pa" focal="86" aperture="3.5" distance="1000" k1="0.1776" k2="-0.9126" k3="0.3512"/>
-+            <vignetting model="pa" focal="86" aperture="4.5" distance="10" k1="-0.0393" k2="0.1320" k3="-0.3081"/>
-+            <vignetting model="pa" focal="86" aperture="4.5" distance="1000" k1="-0.0393" k2="0.1320" k3="-0.3081"/>
-+            <vignetting model="pa" focal="86" aperture="5.6" distance="10" k1="-0.1638" k2="0.4441" k3="-0.4174"/>
-+            <vignetting model="pa" focal="86" aperture="5.6" distance="1000" k1="-0.1638" k2="0.4441" k3="-0.4174"/>
-+            <vignetting model="pa" focal="86" aperture="7.1" distance="10" k1="-0.1406" k2="0.3009" k3="-0.2317"/>
-+            <vignetting model="pa" focal="86" aperture="7.1" distance="1000" k1="-0.1406" k2="0.3009" k3="-0.2317"/>
-+            <vignetting model="pa" focal="86" aperture="9" distance="10" k1="-0.1155" k2="0.1293" k3="-0.0459"/>
-+            <vignetting model="pa" focal="86" aperture="9" distance="1000" k1="-0.1155" k2="0.1293" k3="-0.0459"/>
-+            <vignetting model="pa" focal="86" aperture="11" distance="10" k1="-0.1311" k2="0.1670" k3="-0.0687"/>
-+            <vignetting model="pa" focal="86" aperture="11" distance="1000" k1="-0.1311" k2="0.1670" k3="-0.0687"/>
-+            <vignetting model="pa" focal="86" aperture="14" distance="10" k1="-0.1456" k2="0.1985" k3="-0.0901"/>
-+            <vignetting model="pa" focal="86" aperture="14" distance="1000" k1="-0.1456" k2="0.1985" k3="-0.0901"/>
-+            <vignetting model="pa" focal="86" aperture="18" distance="10" k1="-0.1509" k2="0.1907" k3="-0.0739"/>
-+            <vignetting model="pa" focal="86" aperture="18" distance="1000" k1="-0.1509" k2="0.1907" k3="-0.0739"/>
-+            <vignetting model="pa" focal="86" aperture="22" distance="10" k1="-0.1606" k2="0.1984" k3="-0.0743"/>
-+            <vignetting model="pa" focal="86" aperture="22" distance="1000" k1="-0.1606" k2="0.1984" k3="-0.0743"/>
-+            <vignetting model="pa" focal="97" aperture="2.8" distance="10" k1="-0.7082" k2="0.3921" k3="-0.2121"/>
-+            <vignetting model="pa" focal="97" aperture="2.8" distance="1000" k1="-0.7082" k2="0.3921" k3="-0.2121"/>
-+            <vignetting model="pa" focal="97" aperture="3.5" distance="10" k1="0.1054" k2="-0.6036" k3="0.1442"/>
-+            <vignetting model="pa" focal="97" aperture="3.5" distance="1000" k1="0.1054" k2="-0.6036" k3="0.1442"/>
-+            <vignetting model="pa" focal="97" aperture="4.5" distance="10" k1="-0.1859" k2="0.5307" k3="-0.5384"/>
-+            <vignetting model="pa" focal="97" aperture="4.5" distance="1000" k1="-0.1859" k2="0.5307" k3="-0.5384"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="-0.2082" k2="0.5533" k3="-0.4619"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.2082" k2="0.5533" k3="-0.4619"/>
-+            <vignetting model="pa" focal="97" aperture="7.1" distance="10" k1="-0.1958" k2="0.3997" k3="-0.2706"/>
-+            <vignetting model="pa" focal="97" aperture="7.1" distance="1000" k1="-0.1958" k2="0.3997" k3="-0.2706"/>
-+            <vignetting model="pa" focal="97" aperture="9" distance="10" k1="-0.1295" k2="0.1548" k3="-0.0488"/>
-+            <vignetting model="pa" focal="97" aperture="9" distance="1000" k1="-0.1295" k2="0.1548" k3="-0.0488"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="10" k1="-0.1362" k2="0.1907" k3="-0.0838"/>
-+            <vignetting model="pa" focal="97" aperture="11" distance="1000" k1="-0.1362" k2="0.1907" k3="-0.0838"/>
-+            <vignetting model="pa" focal="97" aperture="14" distance="10" k1="-0.1610" k2="0.2426" k3="-0.1136"/>
-+            <vignetting model="pa" focal="97" aperture="14" distance="1000" k1="-0.1610" k2="0.2426" k3="-0.1136"/>
-+            <vignetting model="pa" focal="97" aperture="18" distance="10" k1="-0.1805" k2="0.2798" k3="-0.1360"/>
-+            <vignetting model="pa" focal="97" aperture="18" distance="1000" k1="-0.1805" k2="0.2798" k3="-0.1360"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="10" k1="-0.1315" k2="0.1363" k3="-0.0377"/>
-+            <vignetting model="pa" focal="97" aperture="22" distance="1000" k1="-0.1315" k2="0.1363" k3="-0.0377"/>
-+            <vignetting model="pa" focal="137" aperture="2.8" distance="10" k1="-0.5045" k2="-0.3905" k3="0.2920"/>
-+            <vignetting model="pa" focal="137" aperture="2.8" distance="1000" k1="-0.5045" k2="-0.3905" k3="0.2920"/>
-+            <vignetting model="pa" focal="137" aperture="3.5" distance="10" k1="0.3406" k2="-1.5303" k3="0.7480"/>
-+            <vignetting model="pa" focal="137" aperture="3.5" distance="1000" k1="0.3406" k2="-1.5303" k3="0.7480"/>
-+            <vignetting model="pa" focal="137" aperture="4.5" distance="10" k1="0.1278" k2="-0.3796" k3="-0.0585"/>
-+            <vignetting model="pa" focal="137" aperture="4.5" distance="1000" k1="0.1278" k2="-0.3796" k3="-0.0585"/>
-+            <vignetting model="pa" focal="137" aperture="5.6" distance="10" k1="-0.0195" k2="0.2068" k3="-0.4238"/>
-+            <vignetting model="pa" focal="137" aperture="5.6" distance="1000" k1="-0.0195" k2="0.2068" k3="-0.4238"/>
-+            <vignetting model="pa" focal="137" aperture="7.1" distance="10" k1="-0.1590" k2="0.5504" k3="-0.5706"/>
-+            <vignetting model="pa" focal="137" aperture="7.1" distance="1000" k1="-0.1590" k2="0.5504" k3="-0.5706"/>
-+            <vignetting model="pa" focal="137" aperture="9" distance="10" k1="-0.0900" k2="0.2635" k3="-0.2454"/>
-+            <vignetting model="pa" focal="137" aperture="9" distance="1000" k1="-0.0900" k2="0.2635" k3="-0.2454"/>
-+            <vignetting model="pa" focal="137" aperture="11" distance="10" k1="-0.0517" k2="0.0631" k3="-0.0405"/>
-+            <vignetting model="pa" focal="137" aperture="11" distance="1000" k1="-0.0517" k2="0.0631" k3="-0.0405"/>
-+            <vignetting model="pa" focal="137" aperture="14" distance="10" k1="-0.1061" k2="0.1023" k3="-0.0230"/>
-+            <vignetting model="pa" focal="137" aperture="14" distance="1000" k1="-0.1061" k2="0.1023" k3="-0.0230"/>
-+            <vignetting model="pa" focal="137" aperture="18" distance="10" k1="-0.0420" k2="-0.0207" k3="0.0466"/>
-+            <vignetting model="pa" focal="137" aperture="18" distance="1000" k1="-0.0420" k2="-0.0207" k3="0.0466"/>
-+            <vignetting model="pa" focal="137" aperture="22" distance="10" k1="-0.1358" k2="0.1564" k3="-0.0558"/>
-+            <vignetting model="pa" focal="137" aperture="22" distance="1000" k1="-0.1358" k2="0.1564" k3="-0.0558"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.5224" k2="1.5956" k3="-0.7242"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.5224" k2="1.5956" k3="-0.7242"/>
-+            <vignetting model="pa" focal="200" aperture="3.5" distance="10" k1="-0.5668" k2="-0.0975" k3="0.1528"/>
-+            <vignetting model="pa" focal="200" aperture="3.5" distance="1000" k1="-0.5668" k2="-0.0975" k3="0.1528"/>
-+            <vignetting model="pa" focal="200" aperture="4.5" distance="10" k1="0.1827" k2="-1.2545" k3="0.7181"/>
-+            <vignetting model="pa" focal="200" aperture="4.5" distance="1000" k1="0.1827" k2="-1.2545" k3="0.7181"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.1489" k2="-0.6608" k3="0.2103"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.1489" k2="-0.6608" k3="0.2103"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="10" k1="-0.0572" k2="0.1043" k3="-0.3017"/>
-+            <vignetting model="pa" focal="200" aperture="7.1" distance="1000" k1="-0.0572" k2="0.1043" k3="-0.3017"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="-0.1676" k2="0.4836" k3="-0.4597"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="-0.1676" k2="0.4836" k3="-0.4597"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.2300" k2="0.4703" k3="-0.3146"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.2300" k2="0.4703" k3="-0.3146"/>
-+            <vignetting model="pa" focal="200" aperture="14" distance="10" k1="-0.1525" k2="0.2350" k3="-0.1212"/>
-+            <vignetting model="pa" focal="200" aperture="14" distance="1000" k1="-0.1525" k2="0.2350" k3="-0.1212"/>
-+            <vignetting model="pa" focal="200" aperture="18" distance="10" k1="-0.1198" k2="0.1299" k3="-0.0465"/>
-+            <vignetting model="pa" focal="200" aperture="18" distance="1000" k1="-0.1198" k2="0.1299" k3="-0.0465"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1574" k2="0.2245" k3="-0.1121"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1574" k2="0.2245" k3="-0.1121"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <!-- FixMe: The "APO" is reported by exiv2 but it's superfluous. -->
-+        <model>Sigma 70-200mm f/2.8 EX DG APO OS HSM</model>
-+        <model lang="en">Sigma 70-200mm f/2.8 EX DG OS HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="poly3" focal="70" k1="-0.0033"/>
-+            <distortion model="poly3" focal="90" k1="-0.00167"/>
-+            <distortion model="poly3" focal="100" k1="0.00038"/>
-+            <distortion model="poly3" focal="140" k1="0.00244"/>
-+            <distortion model="poly3" focal="200" k1="0.00398"/>
-+            <tca model="poly3" focal="70" br="0.0000023" vr="1.0001291" bb="-0.0000306" vb="1.0001155"/>
-+            <tca model="poly3" focal="90" br="0.0000195" vr="1.0000261" bb="-0.0000404" vb="1.0002499"/>
-+            <tca model="poly3" focal="100" br="0.0000209" vr="0.9999191" bb="-0.0000173" vb="1.0002320"/>
-+            <tca model="poly3" focal="140" br="0.0000188" vr="0.9998127" bb="-0.0000376" vb="1.0002433"/>
-+            <tca model="poly3" focal="200" br="0.0000436" vr="0.9997250" bb="-0.0000510" vb="1.0001268"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.4490" k2="0.1998" k3="-0.0468"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.4490" k2="0.1998" k3="-0.0468"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0717" k2="0.0543" k3="-0.0356"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0717" k2="0.0543" k3="-0.0356"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.0690" k2="0.0409" k3="-0.0230"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.0690" k2="0.0409" k3="-0.0230"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.0668" k2="0.0475" k3="-0.0336"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.0668" k2="0.0475" k3="-0.0336"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.0838" k2="0.0809" k3="-0.0500"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.0838" k2="0.0809" k3="-0.0500"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="10" k1="-0.4213" k2="0.2233" k3="-0.0717"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.4213" k2="0.2233" k3="-0.0717"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="10" k1="-0.0749" k2="0.0528" k3="-0.0278"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.0749" k2="0.0528" k3="-0.0278"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="10" k1="-0.0735" k2="0.0512" k3="-0.0296"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="-0.0735" k2="0.0512" k3="-0.0296"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="10" k1="-0.0742" k2="0.0548" k3="-0.0351"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.0742" k2="0.0548" k3="-0.0351"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="10" k1="-0.0850" k2="0.0836" k3="-0.0531"/>
-+            <vignetting model="pa" focal="90" aperture="22" distance="1000" k1="-0.0850" k2="0.0836" k3="-0.0531"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="10" k1="-0.4097" k2="0.2601" k3="-0.1040"/>
-+            <vignetting model="pa" focal="100" aperture="2.8" distance="1000" k1="-0.4097" k2="0.2601" k3="-0.1040"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.0819" k2="0.0704" k3="-0.0371"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.0819" k2="0.0704" k3="-0.0371"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.0717" k2="0.0386" k3="-0.0176"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.0717" k2="0.0386" k3="-0.0176"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.0639" k2="0.0322" k3="-0.0203"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.0639" k2="0.0322" k3="-0.0203"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.0780" k2="0.0693" k3="-0.0450"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.0780" k2="0.0693" k3="-0.0450"/>
-+            <vignetting model="pa" focal="140" aperture="2.8" distance="10" k1="-0.3524" k2="0.2271" k3="-0.1535"/>
-+            <vignetting model="pa" focal="140" aperture="2.8" distance="1000" k1="-0.3524" k2="0.2271" k3="-0.1535"/>
-+            <vignetting model="pa" focal="140" aperture="4" distance="10" k1="-0.1104" k2="0.1910" k3="-0.1561"/>
-+            <vignetting model="pa" focal="140" aperture="4" distance="1000" k1="-0.1104" k2="0.1910" k3="-0.1561"/>
-+            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="-0.0927" k2="0.0899" k3="-0.0485"/>
-+            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="-0.0927" k2="0.0899" k3="-0.0485"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="-0.0735" k2="0.0438" k3="-0.0231"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="-0.0735" k2="0.0438" k3="-0.0231"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="10" k1="-0.0734" k2="0.0626" k3="-0.0425"/>
-+            <vignetting model="pa" focal="140" aperture="22" distance="1000" k1="-0.0734" k2="0.0626" k3="-0.0425"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-0.8337" k2="0.7718" k3="-0.3477"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-0.8337" k2="0.7718" k3="-0.3477"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="0.0480" k2="-0.5987" k3="0.3456"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="0.0480" k2="-0.5987" k3="0.3456"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.1135" k2="0.1709" k3="-0.1291"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.1135" k2="0.1709" k3="-0.1291"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0999" k2="0.0943" k3="-0.0509"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0999" k2="0.0943" k3="-0.0509"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.0900" k2="0.0904" k3="-0.0554"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.0900" k2="0.0904" k3="-0.0554"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 10mm f/2.8 EX DC Fisheye HSM</model>
-+        <model lang="de">Sigma 10mm f/2.8 EX DC Fischauge HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <type>equisolid</type>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS 450D -->
-+            <distortion model="ptlens" focal="10" a="0.01165" b="-0.04879" c="0.09652"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 10mm f/2.8 EX DC Fisheye HSM</model>
-+        <model lang="de">Sigma 10mm f/2.8 EX DC Fischauge HSM</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <type>fisheye</type>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="ptlens" focal="10" a="0.00057" b="-0.02738" c="0.00014"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 100-300mm f/4 APO EX DG HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="ptlens" focal="100" a="0.00007" b="-0.0008" c="-0.00001"/>
-+            <distortion model="ptlens" focal="137" a="-0.00066" b="0.00279" c="-0.00217"/>
-+            <distortion model="ptlens" focal="196" a="-0.00028" b="0.00292" c="-0.0011"/>
-+            <distortion model="ptlens" focal="254" a="-0.00029" b="0.00366" c="-0.00198"/>
-+            <distortion model="ptlens" focal="300" a="0.00081" b="0.0001" c="0.002"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="100" k1="-0.3155" k2="0.2954" k3="-0.15596"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="100" k1="0.16981" k2="-0.60469" k3="0.37843"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="100" k1="0.01921" k2="-0.01703" k3="0.00141"/>
-+            <vignetting model="pa" focal="137" aperture="4" distance="100" k1="-0.24029" k2="0.21036" k3="-0.11008"/>
-+            <vignetting model="pa" focal="137" aperture="5.6" distance="100" k1="0.02429" k2="-0.13049" k3="0.05237"/>
-+            <vignetting model="pa" focal="137" aperture="8" distance="100" k1="0.03889" k2="-0.09327" k3="0.06447"/>
-+            <vignetting model="pa" focal="196" aperture="4" distance="100" k1="-0.19474" k2="0.15132" k3="-0.08183"/>
-+            <vignetting model="pa" focal="196" aperture="5.6" distance="100" k1="-0.02985" k2="0.08378" k3="-0.10544"/>
-+            <vignetting model="pa" focal="196" aperture="8" distance="100" k1="-0.0340" k2="0.04936" k3="-0.03488"/>
-+            <vignetting model="pa" focal="254" aperture="4" distance="100" k1="-0.1021" k2="-0.1678" k3="0.09927"/>
-+            <vignetting model="pa" focal="254" aperture="5.6" distance="100" k1="0.10468" k2="-0.39925" k3="0.18583"/>
-+            <vignetting model="pa" focal="254" aperture="8" distance="100" k1="-0.13138" k2="0.34017" k3="-0.27443"/>
-+            <vignetting model="pa" focal="300" aperture="4" distance="100" k1="-0.20833" k2="-0.21414" k3="0.26428"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="100" k1="-0.03272" k2="-0.35374" k3="0.22915"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="100" k1="-0.0888" k2="0.13017" k3="-0.06867"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 100-300mm f/4 APO EX DG HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="100" a="0.00075" b="-0.00524" c="0.00291"/>
-+            <distortion model="ptlens" focal="135" a="0.00285" b="-0.00904" c="0.00967"/>
-+            <distortion model="ptlens" focal="210" a="-0.00012" b="0.00449" c="-0.0018"/>
-+            <distortion model="ptlens" focal="250" a="0.00444" b="-0.01026" c="0.01586"/>
-+            <distortion model="ptlens" focal="300" a="-0.00125" b="0.00932" c="-0.00324"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="10" k1="-0.63946" k2="0.78525" k3="-0.51379"/>
-+            <vignetting model="pa" focal="100" aperture="4" distance="1000" k1="-0.63946" k2="0.78525" k3="-0.51379"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.2506" k2="0.04868" k3="-0.06119"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.2506" k2="0.04868" k3="-0.06119"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.04002" k2="0.07529" k3="-0.21472"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.04002" k2="0.07529" k3="-0.21472"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.02681" k2="0.03459" k3="-0.05438"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.02681" k2="0.03459" k3="-0.05438"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="10" k1="-0.49673" k2="0.50408" k3="-0.29663"/>
-+            <vignetting model="pa" focal="135" aperture="4" distance="1000" k1="-0.49673" k2="0.50408" k3="-0.29663"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="-0.16118" k2="-0.03828" k3="-0.01797"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="-0.16118" k2="-0.03828" k3="-0.01797"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.02714" k2="0.03486" k3="-0.10248"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.02714" k2="0.03486" k3="-0.10248"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="0" k2="0" k3="0"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="0" k2="0" k3="0"/>
-+            <vignetting model="pa" focal="210" aperture="4" distance="10" k1="-0.19135" k2="-0.12367" k3="-0.02862"/>
-+            <vignetting model="pa" focal="210" aperture="4" distance="1000" k1="-0.19135" k2="-0.12367" k3="-0.02862"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="10" k1="0.00159" k2="-0.35824" k3="0.05758"/>
-+            <vignetting model="pa" focal="210" aperture="5.6" distance="1000" k1="0.00159" k2="-0.35824" k3="0.05758"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="10" k1="-0.19166" k2="0.45016" k3="-0.49235"/>
-+            <vignetting model="pa" focal="210" aperture="8" distance="1000" k1="-0.19166" k2="0.45016" k3="-0.49235"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="10" k1="-0.0865" k2="0.08241" k3="-0.05934"/>
-+            <vignetting model="pa" focal="210" aperture="11" distance="1000" k1="-0.0865" k2="0.08241" k3="-0.05934"/>
-+            <vignetting model="pa" focal="250" aperture="4" distance="10" k1="-0.45098" k2="0.11093" k3="-0.03267"/>
-+            <vignetting model="pa" focal="250" aperture="4" distance="1000" k1="-0.45098" k2="0.11093" k3="-0.03267"/>
-+            <vignetting model="pa" focal="250" aperture="5.6" distance="10" k1="-0.0752" k2="-0.60368" k3="0.40668"/>
-+            <vignetting model="pa" focal="250" aperture="5.6" distance="1000" k1="-0.0752" k2="-0.60368" k3="0.40668"/>
-+            <vignetting model="pa" focal="250" aperture="8" distance="10" k1="-0.03932" k2="-0.17476" k3="-0.04248"/>
-+            <vignetting model="pa" focal="250" aperture="8" distance="1000" k1="-0.03932" k2="-0.17476" k3="-0.04248"/>
-+            <vignetting model="pa" focal="250" aperture="11" distance="10" k1="-0.05962" k2="0.04753" k3="-0.10372"/>
-+            <vignetting model="pa" focal="250" aperture="11" distance="1000" k1="-0.05962" k2="0.04753" k3="-0.10372"/>
-+            <vignetting model="pa" focal="300" aperture="4" distance="10" k1="-0.00125" k2="0.00932" k3="-0.00324"/>
-+            <vignetting model="pa" focal="300" aperture="4" distance="1000" k1="-0.00125" k2="0.00932" k3="-0.00324"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-0.51532" k2="0.33078" k3="-0.17934"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-0.51532" k2="0.33078" k3="-0.17934"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="0.02277" k2="-0.69185" k3="0.43795"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="0.02277" k2="-0.69185" k3="0.43795"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.16967" k2="0.33179" k3="-0.35087"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.16967" k2="0.33179" k3="-0.35087"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 100-300mm f/4 APO EX DG HSM + Kenko Teleplus PRO 300 AF 1.4x DGX extender</model>
-+        <model lang="en">Sigma 100-300mm f/4 APO EX DG HSM + Kenko Teleplus PRO 300 AF 1.4× DGX ext.</model>
-+        <model lang="de">Sigma 100-300mm f/4 APO EX DG HSM + Kenko Teleplus PRO 300 AF 1.4× DGX Konv.</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800 -->
-+            <distortion model="ptlens" focal="140" a="-0.00597" b="0.00974" c="-0.00848"/>
-+            <distortion model="ptlens" focal="190" a="-0.00562" b="0.01101" c="-0.00757"/>
-+            <distortion model="ptlens" focal="270" a="-0.00335" b="0.00606" c="-0.00089"/>
-+            <distortion model="ptlens" focal="290" a="-0.00426" b="0.00942" c="-0.0042"/>
-+            <distortion model="ptlens" focal="350" a="-0.00427" b="0.01015" c="-0.00509"/>
-+            <distortion model="ptlens" focal="420" a="-0.00677" b="0.01777" c="-0.01176"/>
-+            <vignetting model="pa" focal="140" aperture="5.6" distance="10" k1="-0.39578" k2="0.57099" k3="-0.45125"/>
-+            <vignetting model="pa" focal="140" aperture="5.6" distance="1000" k1="-0.39578" k2="0.57099" k3="-0.45125"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="10" k1="-0.10561" k2="0.03059" k3="-0.10984"/>
-+            <vignetting model="pa" focal="140" aperture="8" distance="1000" k1="-0.10561" k2="0.03059" k3="-0.10984"/>
-+            <vignetting model="pa" focal="190" aperture="5.6" distance="10" k1="-0.39271" k2="0.70381" k3="-0.5887"/>
-+            <vignetting model="pa" focal="190" aperture="5.6" distance="1000" k1="-0.39271" k2="0.70381" k3="-0.5887"/>
-+            <vignetting model="pa" focal="190" aperture="8" distance="10" k1="-0.18611" k2="0.38611" k3="-0.37591"/>
-+            <vignetting model="pa" focal="190" aperture="8" distance="1000" k1="-0.18611" k2="0.38611" k3="-0.37591"/>
-+            <vignetting model="pa" focal="270" aperture="5.6" distance="10" k1="-0.38544" k2="0.71939" k3="-0.60858"/>
-+            <vignetting model="pa" focal="270" aperture="5.6" distance="1000" k1="-0.38544" k2="0.71939" k3="-0.60858"/>
-+            <vignetting model="pa" focal="290" aperture="8" distance="10" k1="-0.13135" k2="0.32962" k3="-0.37561"/>
-+            <vignetting model="pa" focal="290" aperture="8" distance="1000" k1="-0.13135" k2="0.32962" k3="-0.37561"/>
-+            <vignetting model="pa" focal="350" aperture="5.6" distance="10" k1="-0.31466" k2="0.37507" k3="-0.34992"/>
-+            <vignetting model="pa" focal="350" aperture="5.6" distance="1000" k1="-0.31466" k2="0.37507" k3="-0.34992"/>
-+            <vignetting model="pa" focal="350" aperture="8" distance="10" k1="-0.05521" k2="-0.0198" k3="-0.14089"/>
-+            <vignetting model="pa" focal="350" aperture="8" distance="1000" k1="-0.05521" k2="-0.0198" k3="-0.14089"/>
-+            <vignetting model="pa" focal="420" aperture="5.6" distance="10" k1="-0.53536" k2="0.69771" k3="-0.49273"/>
-+            <vignetting model="pa" focal="420" aperture="5.6" distance="1000" k1="-0.53536" k2="0.69771" k3="-0.49273"/>
-+            <vignetting model="pa" focal="420" aperture="8" distance="10" k1="-0.32735" k2="0.2811" k3="-0.2171"/>
-+            <vignetting model="pa" focal="420" aperture="8" distance="1000" k1="-0.32735" k2="0.2811" k3="-0.2171"/>
-+            <vignetting model="pa" focal="420" aperture="11" distance="10" k1="-0.02513" k2="-0.07048" k3="-0.01458"/>
-+            <vignetting model="pa" focal="420" aperture="11" distance="1000" k1="-0.02513" k2="-0.07048" k3="-0.01458"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 50-150mm f/2.8 APO EX DC HSM II</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D200 -->
-+            <distortion model="ptlens" focal="50" a="0.00143" b="-0.0113" c="0.00788"/>
-+            <distortion model="ptlens" focal="75" a="0.00207" b="-0.00519" c="0.0052"/>
-+            <distortion model="ptlens" focal="105" a="0.00115" b="0.00265" c="0.00031"/>
-+            <distortion model="ptlens" focal="150" a="0.00072" b="0.00631" c="-0.00073"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="100" k1="-0.3469" k2="0.34748" k3="-0.2902"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="100" k1="-0.0702" k2="0.38516" k3="-0.44561"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="100" k1="-0.07583" k2="0.32289" k3="-0.27317"/>
-+            <vignetting model="pa" focal="75" aperture="2.8" distance="100" k1="-0.2858" k2="0.29719" k3="-0.25336"/>
-+            <vignetting model="pa" focal="75" aperture="4" distance="100" k1="-0.01767" k2="0.21834" k3="-0.25478"/>
-+            <vignetting model="pa" focal="75" aperture="5.6" distance="100" k1="0.02044" k2="-0.01582" k3="0.00834"/>
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="100" k1="-0.10172" k2="-0.3325" k3="0.10147"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="100" k1="0.06624" k2="-0.05579" k3="-0.20602"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="100" k1="-0.0853" k2="0.40954" k3="-0.44304"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="100" k1="-0.65999" k2="0.58565" k3="-0.31284"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="100" k1="0.10953" k2="-0.77165" k3="0.45448"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="100" k1="-0.0087" k2="0.12197" k3="-0.29994"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="100" k1="-0.0864" k2="0.39283" k3="-0.41541"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 50-150mm f/2.8 APO EX DC HSM II</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 60D -->
-+            <distortion model="poly3" focal="50" k1="-0.00415"/>
-+            <distortion model="poly3" focal="72" k1="0.00184"/>
-+            <distortion model="poly3" focal="89" k1="0.00472"/>
-+            <distortion model="poly3" focal="103" k1="0.00552"/>
-+            <distortion model="poly3" focal="121" k1="0.00617"/>
-+            <distortion model="poly3" focal="150" k1="0.007"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 50-150mm f/2.8 APO EX DC OS HSM</model>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7100 -->
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.8835" k2="0.8004" k3="-0.3800"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.8835" k2="0.8004" k3="-0.3800"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="0.0261" k2="-0.4498" k3="0.2086"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="0.0261" k2="-0.4498" k3="0.2086"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1495" k2="0.2558" k3="-0.1906"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1495" k2="0.2558" k3="-0.1906"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.1144" k2="0.0877" k3="-0.0050"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.1144" k2="0.0877" k3="-0.0050"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1511" k2="0.1616" k3="-0.0430"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1511" k2="0.1616" k3="-0.0430"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.7369" k2="0.6745" k3="-0.3250"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.7369" k2="0.6745" k3="-0.3250"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.0574" k2="-0.0668" k3="-0.0096"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.0574" k2="-0.0668" k3="-0.0096"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1020" k2="0.0382" k3="0.0347"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1020" k2="0.0382" k3="0.0347"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1181" k2="0.0875" k3="0.0048"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1181" k2="0.0875" k3="0.0048"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1650" k2="0.2250" k3="-0.0943"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1650" k2="0.2250" k3="-0.0943"/>
-+            <vignetting model="pa" focal="98" aperture="2.8" distance="10" k1="-0.6455" k2="0.7361" k3="-0.5267"/>
-+            <vignetting model="pa" focal="98" aperture="2.8" distance="1000" k1="-0.6455" k2="0.7361" k3="-0.5267"/>
-+            <vignetting model="pa" focal="98" aperture="4" distance="10" k1="-0.1400" k2="0.3700" k3="-0.4613"/>
-+            <vignetting model="pa" focal="98" aperture="4" distance="1000" k1="-0.1400" k2="0.3700" k3="-0.4613"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="10" k1="-0.1784" k2="0.3640" k3="-0.2851"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.1784" k2="0.3640" k3="-0.2851"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="10" k1="-0.1073" k2="0.0515" k3="0.0330"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.1073" k2="0.0515" k3="0.0330"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="10" k1="-0.1660" k2="0.2371" k3="-0.1039"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.1660" k2="0.2371" k3="-0.1039"/>
-+            <vignetting model="pa" focal="130" aperture="2.8" distance="10" k1="-0.4459" k2="-0.0096" k3="-0.0431"/>
-+            <vignetting model="pa" focal="130" aperture="2.8" distance="1000" k1="-0.4459" k2="-0.0096" k3="-0.0431"/>
-+            <vignetting model="pa" focal="130" aperture="4" distance="10" k1="0.0900" k2="-0.4760" k3="0.0787"/>
-+            <vignetting model="pa" focal="130" aperture="4" distance="1000" k1="0.0900" k2="-0.4760" k3="0.0787"/>
-+            <vignetting model="pa" focal="130" aperture="5.6" distance="10" k1="-0.1668" k2="0.4178" k3="-0.4417"/>
-+            <vignetting model="pa" focal="130" aperture="5.6" distance="1000" k1="-0.1668" k2="0.4178" k3="-0.4417"/>
-+            <vignetting model="pa" focal="130" aperture="8" distance="10" k1="-0.1529" k2="0.2377" k3="-0.1452"/>
-+            <vignetting model="pa" focal="130" aperture="8" distance="1000" k1="-0.1529" k2="0.2377" k3="-0.1452"/>
-+            <vignetting model="pa" focal="130" aperture="22" distance="10" k1="-0.1597" k2="0.2169" k3="-0.0881"/>
-+            <vignetting model="pa" focal="130" aperture="22" distance="1000" k1="-0.1597" k2="0.2169" k3="-0.0881"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="10" k1="-0.7113" k2="0.2236" k3="-0.0584"/>
-+            <vignetting model="pa" focal="150" aperture="2.8" distance="1000" k1="-0.7113" k2="0.2236" k3="-0.0584"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="10" k1="0.1357" k2="-0.9865" k3="0.4973"/>
-+            <vignetting model="pa" focal="150" aperture="4" distance="1000" k1="0.1357" k2="-0.9865" k3="0.4973"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="10" k1="-0.0681" k2="0.1370" k3="-0.3250"/>
-+            <vignetting model="pa" focal="150" aperture="5.6" distance="1000" k1="-0.0681" k2="0.1370" k3="-0.3250"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="10" k1="-0.2089" k2="0.4913" k3="-0.4125"/>
-+            <vignetting model="pa" focal="150" aperture="8" distance="1000" k1="-0.2089" k2="0.4913" k3="-0.4125"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="10" k1="-0.1511" k2="0.1851" k3="-0.0612"/>
-+            <vignetting model="pa" focal="150" aperture="22" distance="1000" k1="-0.1511" k2="0.1851" k3="-0.0612"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 105mm f/2.8 EX DG OS HSM Macro</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7000 -->
-+            <distortion model="poly3" focal="105" k1="-0.00027"/>
-+            <!-- There isn't really any -->
-+            <tca model="poly3" focal="105"/>
-+            <!-- Taken with Nikon D7100 -->
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="10" k1="-0.9250" k2="0.9151" k3="-0.4197"/>
-+            <vignetting model="pa" focal="105" aperture="2.8" distance="1000" k1="-0.9250" k2="0.9151" k3="-0.4197"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="0.0419" k2="-0.4258" k3="0.1698"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="0.0419" k2="-0.4258" k3="0.1698"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.0656" k2="0.0250" k3="-0.0148"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.0656" k2="0.0250" k3="-0.0148"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.0620" k2="0.0076" k3="-0.0034"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.0620" k2="0.0076" k3="-0.0034"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.1506" k2="0.1615" k3="-0.0732"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.1506" k2="0.1615" k3="-0.0732"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 80-400mm f/4.5-5.6 EX DG OS</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <vignetting model="pa" focal="80" aperture="4.5" distance="10" k1="-0.1063" k2="-0.9663" k3="0.4644"/>
-+            <vignetting model="pa" focal="80" aperture="4.5" distance="1000" k1="-0.1063" k2="-0.9663" k3="0.4644"/>
-+            <vignetting model="pa" focal="80" aperture="6.3" distance="10" k1="-0.0421" k2="-0.0532" k3="-0.3293"/>
-+            <vignetting model="pa" focal="80" aperture="6.3" distance="1000" k1="-0.0421" k2="-0.0532" k3="-0.3293"/>
-+            <vignetting model="pa" focal="80" aperture="9" distance="10" k1="-0.1976" k2="0.4278" k3="-0.5083"/>
-+            <vignetting model="pa" focal="80" aperture="9" distance="1000" k1="-0.1976" k2="0.4278" k3="-0.5083"/>
-+            <vignetting model="pa" focal="80" aperture="13" distance="10" k1="-0.1713" k2="0.2305" k3="-0.2271"/>
-+            <vignetting model="pa" focal="80" aperture="13" distance="1000" k1="-0.1713" k2="0.2305" k3="-0.2271"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="10" k1="-0.0951" k2="-0.1184" k3="0.1129"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="1000" k1="-0.0951" k2="-0.1184" k3="0.1129"/>
-+            <vignetting model="pa" focal="128" aperture="5" distance="10" k1="-0.2341" k2="-0.3492" k3="0.0958"/>
-+            <vignetting model="pa" focal="128" aperture="5" distance="1000" k1="-0.2341" k2="-0.3492" k3="0.0958"/>
-+            <vignetting model="pa" focal="128" aperture="7.1" distance="10" k1="-0.2059" k2="0.4177" k3="-0.4996"/>
-+            <vignetting model="pa" focal="128" aperture="7.1" distance="1000" k1="-0.2059" k2="0.4177" k3="-0.4996"/>
-+            <vignetting model="pa" focal="128" aperture="10" distance="10" k1="-0.1857" k2="0.2513" k3="-0.2311"/>
-+            <vignetting model="pa" focal="128" aperture="10" distance="1000" k1="-0.1857" k2="0.2513" k3="-0.2311"/>
-+            <vignetting model="pa" focal="128" aperture="14" distance="10" k1="-0.0990" k2="-0.0864" k3="0.0815"/>
-+            <vignetting model="pa" focal="128" aperture="14" distance="1000" k1="-0.0990" k2="-0.0864" k3="0.0815"/>
-+            <vignetting model="pa" focal="128" aperture="36" distance="10" k1="-0.1045" k2="-0.0884" k3="0.0890"/>
-+            <vignetting model="pa" focal="128" aperture="36" distance="1000" k1="-0.1045" k2="-0.0884" k3="0.0890"/>
-+            <vignetting model="pa" focal="199" aperture="5.6" distance="10" k1="0.0113" k2="-1.1181" k3="0.5769"/>
-+            <vignetting model="pa" focal="199" aperture="5.6" distance="1000" k1="0.0113" k2="-1.1181" k3="0.5769"/>
-+            <vignetting model="pa" focal="199" aperture="8" distance="10" k1="0.0355" k2="-0.3309" k3="-0.0910"/>
-+            <vignetting model="pa" focal="199" aperture="8" distance="1000" k1="0.0355" k2="-0.3309" k3="-0.0910"/>
-+            <vignetting model="pa" focal="199" aperture="11" distance="10" k1="-0.2075" k2="0.5056" k3="-0.5866"/>
-+            <vignetting model="pa" focal="199" aperture="11" distance="1000" k1="-0.2075" k2="0.5056" k3="-0.5866"/>
-+            <vignetting model="pa" focal="199" aperture="16" distance="10" k1="-0.1956" k2="0.3443" k3="-0.3236"/>
-+            <vignetting model="pa" focal="199" aperture="16" distance="1000" k1="-0.1956" k2="0.3443" k3="-0.3236"/>
-+            <vignetting model="pa" focal="199" aperture="40" distance="10" k1="-0.0961" k2="-0.0802" k3="0.0820"/>
-+            <vignetting model="pa" focal="199" aperture="40" distance="1000" k1="-0.0961" k2="-0.0802" k3="0.0820"/>
-+            <vignetting model="pa" focal="315" aperture="5.6" distance="10" k1="-0.5488" k2="-0.5040" k3="0.4889"/>
-+            <vignetting model="pa" focal="315" aperture="5.6" distance="1000" k1="-0.5488" k2="-0.5040" k3="0.4889"/>
-+            <vignetting model="pa" focal="315" aperture="8" distance="10" k1="0.2021" k2="-1.6294" k3="0.9609"/>
-+            <vignetting model="pa" focal="315" aperture="8" distance="1000" k1="0.2021" k2="-1.6294" k3="0.9609"/>
-+            <vignetting model="pa" focal="315" aperture="11" distance="10" k1="0.1347" k2="-0.7127" k3="0.1503"/>
-+            <vignetting model="pa" focal="315" aperture="11" distance="1000" k1="0.1347" k2="-0.7127" k3="0.1503"/>
-+            <vignetting model="pa" focal="315" aperture="16" distance="10" k1="-0.1791" k2="0.4427" k3="-0.6240"/>
-+            <vignetting model="pa" focal="315" aperture="16" distance="1000" k1="-0.1791" k2="0.4427" k3="-0.6240"/>
-+            <vignetting model="pa" focal="315" aperture="40" distance="10" k1="-0.1726" k2="0.1452" k3="-0.0829"/>
-+            <vignetting model="pa" focal="315" aperture="40" distance="1000" k1="-0.1726" k2="0.1452" k3="-0.0829"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="10" k1="-1.3915" k2="1.3667" k3="-0.5801"/>
-+            <vignetting model="pa" focal="400" aperture="5.6" distance="1000" k1="-1.3915" k2="1.3667" k3="-0.5801"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="10" k1="-0.2573" k2="-1.0117" k3="0.7555"/>
-+            <vignetting model="pa" focal="400" aperture="8" distance="1000" k1="-0.2573" k2="-1.0117" k3="0.7555"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="10" k1="0.2871" k2="-1.6324" k3="0.8728"/>
-+            <vignetting model="pa" focal="400" aperture="11" distance="1000" k1="0.2871" k2="-1.6324" k3="0.8728"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="10" k1="0.0539" k2="-0.3728" k3="-0.1296"/>
-+            <vignetting model="pa" focal="400" aperture="16" distance="1000" k1="0.0539" k2="-0.3728" k3="-0.1296"/>
-+            <vignetting model="pa" focal="400" aperture="40" distance="10" k1="-0.3365" k2="0.7705" k3="-0.6509"/>
-+            <vignetting model="pa" focal="400" aperture="40" distance="1000" k1="-0.3365" k2="0.7705" k3="-0.6509"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 24-105mm f/4.0 DG OS HSM [A]</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="ptlens" focal="24" a="0.03625" b="-0.10075" c="0.0477"/>
-+            <distortion model="ptlens" focal="35" a="0.01363" b="-0.02727" c="0.02717"/>
-+            <distortion model="ptlens" focal="51" a="0.01362" b="-0.02646" c="0.03176"/>
-+            <distortion model="ptlens" focal="74" a="0.00566" b="-0.00631" c="0.02062"/>
-+            <distortion model="ptlens" focal="105" a="-0.00092" b="0.01302" c="0.00266"/>
-+            <tca model="poly3" focal="24" br="0.0000857" vr="1.0002262" bb="-0.0001073" vb="1.0002404"/>
-+            <tca model="poly3" focal="35" br="0.0000557" vr="1.0000960" bb="-0.0001257" vb="1.0002773"/>
-+            <tca model="poly3" focal="51" br="0.0000334" vr="0.9999950" bb="-0.0000808" vb="1.0001953"/>
-+            <tca model="poly3" focal="74" br="0.0000248" vr="0.9998621" bb="-0.0000925" vb="1.0001385"/>
-+            <tca model="poly3" focal="80" br="0.0000289" vr="0.9997985" bb="-0.0000621" vb="1.0000619"/>
-+            <tca model="poly3" focal="105" br="-0.0000212" vr="0.9997116" bb="-0.0000741" vb="1.0000136"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.7952" k2="-0.0227" k3="0.0344"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.7952" k2="-0.0227" k3="0.0344"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-1.0003" k2="0.7650" k3="-0.4391"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-1.0003" k2="0.7650" k3="-0.4391"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.9989" k2="0.6206" k3="-0.2134"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.9989" k2="0.6206" k3="-0.2134"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.9639" k2="0.4965" k3="-0.1062"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.9639" k2="0.4965" k3="-0.1062"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="10" k1="-0.9767" k2="0.5221" k3="-0.1214"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="1000" k1="-0.9767" k2="0.5221" k3="-0.1214"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.9843" k2="0.5370" k3="-0.1298"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.9843" k2="0.5370" k3="-0.1298"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.6938" k2="0.1952" k3="-0.1031"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6938" k2="0.1952" k3="-0.1031"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.7041" k2="0.4146" k3="-0.2013"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.7041" k2="0.4146" k3="-0.2013"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.6272" k2="0.1414" k3="0.0545"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.6272" k2="0.1414" k3="0.0545"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.6394" k2="0.1639" k3="0.0421"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.6394" k2="0.1639" k3="0.0421"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.6518" k2="0.1866" k3="0.0301"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.6518" k2="0.1866" k3="0.0301"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.6580" k2="0.1954" k3="0.0264"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.6580" k2="0.1954" k3="0.0264"/>
-+            <vignetting model="pa" focal="51" aperture="4" distance="10" k1="-0.6459" k2="0.3214" k3="-0.2888"/>
-+            <vignetting model="pa" focal="51" aperture="4" distance="1000" k1="-0.6459" k2="0.3214" k3="-0.2888"/>
-+            <vignetting model="pa" focal="51" aperture="5.6" distance="10" k1="-0.4831" k2="0.3633" k3="-0.3193"/>
-+            <vignetting model="pa" focal="51" aperture="5.6" distance="1000" k1="-0.4831" k2="0.3633" k3="-0.3193"/>
-+            <vignetting model="pa" focal="51" aperture="8" distance="10" k1="-0.4481" k2="0.0970" k3="0.0132"/>
-+            <vignetting model="pa" focal="51" aperture="8" distance="1000" k1="-0.4481" k2="0.0970" k3="0.0132"/>
-+            <vignetting model="pa" focal="51" aperture="11" distance="10" k1="-0.4181" k2="0.0013" k3="0.0938"/>
-+            <vignetting model="pa" focal="51" aperture="11" distance="1000" k1="-0.4181" k2="0.0013" k3="0.0938"/>
-+            <vignetting model="pa" focal="51" aperture="16" distance="10" k1="-0.4299" k2="0.0228" k3="0.0829"/>
-+            <vignetting model="pa" focal="51" aperture="16" distance="1000" k1="-0.4299" k2="0.0228" k3="0.0829"/>
-+            <vignetting model="pa" focal="51" aperture="22" distance="10" k1="-0.4434" k2="0.0473" k3="0.0694"/>
-+            <vignetting model="pa" focal="51" aperture="22" distance="1000" k1="-0.4434" k2="0.0473" k3="0.0694"/>
-+            <vignetting model="pa" focal="74" aperture="4" distance="10" k1="-0.6943" k2="0.4314" k3="-0.4353"/>
-+            <vignetting model="pa" focal="74" aperture="4" distance="1000" k1="-0.6943" k2="0.4314" k3="-0.4353"/>
-+            <vignetting model="pa" focal="74" aperture="5.6" distance="10" k1="-0.3981" k2="0.4844" k3="-0.5866"/>
-+            <vignetting model="pa" focal="74" aperture="5.6" distance="1000" k1="-0.3981" k2="0.4844" k3="-0.5866"/>
-+            <vignetting model="pa" focal="74" aperture="8" distance="10" k1="-0.4029" k2="0.4017" k3="-0.3221"/>
-+            <vignetting model="pa" focal="74" aperture="8" distance="1000" k1="-0.4029" k2="0.4017" k3="-0.3221"/>
-+            <vignetting model="pa" focal="74" aperture="11" distance="10" k1="-0.3032" k2="-0.0103" k3="0.0612"/>
-+            <vignetting model="pa" focal="74" aperture="11" distance="1000" k1="-0.3032" k2="-0.0103" k3="0.0612"/>
-+            <vignetting model="pa" focal="74" aperture="16" distance="10" k1="-0.3039" k2="-0.0377" k3="0.0951"/>
-+            <vignetting model="pa" focal="74" aperture="16" distance="1000" k1="-0.3039" k2="-0.0377" k3="0.0951"/>
-+            <vignetting model="pa" focal="74" aperture="22" distance="10" k1="-0.3180" k2="-0.0115" k3="0.0808"/>
-+            <vignetting model="pa" focal="74" aperture="22" distance="1000" k1="-0.3180" k2="-0.0115" k3="0.0808"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="10" k1="-0.6405" k2="0.2169" k3="-0.2852"/>
-+            <vignetting model="pa" focal="80" aperture="4" distance="1000" k1="-0.6405" k2="0.2169" k3="-0.2852"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.3369" k2="0.3345" k3="-0.5157"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.3369" k2="0.3345" k3="-0.5157"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.4047" k2="0.4919" k3="-0.4128"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.4047" k2="0.4919" k3="-0.4128"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.2916" k2="0.0324" k3="0.0210"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.2916" k2="0.0324" k3="0.0210"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.2708" k2="-0.0547" k3="0.1020"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.2708" k2="-0.0547" k3="0.1020"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.2834" k2="-0.0305" k3="0.0891"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.2834" k2="-0.0305" k3="0.0891"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="10" k1="-0.5261" k2="-0.2292" k3="0.0645"/>
-+            <vignetting model="pa" focal="105" aperture="4" distance="1000" k1="-0.5261" k2="-0.2292" k3="0.0645"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="10" k1="-0.2002" k2="-0.0926" k3="-0.2170"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="1000" k1="-0.2002" k2="-0.0926" k3="-0.2170"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="10" k1="-0.3480" k2="0.4109" k3="-0.3495"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="1000" k1="-0.3480" k2="0.4109" k3="-0.3495"/>
-+            <vignetting model="pa" focal="105" aperture="11" distance="10" k1="-0.2363" k2="-0.0353" k3="0.0732"/>
-+            <vignetting model="pa" focal="105" aperture="11" distance="1000" k1="-0.2363" k2="-0.0353" k3="0.0732"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="10" k1="-0.2343" k2="-0.0623" k3="0.1032"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="1000" k1="-0.2343" k2="-0.0623" k3="0.1032"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="10" k1="-0.2375" k2="-0.0594" k3="0.1056"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="1000" k1="-0.2375" k2="-0.0594" k3="0.1056"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 18-250mm f/3.5-6.3 DC OS Macro HSM</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 55V -->
-+            <distortion model="ptlens" focal="18" a="0.03419" b="-0.09116" c="0.04125"/>
-+            <distortion model="ptlens" focal="22" a="0.02775" b="-0.06342" c="0.04051"/>
-+            <distortion model="ptlens" focal="26" a="0.02884" b="-0.05966" c="0.03629"/>
-+            <distortion model="ptlens" focal="35" a="0.00054" b="0.03391" c="-0.04229"/>
-+            <distortion model="ptlens" focal="135" a="0.00826" b="-0.02182" c="0.04344"/>
-+            <distortion model="ptlens" focal="180" a="0.01526" b="-0.04617" c="0.06437"/>
-+            <distortion model="ptlens" focal="250" a="0.01692" b="-0.05498" c="0.07496"/>
-+            <tca model="poly3" focal="18" br="0.0000694" vr="1.0004727" bb="-0.0000955" vb="1.0002783"/>
-+            <tca model="poly3" focal="22" br="0.0000250" vr="1.0004101" bb="-0.0000327" vb="1.0002243"/>
-+            <tca model="poly3" focal="26" br="-0.0000025" vr="1.0003871" bb="-0.0000482" vb="1.0002292"/>
-+            <tca model="poly3" focal="30" br="-0.0000027" vr="1.0002919" bb="-0.0000523" vb="1.0002181"/>
-+            <tca model="poly3" focal="35" br="-0.0000256" vr="1.0002410" bb="-0.0000116" vb="1.0000706"/>
-+            <tca model="poly3" focal="50" br="-0.0000453" vr="1.0001936" bb="-0.0000183" vb="1.0000476"/>
-+            <tca model="poly3" focal="75" br="-0.0000103" vr="1.0000727" bb="-0.0000364" vb="1.0000054"/>
-+            <tca model="poly3" focal="135" br="-0.0000020" vr="0.9999291" bb="-0.0000215" vb="0.9999288"/>
-+            <tca model="poly3" focal="180" br="-0.0000950" vr="0.9999136" bb="-0.0000108" vb="0.9995579"/>
-+            <tca model="poly3" focal="250" br="-0.0000950" vr="0.9999277" bb="0.0000332" vb="0.9994025"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 18-35mm f/1.8 DC HSM [A]</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5100 -->
-+            <distortion model="ptlens" focal="18" a="0.01397" b="-0.03966" c="0.01675"/>
-+            <distortion model="ptlens" focal="20" a="0.00937" b="-0.02454" c="0.0113"/>
-+            <distortion model="ptlens" focal="25" a="0.00428" b="-0.00372" c="-0.0014"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0.0075" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.00261" b="0.00264" c="-0.0006"/>
-+            <tca model="poly3" focal="18" br="0.0000193" vr="1.0002528" bb="0.0000063" vb="1.0001295"/>
-+            <tca model="poly3" focal="20" br="0.0000054" vr="1.0001763" bb="-0.0000260" vb="1.0002051"/>
-+            <tca model="poly3" focal="25" br="-0.0000016" vr="1.0000617" bb="-0.0000462" vb="1.0002598"/>
-+            <tca model="poly3" focal="28" br="0.0000097" vr="0.9999973" bb="-0.0000374" vb="1.0001820"/>
-+            <tca model="poly3" focal="35" br="0.0000296" vr="0.9999868" bb="-0.0000595" vb="1.0000178"/>
-+            <vignetting model="pa" focal="18" aperture="1.8" distance="10" k1="-0.7344" k2="0.6606" k3="-0.5296"/>
-+            <vignetting model="pa" focal="18" aperture="1.8" distance="1000" k1="-0.7344" k2="0.6606" k3="-0.5296"/>
-+            <vignetting model="pa" focal="18" aperture="2.2" distance="10" k1="-0.2097" k2="-0.2092" k3="-0.0406"/>
-+            <vignetting model="pa" focal="18" aperture="2.2" distance="1000" k1="-0.2097" k2="-0.2092" k3="-0.0406"/>
-+            <vignetting model="pa" focal="18" aperture="2.8" distance="10" k1="-0.2287" k2="0.2088" k3="-0.2744"/>
-+            <vignetting model="pa" focal="18" aperture="2.8" distance="1000" k1="-0.2287" k2="0.2088" k3="-0.2744"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="10" k1="-0.2432" k2="0.1840" k3="-0.1181"/>
-+            <vignetting model="pa" focal="18" aperture="4" distance="1000" k1="-0.2432" k2="0.1840" k3="-0.1181"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.2688" k2="0.2081" k3="-0.1063"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.2688" k2="0.2081" k3="-0.1063"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="10" k1="-0.2187" k2="0.0824" k3="-0.0247"/>
-+            <vignetting model="pa" focal="18" aperture="16" distance="1000" k1="-0.2187" k2="0.0824" k3="-0.0247"/>
-+            <vignetting model="pa" focal="22" aperture="1.8" distance="10" k1="-0.6328" k2="0.1391" k3="-0.0766"/>
-+            <vignetting model="pa" focal="22" aperture="1.8" distance="1000" k1="-0.6328" k2="0.1391" k3="-0.0766"/>
-+            <vignetting model="pa" focal="22" aperture="2.2" distance="10" k1="-0.1223" k2="-0.4260" k3="0.1500"/>
-+            <vignetting model="pa" focal="22" aperture="2.2" distance="1000" k1="-0.1223" k2="-0.4260" k3="0.1500"/>
-+            <vignetting model="pa" focal="22" aperture="2.8" distance="10" k1="-0.2219" k2="0.1741" k3="-0.2095"/>
-+            <vignetting model="pa" focal="22" aperture="2.8" distance="1000" k1="-0.2219" k2="0.1741" k3="-0.2095"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="10" k1="-0.2672" k2="0.2367" k3="-0.1312"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="1000" k1="-0.2672" k2="0.2367" k3="-0.1312"/>
-+            <vignetting model="pa" focal="22" aperture="5" distance="10" k1="-0.1916" k2="0.0805" k3="-0.0306"/>
-+            <vignetting model="pa" focal="22" aperture="5" distance="1000" k1="-0.1916" k2="0.0805" k3="-0.0306"/>
-+            <vignetting model="pa" focal="22" aperture="16" distance="10" k1="-0.2050" k2="0.0837" k3="-0.0269"/>
-+            <vignetting model="pa" focal="22" aperture="16" distance="1000" k1="-0.2050" k2="0.0837" k3="-0.0269"/>
-+            <vignetting model="pa" focal="25" aperture="1.8" distance="10" k1="-0.6543" k2="-0.1606" k3="0.2104"/>
-+            <vignetting model="pa" focal="25" aperture="1.8" distance="1000" k1="-0.6543" k2="-0.1606" k3="0.2104"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="10" k1="0.0004" k2="-0.7863" k3="0.3456"/>
-+            <vignetting model="pa" focal="25" aperture="2.2" distance="1000" k1="0.0004" k2="-0.7863" k3="0.3456"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="10" k1="-0.2204" k2="0.2840" k3="-0.3007"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-0.2204" k2="0.2840" k3="-0.3007"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="10" k1="-0.1590" k2="0.0331" k3="-0.0083"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.1590" k2="0.0331" k3="-0.0083"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="10" k1="-0.2231" k2="0.1846" k3="-0.1028"/>
-+            <vignetting model="pa" focal="25" aperture="5" distance="1000" k1="-0.2231" k2="0.1846" k3="-0.1028"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="10" k1="-0.1826" k2="0.0654" k3="-0.0185"/>
-+            <vignetting model="pa" focal="25" aperture="16" distance="1000" k1="-0.1826" k2="0.0654" k3="-0.0185"/>
-+            <vignetting model="pa" focal="28" aperture="1.8" distance="10" k1="-1.1397" k2="0.7144" k3="-0.2108"/>
-+            <vignetting model="pa" focal="28" aperture="1.8" distance="1000" k1="-1.1397" k2="0.7144" k3="-0.2108"/>
-+            <vignetting model="pa" focal="28" aperture="2.2" distance="10" k1="-0.0649" k2="-1.2012" k3="0.7605"/>
-+            <vignetting model="pa" focal="28" aperture="2.2" distance="1000" k1="-0.0649" k2="-1.2012" k3="0.7605"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.0345" k2="-0.3492" k3="0.0325"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.0345" k2="-0.3492" k3="0.0325"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2158" k2="0.2900" k3="-0.2318"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2158" k2="0.2900" k3="-0.2318"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="10" k1="-0.1668" k2="0.1017" k3="-0.0521"/>
-+            <vignetting model="pa" focal="28" aperture="5" distance="1000" k1="-0.1668" k2="0.1017" k3="-0.0521"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="10" k1="-0.2146" k2="0.2124" k3="-0.1242"/>
-+            <vignetting model="pa" focal="28" aperture="16" distance="1000" k1="-0.2146" k2="0.2124" k3="-0.1242"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-1.3778" k2="1.4172" k3="-0.6407"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-1.3778" k2="1.4172" k3="-0.6407"/>
-+            <vignetting model="pa" focal="35" aperture="2.2" distance="10" k1="-0.7312" k2="0.2131" k3="-0.0003"/>
-+            <vignetting model="pa" focal="35" aperture="2.2" distance="1000" k1="-0.7312" k2="0.2131" k3="-0.0003"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.1290" k2="-0.8157" k3="0.5467"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.1290" k2="-0.8157" k3="0.5467"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.0446" k2="-0.2877" k3="0.0271"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.0446" k2="-0.2877" k3="0.0271"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="10" k1="-0.2508" k2="0.4293" k3="-0.3716"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="1000" k1="-0.2508" k2="0.4293" k3="-0.3716"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="10" k1="-0.2095" k2="0.1924" k3="-0.1006"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="1000" k1="-0.2095" k2="0.1924" k3="-0.1006"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 180mm f/2.8 EX DG OS HSM APO Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with D800 -->
-+            <distortion model="ptlens" focal="180" a="-0.00333" b="0.00918" c="-0.00596"/>
-+            <vignetting model="pa" focal="180" aperture="2.8" distance="100" k1="-0.99298" k2="0.89434" k3="-0.47337"/>
-+            <vignetting model="pa" focal="180" aperture="4" distance="100" k1="-0.16527" k2="-0.60898" k3="0.37435"/>
-+            <vignetting model="pa" focal="180" aperture="5.6" distance="100" k1="0.19506" k2="-0.92214" k3="0.39933"/>
-+            <vignetting model="pa" focal="180" aperture="8" distance="100" k1="-0.12653" k2="0.27362" k3="-0.49691"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 50mm f/1.4 DG HSM [A]</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="poly3" focal="50" k1="0"/>
-+            <tca model="poly3" focal="50" br="-0.0000685" vr="1.0001549" bb="0.0000708" vb="0.9998455"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-1.7584" k2="1.8503" k3="-0.8208"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-1.7584" k2="1.8503" k3="-0.8208"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.2253" k2="-0.5403" k3="0.3434"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.2253" k2="-0.5403" k3="0.3434"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.3100" k2="-0.1997" k3="0.2306"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3100" k2="-0.1997" k3="0.2306"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.4812" k2="0.1346" k3="0.0260"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.4812" k2="0.1346" k3="0.0260"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.3879" k2="-0.0701" k3="0.1637"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.3879" k2="-0.0701" k3="0.1637"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.3931" k2="-0.0627" k3="0.1598"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3931" k2="-0.0627" k3="0.1598"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.4106" k2="-0.0318" k3="0.1402"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.4106" k2="-0.0318" k3="0.1402"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="10" k1="-0.3843" k2="-0.0946" k3="0.1829"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="1000" k1="-0.3843" k2="-0.0946" k3="0.1829"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 180mm f/5.6 APO Macro</model>
-+        <mount>Sony Alpha</mount>
-+        <mount>Olympus OM</mount>
-+        <mount>Canon FD</mount>
-+        <mount>Pentax K</mount>
-+        <mount>Nikon F</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 77 -->
-+            <distortion model="poly3" focal="180" k1="0.00106"/>
-+            <tca model="poly3" focal="180" vr="0.9997" vb="1.0002"/>
-+            <vignetting model="pa" focal="180" aperture="5.6" distance="10" k1="-0.3350" k2="0.3070" k3="-0.1518"/>
-+            <vignetting model="pa" focal="180" aperture="5.6" distance="1000" k1="-0.3350" k2="0.3070" k3="-0.1518"/>
-+            <vignetting model="pa" focal="180" aperture="8" distance="10" k1="-0.1484" k2="0.1991" k3="-0.1089"/>
-+            <vignetting model="pa" focal="180" aperture="8" distance="1000" k1="-0.1484" k2="0.1991" k3="-0.1089"/>
-+            <vignetting model="pa" focal="180" aperture="11" distance="10" k1="-0.1768" k2="0.2532" k3="-0.1409"/>
-+            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.1768" k2="0.2532" k3="-0.1409"/>
-+            <vignetting model="pa" focal="180" aperture="22" distance="10" k1="-0.2178" k2="0.3124" k3="-0.1716"/>
-+            <vignetting model="pa" focal="180" aperture="22" distance="1000" k1="-0.2178" k2="0.3124" k3="-0.1716"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 70-300mm f/4-5.6 DG Macro</model>
-+        <mount>Sony Alpha</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D610 -->
-+            <distortion model="ptlens" focal="70" a="-0.00361" b="-0.00079" c="0.00665"/>
-+            <distortion model="ptlens" focal="90" a="-0.00146" b="-0.00111" c="0.01353"/>
-+            <distortion model="ptlens" focal="102" a="0.00417" b="-0.01327" c="0.02682"/>
-+            <distortion model="ptlens" focal="135" a="0.00681" b="-0.01051" c="0.01656"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.00905" c="0"/>
-+            <tca model="poly3" focal="70" br="0.0000707" vr="1.0000548" bb="-0.0000728" vb="1.0000550"/>
-+            <tca model="poly3" focal="90" br="0.0000178" vr="1.0000676" bb="-0.0000335" vb="0.9999981"/>
-+            <tca model="poly3" focal="102" br="0.0000021" vr="1.0000526" bb="-0.0000060" vb="0.9999382"/>
-+            <tca model="poly3" focal="135" br="-0.0000271" vr="1.0000352" bb="0.0000214" vb="0.9998037"/>
-+            <tca model="poly3" focal="220" br="-0.0000298" vr="0.9999532" bb="0.0000435" vb="0.9996860"/>
-+            <tca model="poly3" focal="300" br="-0.0000555" vr="0.9998700" bb="0.0000869" vb="0.9996162"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 4.5mm f/2.8 EX DC HSM circular fisheye</model>
-+        <model lang="de">Sigma 4.5mm f/2.8 EX DC HSM Zirkular-Fischauge</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <mount>Sigma SA</mount>
-+        <type>fisheye</type>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K-3 -->
-+            <!-- Measured with 360° panorama -->
-+            <distortion model="ptlens" focal="4.5" a="-0.21693" b="-0.44076" c="-0.47357"/>
-+            <tca model="poly3" focal="4.5" br="-0.0011015" vr="1.0008801" bb="-0.0002284" vb="1.0005327"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 50-100mm f/1.8 DC HSM Art</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F</mount>
-+        <mount>Sigma SA</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS 7D Mark II -->
-+            <distortion model="ptlens" focal="50" a="0.00595" b="-0.02621" c="0.02484"/>
-+            <distortion model="ptlens" focal="60" a="0.00255" b="-0.00766" c="0.00479"/>
-+            <distortion model="ptlens" focal="70" a="-0.00085" b="0.00568" c="-0.00515"/>
-+            <distortion model="ptlens" focal="85" a="0.00304" b="-0.00662" c="0.01071"/>
-+            <distortion model="ptlens" focal="100" a="-0.00115" b="0.01147" c="-0.00831"/>
-+            <tca model="poly3" focal="50" vr="1.0005412" vb="0.9999618"/>
-+            <tca model="poly3" focal="60" vr="1.0004842" vb="0.9999661"/>
-+            <tca model="poly3" focal="70" vr="1.0004081" vb="0.9999722"/>
-+            <tca model="poly3" focal="85" vr="1.0002939" vb="0.9999802"/>
-+            <tca model="poly3" focal="100" vr="1.0002253" vb="0.9999808"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sigma</maker>
-+        <model>Sigma 17-70mm f/2.8-4 DC MACRO OS HSM Contemporary</model>
-+        <model lang="en">Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sigma SA</mount>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5500 -->
-+            <distortion model="ptlens" focal="17" a="0.040576" b="-0.127959" c="0.10121"/>
-+            <distortion model="ptlens" focal="26" a="0.019128" b="-0.055429" c="0.058149"/>
-+            <distortion model="ptlens" focal="28" a="0.023321" b="-0.072098" c="0.084479"/>
-+            <distortion model="ptlens" focal="38" a="0.021812" b="-0.076706" c="0.107533"/>
-+            <distortion model="ptlens" focal="52" a="0.002694" b="0.001095" c="0.000357"/>
-+            <distortion model="ptlens" focal="70" a="-0.000357" b="0.010895" c="-0.010202"/>
-+            <tca model="poly3" focal="17" br="0.0000318" vr="1.0004569" bb="-0.0000359" vb="1.0000930"/>
-+            <tca model="poly3" focal="26" br="-0.0000359" vr="1.0003278" bb="0.0000149" vb="1.0000534"/>
-+            <tca model="poly3" focal="28" br="-0.0000573" vr="1.0002842" bb="0.0000121" vb="1.0000285"/>
-+            <tca model="poly3" focal="38" br="-0.0000506" vr="1.0002011" bb="0.0000024" vb="1.0000138"/>
-+            <tca model="poly3" focal="52" br="-0.0000377" vr="1.0000416" bb="0.0000070" vb="0.9999498"/>
-+            <tca model="poly3" focal="70" br="-0.0000462" vr="0.9999136" bb="0.0000171" vb="0.9999032"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.6617" k2="0.0575" k3="-0.0040"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.6617" k2="0.0575" k3="-0.0040"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.2288" k2="-0.5570" k3="0.3040"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.2288" k2="-0.5570" k3="0.3040"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.3581" k2="0.0558" k3="-0.0845"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.3581" k2="0.0558" k3="-0.0845"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="10" k1="-0.3346" k2="-0.0755" k3="0.0583"/>
-+            <vignetting model="pa" focal="17" aperture="8" distance="1000" k1="-0.3346" k2="-0.0755" k3="0.0583"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="10" k1="-0.3632" k2="-0.0242" k3="0.0325"/>
-+            <vignetting model="pa" focal="17" aperture="22" distance="1000" k1="-0.3632" k2="-0.0242" k3="0.0325"/>
-+            <vignetting model="pa" focal="26" aperture="3.2" distance="10" k1="-0.7618" k2="0.8700" k3="-0.6601"/>
-+            <vignetting model="pa" focal="26" aperture="3.2" distance="1000" k1="-0.7618" k2="0.8700" k3="-0.6601"/>
-+            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="-0.2930" k2="0.1520" k3="-0.2646"/>
-+            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="-0.2930" k2="0.1520" k3="-0.2646"/>
-+            <vignetting model="pa" focal="26" aperture="6.3" distance="10" k1="-0.2816" k2="0.0799" k3="-0.0678"/>
-+            <vignetting model="pa" focal="26" aperture="6.3" distance="1000" k1="-0.2816" k2="0.0799" k3="-0.0678"/>
-+            <vignetting model="pa" focal="26" aperture="9" distance="10" k1="-0.2510" k2="-0.0456" k3="0.0409"/>
-+            <vignetting model="pa" focal="26" aperture="9" distance="1000" k1="-0.2510" k2="-0.0456" k3="0.0409"/>
-+            <vignetting model="pa" focal="26" aperture="22" distance="10" k1="-0.2751" k2="-0.0103" k3="0.0265"/>
-+            <vignetting model="pa" focal="26" aperture="22" distance="1000" k1="-0.2751" k2="-0.0103" k3="0.0265"/>
-+            <vignetting model="pa" focal="34" aperture="3.3" distance="10" k1="-0.7579" k2="1.0756" k3="-0.8260"/>
-+            <vignetting model="pa" focal="34" aperture="3.3" distance="1000" k1="-0.7579" k2="1.0756" k3="-0.8260"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="10" k1="-0.2877" k2="0.2747" k3="-0.3850"/>
-+            <vignetting model="pa" focal="34" aperture="4.5" distance="1000" k1="-0.2877" k2="0.2747" k3="-0.3850"/>
-+            <vignetting model="pa" focal="34" aperture="6.3" distance="10" k1="-0.2470" k2="0.2214" k3="-0.1982"/>
-+            <vignetting model="pa" focal="34" aperture="6.3" distance="1000" k1="-0.2470" k2="0.2214" k3="-0.1982"/>
-+            <vignetting model="pa" focal="34" aperture="9" distance="10" k1="-0.2025" k2="0.0239" k3="-0.0147"/>
-+            <vignetting model="pa" focal="34" aperture="9" distance="1000" k1="-0.2025" k2="0.0239" k3="-0.0147"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="10" k1="-0.2354" k2="0.0766" k3="-0.0398"/>
-+            <vignetting model="pa" focal="34" aperture="22" distance="1000" k1="-0.2354" k2="0.0766" k3="-0.0398"/>
-+            <vignetting model="pa" focal="52" aperture="3.8" distance="10" k1="-0.7196" k2="1.1314" k3="-0.9399"/>
-+            <vignetting model="pa" focal="52" aperture="3.8" distance="1000" k1="-0.7196" k2="1.1314" k3="-0.9399"/>
-+            <vignetting model="pa" focal="52" aperture="5" distance="10" k1="-0.2492" k2="0.4733" k3="-0.5806"/>
-+            <vignetting model="pa" focal="52" aperture="5" distance="1000" k1="-0.2492" k2="0.4733" k3="-0.5806"/>
-+            <vignetting model="pa" focal="52" aperture="7.1" distance="10" k1="-0.2197" k2="0.3035" k3="-0.2691"/>
-+            <vignetting model="pa" focal="52" aperture="7.1" distance="1000" k1="-0.2197" k2="0.3035" k3="-0.2691"/>
-+            <vignetting model="pa" focal="52" aperture="10" distance="10" k1="-0.1588" k2="0.0508" k3="-0.0355"/>
-+            <vignetting model="pa" focal="52" aperture="10" distance="1000" k1="-0.1588" k2="0.0508" k3="-0.0355"/>
-+            <vignetting model="pa" focal="52" aperture="22" distance="10" k1="-0.1920" k2="0.1094" k3="-0.0655"/>
-+            <vignetting model="pa" focal="52" aperture="22" distance="1000" k1="-0.1920" k2="0.1094" k3="-0.0655"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.5271" k2="0.6349" k3="-0.6264"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.5271" k2="0.6349" k3="-0.6264"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2699" k2="0.6582" k3="-0.6639"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2699" k2="0.6582" k3="-0.6639"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1966" k2="0.2831" k3="-0.2366"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1966" k2="0.2831" k3="-0.2366"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1501" k2="0.0901" k3="-0.0588"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1501" k2="0.0901" k3="-0.0588"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1712" k2="0.1244" k3="-0.0783"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1712" k2="0.1244" k3="-0.0783"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-soligor.xml b/data/db/slr-soligor.xml
---- a/data/db/slr-soligor.xml	2013-09-11 22:18:41.000000000 +0200
-+++ b/data/db/slr-soligor.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,16 +1,13 @@
- <lensdatabase>
--
-     <lens>
-         <maker>Soligor</maker>
--        <model>MC SOLIGOR C/D WIDE-AUTO 1:2.8 f=24mm</model>
-+        <model>MC Soligor C/D Wide-Auto 1:2.8 f=24mm</model>
-         <mount>Pentax KAF2</mount>
--        <!-- FixMe: Actually cropfactor 1.531 -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
-             <!-- Taken with Pentax K100D -->
--            <distortion model="ptlens" focal="24" a="0.00094" b="-0.00031" c="-0.02187" />
--            <tca model="poly3" focal="24" br="-0.0001490" vr="1.0007959" bb="0.0001683" vb="0.9994169" />
-+            <distortion model="ptlens" focal="24" a="0.00094" b="-0.00031" c="-0.02187"/>
-+            <tca model="poly3" focal="24" br="-0.0001490" vr="1.0007959" bb="0.0001683" vb="0.9994169"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-sony.xml b/data/db/slr-sony.xml
---- a/data/db/slr-sony.xml	2013-10-11 23:54:00.000000000 +0200
-+++ b/data/db/slr-sony.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,550 +1,829 @@
- <lensdatabase>
--
-     <mount>
-         <name>Sony Alpha</name>
-+        <compat>Minolta AF</compat>
-         <compat>M42</compat>
-+        <compat>M39/1</compat>
-+        <compat>DKL</compat>
-         <compat>T2</compat>
--        <compat>Minolta AF</compat>
-         <compat>Generic</compat>
-     </mount>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A33</model>
-         <model lang="en">Alpha 33</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A35</model>
-         <model lang="en">Alpha 35</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A37</model>
-         <model lang="en">Alpha 37</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A55V</model>
-         <model lang="en">Alpha 55</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A57</model>
-         <model lang="en">Alpha 57</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A58</model>
-         <model lang="en">Alpha 58</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A65V</model>
-         <model lang="en">Alpha 65</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>SLT-A77V</model>
-         <model lang="en">Alpha 77</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-+        <model>ILCA-77M2</model>
-+        <model lang="en">Alpha 77 II</model>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-         <model>SLT-A99</model>
-         <model lang="en">Alpha 99</model>
-         <mount>Sony Alpha</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1.005</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-+        <model>SLT-A99V</model>
-+        <model lang="en">Alpha 99V</model>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.005</cropfactor>
-+    </camera>
-+    <camera>
-+        <maker>Sony</maker>
-         <model>DSLR-A100</model>
-         <model lang="en">Alpha 100</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A200</model>
-         <model lang="en">Alpha 200</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A230</model>
-         <model lang="en">Alpha 230</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A290</model>
-         <model lang="en">Alpha 290</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A300</model>
-         <model lang="en">Alpha 300</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A330</model>
-         <model lang="en">Alpha 330</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A350</model>
-         <model lang="en">Alpha 350</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A380</model>
-         <model lang="en">Alpha 380</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A390</model>
-         <model lang="en">Alpha 390</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A450</model>
-         <model lang="en">Alpha 450</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A500</model>
-         <model lang="en">Alpha 500</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A550</model>
-         <model lang="en">Alpha 550</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A560</model>
-         <model lang="en">Alpha 560</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A580</model>
-         <model lang="en">Alpha 580</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A700</model>
-         <model lang="en">Alpha 700</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A850</model>
-         <model lang="en">Alpha 850</model>
-         <mount>Sony Alpha</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
--        <maker>SONY</maker>
--        <maker lang="en">Sony</maker>
-+        <maker>Sony</maker>
-         <model>DSLR-A900</model>
-         <model lang="en">Alpha 900</model>
-         <mount>Sony Alpha</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>Sony AF DT 16-105 mm F3.5-5.6</model>
-+        <model>Sony AF DT 16-105mm f/3.5-5.6</model>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of Sony APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <tca model="poly3" focal="16" br="0.0000849" vr="1.0002242" bb="0.0002099" vb="1.0007851" />
--            <tca model="poly3" focal="24" br="0.0001033" vr="1.0002142" bb="-0.0001268" vb="1.0003659" />
--            <tca model="poly3" focal="35" br="0.0000673" vr="1.0001269" bb="-0.0001984" vb="1.0001409" />
--            <tca model="poly3" focal="50" br="-0.0000401" vr="0.9998721" bb="-0.0001637" vb="1.0001459" />
--            <tca model="poly3" focal="75" br="0.0000190" vr="0.9997211" bb="-0.0002164" vb="1.0000605" />
--            <tca model="poly3" focal="105" br="0.0001368" vr="0.9992983" bb="-0.0002385" vb="1.0001643" />
--
--            <!-- distortion poly3 with hugin -->
--            <!-- distortion model="poly3" focal="16" k1="-0.025" / -->
--            <!-- distortion model="poly3" focal="22" k1="-0.005" / -->
--            <!-- distortion model="poly3" focal="35" k1="-0.007" / -->
--            <!-- distortion model="poly3" focal="50" k1="-0.008" / -->
--            <!-- distortion model="poly3" focal="70" k1="0.007" / -->
--
--            <!-- distortion ptlens with hugin -->
--            <!-- distortion model="ptlens" focal="16" a="0.030" b="-0.080" c="0.026" / -->
--            <!-- distortion model="ptlens" focal="22" a="0.011" b="-0.024" c="0.009" / -->
--            <!-- distortion model="ptlens" focal="35" a="0.006" b="-0.003" c="-0.002" / -->
--            <!-- distortion model="ptlens" focal="50" a="0.003" b="-0.003" c="0.010" / -->
--            <!-- distortion model="ptlens" focal="70" a="0.002" b="0.003" c="0.003" / -->
--            <!-- distortion model="ptlens" focal="105" a="-0.001" b="0.010" c="-0.004" / -->
--
--            <!-- distortion with OpenCV -->
--            <distortion model="poly5" focal="16" k1="-0.032364"  k2="0.004780" />
--            <distortion model="poly5" focal="24" k1="-0.009351"  k2="0.002502" />
--            <distortion model="poly5" focal="35" k1="0.000617"  k2="0.001124" />
--            <distortion model="poly5" focal="50" k1="0.004351"  k2="0.000318" />        
--            <distortion model="poly5" focal="70" k1="0.006456"  k2="0.000162" />
--            <distortion model="poly5" focal="105" k1="0.006115"  k2="0.000015" />
--
--            <vignetting model="pa" focal="16" aperture="3.5" distance="5" k1="-0.288470" k2="0.374699" k3="-0.523764" />
--            <vignetting model="pa" focal="16" aperture="4" distance="5" k1="-0.330235" k2="0.497285" k3="-0.583721" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="5" k1="-0.336407" k2="0.552643" k3="-0.575818" />
--            <vignetting model="pa" focal="16" aperture="5" distance="5" k1="-0.353798" k2="0.602097" k3="-0.578792" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="5" k1="-0.312894" k2="0.427975" k3="-0.374015" />
--            <vignetting model="pa" focal="16" aperture="8" distance="5" k1="-0.228501" k2="0.134331" k3="-0.103199" />
--            <vignetting model="pa" focal="16" aperture="16" distance="5" k1="-0.202748" k2="0.056228" k3="-0.049107" />
--            <vignetting model="pa" focal="16" aperture="22" distance="5" k1="-0.201659" k2="0.060327" k3="-0.049851" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="5" k1="-0.308582" k2="0.589818" k3="-0.521015" />
--            <vignetting model="pa" focal="24" aperture="5" distance="5" k1="-0.274235" k2="0.476290" k3="-0.393271" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="5" k1="-0.229792" k2="0.330459" k3="-0.263460" />
--            <vignetting model="pa" focal="24" aperture="8" distance="5" k1="-0.186426" k2="0.164882" k3="-0.107059" />
--            <vignetting model="pa" focal="24" aperture="16" distance="5" k1="-0.154042" k2="0.076936" k3="-0.033692" />
--            <vignetting model="pa" focal="24" aperture="22" distance="5" k1="-0.114423" k2="-0.002908" k3="0.015035" />
--            <vignetting model="pa" focal="24" aperture="25" distance="5" k1="-0.124935" k2="-0.005534" k3="0.024066" />
--            <vignetting model="pa" focal="35" aperture="5" distance="5" k1="-0.287485" k2="0.650777" k3="-0.550081" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="5" k1="-0.260832" k2="0.554374" k3="-0.457173" />
--            <vignetting model="pa" focal="35" aperture="8" distance="5" k1="-0.182410" k2="0.293890" k3="-0.226888" />
--            <vignetting model="pa" focal="35" aperture="16" distance="5" k1="-0.133782" k2="0.163862" k3="-0.120876" />
--            <vignetting model="pa" focal="35" aperture="22" distance="5" k1="-0.120685" k2="0.122561" k3="-0.089933" />
--            <vignetting model="pa" focal="35" aperture="32" distance="5" k1="-0.105005" k2="0.097940" k3="-0.083067" />
--            <vignetting model="pa" focal="50" aperture="5" distance="5" k1="-0.258488" k2="0.647112" k3="-0.571874" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="5" k1="-0.241527" k2="0.610572" k3="-0.549893" />
--            <vignetting model="pa" focal="50" aperture="8" distance="5" k1="-0.204291" k2="0.428393" k3="-0.337452" />
--            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.131377" k2="0.216608" k3="-0.160456" />
--            <vignetting model="pa" focal="50" aperture="22" distance="5" k1="-0.139891" k2="0.251957" k3="-0.188303" />
--            <vignetting model="pa" focal="50" aperture="32" distance="5" k1="-0.131371" k2="0.232205" k3="-0.179864" />
--            <vignetting model="pa" focal="55" aperture="5.6" distance="5" k1="-0.254949" k2="0.648429" k3="-0.575154" />
--            <vignetting model="pa" focal="55" aperture="8" distance="5" k1="-0.211558" k2="0.458632" k3="-0.357524" />
--            <vignetting model="pa" focal="55" aperture="22" distance="5" k1="-0.135846" k2="0.253241" k3="-0.185327" />
--            <vignetting model="pa" focal="55" aperture="32" distance="5" k1="-0.145348" k2="0.292481" k3="-0.221538" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.240167" k2="0.681320" k3="-0.676884" />
--            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.260742" k2="0.701911" k3="-0.610079" />
--            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.145886" k2="0.281155" k3="-0.204221" />
--            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.129192" k2="0.255130" k3="-0.188194" />
--            <vignetting model="pa" focal="70" aperture="32" distance="5" k1="-0.139201" k2="0.293529" k3="-0.223242" />
--            <vignetting model="pa" focal="80" aperture="5.6" distance="5" k1="-0.210133" k2="0.592325" k3="-0.609250" />
--            <vignetting model="pa" focal="80" aperture="8" distance="5" k1="-0.238492" k2="0.624078" k3="-0.538598" />
--            <vignetting model="pa" focal="80" aperture="16" distance="5" k1="-0.132754" k2="0.243649" k3="-0.169231" />
--            <vignetting model="pa" focal="80" aperture="22" distance="5" k1="-0.120105" k2="0.212296" k3="-0.146781" />
--            <vignetting model="pa" focal="80" aperture="32" distance="5" k1="-0.134805" k2="0.284222" k3="-0.209818" />
--            <vignetting model="pa" focal="80" aperture="36" distance="5" k1="-0.139841" k2="0.297199" k3="-0.219408" />
--            <vignetting model="pa" focal="105" aperture="5.6" distance="5" k1="-0.175601" k2="0.457244" k3="-0.494756" />
--            <vignetting model="pa" focal="105" aperture="8" distance="5" k1="-0.216160" k2="0.548847" k3="-0.471725" />
--            <vignetting model="pa" focal="105" aperture="16" distance="5" k1="-0.125322" k2="0.199554" k3="-0.120266" />
--            <vignetting model="pa" focal="105" aperture="22" distance="5" k1="-0.108959" k2="0.161971" k3="-0.093471" />
--            <vignetting model="pa" focal="105" aperture="32" distance="5" k1="-0.133615" k2="0.270073" k3="-0.183446" />
--            <vignetting model="pa" focal="105" aperture="36" distance="5" k1="-0.150555" k2="0.308926" k3="-0.206299" />
-+            <tca model="poly3" focal="16" br="0.0000849" vr="1.0002242" bb="0.0002099" vb="1.0007851"/>
-+            <tca model="poly3" focal="24" br="0.0001033" vr="1.0002142" bb="-0.0001268" vb="1.0003659"/>
-+            <tca model="poly3" focal="35" br="0.0000673" vr="1.0001269" bb="-0.0001984" vb="1.0001409"/>
-+            <tca model="poly3" focal="50" br="-0.0000401" vr="0.9998721" bb="-0.0001637" vb="1.0001459"/>
-+            <tca model="poly3" focal="75" br="0.0000190" vr="0.9997211" bb="-0.0002164" vb="1.0000605"/>
-+            <tca model="poly3" focal="105" br="0.0001368" vr="0.9992983" bb="-0.0002385" vb="1.0001643"/>
-+            <distortion model="ptlens" focal="16" a="0.030" b="-0.080" c="0.026"/>
-+            <distortion model="ptlens" focal="22" a="0.011" b="-0.024" c="0.009"/>
-+            <distortion model="ptlens" focal="35" a="0.006" b="-0.003" c="-0.002"/>
-+            <distortion model="ptlens" focal="50" a="0.003" b="-0.003" c="0.010"/>
-+            <distortion model="ptlens" focal="70" a="0.002" b="0.003" c="0.003"/>
-+            <distortion model="ptlens" focal="105" a="-0.001" b="0.010" c="-0.004"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="5" k1="-0.288470" k2="0.374699" k3="-0.523764"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="5" k1="-0.330235" k2="0.497285" k3="-0.583721"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="5" k1="-0.336407" k2="0.552643" k3="-0.575818"/>
-+            <vignetting model="pa" focal="16" aperture="5" distance="5" k1="-0.353798" k2="0.602097" k3="-0.578792"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="5" k1="-0.312894" k2="0.427975" k3="-0.374015"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="5" k1="-0.228501" k2="0.134331" k3="-0.103199"/>
-+            <vignetting model="pa" focal="16" aperture="16" distance="5" k1="-0.202748" k2="0.056228" k3="-0.049107"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="5" k1="-0.201659" k2="0.060327" k3="-0.049851"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="5" k1="-0.308582" k2="0.589818" k3="-0.521015"/>
-+            <vignetting model="pa" focal="24" aperture="5" distance="5" k1="-0.274235" k2="0.476290" k3="-0.393271"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="5" k1="-0.229792" k2="0.330459" k3="-0.263460"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="5" k1="-0.186426" k2="0.164882" k3="-0.107059"/>
-+            <vignetting model="pa" focal="24" aperture="16" distance="5" k1="-0.154042" k2="0.076936" k3="-0.033692"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="5" k1="-0.114423" k2="-0.002908" k3="0.015035"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="5" k1="-0.124935" k2="-0.005534" k3="0.024066"/>
-+            <vignetting model="pa" focal="35" aperture="5" distance="5" k1="-0.287485" k2="0.650777" k3="-0.550081"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="5" k1="-0.260832" k2="0.554374" k3="-0.457173"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="5" k1="-0.182410" k2="0.293890" k3="-0.226888"/>
-+            <vignetting model="pa" focal="35" aperture="16" distance="5" k1="-0.133782" k2="0.163862" k3="-0.120876"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="5" k1="-0.120685" k2="0.122561" k3="-0.089933"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="5" k1="-0.105005" k2="0.097940" k3="-0.083067"/>
-+            <vignetting model="pa" focal="50" aperture="5" distance="5" k1="-0.258488" k2="0.647112" k3="-0.571874"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="5" k1="-0.241527" k2="0.610572" k3="-0.549893"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="5" k1="-0.204291" k2="0.428393" k3="-0.337452"/>
-+            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.131377" k2="0.216608" k3="-0.160456"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="5" k1="-0.139891" k2="0.251957" k3="-0.188303"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="5" k1="-0.131371" k2="0.232205" k3="-0.179864"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="5" k1="-0.254949" k2="0.648429" k3="-0.575154"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="5" k1="-0.211558" k2="0.458632" k3="-0.357524"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="5" k1="-0.135846" k2="0.253241" k3="-0.185327"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="5" k1="-0.145348" k2="0.292481" k3="-0.221538"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.240167" k2="0.681320" k3="-0.676884"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.260742" k2="0.701911" k3="-0.610079"/>
-+            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.145886" k2="0.281155" k3="-0.204221"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.129192" k2="0.255130" k3="-0.188194"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="5" k1="-0.139201" k2="0.293529" k3="-0.223242"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="5" k1="-0.210133" k2="0.592325" k3="-0.609250"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="5" k1="-0.238492" k2="0.624078" k3="-0.538598"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="5" k1="-0.132754" k2="0.243649" k3="-0.169231"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="5" k1="-0.120105" k2="0.212296" k3="-0.146781"/>
-+            <vignetting model="pa" focal="80" aperture="32" distance="5" k1="-0.134805" k2="0.284222" k3="-0.209818"/>
-+            <vignetting model="pa" focal="80" aperture="36" distance="5" k1="-0.139841" k2="0.297199" k3="-0.219408"/>
-+            <vignetting model="pa" focal="105" aperture="5.6" distance="5" k1="-0.175601" k2="0.457244" k3="-0.494756"/>
-+            <vignetting model="pa" focal="105" aperture="8" distance="5" k1="-0.216160" k2="0.548847" k3="-0.471725"/>
-+            <vignetting model="pa" focal="105" aperture="16" distance="5" k1="-0.125322" k2="0.199554" k3="-0.120266"/>
-+            <vignetting model="pa" focal="105" aperture="22" distance="5" k1="-0.108959" k2="0.161971" k3="-0.093471"/>
-+            <vignetting model="pa" focal="105" aperture="32" distance="5" k1="-0.133615" k2="0.270073" k3="-0.183446"/>
-+            <vignetting model="pa" focal="105" aperture="36" distance="5" k1="-0.150555" k2="0.308926" k3="-0.206299"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Sony</maker>
--        <model>Sony DT 16-50mm F2.8 SSM</model>
-+        <model>Sony DT 16-50mm f/2.8 SSM (SAL1650)</model>
-+        <model lang="en">Sony DT 16-50mm f/2.8 SSM</model>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of Sony APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="16" a="0.0313950" b="-0.0812810" c="0.0164699" />
--            <distortion model="ptlens" focal="17" a="0.0264456" b="-0.0659419" c="0.0065271" />
--            <distortion model="ptlens" focal="18" a="0.0269712" b="-0.0687339" c="0.0198162" />
--            <distortion model="ptlens" focal="20" a="0.0226641" b="-0.0556216" c="0.0106769" />
--            <distortion model="ptlens" focal="22" a="0.0132067" b="-0.0314146" c="0.0071973" />
--            <distortion model="ptlens" focal="24" a="0.0056959" b="-0.0077006" c="0.0122191" />
--            <distortion model="ptlens" focal="26" a="0.0055174" b="-0.0074034" c="-0.0107297" />
--            <distortion model="ptlens" focal="28" a="0.0058777" b="-0.0106156" c="-0.0023575" />
--            <distortion model="ptlens" focal="30" a="0.0021962" b="0.0003911" c="-0.0113694" />
--            <distortion model="ptlens" focal="35" a="-0.0029164" b="0.0102165" c="-0.0138367" />
--            <distortion model="ptlens" focal="40" a="-0.0022428" b="-0.0097886" c="-0.0112101" />
--            <distortion model="ptlens" focal="45" a="-0.0042728" b="0.0196205" c="-0.0251080" />
--            <distortion model="ptlens" focal="50" a="-0.0036411" b="0.0132272" c="-0.0130181" />
-+            <distortion model="ptlens" focal="16" a="0.0313950" b="-0.0812810" c="0.0164699"/>
-+            <distortion model="ptlens" focal="17" a="0.0264456" b="-0.0659419" c="0.0065271"/>
-+            <distortion model="ptlens" focal="18" a="0.0269712" b="-0.0687339" c="0.0198162"/>
-+            <distortion model="ptlens" focal="20" a="0.0226641" b="-0.0556216" c="0.0106769"/>
-+            <distortion model="ptlens" focal="22" a="0.0132067" b="-0.0314146" c="0.0071973"/>
-+            <distortion model="ptlens" focal="24" a="0.0056959" b="-0.0077006" c="0.0122191"/>
-+            <distortion model="ptlens" focal="26" a="0.0055174" b="-0.0074034" c="-0.0107297"/>
-+            <distortion model="ptlens" focal="28" a="0.0058777" b="-0.0106156" c="-0.0023575"/>
-+            <distortion model="ptlens" focal="30" a="0.0021962" b="0.0003911" c="-0.0113694"/>
-+            <distortion model="ptlens" focal="35" a="-0.0029164" b="0.0102165" c="-0.0138367"/>
-+            <distortion model="ptlens" focal="40" a="-0.0022428" b="-0.0097886" c="-0.0112101"/>
-+            <distortion model="ptlens" focal="45" a="-0.0042728" b="0.0196205" c="-0.0251080"/>
-+            <distortion model="ptlens" focal="50" a="-0.0036411" b="0.0132272" c="-0.0130181"/>
-+            <!-- Taken with Sony Alpha 77II -->
-+            <tca model="poly3" focal="16" br="0.0000214" vr="1.0005348" bb="-0.0000256" vb="1.0000420"/>
-+            <tca model="poly3" focal="20" br="-0.0000020" vr="1.0005625" bb="-0.0000295" vb="0.9999531"/>
-+            <tca model="poly3" focal="26" br="0.0000032" vr="1.0005516" bb="-0.0000294" vb="0.9998124"/>
-+            <tca model="poly3" focal="30" br="0.0000172" vr="1.0004103" bb="-0.0000284" vb="0.9997872"/>
-+            <tca model="poly3" focal="40" br="0.0000128" vr="1.0002373" bb="-0.0000274" vb="0.9998257"/>
-+            <tca model="poly3" focal="50" br="-0.0000137" vr="0.9999984" bb="0.0000025" vb="0.9999610"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5400" k2="0.3424" k3="-0.1866"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5400" k2="0.3424" k3="-0.1866"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="10" k1="-0.3682" k2="0.0089" k3="-0.0511"/>
-+            <vignetting model="pa" focal="16" aperture="4" distance="1000" k1="-0.3682" k2="0.0089" k3="-0.0511"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.2326" k2="-0.0400" k3="-0.0749"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.2326" k2="-0.0400" k3="-0.0749"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="10" k1="-0.4791" k2="0.3114" k3="-0.0987"/>
-+            <vignetting model="pa" focal="16" aperture="8" distance="1000" k1="-0.4791" k2="0.3114" k3="-0.0987"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.4166" k2="0.0410" k3="-0.0097"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.4166" k2="0.0410" k3="-0.0097"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="10" k1="-0.5282" k2="0.6752" k3="-0.6306"/>
-+            <vignetting model="pa" focal="20" aperture="2.8" distance="1000" k1="-0.5282" k2="0.6752" k3="-0.6306"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="10" k1="-0.4513" k2="0.3808" k3="-0.1392"/>
-+            <vignetting model="pa" focal="20" aperture="4" distance="1000" k1="-0.4513" k2="0.3808" k3="-0.1392"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="10" k1="-0.3287" k2="0.0167" k3="0.0429"/>
-+            <vignetting model="pa" focal="20" aperture="5.6" distance="1000" k1="-0.3287" k2="0.0167" k3="0.0429"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="10" k1="-0.3316" k2="0.0630" k3="-0.0391"/>
-+            <vignetting model="pa" focal="20" aperture="8" distance="1000" k1="-0.3316" k2="0.0630" k3="-0.0391"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="10" k1="-0.3297" k2="0.0521" k3="-0.0265"/>
-+            <vignetting model="pa" focal="20" aperture="22" distance="1000" k1="-0.3297" k2="0.0521" k3="-0.0265"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.2960" k2="0.3705" k3="-0.4955"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.2960" k2="0.3705" k3="-0.4955"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.3438" k2="0.4442" k3="-0.3828"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.3438" k2="0.4442" k3="-0.3828"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2644" k2="0.0964" k3="-0.0625"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2644" k2="0.0964" k3="-0.0625"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.2686" k2="0.0941" k3="-0.0723"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.2686" k2="0.0941" k3="-0.0723"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.2681" k2="0.0814" k3="-0.0549"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.2681" k2="0.0814" k3="-0.0549"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.3121" k2="0.2852" k3="-0.2396"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.3121" k2="0.2852" k3="-0.2396"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.3786" k2="0.6256" k3="-0.4873"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.3786" k2="0.6256" k3="-0.4873"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2362" k2="0.1200" k3="-0.0931"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2362" k2="0.1200" k3="-0.0931"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.2338" k2="0.1090" k3="-0.0835"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.2338" k2="0.1090" k3="-0.0835"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2350" k2="0.1067" k3="-0.0780"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2350" k2="0.1067" k3="-0.0780"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.3433" k2="0.1236" k3="-0.0869"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.3433" k2="0.1236" k3="-0.0869"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2016" k2="0.4882" k3="-0.5190"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2016" k2="0.4882" k3="-0.5190"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2915" k2="0.4416" k3="-0.3872"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2915" k2="0.4416" k3="-0.3872"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.2084" k2="0.1124" k3="-0.0904"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.2084" k2="0.1124" k3="-0.0904"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2043" k2="0.0941" k3="-0.0697"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2043" k2="0.0941" k3="-0.0697"/>
-         </calibration>
-     </lens>
--
--    <!--can be removed in future releases as it is superseded by a probably better profile below. 
--        just keeping this as a backup for a while  -->
--    <!--lens>        
-+    <lens>
-         <maker>Sony</maker>
--        <model>Sony DT 18-55mm F3.5-5.6 SAM SAL 1855</model>
--    	<mount>Sony Alpha</mount>
--	    <type>rectilinear</type>
--    	<focal min="18" max="55" />
-+        <model>Sony DT 18-55mm f/3.5-5.6 SAM (SAL1855)</model>
-+        <model lang="en">Sony DT 18-55mm f/3.5-5.6 SAM</model>
-+        <mount>Sony Alpha</mount>
-+        <focal min="18" max="55"/>
-+        <!-- Average crop factor of Sony APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="18" k1="-0.01644" />
--            <distortion model="poly3" focal="24" k1="-0.00711" />
--            <distortion model="poly3" focal="35" k1="-0.00156" />
--	        <distortion model="poly3" focal="55" k1="0.00022" />
--            <tca model="poly3" focal="18" br="0,0002383" cr="-0,0002026" vr="1,000005" bb="-0,0000326" cb="-0,0002833" vb="1,0005781" />
--            <tca model="poly3" focal="24" br="0,0001333" cr="-0,0000849" vr="0,9999687" bb="-0,0002544" cb="0,0002858" vb="1,0002966" />
--            <tca model="poly3" focal="28" br="0,0000818" cr="-0,0000641" vr="0,999984" bb="-0,0002708" cb="0,0004174" vb="1,0001424" />
--            <tca model="poly3" focal="35" br="0,0000722" cr="-0,0001022" vr="1,000016" bb="-0,0001064" cb="0,0000633" vb="1,000208" />
--            <tca model="poly3" focal="55" br="0,0000018" cr="0,000005" vr="1,0000062" bb="-0,0000538" cb="0,0001139" vb="1,000009" />
--	        <vignetting model="pa" focal="18" aperture="3.5" distance="8" k1="-0.07471" k2="-1.06505" k3="0.49526" />
--	        <vignetting model="pa" focal="18" aperture="4.5" distance="8" k1="-0.047204" k2="-0.3346" k3="-0.31317" />
--	        <vignetting model="pa" focal="18" aperture="5.6" distance="8" k1="-0.27732" k2="0.18407" k3="0.60019" />
--	        <vignetting model="pa" focal="24" aperture="4"   distance="8" k1="-0.34756" k2="-2.15042" k3="0.29237" />
--	        <vignetting model="pa" focal="24" aperture="5.6" distance="8" k1="-0.48086" k2="-0.2996" k3="-0.25975" />
-+            <distortion model="poly3" focal="18" k1="-0.01644"/>
-+            <distortion model="poly3" focal="24" k1="-0.00711"/>
-+            <distortion model="poly3" focal="35" k1="-0.00156"/>
-+            <distortion model="poly3" focal="55" k1="0.00022"/>
-+            <tca model="poly3" focal="18" br="0.0004103" cr="-0.0005073" vr="1.0001516" bb="-0.0001287" cb="-0.000226" vb="1.0007798"/>
-+            <tca model="poly3" focal="24" br="0.0001554" cr="-0.0001725" vr="1.0000343" bb="-0.000046" cb="-0.0002381" vb="1.000655"/>
-+            <tca model="poly3" focal="28" br="0.0001039" cr="-0.0000794" vr="0.9999764" bb="0.0000066" cb="-0.0003685" vb="1.0006678"/>
-+            <tca model="poly3" focal="35" br="0.0000526" cr="-0.0000497" vr="0.9999977" bb="0.0000094" cb="-0.0002178" vb="1.0004108"/>
-+            <tca model="poly3" focal="40" br="0.0000877" cr="-0.0000872" vr="1.0000064" bb="0.0000676" cb="-0.0003308" vb="1.0004211"/>
-+            <tca model="poly3" focal="50" br="0.0000768" cr="-0.000147" vr="1.0000969" bb="-0.0000479" cb="-0.0000054" vb="1.0002261"/>
-+            <tca model="poly3" focal="55" br="0.0000843" cr="-0.0001494" vr="1.0001189" bb="-0.0000056" cb="-0.0000362" vb="1.0001643"/>
-+            <!-- Taken with Sony A77 -->
-+            <!-- Actually, the vignetting data was taken with the version II of
-+                 this lens.  But they are probably optically compatible.  Only
-+                 mechanics and coating are changed according to an internet
-+                 source. -->
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.4116" k2="-0.3091" k3="0.2332"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.4116" k2="-0.3091" k3="0.2332"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.3600" k2="0.0701" k3="-0.0216"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.3600" k2="0.0701" k3="-0.0216"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3503" k2="0.0590" k3="-0.0148"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3503" k2="0.0590" k3="-0.0148"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.3462" k2="0.0454" k3="-0.0056"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.3462" k2="0.0454" k3="-0.0056"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="10" k1="-0.2848" k2="-0.3513" k3="0.2412"/>
-+            <vignetting model="pa" focal="22" aperture="4" distance="1000" k1="-0.2848" k2="-0.3513" k3="0.2412"/>
-+            <vignetting model="pa" focal="22" aperture="5.6" distance="10" k1="-0.2838" k2="0.0869" k3="-0.0309"/>
-+            <vignetting model="pa" focal="22" aperture="5.6" distance="1000" k1="-0.2838" k2="0.0869" k3="-0.0309"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="10" k1="-0.2791" k2="0.0798" k3="-0.0257"/>
-+            <vignetting model="pa" focal="22" aperture="8" distance="1000" k1="-0.2791" k2="0.0798" k3="-0.0257"/>
-+            <vignetting model="pa" focal="22" aperture="25" distance="10" k1="-0.2866" k2="0.0679" k3="-0.0162"/>
-+            <vignetting model="pa" focal="22" aperture="25" distance="1000" k1="-0.2866" k2="0.0679" k3="-0.0162"/>
-+            <vignetting model="pa" focal="26" aperture="4.5" distance="10" k1="-0.2692" k2="-0.3260" k3="0.2314"/>
-+            <vignetting model="pa" focal="26" aperture="4.5" distance="1000" k1="-0.2692" k2="-0.3260" k3="0.2314"/>
-+            <vignetting model="pa" focal="26" aperture="6.3" distance="10" k1="-0.2440" k2="0.0764" k3="-0.0273"/>
-+            <vignetting model="pa" focal="26" aperture="6.3" distance="1000" k1="-0.2440" k2="0.0764" k3="-0.0273"/>
-+            <vignetting model="pa" focal="26" aperture="9" distance="10" k1="-0.2407" k2="0.0722" k3="-0.0261"/>
-+            <vignetting model="pa" focal="26" aperture="9" distance="1000" k1="-0.2407" k2="0.0722" k3="-0.0261"/>
-+            <vignetting model="pa" focal="26" aperture="25" distance="10" k1="-0.2378" k2="0.0588" k3="-0.0167"/>
-+            <vignetting model="pa" focal="26" aperture="25" distance="1000" k1="-0.2378" k2="0.0588" k3="-0.0167"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.1171" k2="-0.3559" k3="0.1995"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.1171" k2="-0.3559" k3="0.1995"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="10" k1="-0.1917" k2="0.0658" k3="-0.0277"/>
-+            <vignetting model="pa" focal="35" aperture="6.3" distance="1000" k1="-0.1917" k2="0.0658" k3="-0.0277"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.1884" k2="0.0621" k3="-0.0253"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.1884" k2="0.0621" k3="-0.0253"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="10" k1="-0.1883" k2="0.0584" k3="-0.0249"/>
-+            <vignetting model="pa" focal="35" aperture="29" distance="1000" k1="-0.1883" k2="0.0584" k3="-0.0249"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.3512" k2="0.0792" k3="0.0124"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.3512" k2="0.0792" k3="0.0124"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.0973" k2="0.0202" k3="-0.0132"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.0973" k2="0.0202" k3="-0.0132"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.0957" k2="0.0116" k3="-0.0079"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.0957" k2="0.0116" k3="-0.0079"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="10" k1="-0.0951" k2="0.0034" k3="-0.0009"/>
-+            <vignetting model="pa" focal="55" aperture="36" distance="1000" k1="-0.0951" k2="0.0034" k3="-0.0009"/>
-         </calibration>
--    </lens-->
--
-+    </lens>
-     <lens>
-         <maker>Sony</maker>
--        <model>Sony DT 18-55mm F3.5-5.6 SAM SAL 1855</model>
-+        <model>Minolta/Sony AF DT 18-70mm f/3.5-5.6 (D)</model>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of Sony APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="18" a="0.02852" b="-0.07655" c="0.0228"/>
-+            <distortion model="ptlens" focal="24" a="0.02014" b="-0.06395" c="0.04007"/>
-+            <distortion model="ptlens" focal="28" a="0.01124" b="-0.03682" c="0.02204"/>
-+            <distortion model="ptlens" focal="35" a="0.00317" b="-0.01195" c="0.00656"/>
-+            <distortion model="ptlens" focal="50" a="0.00171" b="-0.00519" c="0.00528"/>
-+            <distortion model="ptlens" focal="70" a="0.00358" b="-0.01139" c="0.0151"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2822" k2="-0.2773" k3="0.0297"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2822" k2="-0.2773" k3="0.0297"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2289" k2="-0.0997" k3="-0.0906"/>
-+            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2289" k2="-0.0997" k3="-0.0906"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2305" k2="-0.1379" k3="0.0322"/>
-+            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2305" k2="-0.1379" k3="0.0322"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.1860" k2="-0.3038" k3="0.1837"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.1860" k2="-0.3038" k3="0.1837"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="10" k1="-0.1604" k2="-0.3944" k3="0.2621"/>
-+            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.1604" k2="-0.3944" k3="0.2621"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1670" k2="-0.3905" k3="0.2690"/>
-+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1670" k2="-0.3905" k3="0.2690"/>
-+            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.1725" k2="-0.3784" k3="0.2645"/>
-+            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.1725" k2="-0.3784" k3="0.2645"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1985" k2="-0.3162" k3="0.2314"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1985" k2="-0.3162" k3="0.2314"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.2179" k2="-0.2480" k3="0.1111"/>
-+            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.2179" k2="-0.2480" k3="0.1111"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2536" k2="-0.0726" k3="0.0699"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2536" k2="-0.0726" k3="0.0699"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.2592" k2="-0.0670" k3="0.0751"/>
-+            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.2592" k2="-0.0670" k3="0.0751"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.2415" k2="-0.1082" k3="0.1079"/>
-+            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.2415" k2="-0.1082" k3="0.1079"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2423" k2="-0.1100" k3="0.1118"/>
-+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2423" k2="-0.1100" k3="0.1118"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.2377" k2="-0.1193" k3="0.1173"/>
-+            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.2377" k2="-0.1193" k3="0.1173"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2359" k2="-0.1308" k3="0.1339"/>
-+            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2359" k2="-0.1308" k3="0.1339"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.2914" k2="0.1261" k3="-0.1133"/>
-+            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.2914" k2="0.1261" k3="-0.1133"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3071" k2="0.1114" k3="-0.0344"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3071" k2="0.1114" k3="-0.0344"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.2692" k2="0.0268" k3="0.0214"/>
-+            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.2692" k2="0.0268" k3="0.0214"/>
-+            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.2515" k2="-0.0085" k3="0.0425"/>
-+            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.2515" k2="-0.0085" k3="0.0425"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.2650" k2="0.0177" k3="0.0288"/>
-+            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.2650" k2="0.0177" k3="0.0288"/>
-+            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.2150" k2="-0.1039" k3="0.1132"/>
-+            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.2150" k2="-0.1039" k3="0.1132"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2008" k2="-0.0221" k3="0.0260"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2008" k2="-0.0221" k3="0.0260"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1970" k2="-0.0447" k3="0.0576"/>
-+            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1970" k2="-0.0447" k3="0.0576"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.2133" k2="-0.0090" k3="0.0372"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.2133" k2="-0.0090" k3="0.0372"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2114" k2="-0.0169" k3="0.0432"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2114" k2="-0.0169" k3="0.0432"/>
-+            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.2097" k2="-0.0214" k3="0.0473"/>
-+            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.2097" k2="-0.0214" k3="0.0473"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.1763" k2="-0.1044" k3="0.1101"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1763" k2="-0.1044" k3="0.1101"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2141" k2="0.0700" k3="-0.0254"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2141" k2="0.0700" k3="-0.0254"/>
-+            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.2764" k2="0.2208" k3="-0.0960"/>
-+            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.2764" k2="0.2208" k3="-0.0960"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.2859" k2="0.2510" k3="-0.1211"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2859" k2="0.2510" k3="-0.1211"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2178" k2="0.0931" k3="-0.0212"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2178" k2="0.0931" k3="-0.0212"/>
-+            <vignetting model="pa" focal="50" aperture="14" distance="10" k1="-0.2282" k2="0.1222" k3="-0.0444"/>
-+            <vignetting model="pa" focal="50" aperture="14" distance="1000" k1="-0.2282" k2="0.1222" k3="-0.0444"/>
-+            <vignetting model="pa" focal="50" aperture="18" distance="10" k1="-0.2090" k2="0.0720" k3="-0.0109"/>
-+            <vignetting model="pa" focal="50" aperture="18" distance="1000" k1="-0.2090" k2="0.0720" k3="-0.0109"/>
-+            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2278" k2="0.1031" k3="-0.0098"/>
-+            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2278" k2="0.1031" k3="-0.0098"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.3260" k2="0.1512" k3="-0.0255"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3260" k2="0.1512" k3="-0.0255"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.0046" k2="-0.3102" k3="0.1909"/>
-+            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.0046" k2="-0.3102" k3="0.1909"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.0376" k2="-0.1603" k3="0.1161"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.0376" k2="-0.1603" k3="0.1161"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.0405" k2="-0.1670" k3="0.1305"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0405" k2="-0.1670" k3="0.1305"/>
-+            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.0582" k2="-0.1240" k3="0.1025"/>
-+            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.0582" k2="-0.1240" k3="0.1025"/>
-+            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.0581" k2="-0.1168" k3="0.0938"/>
-+            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.0581" k2="-0.1168" k3="0.0938"/>
-+            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.0088" k2="-0.2440" k3="0.1877"/>
-+            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.0088" k2="-0.2440" k3="0.1877"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony AF DT 55-200mm f/4-5.6 SAM (SAL55200-2)</model>
-+        <model lang="en">Sony AF DT 55-200mm f/4-5.6 SAM</model>
-+        <mount>Sony Alpha</mount>
-+        <focal min="55" max="200"/>
-         <type>rectilinear</type>
--        <focal min="18" max="55" />
-+        <!-- Average crop factor of Sony APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="18" k1="-0.01644" />
--            <distortion model="poly3" focal="24" k1="-0.00711" />
--            <distortion model="poly3" focal="35" k1="-0.00156" />
--	        <distortion model="poly3" focal="55" k1="0.00022" />
--            <tca model="poly3" focal="18" br="0.0004103" cr="-0.0005073" vr="1.0001516" bb="-0.0001287" cb="-0.000226" vb="1.0007798" />
--            <tca model="poly3" focal="24" br="0.0001554" cr="-0.0001725" vr="1.0000343" bb="-0.000046" cb="-0.0002381" vb="1.000655" />
--            <tca model="poly3" focal="28" br="0.0001039" cr="-0.0000794" vr="0.9999764" bb="0.0000066" cb="-0.0003685" vb="1.0006678" />
--            <tca model="poly3" focal="35" br="0.0000526" cr="-0.0000497" vr="0.9999977" bb="0.0000094" cb="-0.0002178" vb="1.0004108" />
--            <tca model="poly3" focal="40" br="0.0000877" cr="-0.0000872" vr="1.0000064" bb="0.0000676" cb="-0.0003308" vb="1.0004211" />
--            <tca model="poly3" focal="50" br="0.0000768" cr="-0.000147" vr="1.0000969" bb="-0.0000479" cb="-0.0000054" vb="1.0002261" />
--            <tca model="poly3" focal="55" br="0.0000843" cr="-0.0001494" vr="1.0001189" bb="-0.0000056" cb="-0.0000362" vb="1.0001643" />
--	        <vignetting model="pa" focal="18" aperture="3.5" distance="8" k1="-0.07471" k2="-1.06505" k3="0.49526" />
--	        <vignetting model="pa" focal="18" aperture="4.5" distance="8" k1="-0.047204" k2="-0.3346" k3="-0.31317" />
--	        <vignetting model="pa" focal="18" aperture="5.6" distance="8" k1="-0.27732" k2="0.18407" k3="0.60019" />
--	        <vignetting model="pa" focal="24" aperture="4"   distance="8" k1="-0.34756" k2="-2.15042" k3="0.29237" />
--	        <vignetting model="pa" focal="24" aperture="5.6" distance="8" k1="-0.48086" k2="-0.2996" k3="-0.25975" />
-+            <distortion model="poly3" focal="55" k1="-0.00346"/>
-+            <distortion model="poly3" focal="70" k1="0.00586"/>
-+            <distortion model="poly3" focal="100" k1="0.01073"/>
-+            <distortion model="poly3" focal="135" k1="0.00952"/>
-+            <distortion model="poly3" focal="200" k1="0.00871"/>
-+            <tca model="poly3" focal="55" br="0.0000101" vr="1.0001643" bb="0.0001108" vb="0.9999451"/>
-+            <tca model="poly3" focal="70" br="-0.0000150" vr="1.0001222" bb="0.0000510" vb="0.9998586"/>
-+            <tca model="poly3" focal="100" br="-0.0000128" vr="0.9998724" bb="-0.0000023" vb="0.9997716"/>
-+            <tca model="poly3" focal="135" br="-0.0000979" vr="0.9998131" bb="-0.0001018" vb="0.9997999"/>
-+            <tca model="poly3" focal="200" br="-0.0001877" vr="0.9997167" bb="-0.0000221" vb="0.9996858"/>
-+            <!-- Taken with Sony Alpha 77 -->
-+            <vignetting model="pa" focal="55" aperture="4" distance="10" k1="-0.1376" k2="-0.7425" k3="0.4487"/>
-+            <vignetting model="pa" focal="55" aperture="4" distance="1000" k1="-0.1376" k2="-0.7425" k3="0.4487"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.1970" k2="0.1789" k3="-0.2175"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.1970" k2="0.1789" k3="-0.2175"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1859" k2="0.0706" k3="-0.0337"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1859" k2="0.0706" k3="-0.0337"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="10" k1="-0.1766" k2="0.0300" k3="-0.0140"/>
-+            <vignetting model="pa" focal="55" aperture="32" distance="1000" k1="-0.1766" k2="0.0300" k3="-0.0140"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="-0.1956" k2="-0.6565" k3="0.4253"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="-0.1956" k2="-0.6565" k3="0.4253"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1976" k2="0.1705" k3="-0.1812"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1976" k2="0.1705" k3="-0.1812"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1811" k2="0.0677" k3="-0.0323"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1811" k2="0.0677" k3="-0.0323"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.1725" k2="0.0230" k3="-0.0078"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.1725" k2="0.0230" k3="-0.0078"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="10" k1="-0.2828" k2="-0.4656" k3="0.3377"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.2828" k2="-0.4656" k3="0.3377"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="10" k1="-0.1814" k2="0.1380" k3="-0.1553"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="-0.1814" k2="0.1380" k3="-0.1553"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="10" k1="-0.1714" k2="0.0645" k3="-0.0306"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.1714" k2="0.0645" k3="-0.0306"/>
-+            <vignetting model="pa" focal="90" aperture="32" distance="10" k1="-0.1680" k2="0.0254" k3="-0.0074"/>
-+            <vignetting model="pa" focal="90" aperture="32" distance="1000" k1="-0.1680" k2="0.0254" k3="-0.0074"/>
-+            <vignetting model="pa" focal="140" aperture="4.5" distance="10" k1="-0.5641" k2="0.2131" k3="-0.0950"/>
-+            <vignetting model="pa" focal="140" aperture="4.5" distance="1000" k1="-0.5641" k2="0.2131" k3="-0.0950"/>
-+            <vignetting model="pa" focal="140" aperture="6.3" distance="10" k1="-0.0958" k2="-0.0493" k3="-0.0833"/>
-+            <vignetting model="pa" focal="140" aperture="6.3" distance="1000" k1="-0.0958" k2="-0.0493" k3="-0.0833"/>
-+            <vignetting model="pa" focal="140" aperture="9" distance="10" k1="-0.1464" k2="0.0544" k3="-0.0264"/>
-+            <vignetting model="pa" focal="140" aperture="9" distance="1000" k1="-0.1464" k2="0.0544" k3="-0.0264"/>
-+            <vignetting model="pa" focal="140" aperture="32" distance="10" k1="-0.1509" k2="0.0429" k3="-0.0244"/>
-+            <vignetting model="pa" focal="140" aperture="32" distance="1000" k1="-0.1509" k2="0.0429" k3="-0.0244"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-0.0263" k2="-0.6612" k3="0.3784"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-0.0263" k2="-0.6612" k3="0.3784"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0725" k2="-0.0939" k3="-0.0171"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0725" k2="-0.0939" k3="-0.0171"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1274" k2="0.0477" k3="-0.0235"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1274" k2="0.0477" k3="-0.0235"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.1259" k2="0.0395" k3="-0.0237"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.1259" k2="0.0395" k3="-0.0237"/>
-         </calibration>
-     </lens>
--
-+    <!-- This is a full-frame lens. -->
-     <lens>
-         <maker>Sony</maker>
--        <model>Minolta/Sony AF DT 18-70mm F3.5-5.6 (D)</model>
-+        <model>Sony 50mm f/1.4 (SAL50F14)</model>
-+        <model lang="en">Sony 50mm f/1.4</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.02852" b="-0.07655" c="0.0228" />
--            <distortion model="ptlens" focal="24" a="0.02014" b="-0.06395" c="0.04007" />
--            <distortion model="ptlens" focal="28" a="0.01124" b="-0.03682" c="0.02204" />
--            <distortion model="ptlens" focal="35" a="0.00317" b="-0.01195" c="0.00656" />
--            <distortion model="ptlens" focal="50" a="0.00171" b="-0.00519" c="0.00528" />
--            <distortion model="ptlens" focal="70" a="0.00358" b="-0.01139" c="0.0151" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2822" k2="-0.2773" k3="0.0297" />
--            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2822" k2="-0.2773" k3="0.0297" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="10" k1="-0.2289" k2="-0.0997" k3="-0.0906" />
--            <vignetting model="pa" focal="18" aperture="4.5" distance="1000" k1="-0.2289" k2="-0.0997" k3="-0.0906" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="10" k1="-0.2305" k2="-0.1379" k3="0.0322" />
--            <vignetting model="pa" focal="18" aperture="5.6" distance="1000" k1="-0.2305" k2="-0.1379" k3="0.0322" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.1860" k2="-0.3038" k3="0.1837" />
--            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.1860" k2="-0.3038" k3="0.1837" />
--            <vignetting model="pa" focal="18" aperture="9" distance="10" k1="-0.1604" k2="-0.3944" k3="0.2621" />
--            <vignetting model="pa" focal="18" aperture="9" distance="1000" k1="-0.1604" k2="-0.3944" k3="0.2621" />
--            <vignetting model="pa" focal="18" aperture="11" distance="10" k1="-0.1670" k2="-0.3905" k3="0.2690" />
--            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.1670" k2="-0.3905" k3="0.2690" />
--            <vignetting model="pa" focal="18" aperture="14" distance="10" k1="-0.1725" k2="-0.3784" k3="0.2645" />
--            <vignetting model="pa" focal="18" aperture="14" distance="1000" k1="-0.1725" k2="-0.3784" k3="0.2645" />
--            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.1985" k2="-0.3162" k3="0.2314" />
--            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.1985" k2="-0.3162" k3="0.2314" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="10" k1="-0.2179" k2="-0.2480" k3="0.1111" />
--            <vignetting model="pa" focal="24" aperture="4.5" distance="1000" k1="-0.2179" k2="-0.2480" k3="0.1111" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2536" k2="-0.0726" k3="0.0699" />
--            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2536" k2="-0.0726" k3="0.0699" />
--            <vignetting model="pa" focal="24" aperture="7.1" distance="10" k1="-0.2592" k2="-0.0670" k3="0.0751" />
--            <vignetting model="pa" focal="24" aperture="7.1" distance="1000" k1="-0.2592" k2="-0.0670" k3="0.0751" />
--            <vignetting model="pa" focal="24" aperture="9" distance="10" k1="-0.2415" k2="-0.1082" k3="0.1079" />
--            <vignetting model="pa" focal="24" aperture="9" distance="1000" k1="-0.2415" k2="-0.1082" k3="0.1079" />
--            <vignetting model="pa" focal="24" aperture="11" distance="10" k1="-0.2423" k2="-0.1100" k3="0.1118" />
--            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.2423" k2="-0.1100" k3="0.1118" />
--            <vignetting model="pa" focal="24" aperture="14" distance="10" k1="-0.2377" k2="-0.1193" k3="0.1173" />
--            <vignetting model="pa" focal="24" aperture="14" distance="1000" k1="-0.2377" k2="-0.1193" k3="0.1173" />
--            <vignetting model="pa" focal="24" aperture="25" distance="10" k1="-0.2359" k2="-0.1308" k3="0.1339" />
--            <vignetting model="pa" focal="24" aperture="25" distance="1000" k1="-0.2359" k2="-0.1308" k3="0.1339" />
--            <vignetting model="pa" focal="28" aperture="4.5" distance="10" k1="-0.2914" k2="0.1261" k3="-0.1133" />
--            <vignetting model="pa" focal="28" aperture="4.5" distance="1000" k1="-0.2914" k2="0.1261" k3="-0.1133" />
--            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.3071" k2="0.1114" k3="-0.0344" />
--            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.3071" k2="0.1114" k3="-0.0344" />
--            <vignetting model="pa" focal="28" aperture="7.1" distance="10" k1="-0.2692" k2="0.0268" k3="0.0214" />
--            <vignetting model="pa" focal="28" aperture="7.1" distance="1000" k1="-0.2692" k2="0.0268" k3="0.0214" />
--            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.2515" k2="-0.0085" k3="0.0425" />
--            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.2515" k2="-0.0085" k3="0.0425" />
--            <vignetting model="pa" focal="28" aperture="11" distance="10" k1="-0.2650" k2="0.0177" k3="0.0288" />
--            <vignetting model="pa" focal="28" aperture="11" distance="1000" k1="-0.2650" k2="0.0177" k3="0.0288" />
--            <vignetting model="pa" focal="28" aperture="29" distance="10" k1="-0.2150" k2="-0.1039" k3="0.1132" />
--            <vignetting model="pa" focal="28" aperture="29" distance="1000" k1="-0.2150" k2="-0.1039" k3="0.1132" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.2008" k2="-0.0221" k3="0.0260" />
--            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.2008" k2="-0.0221" k3="0.0260" />
--            <vignetting model="pa" focal="35" aperture="7.1" distance="10" k1="-0.1970" k2="-0.0447" k3="0.0576" />
--            <vignetting model="pa" focal="35" aperture="7.1" distance="1000" k1="-0.1970" k2="-0.0447" k3="0.0576" />
--            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.2133" k2="-0.0090" k3="0.0372" />
--            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.2133" k2="-0.0090" k3="0.0372" />
--            <vignetting model="pa" focal="35" aperture="11" distance="10" k1="-0.2114" k2="-0.0169" k3="0.0432" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.2114" k2="-0.0169" k3="0.0432" />
--            <vignetting model="pa" focal="35" aperture="14" distance="10" k1="-0.2097" k2="-0.0214" k3="0.0473" />
--            <vignetting model="pa" focal="35" aperture="14" distance="1000" k1="-0.2097" k2="-0.0214" k3="0.0473" />
--            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.1763" k2="-0.1044" k3="0.1101" />
--            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.1763" k2="-0.1044" k3="0.1101" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.2141" k2="0.0700" k3="-0.0254" />
--            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.2141" k2="0.0700" k3="-0.0254" />
--            <vignetting model="pa" focal="50" aperture="7.1" distance="10" k1="-0.2764" k2="0.2208" k3="-0.0960" />
--            <vignetting model="pa" focal="50" aperture="7.1" distance="1000" k1="-0.2764" k2="0.2208" k3="-0.0960" />
--            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.2859" k2="0.2510" k3="-0.1211" />
--            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.2859" k2="0.2510" k3="-0.1211" />
--            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.2178" k2="0.0931" k3="-0.0212" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.2178" k2="0.0931" k3="-0.0212" />
--            <vignetting model="pa" focal="50" aperture="14" distance="10" k1="-0.2282" k2="0.1222" k3="-0.0444" />
--            <vignetting model="pa" focal="50" aperture="14" distance="1000" k1="-0.2282" k2="0.1222" k3="-0.0444" />
--            <vignetting model="pa" focal="50" aperture="18" distance="10" k1="-0.2090" k2="0.0720" k3="-0.0109" />
--            <vignetting model="pa" focal="50" aperture="18" distance="1000" k1="-0.2090" k2="0.0720" k3="-0.0109" />
--            <vignetting model="pa" focal="50" aperture="36" distance="10" k1="-0.2278" k2="0.1031" k3="-0.0098" />
--            <vignetting model="pa" focal="50" aperture="36" distance="1000" k1="-0.2278" k2="0.1031" k3="-0.0098" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.3260" k2="0.1512" k3="-0.0255" />
--            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.3260" k2="0.1512" k3="-0.0255" />
--            <vignetting model="pa" focal="70" aperture="7.1" distance="10" k1="-0.0046" k2="-0.3102" k3="0.1909" />
--            <vignetting model="pa" focal="70" aperture="7.1" distance="1000" k1="-0.0046" k2="-0.3102" k3="0.1909" />
--            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.0376" k2="-0.1603" k3="0.1161" />
--            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.0376" k2="-0.1603" k3="0.1161" />
--            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.0405" k2="-0.1670" k3="0.1305" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.0405" k2="-0.1670" k3="0.1305" />
--            <vignetting model="pa" focal="70" aperture="14" distance="10" k1="-0.0582" k2="-0.1240" k3="0.1025" />
--            <vignetting model="pa" focal="70" aperture="14" distance="1000" k1="-0.0582" k2="-0.1240" k3="0.1025" />
--            <vignetting model="pa" focal="70" aperture="18" distance="10" k1="-0.0581" k2="-0.1168" k3="0.0938" />
--            <vignetting model="pa" focal="70" aperture="18" distance="1000" k1="-0.0581" k2="-0.1168" k3="0.0938" />
--            <vignetting model="pa" focal="70" aperture="36" distance="10" k1="-0.0088" k2="-0.2440" k3="0.1877" />
--            <vignetting model="pa" focal="70" aperture="36" distance="1000" k1="-0.0088" k2="-0.2440" k3="0.1877" />
-+            <!-- Taken with Sony NEX-7 -->
-+            <distortion model="poly3" focal="50" k1="-0.00336"/>
-+            <tca model="poly3" focal="50" br="-0.0000281" vr="1.0001987" bb="0.0000235" vb="0.9997216"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="10" k1="-0.8087" k2="0.6472" k3="-0.3195"/>
-+            <vignetting model="pa" focal="50" aperture="1.4" distance="1000" k1="-0.8087" k2="0.6472" k3="-0.3195"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="10" k1="-0.1702" k2="0.2045" k3="-0.2438"/>
-+            <vignetting model="pa" focal="50" aperture="2" distance="1000" k1="-0.1702" k2="0.2045" k3="-0.2438"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1589" k2="0.1037" k3="-0.0584"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1589" k2="0.1037" k3="-0.0584"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1578" k2="0.0843" k3="-0.0396"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1578" k2="0.0843" k3="-0.0396"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1586" k2="0.0847" k3="-0.0395"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1586" k2="0.0847" k3="-0.0395"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="10" k1="-0.1667" k2="0.0726" k3="-0.0261"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.1667" k2="0.0726" k3="-0.0261"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.1778" k2="0.1007" k3="-0.0437"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.1778" k2="0.1007" k3="-0.0437"/>
-         </calibration>
-     </lens>
--
--
-     <lens>
--      <maker>Sony</maker>
--        <model>Sony AF DT 55-200mm F4-5.6 SAM</model>
--	    <mount>Sony Alpha</mount>
--	    <type>rectilinear</type>
--	    <focal min="55" max="200" />
-+        <maker>Sony</maker>
-+        <model>Sony DT 35mm f/1.8 SAM (SAL35F18)</model>
-+        <model lang="en">Sony DT 35mm f/1.8 SAM</model>
-+        <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="55" k1="-0.00346" />
--            <distortion model="poly3" focal="70" k1="0.00586" />
--            <distortion model="poly3" focal="100" k1="0.01073" />
--            <distortion model="poly3" focal="135" k1="0.00952" />
--            <distortion model="poly3" focal="200" k1="0.00871" />
--	        <tca model="poly3" focal="55" br="0.0000101" vr="1.0001643" bb="0.0001108" vb="0.9999451" />
--	        <tca model="poly3" focal="70" br="-0.0000150" vr="1.0001222" bb="0.0000510" vb="0.9998586" />
--	        <tca model="poly3" focal="100" br="-0.0000128" vr="0.9998724" bb="-0.0000023" vb="0.9997716" />
--	        <tca model="poly3" focal="135" br="-0.0000979" vr="0.9998131" bb="-0.0001018" vb="0.9997999" />
--	        <tca model="poly3" focal="200" br="-0.0001877" vr="0.9997167" bb="-0.0000221" vb="0.9996858" />
-+            <!-- Taken with Sony Alpha 77 -->
-+            <distortion model="poly3" focal="35" k1="-0.00624"/>
-+            <tca model="poly3" focal="35" br="-0.0000274" vr="1.0002920" bb="0.0000485" vb="0.9999332"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="10" k1="-1.2721" k2="1.1267" k3="-0.4883"/>
-+            <vignetting model="pa" focal="35" aperture="1.8" distance="1000" k1="-1.2721" k2="1.1267" k3="-0.4883"/>
-+            <vignetting model="pa" focal="35" aperture="2.2" distance="10" k1="-0.0465" k2="-1.0308" k3="0.5989"/>
-+            <vignetting model="pa" focal="35" aperture="2.2" distance="1000" k1="-0.0465" k2="-1.0308" k3="0.5989"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.0290" k2="-0.3515" k3="0.0347"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.0290" k2="-0.3515" k3="0.0347"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.1841" k2="0.2115" k3="-0.1480"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.1841" k2="0.2115" k3="-0.1480"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.2740" k2="0.1185" k3="-0.0422"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.2740" k2="0.1185" k3="-0.0422"/>
-         </calibration>
-     </lens>
--
--
--    <!-- That one is done on a cropi 1.5 cam. It should be replaced by a calibration with full format -->
-     <lens>
-         <maker>Sony</maker>
--        <model>Sony 50 mm F1.4 SAL 50F14</model>
-+        <model>Sony DT 50mm f/1.8 SAM</model>
-         <mount>Sony Alpha</mount>
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly5" focal="50" k1="-0.003782"  k2="-0.000003" />
--
--            <tca model="poly3" focal="50" br="-0.0000170" vr="1.0002353" bb="0.0000836" vb="0.9996309" />
--
--            <vignetting model="pa" focal="50.000000" aperture="1.400000" distance="5.000000" k1="-0.301317" k2="0.131668" k3="-0.068295" />
--            <vignetting model="pa" focal="50.000000" aperture="2.000000" distance="5.000000" k1="-0.094064" k2="0.183463" k3="-0.160173" />
--            <vignetting model="pa" focal="50.000000" aperture="2.800000" distance="5.000000" k1="-0.046364" k2="0.024316" k3="-0.014513" />
--            <vignetting model="pa" focal="50.000000" aperture="3.500000" distance="5.000000" k1="-0.062148" k2="0.049874" k3="-0.019353" />
--            <vignetting model="pa" focal="50.000000" aperture="5.000000" distance="5.000000" k1="-0.070057" k2="0.065284" k3="-0.036651" />
--            <vignetting model="pa" focal="50.000000" aperture="8.000000" distance="5.000000" k1="-0.059283" k2="0.024786" k3="-0.003931" />
--            <vignetting model="pa" focal="50.000000" aperture="16.000000" distance="5.000000" k1="-0.072308" k2="0.080953" k3="-0.051882" />
--            <vignetting model="pa" focal="50.000000" aperture="22.000000" distance="5.000000" k1="-0.080270" k2="0.101158" k3="-0.067876" />
-+            <!-- Taken with Sony Alpha 77 -->
-+            <distortion model="poly3" focal="50" k1="-0.00262"/>
-+            <tca model="poly3" focal="50" br="-0.0000475" vr="1.0000804" bb="0.0000925" vb="0.9999390"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="10" k1="-1.1487" k2="0.9842" k3="-0.4195"/>
-+            <vignetting model="pa" focal="50" aperture="1.8" distance="1000" k1="-1.1487" k2="0.9842" k3="-0.4195"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="10" k1="-0.0212" k2="-0.8743" k3="0.4832"/>
-+            <vignetting model="pa" focal="50" aperture="2.2" distance="1000" k1="-0.0212" k2="-0.8743" k3="0.4832"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.1494" k2="0.1179" k3="-0.1835"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.1494" k2="0.1179" k3="-0.1835"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.1584" k2="0.0881" k3="-0.0433"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.1584" k2="0.0881" k3="-0.0433"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="10" k1="-0.2234" k2="0.0495" k3="-0.0088"/>
-+            <vignetting model="pa" focal="50" aperture="22" distance="1000" k1="-0.2234" k2="0.0495" k3="-0.0088"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony DT 55-300mm f/4.5-5.6 SAM (SAL55300)</model>
-+        <model lang="en">Sony DT 55-300mm f/4.5-5.6 SAM</model>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 77 -->
-+            <distortion model="poly3" focal="55" k1="-0.00707"/>
-+            <distortion model="poly3" focal="60" k1="-0.00225"/>
-+            <distortion model="poly3" focal="75" k1="0.00407"/>
-+            <distortion model="poly3" focal="100" k1="0.00813"/>
-+            <distortion model="poly3" focal="140" k1="0.00988"/>
-+            <distortion model="poly3" focal="200" k1="0.0087"/>
-+            <distortion model="poly3" focal="300" k1="0.0057"/>
-+            <tca model="poly3" focal="55" br="0.0000000" vr="1.0002120" bb="0.0000000" vb="1.0000383"/>
-+            <tca model="poly3" focal="70" br="0.0000000" vr="1.0001006" bb="0.0000000" vb="0.9999609"/>
-+            <tca model="poly3" focal="100" br="0.0000000" vr="0.9999804" bb="0.0000000" vb="0.9999263"/>
-+            <tca model="poly3" focal="140" br="0.0000000" vr="0.9998774" bb="0.0000000" vb="0.9999169"/>
-+            <tca model="poly3" focal="200" br="0.0000000" vr="0.9997727" bb="0.0000000" vb="0.9998248"/>
-+            <tca model="poly3" focal="300" br="0.0000000" vr="0.9997229" bb="0.0000000" vb="0.9997788"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="10" k1="-0.1228" k2="-0.5012" k3="0.2728"/>
-+            <vignetting model="pa" focal="55" aperture="4.5" distance="1000" k1="-0.1228" k2="-0.5012" k3="0.2728"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="10" k1="-0.0864" k2="-0.0933" k3="-0.0554"/>
-+            <vignetting model="pa" focal="55" aperture="5.6" distance="1000" k1="-0.0864" k2="-0.0933" k3="-0.0554"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="10" k1="-0.1458" k2="0.0605" k3="-0.0349"/>
-+            <vignetting model="pa" focal="55" aperture="8" distance="1000" k1="-0.1458" k2="0.0605" k3="-0.0349"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="10" k1="-0.1391" k2="0.0420" k3="-0.0201"/>
-+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.1391" k2="0.0420" k3="-0.0201"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="10" k1="-0.1301" k2="0.0181" k3="-0.0115"/>
-+            <vignetting model="pa" focal="55" aperture="22" distance="1000" k1="-0.1301" k2="0.0181" k3="-0.0115"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="10" k1="-0.1071" k2="-0.5190" k3="0.2749"/>
-+            <vignetting model="pa" focal="70" aperture="4.5" distance="1000" k1="-0.1071" k2="-0.5190" k3="0.2749"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1079" k2="-0.0096" k3="-0.1078"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1079" k2="-0.0096" k3="-0.1078"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1508" k2="0.0770" k3="-0.0439"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1508" k2="0.0770" k3="-0.0439"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1439" k2="0.0565" k3="-0.0267"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1439" k2="0.0565" k3="-0.0267"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="10" k1="-0.1339" k2="0.0286" k3="-0.0146"/>
-+            <vignetting model="pa" focal="70" aperture="22" distance="1000" k1="-0.1339" k2="0.0286" k3="-0.0146"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="10" k1="-0.0926" k2="-0.3928" k3="0.0363"/>
-+            <vignetting model="pa" focal="100" aperture="4.5" distance="1000" k1="-0.0926" k2="-0.3928" k3="0.0363"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="10" k1="-0.1492" k2="0.2022" k3="-0.3418"/>
-+            <vignetting model="pa" focal="100" aperture="5.6" distance="1000" k1="-0.1492" k2="0.2022" k3="-0.3418"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="10" k1="-0.1382" k2="0.0594" k3="-0.0271"/>
-+            <vignetting model="pa" focal="100" aperture="8" distance="1000" k1="-0.1382" k2="0.0594" k3="-0.0271"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="10" k1="-0.1398" k2="0.0654" k3="-0.0315"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.1398" k2="0.0654" k3="-0.0315"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="10" k1="-0.1322" k2="0.0470" k3="-0.0290"/>
-+            <vignetting model="pa" focal="100" aperture="22" distance="1000" k1="-0.1322" k2="0.0470" k3="-0.0290"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="10" k1="-0.0824" k2="-0.8883" k3="0.5455"/>
-+            <vignetting model="pa" focal="200" aperture="5" distance="1000" k1="-0.0824" k2="-0.8883" k3="0.5455"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0534" k2="-0.0266" k3="-0.1483"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0534" k2="-0.0266" k3="-0.1483"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.1114" k2="0.0902" k3="-0.0688"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.1114" k2="0.0902" k3="-0.0688"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1028" k2="0.0472" k3="-0.0259"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1028" k2="0.0472" k3="-0.0259"/>
-+            <vignetting model="pa" focal="200" aperture="25" distance="10" k1="-0.0996" k2="0.0250" k3="-0.0150"/>
-+            <vignetting model="pa" focal="200" aperture="25" distance="1000" k1="-0.0996" k2="0.0250" k3="-0.0150"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="10" k1="-1.0205" k2="0.9895" k3="-0.4365"/>
-+            <vignetting model="pa" focal="300" aperture="5.6" distance="1000" k1="-1.0205" k2="0.9895" k3="-0.4365"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.1049" k2="0.1613" k3="-0.1630"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.1049" k2="0.1613" k3="-0.1630"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="10" k1="-0.0891" k2="0.0469" k3="-0.0291"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.0891" k2="0.0469" k3="-0.0291"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="10" k1="-0.0927" k2="0.0510" k3="-0.0304"/>
-+            <vignetting model="pa" focal="300" aperture="16" distance="1000" k1="-0.0927" k2="0.0510" k3="-0.0304"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="10" k1="-0.0935" k2="0.0531" k3="-0.0323"/>
-+            <vignetting model="pa" focal="300" aperture="29" distance="1000" k1="-0.0935" k2="0.0531" k3="-0.0323"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony DT 18-135mm f/3.5-5.6 SAM</model>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 77 -->
-+            <distortion model="ptlens" focal="18" a="0.03774" b="-0.1046" c="0.03514"/>
-+            <distortion model="ptlens" focal="24" a="0.03357" b="-0.07882" c="0.04264"/>
-+            <distortion model="ptlens" focal="35" a="0.02255" b="-0.05451" c="0.05276"/>
-+            <distortion model="ptlens" focal="50" a="0.00289" b="0.00135" c="0.00994"/>
-+            <distortion model="ptlens" focal="135" a="0.00317" b="-0.00593" c="0.01615"/>
-+            <tca model="poly3" focal="18" br="-0.0000720" vr="1.0007184" bb="0.0000457" vb="0.9999007"/>
-+            <tca model="poly3" focal="24" br="-0.0000226" vr="1.0005173" bb="-0.0000464" vb="0.9999834"/>
-+            <tca model="poly3" focal="35" br="-0.0000321" vr="1.0002826" bb="-0.0000117" vb="0.9999902"/>
-+            <tca model="poly3" focal="50" br="-0.0000027" vr="1.0000720" bb="-0.0000285" vb="0.9999756"/>
-+            <tca model="poly3" focal="70" br="0.0000131" vr="0.9999129" bb="-0.0000779" vb="0.9999934"/>
-+            <tca model="poly3" focal="100" br="-0.0000281" vr="0.9997815" bb="-0.0000172" vb="0.9999202"/>
-+            <tca model="poly3" focal="135" br="-0.0000507" vr="0.9994918" bb="-0.0000277" vb="0.9999325"/>
-+            <tca model="poly3" focal="135" br="-0.0000844" vr="0.9995450" bb="-0.0000238" vb="0.9998508"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="10" k1="-0.2340" k2="-0.5060" k3="0.0926"/>
-+            <vignetting model="pa" focal="18" aperture="3.5" distance="1000" k1="-0.2340" k2="-0.5060" k3="0.0926"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="10" k1="-0.3560" k2="0.4672" k3="-0.5736"/>
-+            <vignetting model="pa" focal="18" aperture="5" distance="1000" k1="-0.3560" k2="0.4672" k3="-0.5736"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="10" k1="-0.3139" k2="0.2152" k3="-0.2452"/>
-+            <vignetting model="pa" focal="18" aperture="7.1" distance="1000" k1="-0.3139" k2="0.2152" k3="-0.2452"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="10" k1="-0.2423" k2="-0.1083" k3="0.0426"/>
-+            <vignetting model="pa" focal="18" aperture="22" distance="1000" k1="-0.2423" k2="-0.1083" k3="0.0426"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.6728" k2="1.0448" k3="-0.9737"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.6728" k2="1.0448" k3="-0.9737"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.4339" k2="0.8624" k3="-0.8051"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.4339" k2="0.8624" k3="-0.8051"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="10" k1="-0.3343" k2="0.4614" k3="-0.4237"/>
-+            <vignetting model="pa" focal="24" aperture="8" distance="1000" k1="-0.3343" k2="0.4614" k3="-0.4237"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="10" k1="-0.2475" k2="0.0888" k3="-0.0873"/>
-+            <vignetting model="pa" focal="24" aperture="22" distance="1000" k1="-0.2475" k2="0.0888" k3="-0.0873"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="10" k1="-0.3819" k2="0.6878" k3="-0.8625"/>
-+            <vignetting model="pa" focal="35" aperture="4.5" distance="1000" k1="-0.3819" k2="0.6878" k3="-0.8625"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.4027" k2="1.0244" k3="-1.0033"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.4027" k2="1.0244" k3="-1.0033"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.3595" k2="0.8017" k3="-0.7397"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.3595" k2="0.8017" k3="-0.7397"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="10" k1="-0.1882" k2="0.1195" k3="-0.1177"/>
-+            <vignetting model="pa" focal="35" aperture="22" distance="1000" k1="-0.1882" k2="0.1195" k3="-0.1177"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.1802" k2="0.3482" k3="-0.4547"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.1802" k2="0.3482" k3="-0.4547"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.1350" k2="0.1520" k3="-0.1303"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.1350" k2="0.1520" k3="-0.1303"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="10" k1="-0.1029" k2="0.0329" k3="-0.0217"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.1029" k2="0.0329" k3="-0.0217"/>
-+            <vignetting model="pa" focal="75" aperture="22" distance="10" k1="-0.1037" k2="0.0387" k3="-0.0296"/>
-+            <vignetting model="pa" focal="75" aperture="22" distance="1000" k1="-0.1037" k2="0.0387" k3="-0.0296"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="10" k1="0.0882" k2="-0.5296" k3="0.1561"/>
-+            <vignetting model="pa" focal="135" aperture="5.6" distance="1000" k1="0.0882" k2="-0.5296" k3="0.1561"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="10" k1="-0.1395" k2="0.2934" k3="-0.3020"/>
-+            <vignetting model="pa" focal="135" aperture="8" distance="1000" k1="-0.1395" k2="0.2934" k3="-0.3020"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="10" k1="-0.0898" k2="0.0582" k3="-0.0402"/>
-+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.0898" k2="0.0582" k3="-0.0402"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="10" k1="-0.0950" k2="0.0536" k3="-0.0355"/>
-+            <vignetting model="pa" focal="135" aperture="22" distance="1000" k1="-0.0950" k2="0.0536" k3="-0.0355"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony AF DT 30mm f/2.8 SAM Macro (SAL30M28)</model>
-+        <model lang="en">Sony AF DT 30mm f/2.8 SAM Macro</model>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 65 -->
-+            <distortion model="ptlens" focal="30" a="0.00472" b="-0.02284" c="0.02137"/>
-+            <tca model="poly3" focal="30" br="-0.0000159" vr="1.0003480" bb="0.0000940" vb="0.9996574"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="10" k1="-1.8670" k2="2.1179" k3="-0.9856"/>
-+            <vignetting model="pa" focal="30" aperture="2.8" distance="1000" k1="-1.8670" k2="2.1179" k3="-0.9856"/>
-+            <vignetting model="pa" focal="30" aperture="3.5" distance="10" k1="-1.3206" k2="0.9184" k3="-0.2916"/>
-+            <vignetting model="pa" focal="30" aperture="3.5" distance="1000" k1="-1.3206" k2="0.9184" k3="-0.2916"/>
-+            <vignetting model="pa" focal="30" aperture="4.5" distance="10" k1="-0.5181" k2="-0.2225" k3="0.1860"/>
-+            <vignetting model="pa" focal="30" aperture="4.5" distance="1000" k1="-0.5181" k2="-0.2225" k3="0.1860"/>
-+            <vignetting model="pa" focal="30" aperture="5.6" distance="10" k1="-0.5288" k2="0.2552" k3="-0.1913"/>
-+            <vignetting model="pa" focal="30" aperture="5.6" distance="1000" k1="-0.5288" k2="0.2552" k3="-0.1913"/>
-+            <vignetting model="pa" focal="30" aperture="7.1" distance="10" k1="-0.6083" k2="0.5202" k3="-0.3191"/>
-+            <vignetting model="pa" focal="30" aperture="7.1" distance="1000" k1="-0.6083" k2="0.5202" k3="-0.3191"/>
-+            <vignetting model="pa" focal="30" aperture="22" distance="10" k1="-0.8122" k2="0.5752" k3="-0.2326"/>
-+            <vignetting model="pa" focal="30" aperture="22" distance="1000" k1="-0.8122" k2="0.5752" k3="-0.2326"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Sony</maker>
-+        <model>Sony AF DT 18-250mm f/3.5-6.3 (SAL18250)</model>
-+        <model lang="en">Sony AF DT 18-250mm f/3.5-6.3</model>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 65 -->
-+            <distortion model="ptlens" focal="18" a="0.01887" b="-0.05832" c="0.00708"/>
-+            <distortion model="ptlens" focal="30" a="0.04068" b="-0.12525" c="0.13898"/>
-+            <distortion model="ptlens" focal="40" a="0.01444" b="-0.03561" c="0.04514"/>
-+            <distortion model="ptlens" focal="55" a="0.00014" b="0.01095" c="0.00508"/>
-+            <distortion model="ptlens" focal="75" a="0.00283" b="-0.00043" c="0.01781"/>
-+            <distortion model="ptlens" focal="130" a="-0.00506" b="0.04556" c="-0.07297"/>
-+            <distortion model="ptlens" focal="250" a="-0.00828" b="0.02298" c="-0.005"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-tamron.xml b/data/db/slr-tamron.xml
---- a/data/db/slr-tamron.xml	2013-10-16 20:48:25.000000000 +0200
-+++ b/data/db/slr-tamron.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,364 +1,898 @@
- <lensdatabase>
--
-     <lens>
-         <maker>Tamron</maker>
--	    <model>Tamron SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical IF</model>
--	    <mount>Canon EF</mount>
-+        <model>Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF)</model>
-+        <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="10" k1="-0.02452" />
--            <distortion model="poly3" focal="12" k1="-0.03732" />
--            <distortion model="poly3" focal="15" k1="-0.023" />
--            <distortion model="poly3" focal="17" k1="-0.01204" />
--            <distortion model="poly3" focal="24" k1="-0.00673" />
--            <tca model="poly3" focal="10" br="-0.0010404" cr="0.0020275" vr="0.9995749" bb="0.0009303" cb="-0.0018018" vb="1.0010352" />
--            <tca model="poly3" focal="12" br="-0.0007314" cr="0.002109" vr="0.9993352" bb="0.0004953" cb="-0.0011687" vb="1.0007539" />
--            <tca model="poly3" focal="15" br="-0.0001484" cr="0.000925" vr="0.9997811" bb="0.0001986" cb="-0.0006209" vb="1.0005421" />
--            <tca model="poly3" focal="17" br="0.0005667" cr="-0.0006233" vr="1.0004042" bb="0.0000267" cb="-0.000269" vb="1.0004302" />
--            <tca model="poly3" focal="18" br="0.0002315" cr="-0.0001694" vr="1.0002462" bb="-0.0000242" cb="-0.0001424" vb="1.000351" />
--            <tca model="poly3" focal="24" br="0.00027" cr="-0.0002972" vr="1.0002846" bb="-0.0000645" cb="-0.0000806" vb="1.0003365" />
-+            <distortion model="poly3" focal="10" k1="-0.02452"/>
-+            <distortion model="poly3" focal="12" k1="-0.03732"/>
-+            <distortion model="poly3" focal="15" k1="-0.023"/>
-+            <distortion model="poly3" focal="17" k1="-0.01204"/>
-+            <distortion model="poly3" focal="24" k1="-0.00673"/>
-+            <tca model="poly3" focal="10" br="-0.0010404" cr="0.0020275" vr="0.9995749" bb="0.0009303" cb="-0.0018018" vb="1.0010352"/>
-+            <tca model="poly3" focal="12" br="-0.0007314" cr="0.002109" vr="0.9993352" bb="0.0004953" cb="-0.0011687" vb="1.0007539"/>
-+            <tca model="poly3" focal="15" br="-0.0001484" cr="0.000925" vr="0.9997811" bb="0.0001986" cb="-0.0006209" vb="1.0005421"/>
-+            <tca model="poly3" focal="17" br="0.0005667" cr="-0.0006233" vr="1.0004042" bb="0.0000267" cb="-0.000269" vb="1.0004302"/>
-+            <tca model="poly3" focal="18" br="0.0002315" cr="-0.0001694" vr="1.0002462" bb="-0.0000242" cb="-0.0001424" vb="1.000351"/>
-+            <tca model="poly3" focal="24" br="0.00027" cr="-0.0002972" vr="1.0002846" bb="-0.0000645" cb="-0.0000806" vb="1.0003365"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 17-35mm f/2.8-4 Di LD</model>
-+        <model>Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical (IF)</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.023029" b="-0.056393" c="0" />
--            <distortion model="ptlens" focal="18" a="0.021257" b="-0.051504" c="0" />
--            <distortion model="ptlens" focal="19" a="0.018234" b="-0.043262" c="0" />
--            <distortion model="ptlens" focal="20" a="0.017656" b="-0.040559" c="0" />
--            <distortion model="ptlens" focal="21" a="0.015106" b="-0.033986" c="0" />
--            <distortion model="ptlens" focal="22" a="0.014043" b="-0.030629" c="0" />
--            <distortion model="ptlens" focal="23" a="0.014764" b="-0.030599" c="0" />
--            <distortion model="ptlens" focal="24" a="0.012702" b="-0.025685" c="0" />
--            <distortion model="ptlens" focal="26" a="0.010132" b="-0.019341" c="0" />
--            <distortion model="ptlens" focal="28" a="0.003497" b="-0.003995" c="0" />
--            <distortion model="ptlens" focal="30" a="0.002043" b="0" c="0" />
--            <distortion model="ptlens" focal="32" a="0.002246" b="0" c="0" />
--            <distortion model="ptlens" focal="35" a="0.002673" b="0" c="0" />
-+            <distortion model="ptlens" focal="17" a="0.023029" b="-0.056393" c="0"/>
-+            <distortion model="ptlens" focal="18" a="0.021257" b="-0.051504" c="0"/>
-+            <distortion model="ptlens" focal="19" a="0.018234" b="-0.043262" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.017656" b="-0.040559" c="0"/>
-+            <distortion model="ptlens" focal="21" a="0.015106" b="-0.033986" c="0"/>
-+            <distortion model="ptlens" focal="22" a="0.014043" b="-0.030629" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.014764" b="-0.030599" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.012702" b="-0.025685" c="0"/>
-+            <distortion model="ptlens" focal="26" a="0.010132" b="-0.019341" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.003497" b="-0.003995" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.002043" b="0" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0.002246" b="0" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.002673" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 17-50mm f/2.8 XR Di II LD</model>
-+        <model>Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF)</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0.02667" b="-0.07161" c="0.02012" />
--            <distortion model="ptlens" focal="24" a="0.02791" b="-0.08057" c="0.07132" />
--            <distortion model="ptlens" focal="35" a="-0.01098" b="0.0448" c="-0.04755" />
--            <distortion model="ptlens" focal="50" a="-0.00372" b="0.01796" c="-0.01334" />
--            <tca model="poly3" focal="17" br="0.0000205" vr="1.0005975" bb="-0.0001325" vb="1.0008428" />
--            <tca model="poly3" focal="24" br="-0.0000073" vr="1.0004585" bb="-0.0000382" vb="1.0004269" />
--            <tca model="poly3" focal="35" br="-0.0000351" vr="1.0002419" bb="-0.0000228" vb="1.0001575" />
--            <tca model="poly3" focal="50" br="-0.0000294" vr="1.0000100" bb="-0.0000149" vb="0.9999915" />
-+            <distortion model="ptlens" focal="17" a="0.02667" b="-0.07161" c="0.02012"/>
-+            <distortion model="ptlens" focal="24" a="0.02791" b="-0.08057" c="0.07132"/>
-+            <distortion model="ptlens" focal="35" a="-0.01098" b="0.0448" c="-0.04755"/>
-+            <distortion model="ptlens" focal="50" a="-0.00372" b="0.01796" c="-0.01334"/>
-+            <tca model="poly3" focal="17" br="0.0000205" vr="1.0005975" bb="-0.0001325" vb="1.0008428"/>
-+            <tca model="poly3" focal="24" br="-0.0000073" vr="1.0004585" bb="-0.0000382" vb="1.0004269"/>
-+            <tca model="poly3" focal="35" br="-0.0000351" vr="1.0002419" bb="-0.0000228" vb="1.0001575"/>
-+            <tca model="poly3" focal="50" br="-0.0000294" vr="1.0000100" bb="-0.0000149" vb="0.9999915"/>
-+            <!-- Taken with Sony Alpha 77 -->
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="10" k1="-0.2015" k2="-0.5991" k3="0.2021"/>
-+            <vignetting model="pa" focal="17" aperture="2.8" distance="1000" k1="-0.2015" k2="-0.5991" k3="0.2021"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="10" k1="-0.3924" k2="0.1323" k3="-0.1185"/>
-+            <vignetting model="pa" focal="17" aperture="4" distance="1000" k1="-0.3924" k2="0.1323" k3="-0.1185"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="10" k1="-0.3503" k2="-0.0386" k3="0.0456"/>
-+            <vignetting model="pa" focal="17" aperture="5.6" distance="1000" k1="-0.3503" k2="-0.0386" k3="0.0456"/>
-+            <vignetting model="pa" focal="17" aperture="32" distance="10" k1="-0.4127" k2="0.0918" k3="-0.0471"/>
-+            <vignetting model="pa" focal="17" aperture="32" distance="1000" k1="-0.4127" k2="0.0918" k3="-0.0471"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="10" k1="-0.2976" k2="0.0425" k3="-0.2040"/>
-+            <vignetting model="pa" focal="24" aperture="2.8" distance="1000" k1="-0.2976" k2="0.0425" k3="-0.2040"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="10" k1="-0.2861" k2="0.0804" k3="-0.0491"/>
-+            <vignetting model="pa" focal="24" aperture="4" distance="1000" k1="-0.2861" k2="0.0804" k3="-0.0491"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="10" k1="-0.2603" k2="-0.0123" k3="0.0309"/>
-+            <vignetting model="pa" focal="24" aperture="5.6" distance="1000" k1="-0.2603" k2="-0.0123" k3="0.0309"/>
-+            <vignetting model="pa" focal="24" aperture="32" distance="10" k1="-0.3228" k2="0.1211" k3="-0.0654"/>
-+            <vignetting model="pa" focal="24" aperture="32" distance="1000" k1="-0.3228" k2="0.1211" k3="-0.0654"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="10" k1="-0.3567" k2="0.2365" k3="-0.3538"/>
-+            <vignetting model="pa" focal="28" aperture="2.8" distance="1000" k1="-0.3567" k2="0.2365" k3="-0.3538"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="10" k1="-0.2659" k2="0.1765" k3="-0.1376"/>
-+            <vignetting model="pa" focal="28" aperture="4" distance="1000" k1="-0.2659" k2="0.1765" k3="-0.1376"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="10" k1="-0.2206" k2="0.0051" k3="0.0147"/>
-+            <vignetting model="pa" focal="28" aperture="5.6" distance="1000" k1="-0.2206" k2="0.0051" k3="0.0147"/>
-+            <vignetting model="pa" focal="28" aperture="32" distance="10" k1="-0.2776" k2="0.1262" k3="-0.0790"/>
-+            <vignetting model="pa" focal="28" aperture="32" distance="1000" k1="-0.2776" k2="0.1262" k3="-0.0790"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="10" k1="-0.4103" k2="0.3490" k3="-0.4316"/>
-+            <vignetting model="pa" focal="35" aperture="2.8" distance="1000" k1="-0.4103" k2="0.3490" k3="-0.4316"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.2610" k2="0.2866" k3="-0.2427"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.2610" k2="0.2866" k3="-0.2427"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="10" k1="-0.1945" k2="0.0220" k3="-0.0015"/>
-+            <vignetting model="pa" focal="35" aperture="5.6" distance="1000" k1="-0.1945" k2="0.0220" k3="-0.0015"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="10" k1="-0.2517" k2="0.1336" k3="-0.1043"/>
-+            <vignetting model="pa" focal="35" aperture="32" distance="1000" k1="-0.2517" k2="0.1336" k3="-0.1043"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="10" k1="-0.4909" k2="0.4324" k3="-0.4813"/>
-+            <vignetting model="pa" focal="50" aperture="2.8" distance="1000" k1="-0.4909" k2="0.4324" k3="-0.4813"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="10" k1="-0.2722" k2="0.4692" k3="-0.4292"/>
-+            <vignetting model="pa" focal="50" aperture="4" distance="1000" k1="-0.2722" k2="0.4692" k3="-0.4292"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="10" k1="-0.1685" k2="0.0381" k3="-0.0172"/>
-+            <vignetting model="pa" focal="50" aperture="5.6" distance="1000" k1="-0.1685" k2="0.0381" k3="-0.0172"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="10" k1="-0.2221" k2="0.1291" k3="-0.1026"/>
-+            <vignetting model="pa" focal="50" aperture="32" distance="1000" k1="-0.2221" k2="0.1291" k3="-0.1026"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 18-200mm f/3.5-6.3 XR Di II LD</model>
-+        <model>Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical (IF)</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 700D -->
-+            <distortion model="ptlens" focal="17" a="0.01062" b="-0.02795" c="-0.01852"/>
-+            <distortion model="ptlens" focal="21" a="0.00662" b="-0.01583" c="-0.01217"/>
-+            <distortion model="ptlens" focal="25" a="0.00546" b="-0.0092" c="-0.01406"/>
-+            <distortion model="ptlens" focal="29" a="0" b="-0.00072" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.0008" c="0"/>
-+            <distortion model="ptlens" focal="42" a="0" b="0.00127" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.00192" c="0"/>
-+            <tca model="poly3" focal="17" br="0.0000899" vr="1.0002901" bb="-0.0000249" vb="1.0000373"/>
-+            <tca model="poly3" focal="21" br="0.0000810" vr="1.0002483" bb="-0.0000293" vb="0.9999965"/>
-+            <tca model="poly3" focal="25" br="0.0000611" vr="1.0002142" bb="-0.0000485" vb="1.0000065"/>
-+            <tca model="poly3" focal="29" br="0.0000039" vr="1.0002061" bb="-0.0000300" vb="0.9999764"/>
-+            <tca model="poly3" focal="35" br="-0.0000217" vr="1.0001788" bb="-0.0000244" vb="0.9999476"/>
-+            <tca model="poly3" focal="42" br="-0.0000020" vr="1.0000794" bb="-0.0000250" vb="0.9999412"/>
-+            <tca model="poly3" focal="50" br="0.0000015" vr="1.0000160" bb="-0.0000400" vb="0.9999559"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.01364" b="-0.042157" c="0" />
--            <distortion model="ptlens" focal="28" a="0.010678" b="-0.016742" c="0" />
--            <distortion model="ptlens" focal="35" a="0.009558" b="-0.008863" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.011197" c="0" />
--            <distortion model="ptlens" focal="72" a="0" b="0.010552" c="0" />
--            <distortion model="ptlens" focal="102" a="0" b="0.007166" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.007026" c="0" />
--            <distortion model="ptlens" focal="150" a="0" b="0.006778" c="0" />
--            <distortion model="ptlens" focal="200" a="0" b="0.006016" c="0" />
-+            <distortion model="ptlens" focal="18" a="0.01364" b="-0.042157" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.010678" b="-0.016742" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.009558" b="-0.008863" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.011197" c="0"/>
-+            <distortion model="ptlens" focal="72" a="0" b="0.010552" c="0"/>
-+            <distortion model="ptlens" focal="102" a="0" b="0.007166" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.007026" c="0"/>
-+            <distortion model="ptlens" focal="150" a="0" b="0.006778" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.006016" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF] MACRO</model>
-+        <model>Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Pentax KAF</mount>
-+        <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="18" a="0.01757" b="-0.052885" c="0"/>
-+            <distortion model="ptlens" focal="25" a="0.007578" b="-0.014077" c="0"/>
-+            <distortion model="ptlens" focal="31" a="0.004963" b="-0.001934" c="0"/>
-+            <distortion model="ptlens" focal="38" a="0" b="0.010127" c="0"/>
-+            <distortion model="ptlens" focal="54" a="0" b="0.010971" c="0"/>
-+            <distortion model="ptlens" focal="73" a="0" b="0.010296" c="0"/>
-+            <distortion model="ptlens" focal="102" a="0" b="0.008059" c="0"/>
-+            <distortion model="ptlens" focal="125" a="0" b="0.007314" c="0"/>
-+            <distortion model="ptlens" focal="149" a="0" b="0.007285" c="0"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.005942" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="18" a="0.020360" b="-0.059050" c="0" />
--            <distortion model="ptlens" focal="20" a="0.020770" b="-0.052400" c="0" />
--            <distortion model="ptlens" focal="23" a="0.016230" b="-0.032540" c="0" />
--            <distortion model="ptlens" focal="29" a="0.012160" b="-0.015480" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="0.037550" c="-0" />
--            <distortion model="ptlens" focal="47" a="0" b="0.033220" c="-0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.017510" c="-0.014350" />
--            <distortion model="ptlens" focal="100" a="0" b="0.018700" c="-0.018810" />
--            <distortion model="ptlens" focal="120" a="0" b="0.018400" c="-0.019970" />
--            <distortion model="ptlens" focal="155" a="0" b="0.009580" c="-0.002450" />
--            <distortion model="ptlens" focal="200" a="0" b="0.001230" c="0.013960" />
--            <distortion model="ptlens" focal="250" a="0" b="-0.000110" c="0.008560" />
--            <tca model="poly3" focal="18" br="0.0000455" cr="0.0001324" vr="1.0003247" bb="-0.0002737" cb="0.0006098" vb="1.0000266" />
--            <tca model="poly3" focal="23.1" br="-0.0000830" cr="0.0002635" vr="1.0002333" bb="-0.0001797" cb="0.0007033" vb="0.9999820" />
--            <tca model="poly3" focal="26.9" br="-0.0003871" cr="0.0008622" vr="0.9999533" bb="-0.0001398" cb="0.0006987" vb="0.9999226" />
--            <tca model="poly3" focal="29.4" br="-0.0003218" cr="0.0007089" vr="0.9999775" bb="0.0001630" cb="-0.0000255" vb="1.0003434" />
--            <tca model="poly3" focal="35" br="-0.0001337" cr="0.0002671" vr="1.0000620" bb="-0.0000737" cb="0.0004179" vb="1.0001761" />
--            <tca model="poly3" focal="55" br="-0.0000006" cr="-0.0000747" vr="1.0000795" bb="-0.0000202" cb="0.0002275" vb="1.0002342" />
--            <tca model="poly3" focal="70" br="-0.0000020" cr="-0.0000449" vr="0.9999473" bb="-0.0002686" cb="0.0006367" vb="1.0000025" />
--            <tca model="poly3" focal="100" br="0.0000928" cr="-0.0002755" vr="0.9998440" bb="-0.0001632" cb="0.0002535" vb="1.0000525" />
--            <tca model="poly3" focal="142.5" br="0.0001761" cr="-0.0004582" vr="0.9996290" bb="-0.0003233" cb="0.0005660" vb="0.9996693" />
--            <tca model="poly3" focal="220" br="0.0001387" cr="-0.0004467" vr="0.9993390" bb="0.0000952" cb="-0.0001185" vb="0.9997363" />
--            <tca model="poly3" focal="250" br="0.0005417" cr="-0.0013082" vr="0.9997014" bb="-0.0007442" cb="0.0015463" vb="0.9988026" />
-+            <distortion model="ptlens" focal="18" a="0.020360" b="-0.059050" c="0"/>
-+            <distortion model="ptlens" focal="20" a="0.020770" b="-0.052400" c="0"/>
-+            <distortion model="ptlens" focal="23" a="0.016230" b="-0.032540" c="0"/>
-+            <distortion model="ptlens" focal="29" a="0.012160" b="-0.015480" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0" b="0.037550" c="-0"/>
-+            <distortion model="ptlens" focal="47" a="0" b="0.033220" c="-0"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.017510" c="-0.014350"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.018700" c="-0.018810"/>
-+            <distortion model="ptlens" focal="120" a="0" b="0.018400" c="-0.019970"/>
-+            <distortion model="ptlens" focal="155" a="0" b="0.009580" c="-0.002450"/>
-+            <distortion model="ptlens" focal="200" a="0" b="0.001230" c="0.013960"/>
-+            <distortion model="ptlens" focal="250" a="0" b="-0.000110" c="0.008560"/>
-+            <tca model="poly3" focal="18" br="0.0000455" cr="0.0001324" vr="1.0003247" bb="-0.0002737" cb="0.0006098" vb="1.0000266"/>
-+            <tca model="poly3" focal="23.1" br="-0.0000830" cr="0.0002635" vr="1.0002333" bb="-0.0001797" cb="0.0007033" vb="0.9999820"/>
-+            <tca model="poly3" focal="26.9" br="-0.0003871" cr="0.0008622" vr="0.9999533" bb="-0.0001398" cb="0.0006987" vb="0.9999226"/>
-+            <tca model="poly3" focal="29.4" br="-0.0003218" cr="0.0007089" vr="0.9999775" bb="0.0001630" cb="-0.0000255" vb="1.0003434"/>
-+            <tca model="poly3" focal="35" br="-0.0001337" cr="0.0002671" vr="1.0000620" bb="-0.0000737" cb="0.0004179" vb="1.0001761"/>
-+            <tca model="poly3" focal="55" br="-0.0000006" cr="-0.0000747" vr="1.0000795" bb="-0.0000202" cb="0.0002275" vb="1.0002342"/>
-+            <tca model="poly3" focal="70" br="-0.0000020" cr="-0.0000449" vr="0.9999473" bb="-0.0002686" cb="0.0006367" vb="1.0000025"/>
-+            <tca model="poly3" focal="100" br="0.0000928" cr="-0.0002755" vr="0.9998440" bb="-0.0001632" cb="0.0002535" vb="1.0000525"/>
-+            <tca model="poly3" focal="142.5" br="0.0001761" cr="-0.0004582" vr="0.9996290" bb="-0.0003233" cb="0.0005660" vb="0.9996693"/>
-+            <tca model="poly3" focal="220" br="0.0001387" cr="-0.0004467" vr="0.9993390" bb="0.0000952" cb="-0.0001185" vb="0.9997363"/>
-+            <tca model="poly3" focal="250" br="0.0005417" cr="-0.0013082" vr="0.9997014" bb="-0.0007442" cb="0.0015463" vb="0.9988026"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 19-35mm f/3.5-4.5</model>
-+        <model>Tamron AF 19-35mm f/3.5-4.5</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="19" a="0.013926" b="-0.041094" c="0" />
--            <distortion model="ptlens" focal="24" a="0.005657" b="-0.020982" c="0" />
--            <distortion model="ptlens" focal="27" a="0.003315" b="-0.014095" c="0" />
--            <distortion model="ptlens" focal="35" a="0.004475" b="-0.013489" c="0" />
-+            <distortion model="ptlens" focal="19" a="0.013926" b="-0.041094" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0.005657" b="-0.020982" c="0"/>
-+            <distortion model="ptlens" focal="27" a="0.003315" b="-0.014095" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.004475" b="-0.013489" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron SP 24-70mm F/2.8 Di VC USD</model>
-+        <model>Tamron SP 24-70mm f/2.8 Di VC USD</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.03519" b="-0.10395" c="0.06092" />
--            <distortion model="ptlens" focal="35" a="0.01436" b="-0.0404" c="0.03983" />
--            <distortion model="ptlens" focal="50" a="0.01112" b="-0.02223" c="0.02177" />
--            <distortion model="ptlens" focal="70" a="0.00625" b="-0.00862" c="0.00987" />
--            <tca model="poly3" focal="24" br="-0.0000913" vr="1.0008446" bb="0.0000181" vb="0.9998653" />
--            <tca model="poly3" focal="35" br="0.0000457" vr="1.0004519" bb="-0.0000735" vb="0.9998598" />
--            <tca model="poly3" focal="50" br="0.0000118" vr="1.0000938" bb="-0.0000862" vb="0.9998401" />
--            <tca model="poly3" focal="70" br="-0.0000161" vr="0.9997567" bb="-0.0000354" vb="0.9997991" />
-+            <distortion model="ptlens" focal="24" a="0.03519" b="-0.10395" c="0.06092"/>
-+            <distortion model="ptlens" focal="35" a="0.01436" b="-0.0404" c="0.03983"/>
-+            <distortion model="ptlens" focal="50" a="0.01112" b="-0.02223" c="0.02177"/>
-+            <distortion model="ptlens" focal="70" a="0.00625" b="-0.00862" c="0.00987"/>
-+            <tca model="poly3" focal="24" br="-0.0000913" vr="1.0008446" bb="0.0000181" vb="0.9998653"/>
-+            <tca model="poly3" focal="35" br="0.0000457" vr="1.0004519" bb="-0.0000735" vb="0.9998598"/>
-+            <tca model="poly3" focal="50" br="0.0000118" vr="1.0000938" bb="-0.0000862" vb="0.9998401"/>
-+            <tca model="poly3" focal="70" br="-0.0000161" vr="0.9997567" bb="-0.0000354" vb="0.9997991"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 24-135mm f/3.5-5.6 SP AD</model>
-+        <model>Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="24" a="0.004951" b="-0.019509" c="0" />
--            <distortion model="ptlens" focal="28" a="0.002141" b="-0.010335" c="0" />
--            <distortion model="ptlens" focal="35" a="0.001649" b="-0.003387" c="0" />
--            <distortion model="ptlens" focal="41" a="0" b="0.002775" c="0" />
--            <distortion model="ptlens" focal="52" a="0" b="0.00443" c="0" />
--            <distortion model="ptlens" focal="62" a="0" b="0.004818" c="0" />
--            <distortion model="ptlens" focal="74" a="0" b="0.004729" c="0" />
--            <distortion model="ptlens" focal="85" a="0" b="0.00486" c="0" />
--            <distortion model="ptlens" focal="99" a="0" b="0.005128" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.004635" c="0" />
-+            <distortion model="ptlens" focal="24" a="0.004951" b="-0.019509" c="0"/>
-+            <distortion model="ptlens" focal="28" a="0.002141" b="-0.010335" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.001649" b="-0.003387" c="0"/>
-+            <distortion model="ptlens" focal="41" a="0" b="0.002775" c="0"/>
-+            <distortion model="ptlens" focal="52" a="0" b="0.00443" c="0"/>
-+            <distortion model="ptlens" focal="62" a="0" b="0.004818" c="0"/>
-+            <distortion model="ptlens" focal="74" a="0" b="0.004729" c="0"/>
-+            <distortion model="ptlens" focal="85" a="0" b="0.00486" c="0"/>
-+            <distortion model="ptlens" focal="99" a="0" b="0.005128" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.004635" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 28-75mm f/2.8 XR Di</model>
-+        <model>Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro</model>
-+        <model lang="en">Tamron SP AF 28-75mm f/2.8 XR Di</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.01469" b="-0.034774" c="0" />
--            <distortion model="ptlens" focal="30" a="0.012441" b="-0.026997" c="0" />
--            <distortion model="ptlens" focal="35" a="0.009958" b="-0.018577" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.005421" c="0" />
--            <distortion model="ptlens" focal="60" a="0" b="0.00752" c="0" />
--            <distortion model="ptlens" focal="75" a="0" b="0.007321" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.01469" b="-0.034774" c="0"/>
-+            <distortion model="ptlens" focal="30" a="0.012441" b="-0.026997" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.009958" b="-0.018577" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.005421" c="0"/>
-+            <distortion model="ptlens" focal="60" a="0" b="0.00752" c="0"/>
-+            <distortion model="ptlens" focal="75" a="0" b="0.007321" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 28-105mm f/2.8 SP LD IF</model>
-+        <model>Tamron SP AF 28-105mm f/2.8 LD Aspherical IF</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0.020983" b="-0.054749" c="0" />
--            <distortion model="ptlens" focal="32" a="0.018015" b="-0.042871" c="0" />
--            <distortion model="ptlens" focal="35" a="0.01094" b="-0.02352" c="0" />
--            <distortion model="ptlens" focal="39" a="0.010993" b="-0.016341" c="0" />
--            <distortion model="ptlens" focal="44" a="0.007493" b="-0.007606" c="0" />
--            <distortion model="ptlens" focal="63" a="0.002757" b="0.006995" c="0" />
--            <distortion model="ptlens" focal="75" a="0" b="0.012653" c="0" />
--            <distortion model="ptlens" focal="93" a="0" b="0.011546" c="0" />
--            <distortion model="ptlens" focal="105" a="0" b="0.012148" c="0" />
-+            <distortion model="ptlens" focal="28" a="0.020983" b="-0.054749" c="0"/>
-+            <distortion model="ptlens" focal="32" a="0.018015" b="-0.042871" c="0"/>
-+            <distortion model="ptlens" focal="35" a="0.01094" b="-0.02352" c="0"/>
-+            <distortion model="ptlens" focal="39" a="0.010993" b="-0.016341" c="0"/>
-+            <distortion model="ptlens" focal="44" a="0.007493" b="-0.007606" c="0"/>
-+            <distortion model="ptlens" focal="63" a="0.002757" b="0.006995" c="0"/>
-+            <distortion model="ptlens" focal="75" a="0" b="0.012653" c="0"/>
-+            <distortion model="ptlens" focal="93" a="0" b="0.011546" c="0"/>
-+            <distortion model="ptlens" focal="105" a="0" b="0.012148" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 28-300mm f/3.5-6.3 XR Di LD</model>
-+        <model>Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical (IF)</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="30" a="-0.00171" b="-0.003088" c="0" />
--            <distortion model="ptlens" focal="38" a="0" b="-0.000956" c="0" />
--            <distortion model="ptlens" focal="50" a="0" b="0.003328" c="0" />
--            <distortion model="ptlens" focal="78" a="0" b="0.005468" c="0" />
--            <distortion model="ptlens" focal="100" a="0" b="0.004829" c="0" />
--            <distortion model="ptlens" focal="135" a="0" b="0.005605" c="0" />
--            <distortion model="ptlens" focal="220" a="0" b="0.006124" c="0" />
--            <distortion model="ptlens" focal="300" a="0" b="0.006507" c="0" />
-+            <distortion model="ptlens" focal="30" a="-0.00171" b="-0.003088" c="0"/>
-+            <distortion model="ptlens" focal="38" a="0" b="-0.000956" c="0"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.003328" c="0"/>
-+            <distortion model="ptlens" focal="78" a="0" b="0.005468" c="0"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.004829" c="0"/>
-+            <distortion model="ptlens" focal="135" a="0" b="0.005605" c="0"/>
-+            <distortion model="ptlens" focal="220" a="0" b="0.006124" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.006507" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron 35-70mm F/3.5 CF MACRO</model>
-+        <model>Tamron 28-300mm f/3.5-6.3 Di VC PZD A010</model>
-+        <model lang="en">Tamron 28-300mm f/3.5-6.3 Di VC PZD</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS 6D -->
-+            <distortion model="ptlens" focal="28" a="0.0324178" b="-0.0946795" c="0.0297184"/>
-+            <distortion model="ptlens" focal="35" a="0.0179732" b="-0.0290612" c="-0.012803"/>
-+            <distortion model="ptlens" focal="50" a="0.0120714" b="-0.0130309" c="0.00336402"/>
-+            <distortion model="ptlens" focal="70" a="0.0096825" b="-0.0142811" c="0.0252535"/>
-+            <distortion model="ptlens" focal="97" a="-0.000852845" b="0.0228922" c="-0.0196526"/>
-+            <distortion model="ptlens" focal="188" a="0.00531574" b="-0.0085828" c="0.0203936"/>
-+            <distortion model="ptlens" focal="300" a="0.00604573" b="-0.0126656" c="0.0245787"/>
-+            <tca model="poly3" focal="28" br="-0.0001708" vr="1.0004967" bb="0.0001592" vb="0.9998905"/>
-+            <tca model="poly3" focal="35" br="-0.0001060" vr="1.0003000" bb="0.0000964" vb="1.0002000"/>
-+            <tca model="poly3" focal="50" br="-0.0000689" vr="1.0002181" bb="0.0000498" vb="0.9998929"/>
-+            <tca model="poly3" focal="70" br="-0.0000049" vr="1.0001289" bb="-0.0000115" vb="0.9999376"/>
-+            <tca model="poly3" focal="97" br="-0.0000401" vr="1.0002000" bb="0.0000123" vb="0.9996000"/>
-+            <tca model="poly3" focal="188" br="0.0000306" vr="0.9999000" bb="0.0000334" vb="0.9993000"/>
-+            <tca model="poly3" focal="300" br="0.0000202" vr="0.9998000" bb="-0.0002713" vb="0.9990000"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="10" k1="-0.6575" k2="-0.2614" k3="0.2136"/>
-+            <vignetting model="pa" focal="28" aperture="3.5" distance="1000" k1="-0.6575" k2="-0.2614" k3="0.2136"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="10" k1="-0.5813" k2="0.2621" k3="-0.1000"/>
-+            <vignetting model="pa" focal="28" aperture="8" distance="1000" k1="-0.5813" k2="0.2621" k3="-0.1000"/>
-+            <vignetting model="pa" focal="28" aperture="9" distance="10" k1="-0.5775" k2="0.2492" k3="-0.0880"/>
-+            <vignetting model="pa" focal="28" aperture="9" distance="1000" k1="-0.5775" k2="0.2492" k3="-0.0880"/>
-+            <vignetting model="pa" focal="28" aperture="10" distance="10" k1="-0.5734" k2="0.2366" k3="-0.0777"/>
-+            <vignetting model="pa" focal="28" aperture="10" distance="1000" k1="-0.5734" k2="0.2366" k3="-0.0777"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="10" k1="-0.5675" k2="0.2170" k3="-0.0603"/>
-+            <vignetting model="pa" focal="28" aperture="22" distance="1000" k1="-0.5675" k2="0.2170" k3="-0.0603"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="10" k1="-0.6512" k2="0.1063" k3="-0.0305"/>
-+            <vignetting model="pa" focal="35" aperture="4" distance="1000" k1="-0.6512" k2="0.1063" k3="-0.0305"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="10" k1="-0.5090" k2="0.2487" k3="-0.0916"/>
-+            <vignetting model="pa" focal="35" aperture="8" distance="1000" k1="-0.5090" k2="0.2487" k3="-0.0916"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="10" k1="-0.5059" k2="0.2419" k3="-0.0864"/>
-+            <vignetting model="pa" focal="35" aperture="9" distance="1000" k1="-0.5059" k2="0.2419" k3="-0.0864"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="10" k1="-0.5067" k2="0.2405" k3="-0.0839"/>
-+            <vignetting model="pa" focal="35" aperture="10" distance="1000" k1="-0.5067" k2="0.2405" k3="-0.0839"/>
-+            <vignetting model="pa" focal="35" aperture="25" distance="10" k1="-0.5004" k2="0.2277" k3="-0.0760"/>
-+            <vignetting model="pa" focal="35" aperture="25" distance="1000" k1="-0.5004" k2="0.2277" k3="-0.0760"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="10" k1="-0.6235" k2="0.6028" k3="-0.4465"/>
-+            <vignetting model="pa" focal="50" aperture="4.5" distance="1000" k1="-0.6235" k2="0.6028" k3="-0.4465"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="10" k1="-0.3861" k2="0.2098" k3="-0.0891"/>
-+            <vignetting model="pa" focal="50" aperture="8" distance="1000" k1="-0.3861" k2="0.2098" k3="-0.0891"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="10" k1="-0.3813" k2="0.1855" k3="-0.0654"/>
-+            <vignetting model="pa" focal="50" aperture="9" distance="1000" k1="-0.3813" k2="0.1855" k3="-0.0654"/>
-+            <vignetting model="pa" focal="50" aperture="10" distance="10" k1="-0.3807" k2="0.1826" k3="-0.0624"/>
-+            <vignetting model="pa" focal="50" aperture="10" distance="1000" k1="-0.3807" k2="0.1826" k3="-0.0624"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="10" k1="-0.3717" k2="0.1758" k3="-0.0614"/>
-+            <vignetting model="pa" focal="50" aperture="29" distance="1000" k1="-0.3717" k2="0.1758" k3="-0.0614"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="10" k1="-0.5410" k2="0.7390" k3="-0.6880"/>
-+            <vignetting model="pa" focal="70" aperture="5" distance="1000" k1="-0.5410" k2="0.7390" k3="-0.6880"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.3593" k2="0.3780" k3="-0.2660"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.3593" k2="0.3780" k3="-0.2660"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="10" k1="-0.3198" k2="0.2237" k3="-0.1245"/>
-+            <vignetting model="pa" focal="70" aperture="9" distance="1000" k1="-0.3198" k2="0.2237" k3="-0.1245"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="10" k1="-0.3054" k2="0.1637" k3="-0.0675"/>
-+            <vignetting model="pa" focal="70" aperture="10" distance="1000" k1="-0.3054" k2="0.1637" k3="-0.0675"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.3004" k2="0.1653" k3="-0.0678"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.3004" k2="0.1653" k3="-0.0678"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="10" k1="-0.1901" k2="-0.1314" k3="-0.2080"/>
-+            <vignetting model="pa" focal="97" aperture="5.6" distance="1000" k1="-0.1901" k2="-0.1314" k3="-0.2080"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="10" k1="-0.3508" k2="0.7872" k3="-0.7709"/>
-+            <vignetting model="pa" focal="97" aperture="8" distance="1000" k1="-0.3508" k2="0.7872" k3="-0.7709"/>
-+            <vignetting model="pa" focal="97" aperture="9" distance="10" k1="-0.3605" k2="0.7826" k3="-0.7079"/>
-+            <vignetting model="pa" focal="97" aperture="9" distance="1000" k1="-0.3605" k2="0.7826" k3="-0.7079"/>
-+            <vignetting model="pa" focal="97" aperture="10" distance="10" k1="-0.3510" k2="0.7304" k3="-0.6393"/>
-+            <vignetting model="pa" focal="97" aperture="10" distance="1000" k1="-0.3510" k2="0.7304" k3="-0.6393"/>
-+            <vignetting model="pa" focal="97" aperture="36" distance="10" k1="-0.2108" k2="0.1593" k3="-0.0891"/>
-+            <vignetting model="pa" focal="97" aperture="36" distance="1000" k1="-0.2108" k2="0.1593" k3="-0.0891"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="10" k1="-0.0711" k2="-1.3334" k3="0.8639"/>
-+            <vignetting model="pa" focal="200" aperture="6.3" distance="1000" k1="-0.0711" k2="-1.3334" k3="0.8639"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="0.1318" k2="-0.9775" k3="0.4330"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="0.1318" k2="-0.9775" k3="0.4330"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="10" k1="0.0210" k2="-0.3899" k3="-0.0073"/>
-+            <vignetting model="pa" focal="200" aperture="9" distance="1000" k1="0.0210" k2="-0.3899" k3="-0.0073"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="10" k1="-0.0737" k2="-0.0057" k3="-0.2692"/>
-+            <vignetting model="pa" focal="200" aperture="10" distance="1000" k1="-0.0737" k2="-0.0057" k3="-0.2692"/>
-+            <vignetting model="pa" focal="300" aperture="6.3" distance="10" k1="-1.0385" k2="0.7010" k3="-0.2139"/>
-+            <vignetting model="pa" focal="300" aperture="6.3" distance="1000" k1="-1.0385" k2="0.7010" k3="-0.2139"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="10" k1="-0.0826" k2="-0.9449" k3="0.6342"/>
-+            <vignetting model="pa" focal="300" aperture="8" distance="1000" k1="-0.0826" k2="-0.9449" k3="0.6342"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="10" k1="0.0862" k2="-0.9600" k3="0.5268"/>
-+            <vignetting model="pa" focal="300" aperture="9" distance="1000" k1="0.0862" k2="-0.9600" k3="0.5268"/>
-+            <vignetting model="pa" focal="300" aperture="10" distance="10" k1="0.0651" k2="-0.6653" k3="0.2827"/>
-+            <vignetting model="pa" focal="300" aperture="10" distance="1000" k1="0.0651" k2="-0.6653" k3="0.2827"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="10" k1="-0.1581" k2="0.1260" k3="-0.0431"/>
-+            <vignetting model="pa" focal="300" aperture="40" distance="1000" k1="-0.1581" k2="0.1260" k3="-0.0431"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <!-- Very old manual lens, so don't look for real EXIF names. -->
-+        <model>Tamron 35-70mm f/3.5 CF Macro</model>
-         <mount>Nikon F</mount>
-         <mount>Pentax K</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="poly3" focal="35" k1="-0.00768" />
--            <distortion model="ptlens" focal="40" a="0.0012" b="-0.00676" c="0.00204" />
--            <distortion model="ptlens" focal="50" a="-0.00143" b="0.00459" c="-0.00465" />
--            <distortion model="poly3" focal="70" k1="0.00233" />
--	        <tca model="poly3" focal="35" br="-0.00004" vr="1.00018" bb="0.00007" vb="0.999835" />
--	        <tca model="poly3" focal="40" br="-0.00003" vr="1.00011" bb="0.000021" vb="0.999909" />
--            <tca model="poly3" focal="50" br="-0.0000088" vr="1.0000432" bb="0.0000117" vb="0.9999312" />
--            <tca model="poly3" focal="70" br="-0.0000079" vr="1.0000614" bb="-0.0000911" vb="1.000192" />
--            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.11121" k2="0.08366" k3="-0.10313" />
--            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.07601" k2="0.00922" k3="-0.04755" />
--	        <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.25218" k2="0.278" k3="-0.15618" />
--            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.21197" k2="-0.08795" k3="0.07518" />
-+            <distortion model="poly3" focal="35" k1="-0.00768"/>
-+            <distortion model="ptlens" focal="40" a="0.0012" b="-0.00676" c="0.00204"/>
-+            <distortion model="ptlens" focal="50" a="-0.00143" b="0.00459" c="-0.00465"/>
-+            <distortion model="poly3" focal="70" k1="0.00233"/>
-+            <tca model="poly3" focal="35" br="-0.00004" vr="1.00018" bb="0.00007" vb="0.999835"/>
-+            <tca model="poly3" focal="40" br="-0.00003" vr="1.00011" bb="0.000021" vb="0.999909"/>
-+            <tca model="poly3" focal="50" br="-0.0000088" vr="1.0000432" bb="0.0000117" vb="0.9999312"/>
-+            <tca model="poly3" focal="70" br="-0.0000079" vr="1.0000614" bb="-0.0000911" vb="1.000192"/>
-+            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.11121" k2="0.08366" k3="-0.10313"/>
-+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.07601" k2="0.00922" k3="-0.04755"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.25218" k2="0.278" k3="-0.15618"/>
-+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.21197" k2="-0.08795" k3="0.07518"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron AF70-300mm F/4-5.6 LD MACRO</model>
-+        <model>Tamron AF 70-300mm f/4-5.6 LD Macro 1:2</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--	        <distortion model="ptlens" focal="70" a="0.00168" b="-0.00649" c="0.0021" />
-- 	        <distortion model="ptlens" focal="100" a="-0.00287" b="0.01075" c="-0.00716" />
--	        <distortion model="ptlens" focal="133" a="0.00404" b="-0.0061" c="0.00845" />
--	        <distortion model="ptlens" focal="180" a="0.0" b="0.00388" c="0.0" />
--	        <distortion model="ptlens" focal="300" a="0.0" b="0.00442" c="0.0" />
--            <tca model="poly3" focal="70" br="-0.0000487" vr="1.0002053" bb="0.0000352" vb="0.9998612" />
--            <tca model="poly3" focal="100" br="-0.0000402" vr="1.0000889" bb="0.0000026" vb="0.9998133" />
--            <tca model="poly3" focal="133" br="-0.0000210" vr="0.9999776" bb="0.0000067" vb="0.9998469" />
--            <tca model="poly3" focal="180" br="-0.0000139" vr="0.9998566" bb="0.0000295" vb="0.999785" />
--            <tca model="poly3" focal="300" br="-0.000011" vr="0.9996417" bb="0.000022" vb="0.9998125" />
--            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.05486" k2="0.04427" k3="-0.01908" />
--            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.07719" k2="0.13209" k3="-0.09579" />
--            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.05807" k2="0.07773" k3="-0.05601" />
--            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.03723" k2="0.02431" k3="-0.02236" />
--            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.03866" k2="0.05966" k3="-0.04464" />
-+            <distortion model="ptlens" focal="70" a="0.00168" b="-0.00649" c="0.0021"/>
-+            <distortion model="ptlens" focal="100" a="-0.00287" b="0.01075" c="-0.00716"/>
-+            <distortion model="ptlens" focal="133" a="0.00404" b="-0.0061" c="0.00845"/>
-+            <distortion model="ptlens" focal="180" a="0" b="0.00388" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.00442" c="0"/>
-+            <tca model="poly3" focal="70" br="-0.0000487" vr="1.0002053" bb="0.0000352" vb="0.9998612"/>
-+            <tca model="poly3" focal="100" br="-0.0000402" vr="1.0000889" bb="0.0000026" vb="0.9998133"/>
-+            <tca model="poly3" focal="133" br="-0.0000210" vr="0.9999776" bb="0.0000067" vb="0.9998469"/>
-+            <tca model="poly3" focal="180" br="-0.0000139" vr="0.9998566" bb="0.0000295" vb="0.999785"/>
-+            <tca model="poly3" focal="300" br="-0.000011" vr="0.9996417" bb="0.000022" vb="0.9998125"/>
-+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.05486" k2="0.04427" k3="-0.01908"/>
-+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.07719" k2="0.13209" k3="-0.09579"/>
-+            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.05807" k2="0.07773" k3="-0.05601"/>
-+            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.03723" k2="0.02431" k3="-0.02236"/>
-+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.03866" k2="0.05966" k3="-0.04464"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
--        <model>Tamron SP 70-300mm F4-5.6 Di VC USD</model>
-+        <model>Tamron SP 70-300mm f/4-5.6 Di VC USD</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Sony Alpha</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="70" a="0" b="-0.006" c="0.002" />
--            <distortion model="ptlens" focal="85" a="-0.006" b="0.009" c="-0.001" />
--            <distortion model="ptlens" focal="100" a="0.018" b="-0.042" c="0.037" />
--            <distortion model="ptlens" focal="170" a="-0.008" b="0.022" c="0.017" />
--            <distortion model="ptlens" focal="250" a="-0.002" b="0.013" c="-0.004" />
--            <distortion model="ptlens" focal="300" a="0.002" b="0.001" c="0.007" />
-+            <distortion model="ptlens" focal="70" a="0" b="-0.006" c="0.002"/>
-+            <distortion model="ptlens" focal="85" a="-0.006" b="0.009" c="-0.001"/>
-+            <distortion model="ptlens" focal="100" a="0.018" b="-0.042" c="0.037"/>
-+            <distortion model="ptlens" focal="170" a="-0.008" b="0.022" c="0.017"/>
-+            <distortion model="ptlens" focal="250" a="-0.002" b="0.013" c="-0.004"/>
-+            <distortion model="ptlens" focal="300" a="0.002" b="0.001" c="0.007"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tamron</maker>
-         <model>Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Sony Alpha</mount>
--        <!-- FixMe: Actually cropfactor 1.613 -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
-             <!-- Taken with Canon EOS 550D -->
--            <distortion model="ptlens" focal="18" a="0.01861" b="-0.05313" c="-0.00391" />
--            <distortion model="ptlens" focal="25" a="0.01981" b="-0.05231" c="0.03436" />
--            <distortion model="ptlens" focal="33" a="0.01589" b="-0.03236" c="0.03109" />
--            <distortion model="ptlens" focal="35" a="0.01503" b="-0.02899" c="0.03321" />
--            <distortion model="ptlens" focal="46" a="0.00509" b="0.00394" c="0.00394" />
--            <distortion model="ptlens" focal="76" a="0.00322" b="0.00008" c="0.01944" />
--            <distortion model="ptlens" focal="85" a="0.01472" b="-0.04063" c="0.0667" />
--            <distortion model="ptlens" focal="142" a="0.00302" b="0.01586" c="-0.03011" />
--            <distortion model="ptlens" focal="270" a="-0.00126" b="0.02251" c="-0.0319" />
-+            <distortion model="ptlens" focal="18" a="0.01861" b="-0.05313" c="-0.00391"/>
-+            <distortion model="ptlens" focal="25" a="0.01981" b="-0.05231" c="0.03436"/>
-+            <distortion model="ptlens" focal="33" a="0.01589" b="-0.03236" c="0.03109"/>
-+            <distortion model="ptlens" focal="35" a="0.01503" b="-0.02899" c="0.03321"/>
-+            <distortion model="ptlens" focal="46" a="0.00509" b="0.00394" c="0.00394"/>
-+            <distortion model="ptlens" focal="76" a="0.00322" b="0.00008" c="0.01944"/>
-+            <distortion model="ptlens" focal="85" a="0.01472" b="-0.04063" c="0.0667"/>
-+            <distortion model="ptlens" focal="142" a="0.00302" b="0.01586" c="-0.03011"/>
-+            <distortion model="ptlens" focal="270" a="-0.00126" b="0.02251" c="-0.0319"/>
-         </calibration>
-     </lens>
--
-     <lens>
--	    <maker>Tamron</maker>
--	    <model>TAMRON SP AF 90mm f/2.8 (172E)</model>
--	    <focal value="90" />
--	    <aperture value="2.8" />
--	    <aperture>2.8-32</aperture>
--	    <mount>Nikon F AF</mount>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP AF 90mm f/2.8 Di Macro 1:1</model>
-+        <mount>Nikon F AF</mount>
-         <mount>Canon EF</mount>
-         <mount>Pentax KAF2</mount>
-         <mount>Sony Alpha</mount>
--	    <cropfactor>1.5</cropfactor>
--	    <calibration>
--	        <distortion focal="90" model="ptlens" a="-0.00126953" b="0.00404399" c="-0.0027782" />
--            <tca model="poly3" focal="90" br="-0.0000152" vr="1.0000471" bb="-0.0000061" vb="0.9998509" />
--            <vignetting model="pa" focal="90" aperture="2.8" distance="0.29" k1="0.0414" k2="-0.1677" k3="0.1199" />
--            <vignetting model="pa" focal="90" aperture="2.8" distance="0.6" k1="-0.0576" k2="-0.2887" k3="0.2065" />
--            <vignetting model="pa" focal="90" aperture="2.8" distance="1.5" k1="-0.2170" k2="-0.0857" k3="0.1121" />
--            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.2146" k2="-0.1791" k3="0.1820" />
--            <vignetting model="pa" focal="90" aperture="4" distance="0.29" k1="-0.0298" k2="-0.0754" k3="0.0582" />
--            <vignetting model="pa" focal="90" aperture="4" distance="0.6" k1="-0.0172" k2="-0.2229" k3="0.1321" />
--            <vignetting model="pa" focal="90" aperture="4" distance="1.5" k1="-0.1334" k2="-0.1854" k3="0.1342" />
--            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.1590" k2="-0.2373" k3="0.1870" />
--            <vignetting model="pa" focal="90" aperture="5.6" distance="0.29" k1="-0.0117" k2="-0.0517" k3="0.0491" />
--            <vignetting model="pa" focal="90" aperture="5.6" distance="0.6" k1="0.0148" k2="-0.1274" k3="0.0910" />
--            <vignetting model="pa" focal="90" aperture="5.6" distance="1.5" k1="0.0117" k2="-0.1416" k3="0.0988" />
--            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="0.0290" k2="-0.1878" k3="0.1275" />
--            <vignetting model="pa" focal="90" aperture="8" distance="0.29" k1="-0.0197" k2="-0.0350" k3="0.0395" />
--            <vignetting model="pa" focal="90" aperture="8" distance="0.6" k1="-0.0280" k2="-0.0312" k3="0.0299" />
--            <vignetting model="pa" focal="90" aperture="8" distance="1.5" k1="-0.0190" k2="-0.0579" k3="0.0448" />
--            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.0084" k2="-0.0916" k3="0.0666" />
--            <vignetting model="pa" focal="90" aperture="32" distance="0.29" k1="-0.0394" k2="0.0075" k3="0.0130" />
--            <vignetting model="pa" focal="90" aperture="32" distance="0.6" k1="-0.1223" k2="0.1561" k3="-0.0806" />
--            <vignetting model="pa" focal="90" aperture="32" distance="1.5" k1="-0.0777" k2="0.0766" k3="-0.0380" />
--            <vignetting model="pa" focal="90" aperture="32" distance="1000" k1="-0.0557" k2="0.0276" k3="-0.0118" />
--	        <field_of_view focal="90" fov="15.1702" />
--	    </calibration>
-+        <focal value="90"/>
-+        <aperture min="2.8" max="32"/>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion focal="90" model="ptlens" a="-0.00126953" b="0.00404399" c="-0.0027782"/>
-+            <tca model="poly3" focal="90" br="-0.0000152" vr="1.0000471" bb="-0.0000061" vb="0.9998509"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="0.29" k1="0.0414" k2="-0.1677" k3="0.1199"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="0.6" k1="-0.0576" k2="-0.2887" k3="0.2065"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="1.5" k1="-0.2170" k2="-0.0857" k3="0.1121"/>
-+            <vignetting model="pa" focal="90" aperture="2.8" distance="1000" k1="-0.2146" k2="-0.1791" k3="0.1820"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="0.29" k1="-0.0298" k2="-0.0754" k3="0.0582"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="0.6" k1="-0.0172" k2="-0.2229" k3="0.1321"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="1.5" k1="-0.1334" k2="-0.1854" k3="0.1342"/>
-+            <vignetting model="pa" focal="90" aperture="4" distance="1000" k1="-0.1590" k2="-0.2373" k3="0.1870"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="0.29" k1="-0.0117" k2="-0.0517" k3="0.0491"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="0.6" k1="0.0148" k2="-0.1274" k3="0.0910"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="1.5" k1="0.0117" k2="-0.1416" k3="0.0988"/>
-+            <vignetting model="pa" focal="90" aperture="5.6" distance="1000" k1="0.0290" k2="-0.1878" k3="0.1275"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="0.29" k1="-0.0197" k2="-0.0350" k3="0.0395"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="0.6" k1="-0.0280" k2="-0.0312" k3="0.0299"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1.5" k1="-0.0190" k2="-0.0579" k3="0.0448"/>
-+            <vignetting model="pa" focal="90" aperture="8" distance="1000" k1="-0.0084" k2="-0.0916" k3="0.0666"/>
-+            <vignetting model="pa" focal="90" aperture="32" distance="0.29" k1="-0.0394" k2="0.0075" k3="0.0130"/>
-+            <vignetting model="pa" focal="90" aperture="32" distance="0.6" k1="-0.1223" k2="0.1561" k3="-0.0806"/>
-+            <vignetting model="pa" focal="90" aperture="32" distance="1.5" k1="-0.0777" k2="0.0766" k3="-0.0380"/>
-+            <vignetting model="pa" focal="90" aperture="32" distance="1000" k1="-0.0557" k2="0.0276" k3="-0.0118"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP AF 11-18mm f/4.5-5.6 Di-II LD Aspherical (IF)</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 7D -->
-+            <distortion model="ptlens" focal="11" a="-0.01251" b="0.06318" c="-0.12889"/>
-+            <distortion model="ptlens" focal="12" a="0.00174" b="0.02168" c="-0.094"/>
-+            <distortion model="ptlens" focal="13" a="0.00177" b="0.02035" c="-0.08444"/>
-+            <distortion model="ptlens" focal="15" a="0.00793" b="-0.00895" c="-0.03469"/>
-+            <distortion model="ptlens" focal="18" a="0.00432" b="-0.00223" c="-0.02884"/>
-+            <tca model="poly3" focal="11" br="0.0003262" vr="1.0002776" bb="-0.0001060" vb="1.0000957"/>
-+            <tca model="poly3" focal="12" br="0.0002765" vr="1.0001904" bb="-0.0001172" vb="1.0001615"/>
-+            <tca model="poly3" focal="13" br="0.0002045" vr="1.0000647" bb="-0.0001133" vb="1.0002291"/>
-+            <tca model="poly3" focal="15" br="0.0001933" vr="1.0000948" bb="-0.0001079" vb="1.0002024"/>
-+            <tca model="poly3" focal="18" br="0.0002596" vr="1.0001649" bb="-0.0001312" vb="1.0000839"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro</model>
-+        <model lang="en">Tamron 16-300mm f/3.5-6.3 Di II VC PZD</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 600D -->
-+            <distortion model="ptlens" focal="16" a="0.02076" b="-0.07067" c="0.03778"/>
-+            <distortion model="ptlens" focal="18" a="0.01927" b="-0.05763" c="0.03858"/>
-+            <distortion model="ptlens" focal="20" a="0.02175" b="-0.06239" c="0.04904"/>
-+            <distortion model="ptlens" focal="22" a="0.01762" b="-0.0406" c="0.02777"/>
-+            <distortion model="ptlens" focal="35" a="0.00542" b="-0.00291" c="0.01265"/>
-+            <distortion model="ptlens" focal="50" a="0" b="0.01525" c="0"/>
-+            <distortion model="ptlens" focal="100" a="0" b="0.01213" c="0"/>
-+            <distortion model="ptlens" focal="211" a="0" b="0.0076" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.00642" c="0"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro</model>
-+        <model lang="en">Tamron 16-300mm f/3.5-6.3 Di II VC PZD</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5200 -->
-+            <distortion model="ptlens" focal="16" a="0.02569" b="-0.0757" c="0.01928"/>
-+            <distortion model="ptlens" focal="18" a="0.02657" b="-0.07396" c="0.04944"/>
-+            <distortion model="ptlens" focal="22" a="0.01778" b="-0.03909" c="0.02957"/>
-+            <distortion model="ptlens" focal="26" a="0.01338" b="-0.0211" c="0.01513"/>
-+            <distortion model="ptlens" focal="31" a="0.00908" b="-0.00334" c="-0.00376"/>
-+            <distortion model="ptlens" focal="50" a="0.00992" b="-0.01139" c="0.02269"/>
-+            <distortion model="ptlens" focal="70" a="0" b="0.01566" c="0"/>
-+            <distortion model="ptlens" focal="150" a="0" b="0.00959" c="0"/>
-+            <distortion model="ptlens" focal="300" a="0" b="0.0062" c="0"/>
-+            <tca model="poly3" focal="16" br="-0.0000074" vr="1.0006557" bb="0.0000419" vb="1.0001881"/>
-+            <tca model="poly3" focal="18" br="0.0000541" vr="1.0004807" bb="0.0000147" vb="1.0000854"/>
-+            <tca model="poly3" focal="22" br="-0.0000022" vr="1.0004633" bb="0.0000035" vb="1.0001122"/>
-+            <tca model="poly3" focal="26" br="-0.0000038" vr="1.0004575" bb="0.0000126" vb="1.0000604"/>
-+            <tca model="poly3" focal="31" br="-0.0000148" vr="1.0004258" bb="-0.0000085" vb="1.0001555"/>
-+            <tca model="poly3" focal="50" br="0.0000099" vr="1.0001272" bb="-0.0000159" vb="1.0000252"/>
-+            <tca model="poly3" focal="70" br="-0.0000024" vr="1.0001413" bb="-0.0000606" vb="0.9998388"/>
-+            <tca model="poly3" focal="150" br="-0.0000344" vr="0.9999047" bb="-0.0001974" vb="0.9996163"/>
-+            <tca model="poly3" focal="300" br="0.0001277" vr="0.9985891" bb="-0.0000268" vb="0.9999028"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP AF 150-600mm f/5-6.3 Di VC USD (A011)</model>
-+        <model lang="en">Tamron SP 150-600mm f/5-6.3 Di VC USD</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7100 -->
-+            <distortion model="poly3" focal="150" k1="0.0029"/>
-+            <distortion model="poly3" focal="210" k1="0.00378"/>
-+            <distortion model="poly3" focal="300" k1="0.00338"/>
-+            <distortion model="poly3" focal="400" k1="0.00319"/>
-+            <distortion model="poly3" focal="500" k1="0.0027"/>
-+            <distortion model="poly3" focal="600" k1="0.00277"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP AF 60mm f/2 Di II LD (IF) Macro 1:1</model>
-+        <model lang="en">Tamron SP AF 60mm f/2 Di II LD (IF) Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5100 -->
-+            <distortion model="ptlens" focal="60" a="0.01029" b="-0.0342" c="0.02936"/>
-+            <tca model="poly3" focal="60" br="-0.0000412" vr="1.0003372" bb="0.0000534" vb="0.9999002"/>
-+            <vignetting model="pa" focal="60" aperture="2" distance="10" k1="-0.8996" k2="0.5615" k3="-0.2074"/>
-+            <vignetting model="pa" focal="60" aperture="2" distance="1000" k1="-0.8996" k2="0.5615" k3="-0.2074"/>
-+            <vignetting model="pa" focal="60" aperture="2.2" distance="10" k1="-0.2344" k2="-0.5402" k3="0.3303"/>
-+            <vignetting model="pa" focal="60" aperture="2.2" distance="1000" k1="-0.2344" k2="-0.5402" k3="0.3303"/>
-+            <vignetting model="pa" focal="60" aperture="2.5" distance="10" k1="-0.0574" k2="-0.7523" k3="0.4045"/>
-+            <vignetting model="pa" focal="60" aperture="2.5" distance="1000" k1="-0.0574" k2="-0.7523" k3="0.4045"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="10" k1="0.0697" k2="-0.6104" k3="0.2494"/>
-+            <vignetting model="pa" focal="60" aperture="2.8" distance="1000" k1="0.0697" k2="-0.6104" k3="0.2494"/>
-+            <vignetting model="pa" focal="60" aperture="3.2" distance="10" k1="0.0307" k2="-0.3043" k3="0.0165"/>
-+            <vignetting model="pa" focal="60" aperture="3.2" distance="1000" k1="0.0307" k2="-0.3043" k3="0.0165"/>
-+            <vignetting model="pa" focal="60" aperture="3.5" distance="10" k1="-0.0183" k2="-0.0873" k3="-0.1169"/>
-+            <vignetting model="pa" focal="60" aperture="3.5" distance="1000" k1="-0.0183" k2="-0.0873" k3="-0.1169"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="10" k1="-0.1496" k2="0.3295" k3="-0.3467"/>
-+            <vignetting model="pa" focal="60" aperture="4" distance="1000" k1="-0.1496" k2="0.3295" k3="-0.3467"/>
-+            <vignetting model="pa" focal="60" aperture="4.5" distance="10" k1="-0.1597" k2="0.3383" k3="-0.3110"/>
-+            <vignetting model="pa" focal="60" aperture="4.5" distance="1000" k1="-0.1597" k2="0.3383" k3="-0.3110"/>
-+            <vignetting model="pa" focal="60" aperture="5" distance="10" k1="-0.0764" k2="0.0456" k3="-0.0556"/>
-+            <vignetting model="pa" focal="60" aperture="5" distance="1000" k1="-0.0764" k2="0.0456" k3="-0.0556"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="10" k1="-0.0203" k2="-0.1233" k3="0.0739"/>
-+            <vignetting model="pa" focal="60" aperture="5.6" distance="1000" k1="-0.0203" k2="-0.1233" k3="0.0739"/>
-+            <vignetting model="pa" focal="60" aperture="6.3" distance="10" k1="-0.0997" k2="0.0717" k3="-0.0351"/>
-+            <vignetting model="pa" focal="60" aperture="6.3" distance="1000" k1="-0.0997" k2="0.0717" k3="-0.0351"/>
-+            <vignetting model="pa" focal="60" aperture="7.1" distance="10" k1="0.0337" k2="-0.2405" k3="0.1533"/>
-+            <vignetting model="pa" focal="60" aperture="7.1" distance="1000" k1="0.0337" k2="-0.2405" k3="0.1533"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="10" k1="-0.1016" k2="0.0700" k3="-0.0286"/>
-+            <vignetting model="pa" focal="60" aperture="8" distance="1000" k1="-0.1016" k2="0.0700" k3="-0.0286"/>
-+            <vignetting model="pa" focal="60" aperture="9" distance="10" k1="-0.0942" k2="0.0443" k3="-0.0159"/>
-+            <vignetting model="pa" focal="60" aperture="9" distance="1000" k1="-0.0942" k2="0.0443" k3="-0.0159"/>
-+            <vignetting model="pa" focal="60" aperture="10" distance="10" k1="-0.0929" k2="0.0837" k3="-0.0504"/>
-+            <vignetting model="pa" focal="60" aperture="10" distance="1000" k1="-0.0929" k2="0.0837" k3="-0.0504"/>
-+            <vignetting model="pa" focal="60" aperture="11" distance="10" k1="-0.1096" k2="0.1064" k3="-0.0553"/>
-+            <vignetting model="pa" focal="60" aperture="11" distance="1000" k1="-0.1096" k2="0.1064" k3="-0.0553"/>
-+            <vignetting model="pa" focal="60" aperture="13" distance="10" k1="-0.1146" k2="0.1086" k3="-0.0564"/>
-+            <vignetting model="pa" focal="60" aperture="13" distance="1000" k1="-0.1146" k2="0.1086" k3="-0.0564"/>
-+            <vignetting model="pa" focal="60" aperture="16" distance="10" k1="0.0288" k2="-0.1655" k3="0.0842"/>
-+            <vignetting model="pa" focal="60" aperture="16" distance="1000" k1="0.0288" k2="-0.1655" k3="0.0842"/>
-+            <vignetting model="pa" focal="60" aperture="18" distance="10" k1="0.0020" k2="-0.1617" k3="0.1066"/>
-+            <vignetting model="pa" focal="60" aperture="18" distance="1000" k1="0.0020" k2="-0.1617" k3="0.1066"/>
-+            <vignetting model="pa" focal="60" aperture="20" distance="10" k1="-0.0697" k2="0.0190" k3="-0.0062"/>
-+            <vignetting model="pa" focal="60" aperture="20" distance="1000" k1="-0.0697" k2="0.0190" k3="-0.0062"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="10" k1="0.0146" k2="-0.1510" k3="0.0879"/>
-+            <vignetting model="pa" focal="60" aperture="22" distance="1000" k1="0.0146" k2="-0.1510" k3="0.0879"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D700 -->
-+            <distortion model="poly3" focal="70" k1="-0.00915"/>
-+            <distortion model="poly3" focal="92" k1="-0.00355"/>
-+            <distortion model="poly3" focal="120" k1="0.00108"/>
-+            <distortion model="poly3" focal="145" k1="0.00556"/>
-+            <distortion model="poly3" focal="200" k1="0.00775"/>
-+            <tca model="poly3" focal="70" vr="1.0003920" vb="0.9998959"/>
-+            <tca model="poly3" focal="92" vr="1.0001709" vb="0.9999495"/>
-+            <tca model="poly3" focal="120" vr="1.0000178" vb="0.9999875"/>
-+            <tca model="poly3" focal="145" vr="0.9999155" vb="1.0000171"/>
-+            <tca model="poly3" focal="200" vr="0.9998438" vb="0.9999326"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron AF 80-210mm f/4.5-5.6 280D</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Pentax KAF2</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon EOS 5D -->
-+            <vignetting model="pa" focal="80" aperture="4.5" distance="10" k1="-0.9893" k2="0.4795" k3="-0.1237"/>
-+            <vignetting model="pa" focal="80" aperture="4.5" distance="1000" k1="-0.9893" k2="0.4795" k3="-0.1237"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="10" k1="-0.1480" k2="-1.1019" k3="0.7138"/>
-+            <vignetting model="pa" focal="80" aperture="5.6" distance="1000" k1="-0.1480" k2="-1.1019" k3="0.7138"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="10" k1="-0.0103" k2="-0.6796" k3="0.2077"/>
-+            <vignetting model="pa" focal="80" aperture="8" distance="1000" k1="-0.0103" k2="-0.6796" k3="0.2077"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="10" k1="-0.2602" k2="0.2634" k3="-0.4153"/>
-+            <vignetting model="pa" focal="80" aperture="11" distance="1000" k1="-0.2602" k2="0.2634" k3="-0.4153"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="10" k1="-0.3332" k2="0.4018" k3="-0.3609"/>
-+            <vignetting model="pa" focal="80" aperture="16" distance="1000" k1="-0.3332" k2="0.4018" k3="-0.3609"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="10" k1="-0.2601" k2="0.0846" k3="-0.0508"/>
-+            <vignetting model="pa" focal="80" aperture="22" distance="1000" k1="-0.2601" k2="0.0846" k3="-0.0508"/>
-+            <vignetting model="pa" focal="98" aperture="4.5" distance="10" k1="-0.8347" k2="0.3737" k3="-0.0886"/>
-+            <vignetting model="pa" focal="98" aperture="4.5" distance="1000" k1="-0.8347" k2="0.3737" k3="-0.0886"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="10" k1="-0.0284" k2="-0.9184" k3="0.5332"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.0284" k2="-0.9184" k3="0.5332"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="10" k1="-0.2385" k2="0.1171" k3="-0.1871"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.2385" k2="0.1171" k3="-0.1871"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="10" k1="-0.2320" k2="0.0070" k3="0.0147"/>
-+            <vignetting model="pa" focal="98" aperture="11" distance="1000" k1="-0.2320" k2="0.0070" k3="0.0147"/>
-+            <vignetting model="pa" focal="98" aperture="16" distance="10" k1="-0.2185" k2="-0.0539" k3="0.0689"/>
-+            <vignetting model="pa" focal="98" aperture="16" distance="1000" k1="-0.2185" k2="-0.0539" k3="0.0689"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="10" k1="-0.2441" k2="-0.0039" k3="0.0423"/>
-+            <vignetting model="pa" focal="98" aperture="22" distance="1000" k1="-0.2441" k2="-0.0039" k3="0.0423"/>
-+            <vignetting model="pa" focal="132" aperture="5" distance="10" k1="-0.3126" k2="-0.5928" k3="0.4105"/>
-+            <vignetting model="pa" focal="132" aperture="5" distance="1000" k1="-0.3126" k2="-0.5928" k3="0.4105"/>
-+            <vignetting model="pa" focal="132" aperture="5.6" distance="10" k1="-0.0934" k2="-0.4179" k3="0.1414"/>
-+            <vignetting model="pa" focal="132" aperture="5.6" distance="1000" k1="-0.0934" k2="-0.4179" k3="0.1414"/>
-+            <vignetting model="pa" focal="132" aperture="8" distance="10" k1="-0.2058" k2="-0.0185" k3="0.0354"/>
-+            <vignetting model="pa" focal="132" aperture="8" distance="1000" k1="-0.2058" k2="-0.0185" k3="0.0354"/>
-+            <vignetting model="pa" focal="132" aperture="11" distance="10" k1="-0.2133" k2="-0.0017" k3="0.0264"/>
-+            <vignetting model="pa" focal="132" aperture="11" distance="1000" k1="-0.2133" k2="-0.0017" k3="0.0264"/>
-+            <vignetting model="pa" focal="132" aperture="16" distance="10" k1="-0.2152" k2="-0.0032" k3="0.0296"/>
-+            <vignetting model="pa" focal="132" aperture="16" distance="1000" k1="-0.2152" k2="-0.0032" k3="0.0296"/>
-+            <vignetting model="pa" focal="132" aperture="22" distance="10" k1="-0.2165" k2="-0.0075" k3="0.0347"/>
-+            <vignetting model="pa" focal="132" aperture="22" distance="1000" k1="-0.2165" k2="-0.0075" k3="0.0347"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="-1.4705" k2="1.5209" k3="-0.6794"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="-1.4705" k2="1.5209" k3="-0.6794"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.0140" k2="-1.0473" k3="0.6308"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.0140" k2="-1.0473" k3="0.6308"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="10" k1="-0.1240" k2="-0.1095" k3="-0.1099"/>
-+            <vignetting model="pa" focal="200" aperture="11" distance="1000" k1="-0.1240" k2="-0.1095" k3="-0.1099"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="10" k1="-0.2404" k2="0.2241" k3="-0.1996"/>
-+            <vignetting model="pa" focal="200" aperture="16" distance="1000" k1="-0.2404" k2="0.2241" k3="-0.1996"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="10" k1="-0.1891" k2="0.0003" k3="0.0180"/>
-+            <vignetting model="pa" focal="200" aperture="22" distance="1000" k1="-0.1891" k2="0.0003" k3="0.0180"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP 70-200mm f/2.8 Di VC USD A009</model>
-+        <model lang="en">Tamron SP 70-200mm f/2.8 Di VC USD</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.005</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 6D -->
-+            <distortion model="poly3" focal="70" k1="-0.00107"/>
-+            <distortion model="poly3" focal="100" k1="0.0043"/>
-+            <distortion model="poly3" focal="134" k1="0.00472"/>
-+            <distortion model="poly3" focal="167" k1="0.00808"/>
-+            <distortion model="poly3" focal="200" k1="0.00838"/>
-+            <tca model="poly3" focal="70" br="0.0000029" vr="1.0002132" bb="-0.0000057" vb="1.0000094"/>
-+            <tca model="poly3" focal="100" br="-0.0000221" vr="1.0000652" bb="-0.0000658" vb="1.0001278"/>
-+            <tca model="poly3" focal="134" br="0.0000229" vr="0.9999349" bb="-0.0000511" vb="1.0001457"/>
-+            <tca model="poly3" focal="167" br="0.0000443" vr="0.9998583" bb="-0.0000448" vb="1.0001015"/>
-+            <tca model="poly3" focal="200" br="0.0000116" vr="0.9998570" bb="-0.0000265" vb="1.0000494"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="10" k1="-0.6171" k2="0.0437" k3="-0.0332"/>
-+            <vignetting model="pa" focal="70" aperture="2.8" distance="1000" k1="-0.6171" k2="0.0437" k3="-0.0332"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="10" k1="0.0040" k2="-0.3182" k3="-0.0755"/>
-+            <vignetting model="pa" focal="70" aperture="4" distance="1000" k1="0.0040" k2="-0.3182" k3="-0.0755"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="10" k1="-0.2547" k2="0.5826" k3="-0.6187"/>
-+            <vignetting model="pa" focal="70" aperture="5.6" distance="1000" k1="-0.2547" k2="0.5826" k3="-0.6187"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="10" k1="-0.2262" k2="0.4231" k3="-0.3675"/>
-+            <vignetting model="pa" focal="70" aperture="8" distance="1000" k1="-0.2262" k2="0.4231" k3="-0.3675"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="10" k1="-0.1338" k2="-0.0139" k3="0.0515"/>
-+            <vignetting model="pa" focal="70" aperture="32" distance="1000" k1="-0.1338" k2="-0.0139" k3="0.0515"/>
-+            <vignetting model="pa" focal="98" aperture="2.8" distance="10" k1="-0.6974" k2="0.5418" k3="-0.3783"/>
-+            <vignetting model="pa" focal="98" aperture="2.8" distance="1000" k1="-0.6974" k2="0.5418" k3="-0.3783"/>
-+            <vignetting model="pa" focal="98" aperture="4" distance="10" k1="-0.2254" k2="0.4093" k3="-0.4754"/>
-+            <vignetting model="pa" focal="98" aperture="4" distance="1000" k1="-0.2254" k2="0.4093" k3="-0.4754"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="10" k1="-0.2580" k2="0.3968" k3="-0.3102"/>
-+            <vignetting model="pa" focal="98" aperture="5.6" distance="1000" k1="-0.2580" k2="0.3968" k3="-0.3102"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="10" k1="-0.1735" k2="0.0667" k3="0.0050"/>
-+            <vignetting model="pa" focal="98" aperture="8" distance="1000" k1="-0.1735" k2="0.0667" k3="0.0050"/>
-+            <vignetting model="pa" focal="98" aperture="32" distance="10" k1="-0.1981" k2="0.0687" k3="0.0261"/>
-+            <vignetting model="pa" focal="98" aperture="32" distance="1000" k1="-0.1981" k2="0.0687" k3="0.0261"/>
-+            <vignetting model="pa" focal="129" aperture="2.8" distance="10" k1="-0.4629" k2="-0.4214" k3="0.2866"/>
-+            <vignetting model="pa" focal="129" aperture="2.8" distance="1000" k1="-0.4629" k2="-0.4214" k3="0.2866"/>
-+            <vignetting model="pa" focal="129" aperture="4" distance="10" k1="0.0147" k2="-0.4337" k3="0.0395"/>
-+            <vignetting model="pa" focal="129" aperture="4" distance="1000" k1="0.0147" k2="-0.4337" k3="0.0395"/>
-+            <vignetting model="pa" focal="129" aperture="5.6" distance="10" k1="-0.2557" k2="0.5165" k3="-0.5489"/>
-+            <vignetting model="pa" focal="129" aperture="5.6" distance="1000" k1="-0.2557" k2="0.5165" k3="-0.5489"/>
-+            <vignetting model="pa" focal="129" aperture="8" distance="10" k1="-0.2803" k2="0.4676" k3="-0.3578"/>
-+            <vignetting model="pa" focal="129" aperture="8" distance="1000" k1="-0.2803" k2="0.4676" k3="-0.3578"/>
-+            <vignetting model="pa" focal="129" aperture="32" distance="10" k1="-0.2125" k2="0.1084" k3="0.0036"/>
-+            <vignetting model="pa" focal="129" aperture="32" distance="1000" k1="-0.2125" k2="0.1084" k3="0.0036"/>
-+            <vignetting model="pa" focal="152" aperture="2.8" distance="10" k1="-0.6975" k2="-0.2219" k3="0.2987"/>
-+            <vignetting model="pa" focal="152" aperture="2.8" distance="1000" k1="-0.6975" k2="-0.2219" k3="0.2987"/>
-+            <vignetting model="pa" focal="152" aperture="4" distance="10" k1="0.1234" k2="-1.0053" k3="0.4797"/>
-+            <vignetting model="pa" focal="152" aperture="4" distance="1000" k1="0.1234" k2="-1.0053" k3="0.4797"/>
-+            <vignetting model="pa" focal="152" aperture="5.6" distance="10" k1="-0.1699" k2="0.2227" k3="-0.3827"/>
-+            <vignetting model="pa" focal="152" aperture="5.6" distance="1000" k1="-0.1699" k2="0.2227" k3="-0.3827"/>
-+            <vignetting model="pa" focal="152" aperture="8" distance="10" k1="-0.3105" k2="0.5837" k3="-0.4807"/>
-+            <vignetting model="pa" focal="152" aperture="8" distance="1000" k1="-0.3105" k2="0.5837" k3="-0.4807"/>
-+            <vignetting model="pa" focal="152" aperture="32" distance="10" k1="-0.2199" k2="0.1181" k3="-0.0014"/>
-+            <vignetting model="pa" focal="152" aperture="32" distance="1000" k1="-0.2199" k2="0.1181" k3="-0.0014"/>
-+            <vignetting model="pa" focal="172" aperture="2.8" distance="10" k1="-1.1271" k2="0.6670" k3="-0.1770"/>
-+            <vignetting model="pa" focal="172" aperture="2.8" distance="1000" k1="-1.1271" k2="0.6670" k3="-0.1770"/>
-+            <vignetting model="pa" focal="172" aperture="4" distance="10" k1="0.1035" k2="-1.2096" k3="0.7009"/>
-+            <vignetting model="pa" focal="172" aperture="4" distance="1000" k1="0.1035" k2="-1.2096" k3="0.7009"/>
-+            <vignetting model="pa" focal="172" aperture="5.6" distance="10" k1="-0.0904" k2="-0.0621" k3="-0.1824"/>
-+            <vignetting model="pa" focal="172" aperture="5.6" distance="1000" k1="-0.0904" k2="-0.0621" k3="-0.1824"/>
-+            <vignetting model="pa" focal="172" aperture="8" distance="10" k1="-0.2978" k2="0.5668" k3="-0.4911"/>
-+            <vignetting model="pa" focal="172" aperture="8" distance="1000" k1="-0.2978" k2="0.5668" k3="-0.4911"/>
-+            <vignetting model="pa" focal="172" aperture="32" distance="10" k1="-0.2479" k2="0.1925" k3="-0.0508"/>
-+            <vignetting model="pa" focal="172" aperture="32" distance="1000" k1="-0.2479" k2="0.1925" k3="-0.0508"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="10" k1="-1.5497" k2="1.6732" k3="-0.7687"/>
-+            <vignetting model="pa" focal="200" aperture="2.8" distance="1000" k1="-1.5497" k2="1.6732" k3="-0.7687"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="10" k1="-0.0389" k2="-1.0804" k3="0.7106"/>
-+            <vignetting model="pa" focal="200" aperture="4" distance="1000" k1="-0.0389" k2="-1.0804" k3="0.7106"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="10" k1="0.0026" k2="-0.4269" k3="0.0882"/>
-+            <vignetting model="pa" focal="200" aperture="5.6" distance="1000" k1="0.0026" k2="-0.4269" k3="0.0882"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="10" k1="-0.2709" k2="0.4909" k3="-0.4424"/>
-+            <vignetting model="pa" focal="200" aperture="8" distance="1000" k1="-0.2709" k2="0.4909" k3="-0.4424"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="10" k1="-0.2670" k2="0.2535" k3="-0.0952"/>
-+            <vignetting model="pa" focal="200" aperture="32" distance="1000" k1="-0.2670" k2="0.2535" k3="-0.0952"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F004</model>
-+        <model lang="en">Tamron SP 90mm f/2.8 Di VC USD Macro 1:1</model>
-+        <mount>Nikon F AF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <cropfactor>1.6</cropfactor>
-+        <calibration>
-+            <!-- taken with Canon EOS 700D -->
-+            <distortion model="poly3" focal="90" k1="-0.00085"/>
-+            <tca model="poly3" focal="90" vr="1.0000890" vb="1.0000142"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7200 -->
-+            <distortion model="ptlens" focal="18" a="0.02445" b="-0.07818" c="0.03054"/>
-+            <distortion model="ptlens" focal="25" a="0.00579" b="-0.00644" c="-0.00982"/>
-+            <distortion model="ptlens" focal="35" a="0.00865" b="-0.01285" c="0.0082"/>
-+            <distortion model="ptlens" focal="50" a="0.00542" b="0.01072" c="-0.02489"/>
-+            <distortion model="ptlens" focal="70" a="0.00396" b="-0.00473" c="0.02262"/>
-+            <distortion model="ptlens" focal="100" a="-0.00576" b="0.03412" c="-0.0423"/>
-+            <distortion model="ptlens" focal="140" a="0.00483" b="-0.01297" c="0.03075"/>
-+            <distortion model="ptlens" focal="200" a="-0.00069" b="0.00867" c="-0.00672"/>
-+            <distortion model="ptlens" focal="270" a="-0.00785" b="0.03486" c="-0.03572"/>
-+            <tca model="poly3" focal="18" vr="1.0005251" vb="1.0000436"/>
-+            <tca model="poly3" focal="25" vr="1.0002516" vb="0.9999854"/>
-+            <tca model="poly3" focal="35" vr="1.0003318" vb="0.9999948"/>
-+            <tca model="poly3" focal="50" vr="1.0001071" vb="0.9999909"/>
-+            <tca model="poly3" focal="70" vr="1.0000046" vb="0.9999661"/>
-+            <tca model="poly3" focal="100" vr="0.9999238" vb="0.9999483"/>
-+            <tca model="poly3" focal="140" vr="0.9997563" vb="0.9997176"/>
-+            <tca model="poly3" focal="200" vr="0.9999102" vb="0.9999149"/>
-+            <tca model="poly3" focal="270" vr="0.9997811" vb="0.9998942"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tamron</maker>
-+        <model>Tamron 200mm f/3.5-22 CT-200 BBAR</model>
-+        <mount>Micro 4/3 System</mount>
-+        <cropfactor>2</cropfactor>
-+        <calibration>
-+            <!-- Taken with Olympus E-PL7 -->
-+            <distortion model="ptlens" focal="200" a="0" b="0.000003" c="0"/>
-+            <tca model="poly3" focal="200" vr="0.9996500" vb="0.9999927"/>
-+        </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-tokina.xml b/data/db/slr-tokina.xml
---- a/data/db/slr-tokina.xml	2013-01-17 20:53:13.000000000 +0100
-+++ b/data/db/slr-tokina.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,197 +1,328 @@
- <lensdatabase>
--
-     <lens>
-+        <!-- Fixme: The versions I and II are optically equivalent.  At the
-+             same time, exiv2 doesn't seem to be able to distinguish between
-+             them (well, version II has ID 122 instead of 116), so I don't
-+             create a second entry.  But once Lensfun has aliases, the II
-+             version should be added as an alias. -->
-         <maker>Tokina</maker>
--        <model>Tokina 11-16mm f/2.8 AT-X 116 AF PRO DX</model>
-+        <model>Tokina 11-16mm f/2.8 AT-X 116 AF Pro DX</model>
-+        <model lang="en">Tokina AF 11-16mm f/2.8 AT-X Pro DX</model>
-+        <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
--        <cropfactor>1.0</cropfactor>
-+        <mount>Sony Alpha</mount>
-+        <aperture min="2.8" max="22"/>
-+        <cropfactor>1</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="11" a="-0.024" b="-0.002" c="0.005" />
--            <distortion model="ptlens" focal="12" a="0.000" b="-0.042" c="0.041" />
--            <distortion model="ptlens" focal="13" a="-0.003" b="-0.023" c="0.018" />
--            <distortion model="ptlens" focal="14" a="0.003" b="-0.033" c="0.033" />
--            <distortion model="ptlens" focal="16" a="0.001" b="-0.023" c="0.021" />
-+            <distortion model="ptlens" focal="11" a="-0.024" b="-0.002" c="0.005"/>
-+            <distortion model="ptlens" focal="12" a="0.000" b="-0.042" c="0.041"/>
-+            <distortion model="ptlens" focal="13" a="-0.003" b="-0.023" c="0.018"/>
-+            <distortion model="ptlens" focal="14" a="0.003" b="-0.033" c="0.033"/>
-+            <distortion model="ptlens" focal="16" a="0.001" b="-0.023" c="0.021"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- Fixme: The versions I and II are optically equivalent.  At the
-+             same time, exiv2 doesn't seem to be able to distinguish between
-+             them (well, version II has ID 122 instead of 116), so I don't
-+             create a second entry.  But once Lensfun has aliases, the II
-+             version should be added as an alias. -->
-         <maker>Tokina</maker>
--        <model>Tokina AT-X Pro DX 11-16mm F2.8</model>
-+        <model>Tokina 11-16mm f/2.8 AT-X 116 AF Pro DX</model>
-+        <model lang="en">Tokina AF 11-16mm f/2.8 AT-X Pro DX</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Sony Alpha</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="11" a="-0.00574" b="-0.00115" c="0.0022" />
--            <distortion model="ptlens" focal="12" a="-0.00494" b="-0.00187" c="0.00464" />
--            <distortion model="ptlens" focal="13" a="-0.00597" b="0.00615" c="-0.0041" />
--            <distortion model="ptlens" focal="14" a="-0.00852" b="0.01584" c="-0.01187" />
--            <distortion model="ptlens" focal="15" a="-0.00318" b="-0.0002" c="0.00625" />
--            <distortion model="ptlens" focal="16" a="-0.00972" b="0.0226" c="-0.01691" />
--            <vignetting model="pa" focal="11" aperture="2.8" distance="10" k1="-0.0379" k2="-1.0821" k3="0.5311" />
--            <vignetting model="pa" focal="11" aperture="2.8" distance="1000" k1="-0.0379" k2="-1.0821" k3="0.5311" />
--            <vignetting model="pa" focal="11" aperture="3.5" distance="10" k1="-0.1331" k2="-0.1912" k3="-0.1581" />
--            <vignetting model="pa" focal="11" aperture="3.5" distance="1000" k1="-0.1331" k2="-0.1912" k3="-0.1581" />
--            <vignetting model="pa" focal="11" aperture="4.5" distance="10" k1="-0.2113" k2="0.0191" k3="-0.1865" />
--            <vignetting model="pa" focal="11" aperture="4.5" distance="1000" k1="-0.2113" k2="0.0191" k3="-0.1865" />
--            <vignetting model="pa" focal="11" aperture="5.6" distance="10" k1="-0.2007" k2="-0.1046" k3="-0.0229" />
--            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.2007" k2="-0.1046" k3="-0.0229" />
--            <vignetting model="pa" focal="11" aperture="7.1" distance="10" k1="-0.1672" k2="-0.2698" k3="0.1455" />
--            <vignetting model="pa" focal="11" aperture="7.1" distance="1000" k1="-0.1672" k2="-0.2698" k3="0.1455" />
--            <vignetting model="pa" focal="11" aperture="22" distance="10" k1="-0.2105" k2="-0.1988" k3="0.1335" />
--            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.2105" k2="-0.1988" k3="0.1335" />
--            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.1743" k2="-0.7147" k3="0.4041" />
--            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.1743" k2="-0.7147" k3="0.4041" />
--            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.1132" k2="-0.3528" k3="0.0961" />
--            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.1132" k2="-0.3528" k3="0.0961" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.1374" k2="-0.3360" k3="0.2227" />
--            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.1374" k2="-0.3360" k3="0.2227" />
--            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1452" k2="-0.3187" k3="0.2177" />
--            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1452" k2="-0.3187" k3="0.2177" />
--            <vignetting model="pa" focal="12" aperture="7.1" distance="10" k1="-0.1536" k2="-0.2926" k3="0.2035" />
--            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.1536" k2="-0.2926" k3="0.2035" />
--            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.1984" k2="-0.2024" k3="0.1672" />
--            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.1984" k2="-0.2024" k3="0.1672" />
--            <vignetting model="pa" focal="13" aperture="2.8" distance="10" k1="-0.3366" k2="-0.3427" k3="0.2544" />
--            <vignetting model="pa" focal="13" aperture="2.8" distance="1000" k1="-0.3366" k2="-0.3427" k3="0.2544" />
--            <vignetting model="pa" focal="13" aperture="3.5" distance="10" k1="-0.0692" k2="-0.5208" k3="0.3049" />
--            <vignetting model="pa" focal="13" aperture="3.5" distance="1000" k1="-0.0692" k2="-0.5208" k3="0.3049" />
--            <vignetting model="pa" focal="13" aperture="4.5" distance="10" k1="-0.1239" k2="-0.3450" k3="0.2508" />
--            <vignetting model="pa" focal="13" aperture="4.5" distance="1000" k1="-0.1239" k2="-0.3450" k3="0.2508" />
--            <vignetting model="pa" focal="13" aperture="5.6" distance="10" k1="-0.1408" k2="-0.2910" k3="0.2162" />
--            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-0.1408" k2="-0.2910" k3="0.2162" />
--            <vignetting model="pa" focal="13" aperture="7.1" distance="10" k1="-0.1468" k2="-0.2659" k3="0.2002" />
--            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.1468" k2="-0.2659" k3="0.2002" />
--            <vignetting model="pa" focal="13" aperture="22" distance="10" k1="-0.1874" k2="-0.2040" k3="0.1839" />
--            <vignetting model="pa" focal="13" aperture="22" distance="1000" k1="-0.1874" k2="-0.2040" k3="0.1839" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-0.4848" k2="-0.0258" k3="0.1050" />
--            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-0.4848" k2="-0.0258" k3="0.1050" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.0747" k2="-0.6430" k3="0.4305" />
--            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0747" k2="-0.6430" k3="0.4305" />
--            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.1224" k2="-0.3113" k3="0.2312" />
--            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.1224" k2="-0.3113" k3="0.2312" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2659" k3="0.2105" />
--            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2659" k3="0.2105" />
--            <vignetting model="pa" focal="14" aperture="7.1" distance="10" k1="-0.1566" k2="-0.2378" k3="0.1952" />
--            <vignetting model="pa" focal="14" aperture="7.1" distance="1000" k1="-0.1566" k2="-0.2378" k3="0.1952" />
--            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.1747" k2="-0.2080" k3="0.1915" />
--            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.1747" k2="-0.2080" k3="0.1915" />
--            <vignetting model="pa" focal="15" aperture="2.8" distance="10" k1="-0.5189" k2="0.1125" k3="0.0317" />
--            <vignetting model="pa" focal="15" aperture="2.8" distance="1000" k1="-0.5189" k2="0.1125" k3="0.0317" />
--            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-0.1445" k2="-0.5302" k3="0.3909" />
--            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-0.1445" k2="-0.5302" k3="0.3909" />
--            <vignetting model="pa" focal="15" aperture="4.5" distance="10" k1="-0.1347" k2="-0.2554" k3="0.1935" />
--            <vignetting model="pa" focal="15" aperture="4.5" distance="1000" k1="-0.1347" k2="-0.2554" k3="0.1935" />
--            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2549" k3="0.2090" />
--            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2549" k3="0.2090" />
--            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.1645" k2="-0.2101" k3="0.1840" />
--            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.1645" k2="-0.2101" k3="0.1840" />
--            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.1766" k2="-0.2047" k3="0.1961" />
--            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.1766" k2="-0.2047" k3="0.1961" />
--            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5341" k2="0.1997" k3="-0.0140" />
--            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5341" k2="0.1997" k3="-0.0140" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.3815" k2="-0.0743" k3="0.1491" />
--            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.3815" k2="-0.0743" k3="0.1491" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.1299" k2="-0.2483" k3="0.1805" />
--            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.1299" k2="-0.2483" k3="0.1805" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1361" k2="-0.2659" k3="0.2208" />
--            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1361" k2="-0.2659" k3="0.2208" />
--            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-0.1586" k2="-0.2196" k3="0.1951" />
--            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-0.1586" k2="-0.2196" k3="0.1951" />
--            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.1690" k2="-0.2027" k3="0.1971" />
--            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.1690" k2="-0.2027" k3="0.1971" />
-+            <distortion model="ptlens" focal="11" a="-0.00574" b="-0.00115" c="0.0022"/>
-+            <distortion model="ptlens" focal="12" a="-0.00494" b="-0.00187" c="0.00464"/>
-+            <distortion model="ptlens" focal="13" a="-0.00597" b="0.00615" c="-0.0041"/>
-+            <distortion model="ptlens" focal="14" a="-0.00852" b="0.01584" c="-0.01187"/>
-+            <distortion model="ptlens" focal="15" a="-0.00318" b="-0.0002" c="0.00625"/>
-+            <distortion model="ptlens" focal="16" a="-0.00972" b="0.0226" c="-0.01691"/>
-+            <vignetting model="pa" focal="11" aperture="2.8" distance="10" k1="-0.0379" k2="-1.0821" k3="0.5311"/>
-+            <vignetting model="pa" focal="11" aperture="2.8" distance="1000" k1="-0.0379" k2="-1.0821" k3="0.5311"/>
-+            <vignetting model="pa" focal="11" aperture="3.5" distance="10" k1="-0.1331" k2="-0.1912" k3="-0.1581"/>
-+            <vignetting model="pa" focal="11" aperture="3.5" distance="1000" k1="-0.1331" k2="-0.1912" k3="-0.1581"/>
-+            <vignetting model="pa" focal="11" aperture="4.5" distance="10" k1="-0.2113" k2="0.0191" k3="-0.1865"/>
-+            <vignetting model="pa" focal="11" aperture="4.5" distance="1000" k1="-0.2113" k2="0.0191" k3="-0.1865"/>
-+            <vignetting model="pa" focal="11" aperture="5.6" distance="10" k1="-0.2007" k2="-0.1046" k3="-0.0229"/>
-+            <vignetting model="pa" focal="11" aperture="5.6" distance="1000" k1="-0.2007" k2="-0.1046" k3="-0.0229"/>
-+            <vignetting model="pa" focal="11" aperture="7.1" distance="10" k1="-0.1672" k2="-0.2698" k3="0.1455"/>
-+            <vignetting model="pa" focal="11" aperture="7.1" distance="1000" k1="-0.1672" k2="-0.2698" k3="0.1455"/>
-+            <vignetting model="pa" focal="11" aperture="22" distance="10" k1="-0.2105" k2="-0.1988" k3="0.1335"/>
-+            <vignetting model="pa" focal="11" aperture="22" distance="1000" k1="-0.2105" k2="-0.1988" k3="0.1335"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="10" k1="-0.1743" k2="-0.7147" k3="0.4041"/>
-+            <vignetting model="pa" focal="12" aperture="2.8" distance="1000" k1="-0.1743" k2="-0.7147" k3="0.4041"/>
-+            <vignetting model="pa" focal="12" aperture="3.5" distance="10" k1="-0.1132" k2="-0.3528" k3="0.0961"/>
-+            <vignetting model="pa" focal="12" aperture="3.5" distance="1000" k1="-0.1132" k2="-0.3528" k3="0.0961"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="10" k1="-0.1374" k2="-0.3360" k3="0.2227"/>
-+            <vignetting model="pa" focal="12" aperture="4.5" distance="1000" k1="-0.1374" k2="-0.3360" k3="0.2227"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="10" k1="-0.1452" k2="-0.3187" k3="0.2177"/>
-+            <vignetting model="pa" focal="12" aperture="5.6" distance="1000" k1="-0.1452" k2="-0.3187" k3="0.2177"/>
-+            <vignetting model="pa" focal="12" aperture="7.1" distance="10" k1="-0.1536" k2="-0.2926" k3="0.2035"/>
-+            <vignetting model="pa" focal="12" aperture="7.1" distance="1000" k1="-0.1536" k2="-0.2926" k3="0.2035"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="10" k1="-0.1984" k2="-0.2024" k3="0.1672"/>
-+            <vignetting model="pa" focal="12" aperture="22" distance="1000" k1="-0.1984" k2="-0.2024" k3="0.1672"/>
-+            <vignetting model="pa" focal="13" aperture="2.8" distance="10" k1="-0.3366" k2="-0.3427" k3="0.2544"/>
-+            <vignetting model="pa" focal="13" aperture="2.8" distance="1000" k1="-0.3366" k2="-0.3427" k3="0.2544"/>
-+            <vignetting model="pa" focal="13" aperture="3.5" distance="10" k1="-0.0692" k2="-0.5208" k3="0.3049"/>
-+            <vignetting model="pa" focal="13" aperture="3.5" distance="1000" k1="-0.0692" k2="-0.5208" k3="0.3049"/>
-+            <vignetting model="pa" focal="13" aperture="4.5" distance="10" k1="-0.1239" k2="-0.3450" k3="0.2508"/>
-+            <vignetting model="pa" focal="13" aperture="4.5" distance="1000" k1="-0.1239" k2="-0.3450" k3="0.2508"/>
-+            <vignetting model="pa" focal="13" aperture="5.6" distance="10" k1="-0.1408" k2="-0.2910" k3="0.2162"/>
-+            <vignetting model="pa" focal="13" aperture="5.6" distance="1000" k1="-0.1408" k2="-0.2910" k3="0.2162"/>
-+            <vignetting model="pa" focal="13" aperture="7.1" distance="10" k1="-0.1468" k2="-0.2659" k3="0.2002"/>
-+            <vignetting model="pa" focal="13" aperture="7.1" distance="1000" k1="-0.1468" k2="-0.2659" k3="0.2002"/>
-+            <vignetting model="pa" focal="13" aperture="22" distance="10" k1="-0.1874" k2="-0.2040" k3="0.1839"/>
-+            <vignetting model="pa" focal="13" aperture="22" distance="1000" k1="-0.1874" k2="-0.2040" k3="0.1839"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="10" k1="-0.4848" k2="-0.0258" k3="0.1050"/>
-+            <vignetting model="pa" focal="14" aperture="2.8" distance="1000" k1="-0.4848" k2="-0.0258" k3="0.1050"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="10" k1="-0.0747" k2="-0.6430" k3="0.4305"/>
-+            <vignetting model="pa" focal="14" aperture="3.5" distance="1000" k1="-0.0747" k2="-0.6430" k3="0.4305"/>
-+            <vignetting model="pa" focal="14" aperture="4.5" distance="10" k1="-0.1224" k2="-0.3113" k3="0.2312"/>
-+            <vignetting model="pa" focal="14" aperture="4.5" distance="1000" k1="-0.1224" k2="-0.3113" k3="0.2312"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2659" k3="0.2105"/>
-+            <vignetting model="pa" focal="14" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2659" k3="0.2105"/>
-+            <vignetting model="pa" focal="14" aperture="7.1" distance="10" k1="-0.1566" k2="-0.2378" k3="0.1952"/>
-+            <vignetting model="pa" focal="14" aperture="7.1" distance="1000" k1="-0.1566" k2="-0.2378" k3="0.1952"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="10" k1="-0.1747" k2="-0.2080" k3="0.1915"/>
-+            <vignetting model="pa" focal="14" aperture="22" distance="1000" k1="-0.1747" k2="-0.2080" k3="0.1915"/>
-+            <vignetting model="pa" focal="15" aperture="2.8" distance="10" k1="-0.5189" k2="0.1125" k3="0.0317"/>
-+            <vignetting model="pa" focal="15" aperture="2.8" distance="1000" k1="-0.5189" k2="0.1125" k3="0.0317"/>
-+            <vignetting model="pa" focal="15" aperture="3.5" distance="10" k1="-0.1445" k2="-0.5302" k3="0.3909"/>
-+            <vignetting model="pa" focal="15" aperture="3.5" distance="1000" k1="-0.1445" k2="-0.5302" k3="0.3909"/>
-+            <vignetting model="pa" focal="15" aperture="4.5" distance="10" k1="-0.1347" k2="-0.2554" k3="0.1935"/>
-+            <vignetting model="pa" focal="15" aperture="4.5" distance="1000" k1="-0.1347" k2="-0.2554" k3="0.1935"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="10" k1="-0.1451" k2="-0.2549" k3="0.2090"/>
-+            <vignetting model="pa" focal="15" aperture="5.6" distance="1000" k1="-0.1451" k2="-0.2549" k3="0.2090"/>
-+            <vignetting model="pa" focal="15" aperture="7.1" distance="10" k1="-0.1645" k2="-0.2101" k3="0.1840"/>
-+            <vignetting model="pa" focal="15" aperture="7.1" distance="1000" k1="-0.1645" k2="-0.2101" k3="0.1840"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="10" k1="-0.1766" k2="-0.2047" k3="0.1961"/>
-+            <vignetting model="pa" focal="15" aperture="22" distance="1000" k1="-0.1766" k2="-0.2047" k3="0.1961"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="10" k1="-0.5341" k2="0.1997" k3="-0.0140"/>
-+            <vignetting model="pa" focal="16" aperture="2.8" distance="1000" k1="-0.5341" k2="0.1997" k3="-0.0140"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="10" k1="-0.3815" k2="-0.0743" k3="0.1491"/>
-+            <vignetting model="pa" focal="16" aperture="3.5" distance="1000" k1="-0.3815" k2="-0.0743" k3="0.1491"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="10" k1="-0.1299" k2="-0.2483" k3="0.1805"/>
-+            <vignetting model="pa" focal="16" aperture="4.5" distance="1000" k1="-0.1299" k2="-0.2483" k3="0.1805"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="10" k1="-0.1361" k2="-0.2659" k3="0.2208"/>
-+            <vignetting model="pa" focal="16" aperture="5.6" distance="1000" k1="-0.1361" k2="-0.2659" k3="0.2208"/>
-+            <vignetting model="pa" focal="16" aperture="7.1" distance="10" k1="-0.1586" k2="-0.2196" k3="0.1951"/>
-+            <vignetting model="pa" focal="16" aperture="7.1" distance="1000" k1="-0.1586" k2="-0.2196" k3="0.1951"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="10" k1="-0.1690" k2="-0.2027" k3="0.1971"/>
-+            <vignetting model="pa" focal="16" aperture="22" distance="1000" k1="-0.1690" k2="-0.2027" k3="0.1971"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tokina</maker>
--        <model>Tokina 12-24mm f/4 AT-X 124 AF PRO DX</model>
-+        <model>Tokina 12-24mm f/4 AT-X 124 AF Pro DX</model>
-+        <model lang="en">Tokina AF 12-24mm f/4 AT-X Pro DX</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="12" a="-0.005227" b="0.0018" c="0" />
--            <distortion model="ptlens" focal="14" a="-0.003321" b="0.00043" c="0" />
--            <distortion model="ptlens" focal="15" a="-0.002362" b="0.00112" c="0" />
--            <distortion model="ptlens" focal="17" a="-0.001493" b="0.000502" c="0" />
--            <distortion model="ptlens" focal="19" a="-0.000691" b="0.000121" c="0" />
--            <distortion model="ptlens" focal="22" a="-0.000208" b="-0.000207" c="0" />
--            <distortion model="ptlens" focal="24" a="0" b="0" c="0" />
-+            <distortion model="ptlens" focal="12" a="-0.005227" b="0.0018" c="0"/>
-+            <distortion model="ptlens" focal="14" a="-0.003321" b="0.00043" c="0"/>
-+            <distortion model="ptlens" focal="15" a="-0.002362" b="0.00112" c="0"/>
-+            <distortion model="ptlens" focal="17" a="-0.001493" b="0.000502" c="0"/>
-+            <distortion model="ptlens" focal="19" a="-0.000691" b="0.000121" c="0"/>
-+            <distortion model="ptlens" focal="22" a="-0.000208" b="-0.000207" c="0"/>
-+            <distortion model="ptlens" focal="24" a="0" b="0" c="0"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tokina</maker>
-         <model>Tokina 19-35mm f/3.5-4.5 AF 193</model>
-+        <model lang="en">Tokina AF 19-35mm f/3.5-4.5</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="19" a="0" b="-0.005476" c="-0.022162" />
--            <distortion model="ptlens" focal="22" a="0" b="-0.003238" c="-0.017549" />
--            <distortion model="ptlens" focal="24" a="0" b="-0.005132" c="-0.0082" />
--            <distortion model="ptlens" focal="27" a="0" b="-0.004119" c="-0.006452" />
--            <distortion model="ptlens" focal="29" a="0" b="-0.004177" c="-0.003541" />
--            <distortion model="ptlens" focal="31" a="0" b="-0.002338" c="-0.006455" />
--            <distortion model="ptlens" focal="33" a="0" b="-0.002642" c="-0.006101" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.000829" c="-0.007504" />
-+            <distortion model="ptlens" focal="19" a="0" b="-0.005476" c="-0.022162"/>
-+            <distortion model="ptlens" focal="22" a="0" b="-0.003238" c="-0.017549"/>
-+            <distortion model="ptlens" focal="24" a="0" b="-0.005132" c="-0.0082"/>
-+            <distortion model="ptlens" focal="27" a="0" b="-0.004119" c="-0.006452"/>
-+            <distortion model="ptlens" focal="29" a="0" b="-0.004177" c="-0.003541"/>
-+            <distortion model="ptlens" focal="31" a="0" b="-0.002338" c="-0.006455"/>
-+            <distortion model="ptlens" focal="33" a="0" b="-0.002642" c="-0.006101"/>
-+            <distortion model="ptlens" focal="35" a="0" b="-0.000829" c="-0.007504"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tokina</maker>
--        <model>Tokina 28-70mm f/2.8 AT-X 287 PRO SV</model>
-+        <model>Tokina 28-70mm f/2.8 AT-X 287 Pro SV</model>
-+        <model lang="en">Tokina 28-70mm f/2.8 AT-X Pro SV</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="28" a="0" b="-0.006412" c="0" />
--            <distortion model="ptlens" focal="30" a="0" b="-0.005104" c="0" />
--            <distortion model="ptlens" focal="35" a="0" b="-0.00295" c="0" />
--            <distortion model="ptlens" focal="42" a="0" b="0.000202" c="0" />
--            <distortion model="ptlens" focal="56" a="0" b="0.002091" c="0" />
--            <distortion model="ptlens" focal="70" a="0" b="0.003103" c="0" />
-+            <distortion model="poly3" focal="28" k1="-0.006412"/>
-+            <distortion model="poly3" focal="30" k1="-0.005104"/>
-+            <distortion model="poly3" focal="35" k1="-0.00295"/>
-+            <distortion model="poly3" focal="42" k1="0.000202"/>
-+            <distortion model="poly3" focal="56" k1="0.002091"/>
-+            <distortion model="poly3" focal="70" k1="0.003103"/>
-         </calibration>
-     </lens>
--
-     <lens>
-+        <!-- This is a pure manual lens with no EXIF footprint. -->
-         <maker>Tokina</maker>
-         <model>Tokina 80-200mm f/4.5-5.6 SZ-X</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-         <mount>Pentax KAF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="80" a="-0.01761" b="0.06433" c="-0.07566" />
--            <distortion model="ptlens" focal="110" a="-0.01579" b="0.05909" c="-0.06129" />
--            <distortion model="ptlens" focal="200" a="-0.01328" b="0.04681" c="-0.03935" />
--            <tca model="poly3" focal="80" br="0.0000351" vr="0.9998083" bb="-0.0000109" vb="0.9998991" />
--            <tca model="poly3" focal="110" br="-0.0000155" vr="0.9999253" bb="-0.0000348" vb="0.9994977" />
--            <tca model="poly3" focal="200" br="-0.0000075" vr="0.9993965" bb="-0.0000782" vb="0.9994524" />
-+            <distortion model="ptlens" focal="80" a="-0.01761" b="0.06433" c="-0.07566"/>
-+            <distortion model="ptlens" focal="110" a="-0.01579" b="0.05909" c="-0.06129"/>
-+            <distortion model="ptlens" focal="200" a="-0.01328" b="0.04681" c="-0.03935"/>
-+            <tca model="poly3" focal="80" br="0.0000351" vr="0.9998083" bb="-0.0000109" vb="0.9998991"/>
-+            <tca model="poly3" focal="110" br="-0.0000155" vr="0.9999253" bb="-0.0000348" vb="0.9994977"/>
-+            <tca model="poly3" focal="200" br="-0.0000075" vr="0.9993965" bb="-0.0000782" vb="0.9994524"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tokina</maker>
--        <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
-+        <model>Tokina 17mm f/3.5 AT-X 17 AF Pro</model>
-+        <model lang="en">Tokina AF 17mm f/3.5 AT-X Pro</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-         <cropfactor>1.5</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0" b="-0.012125" c="0" />
-+            <distortion model="poly3" focal="17" k1="-0.012125"/>
-         </calibration>
-     </lens>
--
-     <lens>
-         <maker>Tokina</maker>
--        <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
-+        <model>Tokina 17mm f/3.5 AT-X 17 AF Pro</model>
-+        <model lang="en">Tokina AF 17mm f/3.5 AT-X Pro</model>
-         <mount>Canon EF</mount>
-         <mount>Nikon F AF</mount>
-+        <!-- Average crop factor of Canon APS-C cameras -->
-         <cropfactor>1.6</cropfactor>
-         <calibration>
--            <distortion model="ptlens" focal="17" a="0" b="-0.004083" c="-0.015672" />
-+            <distortion model="ptlens" focal="17" a="0" b="-0.004083" c="-0.015672"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tokina</maker>
-+        <model>Tokina 500mm f/8 RMC Mirror Lens</model>
-+        <model lang="de">Tokina 500mm f/8 RMC Spiegelobjektiv</model>
-+        <mount>Pentax K</mount>
-+        <mount>Canon FD</mount>
-+        <mount>Minolta M</mount>
-+        <mount>Olympus OM</mount>
-+        <mount>Nikon F AI</mount>
-+        <focal value="500"/>
-+        <aperture value="8"/>
-+        <!-- Average crop factor of non-Canon APS-C cameras -->
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <tca model="poly3" focal="500" br="0.0000917" cr="-0.0001426" vr="0.9998064" bb="0.0002514" cb="-0.0004149" vb="0.9997489"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tokina</maker>
-+        <model>Tokina AF 16-28mm f/2.8 AT-X Pro SD FX</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Canon 5D Mark III -->
-+            <distortion model="poly3" focal="16" k1="-0.00888"/>
-+            <distortion model="poly3" focal="18" k1="-0.00572"/>
-+            <distortion model="poly3" focal="19" k1="-0.00426"/>
-+            <distortion model="poly3" focal="21" k1="-0.00249"/>
-+            <distortion model="poly3" focal="22" k1="-0.00113"/>
-+            <distortion model="poly3" focal="25" k1="-0.00033"/>
-+            <distortion model="poly3" focal="28" k1="0.00034"/>
-+            <tca model="poly3" focal="16" br="0.0000409" vr="1.0000971" bb="0.0000302" vb="1.0000925"/>
-+            <tca model="poly3" focal="18" br="0.0000510" vr="1.0000552" bb="-0.0000165" vb="1.0001691"/>
-+            <tca model="poly3" focal="19" br="0.0000587" vr="1.0000284" bb="-0.0000346" vb="1.0001799"/>
-+            <tca model="poly3" focal="21" br="0.0000502" vr="1.0000214" bb="-0.0000335" vb="1.0001829"/>
-+            <tca model="poly3" focal="22" br="0.0000416" vr="1.0000146" bb="-0.0000435" vb="1.0002136"/>
-+            <tca model="poly3" focal="25" br="0.0000520" vr="0.9999853" bb="-0.0000232" vb="1.0001969"/>
-+            <tca model="poly3" focal="28" br="0.0000373" vr="0.9999960" bb="-0.0000421" vb="1.0002272"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tokina</maker>
-+        <model>Tokina AF 12-28mm f/4 AT-X Pro DX</model>
-+        <mount>Canon EF</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D5200 -->
-+            <distortion model="ptlens" focal="12" a="-0.0155" b="0.02702" c="-0.01478"/>
-+            <distortion model="ptlens" focal="16" a="-0.00587" b="0.01029" c="-0.00103"/>
-+            <distortion model="ptlens" focal="20" a="-0.00615" b="0.01941" c="-0.01691"/>
-+            <distortion model="ptlens" focal="28" a="0" b="0.00087" c="0"/>
-+            <tca model="poly3" focal="12" br="0.0003226" vr="0.9997339" bb="-0.0002505" vb="1.0007854"/>
-+            <tca model="poly3" focal="16" br="0.0002802" vr="0.9996491" bb="-0.0003635" vb="1.0011169"/>
-+            <tca model="poly3" focal="20" br="0.0002331" vr="0.9996805" bb="-0.0002379" vb="1.0008884"/>
-+            <tca model="poly3" focal="28" br="0.0001388" vr="0.9998978" bb="-0.0001242" vb="1.0005127"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tokina</maker>
-+        <model>Tokina AT-X M100 100mm f/2.8 Pro D Macro AF</model>
-+        <model lang="en">Tokina AF 100mm f/2.8 AT-X Pro D Macro</model>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D7100 -->
-+            <distortion model="poly3" focal="100" k1="0.00094"/>
-+            <tca model="poly3" focal="100" vr="0.9998950" vb="0.9997397"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tokina</maker>
-+        <model>Tokina AF 80-200mm f/2.8 AT-X 828 Pro</model>
-+        <mount>Pentax KAF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D610 -->
-+            <distortion model="ptlens" focal="80" a="0.00084" b="-0.00992" c="0.00919"/>
-+            <distortion model="ptlens" focal="100" a="0.00199" b="-0.00657" c="0.00742"/>
-+            <distortion model="ptlens" focal="116" a="0.00629" b="-0.01689" c="0.01942"/>
-+            <distortion model="ptlens" focal="135" a="0.00381" b="-0.00784" c="0.01505"/>
-+            <distortion model="ptlens" focal="200" a="0.00471" b="-0.00806" c="0.02028"/>
-+            <tca model="poly3" focal="80" vr="1.0001077" vb="0.9999569"/>
-+            <tca model="poly3" focal="100" vr="1.0000161" vb="0.9999170"/>
-+            <tca model="poly3" focal="116" vr="0.9999781" vb="0.9998856"/>
-+            <tca model="poly3" focal="135" vr="0.9999332" vb="0.9998826"/>
-+            <tca model="poly3" focal="200" vr="0.9998570" vb="0.9999823"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Tokina</maker>
-+        <model>Tokina AF 28-80mm f/2.8 AT-X 280 Pro</model>
-+        <mount>Pentax KAF</mount>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D610 -->
-+            <distortion model="ptlens" focal="28" a="0.01909" b="-0.06299" c="0.03342"/>
-+            <distortion model="ptlens" focal="35" a="0.01371" b="-0.04183" c="0.03052"/>
-+            <distortion model="ptlens" focal="40" a="0.01315" b="-0.03978" c="0.04334"/>
-+            <distortion model="ptlens" focal="50" a="0.00739" b="-0.01269" c="0.01453"/>
-+            <distortion model="ptlens" focal="62" a="0.00322" b="-0.00052" c="0.00963"/>
-+            <distortion model="ptlens" focal="68" a="0.00235" b="0.00356" c="0.00562"/>
-+            <distortion model="ptlens" focal="80" a="0.00884" b="-0.01771" c="0.02833"/>
-         </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-ussr.xml b/data/db/slr-ussr.xml
---- a/data/db/slr-ussr.xml	2007-11-04 00:41:29.000000000 +0100
-+++ b/data/db/slr-ussr.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -1,85 +1,71 @@
--<!--
--    This file contains some of the cameras and lenses from:
--    "Krasnogorsky zavod" JSC (http://www.zenit-foto.ru/english/index.htm)
--    "Belarusian Optical and Mechanical Associtaion" (http://www.belomo.by/)
---->
- <lensdatabase>
--
-     <camera>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>Zenit 122</model>
-         <model lang="ru">Зенит 122</model>
-         <mount>M42</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>Zenit 122K</model>
-         <model lang="ru">Зенит 122K</model>
-         <mount>Pentax K</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>Zenit 212K</model>
-         <model lang="ru">Зенит 212K</model>
-         <mount>Pentax K</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>Zenit 312K</model>
-         <model lang="ru">Зенит 312K</model>
-         <mount>Pentax K</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>Zenit 412LS</model>
-         <model lang="ru">Зенит 412LS</model>
-         <mount>M42</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <camera>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>Zenit KM</model>
-         <model lang="ru">Зенит KM</model>
-         <mount>Pentax K</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </camera>
--
-     <lens>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>MC Mir-20M 3.5/20</model>
-         <model lang="ru">МС Мир-20М 3.5/20</model>
-         <mount>M42</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>MC Zenitar 2.8/16</model>
-         <model lang="ru">МС Зенитар 2.8/16</model>
--        <type>fisheye</type>
-         <mount>M42</mount>
-         <mount>Pentax K</mount>
-         <mount>Nikon F</mount>
--        <cropfactor>1.0</cropfactor>
-+        <type>fisheye</type>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-@@ -87,38 +73,34 @@
-         <model lang="ru">МС Зенитар 2/50</model>
-         <mount>M42</mount>
-         <mount>Pentax K</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>MC APO Telezenitar 2.8/135</model>
-         <model lang="ru">МС АПО Телезенитар 2.8/135</model>
-         <mount>M42</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>MC APO Telezenitar 4.5/300</model>
-         <model lang="ru">МС АПО Телезенитар 4.5/300</model>
-         <mount>M42</mount>
--        <cropfactor>1.0</cropfactor>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>KMZ</maker>
-         <maker lang="ru">КМЗ</maker>
-         <model>MC Variozenitar-K 2.8-3.5/25-45</model>
-         <model lang="ru">МС Вариозенитар-К 2.8-3.5/25-45</model>
-         <mount>M42</mount>
--        <cropfactor>1.0</cropfactor>
--        <aperture min="2.8" max="3.5" />
--        <focal min="25" max="45" />
-+        <focal min="25" max="45"/>
-+        <aperture min="2.8"/>
-+        <cropfactor>1</cropfactor>
-     </lens>
--
-     <lens>
-         <maker>BelOMO</maker>
-         <maker lang="ru">БелОМО</maker>
-@@ -128,9 +110,56 @@
-         <mount>Pentax K</mount>
-         <mount>Nikon F</mount>
-         <mount>Canon EF</mount>
--        <cropfactor>1.0</cropfactor>
--        <aperture min="3.5" max="16" />
-+        <aperture min="3.5" max="16"/>
-         <type>fisheye</type>
-+        <cropfactor>1</cropfactor>
-+    </lens>
-+    <lens>
-+        <maker>KMZ</maker>
-+        <maker lang="ru">КМЗ</maker>
-+        <model>MC MTO 11CA 10/1000</model>
-+        <mount>M42</mount>
-+        <focal value="1000"/>
-+        <aperture value="10"/>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <distortion model="poly3" focal="1000" k1="0.00451"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>KMZ</maker>
-+        <model>MC Helios-44M-4 58mm 1:2</model>
-+        <mount>M42</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="poly3" focal="58" k1="0.00131"/>
-+            <tca model="poly3" focal="58" vr="1.0000037" vb="0.9999377"/>
-+            <vignetting model="pa" focal="58" aperture="2" distance="10" k1="-0.7541" k2="0.5658" k3="-0.2168"/>
-+            <vignetting model="pa" focal="58" aperture="2" distance="1000" k1="-0.7541" k2="0.5658" k3="-0.2168"/>
-+            <vignetting model="pa" focal="58" aperture="2.8" distance="10" k1="-0.1611" k2="0.0829" k3="-0.0613"/>
-+            <vignetting model="pa" focal="58" aperture="2.8" distance="1000" k1="-0.1611" k2="0.0829" k3="-0.0613"/>
-+            <vignetting model="pa" focal="58" aperture="4" distance="10" k1="-0.1624" k2="0.0504" k3="-0.0082"/>
-+            <vignetting model="pa" focal="58" aperture="4" distance="1000" k1="-0.1624" k2="0.0504" k3="-0.0082"/>
-+            <vignetting model="pa" focal="58" aperture="5.6" distance="10" k1="-0.1559" k2="0.0218" k3="0.0096"/>
-+            <vignetting model="pa" focal="58" aperture="5.6" distance="1000" k1="-0.1559" k2="0.0218" k3="0.0096"/>
-+            <vignetting model="pa" focal="58" aperture="8" distance="10" k1="-0.1870" k2="0.0627" k3="-0.0081"/>
-+            <vignetting model="pa" focal="58" aperture="8" distance="1000" k1="-0.1870" k2="0.0627" k3="-0.0081"/>
-+            <vignetting model="pa" focal="58" aperture="11" distance="10" k1="-0.2473" k2="0.1722" k3="-0.0667"/>
-+            <vignetting model="pa" focal="58" aperture="11" distance="1000" k1="-0.2473" k2="0.1722" k3="-0.0667"/>
-+            <vignetting model="pa" focal="58" aperture="16" distance="10" k1="-0.3149" k2="0.2956" k3="-0.1347"/>
-+            <vignetting model="pa" focal="58" aperture="16" distance="1000" k1="-0.3149" k2="0.2956" k3="-0.1347"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>MTO</maker>
-+        <model>MTO-500 500mm f/8 mirror lens</model>
-+        <mount>M39/1</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Fujifilm X-M1 -->
-+            <vignetting model="pa" focal="500" aperture="8" distance="10" k1="-1.0017" k2="1.0513" k3="-0.4818"/>
-+            <vignetting model="pa" focal="500" aperture="8" distance="1000" k1="-1.0017" k2="1.0513" k3="-0.4818"/>
-+        </calibration>
-     </lens>
--
- </lensdatabase>
-diff -Nurpd a/data/db/slr-vivitar.xml b/data/db/slr-vivitar.xml
---- a/data/db/slr-vivitar.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/slr-vivitar.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,48 @@
-+<lensdatabase>
-+    <lens>
-+        <maker>Vivitar</maker>
-+        <model>Vivitar 100mm f/3.5 AF Macro</model>
-+        <mount>Canon EF</mount>
-+        <mount>Sony Alpha</mount>
-+        <mount>Nikon F AF</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony Alpha 55V -->
-+            <distortion model="poly3" focal="100" k1="0.00072"/>
-+            <!-- No measurable TCA -->
-+            <tca model="poly3" focal="100"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- This lens is available in five variants, see
-+             <http://www.robertstech.com/vivitar.htm>.  This web site suggests
-+             that variants 4 and 5 are optically equivalent.  The other
-+             versions must definitely be considered different from each
-+             other. -->
-+        <maker>Vivitar</maker>
-+        <!-- FixMe: "One" should be "1" once
-+             https://sourceforge.net/p/lensfun/bugs/35 is fixed. -->
-+        <model>Vivitar Series One 70-210mm 1:3.5 SN 22...</model>
-+        <model lang="en">Vivitar Series 1 70-210mm 1:3.5 SN 22…</model>
-+        <mount>Nikon F</mount>
-+        <mount>Pentax K</mount>
-+        <mount>Canon FD</mount>
-+        <mount>Canon FL</mount>
-+        <mount>Olympus OM</mount>
-+        <mount>M42</mount>
-+        <focal min="70" max="210"/>
-+        <aperture min="3.5" max="22"/>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Sony A6000 -->
-+            <distortion model="poly3" focal="70" k1="-0.00183"/>
-+            <distortion model="poly3" focal="85" k1="-0.00025"/>
-+            <distortion model="poly3" focal="210" k1="0.00324"/>
-+            <tca model="poly3" focal="70" vr="1.0001457" vb="0.9998911"/>
-+            <tca model="poly3" focal="85" vr="1.0000626" vb="0.9999076"/>
-+            <tca model="poly3" focal="135" vr="0.9998391" vb="0.9999724"/>
-+            <tca model="poly3" focal="180" vr="0.9995820" vb="1.0000310"/>
-+            <tca model="poly3" focal="210" vr="0.9994685" vb="1.0000417"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>
-diff -Nurpd a/data/db/slr-zeiss.xml b/data/db/slr-zeiss.xml
---- a/data/db/slr-zeiss.xml	1970-01-01 01:00:00.000000000 +0100
-+++ b/data/db/slr-zeiss.xml	2016-11-22 08:44:09.000000000 +0100
-@@ -0,0 +1,55 @@
-+<lensdatabase>
-+    <lens>
-+        <!-- Also update copy at "Carl Zeiss Distagon T* 2,8/21 ZE" below. -->
-+        <maker>Zeiss</maker>
-+        <model>Carl Zeiss Distagon T* 2,8/21 ZF.2</model>
-+        <mount>Nikon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D800E -->
-+            <distortion model="ptlens" focal="21" a="0.03083" b="-0.0633" c="0.01093"/>
-+            <tca model="linear" focal="21" kr="1.0001" kb="1.0001"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <!-- Also update copy at "Carl Zeiss Distagon T* 2,8/21 ZF.2" above. -->
-+        <maker>Zeiss</maker>
-+        <model>Carl Zeiss Distagon T* 2,8/21 ZE</model>
-+        <mount>Canon EF</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <distortion model="ptlens" focal="21" a="0.03083" b="-0.0633" c="0.01093"/>
-+            <tca model="linear" focal="21" kr="1.0001" kb="1.0001"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>Carl Zeiss Jena 1Q Biotar 1:2 f=58mm T</model>
-+        <mount>M42</mount>
-+        <cropfactor>1.5</cropfactor>
-+        <calibration>
-+            <!-- Taken with Pentax K20D -->
-+            <distortion model="poly3" focal="58" k1="0.0017"/>
-+            <tca model="poly3" focal="58" vr="0.9999881" vb="0.9999867"/>
-+        </calibration>
-+    </lens>
-+    <lens>
-+        <maker>Zeiss</maker>
-+        <model>Zeiss Distagon T* 25mm f/2.8 ZF.2</model>
-+        <mount>Nokon F AI-S</mount>
-+        <cropfactor>1</cropfactor>
-+        <calibration>
-+            <!-- Taken with Nikon D810 -->
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="10" k1="-2.0722" k2="2.3741" k3="-1.0791"/>
-+            <vignetting model="pa" focal="25" aperture="2.8" distance="1000" k1="-2.0722" k2="2.3741" k3="-1.0791"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="10" k1="-0.4967" k2="-0.4770" k3="0.3717"/>
-+            <vignetting model="pa" focal="25" aperture="4" distance="1000" k1="-0.4967" k2="-0.4770" k3="0.3717"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="10" k1="-0.6803" k2="0.4196" k3="-0.1860"/>
-+            <vignetting model="pa" focal="25" aperture="5.6" distance="1000" k1="-0.6803" k2="0.4196" k3="-0.1860"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="10" k1="-0.6634" k2="0.3401" k3="-0.1020"/>
-+            <vignetting model="pa" focal="25" aperture="8" distance="1000" k1="-0.6634" k2="0.3401" k3="-0.1020"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="10" k1="-0.6497" k2="0.2995" k3="-0.0740"/>
-+            <vignetting model="pa" focal="25" aperture="22" distance="1000" k1="-0.6497" k2="0.2995" k3="-0.0740"/>
-+        </calibration>
-+    </lens>
-+</lensdatabase>