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

fix:修改新beta 的beta分析参数组成方法

Browse Source
This commit is contained in:
xiaoguangbin 2024-12-03 09:11:12 +08:00
parent 06f733365a
commit 3ea54ffec4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1288,7 +1288,7 @@ public class SelfStationUtil extends SelfBaseUtil {
* @param gStop RoiLimit Gamma Stop
* @param nuclideLinesMap 所有核素信息
*/
public HashMap<String, Object> getBetaAnalyseNuclideParam(SelfStationVueData sampleData, HashMap<String, NuclideLine> nuclideMap,
/**public HashMap<String, Object> getBetaAnalyseNuclideParam(SelfStationVueData sampleData, HashMap<String, NuclideLine> nuclideMap,
List<Double> gStart, List<Double> gStop, Map<String,
NuclideLines> nuclideLinesMap) {
HashMap<String, Object> param = Maps.newHashMap();
@ -1385,7 +1385,7 @@ public class SelfStationUtil extends SelfBaseUtil {
param.put(mapKey, nuclideParam);
}
return param;
}
}*/
/**
* 得到 baseline计数

5
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -2704,7 +2704,10 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
HashMap<String, NuclideLine> nuclideMap = selfParameter.getNuclideMap();
// 获取峰面积、半衰期、发射几率
HashMap<String, Object> nuclideParam = selfStationUtil.getBetaAnalyseNuclideParam(sampleData, nuclideMap, struct.POI_G_y1, struct.POI_G_y2, nuclideLinesMap);
HashMap<String, Object> nuclideParam = selfStationUtil.getBetaAnalyseNuclideParam(nuclideMap, struct.POI_G_y1,
struct.POI_G_y2, sampleData.getROIOnePHDFile(), sampleData.getROITwoPHDFile(),
sampleData.getROIThreePHDFile(), sampleData.getROIFourPHDFile());
Console.log(JSON.toJSONString(nuclideParam));
// 调用beta分析算法
String resultStr = EnergySpectrumHandler.selfBgAnalyse(phdPath, JSON.toJSONString(nuclideParam));