Skip to content

Commit 7045396

Browse files
committed
revert priority_mode
Signed-off-by: kminoda <koji.minoda@tier4.jp>
1 parent 25749dd commit 7045396

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">
4646
<arg name="input/object0" value="$(var merger/input/objects)"/>
4747
<arg name="input/object1" value="clustering/objects"/>
48+
<arg name="priority_mode" value="2"/>
4849
<arg name="output/object" value="$(var merger/output/objects)"/>
4950
<arg name="data_association_matrix_path" value="$(var object_recognition_detection_object_merger_data_association_matrix_param_path)"/>
5051
<arg name="distance_threshold_list_path" value="$(var object_recognition_detection_object_merger_distance_threshold_list_path)"/>
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**:
22
ros__parameters:
33
sync_queue_size: 20
4-
priority_mode: 2 # 0: Object0, 1: Object1, 2: Confidence
54
precision_threshold_to_judge_overlapped: 0.4
65
remove_overlapped_unknown_objects: true

perception/object_merger/launch/object_association_merger.launch.xml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<arg name="input/object0" default="object0"/>
44
<arg name="input/object1" default="object1"/>
55
<arg name="output/object" default="merged_object"/>
6+
<arg name="priority_mode" default="2" description="0: Object0, 1: Object1, 2: Confidence"/>
67
<arg name="data_association_matrix_path" default="$(find-pkg-share object_merger)/config/data_association_matrix.param.yaml"/>
78
<arg name="distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
89
<arg name="object_association_merger_param_path" default="$(find-pkg-share object_merger)/config/object_association_merger.param.yaml"/>
@@ -14,5 +15,8 @@
1415
<param from="$(var data_association_matrix_path)"/>
1516
<param from="$(var distance_threshold_list_path)"/>
1617
<param from="$(var object_association_merger_param_path)"/>
18+
19+
<!-- Be careful when moving this parameter to param.yaml, since this value depends on which part this launcher is called -->
20+
<param name="priority_mode" value="$(var priority_mode)"/>
1721
</node>
1822
</launch>

0 commit comments

Comments
 (0)