use the leftover bits after rounding to reduce errors (29bad/920good)

happycube · happycube · commit a1585d5339bc · 2015-05-22T20:22:24.000-07:00
diff --git a/chopin8.py b/chopin8.py
@@ -29,7 +29,7 @@
 dc = data.mean()
 data -= dc
 
-# without filter: 340 errors
+# without filter: 340 errors, 303bad/449good if DP
 
 # 91 errors
 bandpass = sps.firwin(97, [.08/NYQUIST_MHZ, 1.20/NYQUIST_MHZ], pass_zero=False)
@@ -41,10 +41,13 @@
 bandpass = sps.firwin(97, [.100/NYQUIST_MHZ, 1.50/NYQUIST_MHZ], pass_zero=False)
 # 44 (double precision)
 bandpass = sps.firwin(91, [.100/NYQUIST_MHZ, 1.50/NYQUIST_MHZ], pass_zero=False)
-# 40 (double precision)
-bandpass = sps.firwin(91, [.095/NYQUIST_MHZ, 1.70/NYQUIST_MHZ], pass_zero=False)
+# 40 (double precision)/ 842 good
+bandpass = sps.firwin(91, [.095/NYQUIST_MHZ, 1.72/NYQUIST_MHZ], pass_zero=False)
 data = sps.lfilter(bandpass, 1.0, data)
 
+#bandpassb, bandpassa = sps.butter(4, [0.20/NYQUIST_MHZ, 1.7/NYQUIST_MHZ], btype='bandpass')
+#data = sps.lfilter(bandpassb, bandpassa, data)
+
 # filter to binary signal
 data = (data > 0.0)
 
@@ -115,6 +118,9 @@
     print "writing file ..."
 
     with open("chopin8-bits.txt", "w") as f:
+        leftover = 0
         for (value, duration) in zip(runValues, runDurations):
-            duration = int(round(duration)) # to integer
-            f.write(str(value) * duration)
+            durationr = int(round(duration + (leftover * .111))) # to integer
+            leftover = duration - durationr
+
+            f.write(str(value) * durationr)
diff --git a/laser2wav.py b/laser2wav.py
@@ -218,6 +218,7 @@ def main():
         z = delta_signal.find("100000000001000000000010", z)
         if z<0: break
         frame = delta_signal[z:z+588]
+        z = z + 588
         if len(frame)==588:
             try:
                     (control, data) = analyze_frame(frame)
@@ -226,7 +227,6 @@ def main():
 	            print("good")	
             except KeyError:
 	            print("argh")	
-        z = z + 588
 
     analyze_control_stream(control_stream)
 
