Browse Source

Fix clamp ranges

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8130 ddd99763-3ecb-0310-9145-efcb8ce7c51f
tags/zoom-1.0
jim 12 years ago
parent
commit
398bb38bbd
2 changed files with 18 additions and 18 deletions
  1. +17
    -17
      pc/data/20090722/lightpc.dat
  2. +1
    -1
      pc/data/20090722/makeplotdata.m

+ 17
- 17
pc/data/20090722/lightpc.dat View File

@@ -10,7 +10,7 @@
9.00000000e+00 -1.08881412e+00 0.00000000e+00
1.00000000e+01 -1.22764672e+00 0.00000000e+00
1.10000000e+01 -1.34028448e+00 0.00000000e+00
1.20000000e+01 -1.45554173e+00 1.00000000e+00
1.20000000e+01 -1.45554173e+00 0.00000000e+00
1.30000000e+01 -1.62651370e+00 0.00000000e+00
1.40000000e+01 -1.73915147e+00 0.00000000e+00
1.50000000e+01 -1.86750613e+00 0.00000000e+00
@@ -33,7 +33,7 @@
3.20000000e+01 -5.20151272e+00 0.00000000e+00
3.30000000e+01 -5.48965583e+00 0.00000000e+00
3.40000000e+01 -5.78827688e+00 0.00000000e+00
3.50000000e+01 -6.03974724e+00 1.00000000e+00
3.50000000e+01 -6.03974724e+00 0.00000000e+00
3.60000000e+01 -6.26732366e+00 0.00000000e+00
3.70000000e+01 -6.29613798e+00 0.00000000e+00
3.80000000e+01 -6.31971332e+00 0.00000000e+00
@@ -41,7 +41,7 @@
4.00000000e+01 -6.24112884e+00 0.00000000e+00
4.10000000e+01 -6.08395986e+00 0.00000000e+00
4.20000000e+01 -5.82201157e+00 0.00000000e+00
4.30000000e+01 -5.25620327e+00 1.00000000e+00
4.30000000e+01 -5.25620327e+00 0.00000000e+00
4.40000000e+01 -4.00517728e+00 0.00000000e+00
4.50000000e+01 -2.86308274e+00 1.00000000e+00
4.60000000e+01 -2.73713494e+00 0.00000000e+00
@@ -61,7 +61,7 @@
6.00000000e+01 -1.25712711e+00 0.00000000e+00
6.10000000e+01 -1.10519711e+00 0.00000000e+00
6.20000000e+01 -9.48028133e-01 0.00000000e+00
6.30000000e+01 -8.11815023e-01 1.00000000e+00
6.30000000e+01 -8.11815023e-01 0.00000000e+00
6.40000000e+01 -6.35899523e-01 0.00000000e+00
6.50000000e+01 -4.78730550e-01 0.00000000e+00
6.60000000e+01 -3.26800543e-01 0.00000000e+00
@@ -75,7 +75,7 @@
7.40000000e+01 8.75542100e-01 0.00000000e+00
7.50000000e+01 1.01175521e+00 0.00000000e+00
7.60000000e+01 1.16630470e+00 0.00000000e+00
7.70000000e+01 1.28942040e+00 1.00000000e+00
7.70000000e+01 1.28942040e+00 0.00000000e+00
7.80000000e+01 1.43591094e+00 0.00000000e+00
7.90000000e+01 1.55378767e+00 0.00000000e+00
8.00000000e+01 1.67428389e+00 0.00000000e+00
@@ -93,12 +93,12 @@
9.20000000e+01 2.84781222e+00 0.00000000e+00
9.30000000e+01 2.89234343e+00 0.00000000e+00
9.40000000e+01 2.95521102e+00 0.00000000e+00
9.50000000e+01 3.52625828e+00 1.00000000e+00
9.50000000e+01 3.52625828e+00 0.00000000e+00
9.60000000e+01 4.24036888e+00 0.00000000e+00
9.70000000e+01 4.60185751e+00 0.00000000e+00
9.80000000e+01 4.93191236e+00 0.00000000e+00
9.90000000e+01 5.29863996e+00 0.00000000e+00
1.00000000e+02 5.62345584e+00 1.00000000e+00
1.00000000e+02 5.62345584e+00 0.00000000e+00
1.01000000e+02 5.93643127e+00 0.00000000e+00
1.02000000e+02 6.12241456e+00 0.00000000e+00
1.03000000e+02 6.28220301e+00 0.00000000e+00
@@ -121,7 +121,7 @@
1.20000000e+02 2.10086370e+00 0.00000000e+00
1.21000000e+02 1.98298697e+00 0.00000000e+00
1.22000000e+02 1.86511024e+00 0.00000000e+00
1.23000000e+02 1.74985299e+00 1.00000000e+00
1.23000000e+02 1.74985299e+00 0.00000000e+00
1.24000000e+02 1.61687339e+00 0.00000000e+00
1.25000000e+02 1.50423563e+00 0.00000000e+00
1.26000000e+02 1.36540303e+00 0.00000000e+00
@@ -135,7 +135,7 @@
1.34000000e+02 1.42104528e-01 0.00000000e+00
1.35000000e+02 -2.29228935e-02 0.00000000e+00
1.36000000e+02 -1.64374969e-01 0.00000000e+00
1.37000000e+02 -3.24163425e-01 1.00000000e+00
1.37000000e+02 -3.24163425e-01 0.00000000e+00
1.38000000e+02 -5.12290010e-01 0.00000000e+00
1.39000000e+02 -6.27547257e-01 0.00000000e+00
1.40000000e+02 -7.61140884e-01 0.00000000e+00
@@ -151,7 +151,7 @@
1.50000000e+02 -2.04992646e+00 0.00000000e+00
1.51000000e+02 -2.15470578e+00 0.00000000e+00
1.52000000e+02 -2.27258251e+00 0.00000000e+00
1.53000000e+02 -2.36688389e+00 1.00000000e+00
1.53000000e+02 -2.36688389e+00 0.00000000e+00
1.54000000e+02 -2.49856362e+00 0.00000000e+00
1.55000000e+02 -2.53523639e+00 0.00000000e+00
1.56000000e+02 -2.61644035e+00 0.00000000e+00
@@ -161,7 +161,7 @@
1.60000000e+02 -2.87053019e+00 0.00000000e+00
1.61000000e+02 -3.07746934e+00 0.00000000e+00
1.62000000e+02 -3.77949075e+00 0.00000000e+00
1.63000000e+02 -4.42126406e+00 1.00000000e+00
1.63000000e+02 -4.42126406e+00 0.00000000e+00
1.64000000e+02 -4.81386791e+00 0.00000000e+00
1.65000000e+02 -5.07581620e+00 0.00000000e+00
1.66000000e+02 -5.37967621e+00 0.00000000e+00
@@ -194,7 +194,7 @@
1.93000000e+02 -1.30514438e+00 0.00000000e+00
1.94000000e+02 -1.15845334e+00 0.00000000e+00
1.95000000e+02 -1.00390385e+00 0.00000000e+00
1.96000000e+02 -8.62451775e-01 1.00000000e+00
1.96000000e+02 -8.62451775e-01 0.00000000e+00
1.97000000e+02 -6.97427741e-01 0.00000000e+00
1.98000000e+02 -5.55975666e-01 0.00000000e+00
1.99000000e+02 -3.83089796e-01 0.00000000e+00
@@ -208,7 +208,7 @@
2.07000000e+02 8.32350261e-01 0.00000000e+00
2.08000000e+02 9.55465957e-01 0.00000000e+00
2.09000000e+02 1.11001545e+00 0.00000000e+00
2.10000000e+02 1.24360907e+00 1.00000000e+00
2.10000000e+02 1.24360907e+00 0.00000000e+00
2.11000000e+02 1.38267446e+00 0.00000000e+00
2.12000000e+02 1.50055119e+00 0.00000000e+00
2.13000000e+02 1.62890585e+00 0.00000000e+00
@@ -226,12 +226,12 @@
2.25000000e+02 2.82862901e+00 0.00000000e+00
2.26000000e+02 2.86530177e+00 0.00000000e+00
2.27000000e+02 2.90983298e+00 0.00000000e+00
2.28000000e+02 3.27394110e+00 1.00000000e+00
2.28000000e+02 3.27394110e+00 0.00000000e+00
2.29000000e+02 4.01320302e+00 0.00000000e+00
2.30000000e+02 4.50828529e+00 0.00000000e+00
2.31000000e+02 4.83310116e+00 0.00000000e+00
2.32000000e+02 5.16839497e+00 0.00000000e+00
2.33000000e+02 5.52464464e+00 1.00000000e+00
2.33000000e+02 5.52464464e+00 0.00000000e+00
2.34000000e+02 5.82574352e+00 0.00000000e+00
2.35000000e+02 6.04316060e+00 0.00000000e+00
2.36000000e+02 6.21866595e+00 0.00000000e+00
@@ -249,7 +249,7 @@
2.48000000e+02 2.61337541e+00 0.00000000e+00
2.49000000e+02 2.51121558e+00 0.00000000e+00
2.50000000e+02 2.41691420e+00 0.00000000e+00
2.51000000e+02 2.30427643e+00 1.00000000e+00
2.51000000e+02 2.30427643e+00 0.00000000e+00
2.52000000e+02 2.19967786e+00 0.00000000e+00
2.53000000e+02 2.12895182e+00 0.00000000e+00
2.54000000e+02 2.02155302e+00 0.00000000e+00
@@ -265,7 +265,7 @@
2.64000000e+02 7.09192096e-01 0.00000000e+00
2.65000000e+02 5.44164674e-01 0.00000000e+00
2.66000000e+02 3.66039838e-01 0.00000000e+00
2.67000000e+02 2.06251383e-01 1.00000000e+00
2.67000000e+02 2.06251383e-01 0.00000000e+00
2.68000000e+02 1.18814093e-02 0.00000000e+00
2.69000000e+02 -1.13853769e-01 0.00000000e+00
2.70000000e+02 -2.76261708e-01 0.00000000e+00

+ 1
- 1
pc/data/20090722/makeplotdata.m View File

@@ -15,7 +15,7 @@ dc = mean(dac(t)-calib*adc(t));

% extract the part for the light and pc
t=1080020:1080290;
out = [t' - t(1), (dac(t) - calib*adc(t) - dc)/calib*scale, (adc(t) < 512 | adc(t) > 1536)];
out = [t' - t(1), (dac(t) - calib*adc(t) - dc)/calib*scale, (adc(t) < 400 | adc(t) > 1650)];
save("-ascii","lightpc.dat","out");

% light only


Loading…
Cancel
Save