final changes to bin_pixels code and mex code
#1892
Conversation
This file contains hidden or 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
…arameters from MATLAB rather then selected, which certainly change.
…ected pixels) # Conflicts: # _LowLevelCode/cpp/bin_pixels_c/bin_pixels.h
…de replacement
…_bin # Conflicts: # horace_core/DLL/_PCWIN64/bin_pixels_c.mexw64 # horace_core/sqw/page_operations/PageOp_sqw_binning.m
…from mex code)
…_bin # Conflicts: # _LowLevelCode/cpp/mtimesx_horace/MatMultiply.h
…supports pixels preselection
…/896a_mex_in_cut' into 896c_all_mex4Axes_bin # Conflicts: # _LowLevelCode/cpp/mtimesx_horace/MatMultiply.h # admin/horace_mex.m # horace_core/DLL/_PCWIN64/bin_pixels_c.mexw64 # horace_core/sqw/page_operations/PageOp_sqw_binning.m
…/1902_integration_ranges' into 896c_all_mex4Axes_bin # Conflicts: # _LowLevelCode/cpp/include/CommonCode.h
…_mex4Axes_bin # Conflicts: # _LowLevelCode/cpp/bin_pixels_c/bin_pixels.h # _LowLevelCode/cpp/hdf_mex_reader/hdf_mex_reader.cpp # _LowLevelCode/cpp/hdf_mex_reader/input_parser.h # _LowLevelCode/cpp/include/CommonCode.h # _LowLevelCode/cpp/mtimesx_horace/MatMultiply.h # horace_core/sqw/axes_blocks/@AxesBlockBase/private/bin_pixels_with_mex_code_.m
… into 896c_all_mex4Axes_bin
# Conflicts: # horace_core/sqw/@rundatah/private/calc_sqw_.m
…AB version (s)
…support policy CMP0159
…pported any more and unused anyway
…bled run docify for the time being
…sabled after Toby's changes
…n in sqw_op_bin_pixels.m
…_bin # Conflicts: # horace_core/DLL/_PCWIN64/bin_pixels_c.mexw64 # horace_core/sqw/axes_blocks/@AxesBlockBase/private/bin_pixels_with_mex_code_.m # horace_core/sqw/page_operations/PageOp_sqw_binning.m
…nkins worker failure
…6c_all_mex4Axes_bin # Conflicts: # horace_core/DLL/_PCWIN64/bin_pixels_c.mexw64 # horace_core/sqw/axes_blocks/@AxesBlockBase/private/bin_pixels_with_mex_code_.m
…+ minor typo in MatMultiply.h
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR (c) completes work on writing mex code, which may substitute MATLAB bin_pixels routine.
Should be considered adfer a) and b) have been merged.
All binning modes, supported by MATLAB
AxesBlockBase.bin_pixelsmethod are supported by correspondent mex code. The PR adds two remaining binning modes (6 and 7) -- actually most often used in cuts and cuts with symmetries.This PR does not close the ticket #896, but finishes with changes to
AxesBlockBase.bin_pixels.The final work would be to modify
bin_pixels_cto support binning modes implemented inline_proj.bin_pixels.