-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
Bring muse_dev up-to-date with version 4.x #106
Open
kbwestfall
wants to merge
87
commits into
muse_dev
Choose a base branch
from
muse_dev_merge
base: muse_dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bring survey-level scripts up-to-date with v4 front-end changes.
Merges develop into master (4.0.3 tag)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This would merge the current
develop
branch intomuse_dev
and institute all the changes we talked about for the front end and the new method used to run the DAP.There were a few conflicts that I had to deal with, but nothing looked unclear. The specific files with conflicts were:
So I would pay particular attention to changes made there.
The only thing that might be questionable is the check that there are no NaNs in the DAP output files, which is done in
mangadap/scripts/spotcheck_dap_maps.py
. We just need to check that this now works, or comment out the code again. Note the comment I left in the file.I expect
fit_one_cube_muse.py
is broken in this branch becausemangadap.par.analysisplan
has moved tomangadap.config.analysisplan
, and the instantiation is different. As I said earlier, I'll send along the KCWI example I've been working with, and I'll also use the plan you have infit_one_cube_muse.py
to construct a new plan toml file that should do the same thing.