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

beta分析结果下标越界问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-08 19:08:43 +08:00
parent 2c28a746f5
commit 06ba735009
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -623,6 +623,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
public boolean analyzeSpectrum(File sampleTmp, File gasTmp, File detTmp, BgCalibratePara BgCalPara, Map<String, Object> map, BetaDataFile betaDataFile) {
boolean bRet = true;
long start = System.currentTimeMillis();
//调用动态库解析文件
BgAnalyseResult analyseResult = null;
if (Objects.isNull(BgCalPara)) {
@ -630,6 +631,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
} else {
analyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), BgCalPara);
}
System.out.println("beta分析总耗时："+ (System.currentTimeMillis() - start));
if (StringUtils.isNotBlank(analyseResult.error_log) && !analyseResult.error_log.equalsIgnoreCase("no error.")) {
bRet = false;
return bRet;
@ -840,7 +842,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
gammaCalibrationSpectrumList.add(gammaCalibrationS);
} else {
GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
if (bgAnalyseResult.s_g_fitting_c_e.size() < 0) {
if (bgAnalyseResult.s_g_fitting_c_e.size() <= 0) {
gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
@ -862,7 +864,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
gammaCalibrationSpectrumList.add(gammaCalibrationG);
} else {
GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
if (bgAnalyseResult.g_g_fitting_c_e.size() < 0) {
if (bgAnalyseResult.g_g_fitting_c_e.size() <= 0) {
gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
@ -885,7 +887,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
gammaCalibrationSpectrumList.add(gammaCalibrationD);
} else {
GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
if (bgAnalyseResult.d_g_fitting_c_e.size() < 0) {
if (bgAnalyseResult.d_g_fitting_c_e.size() <= 0) {
gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
@ -912,7 +914,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
gammaCalibrationSpectrumEList.add(gammaCalibrationS);
} else {
GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
if (bgAnalyseResult.s_g_fitting_e_c.size() < 0) {
if (bgAnalyseResult.s_g_fitting_e_c.size() <= 0) {
gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
@ -934,7 +936,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
gammaCalibrationSpectrumEList.add(gammaCalibrationG);
} else {
GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
if (bgAnalyseResult.g_g_fitting_e_c.size() < 0) {
if (bgAnalyseResult.g_g_fitting_e_c.size() <= 0) {
gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
@ -957,7 +959,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
gammaCalibrationSpectrumEList.add(gammaCalibrationD);
} else {
GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
if (bgAnalyseResult.d_g_fitting_e_c.size() < 0) {
if (bgAnalyseResult.d_g_fitting_e_c.size() <= 0) {
gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
@ -985,7 +987,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaCalibrationSpectrumList.add(betaCalibrationS);
} else {
GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
if (bgAnalyseResult.s_b_fitting_c_e.size() < 0) {
if (bgAnalyseResult.s_b_fitting_c_e.size() <= 0) {
betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
betaCalibrationS.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
betaCalibrationS.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
@ -1007,7 +1009,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaCalibrationSpectrumList.add(betaCalibrationG);
} else {
GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
if (bgAnalyseResult.g_b_fitting_c_e.size() < 0) {
if (bgAnalyseResult.g_b_fitting_c_e.size() <= 0) {
betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
betaCalibrationG.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
betaCalibrationG.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
@ -1029,7 +1031,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaCalibrationSpectrumList.add(betaCalibrationD);
} else {
GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
if (bgAnalyseResult.d_b_fitting_c_e.size() < 0) {
if (bgAnalyseResult.d_b_fitting_c_e.size() <= 0) {
betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
betaCalibrationD.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
betaCalibrationD.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
@ -1056,7 +1058,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaCalibrationSpectrumEList.add(betaCalibrationS);
} else {
GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
if (bgAnalyseResult.s_b_fitting_e_c.size() < 0) {
if (bgAnalyseResult.s_b_fitting_e_c.size() <= 0) {
betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
betaCalibrationS.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
betaCalibrationS.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
@ -1078,7 +1080,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaCalibrationSpectrumEList.add(betaCalibrationG);
} else {
GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
if (bgAnalyseResult.g_b_fitting_e_c.size() < 0) {
if (bgAnalyseResult.g_b_fitting_e_c.size() <= 0) {
betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
betaCalibrationG.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
betaCalibrationG.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
@ -1100,7 +1102,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaCalibrationSpectrumEList.add(betaCalibrationD);
} else {
GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
if (bgAnalyseResult.d_b_fitting_e_c.size() < 0) {
if (bgAnalyseResult.d_b_fitting_e_c.size() <= 0) {
betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
betaCalibrationD.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
betaCalibrationD.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));