From 97fb362f065b810a3b0aebc761a098590eea2840 Mon Sep 17 00:00:00 2001 From: Taekjin LEE Date: Thu, 20 Jun 2024 14:56:05 +0900 Subject: [PATCH] chore(tier4_perception_launch): perception launcher refactoring second round (#7440) * feat: separate filters Signed-off-by: Taekjin LEE * fix: object validator to modular Signed-off-by: Taekjin LEE * chore: remove default values from subsequent launch files Signed-off-by: Taekjin LEE * chore: group interfaces and junctions Signed-off-by: Taekjin LEE * Revert "chore: group interfaces and junctions" This reverts commit 9d723c33c260a9a0ac896bdf81c2a6ebeb981479. Signed-off-by: Taekjin LEE * chore: group interfaces and junctions Signed-off-by: Taekjin LEE * fix: radar input Signed-off-by: Taekjin LEE * fix: remove defaults from camera inputs Signed-off-by: Taekjin LEE * chore: rename camera args Signed-off-by: Taekjin LEE * chore: reorder Signed-off-by: Taekjin LEE * fix: remove defaults from lidar interface Signed-off-by: Taekjin LEE * Add use_pointcloud_map and use_validator arguments to detection.launch.xml Signed-off-by: Taekjin LEE * fix: remove default from validators and filters Signed-off-by: Taekjin LEE * fix: pointcloud container node name Signed-off-by: Taekjin LEE * style(pre-commit): autofix Signed-off-by: Taekjin LEE * Add use_low_intensity_cluster_filter argument to launch files Signed-off-by: Taekjin LEE * fix: on off detector and merger Signed-off-by: Taekjin LEE * fix: radar_far/objects default Signed-off-by: Taekjin LEE * fix: radar object filter parameter Signed-off-by: Taekjin LEE --------- Signed-off-by: Taekjin LEE Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../detection/detection.launch.xml | 447 ++++++++++-------- .../detector/camera_lidar_detector.launch.xml | 239 +++++----- .../detector/lidar_dnn_detector.launch.xml | 5 +- .../detector/lidar_rule_detector.launch.xml | 12 +- .../detection/filter/object_filter.launch.xml | 6 +- .../filter/object_validator.launch.xml | 8 +- .../detection/filter/radar_filter.launch.xml | 8 +- .../merger/camera_lidar_merger.launch.xml | 89 ++-- .../camera_lidar_radar_merger.launch.xml | 91 ++-- .../detection/merger/lidar_merger.launch.xml | 16 +- .../launch/perception.launch.xml | 59 ++- 11 files changed, 540 insertions(+), 440 deletions(-) diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml index 754d07c6d99bf..228b4c89f95d3 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -1,223 +1,280 @@ - - + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -227,45 +284,19 @@ - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml index fe0ba0e614e60..3c8480038f320 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml @@ -2,93 +2,94 @@ - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -99,7 +100,7 @@ - + @@ -111,7 +112,7 @@ - + @@ -122,32 +123,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -178,32 +179,32 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml index 274b39be681b8..ab34cc49dd2f6 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml @@ -2,6 +2,7 @@ + @@ -27,7 +28,7 @@ - + @@ -48,7 +49,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml index e78823429195f..819a6337138a1 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml @@ -1,8 +1,10 @@ - - + + + + @@ -11,7 +13,7 @@ - + @@ -21,12 +23,12 @@ - + - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_filter.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_filter.launch.xml index 7047aec77c660..d7bbcb01472eb 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_filter.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_filter.launch.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_validator.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_validator.launch.xml index b3704f130232a..9a09ad2871e85 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_validator.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_validator.launch.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml index d837505649cf1..fe7ab70e9331e 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml @@ -4,12 +4,12 @@ - + - - + + @@ -36,7 +36,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_merger.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_merger.launch.xml index 5bcfe49643dce..85b404ba89b1f 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_merger.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_merger.launch.xml @@ -8,17 +8,42 @@ - + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51,31 +76,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -83,7 +108,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_radar_merger.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_radar_merger.launch.xml index 07ab78cd37f72..16ec8f8fbd573 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_radar_merger.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_radar_merger.launch.xml @@ -11,21 +11,46 @@ - + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -74,31 +99,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,7 +131,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/merger/lidar_merger.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/merger/lidar_merger.launch.xml index f0ce19db6c342..c82de41a28b50 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/merger/lidar_merger.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/merger/lidar_merger.launch.xml @@ -8,21 +8,21 @@ - + + - - - + + - - + + - + @@ -46,7 +46,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml index dd80ab5b2cde7..8f0513bcd5446 100644 --- a/launch/tier4_perception_launch/launch/perception.launch.xml +++ b/launch/tier4_perception_launch/launch/perception.launch.xml @@ -77,6 +77,7 @@ + - - + + @@ -115,12 +116,13 @@ - + + @@ -186,25 +188,35 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,11 +230,14 @@ + + + - +