Skip to content

Commit d623c4c

Browse files
committed
validseq return index; check valid t=0; oldAmpD[validindex:]
1 parent d4d13e0 commit d623c4c

1 file changed

Lines changed: 37 additions & 2 deletions

File tree

nintan/pacq.py

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@
2727
tsamp = 1
2828

2929
def validseq(t):
30+
validindex = 0
3031
for i in range(0,len(t)-1):
3132
if t[i] >= t[i+1]:
32-
print('i='+str(i)+': '+str(t[i])+'>='+str(t[i+1]))
33+
print('i='+str(i)+': '+str(t[i])+'>='+str(t[i+1])+' len='+str(len(t)))
34+
validindex = i+1
35+
return validindex
3336

3437
def extract(amplifierData):
3538
s = 0.0
@@ -193,8 +196,40 @@ def acq():
193196
plt.show()
194197
acq_thread.start()
195198
nxtacq_thread = threading.Thread(target=acq, daemon=True)
199+
validindex = validseq(oldAmpT):
200+
if validindex == 0:
201+
if oldAmpT[0] != 0:
202+
print("validseq yet starttime="+str(oldAmpT[0]))
203+
else:
204+
if oldAmpT[validindex] != 0:
205+
print(str(validindex)+" starttime="+str(oldAmpT[validindex]))
206+
if showPlot&4==4:
207+
plt.plot(oldAmpT,oldAmpD)
208+
plt.title("ym="+str(extract(oldAmpD))+" len="+str(len(oldAmpD)))
209+
plt.xlabel('Time (s)')
210+
plt.ylabel('Voltage (uV)')
211+
plt.show()
212+
if showPlot&8==8:
213+
plt.plot(range(0,len(oldAmpD)),oldAmpD)
214+
plt.title("ym="+str(extract(oldAmpD))+" len="+str(len(oldAmpD)))
215+
plt.xlabel('index')
216+
plt.ylabel('Voltage (uV)')
217+
plt.show()
218+
oldAmpT = oldAmpT[validindex:]
219+
oldAmpD = oldAmpD[validindex:]
220+
if showPlot&4==4:
221+
plt.plot(oldAmpT,oldAmpD)
222+
plt.title("ym="+str(extract(oldAmpD))+" len="+str(len(oldAmpD)))
223+
plt.xlabel('Time (s)')
224+
plt.ylabel('Voltage (uV)')
225+
plt.show()
226+
if showPlot&8==8:
227+
plt.plot(range(0,len(oldAmpD)),oldAmpD)
228+
plt.title("ym="+str(extract(oldAmpD))+" len="+str(len(oldAmpD)))
229+
plt.xlabel('index')
230+
plt.ylabel('Voltage (uV)')
231+
plt.show()
196232
ym[0] = extract(oldAmpD)
197-
validseq(oldAmpT)
198233
print("ym="+str(ym[0]))
199234
concore.write(1,"ym",ym)
200235
acq_thread.join()

0 commit comments

Comments
 (0)