Add version 0.2 and 0.12 JPK file examples from Michael Haggerty.

Also adjust test/jpk_driver.py to attempt to load each file in the JPK
playlist.  Note that this currently fails for some of the new files
because I haven't fixed the JPK driver yet.

diff --git a/test/data/vclamp_jpk/Data1D/data1D-ConstantData1D-1282315524304.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-ConstantData1D-1282315524304.jpk-data1D
new file mode 100644 (file)
index 0000000..0f15ae2
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-ConstantData1D-1282315524304.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/Data1D/data1D-MemoryFloatData1D-1282315524326.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-MemoryFloatData1D-1282315524326.jpk-data1D
new file mode 100644 (file)
index 0000000..32a0f8e
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-MemoryFloatData1D-1282315524326.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/Data1D/data1D-MemoryIntegerData1D-1282315524320.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-MemoryIntegerData1D-1282315524320.jpk-data1D
new file mode 100644 (file)
index 0000000..5d0f226
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-MemoryIntegerData1D-1282315524320.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/Data1D/data1D-MemoryIntegerData1D-1282315524323.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-MemoryIntegerData1D-1282315524323.jpk-data1D
new file mode 100644 (file)
index 0000000..7e50872
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-MemoryIntegerData1D-1282315524323.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/Data1D/data1D-MemoryShortData1D-1282315524313.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-MemoryShortData1D-1282315524313.jpk-data1D
new file mode 100644 (file)
index 0000000..f24909d
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-MemoryShortData1D-1282315524313.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/Data1D/data1D-MemoryShortData1D-1282315524316.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-MemoryShortData1D-1282315524316.jpk-data1D
new file mode 100644 (file)
index 0000000..51ef119
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-MemoryShortData1D-1282315524316.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/Data1D/data1D-RasterData1D-1282315524283.jpk-data1D b/test/data/vclamp_jpk/Data1D/data1D-RasterData1D-1282315524283.jpk-data1D
new file mode 100644 (file)
index 0000000..0427d46
Binary files /dev/null and b/test/data/vclamp_jpk/Data1D/data1D-RasterData1D-1282315524283.jpk-data1D differ

diff --git a/test/data/vclamp_jpk/README b/test/data/vclamp_jpk/README
index f2f624db05a2838c7a3ef9cdf4d901e88401ab45..a4def3c875d0c5067be982e3518848a0bc10497d 100644 (file)
--- a/test/data/vclamp_jpk/README
+++ b/test/data/vclamp_jpk/README
@@ -15,3 +15,13 @@ but can be overridden by an attrubute in the XML playlist,
   <CHANNEL-NAME>_<SOURCE-CONVERSION-NAME>_to_<CONVERSION-NAME>_calibration_file
   height_nominal_to_calibrated_calibration_file="default.cal"
 Relative paths are rooted in the same directory as the curve file.
+
+
+On Fri, Sep 03, 2010 at 02:30:37PM +0200, Michael Haggerty wrote:
+> I have attached a few sample files.  The main directory contains a
+> couple of typical force scan files from the oldest and newest public
+> versions of this file format.  The "Data1D" subdirectory contains files
+> showing the layout of the "data" part of force segments.  Please note
+> that your program *will not* be able to read the Data1D examples because
+> they are fragments that are usually nested in a force file.  They are
+> rather to give you an idea of what the different data types look like.

diff --git a/test/data/vclamp_jpk/force-scan-cycle-contact-AbsoluteZForceSettings-3D-TIPSCANNER-1250682991660.jpk-force b/test/data/vclamp_jpk/force-scan-cycle-contact-AbsoluteZForceSettings-3D-TIPSCANNER-1250682991660.jpk-force
new file mode 100644 (file)
index 0000000..9e98b97
Binary files /dev/null and b/test/data/vclamp_jpk/force-scan-cycle-contact-AbsoluteZForceSettings-3D-TIPSCANNER-1250682991660.jpk-force differ

diff --git a/test/data/vclamp_jpk/force-scan-cycle-contact-AbsoluteZForceSettings-3D-hardwareFeedback-1282223571461.jpk-force b/test/data/vclamp_jpk/force-scan-cycle-contact-AbsoluteZForceSettings-3D-hardwareFeedback-1282223571461.jpk-force
new file mode 100644 (file)
index 0000000..41d9d88
Binary files /dev/null and b/test/data/vclamp_jpk/force-scan-cycle-contact-AbsoluteZForceSettings-3D-hardwareFeedback-1282223571461.jpk-force differ

diff --git a/test/data/vclamp_jpk/force-scan-cycle-contact-RelativeForceSettings-3D-TIPSCANNER-1250682992080.jpk-force b/test/data/vclamp_jpk/force-scan-cycle-contact-RelativeForceSettings-3D-TIPSCANNER-1250682992080.jpk-force
new file mode 100644 (file)
index 0000000..f2d867b
Binary files /dev/null and b/test/data/vclamp_jpk/force-scan-cycle-contact-RelativeForceSettings-3D-TIPSCANNER-1250682992080.jpk-force differ

diff --git a/test/data/vclamp_jpk/force-scan-cycle-contact-RelativeForceSettings-3D-hardwareFeedback-1282223571652.jpk-force b/test/data/vclamp_jpk/force-scan-cycle-contact-RelativeForceSettings-3D-hardwareFeedback-1282223571652.jpk-force
new file mode 100644 (file)
index 0000000..454b663
Binary files /dev/null and b/test/data/vclamp_jpk/force-scan-cycle-contact-RelativeForceSettings-3D-hardwareFeedback-1282223571652.jpk-force differ

diff --git a/test/data/vclamp_jpk/playlist.hkp b/test/data/vclamp_jpk/playlist.hkp
index c35c3447f68f13718daaf3a9419139b971438834..65c44f20b0d64885f68000e8ed4e5d441c2636d7 100644 (file)
--- a/test/data/vclamp_jpk/playlist.hkp
+++ b/test/data/vclamp_jpk/playlist.hkp
@@ -8,3 +8,11 @@ listitems:
   path: 2009.04.23-15.15.47.jpk
 - !!python/object:hooke.curve.Curve
   path: 2009.04.23-15.21.39.jpk
+- !!python/object:hooke.curve.Curve
+  path: force-scan-cycle-contact-AbsoluteZForceSettings-3D-TIPSCANNER-1250682991660.jpk-force
+- !!python/object:hooke.curve.Curve
+  path: force-scan-cycle-contact-AbsoluteZForceSettings-3D-hardwareFeedback-1282223571461.jpk-force
+- !!python/object:hooke.curve.Curve
+  path: force-scan-cycle-contact-RelativeForceSettings-3D-TIPSCANNER-1250682992080.jpk-force
+- !!python/object:hooke.curve.Curve
+  path: force-scan-cycle-contact-RelativeForceSettings-3D-hardwareFeedback-1282223571652.jpk-force

diff --git a/test/jpk_driver.py b/test/jpk_driver.py
index c5e8202e87c2e30e39b9961b48110213e630e3e4..cfc11c9ed319c3145feb34c78b6bb7e075a6fb0b 100644 (file)
--- a/test/jpk_driver.py
+++ b/test/jpk_driver.py
@@ -37,4 +37,9 @@ block names: ['approach', 'retract']
 block sizes: [(4096, 6), (4096, 4)]
 Success
 <BLANKLINE>
+>>> p = h.playlists.current()
+>>> for i,curve in enumerate(p.items()):
+...     print i, [d.info['name'] for d in curve.data]
+... # doctest: +REPORT_UDIFF
+
 """