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.

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

Plot tweaks #82

Merged
merged 15 commits into from
Jun 30, 2021
Merged

Plot tweaks #82

merged 15 commits into from
Jun 30, 2021

Conversation

mdecleir
Copy link
Collaborator

@mdecleir mdecleir commented Jun 25, 2021

This PR contains several changes to the plotting of spectra and extinction curves:

  • Changed default plotting settings
  • Added option to exclude certain bands from plotting instead of all bands or no bands

Other changes:

  • Quadratically added 1 percent uncertainty to the SpeX spectra
  • Small updates to masked windows of SpeX spectra

Some changes will be in conflict with the latest merge from PR #66 , so we will have to fix the conflicts first.

@mdecleir mdecleir marked this pull request as draft June 25, 2021 21:39
@mdecleir
Copy link
Collaborator Author

For some reason, it is only doing 1 test. Where did all the other tests go?

@mdecleir
Copy link
Collaborator Author

Looking at the conflicts, I don't really understand why they are indicated as conflicts. They are different keywords that we added separately, but these are independent from each other. We want to keep both keywords. How can we fix this?

@karllark
Copy link
Owner

Looking at the conflicts, I don't really understand why they are indicated as conflicts. They are different keywords that we added separately, but these are independent from each other. We want to keep both keywords. How can we fix this?

The automated routine can't decide if the changes are in conflict or not. They are in the same place in the code and have different names. Hence it is kicking this back to the humans. The solution is to rebase and manually include both changes.

@karllark
Copy link
Owner

For some reason, it is only doing 1 test. Where did all the other tests go?

Only one test in being run as there are merge conflicts, hence it cannot run any of the other tests.

@mdecleir
Copy link
Collaborator Author

I merged the changes. This should solve the conflicts.

@mdecleir
Copy link
Collaborator Author

I clearly broke the code by merging the changes. I will try to fix this.

@karllark
Copy link
Owner

I clearly broke the code by merging the changes. I will try to fix this.

Been there. Did this last week. ;-)

Removed duplicate keyword
Removed whitespace
@codecov-commenter
Copy link

Codecov Report

Merging #82 (58bd5cc) into master (be30c2e) will increase coverage by 0.50%.
The diff coverage is 62.85%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #82      +/-   ##
==========================================
+ Coverage   46.50%   47.00%   +0.50%     
==========================================
  Files          18       18              
  Lines        2415     2436      +21     
==========================================
+ Hits         1123     1145      +22     
+ Misses       1292     1291       -1     
Impacted Files Coverage Δ
measure_extinction/merge_obsspec.py 6.80% <0.00%> (-0.05%) ⬇️
measure_extinction/utils/merge_spex_spec.py 24.32% <ø> (ø)
measure_extinction/extdata.py 60.72% <66.66%> (+0.03%) ⬆️
measure_extinction/stardata.py 75.99% <66.66%> (+1.49%) ⬆️
measure_extinction/plotting/plot_ext.py 75.00% <75.00%> (+0.21%) ⬆️
measure_extinction/plotting/plot_spec.py 75.56% <75.00%> (-0.02%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update be30c2e...58bd5cc. Read the comment docs.

@mdecleir mdecleir marked this pull request as ready for review June 29, 2021 21:06
@mdecleir
Copy link
Collaborator Author

Issues have been fixed. Tests are successful now. This PR is ready to be reviewed.

Copy link
Owner

@karllark karllark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@karllark karllark merged commit b801194 into karllark:master Jun 30, 2021
@mdecleir mdecleir mentioned this pull request Nov 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants