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

feat(autoware_pointcloud_preprocessor): distortion corrector node update azimuth and distance #8380

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
b7ea57d
feat: add option for updating distance and azimuth value
vividf Aug 6, 2024
1bd37c4
chore: clean code
vividf Aug 6, 2024
336f709
chore: remove space
vividf Aug 6, 2024
c8378ac
chore: add documentation
vividf Aug 6, 2024
3081d66
chore: fix docs
vividf Aug 6, 2024
f6394b2
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Aug 6, 2024
94551b6
feat: conversion formula implementation for degree, still need to cha…
vividf Aug 9, 2024
9ac2689
chore: fix tests for AzimuthConversionExists function
vividf Aug 13, 2024
0990c02
feat: add fastatan to utils
vividf Aug 14, 2024
6796341
feat: remove seperate sin, cos and use sin_and_cos function
vividf Aug 14, 2024
afd0fda
chore: fix readme
vividf Aug 14, 2024
9809a4b
chore: fix some grammar errors
vividf Aug 14, 2024
64bfbc5
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Aug 14, 2024
9aeac77
chore: fix spell error
vividf Aug 14, 2024
8a37932
Merge branch 'feature/distortion_corrector_node_update_azimuth_and_di…
vividf Aug 14, 2024
b5dfa85
chore: set debug mode to false
vividf Aug 14, 2024
d55db4b
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Aug 19, 2024
d57f751
chore: set update_azimuth_and_distance default value to false
vividf Aug 19, 2024
8703a23
chore: update readme
vividf Aug 19, 2024
5390055
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Sep 4, 2024
f509d7d
chore: remove cout
vividf Sep 4, 2024
62434fa
chore: add opencv license
vividf Sep 4, 2024
a3c977b
chore: fix grammar error
vividf Sep 4, 2024
ee1b169
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Sep 9, 2024
7288042
style(pre-commit): autofix
pre-commit-ci[bot] Sep 9, 2024
7e1f510
chore: add runtime error when azimuth conversion failed
vividf Sep 9, 2024
b156fb5
chore: change default pointcloud
vividf Sep 9, 2024
0a1f4c9
chore: change function name
vividf Sep 9, 2024
f11e529
chore: move variables to structure
vividf Sep 9, 2024
f0609f5
chore: add random seed
vividf Sep 9, 2024
ec4172e
chore: rewrite get conversion function
vividf Sep 9, 2024
e797752
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Sep 10, 2024
be9d8c9
Merge branch 'feature/distortion_corrector_node_update_azimuth_and_di…
vividf Sep 10, 2024
427a0ce
chore: fix opencv fast atan2 function
vividf Sep 10, 2024
25253c3
chore: fix schema description
vividf Sep 10, 2024
ed3efee
Update sensing/autoware_pointcloud_preprocessor/test/test_distortion_…
vividf Sep 10, 2024
031bc2c
Update sensing/autoware_pointcloud_preprocessor/test/test_distortion_…
vividf Sep 10, 2024
a1f076c
chore: move code to function for readability
vividf Sep 10, 2024
71b1917
chore: simplify code
vividf Sep 10, 2024
80ad8e2
chore: fix sentence, angle conversion
vividf Sep 10, 2024
11b88bd
chore: add more invalid condition
vividf Sep 11, 2024
53f4162
chore: fix the string name to enum
vividf Sep 11, 2024
a65a2bf
chore: remove runtime error
vividf Sep 11, 2024
8a24a79
chore: use optional for AngleConversion structure
vividf Sep 11, 2024
f6c5dab
chore: fix bug and clean code
vividf Sep 11, 2024
4342dca
chore: refactor the logic of calculating conversion
vividf Sep 11, 2024
242ab45
chore: refactor function in unit test
vividf Sep 12, 2024
1d5ccdb
chore: RCLCPP_WARN_STREAM logging when failed to get angle conversion
vividf Sep 12, 2024
5e55d01
chore: improve normalize angle algorithm
vividf Sep 12, 2024
02beb86
chore: improve multiple_of_90_degrees logic
vividf Sep 12, 2024
29f4b96
chore: add opencv license
vividf Sep 12, 2024
b9a5c56
style(pre-commit): autofix
pre-commit-ci[bot] Sep 12, 2024
13d981f
chore: clean code
vividf Sep 12, 2024
96bafef
Merge branch 'feature/distortion_corrector_node_update_azimuth_and_di…
vividf Sep 12, 2024
02b1217
chore: fix sentence
vividf Sep 12, 2024
cdb88ae
style(pre-commit): autofix
pre-commit-ci[bot] Sep 12, 2024
4e3d70a
Merge branch 'feature/distortion_corrector_node_update_azimuth_and_di…
vividf Sep 12, 2024
a853293
chore: add 0 0 0 points in test case
vividf Sep 12, 2024
cd066c4
chore: fix spell error
vividf Sep 12, 2024
5560c1d
Update common/autoware_universe_utils/NOTICE
vividf Sep 13, 2024
4c521c0
Update sensing/autoware_pointcloud_preprocessor/src/distortion_correc…
vividf Sep 13, 2024
8e26988
Update sensing/autoware_pointcloud_preprocessor/src/distortion_correc…
vividf Sep 13, 2024
41f086a
chore: use constexpr for threshold
vividf Sep 13, 2024
8428321
Merge branch 'feature/distortion_corrector_node_update_azimuth_and_di…
vividf Sep 13, 2024
a3e5cd8
chore: fix the path of license
vividf Sep 13, 2024
550a646
chore: explanation for failures
vividf Sep 13, 2024
03354c8
chore: use throttle
vividf Sep 13, 2024
320e961
chore: fix empty pointcloud function
vividf Sep 13, 2024
f6be637
refactor: change camel to snake case
vividf Sep 17, 2024
8d4bcd7
Update sensing/autoware_pointcloud_preprocessor/include/autoware/poin…
vividf Sep 19, 2024
4d58839
Update sensing/autoware_pointcloud_preprocessor/include/autoware/poin…
vividf Sep 19, 2024
1f144d3
style(pre-commit): autofix
pre-commit-ci[bot] Sep 19, 2024
f58307d
Update sensing/autoware_pointcloud_preprocessor/test/test_distortion_…
vividf Sep 19, 2024
896d843
refactor: refactor virtual function in base class
vividf Sep 19, 2024
3027ec1
chore: fix test naming error
vividf Sep 19, 2024
3c74303
chore: fix clang error
vividf Sep 19, 2024
2439956
chore: fix error
vividf Sep 20, 2024
f40d081
Merge branch 'autowarefoundation:main' into feature/distortion_correc…
vividf Sep 25, 2024
4e0b8bf
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Sep 30, 2024
cf27e42
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Sep 30, 2024
783219f
chore: fix clangd
vividf Sep 30, 2024
caafd52
Merge branch 'feature/distortion_corrector_node_update_azimuth_and_di…
vividf Sep 30, 2024
72f5bb2
chore: add runtime error if the setting is wrong
vividf Oct 3, 2024
9663eaa
chore: clean code
vividf Oct 3, 2024
a06ad31
Update sensing/autoware_pointcloud_preprocessor/src/distortion_correc…
vividf Oct 3, 2024
20ffc99
style(pre-commit): autofix
pre-commit-ci[bot] Oct 3, 2024
7f31139
chore: fix unit test for runtime error
vividf Oct 3, 2024
9d1bef7
Update sensing/autoware_pointcloud_preprocessor/docs/distortion-corre…
vividf Oct 8, 2024
bbbc501
chore: fix offset_rad_threshold
vividf Oct 8, 2024
2594e76
chore: change pointer to reference
vividf Oct 8, 2024
9d0aa59
chore: snake_case for unit test
vividf Oct 8, 2024
cfddc0d
chore: fix refactor process twist and imu
vividf Oct 8, 2024
b1ffa5e
chore: fix abs and return type of matrix to tf2
vividf Oct 8, 2024
57824ef
chore: fix grammar error
vividf Oct 8, 2024
9680027
chore: fix readme description
vividf Oct 9, 2024
4bc0df1
chore: remove runtime error
vividf Oct 9, 2024
384abe8
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Oct 24, 2024
a4a693e
Merge branch 'main' into feature/distortion_corrector_node_update_azi…
vividf Oct 28, 2024
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
2 changes: 2 additions & 0 deletions common/autoware_universe_utils/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The function 'opencv_fast_atan2' in /autoware/src/universe/autoware.universe/common/autoware_universe_utils/src/math/trigonometry.cpp
is a modified version of 'fastAtan2' in the OpenCV project. (https://github.com/opencv/opencv/blob/4.x/modules/core/src/mathfuncs_core.simd.hpp)
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ float cos(float radian);

std::pair<float, float> sin_and_cos(float radian);

float opencv_fast_atan2(float dy, float dx);

} // namespace autoware::universe_utils

