From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 4 Jul 2007 23:46:02 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
X-Git-Url: http://dolda2000.com/gitweb/?p=kokare.git;a=commitdiff_plain;h=d776f08c024659d4972e2e22f7374929dc288b99;hp=41fabc21b8fb8b1a3b9bf65fb2d6d91bf4ce7892

Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
---

diff --git a/calibration.octave b/calibration.octave
deleted file mode 100644
index 626b53b..0000000
--- a/calibration.octave
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by Octave 2.1.73, Thu Jun 21 20:32:14 2007 CEST <fredrik@pc7>
-# name: __nargin__
-# type: scalar
-0
-# name: caltemp
-# type: matrix
-# rows: 1
-# columns: 15
- 100 95 90 85 80 75 69 66 61 60 55 50 45 32 21
-# name: t2r
-# type: scalar
-1442695.04088896
-# name: caldel
-# type: matrix
-# rows: 1
-# columns: 15
- 0.0047 0.0056 0.0065 0.0074 0.0091 0.0108 0.013 0.0144 0.0172 0.0178 0.021 0.026 0.031 0.052 0.08
diff --git a/octave/td2m b/octave/td2m
new file mode 100755
index 0000000..f7b949c
--- /dev/null
+++ b/octave/td2m
@@ -0,0 +1,29 @@
+#!/usr/bin/perl -w
+
+while(<>) {
+    if(/^(\d+)\s+([\d.]+)(-([\d.]+))?$/) {
+	if(defined($4)) {
+	    $temp{$1} = ($2 + $4) / 2;
+	} else {
+	    $temp{$1} = $2;
+	}
+    }
+}
+
+print "#name: ct\n";
+print "#type: matrix\n";
+print "#rows: 1\n";
+print ("#columns: " . scalar(keys %temp) . "\n");
+for $k (sort keys %temp) {
+    print " $k";
+}
+print "\n";
+
+print "#name: cd\n";
+print "#type: matrix\n";
+print "#rows: 1\n";
+print ("#columns: " . scalar(keys %temp) . "\n");
+for $k (sort keys %temp) {
+    print " $temp{$k}";
+}
+print "\n";
diff --git a/tempdata b/tempdata
index b11b3c6..6a26e2d 100644
--- a/tempdata
+++ b/tempdata
@@ -1,20 +1,16 @@
 Temp	Delay
 ----------------
-100	4.7
-95	5.4-5.6
-90	6.2-6.5
-85	7.2-7.4
-80	8.8-9.1
-75	10.5-10.8
-69	12.7-13.0
-66	13.9-14.4
-61	16.6-17.2
-60	17.3-17.8
-55	20-21
-50	25-26
-45	<=30-31
-32	52
-21	80
+100	4.9-5.0
+95	5.6-5.8
+90	6.5-6.7
+85	7.7-7.9
+80	9.1-9.6
+75	10.9-11.2
+70	12.9-13.0
+65	14.9-15.4
+60	17.8-18.4
+53	23
+23	77
 
 Test values:
 A = 0.14732