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

Energy,Resolution,Efficiency功能的call增加判断

Browse Source
This commit is contained in:
qiaoqinzheng 2023-09-20 16:29:31 +08:00
parent 59d063d415
commit 5e5474eb2f
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1356,13 +1356,14 @@ public class GammaServiceImpl implements IGammaService {
if (line.contains("#g_Energy") || line.contains("#Energy")) { if (line.contains("#g_Energy") || line.contains("#Energy")) {
for (int j=i+1; j<readLines.size(); j++) { for (int j=i+1; j<readLines.size(); j++) {
String content = readLines.get(j); String content = readLines.get(j);
if (content.contains("#")) { if (!content.contains("#")) {
break; List<String> values = Arrays.asList(content.split("\t\t"));
if (Double.valueOf(values.get(1))>0) {
m_vCurEnergy.add(Double.valueOf(values.get(0)));
m_vCurCentroid.add(Double.valueOf(values.get(1)));
m_vCurUncert.add(Double.valueOf(values.get(2)));
}
} }
List<String> values = Arrays.asList(content.split("\t\t"));
m_vCurEnergy.add(Double.valueOf(values.get(0)));
m_vCurCentroid.add(Double.valueOf(values.get(1)));
m_vCurUncert.add(Double.valueOf(values.get(2)));
} }
} }
} }
@ -1589,13 +1590,14 @@ public class GammaServiceImpl implements IGammaService {
if (line.contains("#g_Resolution") || line.contains("#Resolution")) { if (line.contains("#g_Resolution") || line.contains("#Resolution")) {
for (int j=i+1; j<readLines.size(); j++) { for (int j=i+1; j<readLines.size(); j++) {
String content = readLines.get(j); String content = readLines.get(j);
if (content.contains("#")) { if (!content.contains("#")) {
break; List<String> values = Arrays.asList(content.split("\t\t"));
if (Double.valueOf(values.get(0))>0) {
m_vCurEnergy.add(Double.valueOf(values.get(0)));
m_vCurReso.add(Double.valueOf(values.get(1)));
m_vCurUncert.add(Double.valueOf(values.get(2)));
}
} }
List<String> values = Arrays.asList(content.split("\t\t"));
m_vCurEnergy.add(Double.valueOf(values.get(0)));
m_vCurReso.add(Double.valueOf(values.get(1)));
m_vCurUncert.add(Double.valueOf(values.get(2)));
} }
} }
} }
@ -1835,14 +1837,16 @@ public class GammaServiceImpl implements IGammaService {
String content = readLines.get(j); String content = readLines.get(j);
if (!content.contains("#") && !content.contains("FitType")) { if (!content.contains("#") && !content.contains("FitType")) {
List<String> values = Arrays.asList(content.split("\t\t")); List<String> values = Arrays.asList(content.split("\t\t"));
m_vCurEnergy.add(Double.valueOf(values.get(0))); if (Double.valueOf(values.get(0))>0) {
m_vCurEffi.add(Double.valueOf(values.get(1))); m_vCurEnergy.add(Double.valueOf(values.get(0)));
m_vCurUncert.add(Double.valueOf(values.get(2))); m_vCurEffi.add(Double.valueOf(values.get(1)));
m_vCurUncert.add(Double.valueOf(values.get(2)));
}
} }
if (content.contains("FitType")) { if (content.contains("FitType")) {
List<String> values = Arrays.asList(content.split("=")); List<String> values = Arrays.asList(content.split("="));
if (values.size() == 2) { if (values.size() == 2) {
m_nFunId = Double.valueOf(values.get(1)); m_nFunId = Double.valueOf(values.get(1).trim());
} }
} }
} }