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

WFIRST changes without any GUI stuff #41

Merged
merged 5 commits into from
Feb 11, 2015

Conversation

josePhoenix
Copy link
Collaborator

This includes some rearranging of stuff in JWInstrument to create a SpaceTelescopeInstrument class as a common base for JWST and WFIRST. It also loads instrument filters the "new" way, from an instrument-specific table rather than one big table for all.

@mperrin
Copy link
Owner

mperrin commented Jan 29, 2015

@josePhoenix this PR can no longer be merged automatically - could you try merging master back into your branch?

Also I've now gotten Travis working for WebbPSF as well as Poppy so I think we ought to be able to use it to check the PR passes all tests, if you update the PR again to trigger a build.

Conflicts:
	webbpsf/webbpsf_core.py
@josePhoenix
Copy link
Collaborator Author

Updated! The build probably won't work yet, for reasons we discussed by email.

@mperrin
Copy link
Owner

mperrin commented Feb 10, 2015

Since this needs the filter information split out into separate .tsv files, can you send me all those before I merge this? Thanks.

@josePhoenix
Copy link
Collaborator Author

Hmm, I seem to remember that we copied those into the instrument sub folders in /grp/jwst/ote/webbpsf-data. I can't check from here, but if they're not there I'll send them to you when I get in tomorrow.

On Feb 9, 2015, at 10:41 PM, Marshall Perrin notifications@github.com wrote:

Since this needs the filter information split out into separate .tsv files, can you send me all those before I merge this? Thanks.


Reply to this email directly or view it on GitHub.

@mperrin
Copy link
Owner

mperrin commented Feb 10, 2015

Ah OK right. I do have those files in /grp/jwst/etc, just not in the local copy on my desktop. Easy fix on my end. Thanks!

mperrin added a commit that referenced this pull request Feb 11, 2015
WFIRST changes without any GUI stuff
@mperrin mperrin merged commit a165ccc into mperrin:master Feb 11, 2015
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.

None yet

2 participants