-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Add buttons #13287
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: main
Are you sure you want to change the base?
Add buttons #13287
Conversation
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks reasonable to me! Just a few minor comments
f"BUTTON\t{t}\t{btn_id}\t{state}\t100\t20\t45\t45\t127.0\t" | ||
"1497.0\t5189.0\t512.5\t.............\n" | ||
) | ||
button_idx += 1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like reasonable modifications, but later I'd expect some assertions about the raw.annotations
or something for example that the right number of button
events occurred etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@WouterKroot do you need more guidance on this part specifically?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes please, not sure that I follow. What do you mean by assertions, as in tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So if you look later in the file you see stuff like
mne-python/mne/io/eyelink/tests/test_eyelink.py
Lines 318 to 319 in b50a29a
assert raw.annotations.description[1] == "SYNCTIME" | |
assert raw.annotations.description[-1] == "BAD_ACQ_SKIP" |
I would expect similar assert
statements to work here. So some of the annotations now should have some button
description, there should be a specific number that have a button description, etc. So something like the following (untested, needs to be adapted)
button_idx = [ii for ii, desc enumerate(raw.annotations.description) if "button" in desc.lower()]
assert len(button_idx) == 6 # or however many you added
assert_allclose(raw.annotations.onset[button_idx[0]], 1.2356, atol=1e-5) # or whatever the onset of the first simulated button press was
make sense?
And you can add to the test and test locally with
pytest mne/io/eyelink -k multi_block_misc
to make sure it passes before pushing
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
for more information, see https://pre-commit.ci
Thanks for the comments, to be fair I don't really understand the eyelink asc format. Also I am new to these tests and how to efficiently push relevant changes. Please let me know if you have more suggestions and comments! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Getting there! that simulate_data
function was already kind of hairy, so nice start @WouterKroot.
the test_multi_block_misc_channels
test was failing on your branch, so the changes I suggested should get things passing..
But you will need find these lines:
assert raw.annotations.description[-1] == "BAD_ACQ_SKIP"
assert np.isclose(raw.annotations.onset[-1], 1.001)
assert np.isclose(raw.annotations.duration[-1], 0.1)
And change them to something like
assert raw.annotations.description[-1] == "button_1_release"
# there should be 1 BAD_ACQ_SKIP annotation between our two blocks
assert raw.annotations.description[-8] == "BAD_ACQ_SKIP"
assert np.isclose(raw.annotations.onset[-8], 1.001)
assert np.isclose(raw.annotations.duration[-8], 0.1)
This is because the last annotation in this file used to be BAD_ACQ_SKIP
, but now the last 6 or so annotations are the button events you've added, so our assert statements need to reflect that.
The last sticking point for me is that with this test case, I would expect the first button related annotation tone button_1_pressed
but it appears to be button_1_released
. Why is that?
>>> raw.annotations.description
array(['fixation', 'SYNCTIME', 'saccade', 'fixation', 'saccade',
'fixation', 'saccade', 'fixation', 'saccade', 'BAD_ACQ_SKIP',
'button_1_release', 'button_1_press', 'button_1_release',
'button_1_press', 'button_1_release', 'button_1_press',
'button_1_release'], dtype='<U16')
```
) | ||
df_dict["buttons"] = pd.DataFrame(parsed) | ||
n_button = len(df_dict.get("buttons", [])) | ||
logger.info(f"Found {n_button} button event{_pl(n_button)} in this file.") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if this _pl
function was supposed to add an s
character in the case of multiple button events (because _pl
is not defined), but I think the logging message below is good enough?
logger.info(f"Found {n_button} button event{_pl(n_button)} in this file.") | |
logger.info(f"Found {n_button} button event(s) in this file.") |
@@ -246,6 +268,22 @@ def _simulate_eye_tracking_data(in_file, out_file): | |||
"...\t1497\t5189\t512.5\t.............\n" | |||
) | |||
|
|||
for timestamp in np.arange(5488500, 5488600): # 100 samples |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for timestamp in np.arange(5488500, 5488600): # 100 samples | |
# And let's add some buttons events to this block | |
for timestamp in np.arange(7453390, 7453490): # 100 more samples |
So these new lines you appended to the end of the simulated file, actually had earlier timestamps than the previous lines, which breaks things. So I'm just making sure the timestamps are increasing.
@@ -214,7 +227,7 @@ def _simulate_eye_tracking_data(in_file, out_file): | |||
if event_type.isnumeric(): # samples | |||
tokens[4:4] = ["100", "20", "45", "45", "127.0"] # vel, res, DIN | |||
tokens.extend(["1497.0", "5189.0", "512.5", "............."]) | |||
elif event_type in ("EFIX", "ESACC"): | |||
elif event_type in ("EFIX", "ESACC", "BUTTON"): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
elif event_type in ("EFIX", "ESACC", "BUTTON"): | |
elif event_type in ("EFIX", "ESACC"): |
elif event_type == "BUTTON": | ||
# simulate a button event | ||
tokens[1] = "BUTTON" # simulate button press | ||
tokens[2] = "1" # simulate button 1 | ||
tokens[3] = "1" # simulate button pressed | ||
tokens[4:4] = ["100", "20", "45", "45", "127.0"] | ||
tokens.extend(["1497.0", "5189.0", "512.5", "............."]) | ||
|
||
continue |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
elif event_type == "BUTTON": | |
# simulate a button event | |
tokens[1] = "BUTTON" # simulate button press | |
tokens[2] = "1" # simulate button 1 | |
tokens[3] = "1" # simulate button pressed | |
tokens[4:4] = ["100", "20", "45", "45", "127.0"] | |
tokens.extend(["1497.0", "5189.0", "512.5", "............."]) | |
continue |
Hint: This simulated eyetracking data is built off the actual eyetracking test file ~/mne_data/MNE-testing-data/eyetrack/test_eyelink_HREF.asc, which doesn't have any button events! So the code you added there will never actually be hit : )
# Define your known BUTTON events | ||
button_events = [ | ||
(5488529, 1, 0), | ||
(5488532, 1, 1), | ||
(5488540, 1, 0), | ||
(5488543, 1, 1), | ||
(5488550, 1, 0), | ||
(5488553, 1, 1), | ||
(5488571, 1, 0), | ||
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Define your known BUTTON events | |
button_events = [ | |
(5488529, 1, 0), | |
(5488532, 1, 1), | |
(5488540, 1, 0), | |
(5488543, 1, 1), | |
(5488550, 1, 0), | |
(5488553, 1, 1), | |
(5488571, 1, 0), | |
] | |
# Define a few BUTTON press events | |
button_events = [ | |
(7453400, 1, 0), | |
(7453410, 1, 1), | |
(7453420, 1, 0), | |
(7453430, 1, 1), | |
(7453440, 1, 0), | |
(7453450, 1, 1), | |
(7453460, 1, 0), | |
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am just making sure that the timestamps here line up with the adjustments I made below.
while ( | ||
button_idx < len(button_events) | ||
and button_events[button_idx][0] == timestamp | ||
): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The while
statement works, but you don't really need a loop here, you can just use a conditional statement:
while ( | |
button_idx < len(button_events) | |
and button_events[button_idx][0] == timestamp | |
): | |
if button_idx < len(button_events) and button_events[button_idx][0] == timestamp: |
Reference issue (if any)
What does this implement/fix?
Additional information