Skip to content

Commit 6745976

Browse files
authored
fix: detection launch in perception_launch (#506)
Signed-off-by: Yukihiro Saito <yukky.saito@gmail.com>
1 parent 1d36fae commit 6745976

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</include> -->
3535

3636
<group>
37-
<push-ros-namespace namespace="euclidean"/>
37+
<push-ros-namespace namespace="clustering"/>
3838
<include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml">
39-
<arg name="output_clusters" value="lidar/clusters"/>
39+
<arg name="output_clusters" value="clusters"/>
4040
<arg name="use_pointcloud_map" value="false"/>
4141
</include>
4242
<include file="$(find-pkg-share roi_cluster_fusion)/launch/roi_cluster_fusion.launch.xml">
@@ -57,7 +57,7 @@
5757
<arg name="input/camera_info7" value="$(var camera_info7)"/>
5858
<arg name="input/rois7" value="/perception/object_recognition/detection/rois7"/>
5959
<arg name="input/rois_number" value="$(var image_number)"/>
60-
<arg name="input/clusters" value="clustering/lidar/clusters"/>
60+
<arg name="input/clusters" value="clusters"/>
6161
<arg name="input/image0" value="$(var image_raw0)"/>
6262
<arg name="input/image1" value="$(var image_raw1)"/>
6363
<arg name="input/image2" value="$(var image_raw2)"/>
@@ -120,7 +120,7 @@
120120
<!-- Merger -->
121121
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">
122122
<arg name="input/object0" value="$(var lidar_detection_model)/objects"/>
123-
<arg name="input/object1" value="euclidean/camera_lidar_fusion/short_range_objects"/>
123+
<arg name="input/object1" value="clustering/camera_lidar_fusion/short_range_objects"/>
124124
<arg name="output/object" value="camera_lidar_fusion/objects"/>
125125
</include>
126126
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">

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

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
<!-- Clustering -->
77
<group>
8+
<push-ros-namespace namespace="clustering"/>
89
<include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml">
910
<arg name="output_clusters" value="clusters"/>
1011
<arg name="use_pointcloud_map" value="false"/>

perception/euclidean_cluster/launch/euclidean_cluster.launch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def load_composable_node_param(param_path):
3232
with open(LaunchConfiguration(param_path).perform(context), "r") as f:
3333
return yaml.safe_load(f)["/**"]["ros__parameters"]
3434

35-
ns = "euclidean_cluster"
35+
ns = ""
3636
pkg = "euclidean_cluster"
3737

3838
# set voxel grid filter as a component

perception/euclidean_cluster/launch/voxel_grid_based_euclidean_cluster.launch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def load_composable_node_param(param_path):
3232
with open(LaunchConfiguration(param_path).perform(context), "r") as f:
3333
return yaml.safe_load(f)["/**"]["ros__parameters"]
3434

35-
ns = "clustering"
35+
ns = ""
3636
pkg = "euclidean_cluster"
3737

3838
# set compare map filter as a component

0 commit comments

Comments
 (0)