Skip to content

Commit 5b91874

Browse files
authored
chore(object_range_splitter): rework parameters (#6159)
* chore(object_range_splitter): add param file Signed-off-by: kminoda <koji.minoda@tier4.jp> * fix arg name Signed-off-by: kminoda <koji.minoda@tier4.jp> * feat: use param file from autoware.launch Signed-off-by: kminoda <koji.minoda@tier4.jp> --------- Signed-off-by: kminoda <koji.minoda@tier4.jp>
1 parent 6d6a7b0 commit 5b91874

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
@@ -78,7 +78,7 @@
7878
<arg name="filter/angle_threshold" value="1.0472"/>
7979
<arg name="filter/velocity_threshold" value="3.0"/>
8080
<arg name="split/velocity_threshold" value="4.5"/>
81-
<arg name="split_range" value="70.0"/>
81+
<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)"/>
8484
</include>
@@ -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_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_fusion_param_path)"/>
180181
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
181182
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
182183
</include>
@@ -236,6 +237,7 @@
236237
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
237238
<arg name="input/radar" value="$(var input/radar)"/>
238239
<arg name="output/objects" value="objects"/>
240+
<arg name="object_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_param_path)"/>
239241
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
240242
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
241243
</include>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<arg name="filter/angle_threshold" default="1.221"/>
66
<arg name="filter/velocity_threshold" default="1.5"/>
77
<arg name="split/velocity_threshold" default="5.5"/>
8-
<arg name="split_range" default="80.0"/>
8+
<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"/>
1111

@@ -29,7 +29,7 @@
2929
<arg name="input/object" value="high_speed_objects"/>
3030
<arg name="output/long_range_object" value="far_high_speed_objects"/>
3131
<arg name="output/short_range_object" value="near_high_speed_objects"/>
32-
<arg name="split_range" value="$(var split_range)"/>
32+
<arg name="param_path" value="$(var object_range_splitter_param_path)"/>
3333
</include>
3434

3535
<include file="$(find-pkg-share detected_object_validation)/launch/object_lanelet_filter.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_tracking_multi_object_tracker_data_association_matrix_param_path"/>
2022
<arg name="object_recognition_tracking_multi_object_tracker_node_param_path"/>
2123
<arg name="object_recognition_tracking_radar_object_tracker_data_association_matrix_param_path"/>

perception/object_range_splitter/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ rclcpp_components_register_node(object_range_splitter
1616
ament_auto_package(
1717
INSTALL_TO_SHARE
1818
launch
19+
config
1920
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/**:
2+
ros__parameters:
3+
split_range: 30.0

perception/object_range_splitter/launch/object_range_splitter.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<arg name="input/object" default="object"/>
44
<arg name="output/long_range_object" default="long_range_object"/>
55
<arg name="output/short_range_object" default="short_range_object"/>
6-
<arg name="split_range" default="30.0"/>
6+
<arg name="param_path" default="$(find-pkg-share object_range_splitter)/config/object_range_splitter.param.yaml"/>
77

88
<node pkg="object_range_splitter" exec="object_range_splitter_node" name="object_range_splitter" output="screen">
99
<remap from="input/object" to="$(var input/object)"/>
1010
<remap from="output/long_range_object" to="$(var output/long_range_object)"/>
1111
<remap from="output/short_range_object" to="$(var output/short_range_object)"/>
12-
<param name="split_range" value="$(var split_range)"/>
12+
<param from="$(var param_path)"/>
1313
</node>
1414
</launch>

0 commit comments

Comments
 (0)