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

Fix fit plugin resolution

Browse Source
This commit is contained in:
darksnake 2017-04-06 22:01:08 +03:00
parent 995aebbd03
commit 75a27abc79
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
numass-main/src/main/groovy/inr/numass/scripts/SimulatePileup.groovy
View File

@ -54,7 +54,7 @@ List<NMPoint> pileup = new ArrayList<>();
lowerChannel = 400; lowerChannel = 400;
upperChannel = 1800; upperChannel = 1800;
PileUpSimulator buildSimulator(NMPoint point, double cr, NMPoint reference = null, boolean extrapolate = false, double scale = 1d) { PileUpSimulator buildSimulator(NMPoint point, double cr, NMPoint reference = null, boolean extrapolate = true, double scale = 1d) {
def cfg = Grind.buildMeta(cr: cr) { def cfg = Grind.buildMeta(cr: cr) {
pulser(mean: 3450, sigma: 86.45, freq: 66.43) pulser(mean: 3450, sigma: 86.45, freq: 66.43)
} }
@ -63,7 +63,7 @@ PileUpSimulator buildSimulator(NMPoint point, double cr, NMPoint reference = nul
if (extrapolate) { if (extrapolate) {
double[] chanels = new double[RawNMPoint.MAX_CHANEL]; double[] chanels = new double[RawNMPoint.MAX_CHANEL];
double[] values = new double[RawNMPoint.MAX_CHANEL]; double[] values = new double[RawNMPoint.MAX_CHANEL];
DataPoint fitResult = new UnderflowCorrection().fitPoint(point, 400, 600, 1800, 20); DataPoint fitResult = new UnderflowCorrection().fitPoint(point, 400, 600, 1800, 20); numa
def amp = fitResult.getDouble("amp") def amp = fitResult.getDouble("amp")
def sigma = fitResult.getDouble("expConst") def sigma = fitResult.getDouble("expConst")

2
numass-main/src/main/java/inr/numass/NumassPlugin.java
View File

@ -73,7 +73,7 @@ public class NumassPlugin extends BasicPlugin {
// StorageManager.buildFrom(context); // StorageManager.buildFrom(context);
super.attach(context); super.attach(context);
context.setIO(new NumassIO()); context.setIO(new NumassIO());
FitManager fm = context.provide("fitting", FitManager.class); FitManager fm = context.getFeature(FitManager.class);
loadModels(fm.getModelManager()); loadModels(fm.getModelManager());
loadMath(MathPlugin.buildFrom(context)); loadMath(MathPlugin.buildFrom(context));