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 scikit-beam autocorr repository #11

Closed
wants to merge 2,280 commits into from
Closed

merge scikit-beam autocorr repository #11

wants to merge 2,280 commits into from

Conversation

jklynch
Copy link

@jklynch jklynch commented Nov 14, 2019

This PR merges the scikit-beam autocorr code including git history.

ericdill and others added 30 commits September 23, 2016 11:02
@ericdill
CI: need to make miniconda executable
a14504f
@ericdill
CI: Need that darn --yes flag
d75f4ec
@ericdill
Matrix in numpy 1.10/1.11 too
f0f5106
@jrmlhermitte
modified origin default
5ee0ac7
@jrmlhermitte
added origin to test, made one dimension odd for test
7b48373
@jrmlhermitte
doc change int to float for origin
f65bf3d
@tacaswell
Merge pull request #473 from chrisvam/fix_1d
f030d4c 
API: Fix 1D bin_edges
@jrmlhermitte
oops, wrong origin definition! fixed
fc00f41
@tacaswell
Merge pull request #475 from ordirules/addorigin
6fedb5a 
ENH: modified origin default in binned stats
@licode
Merge pull request #474 from ericdill/enhance-travis
ed8390d 
WIP: Use explicit condarc for travis
forced mask to be bool
e1b5276
@tacaswell
Merge pull request #476 from ordirules/auto_masking
c1e9e7b 
FIX: forced mask to be bool in auto masking
@CJ-Wright
ENH: use fabio to perform fit2d mask saving and loading, with boolian…
42427ec 
… switching to make certain masks end up in skbeam convention
@CJ-Wright
TST: rename fit2d save test
738ce88
@CJ-Wright
MTN: shim fit2d_save
76f011a
@CJ-Wright
API: add dep warning and change fit2d_io to fit2d
50b4e94
removed an unnecessary line
a62a835
@danielballan
Merge pull request #478 from ordirules/fix_construct_circavgimg
037c583 
removed an unnecessary line
@danielballan
DOC: Include API docs for more modules.
6379aca
@danielballan
DOC: Fix docstrings for numpydoc compat.
e2aba4a
@tacaswell
Merge pull request #477 from CJ-Wright/fit2d_mask2
0c710ca 
ENH: use fabio to perform fit2d mask saving and loading
@ericdill
Merge pull request #479 from danielballan/doc-core
e6df409 
DOC: Include API docs for more of the modules
@CJ-Wright
ENH: allow for changing statistic via call
cada256
@CJ-Wright
Merge remote-tracking branch 'upstream/master' into binned_stat
5aa2424
@CJ-Wright
ENH: move stats to class variable
fd6ed0c
@CJ-Wright
REF: statistic as property
2541929
@CJ-Wright
FIX: acutally set the property
0f66f95
@CJ-Wright
FIX: remove double validation
a332e54
@CJ-Wright
FIX: add back statistic
6ee3a81
@CJ-Wright
FIX: move down one line
aa1e29c
aryabhatt and others added 28 commits August 28, 2019 15:35
@aryabhatt
Merge branch 'master' of https://github.com/aryabhatt/autocorr
1f1c946 
1. Merged aryabhatt/multitau to scikit-beam/autocorr
2. renamed autocorrelate to mulittau
3. renamed autocorrelate_mt to multitau_mt
4. Failing to build extension should not fail installation
5. Fallback wrapper for multitau_mt if c-extension is there
@aryabhatt
Removed README.md
beba905
@aryabhatt
Fixed README.rst syntax bugs
c8abffa
@danielballan
Merge Travis file with existing one.
e8d659a
@danielballan
Satisfy flake8.
adcc13c
@danielballan
Remove placeholder 'test_examples.py' from template.
0818c6d
@danielballan
Move installation/usage notes into docs. Put link in README.
6de2ffd
@danielballan
Copyedited (manually applied suggestions by @mrakitin)
a854377
@danielballan
Minor refactor (use ndim)
b619c22
@danielballan
Define min pybind11 version in a parameter.
9ca5331
@danielballan
Remove vestigial '/usr/bin/env python' lines.
7e3e703
@tacaswell
Merge pull request #2 from lbl-camera/master
4bcffb7 
ENH: Merged multitau repo into autocorr
@aryabhatt
1. Added multi-threaded routine for fftautocorr (uses FFTW3)
9fb53a5 
 2. Renamed extension module to reflect more accurate representation
 3. Minor cosmetic code formating

 TODO:
 1. Two time correlations
 2. Bad frames and/or bad values
@aryabhatt
added fftw3 requirments for travis
711705a
@aryabhatt
adding a success message to Extension
4bfc0c0
@aryabhatt
Update setup.py
422b5b8
@aryabhatt
Forcing setup to build extension
fa9dca2
@aryabhatt
Forcing setup to build extension
59c2f15
@aryabhatt
Minor changes to .travis.yml
9b54ace
@aryabhatt
testing without fftw3
e8a8c68
@aryabhatt
using editable installtion for travis
e871498
@aryabhatt
Stupid flake8 errors!
aa08eed
@aryabhatt
even more stupid flake8 errors!
7749fff
@danielballan
Merge pull request #7 from lbl-camera/master
5f2d5eb 
Add fftw
@danielballan
Use descriptive spec instead of procedural commands.
3b7625e
@danielballan
Merge pull request #8 from danielballan/use-travis-apt
93fc238 
Use descriptive spec instead of procedural commands.
@jklynch
Add 'scikit-beam/' from commit 'bb08ccade8c1b9e1fb1c0fb9b141f0687bd7b…
ce44d0a 
…27e'

git-subtree-dir: scikit-beam
git-subtree-mainline: dd47b01
git-subtree-split: bb08cca
@jklynch
Merge branch 'skbeam-autocorr' of github.com:jklynch/autocorr into sk…
7592115 
…beam-autocorr
@danielballan
Copy link
Member

Superseded by #13

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.