search

openEXO / cloud-kepler

Cloud Kepler is a cloud enabled Kepler Planet searching pipeline
8 stars 3 forks source link

emprice-cython #45

Closed emprice closed 10 years ago

emprice commented 10 years ago

This code is pretty much ready to be merged into master, barring any small bugs we may find in the next week or so.

scfleming commented 10 years ago

@emprice There are some conflicts with this merge. I think they are solvable, but can you confirm that the patch with is_straddling when duration was assumed to be in hours but should be in days is fixed? In the main branch this was done on the call to is_straddling in the unit tests by explitictly dividing by 24, but I don't see this anymore. On the cython branch, it looks like the durations are being defined in days to begin with? but please confirm.

emprice commented 10 years ago

Yes, I've changed all the code so that durations are in the same time units as midtimes, etc. (presumably days). This makes debugging a lot easier because the time units aren't assumed by the code.

I'm also somewhat experienced with resolving git conflicts, so when we're ready to do the merge, I can take care of all the conflicts.

scfleming commented 10 years ago

Double check the merge but I think everything is correct on master now. If so, please go ahead and delete the cython branch.

emprice commented 10 years ago

Everything looks good to me!