Two time correlation #276
Closed
Two time correlation #276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* upstream/master: API: changed the diff_roi_choice.py to roi.py and tests/test_diff_roi_choice.py to tests/test_roi.py ENH: took out the grid_values function used the function in core.py and made some chnages according to Tom's comments ENH: changed the functions in this module(diff_roi_choice) to easily use in one time correlation so now roi functions only returns the labels array ENH: Un-hide numpy's pre-allocation option
…images) and to _two_time_process function
…time correlation functions
* danielballan/roi-edits: (31 commits) MNT/DOC: Minor fixes DOC: Add change in angle_grid orientation to API changes. DOC: Tweak wording of angle_grid note. BLD: Make Travis faster by running in container. TST: Several more tests for segmented_rings. FIX: segments=N should draw N segments TST: Test segmented_rings more thoroughly. DOC/TST: Document and test angle convention. TST: modifies the tests, took out the parts that was adding for more tests. Will add them near future TST: modifed the test for segmentation_rings and modified teh segmentation_rings to get the correct label_aray API: modified the function sto use core.angle_grid and core.radial_grid instead of core.pixel_to_phi and core.pixel_to_radius DOC: Change rr, cc indication format. REF: Tweak logic / varnames / comments in segmented_rings. ENH: Validate input to segmented_rings. FIX/API: Update other modules to core API change. DOC: Document API change in core funcs. API: "slicing" -> "segments" PERF/CLN: Ravel once. CLN: Remove unneeded function. API: Tweak names and use new functions in core. ...
…on validate_inputs
| @@ -367,3 +344,337 @@ def extract_label_indices(labels): | |||
| label_mask = labels[labels > 0] | |||
|
|
|||
| return label_mask, pixel_list | |||
|
|
|||
|
|
|||
| def two_time_corr(num_levels, num_bufs, labels, images): | |||
There was a problem hiding this comment.
I'm not sure the _corr is needed, as the module where this function resides is called correlation. I think that the import would look nice and be just as descriptive if the _corr was dropped. e.g.,
from skxray.correlation import two_timeThoughts?
There was a problem hiding this comment.
Sure, yes I think it is better in this way
… function name two_time_corr to two_time
* upstream/master: (90 commits) STY: checked with PEP8 API: removed the tests/roi.py functions and added all the test to core.tests.roi ENH: changed the returning dict for ROI pixel values CLN: removed un-used local variable MNT: re-arranged code and test locations ENH: add XSVS TST: Make the image correlation test twice the num_bufs TST: Fix py2 unicode issues MNT: Fix package data MNT: Remove examples from scikit-xray MNT: Remove unicode literals from __future__ import MNT: Tests passing TST: Enable 1-time correlation test again TST: fix broken tests ENH: Move dpc demo to scikit-xray from skxray-examples API: Add imports back to the fluorescence namespace MNT: Rename 'demos' to 'examples' ENH: Fix xrf spectrum demo MNT: Remove io/api.py MNT: Make all library imports relative ... Conflicts: skxray/core/correlation.py skxray/core/tests/test_correlation.py
|
@sameera2004 what is the development status of this branch? |
|
@ericdill Yes this is my next plan, Right now it is broken, I will fix this and discuss with Andrei and Yugang. Looks like CHX will not need it soon, may be CSX will need soon? |
|
Closing this due to merge conflicts, New PR is added for two time correlation |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.