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

Phase calculation #3

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

Phase calculation #3

wants to merge 49 commits into from

Conversation

npricejones
Copy link
Contributor

At Ue-Li's request, I wrote a python program that calculates the phase at a given time by taking a file of arrival times. Included are a couple of files to serve as input. The program also generates an array of times that have thus far been used for testing purposes.

@mhvk
Copy link
Owner

mhvk commented Jun 19, 2013

@NatalieP-J - think it would be fine to merge but the pull request includes my changes and hence it cannot be done. Can you rebase? Essentially,

git fetch upstream
git checkout your-branch-name
git rebase upstream/master

@npricejones
Copy link
Contributor Author

@mhvk I am still fighting with git, but it doesn't seem like I'm having any luck. I just can't get things to merge properly. I'll let you know if I make any progress

@mhvk
Copy link
Owner

mhvk commented Jun 19, 2013

@NatalieP-J - it does look like it could now be merged, in principle. Are the .dat files easy to re-generate or are they from folding? If easy to regenerate, I'd just put the code that makes them; otherwise, fine to include.

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.

2 participants