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

Prepare for release candidate v6.11.0.3rc1 #38592

Merged
merged 129 commits into from
Jan 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
902fcd1
Replace boost ends_with with std::string equivalent.
thomashampson Oct 29, 2024
18ada7e
Merge pull request #38482 from peterfpeterson/cppcheck_suppressions_o…
peterfpeterson Dec 6, 2024
9e4c44f
Ignore in-source build of conda
peterfpeterson Dec 5, 2024
f64d89f
Move muon loader confidence check out of exec method
robertapplin Oct 30, 2024
dceeace
Add system tests for muon loading
robertapplin Oct 23, 2024
375996c
Merge pull request #38479 from peterfpeterson/muon-loader-confidence
peterfpeterson Dec 6, 2024
83ebb0b
Merge pull request #38485 from peterfpeterson/ignore_conda_build
peterfpeterson Dec 6, 2024
7d1de1e
Fix cppcheck warnings and remove unused headers
peterfpeterson Dec 9, 2024
7249bd2
Merge pull request #38496 from peterfpeterson/cppcheck_fixes
peterfpeterson Dec 10, 2024
b4e0a2a
#38451 Sibling: Create MatrixWorkspace::plot_type property (#38495)
ktactac-ornl Dec 10, 2024
c631831
Move muon hdf4 loaders to muon library
robertapplin Dec 5, 2024
15eb461
Merge pull request #38508 from peterfpeterson/38214-move-muon-hdf4-lo…
peterfpeterson Dec 13, 2024
96ab99b
Log cppcheck command during configure step
peterfpeterson Dec 12, 2024
c937344
Add QTransform base class
rosswhitfield Dec 10, 2024
7bc5372
Add tests for QTransform
rosswhitfield Dec 12, 2024
8eac2ec
Add MagneticFormFactorCorrectionMD algorithm
rosswhitfield Dec 13, 2024
4a6b734
Add tests for MagneticFormFactorCorrectionMD
rosswhitfield Dec 13, 2024
bd055f1
Update docs for MagneticFormFactorCorrectionMD
rosswhitfield Dec 16, 2024
af018dd
Update CppCheck_Suppressions
rosswhitfield Dec 16, 2024
84968f1
Add release notes
rosswhitfield Dec 16, 2024
2cfa9cc
#38487 Sibling - Bugfix: isDistribution After Divide of Two RaggedWor…
ktactac-ornl Dec 16, 2024
5e9e0c5
Fixing face centered lattice
zjmorgan Dec 16, 2024
c95bf2a
Merge pull request #38516 from mantidproject/fix_reflection_condition…
peterfpeterson Dec 16, 2024
9dd36cf
Change atom labels to the ones that were supplied
peterfpeterson Dec 17, 2024
e346929
Switch to generated DllConfig.h
peterfpeterson Dec 17, 2024
beb0099
Merge pull request #38521 from rosswhitfield/MagneticFormFactorCorrec…
rosswhitfield Dec 18, 2024
4c0202f
Remove MantidKernel/System.h
peterfpeterson Dec 18, 2024
da985e5
Remove empty unit tests
peterfpeterson Dec 18, 2024
bd660f4
Merge pull request #38527 from peterfpeterson/cppcheck_command
peterfpeterson Dec 18, 2024
cc1d371
Merge pull request #38528 from peterfpeterson/ewm8669_isotropic_labels
peterfpeterson Dec 18, 2024
a3addd2
Merge pull request #38531 from peterfpeterson/38457_sinq_system_h
peterfpeterson Dec 19, 2024
5b8b829
Merge pull request #38533 from peterfpeterson/38457_remove_includes
peterfpeterson Dec 19, 2024
a0b77af
solve the interpolation issue
Dec 19, 2024
da86e0b
Merge pull request #38540 from peterfpeterson/interpo_issue_fix
peterfpeterson Dec 20, 2024
19d66fd
Remove unused MantidKernel/System.h import
peterfpeterson Dec 20, 2024
18cde14
Merge pull request #38547 from peterfpeterson/38457_system_h_in_cpp
peterfpeterson Dec 27, 2024
565cc39
Move from MantidKernel/System.h to DllConfig.h
peterfpeterson Dec 23, 2024
bb30eb0
Add support for histogram ragged workspaces with density=true
peterfpeterson Dec 31, 2024
e81b9fc
Advance to what is on main
peterfpeterson Jan 3, 2025
97bf4ac
Merge pull request #38553 from peterfpeterson/38457_more_places
peterfpeterson Jan 3, 2025
8a350da
Merge pull request #38554 from peterfpeterson/pre-commit-ci-update-co…
peterfpeterson Jan 3, 2025
2636807
Update developer dependencies
peterfpeterson Nov 4, 2024
d19ed26
Add conda-verify to quiet packaging warning
peterfpeterson Nov 26, 2024
98b4343
Replace nexus with its dependencies
peterfpeterson Nov 26, 2024
6acf1c1
First copying of files into NexusCpp subpackage
peterfpeterson Nov 27, 2024
94882a6
Add tests which compile but fail
peterfpeterson Nov 27, 2024
cd8b293
Remove files that implement xml backend
peterfpeterson Nov 27, 2024
1326ba3
Remove ifdef for xml
peterfpeterson Nov 27, 2024
1842b0c
Add test for unlimited arrays
peterfpeterson Nov 27, 2024
4d4e768
Fix cppcheck warnings
peterfpeterson Nov 27, 2024
441d26e
Remove NeXusStream class
peterfpeterson Dec 2, 2024
cc75a73
Fix compiler warnings and cppcheck
peterfpeterson Dec 2, 2024
1c62348
Give cpp tests standard extension
peterfpeterson Dec 2, 2024
ff3c053
Move contents of nxconfig into napiconfig
peterfpeterson Dec 2, 2024
b362ba8
Bare minimum to get the code to compile and link as c++
peterfpeterson Dec 2, 2024
27fb948
Lots of little changes to make it more c++ ish
peterfpeterson Dec 2, 2024
11b93a9
Make test errors clearer
peterfpeterson Dec 3, 2024
36f6e97
Change import from nexus to MantidNexusCpp
peterfpeterson Dec 3, 2024
9b06b64
Fix cppcheck issues
peterfpeterson Dec 4, 2024
9cada48
Undo cppcheck fix
peterfpeterson Dec 6, 2024
426c5f0
Fix cppcheck issues in nexuscpp
peterfpeterson Dec 4, 2024
4710063
Refactor printing into utility function
peterfpeterson Dec 9, 2024
c4dcc85
Create external data files on the fly
peterfpeterson Dec 9, 2024
2ef5395
Always return that creating the attribute was ok
peterfpeterson Dec 10, 2024
d6376c4
Fix cppcheck issues
peterfpeterson Dec 10, 2024
0baa2e0
Remove incorrect imports
peterfpeterson Dec 10, 2024
52aadb5
Fix compiler warnings
peterfpeterson Dec 11, 2024
cb5c7d5
Stop using deprecated functions
peterfpeterson Dec 11, 2024
ffbb9f3
Fix cppcheck issues
peterfpeterson Dec 12, 2024
1727918
Remove system nexus finder
peterfpeterson Dec 12, 2024
cbe862c
Change error reporting function to take const string
peterfpeterson Dec 12, 2024
64fbef3
Remove deprecated function
peterfpeterson Dec 12, 2024
381510e
Make final parameter const for clang
peterfpeterson Dec 12, 2024
a5fb713
Do not capture exception that is rethrown
peterfpeterson Dec 12, 2024
0e3306f
Import nxconfig to help windows build
peterfpeterson Dec 12, 2024
5c29a5a
Change order of modules
peterfpeterson Dec 12, 2024
13a968f
Skip clang compiler rather than intel
peterfpeterson Dec 12, 2024
45a40e3
Copy configuration from Kernel to fix windows
peterfpeterson Dec 12, 2024
5875e92
Remove wrong header file
peterfpeterson Dec 13, 2024
b5e11b4
Change signature to quiet msvs warnings
peterfpeterson Dec 13, 2024
6893cf7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
e834a20
Remove unused setnumberformat function
peterfpeterson Dec 13, 2024
70a95d6
Use strdup variant on windows
peterfpeterson Dec 13, 2024
8e8c858
Fix compiler warnings on windows
peterfpeterson Dec 16, 2024
d6f1d18
Change default create to hdf5
peterfpeterson Dec 16, 2024
85c5275
Skipping external file tests on windows
peterfpeterson Dec 17, 2024
dca4462
Try to make windows test errors clearer
peterfpeterson Dec 17, 2024
ebbc6c7
No longer configure packagesetup.py because nexus is gone
peterfpeterson Dec 18, 2024
6389e41
Turn off the c-hdf5 test on windows
peterfpeterson Dec 20, 2024
e59830b
Update cppcheck suppression
peterfpeterson Dec 29, 2024
2853d4c
Remove commented out code and change some magic numbers to constants
peterfpeterson Jan 3, 2025
d19bd19
Fix invalid data when MDHistoworkspace replaced and has original work…
rosswhitfield Jan 6, 2025
73c368c
Add release note
rosswhitfield Jan 6, 2025
be49167
update plotting
searscr Dec 27, 2024
bf5d0b4
update cppCheck
searscr Dec 27, 2024
b5b30ac
fix doxygen
searscr Dec 27, 2024
ed46544
Release Notes
searscr Dec 31, 2024
d450db7
Merge pull request #38555 from mantidproject/ewm7830_plotMarkerWS_ORN…
peterfpeterson Jan 6, 2025
1c096c4
Move string constants to the top of the test file
peterfpeterson Jan 6, 2025
d5cfffb
Pin scipy to less than v1.15.0
sf1919 Jan 6, 2025
f3a2228
Merge pull request #38563 from peterfpeterson/pin_scipy_Jan25_ornlnext
peterfpeterson Jan 6, 2025
5dc6ce1
Do not double read when actual matches requested
peterfpeterson Dec 26, 2024
3c6a54a
Add ability to read portions of the data
peterfpeterson Dec 27, 2024
325fb4a
Combine functions by using default values
peterfpeterson Jan 6, 2025
8e31f79
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jan 6, 2025
983d8c8
Set cmake policy CMP0177 to new
jclarkeSTFC Dec 20, 2024
d5a7794
Drop scipy pin, relax tolerance for AbinsPowderCalculatorTest
ajjackson Jan 6, 2025
57a0d30
Merge pull request #38568 from peterfpeterson/pre-commit-ci-update-co…
peterfpeterson Jan 7, 2025
8bb269a
Merge pull request #38569 from peterfpeterson/ewm8446_nexus_into_mantid
peterfpeterson Jan 7, 2025
fcd49ba
Merge pull request #38570 from peterfpeterson/38437_fix_cmake_warning…
peterfpeterson Jan 7, 2025
3a41a4c
Merge pull request #38571 from peterfpeterson/ewm8789_convert_units_r…
peterfpeterson Jan 7, 2025
1701172
Merge pull request #38572 from peterfpeterson/abins-scipy-constants-o…
peterfpeterson Jan 7, 2025
94614aa
Remove includes of MantidKernel/System.h
peterfpeterson Jan 7, 2025
ed43820
Update googletest to version 1.15.2
jclarkeSTFC Dec 20, 2024
00d2658
Merge pull request #38575 from peterfpeterson/update_googletest_1_15_…
peterfpeterson Jan 8, 2025
f7982b0
Clarify that gtest is pinned to v1.15.2
peterfpeterson Jan 8, 2025
ff47bef
Merge pull request #38576 from peterfpeterson/38332_h5util_improvements
peterfpeterson Jan 8, 2025
bc7e058
Merge pull request #38579 from peterfpeterson/38457_generate_export_h…
peterfpeterson Jan 9, 2025
e0e6386
Code cleanup
peterfpeterson Dec 20, 2024
7304aed
Improve algorithm user documentation
peterfpeterson Dec 20, 2024
8752da4
Cleanup release notes directories
peterfpeterson Dec 23, 2024
cafbc9c
More clarification on how the algorithm works
peterfpeterson Jan 6, 2025
8cea670
Remove unnecessary word
peterfpeterson Jan 6, 2025
0610193
Flip for/if for a little speed boost
peterfpeterson Jan 9, 2025
0ac1c78
Merge pull request #38585 from peterfpeterson/gtest_pin
peterfpeterson Jan 9, 2025
0453e5e
Merge pull request #38586 from rosswhitfield/fix_sliceviewer_data_exc…
rosswhitfield Jan 10, 2025
9c6d1b1
Remove clang-format suppressions
peterfpeterson Jan 9, 2025
2a4279c
Merge pull request #38589 from peterfpeterson/cc_gdo_docs
peterfpeterson Jan 10, 2025
3bc0c16
Merge pull request #38590 from peterfpeterson/38332_nexus_sorted_incl…
peterfpeterson Jan 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not double read when actual matches requested
peterfpeterson committed Jan 6, 2025
commit 5dc6ce10029d563663ac45c8d45dcf591f97f65b
10 changes: 4 additions & 6 deletions Framework/Nexus/src/H5Util.cpp
Original file line number Diff line number Diff line change
@@ -380,15 +380,13 @@ std::vector<NumT> readNumArrayAttributeCoerce(const H5::H5Object &object, const
}

template <typename NumT> void readArray1DCoerce(const DataSet &dataset, std::vector<NumT> &output) {
DataType dataType = dataset.getDataType();
const DataType dataType = dataset.getDataType();

if (getType<NumT>() == dataType) { // no conversion necessary
DataSpace dataSpace = dataset.getSpace();
output.resize(dataSpace.getSelectNpoints());
const DataSpace dataSpace = dataset.getSpace();
output.resize(static_cast<size_t>(dataSpace.getSelectNpoints()));
dataset.read(output.data(), dataType, dataSpace);
}

if (PredType::NATIVE_INT32 == dataType) {
} else if (PredType::NATIVE_INT32 == dataType) {
convertingRead<int32_t>(dataset, dataType, output);
} else if (PredType::NATIVE_UINT32 == dataType) {
convertingRead<uint32_t>(dataset, dataType, output);