linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tnmr' of https://gitea.psi.ch/linse/frappy into tnmr

Browse Source
This commit is contained in:
last_d
2025-07-21 17:10:53 +02:00
parent 7adf4bf452 00e662a27f
commit 2194085e8e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frappy_psi/network_analysers/ZVL/ZVLDriver.py
View File

@@ -39,9 +39,14 @@ class ZVLNetAnalyzer():
self.instrument.write(":CALC:PAR:MEAS 'Trc1', 'S11'") self.instrument.write(":CALC:PAR:MEAS 'Trc1', 'S11'")
self.instrument.write('CALC:FORM MLOG') self.instrument.write('CALC:FORM MLOG')
self.instrument.write('INIT:CONT OFF') self.instrument.write('INIT:CONT OFF')
self.instrument.write("SYST:USER:DISP:TITL 'Frappy connection'")
#self.instrument.write('INIT:SCOP OFF') #self.instrument.write('INIT:SCOP OFF')
#self.instrument.write('DISPlay:WINDow2:STATe ON') #self.instrument.write('DISPlay:WINDow2:STATe ON')
def load_calibration(self, f):
self.instrument.write(f":MMEMORY:STORE:CORR 1, 'OSM1 {f}'") # put calibration in pool
self.instrument.write(f":MMEMORY:LOAD:CORR 1, 'OSM1 {f}'") # load from pool
def set_freq_range(self, start, stop): def set_freq_range(self, start, stop):
'''In Hz''' '''In Hz'''
self.instrument.write(f'SENS1:FREQ:STAR {start}') self.instrument.write(f'SENS1:FREQ:STAR {start}')

8
frappy_psi/network_analysers/ZVL/ZVLNode.py
View File

@@ -26,6 +26,7 @@ class ZVLNode(fc.Readable):
pollinterval = fc.Parameter(default=1) pollinterval = fc.Parameter(default=1)
central_freq = fc.Parameter('central_freq', fc.FloatRange(min=9_000, max=13_600_000_000, unit='Hz'), default=10_000_000, readonly=False) central_freq = fc.Parameter('central_freq', fc.FloatRange(min=9_000, max=13_600_000_000, unit='Hz'), default=10_000_000, readonly=False)
freq_span = fc.Parameter('freq_span', fc.FloatRange(unit='Hz'), default=1_000_000, readonly=False) freq_span = fc.Parameter('freq_span', fc.FloatRange(unit='Hz'), default=1_000_000, readonly=False)
calibration = fc.Parameter('calibration filename', fc.StringType(), default='None', readonly=False)
analyser_ip = fc.Parameter('analyser_ip', fc.StringType()) analyser_ip = fc.Parameter('analyser_ip', fc.StringType())
@@ -43,7 +44,12 @@ class ZVLNode(fc.Readable):
self.NA.set_freq_span(self.central_freq, self.freq_span) self.NA.set_freq_span(self.central_freq, self.freq_span)
self.value = self.NA.get_data()[1] self.value = self.NA.get_data()[1]
self.status = ('IDLE', 'idle') self.status = ('IDLE', 'idle')
def write_calibration(self, f):
self.calibration = f
self.NA.load_calibration(self.calibration)
return self.read_calibration()
def write_central_freq(self, f): def write_central_freq(self, f):
self.central_freq = (f) self.central_freq = (f)
self.acq() self.acq()