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

gamma功能数据库加载数据null问题修改

Browse Source 
gamma功能peak的recoilBetaChan，recoilDeltaChan参数默认赋值nan
beta生成RRR报告old数据颠倒
This commit is contained in:
qiaoqinzheng 2023-11-13 10:40:05 +08:00
parent a740a32b64
commit 4487f91705
5 changed files with 49 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideActMda.java
View File

@ -22,13 +22,13 @@ public class NuclideActMda implements Serializable {
private double mda;
private double mdc;
private Double mdc;
private double efficiency;
private double effi_err;
private double concentration;
private Double concentration;
private List<String> fullNames;

8
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -1447,10 +1447,10 @@ public class GammaFileUtil extends AbstractLogOrReport {
for (PeakInfo peak:phd.getVPeak()) {
if (StringUtils.isBlank(peak.recoilBetaChan)) {
peak.recoilBetaChan = "1";
peak.recoilBetaChan = "nan";
}
if (StringUtils.isBlank(peak.recoilDeltaChan)) {
peak.recoilDeltaChan = "1";
peak.recoilDeltaChan = "nan";
}
}
} catch (JsonProcessingException e){
@ -1615,8 +1615,8 @@ public class GammaFileUtil extends AbstractLogOrReport {
ActMda.setEfficiency(0);
ActMda.setEffi_err(0);
ActMda.setMda(0);
ActMda.setMdc(0);
ActMda.setConcentration(0);
ActMda.setMdc(0.0);
ActMda.setConcentration(0.0);
}
int fitLineNum = 0, peakIdx = -1;

4
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java
View File

@ -64,8 +64,8 @@ public class PeakInfo implements Serializable {
public PeakInfo(){
nuclides = new LinkedList<>();
comments = "";
recoilBetaChan = "1";
recoilDeltaChan = "1";
recoilBetaChan = "nan";
recoilDeltaChan = "nan";
}
}

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

@ -406,25 +406,15 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
ParameterInfo value = JSON.parseObject(JSON.toJSONString(entry.getValue()), ParameterInfo.class);
phd.setUsedTotEPara(value);
}
// if (entry.getKey().equalsIgnoreCase("mapNucActMda")) {
// HashMap<String, Object> jsonMap = JSON.parseObject(JSON.toJSONString(entry.getValue()), HashMap.class);
// Map<String, NuclideActMda> value = new HashMap<>();
// for (Map.Entry<String, Object> objectEntry : jsonMap.entrySet()) {
// String key = objectEntry.getKey();
// NuclideActMda entryValue = JSON.parseObject(JSON.toJSONString(objectEntry.getValue()), NuclideActMda.class);
// value.put(key, entryValue);
// }
// phd.setMapNucActMda(value);
// }
}
BeanUtils.copyProperties(phd.getSetting(), phd.getUsedSetting());
for (PeakInfo peak : phd.getVPeak()) {
if (StringUtils.isBlank(peak.recoilBetaChan)) {
peak.recoilBetaChan = "1";
for (PeakInfo info:phd.getVPeak()) {
if (StringUtils.isBlank(info.recoilBetaChan)) {
info.recoilBetaChan = "nan";
}
if (StringUtils.isBlank(peak.recoilDeltaChan)) {
peak.recoilDeltaChan = "1";
if (StringUtils.isBlank(info.recoilDeltaChan)) {
info.recoilDeltaChan = "nan";
}
}
// 重新分析各峰值对应的核素信息
@ -1309,7 +1299,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
for (int j = 0; j < structInsertOutput.vIdx.size(); j++) {
int a = 0;
while (a < phd.getVPeak().size() && structInsertOutput.peakCentroid.get(j) > phd.getVPeak().get(a).peakCentroid) {
a++;
++a;
}
PeakInfo peak = new PeakInfo();
peak.index = a + 1;
@ -1329,8 +1319,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
peak.upperTailAlpha = structInsertOutput.upperTailAlpha.get(j);
peak.efficiency = structInsertOutput.efficiency.get(j);
peak.BWWidthChan = 0;
peak.recoilBetaChan = String.valueOf(structInsertOutput.recoilBetaChan.get(j));
peak.recoilDeltaChan = String.valueOf(structInsertOutput.recoilDeltaChan.get(j));
peak.recoilBetaChan = Objects.isNull(structInsertOutput.recoilBetaChan.get(j))?"nan":String.valueOf(structInsertOutput.recoilBetaChan.get(j));
peak.recoilDeltaChan = Objects.isNull(structInsertOutput.recoilDeltaChan.get(j))?"nan":String.valueOf(structInsertOutput.recoilDeltaChan.get(j));
newPeaks.add(a, peak);
}
}
@ -1350,6 +1340,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
FitPeakBaseLine(newPeaks, phd.getUsedEnerPara().getP(), vIdx, map);
map.put("oldPeaks", vOriPeaks);
map.put("newPeaks", newPeaks);
result.setSuccess(true);
result.setResult(map);
return result;
@ -1357,12 +1348,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
public void FitPeakBaseLine(List<PeakInfo> vPeaks, List<Double> p, List<Integer> vIdx, Map<String, Object> map) {
List<TablePeaks> tablePeaksList = new LinkedList<>();
List<PeakInfo> newPeaks = new LinkedList<>();
int peakNum = vIdx.size();
for (int i = 0; i < peakNum; i++) {
int peakIdx = vIdx.get(i);
PeakInfo peak = vPeaks.get(peakIdx);
newPeaks.add(peak);
TablePeaks tablePeaks = new TablePeaks();
tablePeaks.setLab(String.valueOf(peakIdx + 1));
String nuclide = "";
@ -1383,7 +1372,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
tablePeaksList.add(tablePeaks);
}
map.put("tablePeaksList", tablePeaksList);
map.put("newPeaks", newPeaks);
}
@Override
@ -1423,20 +1411,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
phd.getVPeak().set(peakInfo.index - 1, peakInfo);
}
} else if (flag.equalsIgnoreCase("insert")) {// 如果传递的flag标识 是 Insert则进行峰值的插入
for (int j = 0; j < newPeak.size(); j++) {
// 获取需要插入的第一个峰值信息
PeakInfo peakInfo = newPeak.get(j);
// 根据下标获取旧的峰值数据
PeakInfo info = oldPeak.get(peakInfo.index - 1);
String newEnergy = NumberFormatUtil.numberFormat(String.valueOf(peakInfo.energy));
String oldEnergy = NumberFormatUtil.numberFormat(String.valueOf(info.energy));
// 将旧的峰值能量与新的峰值能量格式化后 比较 如果一致则覆盖 不一致则在对应下标插入峰值
if (oldEnergy.equals(newEnergy) && peakInfo.index == info.index) {
phd.getVPeak().set(peakInfo.index - 1, peakInfo);
} else {
phd.getVPeak().add(peakInfo.index - 1, peakInfo);
}
//重新赋值index
for (int k=0; k<newPeak.size(); k++) {
newPeak.get(k).index = k;
}
phd.setVPeak(newPeak);
}
List<Double> vC_Rg = new LinkedList<>();
@ -1455,6 +1434,9 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
for (int j = 0; j < tablePeaksList.size(); j++) {
TablePeaks nPeak = tablePeaksList.get(j);
PeakInfo peak = phd.getVPeak().get(Integer.valueOf(nPeak.getLab()) - 1);
peak.energy = Double.parseDouble(nPeak.getEnergy());
peak.area = Double.parseDouble(nPeak.getNetArea());
peak.fwhm = Double.parseDouble(nPeak.getFwhm());
double dE = CalValuesHandler.calDerivaOut(peak.peakCentroid, phd.getUsedEnerPara().getP());
if (peak.energy < vE_Rg.get(0) || peak.energy > vE_Rg.get(1)) {

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

@ -989,25 +989,25 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append("\n");
strBuffer.append("#SAMPLE Old CALIBRATION").append("\n");
strBuffer.append(" Old Beta Old Gamma ").append("\n");
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
} else {
strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2))));
strBuffer.append("\n");
} else {
strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ");
strBuffer.append("\n");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))));
} else {
strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x ");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2))));
strBuffer.append("\n");
} else {
strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x ");
@ -1043,25 +1043,25 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append("\n");
strBuffer.append("#DET Old CALIBRATION").append("\n");
strBuffer.append(" Old Beta Old Gamma ").append("\n");
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
} else {
strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2))));
strBuffer.append("\n");
} else {
strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ");
strBuffer.append("\n");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))));
} else {
strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x ");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2))));
strBuffer.append("\n");
} else {
strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x ");
@ -1097,25 +1097,25 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append("\n");
strBuffer.append("#GAS Old CALIBRATION").append("\n");
strBuffer.append(" Old Beta Old Gamma ").append("\n");
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
} else {
strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2))));
strBuffer.append("\n");
} else {
strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ");
strBuffer.append("\n");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))));
} else {
strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x ");
}
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2))));
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2))));
strBuffer.append("\n");
} else {
strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x ");
@ -1326,8 +1326,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
}
@Override
public void exportSampleInformation(Integer sampleId, String sampleFileName,
HttpServletRequest request, HttpServletResponse response) {
public void exportSampleInformation(Integer sampleId, String sampleFileName, HttpServletRequest request, HttpServletResponse response) {
Result<String> result = viewSampleInformation(sampleId, sampleFileName, request);
String sampleInfo = result.getResult();
if (StrUtil.isBlank(sampleInfo)) return;