Samwalton9
commented
8 years ago Great!
I'm still figuring out whether the masking is working, because it doesn't seem to be right now, but when it is I'll push it up.
On 17/02/16 10:15, Ted Mackereth wrote:
Ive worked out what all those <<<<<<HEAD things mean haha
if you try to pull something thats got loads of changes those symbols mark out the major changes so you can correct them. I think i have now made it so your recent changes and mine are all consistent, so the new mass cut is there but also my snip shot stuff is treated correctly. The one thing i think now needs to be added/changed is the stuff you did yesterday to the saving etc.
Notice that the saving function has separate sections for snips and snaps now.
Hopefully this all works ok, its my fault for not keeping up with the git
You can view, comment on, or merge this pull request online at:
https://github.com/jmackereth/eaglestuff/pull/16
Commit Summary
- New memory usage reduction, object oriented mode etc.
- Latest Version -- Ted
- Brought my branch in line with mass cut changes
File Changes
- M etools.pyhttps://github.com/jmackereth/eaglestuff/pull/16/files#diff-0 (332)
Patch Links:
- https://github.com/jmackereth/eaglestuff/pull/16.patch
- https://github.com/jmackereth/eaglestuff/pull/16.diff
— Reply to this email directly or view it on GitHubhttps://github.com/jmackereth/eaglestuff/pull/16.
PhD Student Astrophysics Research Institute, LJMU S.R.Walton@2011.ljmu.ac.ukmailto:S.R.Walton@2011.ljmu.ac.uk
Important Notice: the information in this email and any attachments is for the sole use of the intended recipient(s). If you are not an intended recipient, or a person responsible for delivering it to an intended recipient, you should delete it from your system immediately without disclosing its contents elsewhere and advise the sender by returning the email or by telephoning a number contained in the body of the email. No responsibility is accepted for loss or damage arising from viruses or changes made to this message after it was sent. The views contained in this email are those of the author and not necessarily those of Liverpool John Moores University.
jmackereth
Ive worked out what all those <<<<<<HEAD things mean haha
if you try to pull something thats got loads of changes those symbols mark out the major changes so you can correct them. I think i have now made it so your recent changes and mine are all consistent, so the new mass cut is there but also my snip shot stuff is treated correctly. The one thing i think now needs to be added/changed is the stuff you did yesterday to the saving etc.
Notice that the saving function has separate sections for snips and snaps now.
Hopefully this all works ok, its my fault for not keeping up with the git