From 221ce4ba4dfb22c97ffbcd05fcbb6ad6fd9c904d Mon Sep 17 00:00:00 2001 From: Taekjin LEE Date: Wed, 12 Jun 2024 19:19:48 +0900 Subject: [PATCH] chore(tier4_perception_launch): perception launcher refactoring (#7194) * fix: reorder object merger launchers Signed-off-by: Taekjin LEE * fix: separate detection by tracker launch Signed-off-by: Taekjin LEE * fix: refactor tracking launch Signed-off-by: Taekjin LEE * style(pre-commit): autofix Signed-off-by: Taekjin LEE * fix: input pointcloud topic names, mot input channels Signed-off-by: Taekjin LEE * feat: separate filters Signed-off-by: Taekjin LEE * fix: object validator to modular Signed-off-by: Taekjin LEE * fix: implement filters on mergers Signed-off-by: Taekjin LEE * fix lidar only mode chore: simplify mode check Signed-off-by: Taekjin LEE * fix: fix a bug when use_radar_tracking_fusion is fault Signed-off-by: Taekjin LEE * fix: rename radar detector to filter 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 | 42 ++++- .../detector/camera_lidar_detector.launch.xml | 10 +- .../detector/lidar_rule_detector.launch.xml | 10 +- .../tracker_based_detector.launch.xml | 10 ++ .../detection/filter/object_filter.launch.xml | 25 +++ .../filter/object_validator.launch.xml | 26 +++ .../pointcloud_map_filter.launch.py | 0 .../radar_filter.launch.xml} | 9 +- .../merger/camera_lidar_merger.launch.xml | 123 +++++++------- .../camera_lidar_radar_merger.launch.xml | 155 ++++++++++-------- .../detection/merger/lidar_merger.launch.xml | 113 ++++++------- .../tracking/tracking.launch.xml | 63 ++++--- .../launch/perception.launch.xml | 5 +- 13 files changed, 348 insertions(+), 243 deletions(-) create mode 100644 launch/tier4_perception_launch/launch/object_recognition/detection/detector/tracker_based_detector.launch.xml create mode 100644 launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_filter.launch.xml create mode 100644 launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_validator.launch.xml rename launch/tier4_perception_launch/launch/object_recognition/detection/{ => filter}/pointcloud_map_filter.launch.py (100%) rename launch/tier4_perception_launch/launch/object_recognition/detection/{detector/radar_detector.launch.xml => filter/radar_filter.launch.xml} (96%) 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 7e389f5790051..754d07c6d99bf 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 @@ -2,6 +2,7 @@ + @@ -65,10 +66,10 @@ - + - + @@ -78,6 +79,12 @@ + + + + + + @@ -98,6 +105,8 @@ + + @@ -138,6 +147,12 @@ + + + + + + @@ -159,16 +174,17 @@ + - + - + @@ -189,10 +205,17 @@ + + + + + + + @@ -217,9 +240,16 @@ + + + + + + + @@ -227,8 +257,8 @@ - - + + 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 6294df64279a5..fe0ba0e614e60 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 @@ -94,7 +94,7 @@ - + @@ -234,12 +234,4 @@ - - - - - - - - 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 0fabd5e98e45f..e78823429195f 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 @@ -6,7 +6,7 @@ - + @@ -45,12 +45,4 @@ - - - - - - - - diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/tracker_based_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/tracker_based_detector.launch.xml new file mode 100644 index 0000000000000..0efe7444fcba5 --- /dev/null +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/tracker_based_detector.launch.xml @@ -0,0 +1,10 @@ + + + + + + + + + + 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 new file mode 100644 index 0000000000000..7047aec77c660 --- /dev/null +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_filter.launch.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000000..b3704f130232a --- /dev/null +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/object_validator.launch.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/pointcloud_map_filter.launch.py similarity index 100% rename from launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py rename to launch/tier4_perception_launch/launch/object_recognition/detection/filter/pointcloud_map_filter.launch.py diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/radar_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml similarity index 96% rename from launch/tier4_perception_launch/launch/object_recognition/detection/detector/radar_detector.launch.xml rename to launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml index b09684281d33a..d837505649cf1 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/radar_detector.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml @@ -1,14 +1,17 @@ - - + - + + + + + 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 2f62e83ae0ef5..5bcfe49643dce 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 @@ -1,23 +1,55 @@ - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - @@ -44,81 +76,52 @@ - - + + - - - - - + + - - + + + - - - - - - - - + - - - - - - - - - + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - + + + + + 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 b4d19c9052a63..07ab78cd37f72 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 @@ -1,39 +1,78 @@ - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - @@ -60,91 +99,63 @@ - - + + - - - - - + + - - - - - - - - - + + + - + - - - - - - - - - + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + - - - + + + 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 0ecc89c8743e8..f0ce19db6c342 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 @@ -1,89 +1,90 @@ - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - + + + - - - - - - - - + - - - - - - - - + + + - + - - - - - + + + - - - - - - - - - - - - - - - - - - + + + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml index cf11c65ac805c..b8172daa616fa 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml @@ -1,41 +1,50 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + @@ -43,9 +52,9 @@ - - - + + + diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml index 62404a7deb43a..dd80ab5b2cde7 100644 --- a/launch/tier4_perception_launch/launch/perception.launch.xml +++ b/launch/tier4_perception_launch/launch/perception.launch.xml @@ -90,7 +90,7 @@ - + @@ -217,6 +217,8 @@ + + @@ -238,6 +240,7 @@ +