大法师

Service/X1LeoTaskServer54/App.config

@@ -36,9 +36,6 @@
 		<!--星历速度误差(单位:m/s)-->
 		<add key="EphVelErr" value="0.1"/>
 
-		<!--使用GPU执行参数估计=1 ，使用CPU执行参数估计=0-->
-		<add key="UseGpuCg" value="0"/>
-
 	</appSettings>
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />

Service/X2LeoTaskServer54/App.config

@@ -40,9 +40,6 @@
 		<!--星历速度误差(单位:m/s)-->
 		<add key="EphVelErr" value="0.1"/>
 
-		<!--使用GPU执行参数估计=1 ，使用CPU执行参数估计=0-->
-		<add key="UseGpuCg" value="0"/>
-
 	</appSettings>
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />

Service/X2LeoTaskServer54/Service/TaskService.cs

@@ -24,7 +24,6 @@ namespace X2LeoTaskServer54.Service
         int Adja1SatCode;
         double[] MainXYZ, Adja1XYZ;
         int PosDtoFactor;
-        bool useGpuCg = false;
 
         double TarFreqDownMHz;
         double RefFreqDownMHz;
@@ -67,9 +66,6 @@ namespace X2LeoTaskServer54.Service
             var EphVelErrstr = ConfigurationManager.AppSettings["EphVelErr"].Trim();
             double.TryParse(EphVelErrstr, out EphVelErr);
 
-            string useGpuStr = ConfigurationManager.AppSettings["UseGpuCg"];
-            if (useGpuStr != null && useGpuStr.Trim() == "1")
-                useGpuCg = true;
         }
 
         /// <summary>
