diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/parameter/SelfParameterInit.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/parameter/SelfParameterInit.java index 623496dd..bd1f971c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/parameter/SelfParameterInit.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/parameter/SelfParameterInit.java @@ -78,6 +78,9 @@ public class SelfParameterInit { } else if (attribute.getNodeName().equalsIgnoreCase("half_life")) { 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())) { selfParameter.getNuclideMap().put(nuclide.getName(), nuclide); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLine.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLine.java index 9be96b3b..14f3a2c2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLine.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLine.java @@ -23,4 +23,5 @@ public class NuclideLine implements Serializable { private String name; + private Double range; } diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java index c5df0d9f..2fbfe147 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java @@ -887,7 +887,7 @@ public class SelfBaseUtil extends AbstractLogOrReport { switch (nuclideName) { case "Xe131M": phd = phdFiles[0]; - fwhm = 0.2; + fwhm = nuclideMap.get(nuclideName).getRange(); // fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), // nuclideMap.get(nuclideName).getEnergy()) * 1.25; // left = 29.7 - fwhm; @@ -895,21 +895,21 @@ public class SelfBaseUtil extends AbstractLogOrReport { break; case "Xe133M": phd = phdFiles[1]; - fwhm = 0.2; + fwhm = nuclideMap.get(nuclideName).getRange(); // fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), nuclideMap.get(nuclideName).getEnergy()); // left = 29.7 - fwhm; // right = 29.7 + fwhm; break; case "Xe133": phd = phdFiles[2]; - fwhm = 0.5; + fwhm = nuclideMap.get(nuclideName).getRange(); // fwhm = getFwhm(phd.getMapResoPara().get(phd.getUsedReso()), nuclideMap.get(nuclideName).getEnergy()); // left = 81 - fwhm; // right = 81 + fwhm; break; case "Xe135": phd = phdFiles[3]; - fwhm = 0.5; + fwhm = nuclideMap.get(nuclideName).getRange(); // left = 249.8 - fwhm; // right = 249.8 + fwhm; break;