Skip to content

Commit 72968d4

Browse files
committed
fix: rename radar detector to filter
1 parent 34fbb15 commit 72968d4

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
<arg name="input/pointcloud" value="$(var input/pointcloud)"/>
6767
<arg name="lidar_detection_model" value="$(var lidar_detection_model)"/>
6868
</include>
69-
<!-- Radar detector-->
69+
<!-- Radar detector/filter-->
7070
<group>
7171
<push-ros-namespace namespace="radar"/>
72-
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
72+
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/filter/radar_filter.launch.xml">
7373
<arg name="input/radar" value="$(var input/radar)"/>
7474
<arg name="output/objects" value="far_objects"/>
7575
<arg name="radar_lanelet_filtering_range_param_path" value="$(var radar_lanelet_filtering_range_param_path)"/>
@@ -181,10 +181,10 @@
181181

182182
<!-- Lidar-Radar fusion based detection -->
183183
<group if="$(eval '&quot;$(var mode)&quot;==&quot;lidar_radar_fusion&quot;')">
184-
<!-- Radar detector-->
184+
<!-- Radar detector/filter-->
185185
<group>
186186
<push-ros-namespace namespace="radar"/>
187-
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
187+
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/filter/radar_filter.launch.xml">
188188
<arg name="input/radar" value="$(var input/radar)"/>
189189
<arg name="output/objects" value="far_objects"/>
190190
<arg name="radar_lanelet_filtering_range_param_path" value="$(var radar_lanelet_filtering_range_param_path)"/>
@@ -257,8 +257,8 @@
257257

258258
<!-- Radar based detection -->
259259
<group if="$(eval '&quot;$(var mode)&quot;==&quot;radar&quot;')">
260-
<!-- Radar detector-->
261-
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
260+
<!-- Radar detector/filter-->
261+
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/filter/radar_filter.launch.xml">
262262
<arg name="input/radar" value="$(var input/radar)"/>
263263
<arg name="output/objects" value="objects"/>
264264
<arg name="radar_lanelet_filtering_range_param_path" value="$(var radar_lanelet_filtering_range_param_path)"/>

launch/tier4_perception_launch/launch/object_recognition/detection/detector/radar_detector.launch.xml launch/tier4_perception_launch/launch/object_recognition/detection/filter/radar_filter.launch.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<arg name="input/radar" default="/sensing/radar/detected_objects"/>
4-
<arg name="output/objects" default="far_objects"/>
3+
<!-- Parameters -->
54
<arg name="radar_crossing_objects_noise_filter_param_path"/>
65
<arg name="object_velocity_splitter_param_path" default="$(var object_recognition_detection_object_velocity_splitter_radar_param_path)"/>
76
<arg name="object_range_splitter_param_path" default="$(var object_recognition_detection_object_range_splitter_radar_param_path)"/>
87
<arg name="radar_lanelet_filtering_range_param" default="$(find-pkg-share detected_object_validation)/config/object_lanelet_filter.param.yaml"/>
98
<arg name="radar_object_clustering_param_path" default="$(find-pkg-share radar_object_clustering)/config/radar_object_clustering.param.yaml"/>
109

11-
<!-- Detection for far dynamic objects -->
10+
<!-- External interfaces -->
11+
<arg name="input/radar" default="/sensing/radar/detected_objects"/>
12+
<arg name="output/objects" default="far_objects"/>
13+
14+
<!-- Radar filter pipeline -->
1215
<include file="$(find-pkg-share radar_crossing_objects_noise_filter)/launch/radar_crossing_objects_noise_filter.launch.xml">
1316
<arg name="input/objects" value="$(var input/radar)"/>
1417
<arg name="output/noise_objects" value="noise_objects"/>

launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_merger.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<!-- Merger parameters -->
3+
<!-- Parameters -->
44
<arg name="object_recognition_detection_object_merger_data_association_matrix_param_path" default="$(find-pkg-share object_merger)/config/data_association_matrix.param.yaml"/>
55
<arg name="object_recognition_detection_object_merger_distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
66

launch/tier4_perception_launch/launch/object_recognition/detection/merger/camera_lidar_radar_merger.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<!-- Merger parameters -->
3+
<!-- Parameters -->
44
<arg name="object_recognition_detection_object_merger_data_association_matrix_param_path" default="$(find-pkg-share object_merger)/config/data_association_matrix.param.yaml"/>
55
<arg name="object_recognition_detection_object_merger_distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
66
<arg name="far_object_merger_sync_queue_size" default="20"/>

launch/tier4_perception_launch/launch/object_recognition/detection/merger/lidar_merger.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<!-- Merger parameters -->
3+
<!-- Parameters -->
44
<arg name="object_recognition_detection_object_merger_data_association_matrix_param_path" default="$(find-pkg-share object_merger)/config/data_association_matrix.param.yaml"/>
55
<arg name="object_recognition_detection_object_merger_distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
66

0 commit comments

Comments
 (0)