{"action":"created","comment":{"url":"https://api.github.com/repos/mne-tools/mne-python/pulls/comments/98858225","pull_request_review_id":19512617,"id":98858225,"diff_hunk":"@@ -133,25 +134,34 @@ def _combine_annotations(annotations, last_samps, first_samps, sfreq):\n         old_orig_time = annotations[0].orig_time\n \n     extra_samps = len(first_samps) - 1  # Account for sample 0\n-    onset = (annotations[1].onset + (sum(last_samps[:-1]) + extra_samps -\n-                                     sum(first_samps[:-1])) / sfreq)\n+    if old_orig_time is not None and annotations[1].orig_time is None:\n+        meas_date = _handle_meas_date(meas_date)\n+        extra_samps += sfreq * (meas_date - old_orig_time) + first_samps[0]\n+\n+    onset = annotations[1].onset + (sum(last_samps[:-1]) + extra_samps -","path":"mne/annotations.py","position":20,"original_position":20,"commit_id":"ce2e2e476db59b0db48af9a813f815b3dddc934d","original_commit_id":"ce2e2e476db59b0db48af9a813f815b3dddc934d","user":{"login":"agramfort","id":161052,"avatar_url":"https://avatars.githubusercontent.com/u/161052?v=3","gravatar_id":"","url":"https://api.github.com/users/agramfort","html_url":"https://github.com/agramfort","followers_url":"https://api.github.com/users/agramfort/followers","following_url":"https://api.github.com/users/agramfort/following{/other_user}","gists_url":"https://api.github.com/users/agramfort/gists{/gist_id}","starred_url":"https://api.github.com/users/agramfort/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/agramfort/subscriptions","organizations_url":"https://api.github.com/users/agramfort/orgs","repos_url":"https://api.github.com/users/agramfort/repos","events_url":"https://api.github.com/users/agramfort/events{/privacy}","received_events_url":"https://api.github.com/users/agramfort/received_events","type":"User","site_admin":false},"body":"np.sum ?","created_at":"2017-02-01T09:51:48Z","updated_at":"2017-02-01T09:51:48Z","html_url":"https://github.com/mne-tools/mne-python/pull/3946#discussion_r98858225","pull_request_url":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946","_links":{"self":{"href":"https://api.github.com/repos/mne-tools/mne-python/pulls/comments/98858225"},"html":{"href":"https://github.com/mne-tools/mne-python/pull/3946#discussion_r98858225"},"pull_request":{"href":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946"}}},"pull_request":{"url":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946","id":103950633,"html_url":"https://github.com/mne-tools/mne-python/pull/3946","diff_url":"https://github.com/mne-tools/mne-python/pull/3946.diff","patch_url":"https://github.com/mne-tools/mne-python/pull/3946.patch","issue_url":"https://api.github.com/repos/mne-tools/mne-python/issues/3946","number":3946,"state":"open","locked":false,"title":"Annotation bug fix.","user":{"login":"jaeilepp","id":3456414,"avatar_url":"https://avatars.githubusercontent.com/u/3456414?v=3","gravatar_id":"","url":"https://api.github.com/users/jaeilepp","html_url":"https://github.com/jaeilepp","followers_url":"https://api.github.com/users/jaeilepp/followers","following_url":"https://api.github.com/users/jaeilepp/following{/other_user}","gists_url":"https://api.github.com/users/jaeilepp/gists{/gist_id}","starred_url":"https://api.github.com/users/jaeilepp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jaeilepp/subscriptions","organizations_url":"https://api.github.com/users/jaeilepp/orgs","repos_url":"https://api.github.com/users/jaeilepp/repos","events_url":"https://api.github.com/users/jaeilepp/events{/privacy}","received_events_url":"https://api.github.com/users/jaeilepp/received_events","type":"User","site_admin":false},"body":"There was a bug when concatenating two raws with annotations where the first uses ``orig_time`` and the second does not.\r\n\r\nAlso added more test cases for annotation rejection.","created_at":"2017-01-31T14:51:01Z","updated_at":"2017-02-01T09:51:48Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8e20dbe3ad13acd274daa1eddbf15826e2fc98a6","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946/commits","review_comments_url":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946/comments","review_comment_url":"https://api.github.com/repos/mne-tools/mne-python/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mne-tools/mne-python/issues/3946/comments","statuses_url":"https://api.github.com/repos/mne-tools/mne-python/statuses/ce2e2e476db59b0db48af9a813f815b3dddc934d","head":{"label":"jaeilepp:annotation-bug","ref":"annotation-bug","sha":"ce2e2e476db59b0db48af9a813f815b3dddc934d","user":{"login":"jaeilepp","id":3456414,"avatar_url":"https://avatars.githubusercontent.com/u/3456414?v=3","gravatar_id":"","url":"https://api.github.com/users/jaeilepp","html_url":"https://github.com/jaeilepp","followers_url":"https://api.github.com/users/jaeilepp/followers","following_url":"https://api.github.com/users/jaeilepp/following{/other_user}","gists_url":"https://api.github.com/users/jaeilepp/gists{/gist_id}","starred_url":"https://api.github.com/users/jaeilepp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jaeilepp/subscriptions","organizations_url":"https://api.github.com/users/jaeilepp/orgs","repos_url":"https://api.github.com/users/jaeilepp/repos","events_url":"https://api.github.com/users/jaeilepp/events{/privacy}","received_events_url":"https://api.github.com/users/jaeilepp/received_events","type":"User","site_admin":false},"repo":{"id":35097627,"name":"mne-python","full_name":"jaeilepp/mne-python","owner":{"login":"jaeilepp","id":3456414,"avatar_url":"https://avatars.githubusercontent.com/u/3456414?v=3","gravatar_id":"","url":"https://api.github.com/users/jaeilepp","html_url":"https://github.com/jaeilepp","followers_url":"https://api.github.com/users/jaeilepp/followers","following_url":"https://api.github.com/users/jaeilepp/following{/other_user}","gists_url":"https://api.github.com/users/jaeilepp/gists{/gist_id}","starred_url":"https://api.github.com/users/jaeilepp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jaeilepp/subscriptions","organizations_url":"https://api.github.com/users/jaeilepp/orgs","repos_url":"https://api.github.com/users/jaeilepp/repos","events_url":"https://api.github.com/users/jaeilepp/events{/privacy}","received_events_url":"https://api.github.com/users/jaeilepp/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jaeilepp/mne-python","description":"MNE : Magnetoencephalography (MEG) and Electroencephalography (EEG) in Python","fork":true,"url":"https://api.github.com/repos/jaeilepp/mne-python","forks_url":"https://api.github.com/repos/jaeilepp/mne-python/forks","keys_url":"https://api.github.com/repos/jaeilepp/mne-python/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jaeilepp/mne-python/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jaeilepp/mne-python/teams","hooks_url":"https://api.github.com/repos/jaeilepp/mne-python/hooks","issue_events_url":"https://api.github.com/repos/jaeilepp/mne-python/issues/events{/number}","events_url":"https://api.github.com/repos/jaeilepp/mne-python/events","assignees_url":"https://api.github.com/repos/jaeilepp/mne-python/assignees{/user}","branches_url":"https://api.github.com/repos/jaeilepp/mne-python/branches{/branch}","tags_url":"https://api.github.com/repos/jaeilepp/mne-python/tags","blobs_url":"https://api.github.com/repos/jaeilepp/mne-python/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jaeilepp/mne-python/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jaeilepp/mne-python/git/refs{/sha}","trees_url":"https://api.github.com/repos/jaeilepp/mne-python/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jaeilepp/mne-python/statuses/{sha}","languages_url":"https://api.github.com/repos/jaeilepp/mne-python/languages","stargazers_url":"https://api.github.com/repos/jaeilepp/mne-python/stargazers","contributors_url":"https://api.github.com/repos/jaeilepp/mne-python/contributors","subscribers_url":"https://api.github.com/repos/jaeilepp/mne-python/subscribers","subscription_url":"https://api.github.com/repos/jaeilepp/mne-python/subscription","commits_url":"https://api.github.com/repos/jaeilepp/mne-python/commits{/sha}","git_commits_url":"https://api.github.com/repos/jaeilepp/mne-python/git/commits{/sha}","comments_url":"https://api.github.com/repos/jaeilepp/mne-python/comments{/number}","issue_comment_url":"https://api.github.com/repos/jaeilepp/mne-python/issues/comments{/number}","contents_url":"https://api.github.com/repos/jaeilepp/mne-python/contents/{+path}","compare_url":"https://api.github.com/repos/jaeilepp/mne-python/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jaeilepp/mne-python/merges","archive_url":"https://api.github.com/repos/jaeilepp/mne-python/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jaeilepp/mne-python/downloads","issues_url":"https://api.github.com/repos/jaeilepp/mne-python/issues{/number}","pulls_url":"https://api.github.com/repos/jaeilepp/mne-python/pulls{/number}","milestones_url":"https://api.github.com/repos/jaeilepp/mne-python/milestones{/number}","notifications_url":"https://api.github.com/repos/jaeilepp/mne-python/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jaeilepp/mne-python/labels{/name}","releases_url":"https://api.github.com/repos/jaeilepp/mne-python/releases{/id}","deployments_url":"https://api.github.com/repos/jaeilepp/mne-python/deployments","created_at":"2015-05-05T12:24:30Z","updated_at":"2016-02-29T07:08:15Z","pushed_at":"2017-02-01T08:12:01Z","git_url":"git://github.com/jaeilepp/mne-python.git","ssh_url":"git@github.com:jaeilepp/mne-python.git","clone_url":"https://github.com/jaeilepp/mne-python.git","svn_url":"https://github.com/jaeilepp/mne-python","homepage":"http://martinos.org/mne/","size":91797,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"mne-tools:master","ref":"master","sha":"7d653f91d9cc3661dc7a27f411df457fd3b1ebeb","user":{"login":"mne-tools","id":583875,"avatar_url":"https://avatars.githubusercontent.com/u/583875?v=3","gravatar_id":"","url":"https://api.github.com/users/mne-tools","html_url":"https://github.com/mne-tools","followers_url":"https://api.github.com/users/mne-tools/followers","following_url":"https://api.github.com/users/mne-tools/following{/other_user}","gists_url":"https://api.github.com/users/mne-tools/gists{/gist_id}","starred_url":"https://api.github.com/users/mne-tools/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mne-tools/subscriptions","organizations_url":"https://api.github.com/users/mne-tools/orgs","repos_url":"https://api.github.com/users/mne-tools/repos","events_url":"https://api.github.com/users/mne-tools/events{/privacy}","received_events_url":"https://api.github.com/users/mne-tools/received_events","type":"Organization","site_admin":false},"repo":{"id":1301584,"name":"mne-python","full_name":"mne-tools/mne-python","owner":{"login":"mne-tools","id":583875,"avatar_url":"https://avatars.githubusercontent.com/u/583875?v=3","gravatar_id":"","url":"https://api.github.com/users/mne-tools","html_url":"https://github.com/mne-tools","followers_url":"https://api.github.com/users/mne-tools/followers","following_url":"https://api.github.com/users/mne-tools/following{/other_user}","gists_url":"https://api.github.com/users/mne-tools/gists{/gist_id}","starred_url":"https://api.github.com/users/mne-tools/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mne-tools/subscriptions","organizations_url":"https://api.github.com/users/mne-tools/orgs","repos_url":"https://api.github.com/users/mne-tools/repos","events_url":"https://api.github.com/users/mne-tools/events{/privacy}","received_events_url":"https://api.github.com/users/mne-tools/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mne-tools/mne-python","description":"MNE : Magnetoencephalography (MEG) and Electroencephalography (EEG) in Python","fork":false,"url":"https://api.github.com/repos/mne-tools/mne-python","forks_url":"https://api.github.com/repos/mne-tools/mne-python/forks","keys_url":"https://api.github.com/repos/mne-tools/mne-python/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mne-tools/mne-python/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mne-tools/mne-python/teams","hooks_url":"https://api.github.com/repos/mne-tools/mne-python/hooks","issue_events_url":"https://api.github.com/repos/mne-tools/mne-python/issues/events{/number}","events_url":"https://api.github.com/repos/mne-tools/mne-python/events","assignees_url":"https://api.github.com/repos/mne-tools/mne-python/assignees{/user}","branches_url":"https://api.github.com/repos/mne-tools/mne-python/branches{/branch}","tags_url":"https://api.github.com/repos/mne-tools/mne-python/tags","blobs_url":"https://api.github.com/repos/mne-tools/mne-python/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mne-tools/mne-python/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mne-tools/mne-python/git/refs{/sha}","trees_url":"https://api.github.com/repos/mne-tools/mne-python/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mne-tools/mne-python/statuses/{sha}","languages_url":"https://api.github.com/repos/mne-tools/mne-python/languages","stargazers_url":"https://api.github.com/repos/mne-tools/mne-python/stargazers","contributors_url":"https://api.github.com/repos/mne-tools/mne-python/contributors","subscribers_url":"https://api.github.com/repos/mne-tools/mne-python/subscribers","subscription_url":"https://api.github.com/repos/mne-tools/mne-python/subscription","commits_url":"https://api.github.com/repos/mne-tools/mne-python/commits{/sha}","git_commits_url":"https://api.github.com/repos/mne-tools/mne-python/git/commits{/sha}","comments_url":"https://api.github.com/repos/mne-tools/mne-python/comments{/number}","issue_comment_url":"https://api.github.com/repos/mne-tools/mne-python/issues/comments{/number}","contents_url":"https://api.github.com/repos/mne-tools/mne-python/contents/{+path}","compare_url":"https://api.github.com/repos/mne-tools/mne-python/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mne-tools/mne-python/merges","archive_url":"https://api.github.com/repos/mne-tools/mne-python/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mne-tools/mne-python/downloads","issues_url":"https://api.github.com/repos/mne-tools/mne-python/issues{/number}","pulls_url":"https://api.github.com/repos/mne-tools/mne-python/pulls{/number}","milestones_url":"https://api.github.com/repos/mne-tools/mne-python/milestones{/number}","notifications_url":"https://api.github.com/repos/mne-tools/mne-python/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mne-tools/mne-python/labels{/name}","releases_url":"https://api.github.com/repos/mne-tools/mne-python/releases{/id}","deployments_url":"https://api.github.com/repos/mne-tools/mne-python/deployments","created_at":"2011-01-28T03:31:13Z","updated_at":"2017-01-29T08:50:39Z","pushed_at":"2017-02-01T08:12:03Z","git_url":"git://github.com/mne-tools/mne-python.git","ssh_url":"git@github.com:mne-tools/mne-python.git","clone_url":"https://github.com/mne-tools/mne-python.git","svn_url":"https://github.com/mne-tools/mne-python","homepage":"http://martinos.org/mne/","size":91305,"stargazers_count":267,"watchers_count":267,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":236,"mirror_url":null,"open_issues_count":223,"forks":236,"open_issues":223,"watchers":267,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946"},"html":{"href":"https://github.com/mne-tools/mne-python/pull/3946"},"issue":{"href":"https://api.github.com/repos/mne-tools/mne-python/issues/3946"},"comments":{"href":"https://api.github.com/repos/mne-tools/mne-python/issues/3946/comments"},"review_comments":{"href":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946/comments"},"review_comment":{"href":"https://api.github.com/repos/mne-tools/mne-python/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mne-tools/mne-python/pulls/3946/commits"},"statuses":{"href":"https://api.github.com/repos/mne-tools/mne-python/statuses/ce2e2e476db59b0db48af9a813f815b3dddc934d"}}}}
{"actor":{"display_login":"agramfort"}}