Lightsource/LED monitoring and reporting

davereid98133 commented 7 years ago

Should be a clean commit with the necessary changes...

davereid98133 commented 7 years ago

Luke...I've made the recommended changes, but have run into something I'm not sure how to best address. I'm updating the frameInfo[lightSourceState] every time the DAQ input changes, but the portion of the Camera.py that updates the info[frameInfo] only appears to be called when camera is first turned on. I get the lightSourceState correctly, but if the DAQ changes with the camera running, I don't pick up that change. Is there another place the info[frameInfo] gets updated? Or should I be looking for the method that gets called by the "Save Frame" button to do that update? Thanks...

campagnola commented 7 years ago

In AcquireThread.run(), information about the current objective is handled here: https://github.com/acq4/acq4/blob/develop/acq4/devices/Camera/Camera.py#L812
That objective information comes from an earlier call to Camera.getScopeState(): https://github.com/acq4/acq4/blob/develop/acq4/devices/Camera/Camera.py#L803
Meanwhile, the camera keeps a local copy of the microscope state updated by watching for changes to the objective: https://github.com/acq4/acq4/blob/develop/acq4/devices/Camera/Camera.py#L362

So it should be enough to also track light status in Camera.scopeState (this is already done here: https://github.com/aiephys/acq4/pull/21/files#diff-f22ca5b93def0c15faf52c0a1c0b4688R375), and add just one more line to AcquireThread.run() to access that state (by modifying this line https://github.com/aiephys/acq4/pull/21/files#diff-f22ca5b93def0c15faf52c0a1c0b4688R835).

campagnola commented 7 years ago

Merged! Thanks Dave! If you're curious, you can see the changes I made this afternoon here: https://github.com/aiephys/acq4/pull/28/commits/82f2547b8881bfd7937361c2918d4613f4ebf58b

aiephys / acq4

Lightsource/LED monitoring and reporting #21