From 0556a825f43d6e683cd7af500526bb8a3abc28bb Mon Sep 17 00:00:00 2001 From: Taekjin LEE Date: Wed, 26 Jun 2024 11:24:45 +0900 Subject: [PATCH] feat(tier4_perception_launch): enable multi channel tracker merger (#7459) * feat: introduce multi channel tracker merger Signed-off-by: Taekjin LEE feat: separate filters feat: filtering camera lidar fusion fix: object validator to modular Signed-off-by: Taekjin LEE fix: add missing config Signed-off-by: Taekjin LEE fix: radar only mode for both fusion mode fix Signed-off-by: Taekjin LEE style(pre-commit): autofix Signed-off-by: Taekjin LEE * fix: implement merger switching Signed-off-by: Taekjin LEE * chore: move pointcloud filter from detection to filter group Signed-off-by: Taekjin LEE * chore: define external and internal interfaces Signed-off-by: Taekjin LEE * fix: set output of camera-lidar in absolute path Signed-off-by: Taekjin LEE * chore: explicit object detection output Signed-off-by: Taekjin LEE * style(pre-commit): autofix Signed-off-by: Taekjin LEE * chore: update object detection input paths fix radar output Signed-off-by: Taekjin LEE * chore: update object detection input paths Signed-off-by: Taekjin LEE * fix: radar pipeline output Signed-off-by: Taekjin LEE * chore: update object detection input paths This commit updates the input paths for object detection. It ensures that the correct paths are used for the detection process. Signed-off-by: Taekjin LEE * style(pre-commit): autofix Signed-off-by: Taekjin LEE * fix: group to avoid argument mixture 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> Signed-off-by: Simon Eisenmann --- .../detection/detection.launch.xml | 162 +++++++++++++----- .../detector/camera_lidar_detector.launch.xml | 32 ++-- .../detector/lidar_dnn_detector.launch.xml | 15 +- .../detector/lidar_rule_detector.launch.xml | 20 +-- .../tracker_based_detector.launch.xml | 2 + .../merger/camera_lidar_merger.launch.xml | 6 +- .../camera_lidar_radar_merger.launch.xml | 12 +- .../tracking/tracking.launch.xml | 119 ++++++++----- .../launch/perception.launch.xml | 6 + 9 files changed, 241 insertions(+), 133 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 228b4c89f95d3..373e343ad64fa 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,5 +1,8 @@ + + + @@ -10,15 +13,13 @@ + - + + + - - - - - @@ -43,10 +44,21 @@ - - + + + + + + + + + + + + + @@ -56,35 +68,58 @@ + + + + + - + + + + + + + + - + + + + + + + + - + + + - + + - + + @@ -118,11 +153,12 @@ - + + + - @@ -133,6 +169,7 @@ + @@ -141,9 +178,9 @@ - + - + @@ -152,7 +189,7 @@ - + @@ -175,10 +212,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -208,8 +273,14 @@ - + + + + + + + @@ -250,8 +321,12 @@ - + + + + + @@ -264,32 +339,41 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + - + - + + + + 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 3c8480038f320..4c288aa632182 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 @@ -1,17 +1,11 @@ - - - - - - - + @@ -38,6 +32,14 @@ + + + + + + + + - - - - - - - - - - - @@ -230,7 +220,7 @@ - + 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 ab34cc49dd2f6..98e8ec7c8ed4b 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 @@ -1,18 +1,19 @@ - - - - + + + + + @@ -21,7 +22,7 @@ - + @@ -41,7 +42,7 @@ - + @@ -77,7 +78,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 819a6337138a1..38ee946201f7e 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,22 +1,10 @@ - + + - - - - - - - - - - - - - - + @@ -43,7 +31,7 @@ - + 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 index 0efe7444fcba5..b85d4b02847b3 100644 --- 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 @@ -1,10 +1,12 @@ + + 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 85b404ba89b1f..d4a9e40f29d97 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 @@ -44,9 +44,9 @@ - - - + + + 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 16ec8f8fbd573..6ea745a8bae2c 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 @@ -47,16 +47,16 @@ - - - - - + + + + + - + 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 b8172daa616fa..9bc4aabc39b20 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,5 +1,8 @@ + + + @@ -13,50 +16,84 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml index 8f0513bcd5446..5d8d7563e7a7c 100644 --- a/launch/tier4_perception_launch/launch/perception.launch.xml +++ b/launch/tier4_perception_launch/launch/perception.launch.xml @@ -124,6 +124,9 @@ /> + + + @@ -189,6 +192,7 @@ + @@ -255,7 +259,9 @@ + +