#endif // AUTOWARE__UNIVERSE_UTILS__MATH__TRIGONOMETRY_HPP_
53 changes: 53 additions & 0 deletions common/autoware_universe_utils/src/math/trigonometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,57 @@ std::pair<float, float> sin_and_cos(float radian)
}
}

// This code is modified from a part of the OpenCV project
// (https://github.com/opencv/opencv/blob/4.x/modules/core/src/mathfuncs_core.simd.hpp). It is
// subject to the license terms in the LICENSE file found in the top-level directory of this
// distribution and at http://opencv.org/license.html.
mojomex marked this conversation as resolved.
Show resolved Hide resolved
// The license can be found in
// common/autoware_universe_utils/third_party_licenses/opencv-license.md
// and https://github.com/opencv/opencv/blob/master/LICENSE

// Modification:
// 1. use autoware defined PI
// 2. output of the function is changed from degrees to radians.
namespace detail_fast_atan2
{
static const float atan2_p1 =
0.9997878412794807f * static_cast<float>(180) / autoware::universe_utils::pi;
static const float atan2_p3 =
-0.3258083974640975f * static_cast<float>(180) / autoware::universe_utils::pi;
static const float atan2_p5 =
0.1555786518463281f * static_cast<float>(180) / autoware::universe_utils::pi;
static const float atan2_p7 =
-0.04432655554792128f * static_cast<float>(180) / autoware::universe_utils::pi;
static const float atan2_DBL_EPSILON = 2.2204460492503131e-016f;
mojomex marked this conversation as resolved.
Show resolved Hide resolved
} // namespace detail_fast_atan2

