From ffbf97dc0ca700ecc82a76568ae80923a7f2b6a9 Mon Sep 17 00:00:00 2001
From: darksnake <darksnake@LUNA.localdomain>
Date: Wed, 7 Sep 2016 14:59:01 +0300
Subject: [PATCH] Fixes in tasks

---
 .../java/inr/numass/workspace/NumassFitScanSummaryTask.java   | 2 +-
 .../src/main/java/inr/numass/workspace/NumassFitScanTask.java | 4 ++--
 .../java/inr/numass/workspace/NumassJavaGrindLauncher.java    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/numass-main/src/main/java/inr/numass/workspace/NumassFitScanSummaryTask.java b/numass-main/src/main/java/inr/numass/workspace/NumassFitScanSummaryTask.java
index 7ad35058..e1a15218 100644
--- a/numass-main/src/main/java/inr/numass/workspace/NumassFitScanSummaryTask.java
+++ b/numass-main/src/main/java/inr/numass/workspace/NumassFitScanSummaryTask.java
@@ -35,7 +35,7 @@ public class NumassFitScanSummaryTask extends AbstractTask<Table> {
         Action<FitState, Table> action = new FitSummaryAction().withContext(model.getWorkspace().getContext());
         DataNode<FitState> input = data.getCheckedNode("fitscan", FitState.class);
         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) {
         //merge tables if there is more than one
diff --git a/numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java b/numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java
index af038a38..0e4572ad 100644
--- a/numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java
+++ b/numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java
@@ -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]"));
         Action<Table, FitState> action = new FitAction().withContext(model.getContext()).withParentProcess(callback.workName());
         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")) {
             //use merged data and ignore raw data
-            sourceNode = sourceNode.getNode("merge").get();
+            sourceNode = sourceNode.getCheckedNode("merge", Table.class);
         }
 
         //do fit
diff --git a/numass-main/src/main/java/inr/numass/workspace/NumassJavaGrindLauncher.java b/numass-main/src/main/java/inr/numass/workspace/NumassJavaGrindLauncher.java
index 90765547..b9b9571a 100644
--- a/numass-main/src/main/java/inr/numass/workspace/NumassJavaGrindLauncher.java
+++ b/numass-main/src/main/java/inr/numass/workspace/NumassJavaGrindLauncher.java
@@ -17,6 +17,7 @@ import java.util.stream.Collectors;
 /**
  * Created by darksnake on 12-Aug-16.
  */
+@Deprecated
 public class NumassJavaGrindLauncher {
 
     public static void main(String[] args) throws Exception {