functionalize and remove the StampCreator class #761
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
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
jeremykubica
approved these changes
Dec 18, 2024
| @@ -55,7 +54,6 @@ def run_search_benchmark(params): | |||
|
|
|||
| # Create an empty search stack. | |||
| # im_stack = ImageStack([]) | |||
| sc = StampCreator() | |||
|
|
|||
| # Do the timing runs. | |||
| tmr = timeit.Timer(stmt="sc.filter_stamp(stamp, params)", globals=locals()) | |||
There was a problem hiding this comment.
This will need to be changed because sc no longer exists.
| StampCreator::StampCreator() {} | ||
|
|
||
| std::vector<RawImage> StampCreator::create_stamps(ImageStack& stack, const Trajectory& trj, int radius, | ||
| std::vector<RawImage> create_stamps(ImageStack& stack, const Trajectory& trj, int radius, | ||
| bool keep_no_data, const std::vector<bool>& use_index) { |
There was a problem hiding this comment.
This line should moved left to align with the line above.
| std::vector<bool> empty_vect; | ||
| return create_stamps(stack, t, radius, false /*=keep_no_data*/, empty_vect); | ||
| } | ||
|
|
||
| // For creating coadded stamps, we do not interpolate the pixel values and keep | ||
| // invalid pixels tagged (so we can filter it out of mean/median). | ||
| RawImage StampCreator::get_median_stamp(ImageStack& stack, const Trajectory& trj, int radius, | ||
| RawImage get_median_stamp(ImageStack& stack, const Trajectory& trj, int radius, | ||
| const std::vector<bool>& use_index) { |
There was a problem hiding this comment.
This line should be moved left to align with the line above.
| const std::vector<bool>& use_index) { | ||
| return create_median_image(create_stamps(stack, trj, radius, true /*=keep_no_data*/, use_index)); | ||
| } | ||
|
|
||
| // For creating coadded stamps, we do not interpolate the pixel values and keep | ||
| // invalid pixels tagged (so we can filter it out of mean/median). | ||
| RawImage StampCreator::get_mean_stamp(ImageStack& stack, const Trajectory& trj, int radius, | ||
| RawImage get_mean_stamp(ImageStack& stack, const Trajectory& trj, int radius, | ||
| const std::vector<bool>& use_index) { |
There was a problem hiding this comment.
This line should be moved left to align with the line above.
| const std::vector<bool>& use_index) { | ||
| return create_mean_image(create_stamps(stack, trj, radius, true /*=keep_no_data*/, use_index)); | ||
| } | ||
|
|
||
| // For creating summed stamps, we do not interpolate the pixel values and replace | ||
| // invalid pixels with zero (which is the same as filtering it out for the sum). | ||
| RawImage StampCreator::get_summed_stamp(ImageStack& stack, const Trajectory& trj, int radius, | ||
| RawImage get_summed_stamp(ImageStack& stack, const Trajectory& trj, int radius, | ||
| const std::vector<bool>& use_index) { |
There was a problem hiding this comment.
This line should be moved left to align with the line above.
| const std::vector<bool>& use_index) { | ||
| return create_summed_image(create_stamps(stack, trj, radius, false /*=keep_no_data*/, use_index)); | ||
| } | ||
|
|
||
| std::vector<RawImage> StampCreator::get_coadded_stamps(ImageStack& stack, std::vector<Trajectory>& t_array, | ||
| std::vector<RawImage> get_coadded_stamps(ImageStack& stack, std::vector<Trajectory>& t_array, | ||
| std::vector<std::vector<bool>>& use_index_vect, |
There was a problem hiding this comment.
These two lines should be moved left to align with the line above.
| @@ -80,7 +78,7 @@ std::vector<RawImage> StampCreator::get_coadded_stamps(ImageStack& stack, std::v | |||
| return get_coadded_stamps_cpu(stack, t_array, use_index_vect, params); | |||
| } | |||
|
|
|||
| std::vector<RawImage> StampCreator::get_coadded_stamps_cpu(ImageStack& stack, | |||
| std::vector<RawImage> get_coadded_stamps_cpu(ImageStack& stack, | |||
There was a problem hiding this comment.
The lines below should be moved left to align with this line.
| @@ -159,7 +157,7 @@ bool StampCreator::filter_stamp(const RawImage& img, const StampParameters& para | |||
| return false; | |||
| } | |||
|
|
|||
| std::vector<RawImage> StampCreator::get_coadded_stamps_gpu(ImageStack& stack, | |||
| std::vector<RawImage> get_coadded_stamps_gpu(ImageStack& stack, | |||
There was a problem hiding this comment.
The lines below should be moved left to align with this line.
| @@ -273,7 +271,7 @@ std::vector<RawImage> StampCreator::get_coadded_stamps_gpu(ImageStack& stack, | |||
| return results; | |||
| } | |||
|
|
|||
| std::vector<RawImage> StampCreator::create_variance_stamps(ImageStack& stack, const Trajectory& trj, | |||
| std::vector<RawImage> create_variance_stamps(ImageStack& stack, const Trajectory& trj, | |||
There was a problem hiding this comment.
The lines below should be moved left to align with this line.
| @@ -295,7 +293,7 @@ std::vector<RawImage> StampCreator::create_variance_stamps(ImageStack& stack, co | |||
| return stamps; | |||
| } | |||
|
|
|||
| RawImage StampCreator::get_variance_weighted_stamp(ImageStack& stack, const Trajectory& trj, int radius, | |||
| RawImage get_variance_weighted_stamp(ImageStack& stack, const Trajectory& trj, int radius, | |||
There was a problem hiding this comment.
The line below should be moved left to align with this line.
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.
Removes the
StampCreatorand leaves all of its methods as functionsresolves #714
(was going through the backlog looking for something to do and couldn't resist the urge to make something more functional)