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

Trying to implement caching

Browse Source
This commit is contained in:
Alexander Nozik 2016-07-19 18:24:34 +03:00
parent 977331e8f8
commit c923d3cb92
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,26 +203,26 @@ public class NumassPlugin extends BasicPlugin {
return res; return res;
}); });
manager.addModel("sterile", (context, an) -> { manager.addModel("sterile", (context, meta) -> {
double A = an.getDouble("resolution", an.getDouble("resolution.width", 8.3e-5));//8.3e-5 double A = meta.getDouble("resolution", meta.getDouble("resolution.width", 8.3e-5));//8.3e-5
double from = an.getDouble("from", 13900d); double from = meta.getDouble("from", 13900d);
double to = an.getDouble("to", 18700d); double to = meta.getDouble("to", 18700d);
context.getReport().report("Setting up tritium model with real transmission function"); context.getReport().report("Setting up tritium model with real transmission function");
BivariateFunction resolutionTail; BivariateFunction resolutionTail;
if (an.hasValue("resolution.tailAlpha")) { if (meta.hasValue("resolution.tailAlpha")) {
resolutionTail = ResolutionFunction.getAngledTail(an.getDouble("resolution.tailAlpha"), an.getDouble("resolution.tailBeta", 0)); resolutionTail = ResolutionFunction.getAngledTail(meta.getDouble("resolution.tailAlpha"), meta.getDouble("resolution.tailBeta", 0));
} else { } else {
resolutionTail = ResolutionFunction.getRealTail(); resolutionTail = ResolutionFunction.getRealTail();
} }
RangedNamedSetSpectrum beta = new BetaSpectrum(context.io().getFile("FS.txt")); RangedNamedSetSpectrum beta = new BetaSpectrum(context.io().getFile("FS.txt"));
ModularSpectrum sp = new ModularSpectrum(beta, new ResolutionFunction(A, resolutionTail), from, to); ModularSpectrum sp = new ModularSpectrum(beta, new ResolutionFunction(A, resolutionTail), from, to);
if (an.getBoolean("caching", false)) { if (meta.getBoolean("caching", false)) {
context.getReport().report("Caching turned on"); context.getReport().report("Caching turned on");
sp.setCaching(true); sp.setCaching(true);
} }
//Adding trapping energy dependence //Adding trapping energy dependence
switch (an.getString("trappingFunction", "default")) { switch (meta.getString("trappingFunction", "default")) {
case "run2016": case "run2016":
sp.setTrappingFunction((Ei, Ef) -> { sp.setTrappingFunction((Ei, Ef) -> {
return 6.2e-5 * FastMath.exp(-(Ei - Ef) / 350d) + 1.97e-4 - 6.818e-9 * Ei; return 6.2e-5 * FastMath.exp(-(Ei - Ef) / 350d) + 1.97e-4 - 6.818e-9 * Ei;
@ -237,7 +237,7 @@ public class NumassPlugin extends BasicPlugin {
"6.2e-5 * FastMath.exp(-(Ei - Ef) / 350d) + 1.97e-4 - 6.818e-9 * Ei"); "6.2e-5 * FastMath.exp(-(Ei - Ef) / 350d) + 1.97e-4 - 6.818e-9 * Ei");
NBkgSpectrum spectrum = new NBkgSpectrum(sp); NBkgSpectrum spectrum = new NBkgSpectrum(sp);
return new XYModel(spectrum, getAdapter(an)); return new XYModel(spectrum, getAdapter(meta));
}); });
manager.addModel("modularbeta-unadeabatic", (context, an) -> { manager.addModel("modularbeta-unadeabatic", (context, an) -> {

2
numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java
View File

@ -51,7 +51,7 @@ public class TransmissionInterpolator implements UnivariateFunction {
public static TransmissionInterpolator fromAction(Context context, Meta actionAnnotation, public static TransmissionInterpolator fromAction(Context context, Meta actionAnnotation,
String xName, String yName, int nSmooth, double w, double border) throws InterruptedException { String xName, String yName, int nSmooth, double w, double border) throws InterruptedException {
DataNode<Table> node = ActionUtils.runConfig(context, actionAnnotation); DataNode<Table> node = ActionUtils.runConfig(context, actionAnnotation);
PointSource data = node.getData().get(); PointSource data = node.getData().getNow();
return new TransmissionInterpolator(data, xName, yName, nSmooth, w, border); return new TransmissionInterpolator(data, xName, yName, nSmooth, w, border);
} }