{"action":"created","comment":{"url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/comments/184173219","pull_request_review_id":115314022,"id":184173219,"diff_hunk":"@@ -9,19 +10,26 @@\n from move import move_all\n \n \n-# This ignores geometries we have said we don't care about\n-# As there are only [(len(geometries)-1)!] combinations, and we don't care about some, there isn't much effort saved\n-# by using spaces (which do a quicker estimate of collisions first)\n-def collide(geometries, ignore):\n+def collide(geometries, ignore, collision_func=ode.collide):\n+    \"\"\"\n+    Calculates which of the given geometries will collide, ignoring geometries that are specified as ignored.\n+    As there are only [(len(geometries)-1)!] combinations, and we don't care about some, there isn't much effort saved\n+    by using spaces (which do a quicker estimate of collisions first)\n+\n+    Args:\n+        geometries: A list of GeometryBox objects to check for collisions.\n+        ignore: A list of pairs to ignore. Each pair is represented by a list with two entries.\n+        collision_func: A callable which takes two geometries as input, and returns True iff they are colliding.","path":"CollisionDetection/collide.py","position":24,"original_position":24,"commit_id":"230101189c8ad57cfb0ab3b9637244c0ce501be8","original_commit_id":"230101189c8ad57cfb0ab3b9637244c0ce501be8","user":{"login":"DominicOram","id":10086797,"avatar_url":"https://avatars2.githubusercontent.com/u/10086797?v=4","gravatar_id":"","url":"https://api.github.com/users/DominicOram","html_url":"https://github.com/DominicOram","followers_url":"https://api.github.com/users/DominicOram/followers","following_url":"https://api.github.com/users/DominicOram/following{/other_user}","gists_url":"https://api.github.com/users/DominicOram/gists{/gist_id}","starred_url":"https://api.github.com/users/DominicOram/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DominicOram/subscriptions","organizations_url":"https://api.github.com/users/DominicOram/orgs","repos_url":"https://api.github.com/users/DominicOram/repos","events_url":"https://api.github.com/users/DominicOram/events{/privacy}","received_events_url":"https://api.github.com/users/DominicOram/received_events","type":"User","site_admin":false},"body":"iff, typo","created_at":"2018-04-25T19:03:50Z","updated_at":"2018-04-25T19:03:50Z","html_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/156#discussion_r184173219","pull_request_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/comments/184173219"},"html":{"href":"https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/156#discussion_r184173219"},"pull_request":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156"}}},"pull_request":{"url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156","id":182789716,"html_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/156","diff_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/156.diff","patch_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/156.patch","issue_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/156","number":156,"state":"open","locked":false,"title":"Collision detection for IMAT and other minor edits","user":{"login":"DominicOram","id":10086797,"avatar_url":"https://avatars2.githubusercontent.com/u/10086797?v=4","gravatar_id":"","url":"https://api.github.com/users/DominicOram","html_url":"https://github.com/DominicOram","followers_url":"https://api.github.com/users/DominicOram/followers","following_url":"https://api.github.com/users/DominicOram/following{/other_user}","gists_url":"https://api.github.com/users/DominicOram/gists{/gist_id}","starred_url":"https://api.github.com/users/DominicOram/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DominicOram/subscriptions","organizations_url":"https://api.github.com/users/DominicOram/orgs","repos_url":"https://api.github.com/users/DominicOram/repos","events_url":"https://api.github.com/users/DominicOram/events{/privacy}","received_events_url":"https://api.github.com/users/DominicOram/received_events","type":"User","site_admin":false},"body":"### Description of work\r\n\r\nAdded some improvements to collision detection.\r\n\r\n---\r\n\r\n#### Code Review\r\n\r\n- [ ] Is the code of an acceptable quality?\r\n- [ ] Has the author taken into account the multi-threaded nature of the code?\r\n- [ ] Have the changes been documented in the [release notes](https://github.com/ISISComputingGroup/IBEX/wiki/ReleaseNotes_Dev). If so, do they describe the changes appropriately?\r\n- [ ] Has the [manual system tests spreadsheet](https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/Manual-system-tests) been updated?\r\n\r\n### Functional Tests\r\n\r\n- [ ] Do changes function as described? Add comments below that describe the tests performed.\r\n\r\n### Final steps\r\n\r\n- [ ] Reviewer has updated the submodule in the main EPICS repo? See **Reviewing work for the subModules of EPICS** in the [Git workflow](https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/Git-workflow) page for details.\r\n- [ ] Reviewer has moved the [release notes](https://github.com/ISISComputingGroup/IBEX/wiki/ReleaseNotes_Dev) entry for this ticket in the \"Changes merged into master\" section\r\n","created_at":"2018-04-19T14:12:15Z","updated_at":"2018-04-25T19:03:50Z","closed_at":null,"merged_at":null,"merge_commit_sha":"4ca78e62180db1fe23307cfa52e3e153087eed94","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156/commits","review_comments_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156/comments","review_comment_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/156/comments","statuses_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/statuses/230101189c8ad57cfb0ab3b9637244c0ce501be8","head":{"label":"ISISComputingGroup:configure_collision_detection_for_imat","ref":"configure_collision_detection_for_imat","sha":"230101189c8ad57cfb0ab3b9637244c0ce501be8","user":{"login":"ISISComputingGroup","id":7941980,"avatar_url":"https://avatars2.githubusercontent.com/u/7941980?v=4","gravatar_id":"","url":"https://api.github.com/users/ISISComputingGroup","html_url":"https://github.com/ISISComputingGroup","followers_url":"https://api.github.com/users/ISISComputingGroup/followers","following_url":"https://api.github.com/users/ISISComputingGroup/following{/other_user}","gists_url":"https://api.github.com/users/ISISComputingGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/ISISComputingGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ISISComputingGroup/subscriptions","organizations_url":"https://api.github.com/users/ISISComputingGroup/orgs","repos_url":"https://api.github.com/users/ISISComputingGroup/repos","events_url":"https://api.github.com/users/ISISComputingGroup/events{/privacy}","received_events_url":"https://api.github.com/users/ISISComputingGroup/received_events","type":"Organization","site_admin":false},"repo":{"id":40836703,"name":"EPICS-inst_servers","full_name":"ISISComputingGroup/EPICS-inst_servers","owner":{"login":"ISISComputingGroup","id":7941980,"avatar_url":"https://avatars2.githubusercontent.com/u/7941980?v=4","gravatar_id":"","url":"https://api.github.com/users/ISISComputingGroup","html_url":"https://github.com/ISISComputingGroup","followers_url":"https://api.github.com/users/ISISComputingGroup/followers","following_url":"https://api.github.com/users/ISISComputingGroup/following{/other_user}","gists_url":"https://api.github.com/users/ISISComputingGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/ISISComputingGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ISISComputingGroup/subscriptions","organizations_url":"https://api.github.com/users/ISISComputingGroup/orgs","repos_url":"https://api.github.com/users/ISISComputingGroup/repos","events_url":"https://api.github.com/users/ISISComputingGroup/events{/privacy}","received_events_url":"https://api.github.com/users/ISISComputingGroup/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers","description":null,"fork":false,"url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers","forks_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/forks","keys_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/teams","hooks_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/hooks","issue_events_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/events{/number}","events_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/events","assignees_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/assignees{/user}","branches_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/branches{/branch}","tags_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/tags","blobs_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/refs{/sha}","trees_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/statuses/{sha}","languages_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/languages","stargazers_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/stargazers","contributors_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/contributors","subscribers_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/subscribers","subscription_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/subscription","commits_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/commits{/sha}","git_commits_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/commits{/sha}","comments_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/comments{/number}","issue_comment_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/comments{/number}","contents_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/contents/{+path}","compare_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/merges","archive_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/downloads","issues_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues{/number}","pulls_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls{/number}","milestones_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/milestones{/number}","notifications_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/labels{/name}","releases_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/releases{/id}","deployments_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/deployments","created_at":"2015-08-16T19:48:23Z","updated_at":"2016-01-13T09:47:10Z","pushed_at":"2018-04-24T15:26:43Z","git_url":"git://github.com/ISISComputingGroup/EPICS-inst_servers.git","ssh_url":"git@github.com:ISISComputingGroup/EPICS-inst_servers.git","clone_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers.git","svn_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers","homepage":null,"size":2518,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":{"key":"epl-1.0","name":"Eclipse Public License 1.0","spdx_id":"EPL-1.0","url":"https://api.github.com/licenses/epl-1.0"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"ISISComputingGroup:master","ref":"master","sha":"ff675964be09b09202b7854c2c533b11cc3a5bfc","user":{"login":"ISISComputingGroup","id":7941980,"avatar_url":"https://avatars2.githubusercontent.com/u/7941980?v=4","gravatar_id":"","url":"https://api.github.com/users/ISISComputingGroup","html_url":"https://github.com/ISISComputingGroup","followers_url":"https://api.github.com/users/ISISComputingGroup/followers","following_url":"https://api.github.com/users/ISISComputingGroup/following{/other_user}","gists_url":"https://api.github.com/users/ISISComputingGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/ISISComputingGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ISISComputingGroup/subscriptions","organizations_url":"https://api.github.com/users/ISISComputingGroup/orgs","repos_url":"https://api.github.com/users/ISISComputingGroup/repos","events_url":"https://api.github.com/users/ISISComputingGroup/events{/privacy}","received_events_url":"https://api.github.com/users/ISISComputingGroup/received_events","type":"Organization","site_admin":false},"repo":{"id":40836703,"name":"EPICS-inst_servers","full_name":"ISISComputingGroup/EPICS-inst_servers","owner":{"login":"ISISComputingGroup","id":7941980,"avatar_url":"https://avatars2.githubusercontent.com/u/7941980?v=4","gravatar_id":"","url":"https://api.github.com/users/ISISComputingGroup","html_url":"https://github.com/ISISComputingGroup","followers_url":"https://api.github.com/users/ISISComputingGroup/followers","following_url":"https://api.github.com/users/ISISComputingGroup/following{/other_user}","gists_url":"https://api.github.com/users/ISISComputingGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/ISISComputingGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ISISComputingGroup/subscriptions","organizations_url":"https://api.github.com/users/ISISComputingGroup/orgs","repos_url":"https://api.github.com/users/ISISComputingGroup/repos","events_url":"https://api.github.com/users/ISISComputingGroup/events{/privacy}","received_events_url":"https://api.github.com/users/ISISComputingGroup/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers","description":null,"fork":false,"url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers","forks_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/forks","keys_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/teams","hooks_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/hooks","issue_events_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/events{/number}","events_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/events","assignees_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/assignees{/user}","branches_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/branches{/branch}","tags_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/tags","blobs_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/refs{/sha}","trees_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/statuses/{sha}","languages_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/languages","stargazers_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/stargazers","contributors_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/contributors","subscribers_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/subscribers","subscription_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/subscription","commits_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/commits{/sha}","git_commits_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/git/commits{/sha}","comments_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/comments{/number}","issue_comment_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/comments{/number}","contents_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/contents/{+path}","compare_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/merges","archive_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/downloads","issues_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues{/number}","pulls_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls{/number}","milestones_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/milestones{/number}","notifications_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/labels{/name}","releases_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/releases{/id}","deployments_url":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/deployments","created_at":"2015-08-16T19:48:23Z","updated_at":"2016-01-13T09:47:10Z","pushed_at":"2018-04-24T15:26:43Z","git_url":"git://github.com/ISISComputingGroup/EPICS-inst_servers.git","ssh_url":"git@github.com:ISISComputingGroup/EPICS-inst_servers.git","clone_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers.git","svn_url":"https://github.com/ISISComputingGroup/EPICS-inst_servers","homepage":null,"size":2518,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":{"key":"epl-1.0","name":"Eclipse Public License 1.0","spdx_id":"EPL-1.0","url":"https://api.github.com/licenses/epl-1.0"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156"},"html":{"href":"https://github.com/ISISComputingGroup/EPICS-inst_servers/pull/156"},"issue":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/156"},"comments":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/issues/156/comments"},"review_comments":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156/comments"},"review_comment":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/pulls/156/commits"},"statuses":{"href":"https://api.github.com/repos/ISISComputingGroup/EPICS-inst_servers/statuses/230101189c8ad57cfb0ab3b9637244c0ce501be8"}},"author_association":"OWNER"}}
{"actor":{"display_login":"DominicOram"}}