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

Cdi plot #294

Merged
merged 8 commits into from
Jun 30, 2015
Merged

Cdi plot #294

merged 8 commits into from
Jun 30, 2015

Conversation

licode
Copy link
Contributor

@licode licode commented Jun 29, 2015

Add plotting function to cdi reconstruction.

@@ -281,6 +283,10 @@ def cdi_recon(diffracted_pattern, sample_obj, sup,
n_iterations : int, optional
number of iterations to run.
default is 1000.
plot_function : function, optional
plotting function
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this is a callback function that expects to receive these four objects: sample_obj, obj_error, diff_error, sup_error

@licode
Copy link
Contributor Author

licode commented Jun 29, 2015

Done. thanks!

@@ -45,6 +45,7 @@
import numpy as np
import time
from scipy.ndimage.filters import gaussian_filter
import matplotlib.pyplot as plt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not need this import here

@licode
Copy link
Contributor Author

licode commented Jun 30, 2015

Done!

@@ -281,6 +282,12 @@ def cdi_recon(diffracted_pattern, sample_obj, sup,
n_iterations : int, optional
number of iterations to run.
default is 1000.
cb_function : function, optional
This is a callback function that expects to receive these
four objects: sample_obj, obj_error, diff_error, sup_error
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also list the expected types. Imaging reading this doc string with out having read the function, but wanting to write a callback to plug into this.

@tacaswell
Copy link
Member

Two minor doc/naming comments, but 👍 to merge as soon as those are fixed.

@licode
Copy link
Contributor Author

licode commented Jun 30, 2015

Updated.

tacaswell added a commit that referenced this pull request Jun 30, 2015
@tacaswell tacaswell merged commit ac76748 into scikit-beam:master Jun 30, 2015
@licode licode deleted the cdi_plot branch January 11, 2016 19:39
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.

None yet

3 participants