From 66cabb8b458145820bc93abcb99acea04d01641a Mon Sep 17 00:00:00 2001 From: waiwaylee Date: Tue, 3 Nov 2026 09:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A1=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0TAS=E6=B3=A2=E6=9D=9F=E4=BF=AF=E4=BB=B0=E8=A7=92?= =?UTF-8?q?=E4=B8=8B=E9=99=90=EF=BC=8C=E9=81=BF=E5=85=8DTAS=E6=B3=A2?= =?UTF-8?q?=E6=9D=9F=E6=89=93=E5=88=B0=E5=9C=B0=E9=9D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: waiwaylee --- config/X1024_MS_4.8S.toml | 2 ++ config/X1024_MS_5S.toml | 2 ++ config/X1024_PS_3S_TAS_2Hz.toml | 2 ++ config/X256_MS_4S.toml | 2 ++ config/X256_PS_3S_TAS_1Hz.toml | 2 ++ config/X256_PS_3S_TAS_2Hz.toml | 2 ++ config/config_tmp.toml | 2 ++ data_process_class_dll/rdp_parameter_loader.cpp | 2 ++ data_process_class_dll/struct.h | 1 + data_process_class_dll/tas_ctrl.cpp | 2 +- 10 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config/X1024_MS_4.8S.toml b/config/X1024_MS_4.8S.toml index 8fed1f2..5e67643 100644 --- a/config/X1024_MS_4.8S.toml +++ b/config/X1024_MS_4.8S.toml @@ -121,6 +121,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 1 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 3.0 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/config/X1024_MS_5S.toml b/config/X1024_MS_5S.toml index 62495ac..4c50331 100644 --- a/config/X1024_MS_5S.toml +++ b/config/X1024_MS_5S.toml @@ -121,6 +121,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 1 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 3.0 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/config/X1024_PS_3S_TAS_2Hz.toml b/config/X1024_PS_3S_TAS_2Hz.toml index e194d72..7cd3953 100644 --- a/config/X1024_PS_3S_TAS_2Hz.toml +++ b/config/X1024_PS_3S_TAS_2Hz.toml @@ -121,6 +121,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 4 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 3.0 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/config/X256_MS_4S.toml b/config/X256_MS_4S.toml index ef9cbc0..57a056b 100644 --- a/config/X256_MS_4S.toml +++ b/config/X256_MS_4S.toml @@ -121,6 +121,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 1 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 5.4 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/config/X256_PS_3S_TAS_1Hz.toml b/config/X256_PS_3S_TAS_1Hz.toml index 79e55da..5862e58 100644 --- a/config/X256_PS_3S_TAS_1Hz.toml +++ b/config/X256_PS_3S_TAS_1Hz.toml @@ -121,6 +121,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 4 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 5.4 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/config/X256_PS_3S_TAS_2Hz.toml b/config/X256_PS_3S_TAS_2Hz.toml index 5f884c8..e1c0421 100644 --- a/config/X256_PS_3S_TAS_2Hz.toml +++ b/config/X256_PS_3S_TAS_2Hz.toml @@ -121,6 +121,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 4 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 5.4 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/config/config_tmp.toml b/config/config_tmp.toml index 20f3343..e670119 100644 --- a/config/config_tmp.toml +++ b/config/config_tmp.toml @@ -123,6 +123,8 @@ track_index_max = 500 default_track_beam_type = 1 # 最大同时跟踪目标数（TAS 队列容量上限 30） tas_track_num_max = 4 +# TAS波束最小俯仰角度 +tas_beam_pitch_min = 3.0 ## singer模型机动参数（均必须 > 0） [singer_model] diff --git a/data_process_class_dll/rdp_parameter_loader.cpp b/data_process_class_dll/rdp_parameter_loader.cpp index 551ea26..3000b17 100644 --- a/data_process_class_dll/rdp_parameter_loader.cpp +++ b/data_process_class_dll/rdp_parameter_loader.cpp @@ -128,6 +128,8 @@ const FloatField kFloatFields[] = { {"track_quality", "track_quality_iter_coeff", &RDP_parameter::track_quality_iter_coeff}, {"track_quality", "track_quality_decrease_coeff_o2", &RDP_parameter::track_quality_decrease_coeff_o2}, {"track_quality", "track_quality_decrease_coeff_o1", &RDP_parameter::track_quality_decrease_coeff_o1}, + // [beam_control] 波束调度参数 + {"beam_control", "tas_beam_pitch_min", &RDP_parameter::tas_beam_pitch_min}, // [singer_model] singer 模型机动参数 {"singer_model", "model_1_Q_fast", &RDP_parameter::model_1_Q_fast}, {"singer_model", "model_1_Q_slow", &RDP_parameter::model_1_Q_slow}, diff --git a/data_process_class_dll/struct.h b/data_process_class_dll/struct.h index 9b8b927..ebadf22 100644 --- a/data_process_class_dll/struct.h +++ b/data_process_class_dll/struct.h @@ -256,6 +256,7 @@ struct RDP_parameter // ******************* 波束调度参数 ************************// int default_track_beam_type; //默认跟踪波束类型 int tas_track_num_max; //最大同时跟踪目标数 + float tas_beam_pitch_min; //TAS跟踪波束俯仰最小值 // ******************* singer模型机动参数 ************************// float model_1_Q_fast; //模型1 diff --git a/data_process_class_dll/tas_ctrl.cpp b/data_process_class_dll/tas_ctrl.cpp index d298312..476c4c9 100644 --- a/data_process_class_dll/tas_ctrl.cpp +++ b/data_process_class_dll/tas_ctrl.cpp @@ -391,7 +391,7 @@ void TAS_Ctrl::tas_beam_output(std::vector *trust_track // else // elev=elev; - Tracking_beam->Elev=(float)elev; + Tracking_beam->Elev= max((float)elev, rdp_parameter.tas_beam_pitch_min); //跟踪波束类型 Tracking_beam->type=rdp_parameter.default_track_beam_type;