Fixed zapbirds bug #18

Merged
merged 2 commits into from Oct 31, 2012

Projects

None yet

2 participants

@pscholz
pscholz commented Oct 29, 2012

Hi Scott. Here's the pull request for the small fix in zapbirds. My master branch also includes some commits from Kevin's implementation of zerodming. There is also a commit where I found 2 free() calls in explorefft.c that should be vect_free() calls. You probably just want to cherry pick the zapbird fix commit and the explorefft vect_free fix commit.

Paul

@scottransom
Owner

Hmmm. Yeah, this is not the way to do pull requests in general. You
want to make sure that the one doing the pull can and will merge things
cleanly. I don't want the hack zerodm stuff in the master presto.

I'll see if I can cherry-pick, though. And thanks for finding the other
vect_free() issue.

Scott

On 10/29/2012 03:26 PM, Paul Scholz wrote:

Hi Scott. Here's the pull request for the small fix in zapbirds. My
master branch also includes some commits from Kevin's implementation of
zerodming. There is also a commit where I found 2 free() calls in
explorefft.c that should be vect_free() calls. You probably just want to
cherry pick the zapbird fix commit and the explorefft vect_free fix commit.

Paul


    You can merge this Pull Request by running:

git pull https://github.com/pscholz/presto master

Or view, comment on, or merge it at:

#18

    Commit Summary


Reply to this email directly or view it on GitHub
#18.

Web Bug from
https://github.com/notifications/beacon/Prz-m8buh6PILMyQxI5OzFBF4McVyXYiDJelIlO4H9esynDVCsJ2WrkqKTg2t1xW.gif

Scott M. Ransom Address: NRAO
Phone: (434) 296-0320 520 Edgemont Rd.
email: sransom@nrao.edu Charlottesville, VA 22903 USA
GPG Fingerprint: 06A9 9553 78BE 16DB 407B FFCA 9BFA B6FF FFD3 2989

@pscholz
pscholz commented Oct 31, 2012

Hi Scott. I cleaned my master branch so it should be a simple pull now and
you wont have to cherry pick. Let me know if it works.

On Mon, Oct 29, 2012 at 3:36 PM, Scott Ransom notifications@github.comwrote:

Hmmm. Yeah, this is not the way to do pull requests in general. You
want to make sure that the one doing the pull can and will merge things
cleanly. I don't want the hack zerodm stuff in the master presto.

I'll see if I can cherry-pick, though. And thanks for finding the other
vect_free() issue.

Scott

On 10/29/2012 03:26 PM, Paul Scholz wrote:

Hi Scott. Here's the pull request for the small fix in zapbirds. My
master branch also includes some commits from Kevin's implementation of
zerodming. There is also a commit where I found 2 free() calls in
explorefft.c that should be vect_free() calls. You probably just want to
cherry pick the zapbird fix commit and the explorefft vect_free fix
commit.

Paul


You can merge this Pull Request by running:

git pull https://github.com/pscholz/presto master

Or view, comment on, or merge it at:

#18

Commit Summary

  • Added -zerodm option to prepsubband.
  • Merge https://github.com/scottransom/presto
  • Added semi-support for LWA1. Suppressing warning messages about
  • Changed free() calls to vect_free() calls in explorefft.c
  • Merge git://github.com/scottransom/presto
  • Fixed bug where zapbirds was trying to zap 0 bins.

File Changes

  • M src/explorefft.c (4)
  • M src/misc_utils.c (3)
  • M src/psrfits.c (8)
  • M src/zapbirds.c (2)

Patch Links


Reply to this email directly or view it on GitHub
#18.

Web Bug from

https://github.com/notifications/beacon/Prz-m8buh6PILMyQxI5OzFBF4McVyXYiDJelIlO4H9esynDVCsJ2WrkqKTg2t1xW.gif

Scott M. Ransom Address: NRAO
Phone: (434) 296-0320 520 Edgemont Rd.
email: sransom@nrao.edu Charlottesville, VA 22903 USA
GPG Fingerprint: 06A9 9553 78BE 16DB 407B FFCA 9BFA B6FF FFD3 2989


Reply to this email directly or view it on GitHubhttps://github.com/scottransom/presto/pull/18#issuecomment-9882319.

@scottransom scottransom merged commit 0a497f6 into scottransom:master Oct 31, 2012
@scottransom
Owner

Thanks for this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment