Skip to content

Commit f16ff53

Browse files
authored
feat(autoware_object_merger, autoware_tracking_object_merger): enable anonymized node names to be configurable (#9733)
feat: enable anonymized node names to be configurable Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent 8865d0f commit f16ff53

File tree

6 files changed

+12
-2
lines changed

6 files changed

+12
-2
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<!-- 1st merger: camera_lidar_fusion + lidar cluster-->
121121
<group>
122122
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
123+
<arg name="node_name" value="object_association_merger_alpha"/>
123124
<arg name="input/object0" value="$(var merger1/input/objects0)"/>
124125
<arg name="input/object1" value="$(var merger1/input/objects1)"/>
125126
<arg name="output/object" value="$(var merger1/output/objects)"/>
@@ -132,6 +133,7 @@
132133
<!-- 2nd merger: + detection_by_tracker -->
133134
<group if="$(var use_detection_by_tracker)">
134135
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
136+
<arg name="node_name" value="object_association_merger_beta"/>
135137
<arg name="input/object0" value="$(var merger2/input/objects0)"/>
136138
<arg name="input/object1" value="$(var merger2/input/objects1)"/>
137139
<arg name="output/object" value="$(var merger2/output/objects)"/>

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

+3
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<!-- 1st merger -->
144144
<group>
145145
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
146+
<arg name="node_name" value="object_association_merger_alpha"/>
146147
<arg name="input/object0" value="$(var merger1/input/objects0)"/>
147148
<arg name="input/object1" value="$(var merger1/input/objects1)"/>
148149
<arg name="output/object" value="$(var merger1/output/objects)"/>
@@ -155,6 +156,7 @@
155156
<!-- 2nd merger: + detection_by_tracker -->
156157
<group if="$(var use_detection_by_tracker)">
157158
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
159+
<arg name="node_name" value="object_association_merger_beta"/>
158160
<arg name="input/object0" value="$(var merger2/input/objects0)"/>
159161
<arg name="input/object1" value="$(var merger2/input/objects1)"/>
160162
<arg name="output/object" value="$(var merger2/output/objects)"/>
@@ -178,6 +180,7 @@
178180
Control parameter 'use_radar_tracking_fusion' should defined in perception.launch.xml -->
179181
<group unless="$(var use_radar_tracking_fusion)">
180182
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
183+
<arg name="node_name" value="object_association_merger_gamma"/>
181184
<arg name="input/object0" value="$(var merger3/input/objects0)"/>
182185
<arg name="input/object1" value="$(var merger3/input/objects1)"/>
183186
<arg name="output/object" value="$(var merger3/output/objects)"/>

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

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<!-- 1st merger: ML detection + pointcloud cluster -->
5959
<group>
6060
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
61+
<arg name="node_name" value="object_association_merger_alpha"/>
6162
<arg name="input/object0" value="$(var merger1/input/objects0)"/>
6263
<arg name="input/object1" value="$(var merger1/input/objects1)"/>
6364
<arg name="output/object" value="$(var merger1/output/objects)"/>
@@ -70,6 +71,7 @@
7071
<!-- 2nd merger: + detection_by_tracker -->
7172
<group if="$(var use_detection_by_tracker)">
7273
<include file="$(find-pkg-share autoware_object_merger)/launch/object_association_merger.launch.xml">
74+
<arg name="node_name" value="object_association_merger_beta"/>
7375
<arg name="input/object0" value="$(var merger2/input/objects0)"/>
7476
<arg name="input/object1" value="$(var merger2/input/objects1)"/>
7577
<arg name="output/object" value="$(var merger2/output/objects)"/>

launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757

5858
<!-- tracking object merger to merge near objects and far objects -->
5959
<include file="$(find-pkg-share autoware_tracking_object_merger)/launch/decorative_tracker_merger.launch.xml">
60+
<arg name="node_name" value="decorative_tracker_merger"/>
6061
<arg name="input/main_object" value="$(var tracker_merger/input/main_objects)"/>
6162
<arg name="input/sub_object" value="$(var tracker_merger/input/sub_objects)"/>
6263
<arg name="output" value="$(var tracker_merger/output/objects)"/>

perception/autoware_object_merger/launch/object_association_merger.launch.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<arg name="node_name" default="$(anon object_association_merger)"/>
34
<arg name="input/object0" default="object0"/>
45
<arg name="input/object1" default="object1"/>
56
<arg name="output/object" default="merged_object"/>
@@ -8,7 +9,7 @@
89
<arg name="distance_threshold_list_path" default="$(find-pkg-share autoware_object_merger)/config/overlapped_judge.param.yaml"/>
910
<arg name="object_association_merger_param_path" default="$(find-pkg-share autoware_object_merger)/config/object_association_merger.param.yaml"/>
1011

11-
<node pkg="autoware_object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
12+
<node pkg="autoware_object_merger" exec="object_association_merger_node" name="$(var node_name)" output="screen">
1213
<remap from="input/object0" to="$(var input/object0)"/>
1314
<remap from="input/object1" to="$(var input/object1)"/>
1415
<remap from="output/object" to="$(var output/object)"/>

perception/autoware_tracking_object_merger/launch/decorative_tracker_merger.launch.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<arg name="node_name" default="$(anon decorative_tracker_merger)"/>
34
<arg name="input/main_object" default="main_object"/>
45
<arg name="input/sub_object" default="sub_object"/>
56
<arg name="output" default="merged_object"/>
67
<arg name="data_association_matrix_path" default="$(find-pkg-share autoware_tracking_object_merger)/config/data_association_matrix.param.yaml"/>
78
<arg name="merge_options_path" default="$(find-pkg-share autoware_tracking_object_merger)/config/decorative_tracker_merger_policy.param.yaml"/>
89
<arg name="node_param_file_path" default="$(find-pkg-share autoware_tracking_object_merger)/config/decorative_tracker_merger.param.yaml"/>
910

10-
<node pkg="autoware_tracking_object_merger" exec="decorative_tracker_merger_node" name="$(anon decorative_tracker_merger)" output="screen">
11+
<node pkg="autoware_tracking_object_merger" exec="decorative_tracker_merger_node" name="$(var node_name)" output="screen">
1112
<remap from="input/main_object" to="$(var input/main_object)"/>
1213
<remap from="input/sub_object" to="$(var input/sub_object)"/>
1314
<remap from="output/object" to="$(var output)"/>

0 commit comments

Comments
 (0)