search

faitdivers / pyao

PyAO - Adaptive Optics simulation package
6 stars 0 forks source link

Issue66 #68

Closed NKant13 closed 10 years ago

NKant13 commented 10 years ago

Found only a bug in the main where centLensx/y must be an array instead of a list. When this was solved the mainWFS.py worked without any errors. Also included a test function and made some adjustments to the mainWFS.py regarding the number of samples the intensity distribution has.

forcaeluz commented 10 years ago

As it is now I cannot merge it, as there are conflicts with the master. You have to merge the current master into your branch and manually solve the conflicts with the master.

NKant13 commented 10 years ago

So it is ready to merge? And I have to merge it?

forcaeluz commented 10 years ago

Not ready yet, as your branch still has conflicts with the master. You can merge the master into your branch to solve the conflicts. To be clear, you shouldn't use the "Merge pull request" button.

Do you need help merging the master into your branch?

forcaeluz commented 10 years ago

Confirm that we need Scipy 0.13 or higher to get this running. If you merge the master into your branch to solve conflicts, I can merge the pull request later, and close the issue.

NKant13 commented 10 years ago

Conflicts should be solved.

forcaeluz commented 10 years ago

Not yet. (When they are solved, you see the "Merge pull request" button on this page get green. Probably you merged with an outdated master.

Solve the conflicts, commit, and push the changes to you branch on github. After that it should have all the conflicts solved.

forcaeluz commented 10 years ago

It also seems you deleted the content of your test file.

NKant13 commented 10 years ago

Already on it! That was the old test file.