Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

base frame timestamp off epicsTS #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

jsouter
Copy link

@jsouter jsouter commented Nov 16, 2023

Part of a series of PRs for AreaDetector repos that sets the outgoing frames' timeStamp member to be equal to the frame's epicsTS member, updated with updateTimeStamp, when not retreiving a timestamp from hardware.

@MarkRivers
Copy link
Member

MarkRivers commented Nov 16, 2023

I think I have a better solution to this problem. I have added a new method in ADCore

asynNDArrayDriver::updateTimeStamps(NDArray *pArray)

https://github.com/areaDetector/ADCore/blob/d1772ed932f958c985953f8b4c44d580585066e9/ADApp/ADSrc/asynNDArrayDriver.h#L159

This will update both timestamps, simplifying the drivers.

I have switched to this method in ADSimDetector and ADPilatus and pushed to Github.

@MarkRivers
Copy link
Member

Note that drivers that set NDArray.timeStamp from the camera info need to call the new method before they set the camera-derived timeStamp. Otherwise it will be overwritten by the new method.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants