From 3320cdd7ef93d87ce8b542082dc7b37cdd6b4610 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 8 Feb 2018 17:27:30 +0100 Subject: [PATCH] Closedown --- script/keithley.py | 1 + script/local.py | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/script/keithley.py b/script/keithley.py index 8ad4350f..ae3fd9d8 100644 --- a/script/keithley.py +++ b/script/keithley.py @@ -16,6 +16,7 @@ class Keithley(object): def initialize(self): self.scanCh = epics.ChannelInteger(self.base_name + "Scan", self.base_channel + "READSCAN.SCAN") + self.scanCh.initialize() self.ttypeCh = epics.ChannelInteger(self.base_name + "TType", self.base_channel + "TTYPE") self.nplcCh = epics.ChannelDouble(self.base_name + "Nplc", self.base_channel + "NPLC") self.navgCh = epics.ChannelInteger(self.base_name + "Navg", self.base_channel + "NAVG") diff --git a/script/local.py b/script/local.py index 8530eb94..741114aa 100644 --- a/script/local.py +++ b/script/local.py @@ -105,14 +105,16 @@ def prepare_keithleys(dwell): """ KeiSample.prepare(dwell) KeiReference.prepare(dwell) - + pass + def trig_keithleys(): """ trigger keithleys, do not wait. after this, you have to wait for at least the dwell time before reading the value! """ - KeiSample.trig() - KeiReference.trig() + #KeiSample.trig() + #KeiReference.trig() + pass def read_keithleys(): """ @@ -120,16 +122,18 @@ def read_keithleys(): this requires that at least the dwell time has passed since the last trigger. the value can then be read from the SampleCurrent and ReferenceCurrent devices. """ - KeiSample.fetch() - KeiReference.fetch() + #KeiSample.fetch() + #KeiReference.fetch() + pass def release_keithleys(): """ switch keithleys to free run. 0.1 s polling and dwell time """ - KeiSample.release() - KeiReference.release() + #KeiSample.release() + #KeiReference.release() + pass def init_keithley_ca(dwell):