float opencv_fast_atan2(float dy, float dx)
{
float ax = std::abs(dx);
float ay = std::abs(dy);
float a, c, c2;
if (ax >= ay) {
c = ay / (ax + detail_fast_atan2::atan2_DBL_EPSILON);
c2 = c * c;
a = (((detail_fast_atan2::atan2_p7 * c2 + detail_fast_atan2::atan2_p5) * c2 +
detail_fast_atan2::atan2_p3) *
c2 +
detail_fast_atan2::atan2_p1) *
c;
} else {
c = ax / (ay + detail_fast_atan2::atan2_DBL_EPSILON);
c2 = c * c;
a = 90.f - (((detail_fast_atan2::atan2_p7 * c2 + detail_fast_atan2::atan2_p5) * c2 +
detail_fast_atan2::atan2_p3) *
c2 +
detail_fast_atan2::atan2_p1) *
c;
}
if (dx < 0) a = 180.f - a;
if (dy < 0) a = 360.f - a;

a = a * autoware::universe_utils::pi / 180.f;
mojomex marked this conversation as resolved.
Show resolved Hide resolved
return a;
}

} // namespace autoware::universe_utils
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,28 @@ TEST(trigonometry, sin_and_cos)
EXPECT_TRUE(std::abs(std::cos(x * static_cast<float>(i)) - sin_and_cos.second) < 10e-7);
}
}

float normalize_angle(double angle)
{
const double tau = 2 * autoware::universe_utils::pi;
double factor = std::floor(angle / tau);
return static_cast<float>(angle - (factor * tau));
}

TEST(trigonometry, opencv_fast_atan2)
{
for (int i = 0; i < 100; ++i) {
// Generate random x and y between -10 and 10
std::srand(0);
float x = static_cast<float>(std::rand()) / RAND_MAX * 20.0 - 10.0;
float y = static_cast<float>(std::rand()) / RAND_MAX * 20.0 - 10.0;
mojomex marked this conversation as resolved.
Show resolved Hide resolved

float fast_atan = autoware::universe_utils::opencv_fast_atan2(y, x);
float std_atan = normalize_angle(std::atan2(y, x));

// 0.3 degree accuracy
ASSERT_NEAR(fast_atan, std_atan, 6e-3)
<< "Test failed for input (" << y << ", " << x << "): "
<< "fast atan2 = " << fast_atan << ", std::atan2 = " << std_atan;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
base_frame: base_link
use_imu: true
use_3d_distortion_correction: false
update_azimuth_and_distance: false
has_static_tf_only: true
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,24 @@ ros2 launch autoware_pointcloud_preprocessor distortion_corrector.launch.xml

- The node requires time synchronization between the topics from lidars, twist, and IMU.
- If you want to use a 3D distortion corrector without IMU, please check that the linear and angular velocity fields of your twist message are not empty.
- The node updates the per-point azimuth and distance values based on the undistorted XYZ coordinates when the input point cloud is in the sensor frame (not in the `base_link`) and the `update_azimuth_and_distance` parameter is set to `true`. The azimuth values are calculated using a modified version of OpenCV's `cv::fastAtan2` function.
- Please note that updating the azimuth and distance fields increases the execution time by approximately 20%. Additionally, due to the `cv::fastAtan2` algorithm's has a maximum error of 0.3 degrees, there is a **possibility of changing the beam order for high azimuth resolution LiDAR**.
- LiDARs from different vendors have different azimuth coordinates, as shown in the images below. Currently, the coordinate systems listed below have been tested, and the node will update the azimuth based on the input coordinate system.
- `velodyne`: (x: 0 degrees, y: 270 degrees)
- `hesai`: (x: 90 degrees, y: 0 degrees)
- `others`: (x: 0 degrees, y: 90 degrees) and (x: 270 degrees, y: 0 degrees)

<table>
<tr>
<td><img src="./image/velodyne.drawio.png" alt="velodyne azimuth coordinate"></td>
<td><img src="./image/hesai.drawio.png" alt="hesai azimuth coordinate"></td>
</tr>
<tr>
<td><p style="text-align: center;">Velodyne azimuth coordinate</p></td>
<td><p style="text-align: center;">Hesai azimuth coordinate</p></td>
</tr>
</table>

## References/External links

<https://docs.opencv.org/3.4/db/de0/group__core__utils.html#ga7b356498dd314380a0c386b059852270>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading