cvphase.py

@@ -46,7 +46,6 @@ tek.verbosity = verbosity
 while fmin + fres < fmax:
     f = (fmin + fmax)/2
     pulser.cmd(f"FREQ {f:.1f}")
-    tek.cmd("ACQ:NUMAVG 1")
     tek.cmd("ACQ:NUMAVG 512")
     t = time.time() + t_settle
     phi = tek.cmd(f":MEASU:MEAS{i_phi}:VAL?")[1]

tarena.py

@@ -13,8 +13,6 @@ arena._connect(ifc)
 if ifc.is_a("USB"):
     findarena()
 
-lasc.lasc_init(ifc)
-
 def enable(what="usb/f3/hk"):
     Cmd("altera/fifo/set 8")
     Cmd("altera/fifo/reset 0x080")
@@ -130,29 +128,29 @@ lasc.LA.update({a: 1<<i for i,a in enumerate(LAch)})
 
 def IPLOT(lasc=None):
     if not lasc:
-        lasc = (lasc.LAread(),)
-    lasc.LASCplot(*lasc, what=LAch)
+        lasc = (LAread(),)
+    LASCplot(*lasc, what=LAch)
 
 LAdata=None
 
 def taLAsingle(trig="RD"):
     if trig[0]=='~' or trig[0]=='!':
-        lasc.LASCsingle(trig[1:], edge=False)
+        LASCsingle(trig[1:], edge=False)
     else:
-        lasc.LASCsingle(trig)
+        LASCsingle(trig)
 
 def taLAread():
     global LAdata
-    LAdata = lasc.LAread()
+    LAdata = LAread()
     return LAdata
 
 def taLAplot(d=None, what=LAch):
     if not d:
         d = LAdata
-    lasc.LASCplot(d, None, what=what)
+    LASCplot(d, None, what=what)
 
 def taLAprint(fn="la.ps", what=LAch):
-    lasc.LASCplot(LAdata, None, what=what, term="""
+    LASCplot(LAdata, None, what=what, term="""
 set term post enhanced solid color
 set out "%s"
 """ % fn)