Skip to content
This repository has been archived by the owner on Sep 27, 2021. It is now read-only.

maxindex correction in csg_resample #575

Merged
merged 3 commits into from
Aug 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Version 2021-dev
- read units stored in H5MD file (#549)
- enable CXX only in CMake (#560)
- refactored tests to use files instead of data in source code (#572)
- corrected max index in csg_resample (#575)

Version 1.6.2 (released XX.07.20)
=================================
Expand Down
2 changes: 1 addition & 1 deletion src/tools/csg_resample.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ int main(int argc, char **argv) {
if (in.x(i) < sp_min) {
junghans marked this conversation as resolved.
Show resolved Hide resolved
minindex = i;
}
if (in.x(i) < sp_max) {
if (in.x(i) <= sp_max) {
junghans marked this conversation as resolved.
Show resolved Hide resolved
maxindex = i;
}
}
Expand Down
20 changes: 10 additions & 10 deletions src/tools/references/csg_resample/table_cubicfit
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
0 0.9739102263 i
1 2.145689133 i
2 2.676548033 i
3 2.19769654 i
4 1.428862755 i
5 1.167379552 i
6 1.432480399 i
7 2.058572883 i
8 2.918860478 i
9 3.896245629 i
0 0.9324530711 i
1 2.21049713 i
2 2.735043252 i
3 2.099478317 i
4 1.284728477 i
5 1.281849978 i
6 1.734880172 i
7 2.079710618 i
8 2.26666861 i
9 2.374690376 i