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

ENH: Speckle plotting tools #68

Closed
wants to merge 27 commits into from
Closed

ENH: Speckle plotting tools #68

wants to merge 27 commits into from

Conversation

ericdill
Copy link
Contributor

supersedes #66

@ericdill ericdill mentioned this pull request Jul 21, 2015
@ericdill ericdill changed the title Speckle plotting tools WIP: Speckle plotting tools Jul 22, 2015
@sameera2004
Copy link

@ericdill , @tacaswell wanted me to return the artists added in each plotting function ( in my earlier PR #66)
Are you going to do that?

@ericdill
Copy link
Contributor Author

@sameera2004 yes, i am planning on doing that

@sameera2004
Copy link

@ericdill sure thanks

@sameera2004
Copy link

Are we going to add ipython-notebook examples in this repo too?

@ericdill these fucntions are fine, much better! Thanks

@ericdill
Copy link
Contributor Author

@sameera2004 can you review these changes?

`combine_intensity`+1
"""
num_rois = len(combine_intensity)
if labels is None:

Choose a reason for hiding this comment

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

I think we need "The labels for each element of the mean_intensity list" before combining it, Therefore, it shouldn't be optional.
Before combining it is better to check all the mean intensities from the different image sets have same label list(index list)
Otherwise it can combine different roi's?

@sameera2004
Copy link

@ericdill what is the status of this?

@ericdill
Copy link
Contributor Author

This should be ready to go. I updated the speckle_plotting notebook in scikit-beam/scikit-beam-examples#29

@sameera2004
Copy link

@ericdill speckle-plotting.ipnb' in this PR hasn't updated, one in skray-examples is working, the problem due to changes inroi.mean_inetnsity' function,
error is at roi_data converting to data frame, can you please add the same notebook here?

@sameera2004
Copy link

@ericdill speckle-plotting.ipnb in this PR hasn't updated can you add the same one you have in scikit-xray-examples. This ipnb is not working

@ericdill
Copy link
Contributor Author

I am going to remove the ipython notebook from this PR. I am 👎 on having the same notebook in two places. That seems like a recipe for things getting horribly out of sync, right?

@sameera2004
Copy link

Yes sure

Conflicts:
	examples/plotting/speckle/speckle-plotting.ipynb
It now accepts a dataframe and plots that. This matches the API on
`skxray.core.roi.mean_intensity_sets`, which returns a dataframe.
Relevant skxray commit: 34441f96ea1bc6cb70824338455be948d15d66aa

Conflicts:
	examples/plotting/speckle/speckle-plotting.ipynb
Conflicts:
	examples/plotting/speckle/speckle-plotting.ipynb
Conflicts:
	examples/plotting/speckle/speckle-plotting.ipynb
Conflicts:
	examples/plotting/speckle/speckle-plotting.ipynb
@ericdill
Copy link
Contributor Author

Ok, rebased with edits to get rid of the notebook from this PR

@ericdill ericdill changed the title WIP: Speckle plotting tools ENH: Speckle plotting tools Sep 15, 2015
@sameera2004
Copy link

@ericdill speckle_plotting_tools looks good, can you fix this Travis fail?

@ericdill
Copy link
Contributor Author

Yes I could, but it is failing because there is no .travis file. I will create one in a separate PR

@ericdill
Copy link
Contributor Author

travis is failing because it has no idea what to do, not because there is a specific error

@ericdill
Copy link
Contributor Author

Apparently github has freaked out. All of these commits are already in master...

@ericdill ericdill closed this Sep 16, 2015
@ericdill ericdill deleted the xsvs_plotting branch September 16, 2015 13:41
sameera2004 added a commit to sameera2004/xray-vision that referenced this pull request Sep 16, 2015
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

2 participants