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
index 50b73709cc902..9c3e815e8abb4 100644
--- a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml
+++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml
@@ -7,7 +7,6 @@
-
@@ -56,7 +55,6 @@
-
@@ -130,7 +128,6 @@
-
@@ -190,7 +187,6 @@
-
@@ -219,7 +215,6 @@
-
diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml
index 2232feb6d7c67..1e14ae9379a41 100644
--- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml
+++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml
@@ -4,7 +4,6 @@
-
@@ -86,7 +85,7 @@
-
+
@@ -98,7 +97,6 @@
-
diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml
index 34f0a01d0a688..f9b65fd5c30eb 100644
--- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml
+++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml
index cec0c3bc05aac..0fabd5e98e45f 100644
--- a/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml
+++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml
@@ -3,7 +3,6 @@
-
@@ -12,7 +11,6 @@
-
@@ -27,7 +25,7 @@
-
+
diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py b/launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py
index 1dcb9cfc90daf..a5af24595c593 100644
--- a/launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py
+++ b/launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py
@@ -20,7 +20,6 @@
from launch.conditions import IfCondition
from launch.conditions import UnlessCondition
from launch.substitutions import LaunchConfiguration
-from launch_ros.actions import ComposableNodeContainer
from launch_ros.actions import LoadComposableNodes
from launch_ros.descriptions import ComposableNode
import yaml
@@ -140,21 +139,11 @@ def launch_setup(context, *args, **kwargs):
pipeline = PointcloudMapFilterPipeline(context)
components = []
components.extend(pipeline.create_pipeline())
- individual_container = ComposableNodeContainer(
- name=LaunchConfiguration("individual_container_name"),
- namespace="",
- package="rclcpp_components",
- executable=LaunchConfiguration("container_executable"),
- composable_node_descriptions=components,
- condition=UnlessCondition(LaunchConfiguration("use_pointcloud_container")),
- output="screen",
- )
pointcloud_container_loader = LoadComposableNodes(
composable_node_descriptions=components,
target_container=LaunchConfiguration("pointcloud_container_name"),
- condition=IfCondition(LaunchConfiguration("use_pointcloud_container")),
)
- return [individual_container, pointcloud_container_loader]
+ return [pointcloud_container_loader]
def generate_launch_description():
@@ -167,9 +156,7 @@ def add_launch_arg(name: str, default_value=None):
add_launch_arg("output_topic", "")
add_launch_arg("use_multithread", "False")
add_launch_arg("use_intra_process", "True")
- add_launch_arg("use_pointcloud_container", "False")
add_launch_arg("pointcloud_container_name", "pointcloud_container")
- add_launch_arg("individual_container_name", "pointcloud_map_filter_container")
add_launch_arg("use_pointcloud_map", "true")
set_container_executable = SetLaunchConfiguration(
"container_executable",
diff --git a/launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py b/launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py
index 66a0bb4d0fb63..99074d4ae4a98 100644
--- a/launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py
+++ b/launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py
@@ -21,7 +21,6 @@
from launch.conditions import UnlessCondition
from launch.substitutions import LaunchConfiguration
from launch.substitutions import PathJoinSubstitution
-from launch_ros.actions import ComposableNodeContainer
from launch_ros.actions import LoadComposableNodes
from launch_ros.descriptions import ComposableNode
from launch_ros.substitutions import FindPackageShare
@@ -504,21 +503,11 @@ def launch_setup(context, *args, **kwargs):
output_topic=pipeline.output_topic,
)
)
- individual_container = ComposableNodeContainer(
- name=LaunchConfiguration("individual_container_name"),
- namespace="",
- package="rclcpp_components",
- executable=LaunchConfiguration("container_executable"),
- composable_node_descriptions=components,
- condition=UnlessCondition(LaunchConfiguration("use_pointcloud_container")),
- output="screen",
- )
pointcloud_container_loader = LoadComposableNodes(
composable_node_descriptions=components,
target_container=LaunchConfiguration("pointcloud_container_name"),
- condition=IfCondition(LaunchConfiguration("use_pointcloud_container")),
)
- return [individual_container, pointcloud_container_loader]
+ return [pointcloud_container_loader]
def generate_launch_description():
@@ -530,9 +519,7 @@ 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", "True")
- add_launch_arg("use_pointcloud_container", "False")
add_launch_arg("pointcloud_container_name", "pointcloud_container")
- add_launch_arg("individual_container_name", "ground_segmentation_container")
add_launch_arg("input/pointcloud", "/sensing/lidar/concatenated/pointcloud")
set_container_executable = SetLaunchConfiguration(
diff --git a/launch/tier4_perception_launch/launch/occupancy_grid_map/probabilistic_occupancy_grid_map.launch.xml b/launch/tier4_perception_launch/launch/occupancy_grid_map/probabilistic_occupancy_grid_map.launch.xml
index 244e0940acb70..fce3da96ce888 100644
--- a/launch/tier4_perception_launch/launch/occupancy_grid_map/probabilistic_occupancy_grid_map.launch.xml
+++ b/launch/tier4_perception_launch/launch/occupancy_grid_map/probabilistic_occupancy_grid_map.launch.xml
@@ -6,7 +6,6 @@
-
@@ -23,7 +22,7 @@
-
+
@@ -39,7 +38,7 @@
-
+
@@ -55,7 +54,7 @@
-
+
diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml
index 0d517ced97d17..dbb74335f79d2 100644
--- a/launch/tier4_perception_launch/launch/perception.launch.xml
+++ b/launch/tier4_perception_launch/launch/perception.launch.xml
@@ -82,7 +82,6 @@
default="false"
description="if use_empty_dynamic_object_publisher:=true, /perception/object_recognition/objects topic has an empty DynamicObjectArray"
/>
-
@@ -131,7 +130,6 @@
-
@@ -146,7 +144,6 @@
-
@@ -197,7 +194,6 @@
-
diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml
index 602bd25ad8d27..90ebd23215be5 100644
--- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml
+++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml
@@ -269,59 +269,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/launch/tier4_sensing_launch/launch/sensing.launch.xml b/launch/tier4_sensing_launch/launch/sensing.launch.xml
index af9e4481a1430..391a1f8bad641 100644
--- a/launch/tier4_sensing_launch/launch/sensing.launch.xml
+++ b/launch/tier4_sensing_launch/launch/sensing.launch.xml
@@ -2,7 +2,6 @@
-
@@ -14,7 +13,6 @@
-