feat!: replace use_pointcloud_container

Signed-off-by: kminoda <[email protected]>
tier4 · Jan 16, 2024 · 68ec5ee · 68ec5ee
1 parent 89b3dd4
commit 68ec5ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/awsim_sensor_kit_launch/launch/lidar.launch.xml b/awsim_sensor_kit_launch/launch/lidar.launch.xml
@@ -1,7 +1,7 @@
 <launch>
   <arg name="use_concat_filter" default="true"/>
   <arg name="vehicle_mirror_param_file"/>
-  <arg name="use_pointcloud_container" default="false" description="launch pointcloud container"/>
+  <arg name="include_concat_node_in_pointcloud_container" default="false" description="include concat node in pointcloud_container"/>
   <arg name="pointcloud_container_name" default="pointcloud_container"/>
   <arg name="use_distortion_corrector" default="true"/>
 
@@ -36,8 +36,8 @@
       <arg name="base_frame" value="base_link"/>
       <arg name="use_intra_process" value="true"/>
       <arg name="use_multithread" value="true"/>
-      <arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
-      <arg name="container_name" value="$(var pointcloud_container_name)"/>
+      <arg name="include_concat_node_in_pointcloud_container" value="$(var include_concat_node_in_pointcloud_container)"/>
+      <arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
     </include>
   </group>
 </launch>
diff --git a/awsim_sensor_kit_launch/launch/pointcloud_preprocessor.launch.py b/awsim_sensor_kit_launch/launch/pointcloud_preprocessor.launch.py
@@ -53,19 +53,19 @@ def launch_setup(context, *args, **kwargs):
 
     # set container to run all required components in the same process
     container = ComposableNodeContainer(
-        name=LaunchConfiguration("container_name"),
+        name=LaunchConfiguration("individual_container_name"),
         namespace="",
         package="rclcpp_components",
         executable=LaunchConfiguration("container_executable"),
         composable_node_descriptions=[],
-        condition=UnlessCondition(LaunchConfiguration("use_pointcloud_container")),
+        condition=UnlessCondition(LaunchConfiguration("include_concat_node_in_pointcloud_container")),
         output="screen",
     )
 
     target_container = (
         container
-        if UnlessCondition(LaunchConfiguration("use_pointcloud_container")).evaluate(context)
-        else LaunchConfiguration("container_name")
+        if UnlessCondition(LaunchConfiguration("include_concat_node_in_pointcloud_container")).evaluate(context)
+        else LaunchConfiguration("pointcloud_container_name")
     )
 
     # load concat or passthrough filter
@@ -88,8 +88,9 @@ def add_launch_arg(name: str, default_value=None):
     add_launch_arg("base_frame", "base_link")
     add_launch_arg("use_multithread", "False")
     add_launch_arg("use_intra_process", "False")
-    add_launch_arg("use_pointcloud_container", "False")
-    add_launch_arg("container_name", "pointcloud_preprocessor_container")
+    add_launch_arg("include_concat_node_in_pointcloud_container", "False")
+    add_launch_arg("pointcloud_container_name", "pointcloud_container")
+    add_launch_arg("individual_container_name", "concatenate_container")
 
     set_container_executable = SetLaunchConfiguration(
         "container_executable",

diff --git a/awsim_sensor_kit_launch/launch/sensing.launch.xml b/awsim_sensor_kit_launch/launch/sensing.launch.xml
@@ -2,15 +2,15 @@
   <!-- Launch driver argument is not used since the AWSIM doesn't need any hardware drivers. -->
   <!-- <arg name="launch_driver" default="true" description="do launch driver"/> -->
   <arg name="vehicle_mirror_param_file" description="path to the file of vehicle mirror position yaml"/>
-  <arg name="use_pointcloud_container" default="false" description="launch pointcloud container"/>
+  <arg name="include_concat_node_in_pointcloud_container" default="false" description="launch pointcloud container"/>
   <arg name="pointcloud_container_name" default="pointcloud_container"/>
   <arg name="use_distortion_corrector" default="false" description="compensate the point cloud distortion caused by vehicle movement"/>
 
   <group>
     <!-- LiDAR Driver -->
     <include file="$(find-pkg-share awsim_sensor_kit_launch)/launch/lidar.launch.xml">
       <arg name="vehicle_mirror_param_file" value="$(var vehicle_mirror_param_file)"/>
-      <arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
+      <arg name="include_concat_node_in_pointcloud_container" value="$(var include_concat_node_in_pointcloud_container)"/>
       <arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
       <arg name="use_distortion_corrector" value="$(var use_distortion_corrector)"/>
     </include>