Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Commit 32b7323

Browse files
authored
Merge branch 'main' into feature/filter_load_param_from_file
2 parents e2c9732 + a5e7a2d commit 32b7323

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**:
2+
ros__parameters:
3+
distance_ratio: 1.03
4+
object_length_threshold: 0.1
5+
num_points_threshold: 4
6+
max_rings_num: 128
7+
max_points_num_per_ring: 4000
8+
publish_outlier_pointcloud: false
9+
min_azimuth_deg: 0.0
10+
max_azimuth_deg: 360.0
11+
max_distance: 12.0
12+
vertical_bins: 128
13+
horizontal_bins: 36
14+
noise_threshold: 2

common_sensor_launch/launch/nebula_node_container.launch.py

+16-5
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ def create_parameter_dict(*args):
9999
param_file=LaunchConfiguration("distortion_correction_node_param_path").perform(context),
100100
allow_substs=True,
101101
)
102+
ring_outlier_filter_node_param = ParameterFile(
103+
param_file=LaunchConfiguration("ring_outlier_filter_node_param_path").perform(context),
104+
allow_substs=True,
105+
)
102106

103107
nodes = []
104108

@@ -210,11 +214,9 @@ def create_parameter_dict(*args):
210214

211215
# Ring Outlier Filter is the last component in the pipeline, so control the output frame here
212216
if LaunchConfiguration("output_as_sensor_frame").perform(context).lower() == "true":
213-
ring_outlier_filter_parameters = {"output_frame": LaunchConfiguration("frame_id")}
217+
ring_outlier_output_frame = {"output_frame": LaunchConfiguration("frame_id")}
214218
else:
215-
ring_outlier_filter_parameters = {
216-
"output_frame": ""
217-
} # keep the output frame as the input frame
219+
ring_outlier_output_frame = {"output_frame": ""} # keep the output frame as the input frame
218220
nodes.append(
219221
ComposableNode(
220222
package="autoware_pointcloud_preprocessor",
@@ -224,7 +226,7 @@ def create_parameter_dict(*args):
224226
("input", "rectified/pointcloud_ex"),
225227
("output", "pointcloud_before_sync"),
226228
],
227-
parameters=[filter_param, ring_outlier_filter_parameters],
229+
parameters=[filter_param, ring_outlier_filter_node_param, ring_outlier_output_frame],
228230
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
229231
)
230232
)
@@ -333,6 +335,15 @@ def add_launch_arg(name: str, default_value=None, description=None):
333335
),
334336
description="path to parameter file of distortion correction node",
335337
)
338+
add_launch_arg(
339+
"ring_outlier_filter_node_param_path",
340+
os.path.join(
341+
common_sensor_share_dir,
342+
"config",
343+
"ring_outlier_filter_node.param.yaml",
344+
),
345+
description="path to parameter file of ring outlier filter node",
346+
)
336347

337348
set_container_executable = SetLaunchConfiguration(
338349
"container_executable",

0 commit comments

Comments
 (0)