From 481ef431b3815949975df7585f8781a6d0b1eaf1 Mon Sep 17 00:00:00 2001
From: "Michael D. M. Dryden" <mdryden@chem.utoronto.ca>
Date: Mon, 21 Jul 2014 13:54:34 -0400
Subject: [PATCH] Removed redundant parameters from experiments after CA which
were breaking pickling on Windows.
---
dstatInterface/dstat_comm.py | 25 +++++--------------------
dstatInterface/interface_test.py | 10 +++++-----
2 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/dstatInterface/dstat_comm.py b/dstatInterface/dstat_comm.py
index 4039512..69ceb4c 100644
--- a/dstatInterface/dstat_comm.py
+++ b/dstatInterface/dstat_comm.py
@@ -43,8 +43,6 @@ class Experiment:
self.data_extra = [] #must be defined even when not needed
self.__gaintable = [1e2, 3e2, 3e3, 3e4, 3e5, 3e6, 3e7, 5e8]
self.gain = self.__gaintable[int(self.parameters['gain'])]
- self.updatelimit = self.view_parameters['updatelimit']
- self.update = self.view_parameters['update']
self.commands = ["A","G"]
@@ -109,10 +107,9 @@ class Experiment:
pass
class chronoamp(Experiment):
- def __init__(self, parameters, view_parameters, main_pipe):
+ def __init__(self, parameters, main_pipe):
self.main_pipe = main_pipe
self.parameters = parameters
- self.view_parameters = view_parameters
self.datatype = "linearData"
self.xlabel = "Time (s)"
self.ylabel = "Current (A)"
@@ -143,12 +140,9 @@ class chronoamp(Experiment):
return (scan, [seconds+milliseconds/1000., current*(1.5/self.gain/8388607)])
class lsv_exp(Experiment):
- def __init__(self, parameters, view_parameters, plot_instance, databuffer_instance, send_pipe):
+ def __init__(self, parameters, send_pipe):
self.main_pipe = send_pipe
self.parameters = parameters
- self.view_parameters = view_parameters
- self.plot = plot_instance
- self.databuffer = databuffer_instance
self.datatype = "linearData"
self.xlabel = "Voltage (mV)"
@@ -178,12 +172,9 @@ class lsv_exp(Experiment):
self.commands[2] += " "
class cv_exp(Experiment):
- def __init__(self, parameters, view_parameters, plot_instance, databuffer_instance, main_pipe):
+ def __init__(self, parameters, main_pipe):
self.main_pipe = main_pipe
self.parameters = parameters
- self.view_parameters = view_parameters
- self.plot = plot_instance
- self.databuffer = databuffer_instance
self.datatype = "CVData"
self.xlabel = "Voltage (mV)"
@@ -222,12 +213,9 @@ class cv_exp(Experiment):
return (scan, [(voltage-32768)*3000./65536, current*(1.5/self.gain/8388607)])
class swv_exp(Experiment):
- def __init__(self, parameters, view_parameters, plot_instance, databuffer_instance, main_pipe):
+ def __init__(self, parameters, main_pipe):
self.main_pipe = main_pipe
self.parameters = parameters
- self.view_parameters = view_parameters
- self.plot = plot_instance
- self.databuffer = databuffer_instance
self.datatype = "SWVData"
self.xlabel = "Voltage (mV)"
@@ -271,12 +259,9 @@ class swv_exp(Experiment):
class dpv_exp(swv_exp):
- def __init__(self, parameters, view_parameters, plot_instance, databuffer_instance, main_pipe):
+ def __init__(self, parameters, main_pipe):
self.main_pipe = main_pipe
self.parameters = parameters
- self.view_parameters = view_parameters
- self.plot = plot_instance
- self.databuffer = databuffer_instance
self.datatype = "SWVData"
self.xlabel = "Voltage (mV)"
diff --git a/dstatInterface/interface_test.py b/dstatInterface/interface_test.py
index 0b14318..4907636 100644
--- a/dstatInterface/interface_test.py
+++ b/dstatInterface/interface_test.py
@@ -228,7 +228,7 @@ class main:
raise InputError(parameters['potential'],"Step table is empty")
self.recv_p, self.send_p = multiprocessing.Pipe(duplex=True)
- self.current_exp = comm.chronoamp(parameters, view_parameters, self.send_p)
+ self.current_exp = comm.chronoamp(parameters, self.send_p)
self.plot.clearall()
self.plot.changetype(self.current_exp)
@@ -273,7 +273,7 @@ class main:
raise InputError(parameters['start'],"Start cannot equal Stop.")
self.recv_p, self.send_p = multiprocessing.Pipe(duplex=True)
- self.current_exp = comm.lsv_exp(parameters, view_parameters, self.plot, self.rawbuffer, self.send_p)
+ self.current_exp = comm.lsv_exp(parameters, self.send_p)
self.plot.clearall()
self.plot.changetype(self.current_exp)
@@ -324,7 +324,7 @@ class main:
raise InputError(parameters['v1'],"Vertex 1 cannot equal Vertex 2.")
self.recv_p, self.send_p = multiprocessing.Pipe(duplex=True)
- self.current_exp = comm.cv_exp(parameters, view_parameters, self.plot, self.rawbuffer, self.send_p)
+ self.current_exp = comm.cv_exp(parameters, self.send_p)
self.plot.clearall()
self.plot.changetype(self.current_exp)
@@ -382,7 +382,7 @@ class main:
raise InputError(parameters['start'],"Start cannot equal Stop.")
self.recv_p, self.send_p = multiprocessing.Pipe(duplex=True)
- self.current_exp = comm.swv_exp(parameters, view_parameters, self.plot, self.rawbuffer, self.send_p)
+ self.current_exp = comm.swv_exp(parameters, self.send_p)
self.plot.clearall()
self.plot.changetype(self.current_exp)
@@ -438,7 +438,7 @@ class main:
raise InputError(parameters['start'],"Start cannot equal Stop.")
self.recv_p, self.send_p = multiprocessing.Pipe(duplex=True)
- self.current_exp = comm.dpv_exp(parameters, view_parameters, self.plot, self.rawbuffer, self.send_p)
+ self.current_exp = comm.dpv_exp(parameters, self.send_p)
self.plot.clearall()
self.plot.changetype(self.current_exp)
--
GitLab