Skip to content

Commit 17a3070

Browse files
authored
chore(object_velocity_splitter): rework parameters (#6158)
* chore(object_velocity_splitter): add param file Signed-off-by: kminoda <koji.minoda@tier4.jp> * fix Signed-off-by: kminoda <koji.minoda@tier4.jp> * fix arg name Signed-off-by: kminoda <koji.minoda@tier4.jp> * fix: update launch param handling Signed-off-by: kminoda <koji.minoda@tier4.jp> --------- Signed-off-by: kminoda <koji.minoda@tier4.jp>
1 parent debe198 commit 17a3070

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<arg name="output/objects" value="far_objects"/>
7878
<arg name="filter/angle_threshold" value="1.0472"/>
7979
<arg name="filter/velocity_threshold" value="3.0"/>
80-
<arg name="split/velocity_threshold" value="4.5"/>
80+
<arg name="object_velocity_splitter_param_path" value="$(var object_recognition_detection_object_velocity_splitter_radar_fusion_param_path)"/>
8181
<arg name="object_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_fusion_param_path)"/>
8282
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
8383
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
@@ -177,6 +177,7 @@
177177
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
178178
<arg name="input/radar" value="$(var input/radar)"/>
179179
<arg name="output/objects" value="far_objects"/>
180+
<arg name="object_velocity_splitter_param_path" value="$(var object_recognition_detection_object_velocity_splitter_radar_fusion_param_path)"/>
180181
<arg name="object_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_fusion_param_path)"/>
181182
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
182183
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
@@ -237,6 +238,7 @@
237238
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
238239
<arg name="input/radar" value="$(var input/radar)"/>
239240
<arg name="output/objects" value="objects"/>
241+
<arg name="object_velocity_splitter_param_path" value="$(var object_recognition_detection_object_velocity_splitter_radar_param_path)"/>
240242
<arg name="object_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_param_path)"/>
241243
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
242244
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<arg name="output/objects" default="far_objects"/>
55
<arg name="filter/angle_threshold" default="1.221"/>
66
<arg name="filter/velocity_threshold" default="1.5"/>
7-
<arg name="split/velocity_threshold" default="5.5"/>
7+
<arg name="object_velocity_splitter_param_path" default="$(var object_recognition_detection_object_velocity_splitter_radar_param_path)"/>
88
<arg name="object_range_splitter_param_path" default="$(var object_recognition_detection_object_range_splitter_radar_param_path)"/>
99
<arg name="radar_lanelet_filtering_range_param" default="$(find-pkg-share detected_object_validation)/config/object_lanelet_filter.param.yaml"/>
1010
<arg name="radar_object_clustering_param_path" default="$(find-pkg-share radar_object_clustering)/config/radar_object_clustering.param.yaml"/>
@@ -22,7 +22,7 @@
2222
<arg name="input/objects" value="noise_filtered_objects"/>
2323
<arg name="output/low_speed_objects" value="low_speed_objects"/>
2424
<arg name="output/high_speed_objects" value="high_speed_objects"/>
25-
<arg name="velocity_threshold" value="$(var split/velocity_threshold)"/>
25+
<arg name="param_path" value="$(var object_velocity_splitter_param_path)"/>
2626
</include>
2727

2828
<include file="$(find-pkg-share object_range_splitter)/launch/object_range_splitter.launch.xml">

launch/tier4_perception_launch/launch/perception.launch.xml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<arg name="object_recognition_detection_lidar_model_param_path"/>
1717
<arg name="object_recognition_detection_radar_lanelet_filtering_range_param"/>
1818
<arg name="object_recognition_detection_radar_object_clustering_param_path"/>
19+
<arg name="object_recognition_detection_object_velocity_splitter_radar_param_path"/>
20+
<arg name="object_recognition_detection_object_velocity_splitter_radar_fusion_param_path"/>
1921
<arg name="object_recognition_detection_object_range_splitter_radar_param_path"/>
2022
<arg name="object_recognition_detection_object_range_splitter_radar_fusion_param_path"/>
2123
<arg name="object_recognition_tracking_multi_object_tracker_data_association_matrix_param_path"/>

perception/object_velocity_splitter/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ endif()
3737
ament_auto_package(
3838
INSTALL_TO_SHARE
3939
launch
40+
config
4041
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/**:
2+
ros__parameters:
3+
velocity_threshold: 3.0

perception/object_velocity_splitter/launch/object_velocity_splitter.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<arg name="output/low_speed_objects" default="~/output/low_speed_objects"/>
66
<arg name="output/high_speed_objects" default="~/output/high_speed_objects"/>
77
<!-- Parameter -->
8-
<arg name="velocity_threshold" default="3.0"/>
8+
<arg name="param_path" default="$(find-pkg-share object_velocity_splitter)/config/object_velocity_splitter.param.yaml"/>
99

1010
<!-- Node -->
1111
<node pkg="object_velocity_splitter" exec="object_velocity_splitter_node" name="object_velocity_splitter" output="screen">
1212
<remap from="~/input/objects" to="$(var input/objects)"/>
1313
<remap from="~/output/low_speed_objects" to="$(var output/low_speed_objects)"/>
1414
<remap from="~/output/high_speed_objects" to="$(var output/high_speed_objects)"/>
15-
<param name="velocity_threshold" value="$(var velocity_threshold)"/>
15+
<param from="$(var param_path)"/>
1616
</node>
1717
</launch>

0 commit comments

Comments
 (0)