fix: 人工交互模块临时生成的日志文件,报告文件删除
人工交互模块beta部分公式参数存储问题修改
This commit is contained in:
parent
d9e89f5606
commit
fc1ff16fac
|
@ -5129,6 +5129,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
|
||||||
ftpUtil.saveFile(logPathName, logFileName, in);
|
ftpUtil.saveFile(logPathName, logFileName, in);
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
|
} finally {
|
||||||
|
logFile.delete();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -5141,6 +5143,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
|
||||||
ftpUtil.saveFile(rptPathName, rptFileName, in);
|
ftpUtil.saveFile(rptPathName, rptFileName, in);
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
|
} finally {
|
||||||
|
rptFile.delete();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<String> paths = new LinkedList<>();
|
List<String> paths = new LinkedList<>();
|
||||||
|
|
|
@ -564,8 +564,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
xeData.setConcErr(Double.valueOf(NumberFormatUtil.numberSixLen(String.valueOf(xeData.getConcErr()))));
|
xeData.setConcErr(Double.valueOf(NumberFormatUtil.numberSixLen(String.valueOf(xeData.getConcErr()))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
betaDataFile.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList);
|
betaDataFile.setGammaCalibrationSpectrumEList(gammaCalibrationSpectrumList);
|
||||||
betaDataFile.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList);
|
betaDataFile.setBetaCalibrationSpectrumEList(betaCalibrationSpectrumList);
|
||||||
betaDataFile.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
|
betaDataFile.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
|
||||||
betaDataFile.setRoiResultsSpectrumList(roiResultsSpectrumList);
|
betaDataFile.setRoiResultsSpectrumList(roiResultsSpectrumList);
|
||||||
betaDataFile.setGammaCalibrationPairsList(gammaCalibrationPairsList);
|
betaDataFile.setGammaCalibrationPairsList(gammaCalibrationPairsList);
|
||||||
|
@ -1089,16 +1089,24 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
strBuffer.append(rowFormat("%sOld Beta%-43sOld Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE));
|
strBuffer.append(rowFormat("%sOld Beta%-43sOld Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE));
|
||||||
strBuffer.append(System.lineSeparator());
|
strBuffer.append(System.lineSeparator());
|
||||||
//拼接历史计算公式 CH
|
//拼接历史计算公式 CH
|
||||||
String oldBetaSampleCHStr = rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)),
|
String oldBetaSampleCHStr = rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE,
|
||||||
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)));
|
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)),
|
||||||
String oldGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)),
|
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)),
|
||||||
|
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)));
|
||||||
|
String oldGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s",
|
||||||
|
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)),
|
||||||
|
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)),
|
||||||
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)), StringPool.SPACE);
|
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)), StringPool.SPACE);
|
||||||
strBuffer.append(rowFormat("%s%-"+(52-oldBetaSampleCHStr.length())+"s%s", oldBetaSampleCHStr, StringPool.SPACE, oldGammaSampleCHStr));
|
strBuffer.append(rowFormat("%s%-"+(52-oldBetaSampleCHStr.length())+"s%s", oldBetaSampleCHStr, StringPool.SPACE, oldGammaSampleCHStr));
|
||||||
strBuffer.append(System.lineSeparator());
|
strBuffer.append(System.lineSeparator());
|
||||||
//拼接历史计算公式 E
|
//拼接历史计算公式 E
|
||||||
String oldBetaSampleEStr = rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)),
|
String oldBetaSampleEStr = rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE,
|
||||||
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)));
|
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)),
|
||||||
String oldGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)),
|
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)),
|
||||||
|
NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)));
|
||||||
|
String oldGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s",
|
||||||
|
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)),
|
||||||
|
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)),
|
||||||
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)), StringPool.SPACE);
|
NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)), StringPool.SPACE);
|
||||||
strBuffer.append(rowFormat("%s%-"+(52-oldBetaSampleEStr.length())+"s%s", oldBetaSampleEStr, StringPool.SPACE, oldGammaSampleEStr));
|
strBuffer.append(rowFormat("%s%-"+(52-oldBetaSampleEStr.length())+"s%s", oldBetaSampleEStr, StringPool.SPACE, oldGammaSampleEStr));
|
||||||
strBuffer.append(System.lineSeparator());
|
strBuffer.append(System.lineSeparator());
|
||||||
|
@ -1112,7 +1120,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
(Objects.isNull(betaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))),
|
(Objects.isNull(betaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))),
|
||||||
(Objects.isNull(betaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))),
|
(Objects.isNull(betaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))),
|
||||||
(Objects.isNull(betaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3()))));
|
(Objects.isNull(betaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3()))));
|
||||||
String newGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s", (Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))),
|
String newGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s",
|
||||||
|
(Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))),
|
||||||
(Objects.isNull(gammaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))),
|
(Objects.isNull(gammaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))),
|
||||||
(Objects.isNull(gammaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))),
|
(Objects.isNull(gammaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))),
|
||||||
StringPool.SPACE);
|
StringPool.SPACE);
|
||||||
|
@ -1123,7 +1132,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
(Objects.isNull(betaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))),
|
(Objects.isNull(betaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))),
|
||||||
(Objects.isNull(betaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))),
|
(Objects.isNull(betaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))),
|
||||||
(Objects.isNull(betaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3()))));
|
(Objects.isNull(betaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3()))));
|
||||||
String newGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s", (Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))),
|
String newGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s",
|
||||||
|
(Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))),
|
||||||
(Objects.isNull(gammaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))),
|
(Objects.isNull(gammaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))),
|
||||||
(Objects.isNull(gammaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))),
|
(Objects.isNull(gammaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))),
|
||||||
StringPool.SPACE);
|
StringPool.SPACE);
|
||||||
|
@ -4073,6 +4083,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
ftpUtil.saveFile(rptPathName, rptFileName, in);
|
ftpUtil.saveFile(rptPathName, rptFileName, in);
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
|
} finally {
|
||||||
|
rptFile.delete();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
|
@ -5391,9 +5403,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} else {
|
} else {
|
||||||
GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
|
GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
|
||||||
gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
|
gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
|
||||||
gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
|
gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_e_c.get(0));
|
||||||
gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
|
gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_e_c.get(1));
|
||||||
gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
|
gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_e_c.get(2));
|
||||||
gammaCalibrationSpectrumList.add(gammaCalibrationS);
|
gammaCalibrationSpectrumList.add(gammaCalibrationS);
|
||||||
}
|
}
|
||||||
if (anlyseResultIn.isBGammaEnergyValidGas()) {
|
if (anlyseResultIn.isBGammaEnergyValidGas()) {
|
||||||
|
@ -5406,9 +5418,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} else {
|
} else {
|
||||||
GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
|
GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
|
||||||
gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
|
gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
|
||||||
gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
|
gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_e_c.get(0));
|
||||||
gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
|
gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_e_c.get(1));
|
||||||
gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
|
gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_e_c.get(2));
|
||||||
gammaCalibrationSpectrumList.add(gammaCalibrationG);
|
gammaCalibrationSpectrumList.add(gammaCalibrationG);
|
||||||
}
|
}
|
||||||
if (anlyseResultIn.isBGammaEnergyValidDet()) {
|
if (anlyseResultIn.isBGammaEnergyValidDet()) {
|
||||||
|
@ -5421,9 +5433,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} else {
|
} else {
|
||||||
GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
|
GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
|
||||||
gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
|
gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
|
||||||
gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
|
gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_e_c.get(0));
|
||||||
gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
|
gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_e_c.get(1));
|
||||||
gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
|
gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_e_c.get(2));
|
||||||
gammaCalibrationSpectrumList.add(gammaCalibrationD);
|
gammaCalibrationSpectrumList.add(gammaCalibrationD);
|
||||||
}
|
}
|
||||||
anlyseResultIn.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList);
|
anlyseResultIn.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList);
|
||||||
|
@ -5439,9 +5451,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} else {
|
} else {
|
||||||
GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
|
GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
|
||||||
betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
|
betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
|
||||||
betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
|
betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_e_c.get(0));
|
||||||
betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
|
betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_e_c.get(1));
|
||||||
betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
|
betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_e_c.get(2));
|
||||||
betaCalibrationSpectrumList.add(betaCalibrationS);
|
betaCalibrationSpectrumList.add(betaCalibrationS);
|
||||||
}
|
}
|
||||||
if (anlyseResultIn.isBBetaEnergyValidGas()) {
|
if (anlyseResultIn.isBBetaEnergyValidGas()) {
|
||||||
|
@ -5454,9 +5466,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} else {
|
} else {
|
||||||
GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
|
GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
|
||||||
betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
|
betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
|
||||||
betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
|
betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_e_c.get(0));
|
||||||
betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
|
betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_e_c.get(1));
|
||||||
betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
|
betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_e_c.get(2));
|
||||||
betaCalibrationSpectrumList.add(betaCalibrationG);
|
betaCalibrationSpectrumList.add(betaCalibrationG);
|
||||||
}
|
}
|
||||||
if (anlyseResultIn.isBBetaEnergyValidDet()) {
|
if (anlyseResultIn.isBBetaEnergyValidDet()) {
|
||||||
|
@ -5469,9 +5481,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} else {
|
} else {
|
||||||
GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
|
GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
|
||||||
betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
|
betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
|
||||||
betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
|
betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_e_c.get(0));
|
||||||
betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
|
betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_e_c.get(1));
|
||||||
betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
|
betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_e_c.get(2));
|
||||||
betaCalibrationSpectrumList.add(betaCalibrationD);
|
betaCalibrationSpectrumList.add(betaCalibrationD);
|
||||||
}
|
}
|
||||||
anlyseResultIn.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList);
|
anlyseResultIn.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user