NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed underflow calculation and viewer export

Browse Source
This commit is contained in:
Alexander Nozik 2016-11-23 18:21:27 +03:00
parent accff41291
commit 5f8d4031d1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java
View File

@ -59,16 +59,16 @@ public class UnderflowCorrection {
} }
return builder.build(); return builder.build();
} }
public Table fitAllPoints(NumassData data, int xLow, int xHigh, int upper, int binning) { public Table fitAllPoints(NumassData data, int xLow, int xHigh, int upper, int binning) {
ListTable.Builder builder = new ListTable.Builder("U", "amp", "expConst", "correction"); ListTable.Builder builder = new ListTable.Builder("U", "amp", "expConst", "correction");
for (NMPoint point : data.getNMPoints()) { for (NMPoint point : data.getNMPoints()) {
long norm = point.getCountInWindow(xLow, upper); double norm = ((double) point.getCountInWindow(xLow, upper))/point.getLength();
double[] fitRes = getUnderflowExpParameters(point, xLow, xHigh, binning); double[] fitRes = getUnderflowExpParameters(point, xLow, xHigh, binning);
builder.row(point.getUset(), fitRes[0], fitRes[1], fitRes[0] * fitRes[1] * (Math.exp(xLow / fitRes[1]) - 1d) / norm + 1d); builder.row(point.getUset(), fitRes[0], fitRes[1], fitRes[0] * fitRes[1] * (Math.exp(xLow / fitRes[1]) - 1d) / norm + 1d);
} }
return builder.build(); return builder.build();
} }
/** /**
* Calculate underflow exponent parameters using (xLow, xHigh) window for * Calculate underflow exponent parameters using (xLow, xHigh) window for
@ -90,7 +90,8 @@ public class UnderflowCorrection {
.map(p -> new WeightedObservedPoint( .map(p -> new WeightedObservedPoint(
1d / p.getValue() * point.getLength() * point.getLength(), //weight 1d / p.getValue() * point.getLength() * point.getLength(), //weight
p.getKey(), // x p.getKey(), // x
p.getValue() / binning / point.getLength())) //y p.getValue() / binning / point.getLength())//y
)
.collect(Collectors.toList()); .collect(Collectors.toList());
SimpleCurveFitter fitter = SimpleCurveFitter.create(new ExponentFunction(), new double[]{1d, 200d}); SimpleCurveFitter fitter = SimpleCurveFitter.create(new ExponentFunction(), new double[]{1d, 200d});
return fitter.fit(points); return fitter.fit(points);