From 789e8b04c8e2138bcf239033107e83c653d4f708 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 30 Aug 2017 19:05:58 +0300 Subject: [PATCH] Update in data loaders and exec action --- build.gradle | 16 ---------------- .../java/inr/numass/actions/MergeDataAction.java | 2 +- .../inr/numass/actions/TransformDataAction.java | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 1e44c694..014975fa 100644 --- a/build.gradle +++ b/build.gradle @@ -24,20 +24,4 @@ subprojects { testCompile "org.spockframework:spock-core:1.0-groovy-2.+" } -} - -// id 'project-report' -// id 'build-dashboard' - - - - -//htmlDependencyReport { -// projects = project.allprojects -//} - - - -task wrapper(type: Wrapper) { - gradleVersion = '3.5.0' } \ No newline at end of file diff --git a/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java b/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java index 1936baeb..13cb55a5 100644 --- a/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java +++ b/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java @@ -35,7 +35,7 @@ import java.util.*; * @author Darksnake */ @TypedActionDef(name = "numass.merge", inputType = Table.class, outputType = Table.class, info = "Merge different numass data files into one.") -@NodeDef(name = "grouping", info = "The definition of grouping rule for this merge", target = "method::hep.dataforge.actions.GroupBuilder.byMeta") +@NodeDef(name = "grouping", info = "The definition of grouping rule for this merge", from = "method::hep.dataforge.actions.GroupBuilder.byMeta") public class MergeDataAction extends ManyToOneAction { public static final String MERGE_NAME = "mergeName"; diff --git a/numass-main/src/main/java/inr/numass/actions/TransformDataAction.java b/numass-main/src/main/java/inr/numass/actions/TransformDataAction.java index de263d15..3bf079ef 100644 --- a/numass-main/src/main/java/inr/numass/actions/TransformDataAction.java +++ b/numass-main/src/main/java/inr/numass/actions/TransformDataAction.java @@ -34,7 +34,7 @@ import static inr.numass.utils.NumassUtils.pointExpression; @ValueDef(name = "correction", info = "An expression to correct count number depending on potential `U`, point length `T` and point itself as `point`") @ValueDef(name = "utransform", info = "Expression for voltage transformation. Uses U as input") -@NodeDef(name = "correction", multiple = true, target = "method::inr.numass.actions.TransformDataAction.makeCorrection") +@NodeDef(name = "correction", multiple = true, from = "method::inr.numass.actions.TransformDataAction.makeCorrection") public class TransformDataAction extends OneToOneAction { @Override