From 6a184ddddac5c31d6389791a4fa0160aabacde6e Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 20 Aug 2016 13:44:28 +0300 Subject: [PATCH] Working on DSL improvement --- .../main/java/inr/numass/workspace/NumassFitScanTask.java | 8 ++++++-- .../java/inr/numass/workspace/NumassGrindLauncher.java | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) 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 7bb45bf0..99b56e8d 100644 --- a/numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java +++ b/numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java @@ -47,8 +47,12 @@ public class NumassFitScanTask extends GenericTask { MetaBuilder overrideMeta = new MetaBuilder(fitConfig); overrideMeta.setValue("@resultName", String.format("%s[%s=%s]", data.getName(), scanParameter, val.stringValue())); - overrideMeta.getNodes("params.param").stream() - .filter(par -> par.getString("name") == scanParameter).forEach(par -> par.setValue("value", val)); + if (overrideMeta.hasNode("params." + scanParameter)) { + overrideMeta.setValue("params." + scanParameter + ".value", val); + } else { + overrideMeta.getNodes("params.param").stream() + .filter(par -> par.getString("name") == scanParameter).forEach(par -> par.setValue("value", val)); + } // Data newData = new Data
(data.getGoal(),data.type(),overrideMeta); DataNode node = action.run(DataNode.of("fit_" + i, data, Meta.empty()), overrideMeta); resultBuilder.putData(data.getName() + ".fit_" + i, node.getData()); diff --git a/numass-main/src/main/java/inr/numass/workspace/NumassGrindLauncher.java b/numass-main/src/main/java/inr/numass/workspace/NumassGrindLauncher.java index 6133ffc6..ad8bb9f5 100644 --- a/numass-main/src/main/java/inr/numass/workspace/NumassGrindLauncher.java +++ b/numass-main/src/main/java/inr/numass/workspace/NumassGrindLauncher.java @@ -1,5 +1,6 @@ package inr.numass.workspace; +import hep.dataforge.context.GlobalContext; import hep.dataforge.data.DataNode; import hep.dataforge.grind.JavaGrindLauncher; import hep.dataforge.meta.Meta; @@ -50,6 +51,7 @@ public class NumassGrindLauncher { } node.computeAll(); + GlobalContext.instance().close(); } // // JavaGrindLauncher.buildWorkspace(new File(cfgPath), NumassWorkspaceSpec.class)