Multipatch dev #23

JFPerkins · 2017-01-17T18:43:35Z

0MQ interactions with MIES

Polling for test pulse data.
Live updating for test pulses.
No more need for any ActiveX.
JSON formatting for pipette history.

fixes #1

Correct address string. Default params to empty list. Return values with "result" key instead of "return".

Setting pipette pressure modes no longer clicks button

MIES subclasses QObject to allow Timers and signaling. Stubs for processUpdate and resetData.

campagnola · 2017-01-18T17:49:10Z

@JFPerkins, is this ready for review?

campagnola

This looks awesome!

campagnola · 2017-01-18T00:39:30Z

acq4/util/mies.py

+
+
+def __reload__(old):
+    MIES._bridge = old['MIESBridge']._bridge


should be MIES._bridge = old['MIES']._bridge

campagnola · 2017-01-18T00:54:39Z

acq4/util/igorpro.py

+        self._pollTimer.timeout.connect(self._checkRecv)
+        self._pollTimer.start(100)
+
+    def __call__(self, cmd, *args, **kwds):


Should we do something with kwds ?

So my intention with kwds was to utilize them to handle the optional arguments if that ever gets supported on the Igor side (it currently isn't). For now they are ignored, but other options would be to remove them or to raise an error on them. Thoughts?

Let's just remove it for now.

campagnola · 2017-01-18T01:08:46Z

acq4/util/igorpro.py

+        return future
+
+    def _checkRecv(self):
+        socks = self._poller.poll(100)


Can we do poll(0) here? It would be better to avoid blocking the event loop.

Alternatively, I think we could set the receive timeout to 0 and ditch the poller altogether?

I'll test with receive timeout set to 0 and if that looks like it is still functional we'll go with that, since I don't really like having the poller either.

campagnola · 2017-01-18T01:17:53Z

acq4/util/igorpro.py

+            messageID = reply.get("messageID", None)
+            reply = self.parseReply(reply)
+            future = self._unresolvedFutures.pop(messageID, None)
+            if future:


When would we expect not future ? Is it safe to just discard such messages?

campagnola · 2017-01-18T01:20:42Z

acq4/util/igorpro.py

+            reply = self.parseReply(reply)
+            future = self._unresolvedFutures.pop(messageID, None)
+            if future:
+                future.set_result(reply)


I think there should also be a future.set_exception somewhere in here..

campagnola · 2017-01-18T21:27:08Z

acq4/util/mies.py

+        return self.setCtrl("setvar_DataAcq_SSPressure", pressure)
+
+    def setApproach(self, hs):
+        windowName = '"{}"'.format(self.windowName)


Why are you adding quotes here? This seems to be causing an error in mies:

Assertion FAILED in function IsControlDisabled(...) MIES_GuiUtilities.ipf:862. Message: Non-existing control or window "ITC1600_Dev_0"

campagnola · 2017-01-18T21:47:09Z

acq4/util/mies.py

+
+    def quit(self):
+        self._exiting = True
+        if self._future:


This line causes AttributeError: 'MIES' object has no attribute '_future'

campagnola · 2017-01-18T23:40:41Z

acq4/util/mies.py

+
+    def setSeal(self):
+        windowName = '"{}"'.format(self.windowName)
+        return self.igor("P_MethodSeal", windowName, hs)


NameError: global name 'hs' is not defined

campagnola · 2017-01-25T22:26:52Z

Got an error:

TypeError: 'NoneType' object has no attribute '__getitem__'
  File "acq4\util\igorpro.py", line 250, in _checkRecv
    reply = self.parseReply(reply)
  File "acq4\util\igorpro.py", line 284, in parseReply
    return self.parseWave(val)
  File "acq4\util\igorpro.py", line 289, in parseWave
    dtype = self._types.get(jsonWave["type"], np.float)

campagnola · 2017-01-25T22:52:52Z

Lingering issues:

Seal button seems to have no effect
Plots are too crowded due to plot labels

campagnola · 2017-01-31T23:22:33Z

In the multipatch log file, event times are being stored as string rather than float.

campagnola · 2017-02-10T20:19:02Z

FYI: We are waiting on a MIES communication bugfix; hopefully will test this soon.

Meanwhile, I noticed changes to NIDAQmx_headers_win32.cache that should not be included (it's a big / automatically generated file). Can you rebase with those changes filtered out?

JFPerkins · 2017-02-10T22:10:33Z

Yeah looks like that was accidentally committed back in October, will fix.

JFPerkins · 2017-02-10T23:07:59Z

Looks like you had merged some changes in after that file was tracked, so the rebase was a little bit messy. I continued by accepting the changes on your merges compared to head but now it looks like there are conflicts.

campagnola · 2017-02-10T23:10:13Z

HRM. I'll have a peek.

campagnola · 2017-02-10T23:18:05Z

If you use rebase, don't change the base branch--we don't actually need to rebase on top of the latest multipatch, just rewrite the history without the file in question. It might be easier to use filter-branch; see https://help.github.com/articles/removing-sensitive-data-from-a-repository/

…multipatch-dev Fix issues with new Scientifica hardware

Record event time in event history so it is preserved. Use json formatting on each line for easier parsing. Record target changes. Record surface depth changes.

Add comma to end of each logged event for easy json loading. Grab initial pipette states. Grab initial microscope surface depth.

Event time is recorded as a float. Removed titles from test pulse plots to free up space. Catch situation where wave is returned as null.

scseeman · 2017-02-23T00:55:00Z

Hey Jed, tested out this PR today with 64-bit Igor. The only major problem I had was an error that was generated when ACQ4 would prompt MIES to interact with the MCCs
TypeError:'NoneType' object has no attribute 'getitem'
File "acq4\util\mies.py", line 65, in processUpdate
data = res[...,0] # dimension hack when return value suddenly changed

JFPerkins · 2017-02-23T05:03:53Z

Looks like this was a problem with a return type of wave but an empty value. Fixed.

scseeman · 2017-02-23T17:18:37Z

That sounds right, it was also occurring when MIES gave the error:
TP Cycle Count is zero...returning null

campagnola · 2017-03-01T18:09:21Z

Tests look good; let's do this!

campagnola · 2017-03-01T18:09:48Z

Thanks Jed!

JFPerkins added 9 commits August 30, 2016 12:58

Method calls to Igor now return result.

4ee0f91

Basic ZMQIgorBridge implemented

71d1fa7

Fix ZMQIgorBridge

f620a65

Correct address string. Default params to empty list. Return values with "result" key instead of "return".

Assemble commands in IgorBridge instead of MiesBridge

5cf03cd

Wave parsing in ZMQIgorBridge

4ab0fc1

MIESBridge using zmq

78e9911

Setting pipette pressure modes no longer clicks button

Change MIESBridge to MIES

52baa9f

MIES subclasses QObject to allow Timers and signaling. Stubs for processUpdate and resetData.

Test app for MIES

7b47434

Fix polling TP values to not block GUI thread

de3928c

campagnola requested changes Jan 18, 2017

View reviewed changes

campagnola reviewed Jan 18, 2017

View reviewed changes

campagnola approved these changes Jan 25, 2017

View reviewed changes

JFPerkins added 7 commits February 10, 2017 16:08

Update TP values in MultiPatch Module

ae158e1

Handle result when calling for TP values when test pulse isn't running

d5849f0

Merge branch 'multipatch' of https://github.com/campagnola/acq4 into …

92339e0

…multipatch-dev Fix issues with new Scientifica hardware

Update to dealer-router for ZMQIgorBridge

5a0dc01

Only update each MIESPipette on new data

0ab6fc6

Get pipette state changes reflected in the Multipatch GUI.

4c478f7

Update recording history

fd50267

Record event time in event history so it is preserved. Use json formatting on each line for easier parsing. Record target changes. Record surface depth changes.

JFPerkins added 8 commits February 10, 2017 16:12

Fix state signaling

09cd8c0

Add comma to end of each logged event for easy json loading. Grab initial pipette states. Grab initial microscope surface depth.

Link x axes of test pulse plots

7cfb061

More efficient use of axis linking. Must autoscale an active plot.

7906af4

Working towards aysnchronous call support in ZMQIgorBridge

9657acd

Resumable polling now functioning

c8cf891

Requested changes for pull request 23.

079e32d

Addressing feedback on pull request

0205bc9

Event time is recorded as a float. Removed titles from test pulse plots to free up space. Catch situation where wave is returned as null.

Fixed setApproach and setSeal by calling non-static MIES functions.

1d32c93

Handle null wave return in processUpdate

460cb16

campagnola merged commit 29eebc3 into aiephys:multipatch Mar 1, 2017

davoudian added a commit to davoudian/acq4 that referenced this pull request Mar 2, 2017

Resolve conflicts raised by Jed's latest PR(aiephys#23)

ed5e7af

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multipatch dev #23

Multipatch dev #23

JFPerkins commented Jan 17, 2017 •

edited by campagnola

Loading

campagnola commented Jan 18, 2017

campagnola left a comment

campagnola Jan 18, 2017

campagnola Jan 18, 2017

JFPerkins Jan 19, 2017

campagnola Jan 19, 2017

campagnola Jan 18, 2017

campagnola Jan 18, 2017

JFPerkins Jan 19, 2017

campagnola Jan 18, 2017

campagnola Jan 18, 2017

campagnola Jan 18, 2017

campagnola Jan 18, 2017

campagnola Jan 18, 2017

campagnola commented Jan 25, 2017

campagnola commented Jan 25, 2017

campagnola commented Jan 31, 2017

campagnola commented Feb 10, 2017

JFPerkins commented Feb 10, 2017

JFPerkins commented Feb 10, 2017

campagnola commented Feb 10, 2017

campagnola commented Feb 10, 2017

scseeman commented Feb 23, 2017

JFPerkins commented Feb 23, 2017

scseeman commented Feb 23, 2017

campagnola commented Mar 1, 2017

campagnola commented Mar 1, 2017



		def __reload__(old):
		MIES._bridge = old['MIESBridge']._bridge

Multipatch dev #23

Multipatch dev #23

Conversation

JFPerkins commented Jan 17, 2017 • edited by campagnola Loading

campagnola commented Jan 18, 2017

campagnola left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

campagnola commented Jan 25, 2017

campagnola commented Jan 25, 2017

campagnola commented Jan 31, 2017

campagnola commented Feb 10, 2017

JFPerkins commented Feb 10, 2017

JFPerkins commented Feb 10, 2017

campagnola commented Feb 10, 2017

campagnola commented Feb 10, 2017

scseeman commented Feb 23, 2017

JFPerkins commented Feb 23, 2017

scseeman commented Feb 23, 2017

campagnola commented Mar 1, 2017

campagnola commented Mar 1, 2017

JFPerkins commented Jan 17, 2017 •

edited by campagnola

Loading