params pw,showPlot,tsamp

Author: markgarnold

nintan/pacq.py

@@ -12,6 +12,19 @@
 import time
 import threading
 import socket
+import matplotlib.pyplot as plt
+
+try:
+    showPlot = concore.params['plot']
+except:
+    showPlot = False
+
+try:
+    tsamp = concore.params['tsamp']
+    if tsamp > 1:
+       tsamp = 1
+except:
+    tsamp = 1 
 
 def extract(amplifierData):
     s = 0.0
@@ -39,9 +52,9 @@ def readUint16(array, arrayIndex):
     return variable, arrayIndex
 
 def acq():
-    # Run controller for 1 second
+    # Run controller for tsamp second
     scommand.sendall(b'set runmode run')
-    time.sleep(1)
+    time.sleep(tsamp)
     scommand.sendall(b'set runmode stop')
 
     # Read waveform data
@@ -152,13 +165,20 @@ def acq():
         ym = concore.read(1,"ym",init_simtime_ym)
     acq_thread.join()
     acq_thread = nxtacq_thread
+    oldAmpT = amplifierTimestamps
     oldAmpD = amplifierData
     amplifierTimestamps = []
     amplifierData = []
     acq_thread.start()
     nxtacq_thread = threading.Thread(target=acq, daemon=True)
     ym[0] = extract(oldAmpD)
-    print("ym="+str(ym[0]));
+    print("ym="+str(ym[0]))
+    if showPlot:
+        plt.plot(oldAmpT,oldAmpD)
+        plt.title("ym="+str(ym[0]))
+        plt.xlabel('Time (s)')
+        plt.ylabel('Voltage (uV)')
+        plt.show()
     concore.write(1,"ym",ym)
 acq_thread.join()
 print("retry="+str(concore.retrycount))

nintan/pstim.py

@@ -10,7 +10,11 @@
 
 global uglobal
 uglobal = 0.5
-PULSE_WIDTH = 10
+
+try:
+  PULSE_WIDTH = concore.params['pw']
+except:
+  PULSE_WIDTH = 10
 
 def pwm():
     while(True):
@@ -20,15 +24,15 @@ def pwm():
         if ulocal > 1.0:
             ulocal = 1.0
 
-        print("+")
+        if PULSE_WIDTH >= 2:
+            print("+")
         writer.write_one_sample_one_line(data=1,timeout=10)
         time.sleep(PULSE_WIDTH*ulocal)
-        # accurate_delay(PULSE_WIDTH*ulocal)
 
-        print("-")
+        if PULSE_WIDTH >= 2:
+            print("-")
         writer.write_one_sample_one_line(data=0,timeout=10)
         time.sleep(PULSE_WIDTH*(1.0-ulocal))
-        # accurate_delay(PULSE_WIDTH*(1.0-ulocal))
 
 pwm_thread = threading.Thread(target=pwm, daemon=True)
 

nintan/pstim0.py

@@ -5,7 +5,10 @@
 
 global uglobal
 uglobal = 0.5
-PULSE_WIDTH = 10
+try:
+  PULSE_WIDTH = concore.params['pw']
+except:
+  PULSE_WIDTH = 10
 
 def pwm():
     while(True):