xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改 自动处理分析新beta保存刻度数据业务。修改从数据库加载读取刻度数据业务逻辑

Browse Source
This commit is contained in:
xiaoguangbin 2024-10-08 14:29:33 +08:00
parent 9ea7aee74c
commit cfe6778c82
1 changed files with 4 additions and 2 deletions

6
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
View File

@ -469,7 +469,8 @@ public class SelfStationUtil extends SelfBaseUtil {
vChan.add(1.0);
vChan.add(Double.valueOf(selfStationData.getSampleStruct().g_channels));
List<Double> vEner = CalValuesHandler.calFcnEval(vChan, selfStationData.getSampleVueData().getUsedEnerPara().getP()).counts;
PHDFile phd = selfStationData.getSampleVueData().getROIOnePHDFile();
List<Double> vEner = CalValuesHandler.calFcnEval(vChan, phd.getUsedEnerPara().getP()).counts;
double d = vEner.get(0), maxE = vEner.get(1);
double dStep = maxE / width * 2;
@ -602,7 +603,8 @@ public class SelfStationUtil extends SelfBaseUtil {
vChan.add(1.0);
vChan.add(Double.valueOf(selfStationData.getSampleStruct().g_channels));
List<Double> vEner = CalValuesHandler.calFcnEval(vChan, selfStationData.getSampleVueData().getUsedEnerPara().getP()).counts;
PHDFile phd = selfStationData.getSampleVueData().getROIOnePHDFile();
List<Double> vEner = CalValuesHandler.calFcnEval(vChan, phd.getUsedEnerPara().getP()).counts;
double d = vEner.get(0);
double maxE = vEner.get(1);
double dStep = maxE / width * 2;