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

Fixes in tasks

Browse Source
This commit is contained in:
darksnake 2016-09-07 14:59:01 +03:00
parent c5389c4e15
commit ffbf97dc0c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/src/main/java/inr/numass/workspace/NumassFitScanSummaryTask.java
View File

@ -35,7 +35,7 @@ public class NumassFitScanSummaryTask extends AbstractTask<Table> {
Action<FitState, Table> action = new FitSummaryAction().withContext(model.getWorkspace().getContext()); Action<FitState, Table> action = new FitSummaryAction().withContext(model.getWorkspace().getContext());
DataNode<FitState> input = data.getCheckedNode("fitscan", FitState.class); DataNode<FitState> input = data.getCheckedNode("fitscan", FitState.class);
input.nodeStream().forEach(node -> input.nodeStream().forEach(node ->
builder.putData(node.getName(), action.run((DataNode<FitState>) node, model.meta()).getData())); builder.putData(node.getName(), action.run(node, model.meta()).getData()));
// if (data.nodeStream().count() > 1) { // if (data.nodeStream().count() > 1) {
//merge tables if there is more than one //merge tables if there is more than one

4
numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java
View File

@ -31,11 +31,11 @@ public class NumassFitScanTask extends AbstractTask<FitState> {
Value scanValues = config.getValue("scanValues", Value.of("[2.5e5, 1e6, 2.25e6, 4e6, 6.25e6, 9e6]")); Value scanValues = config.getValue("scanValues", Value.of("[2.5e5, 1e6, 2.25e6, 4e6, 6.25e6, 9e6]"));
Action<Table, FitState> action = new FitAction().withContext(model.getContext()).withParentProcess(callback.workName()); Action<Table, FitState> action = new FitAction().withContext(model.getContext()).withParentProcess(callback.workName());
DataTree.Builder<FitState> resultBuilder = DataTree.builder(FitState.class); DataTree.Builder<FitState> resultBuilder = DataTree.builder(FitState.class);
DataNode<?> sourceNode = data.getNode("prepare").get(); DataNode<Table> sourceNode = data.getCheckedNode("prepare", Table.class);
if (config.hasNode("merge")) { if (config.hasNode("merge")) {
//use merged data and ignore raw data //use merged data and ignore raw data
sourceNode = sourceNode.getNode("merge").get(); sourceNode = sourceNode.getCheckedNode("merge", Table.class);
} }
//do fit //do fit

1
numass-main/src/main/java/inr/numass/workspace/NumassJavaGrindLauncher.java
View File

@ -17,6 +17,7 @@ import java.util.stream.Collectors;
/** /**
* Created by darksnake on 12-Aug-16. * Created by darksnake on 12-Aug-16.
*/ */
@Deprecated
public class NumassJavaGrindLauncher { public class NumassJavaGrindLauncher {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {