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

numass task fixes

Browse Source
This commit is contained in:
darksnake 2017-08-24 09:06:56 +03:00
parent 50e2c00b7f
commit c04a1780e8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java
View File

@ -29,17 +29,17 @@ public class NumassFitScanTask extends AbstractTask<FitResult> {
@Override
protected DataNode<FitResult> run(TaskModel model, DataNode<?> data) {
Meta config = model.meta();
String scanParameter = config.getString("scan.parameter", "msterile2");
String scanParameter = config.getString("parameter", "msterile2");
Value scanValues;
if (config.hasValue("scan.masses")) {
scanValues = Value.of(config.getValue("scan.masses")
if (config.hasValue("masses")) {
scanValues = Value.of(config.getValue("masses")
.listValue().stream()
.map(it -> Math.pow(it.doubleValue() * 1000, 2.0))
.collect(Collectors.toList())
);
} else {
scanValues = config.getValue("scan.values", Value.of("[2.5e5, 1e6, 2.25e6, 4e6, 6.25e6, 9e6]"));
scanValues = config.getValue("values", Value.of("[2.5e5, 1e6, 2.25e6, 4e6, 6.25e6, 9e6]"));
}
Action<Table, FitResult> action = new FitAction();
DataTree.Builder<FitResult> resultBuilder = DataTree.builder(FitResult.class);
@ -79,6 +79,8 @@ public class NumassFitScanTask extends AbstractTask<FitResult> {
@Override
protected void updateModel(TaskModel.Builder model, Meta meta) {
model.configure(meta.getMetaOrEmpty("scan"));
model.configure(it->it.putNode(meta.getMetaOrEmpty("fit")));
if (meta.hasMeta("filter")) {
model.dependsOn("filter", meta, "prepare");
} else if (meta.hasMeta("empty")) {