Stephan/irena-arm
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Stephan:36c011d26e291eef13c17a4d5ca4d7c3c948d57e
Branches Tags
Stephan:master
Stephan:dlrena
..
compare: Stephan:53c8767dea726506219a6a93d7e409fbfbd174fe
Branches Tags
Stephan:master
Stephan:dlrena

No commits in common. "36c011d26e291eef13c17a4d5ca4d7c3c948d57e" and "53c8767dea726506219a6a93d7e409fbfbd174fe" have entirely different histories.
36c011d26e ... 53c8767dea

2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cvphase.py
View file

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

16
tarena.py
View file

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