diff --git a/aip_x2_launch/config/blockage_diagnostics_param_file.yaml b/aip_x2_launch/config/blockage_diagnostics.param.yaml similarity index 100% rename from aip_x2_launch/config/blockage_diagnostics_param_file.yaml rename to aip_x2_launch/config/blockage_diagnostics.param.yaml diff --git a/aip_x2_launch/config/distortion_corrector_node.param.yaml b/aip_x2_launch/config/distortion_corrector_node.param.yaml new file mode 100644 index 00000000..3afa4816 --- /dev/null +++ b/aip_x2_launch/config/distortion_corrector_node.param.yaml @@ -0,0 +1,5 @@ +/**: + ros__parameters: + base_frame: base_link + use_imu: true + use_3d_distortion_correction: false diff --git a/aip_x2_launch/config/ring_outlier_filter_node.param.yaml b/aip_x2_launch/config/ring_outlier_filter_node.param.yaml new file mode 100644 index 00000000..76bf6895 --- /dev/null +++ b/aip_x2_launch/config/ring_outlier_filter_node.param.yaml @@ -0,0 +1,14 @@ +/**: + ros__parameters: + distance_ratio: 1.03 + object_length_threshold: 0.1 + num_points_threshold: 4 + max_rings_num: 128 + max_points_num_per_ring: 4000 + publish_outlier_pointcloud: false + min_azimuth_deg: 0.0 + max_azimuth_deg: 360.0 + max_distance: 12.0 + vertical_bins: 128 + horizontal_bins: 36 + noise_threshold: 2 diff --git a/aip_x2_launch/launch/pandar_node_container.launch.py b/aip_x2_launch/launch/pandar_node_container.launch.py index 17a1d97c..869d2f23 100644 --- a/aip_x2_launch/launch/pandar_node_container.launch.py +++ b/aip_x2_launch/launch/pandar_node_container.launch.py @@ -203,16 +203,15 @@ def create_parameter_dict(*args): ("~/input/pointcloud", "mirror_cropped/pointcloud_ex"), ("~/output/pointcloud", "rectified/pointcloud_ex"), ], + parameters=[load_composable_node_param("distortion_corrector_node_param_file")], extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}], ) # Ring Outlier Filter is the last component in the pipeline, so control the output frame here if LaunchConfiguration("output_as_sensor_frame").perform(context): - ring_outlier_filter_parameters = {"output_frame": LaunchConfiguration("frame_id")} + ring_outlier_output_frame = {"output_frame": LaunchConfiguration("frame_id")} else: - ring_outlier_filter_parameters = { - "output_frame": "" - } # keep the output frame as the input frame + ring_outlier_output_frame = {"output_frame": ""} # keep the output frame as the input frame ring_outlier_filter_component = ComposableNode( package="autoware_pointcloud_preprocessor", plugin="autoware::pointcloud_preprocessor::RingOutlierFilterComponent", @@ -221,7 +220,10 @@ def create_parameter_dict(*args): ("input", "rectified/pointcloud_ex"), ("output", "pointcloud_before_sync"), ], - parameters=[ring_outlier_filter_parameters], + parameters=[ + load_composable_node_param("ring_outlier_filter_node_param_file"), + ring_outlier_output_frame, + ], extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}], ) @@ -341,7 +343,15 @@ def add_launch_arg(name: str, default_value=None): add_launch_arg("horizontal_resolution", "0.4") add_launch_arg( "blockage_diagnostics_param_file", - [FindPackageShare("aip_x2_launch"), "/config/blockage_diagnostics_param_file.yaml"], + [FindPackageShare("aip_x2_launch"), "/config/blockage_diagnostics.param.yaml"], + ) + add_launch_arg( + "distortion_corrector_node_param_file", + [FindPackageShare("aip_x2_launch"), "/config/distortion_corrector_node.param.yaml"], + ) + add_launch_arg( + "ring_outlier_filter_node_param_file", + [FindPackageShare("aip_x2_launch"), "/config/ring_outlier_filter_node.param.yaml"], ) add_launch_arg("vehicle_mirror_param_file") add_launch_arg("use_multithread", "true") diff --git a/common_sensor_launch/launch/nebula_node_container.launch.py b/common_sensor_launch/launch/nebula_node_container.launch.py index e9660646..bcd5ec5c 100644 --- a/common_sensor_launch/launch/nebula_node_container.launch.py +++ b/common_sensor_launch/launch/nebula_node_container.launch.py @@ -382,6 +382,10 @@ def add_launch_arg(name: str, default_value=None, description=None): "distortion_corrector_node_param_file", [FindPackageShare("common_sensor_launch"), "/config/distortion_corrector_node.param.yaml"], ) + add_launch_arg( + "ring_outlier_filter_node_param_file", + [FindPackageShare("common_sensor_launch"), "/config/ring_outlier_filter_node.param.yaml"], + ) set_container_executable = SetLaunchConfiguration( "container_executable",