Thanks to visit codestin.com
Credit goes to github.com

Skip to content

adding new astra files for dr19 and ipl3#95

Merged
havok2063 merged 15 commits into
mainfrom
dr19
Nov 8, 2024
Merged

adding new astra files for dr19 and ipl3#95
havok2063 merged 15 commits into
mainfrom
dr19

Conversation

@ajwheeler

Copy link
Copy Markdown
Contributor

I've added the astra files (I'll do apogee DRP/apoee redux in future PR). I've also updated the ipl3.cfg to include the 2 new files since it was updated last.

@havok2063

Copy link
Copy Markdown
Collaborator

@ajwheeler can you please merge in the latest main?

@havok2063

Copy link
Copy Markdown
Collaborator

The test is failing because there is a syntax error in the key name. Can you also give this a more representative title of the work in the PR?

@ajwheeler ajwheeler changed the title DR 19 some DR 19 files Nov 7, 2024
@ajwheeler

Copy link
Copy Markdown
Contributor Author

This branch include stuff from Sean and Joel, not just what I wrote. (This is why I was asking about whether I should be pushing commits to it.)

@ajwheeler

Copy link
Copy Markdown
Contributor Author

And sorry to be thick, but I don't know what syntax error you are referring to.

@joelbrownstein

Copy link
Copy Markdown
Contributor

Adam, In hindsight it would have been simpler to create a fresh branch for your PR.

@ajwheeler

Copy link
Copy Markdown
Contributor Author

Happy to git revert the changes and put them on a separate branch. That's actually what I did at first, but when I realized there was already a dr19 branch, I assumed that that's where dr19 changes should go. I think using a separate branch is likely to require a manual merge later (two parallel dr19.cfgs), but that's obviously not a huge problem.

@joelbrownstein

Copy link
Copy Markdown
Contributor

I personally prefer a fresh branch, but only if you want to!

@ajwheeler

Copy link
Copy Markdown
Contributor Author

If it's up to me I'd rather merge this one and avoid the conflict in the future, but it's not a strong opinion.

@joelbrownstein

Copy link
Copy Markdown
Contributor

That's fine, since I don't think any of the old changes I made are problematic (just cleanup)

However, the syntax error appears related to the name astraAllStarASCAP. I don't see anything obvious -- Brian do you have any insight into this?

Comment thread tests/test_tree.py Outdated
assert 'MWM_ASTRA' in tree.environ['MWM']
assert 'ipl-3/spectro/astra' in tree.environ['MWM']['MWM_ASTRA']
assert tree.paths['astraAllStarBest'] == '$MWM_ASTRA/{v_astra}/summary/astraAllStarBest-{v_astra}.fits' No newline at end of file
assert tree.paths['astraAllStarASCAP'] == '$MWM_ASTRA/{v_astra}/summary/astraAllStarASCAP-{v_astra}.fits' No newline at end of file

@havok2063 havok2063 Nov 7, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is the line that I think is causing the test to fail. I think this should be astraAllStarASPCAP?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Its just a typo

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I fixed the typo in the ipl3 test and commited.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

thanks

@havok2063 havok2063 changed the title some DR 19 files adding new astra files for dr19 and ipl3 Nov 7, 2024
@codecov

codecov Bot commented Nov 7, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.52%. Comparing base (c8b66a3) to head (c47787a).
Report is 9 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main      #95   +/-   ##
=======================================
  Coverage   84.52%   84.52%           
=======================================
  Files           3        3           
  Lines         614      614           
  Branches      143      130   -13     
=======================================
  Hits          519      519           
  Misses         57       57           
  Partials       38       38           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@joelbrownstein

Copy link
Copy Markdown
Contributor

I checked on the changes prior to Adam's commits, and I think they're not concerning.

Brian, please proceed with the merge if you're happy with this PR as it is.

@havok2063 havok2063 merged commit 256bd3b into main Nov 8, 2024
@havok2063 havok2063 deleted the dr19 branch November 8, 2024 14:54
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.

6 participants