fix conflict

Signed-off-by: scepter914 <[email protected]>
tier4 · Oct 2, 2023 · 8d14fdf · 8d14fdf
1 parent 641d9bb
commit 8d14fdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.../launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml b/.../launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml
@@ -102,8 +102,7 @@
       <include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml">
         <arg name="input_pointcloud" value="$(var clustering/input/pointcloud)"/>
         <arg name="output_clusters" value="clusters"/>
-        <arg name="use_pointcloud_map" value="false"/>
-        <arg name="use_downsample_pointcloud" value="$(var use_downsample_pointcloud)"/>
+        <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
       </include>
     </group>
 

diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml
@@ -37,6 +37,8 @@
   <!-- Camera-LiDAR fusion parameters -->
   <arg name="remove_unknown" default="true"/>
   <arg name="trust_distance" default="30.0"/>
+  <arg name="use_roi_based_cluster" default="false"/>
+  <arg name="use_low_height_cropbox" default="true" description="use low height crop filter in clustering"/>
 
   <!-- Camera-LiDAR-Radar fusion based detection -->
   <group if="$(eval '&quot;$(var mode)&quot;==&quot;camera_lidar_radar_fusion&quot;')">
@@ -67,9 +69,6 @@
       <arg name="remove_unknown" value="$(var remove_unknown)"/>
       <arg name="trust_distance" value="$(var trust_distance)"/>
       <arg name="input/radar" value="$(var input/radar)"/>
-      <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
-      <arg name="use_roi_based_cluster" value="$(var use_roi_based_cluster)"/>
-      <arg name="input/radar" value="$(var input/radar)"/>
       <arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
     </include>
   </group>
@@ -112,8 +111,6 @@
       <arg name="use_object_filter" value="$(var use_object_filter)"/>
       <arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
       <arg name="container_name" value="$(var container_name)"/>
-      <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
-      <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
       <arg name="input/radar" value="$(var input/radar)"/>
       <arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
     </include>