Skip to content

Commit 5dfa160

Browse files
committed
fix: launch file
Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>
1 parent 2ff0ff3 commit 5dfa160

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<arg name="fusion_distance" default="100.0"/>
1919
<arg name="trust_object_distance" default="100.0"/>
2020
<arg name="use_roi_based_cluster" default="false"/>
21+
<arg name="use_image_segmentation_filter" default="false" description="use image sematic segmentation based pointcloud filter"/>
2122

2223
<!-- Camera parameters -->
2324
<arg name="image_raw0" default="/image_raw" description="image raw topic name"/>
@@ -45,7 +46,6 @@
4546
<arg name="camera_info7" default="/camera_info7"/>
4647
<arg name="detection_rois7" default="/perception/object_recognition/detection/rois7"/>
4748
<arg name="image_number" default="1" description="choose image raw number(1-8)"/>
48-
<arg name="use_image_segmentation_filter" default="false"/>
4949

5050
<!-- Jetson AGX -->
5151
<!-- <include file="$(find-pkg-share tensorrt_yolo)/launch/yolo.launch.xml">

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

+23-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<arg name="remove_unknown" default="true"/>
1818
<arg name="fusion_distance" default="100.0"/>
1919
<arg name="trust_object_distance" default="100.0"/>
20+
<arg name="use_image_segmentation_filter" default="false" description="use image sematic segmentation based pointcloud filter"/>
2021

2122
<!-- Camera parameters -->
2223
<arg name="image_raw0" default="/image_raw" description="image raw topic name"/>
@@ -97,14 +98,35 @@
9798
</include>
9899
</group>
99100

101+
<!-- Pointcloud filtering by image semantic segmentation model -->
102+
<group if="$(var use_image_segmentation_filter)">
103+
<let name="segmentation_filter/input_pointcloud" value="pointcloud_map_filtered/pointcloud" if="$(var use_pointcloud_map)"/>
104+
<let name="segmentation_filter/input_pointcloud" value="input/obstacle_segmentation/pointcloud" unless="$(var use_pointcloud_map)"/>
105+
<include file="$(find-pkg-share image_projection_based_fusion)/launch/segmentation_pointcloud_fusion.launch.xml">
106+
<arg name="input/pointcloud" value="pointcloud_map_filtered/pointcloud"/>
107+
<arg name="output/pointcloud" value="image_segmentation_filtered/pointcloud"/>
108+
</include>
109+
</group>
110+
100111
<!-- Clustering -->
101112
<group>
102113
<push-ros-namespace namespace="clustering"/>
103114
<group>
115+
<let name="clustering/input/pointcloud" value="/perception/object_recognition/detection/image_segmentation_filtered/pointcloud" if="$(var use_image_segmentation_filter)"/>
116+
<let
117+
name="clustering/input/pointcloud"
118+
value="/perception/object_recognition/detection/pointcloud_map_filtered/pointcloud"
119+
if="$(eval &quot;'$(var use_image_segmentation_filter)'=='false' and '$(var use_pointcloud_map)'=='true' &quot;)"
120+
/>
121+
<let
122+
name="clustering/input/pointcloud"
123+
value="$(var input/obstacle_segmentation/pointcloud)"
124+
if="$(eval &quot;'$(var use_image_segmentation_filter)'=='false' and '$(var use_pointcloud_map)'=='false' &quot;)"
125+
/>
104126
<let name="euclidean_cluster_output" value="euclidean_cluster/clusters" if="$(var use_roi_based_cluster)"/>
105127
<let name="euclidean_cluster_output" value="clusters" unless="$(var use_roi_based_cluster)"/>
106128
<include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml">
107-
<arg name="input_pointcloud" value="/perception/object_recognition/detection/pointcloud_map_filtered/pointcloud"/>
129+
<arg name="input_pointcloud" value="$(var clustering/input/pointcloud)"/>
108130
<arg name="output_clusters" value="$(var euclidean_cluster_output)"/>
109131
<arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
110132
</include>

launch/tier4_perception_launch/launch/perception.launch.xml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<arg name="use_low_height_cropbox" default="true" description="use low height crop filter in clustering"/>
6464
<arg name="use_object_filter" default="true" description="use object filter"/>
6565
<arg name="use_roi_based_cluster" default="true" description="use roi_based_cluster in clustering"/>
66+
<arg name="use_image_segmentation_filter" default="false" description="use image sematic segmentation based pointcloud filter"/>
6667
<arg
6768
name="use_empty_dynamic_object_publisher"
6869
default="false"

0 commit comments

Comments
 (0)