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.

Sign up for GitHub

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

Jump to bottom

merge 0.11.x into master #610

Merged
merged 87 commits into from Jun 18, 2020
Merged

merge 0.11.x into master #610

merged 87 commits into from Jun 18, 2020

Conversation

dnjohnstone
Copy link
Member

No description provided.

dnjohnstone and others added 30 commits May 21, 2020 12:39
@dnjohnstone
black formatting
e2c0e78
@EirikOpheim
Merge pull request #7 from pyxem/0.11.x
dbbe3f8 
0.11.x
@EirikOpheim
Added Full Frame correlation metric
f3dfd23
@EirikOpheim
Added docstrings and moved the image_FT outside function call
f1c627b
@EirikOpheim
fix issue in _core_sum
6729720
@EirikOpheim
fix issue in _core_sum
5c74f42
@EirikOpheim
Cleared up a misunderstanding on my part
2b99272
@EirikOpheim
Missing .fft
fe81295
@EirikOpheim
Remove functions for sub-pixel refinement for now
afeabe0
@EirikOpheim
Minor bugfix
1669277
@EirikOpheim
Some visual improvements
67d8ca3
@EirikOpheim
fix typo
6a1c19e
@EirikOpheim
Handle division by 0 case
2aded46
@EirikOpheim
Remove functions for sub-pixel refinement for now
a2a6f20
@EirikOpheim
Minor bugfix
bf932d8
@EirikOpheim
Some visual improvements
f3cb348
@EirikOpheim
fix typo
a2b36b3
@EirikOpheim
Handle division by 0 case
ac3fffc
@EirikOpheim
Fourier transform of template done separately + restructure
7a1099d
@EirikOpheim
import next_fast_len
9de98bd
@EirikOpheim
fix typo
0eaba03
@EirikOpheim
fix imports
1143878
@EirikOpheim
fix typo
0c83564
@EirikOpheim
fix typo
201c8ac
@EirikOpheim
fix typo
770fa3f
@EirikOpheim
fix typo
72446de
@EirikOpheim
fix typo
312cd43
@EirikOpheim
fftn -> rfftn + wrapper for next_fast_len()
3906a80
@EirikOpheim
Testing
0f4dfd3
@EirikOpheim
Remove changes made for testing
d040d5e
EirikOpheim and others added 27 commits June 8, 2020 17:29
@EirikOpheim
some more testing
9323cdb
@EirikOpheim
revert testing changes
3cd872c
@EirikOpheim
added new tests
f70d7b6
@EirikOpheim
fix special case of FullFrame where template is very small
3dd7baa
@EirikOpheim
bugfix
6c4b1c4
@EirikOpheim
sort out a couple of errors
650ce38
@EirikOpheim
Fix tests
9839273
@EirikOpheim
Fix tests
54e24af
@EirikOpheim
added new tests
a40b696
@EirikOpheim
fix special case of FullFrame where template is very small
60afd4f
@EirikOpheim
bugfix
8390346
@EirikOpheim
sort out a couple of errors
1c381dc
@EirikOpheim
Fix tests
6b9e1d5
@EirikOpheim
Fix tests
526a2fd
@EirikOpheim
changed one test to deal with python 3.7 on windows
5d069ba
@EirikOpheim
add test for FullFrame full function
b8d06e8
@EirikOpheim
Try and make test_workflows work
cda36e2
@EirikOpheim
Temporary solution to direct beam issue for full_frame
52e38d7
@EirikOpheim
Added clearifying error message
0424ee0
@EirikOpheim
Improve logic
41c04fc
@EirikOpheim
Improve logic
5bca31f
@EirikOpheim
fix bug
ee78bb6
@EirikOpheim
Add test for new functionality
3049014
@EirikOpheim
restructure tests
51c0eff
@EirikOpheim
Some syntax changes
9487863
@EirikOpheim
Added docstrings and removed deprecated code.
e6eedd2
@pc494
Merge pull request #609, full_frame_correlation
0340688
@coveralls
Copy link

coveralls commented Jun 18, 2020 •
edited

Coverage Status

Coverage increased (+0.01%) to 98.858% when pulling 0340688 on 0.11.x into 13bccc5 on master.

@dnjohnstone dnjohnstone merged commit d39aa48 into master Jun 18, 2020
@pc494 pc494 deleted the 0.11.x branch February 23, 2021 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dnjohnstone @coveralls @EirikOpheim @pc494