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

修改获取MDC参数从配置文件中获取

Browse Source
This commit is contained in:
duwenyuan 2025-07-16 09:14:16 +08:00
parent 9d8dca0948
commit 7407a81d89
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-boot-base-core/src/main/java/org/jeecg/common/parameter/SelfParameterInit.java
View File

@ -78,6 +78,9 @@ public class SelfParameterInit {
} else if (attribute.getNodeName().equalsIgnoreCase("half_life")) { } else if (attribute.getNodeName().equalsIgnoreCase("half_life")) {
nuclide.setHalflife(Double.valueOf(attribute.getNodeValue())); nuclide.setHalflife(Double.valueOf(attribute.getNodeValue()));
} }
else if (attribute.getNodeName().equalsIgnoreCase("range")) {
nuclide.setRange(Double.valueOf(attribute.getNodeValue()));
}
} }
if (StrUtil.isNotBlank(nuclide.getName()) && Objects.nonNull(nuclide.getEnergy())) { if (StrUtil.isNotBlank(nuclide.getName()) && Objects.nonNull(nuclide.getEnergy())) {
selfParameter.getNuclideMap().put(nuclide.getName(), nuclide); selfParameter.getNuclideMap().put(nuclide.getName(), nuclide);

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

@ -23,4 +23,5 @@ public class NuclideLine implements Serializable {
private String name; private String name;
private Double range;
} }

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

@ -887,7 +887,7 @@ public class SelfBaseUtil extends AbstractLogOrReport {
switch (nuclideName) { switch (nuclideName) {
case "Xe131M": case "Xe131M":
phd = phdFiles[0]; phd = phdFiles[0];
fwhm = 0.2; fwhm = nuclideMap.get(nuclideName).getRange();
// fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), // fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()),
// nuclideMap.get(nuclideName).getEnergy()) * 1.25; // nuclideMap.get(nuclideName).getEnergy()) * 1.25;
// left = 29.7 - fwhm; // left = 29.7 - fwhm;
@ -895,21 +895,21 @@ public class SelfBaseUtil extends AbstractLogOrReport {
break; break;
case "Xe133M": case "Xe133M":
phd = phdFiles[1]; phd = phdFiles[1];
fwhm = 0.2; fwhm = nuclideMap.get(nuclideName).getRange();
// fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), nuclideMap.get(nuclideName).getEnergy()); // fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), nuclideMap.get(nuclideName).getEnergy());
// left = 29.7 - fwhm; // left = 29.7 - fwhm;
// right = 29.7 + fwhm; // right = 29.7 + fwhm;
break; break;
case "Xe133": case "Xe133":
phd = phdFiles[2]; phd = phdFiles[2];
fwhm = 0.5; fwhm = nuclideMap.get(nuclideName).getRange();
// fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), nuclideMap.get(nuclideName).getEnergy()); // fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), nuclideMap.get(nuclideName).getEnergy());
// left = 81 - fwhm; // left = 81 - fwhm;
// right = 81 + fwhm; // right = 81 + fwhm;
break; break;
case "Xe135": case "Xe135":
phd = phdFiles[3]; phd = phdFiles[3];
fwhm = 0.5; fwhm = nuclideMap.get(nuclideName).getRange();
// left = 249.8 - fwhm; // left = 249.8 - fwhm;
// right = 249.8 + fwhm; // right = 249.8 + fwhm;
break; break;