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

Merge remote-tracking branch 'origin/station' into station

Browse Source
This commit is contained in:
nieziyan 2023-12-01 21:00:14 +08:00
commit 3b062b2de8
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1461,16 +1461,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
for (int j = 0; j < tablePeaksList.size(); j++) { for (int j = 0; j < tablePeaksList.size(); j++) {
TablePeaks nPeak = tablePeaksList.get(j); TablePeaks nPeak = tablePeaksList.get(j);
PeakInfo peak = phd.getVPeak().get(Integer.valueOf(nPeak.getLab()) - 1); PeakInfo peak = phd.getVPeak().get(Integer.valueOf(nPeak.getLab()) - 1);
if (!NumberFormatUtil.numberFormat(String.valueOf(peak.energy)).equals(nPeak.getEnergy()) ) {
peak.energy = Double.parseDouble(nPeak.getEnergy());
}
if (!NumberFormatUtil.numberFormat(String.valueOf(peak.area)).equals(nPeak.getNetArea())) {
peak.area = Double.parseDouble(nPeak.getNetArea());
}
if (!NumberFormatUtil.numberFormat(String.valueOf(peak.fwhm)).equals(nPeak.getFwhm())) {
peak.fwhm = Double.parseDouble(nPeak.getFwhm());
}
double dE = CalValuesHandler.calDerivaOut(peak.peakCentroid, phd.getUsedEnerPara().getP()); double dE = CalValuesHandler.calDerivaOut(peak.peakCentroid, phd.getUsedEnerPara().getP());
peak.energy = Double.parseDouble(nPeak.getEnergy());
if (peak.energy < vE_Rg.get(0) || peak.energy > vE_Rg.get(1)) { if (peak.energy < vE_Rg.get(0) || peak.energy > vE_Rg.get(1)) {
result.error500("The energy isn't in the analysis range."); result.error500("The energy isn't in the analysis range.");
@ -1479,6 +1471,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
List<Double> energys = new LinkedList<>(); List<Double> energys = new LinkedList<>();
energys.add(peak.energy); energys.add(peak.energy);
peak.peakCentroid = CalValuesHandler.energyToChannel(energys, phd.getUsedEnerPara().getP()).counts.get(0); peak.peakCentroid = CalValuesHandler.energyToChannel(energys, phd.getUsedEnerPara().getP()).counts.get(0);
peak.area = Double.parseDouble(nPeak.getNetArea());
peak.fwhm = Double.parseDouble(nPeak.getFwhm());
peak.stepRatio = Double.valueOf(nPeak.getStep()) / peak.area; peak.stepRatio = Double.valueOf(nPeak.getStep()) / peak.area;
peak.BWWidthChan = Double.valueOf(nPeak.getBwGamma()) / dE; peak.BWWidthChan = Double.valueOf(nPeak.getBwGamma()) / dE;
if (dE > 0) { if (dE > 0) {