@@ -81,9 +77,9 @@ namespace X2LeoTaskServer54.Service
             cts = new CancellationTokenSource();
             Task.Run(async () =>
             {
-                LogHelper.Info($"【任务{dto.ID}】开始执行...");
-                LogHelper.Info($"【任务{dto.ID}】AD采集目录[{CapDir}]");
-                LogHelper.Info($"【任务{dto.ID}】状态上报输出目录[{StateDir}]");
+                await LogHelper.Info($"【任务{dto.ID}】开始执行...");
+                await LogHelper.Info($"【任务{dto.ID}】AD采集目录[{CapDir}]");
+                await LogHelper.Info($"【任务{dto.ID}】状态上报输出目录[{StateDir}]");
                 //点击定位平台右上角查看接口可以在浏览器中查看平台提供的所有接口详细信息
                 while (!cts.IsCancellationRequested)
                 {
@@ -122,7 +118,7 @@ namespace X2LeoTaskServer54.Service
 
                         if (!groupFiles.Any())
                         {
-                            LogHelper.Info($"【任务{dto.ID}】等待扫描文件...");
+                            await LogHelper.Info($"【任务{dto.ID}】等待扫描文件...");
                             await Task.Delay(10000);
                         }
                         var listTask = new List<Task>();
@@ -131,12 +127,12 @@ namespace X2LeoTaskServer54.Service
                             if (cts.IsCancellationRequested) break;
 
                             var first = groupFile.First();
-                            LogHelper.Info($"【任务{dto.ID}】正在执行第{first.XDNo}组的采集文件");
+                            await LogHelper.Info($"【任务{dto.ID}】正在执行第{first.XDNo}组的采集文件");
 
                             var group = groupFile.OrderBy(g => g.AdTime).ToArray();
                             if (group.Count() != 4)
                             {
-                                LogHelper.Warning($"【任务{dto.ID}】第{first.XDNo}组{first.AdTime:yyyyMMddHHmmss}时刻-信号{first.FreqDownMHz}MHz-未找到双星目标及参考的信号文件,跳过此组数据");
+                                await LogHelper.Warning($"【任务{dto.ID}】第{first.XDNo}组{first.AdTime:yyyyMMddHHmmss}时刻-信号{first.FreqDownMHz}MHz-未找到双星目标及参考的信号文件,跳过此组数据");
                                 return;
                             }
                             //group:同一组不同时刻的文件
@@ -154,22 +150,22 @@ namespace X2LeoTaskServer54.Service
                                 var refFileInfo2 = refInfo.FirstOrDefault(t => t.Ch == 2);
                                 if (tarFileInfo1 == null)
                                 {
-                                    LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{TarFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
+                                    await LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{TarFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
                                     return;
                                 }
                                 if (tarFileInfo2 == null)
                                 {
-                                    LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{TarFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
+                                    await LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{TarFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
                                     return;
                                 }
                                 if (refFileInfo1 == null)
                                 {
-                                    LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{RefFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
+                                    await LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{RefFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
                                     return;
                                 }
                                 if (refFileInfo2 == null)
                                 {
-                                    LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{RefFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
+                                    await LogHelper.Warning($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{RefFreqDownMHz}MHz-未找到信号文件,跳过此组数据");
                                     return;
                                 }
                                 if (cts.IsCancellationRequested) return;
@@ -194,12 +190,12 @@ namespace X2LeoTaskServer54.Service
                                 var deteResp = await HttpHelper.PostRequestAsync<List<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", detectDto, token: cts.Token);
                                 if (deteResp.code != 200)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz信号检测出错.{deteResp.msg}");
+                                    await LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz信号检测出错.{deteResp.msg}");
                                     return;
                                 }
                                 var smps = deteResp.data.Select(m => new SmpPosition(m.Start, m.Length)).ToList();//怎么补0?
 
-                                LogHelper.Info($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-CPU参估开始,共{smps.Count}个突发...");
+                                await LogHelper.Info($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-CPU参估开始,共{smps.Count}个突发...");
                                 var cgDto = new CpuCgMultiDto()
                                 {
                                     dtCenter = 0,
@@ -213,7 +209,7 @@ namespace X2LeoTaskServer54.Service
                                 var result1 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
                                 if (result1.code != 200)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-目标主星邻1星CPU参估出错.{result1.msg}");
+                                    await LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-目标主星邻1星CPU参估出错.{result1.msg}");
                                     return;
                                 }
                                 var cpuCgDto = new CpuCgDto()
@@ -231,15 +227,15 @@ namespace X2LeoTaskServer54.Service
                                 sw.Stop();
                                 if (result2.code != 200)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-参考主星邻2星CPU参估出错.{result2.msg}");
+                                    await LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-参考主星邻2星CPU参估出错.{result2.msg}");
                                     return;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-CPU参估完成,耗时{sw.ElapsedMilliseconds}ms");
+                                await LogHelper.Info($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-CPU参估完成,耗时{sw.ElapsedMilliseconds}ms");
                                 var data1 = result1.data;
                                 var data2 = result2.data;
                                 if (data1.Count != cgDto.smpPositions.Count)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-参估结果个数和检测结果个数不匹配");
+                                    await LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-参估结果个数和检测结果个数不匹配");
                                     return;
                                 }
                                 sw.Start();
@@ -290,7 +286,7 @@ namespace X2LeoTaskServer54.Service
                                         var result = await HttpHelper.PostRequestAsync<PosResDto>(baseUrl + "Pos/PosLeX2ParAsync", leoX2);
                                         if (result.code != 200)
                                         {
-                                            LogHelper.Error($"【任务{dto.ID}】第{No}组-{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz 第{i + 1}个突发定位异常.{result.msg}");
+                                            await LogHelper.Error($"【任务{dto.ID}】第{No}组-{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz 第{i + 1}个突发定位异常.{result.msg}");
                                         }
                                         else
                                         {
@@ -306,14 +302,14 @@ namespace X2LeoTaskServer54.Service
                                             {
                                                 MsEph = MainXYZ,
                                                 NsEph = Adja1XYZ,
-                                                RefGeod= new double[3] { dto.RefLon, dto.RefLat, 0 },
+                                                RefGeod = new double[3] { dto.RefLon, dto.RefLat, 0 },
                                                 SelectPoint = new double[3] { posLon, posLat, 0 },
-                                                DtoErr=DtoErrus *1e-6,
+                                                DtoErr = DtoErrus * 1e-6,
                                                 DfoErr = DfoErrHz,
                                                 EphPosErr = EphPosErrM,
                                                 EphVelErr = EphVelErr,
                                                 fu1 = leoX2.TarFreqUp,
-                                                fu2=leoX2.RefFreqUp,
+                                                fu2 = leoX2.RefFreqUp,
                                                 Pe = 0.5,
                                                 OutputErrPoint = false
                                             };
@@ -338,7 +334,7 @@ namespace X2LeoTaskServer54.Service
                                             sb.Append($"{Convert.ToInt64(leoX2.Dto * 1e2):D10}\t");
                                             sb.Append($"{Convert.ToInt64(leoX2.Dfo * 1e2):D10}\t");
                                             sb.Append($"{Convert.ToInt64(leoX2.Snr * 1e2):D6}\t");
-                                            sb.Append($"{Convert.ToInt64((leoX2.YbMainDto- leoX2.YbAdjaDto) * 1e2):D10}\t");
+                                            sb.Append($"{Convert.ToInt64((leoX2.YbMainDto - leoX2.YbAdjaDto) * 1e2):D10}\t");
                                             sb.Append($"{Convert.ToInt64((leoX2.YbMainDfo - leoX2.YbAdjaDfo) * 1e2):D10}\t");
                                             sb.Append($"{Convert.ToInt64(data2.Snr * 1e2):D6}\t");
                                             sb.Append($"{Convert.ToInt64(0 * 1e2):D10}\t");
@@ -359,16 +355,11 @@ namespace X2LeoTaskServer54.Service
                                     }
                                     catch (Exception ex)
                                     {
-                                        LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-时隙位置{data1[i].Smpstart}定位异常", ex);
+                                        await LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-时隙位置{data1[i].Smpstart}定位异常", ex);
                                     }
                                 }
                                 sw.Stop();
-                                LogHelper.Info($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-定位完成,耗时{sw.ElapsedMilliseconds}ms");
-
-
-                                /* File.Delete(ch0File.File);
-                                 File.Delete(ch1File.File);
-                                 File.Delete(ch2File.File);*/
+                                await LogHelper.Info($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-定位完成,耗时{sw.ElapsedMilliseconds}ms");
                             }, cts.Token);
                             listTask.Add(task);
 
@@ -378,14 +369,14 @@ namespace X2LeoTaskServer54.Service
                     }
                     catch (TaskCanceledException ex)
                     {
-                        LogHelper.Warning($"【任务{dto.ID}】处理结束,用户手动终止", ex.InnerException);
+                        await LogHelper.Warning($"【任务{dto.ID}】处理结束,用户手动终止", ex.InnerException);
                     }
                     catch (Exception ex)
                     {
                         if (ex.InnerException != null && ex.InnerException.GetType() == typeof(TaskCanceledException))
-                            LogHelper.Warning($"【任务{dto.ID}】处理结束,用户手动终止", ex.InnerException);
+                            await LogHelper.Warning($"【任务{dto.ID}】处理结束,用户手动终止", ex.InnerException);
                         else
-                            LogHelper.Error($"【任务{dto.ID}】任务执行出错", ex);
+                            await LogHelper.Error($"【任务{dto.ID}】任务执行出错", ex);
                         continue;
                     }
                 }
@@ -411,7 +402,6 @@ namespace X2LeoTaskServer54.Service
         private int GetSignalType(string modTypestr)
         {
             EnumSignalTypeDto modType = modTypestr.GetEnumByDisplayName<EnumSignalTypeDto>();
-#warning 没有CPM调制方式
             //1:CPM,2:BPSK,4:QPSK,9:其他
             int signalType = 9;
             if (modType == EnumSignalTypeDto.BPSK)
@@ -445,17 +435,17 @@ namespace X2LeoTaskServer54.Service
             await Task.Delay(2000);
             if (type == EnumTaskStopType.Properly)
             {
-                LogHelper.Info($"【任务{taskID}】{stopReason}");
+                await LogHelper.Info($"【任务{taskID}】{stopReason}");
             }
             else
             {
-                LogHelper.Error($"【任务{taskID}】{stopReason}");
+                await LogHelper.Error($"【任务{taskID}】{stopReason}");
             }
             TaskStopHandleDto stopDto = new TaskStopHandleDto() { ID = taskID, StopType = type, StopReason = stopReason };
             var stopResp = await HttpHelper.PostRequestAsync(baseUrl + "Task/StopTask", stopDto);
             if (stopResp.code != 200)
             {
-                LogHelper.Error($"【任务{taskID}】停止异常.{stopResp.msg}");
+                await LogHelper.Error($"【任务{taskID}】停止异常.{stopResp.msg}");
             }
         }
 

Service/X3LeoTaskServer54/App.config

@@ -34,10 +34,6 @@
 
 		<!--星历误差(单位:m)-->
 		<add key="EphErrm" value="10000"/>
-
-		<!--使用GPU执行参数估计=1 ，使用CPU执行参数估计=0-->
-		<add key="UseGpuCg" value="0"/>
-
 	</appSettings>
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />