删除注释的无效代码
This commit is contained in:
qiaoqinzheng
parent
06bb6146ab
commit
83c961316e
|
|
@ -4706,35 +4706,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
efficiencies.add(efficiency);
|
||||
}
|
||||
}
|
||||
// int i = phd.getEfficiencyCurRow();
|
||||
// if(i < 0 || i >= e_size) break;
|
||||
//
|
||||
// double y1, y0, x1, x0;
|
||||
// if(i < e_size - 1) {
|
||||
// y1 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2+3))));
|
||||
// y0 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2+1))));
|
||||
// x1 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2+2))));
|
||||
// x0 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2))));
|
||||
// } else {
|
||||
// y1 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2+1))));
|
||||
// y0 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2-1))));
|
||||
// x1 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2))));
|
||||
// x0 = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i*2-2))));
|
||||
// }
|
||||
// for (int j=0; j<nuclideLines.fullNames.size(); j++) {
|
||||
// //获取峰核素能量值
|
||||
// Double energy = nuclideLines.venergy.get(j);
|
||||
// Double yield = nuclideLines.vyield.get(j);
|
||||
// //能量不为空
|
||||
// if (Objects.nonNull(energy) && Objects.nonNull(yield)) {
|
||||
// double eff = y0 + (y1 - y0) * (energy - x0) / (x1 - x0);
|
||||
// if (Double.isFinite(eff)) {
|
||||
// double efficiency = eff * yield;
|
||||
// efficiencies.add(efficiency);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// equation += "Efficiency = "+y0+" + ("+y1+"-"+y0+") * (E - "+x0+") / ("+x1+" - "+x0+")";
|
||||
}
|
||||
break;
|
||||
case 5: // HT Efficiency: y = A*exp(-(E1/x)^k)*(1-exp(-(E2/x)^n))
|
||||
|
|
@ -4767,8 +4738,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
}
|
||||
}
|
||||
}
|
||||
// equation += "Efficiency = "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(1)))+" * exp(-("+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(2)))+" / E)<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(3)))+"</sup>) * "+
|
||||
// "(1-exp(-("+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(4)))+" / E)<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(5)))+"</sup>))";
|
||||
}
|
||||
break;
|
||||
case 6: // Polynomial in log(y) against log(x): log(y) = a0 + a1*log(x) +a2*log(x)^2+ a3*log(x)^3
|
||||
|
|
@ -4802,10 +4771,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
}
|
||||
}
|
||||
}
|
||||
// equation += "log(Efficiency) = "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(1)))+" + "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(2)))+" * log(E)";
|
||||
// for(int i=3; i<=p_size; i++) {
|
||||
// equation += " + "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i)))+" * log(E)<sup style=\"vertical-align:super;\">"+(i-1)+"</sup>";
|
||||
// }
|
||||
}
|
||||
break;
|
||||
case 8: // Polynomial in log(y) against log(1/x): log(y) = a0 + a1*log(c/x) + a2*log(c/x)^2 + a3*log(c/x)^3 + a4*log(c/x)^4
|
||||
|
|
@ -4821,37 +4786,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
efficiencies.add(efficiency);
|
||||
}
|
||||
}
|
||||
// for (int j=0; j<nuclideLines.fullNames.size(); j++) {
|
||||
// //获取峰核素能量值
|
||||
// Double energy = nuclideLines.venergy.get(j);
|
||||
// Double yield = nuclideLines.vyield.get(j);
|
||||
// double C = Math.round(phd.getEfficiencyParam().get(phd.getEfficiencyParam().size() - 1));
|
||||
// //能量不为空
|
||||
// if (Objects.nonNull(energy) && Objects.nonNull(yield)) {
|
||||
// double paramA = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(1))));
|
||||
// double paramB = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(2)))) * Math.log(C/energy);
|
||||
// if (Double.isNaN(paramB)) {
|
||||
// paramB = 0;
|
||||
// }
|
||||
// double param = paramA + paramB;
|
||||
// for(int i=3; i<=p_size; i++) {
|
||||
// double paramC = Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i)))) * Math.pow(Math.log(C/energy), (i-1));
|
||||
// if (Double.isNaN(paramC)) {
|
||||
// paramC = 0;
|
||||
// }
|
||||
// param += paramC;
|
||||
// }
|
||||
// double eff = Math.pow(Math.E, param);
|
||||
// if (Double.isFinite(eff)) {
|
||||
// double efficiency = eff * yield;
|
||||
// efficiencies.add(efficiency);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// equation += "log(Efficiency) = "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(1)))+" + "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(2)))+" * log(C/E)";
|
||||
// for(int i=3; i<=p_size; i++) {
|
||||
// equation += " + "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(i)))+" * log(C/E)<sup style=\"vertical-align:super;\">"+(i-1)+"</sup>";
|
||||
// }
|
||||
}
|
||||
break;
|
||||
case 93: // HAE Efficiency (1-3): y=S*exp(-(E1/x)^k)*(1- exp(-(2*E3/(x-E3))^n))
|
||||
|
|
@ -4878,8 +4812,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
}
|
||||
}
|
||||
}
|
||||
// equation += "Efficiency = "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(1)))+" * exp(-("+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(2)))+" / E)<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(3)))+"</sup>) * "+
|
||||
// "(1 - exp(-(2 * "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(4)))+" / (E - "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(4)))+"))<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(5)))+"</sup>))";
|
||||
}
|
||||
break;
|
||||
case 94: // HAE Efficiency (1-2): y=S*exp(-(E1/x)^k)*(1- exp(-b*(1/(x-E2))^m))
|
||||
|
|
@ -4906,11 +4838,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
}
|
||||
}
|
||||
}
|
||||
// Efficiency = phd.getEfficiencyParam().get(1)
|
||||
// * exp( -(phd.getEfficiencyParam().get(2) / E) ^ phd.getEfficiencyParam().get(3) )
|
||||
// * (1 -
|
||||
// exp( -phd.getEfficiencyParam().get(4) * (1 / (E - phd.getEfficiencyParam().get(5)) ^ phd.getEfficiencyParam().get(6) )
|
||||
// );
|
||||
}
|
||||
break;
|
||||
case 95: // HAE Efficiency (1-2-3): y = S * exp(-(E1/x)^k) * (1- exp(-b*(1/(x-E2))^m)) *(1 - exp(-(2*E3/(E-E3))^n))
|
||||
|
|
@ -4941,9 +4868,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
|
|||
}
|
||||
}
|
||||
}
|
||||
// equation += "Efficiency = "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(1)))+" * exp(-("+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(2)))+" / E)<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(3)))+"</sup>) * "+
|
||||
// "(1 - exp(-"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(4)))+" * (1 / (E - "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(5)))+"))<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(6)))+"</sup>)) * "+
|
||||
// "(1 - exp(-(2 * "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(7)))+" / (E - "+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(7)))+"))<sup style=\"vertical-align:super;\">"+NumberFormatUtil.numberFormat(String.valueOf(phd.getEfficiencyParam().get(8)))+"</sup>))";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user