Closed timothyfrankdavies closed 7 months ago
I've tried merging without any changes, then taking a git diff, here's a rundown of the actual changes I made:
In src/pywifes/__init__.py
:
In src/data_classifier.py
:
In reduction_scripts/reduce_data.py
:
And a few corresponding changes in that file, e.g.
(Those are all straight copies of the changes I made in the pip install branch from reduce_blue_data.py & reduce_red_data.py over to reduce_data.py.)
Finished testing, I get the expected files. Should be good to go.
All my tests went well as well. Also, everything looks ok to me. Feel free to go with the merging.
This PR makes changes to fji_data_classifier, which has its own pull request here: https://github.com/PyWiFeS/pipeline/pull/29
I've merged from automation into fji_data_classifier using this branch to avoid causing more merge conflicts for @felipeji. Let's merge this PR once all changes to fji_data_classifier are pushed, to avoid causing more conflicts.
I've tested with origin/tdavies__fix_save_data merged in too, and get all the expected output files. That said, I'm still not 100% sure I'm running tests with the same configuration as @felipeji and @CMartinezLombilla, so it might be worth either of you repeating the tests.