Commit b41ad7bf authored by Jose Tiago Macara Coutinho's avatar Jose Tiago Macara Coutinho Committed by blissadm_ID31@bibhelm
Browse files

SPEC config: support non SCPI keithleys

parent 401c3ad7
......@@ -176,7 +176,7 @@ SPEC_MULTIM_TEMPLATE = """\
##########################
# Multim counter: {name}
#########################
multimsetup {name} type={type} integrate={integrate} scale={scale}
multimsetup {name} type={type} trigger={trigger} integrate={integrate} scale={scale}
"""
class WagoSetup:
......@@ -753,13 +753,17 @@ class Generator(object):
pad = config.get('gpib_pad')
scale = config.get('scale', 1E12)
integ = config.get('integrate', True)
trigger = config.get('trigger', True)
ktype = config.get('spec_type', 'kgpib')
counter = Counter(ctrl='NONE', unit=gpib_unit, chan=pad,
mne=name, name=name)
self.spec_config.addCounter(counter)
self.__spec_macros.add('multim.mac')
integ_str = 'yes' if integ else 'no'
keithley_setup = SPEC_MULTIM_TEMPLATE.format(name=name, type='kscpi',
trig_str = 'yes' if trigger else 'no'
keithley_setup = SPEC_MULTIM_TEMPLATE.format(name=name, type=ktype,
integrate=integ_str,
trigger=trig_str,
scale=scale)
self.__spec_setup.append(keithley_setup)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment