From cd3d702f32d6c6a05b12c24cc53dd55ddb8d857c Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 8 Feb 2018 17:12:00 +0100 Subject: [PATCH] Closedown --- script/keithley.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/script/keithley.py b/script/keithley.py index 80a161b0..53d397ee 100644 --- a/script/keithley.py +++ b/script/keithley.py @@ -1,8 +1,9 @@ import ch.psi.pshell.epics as epics class Keithley(object): - def __init__(self, basename): - self.basename = basename + def __init__(self, base_name, base_channel): + self.base_channel = base_channel + self.base_name = base_name self.scanCh = None self.ttypeCh = None self.nplcCh = None @@ -14,15 +15,15 @@ class Keithley(object): self.readoutCh = None def initialize(self): - self.scanCh = epics.ChannelInteger(self.basename + "READSCAN.SCAN") - self.ttypeCh = epics.ChannelInteger(self.basename + "TTYPE") - self.nplcCh = epics.ChannelDouble(self.basename + "NPLC") - self.navgCh = epics.ChannelInteger(self.basename + "NAVG") - self.tottimeCh = epics.ChannelDouble(self.basename + "TOTTIME") - self.doinitCh = epics.ChannelInteger(self.basename + "DOINIT") - self.dotriggerCh = epics.ChannelInteger(self.basename + "DOTRIGGER") - self.dofetchCh = epics.ChannelInteger(self.basename + "DOFETCH") - self.readoutCh = epics.ChannelDouble(self.basename + "READOUT") + self.scanCh = epics.ChannelInteger(self.base_name + "Scan", self.base_channel + "READSCAN.SCAN") + 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") + self.tottimeCh = epics.ChannelDouble(self.base_name + "TotTime", self.base_channel + "TOTTIME") + self.doinitCh = epics.ChannelInteger(self.base_name + "DoInit", self.base_channel + "DOINIT") + self.dotriggerCh = epics.ChannelInteger(self.base_name + "DoTrigger", self.base_channel + "DOTRIGGER") + self.dofetchCh = epics.ChannelInteger(self.base_name + "DoFetch", self.base_channel + "DOFETCH") + self.readoutCh = epics.ChannelDouble(self.base_name + "Readout", self.base_channel + "READOUT") def prepare(self, dwell): """ @@ -84,8 +85,8 @@ class Keithley(object): self.scanCh.putq(9) self.ttypeCh.putq(0) -KeiSample = Keithley("X03DA-KEITHLEY-1:") -KeiReference = Keithley("X03DA-KEITHLEY-2:") +KeiSample = Keithley("SampleKeithley", "X03DA-KEITHLEY-1:") +KeiReference = Keithley("ReferenceKeithley", "X03DA-KEITHLEY-2:") KeiSample.initialize() KeiReference.initialize()