From 8759747c9de78dad59f5d3c7dfe7ff0637e12b97 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 1 Jul 2018 21:30:22 +0300 Subject: [PATCH] Remaking descriptors --- .../src/main/kotlin/inr/numass/actions/MergeDataAction.kt | 2 +- .../src/main/kotlin/inr/numass/actions/TransformDataAction.kt | 2 +- .../src/main/groovy/inr/numass/scripts/TestStorageAccess.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/numass-main/src/main/kotlin/inr/numass/actions/MergeDataAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/MergeDataAction.kt index 5ac4029f..dd7d9fe2 100644 --- a/numass-main/src/main/kotlin/inr/numass/actions/MergeDataAction.kt +++ b/numass-main/src/main/kotlin/inr/numass/actions/MergeDataAction.kt @@ -38,7 +38,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(key = "grouping", info = "The definition of grouping rule for this merge", from = "method::hep.dataforge.actions.GroupBuilder.byMeta") +@NodeDef(key = "grouping", info = "The definition of grouping rule for this merge", descriptor = "method::hep.dataforge.actions.GroupBuilder.byMeta") object MergeDataAction : ManyToOneAction() { private val parnames = arrayOf(NumassPoint.HV_KEY, NumassPoint.LENGTH_KEY, NumassAnalyzer.COUNT_KEY, NumassAnalyzer.COUNT_RATE_KEY, NumassAnalyzer.COUNT_RATE_ERROR_KEY) diff --git a/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt index 44f97abc..a8418400 100644 --- a/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt +++ b/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt @@ -34,7 +34,7 @@ import java.util.* ValueDef(key = "correction", info = "An expression to correct count number depending on potential `U`, point length `T` and point itself as `point`"), ValueDef(key = "utransform", info = "Expression for voltage transformation. Uses U as input") ) -@NodeDef(key = "correction", multiple = true, from = "method::inr.numass.actions.TransformDataAction.makeCorrection") +@NodeDef(key = "correction", multiple = true, descriptor = "method::inr.numass.actions.TransformDataAction.makeCorrection") object TransformDataAction : OneToOneAction() { override fun execute(context: Context, name: String, input: Table, meta: Laminate): Table { diff --git a/numass-test/src/main/groovy/inr/numass/scripts/TestStorageAccess.groovy b/numass-test/src/main/groovy/inr/numass/scripts/TestStorageAccess.groovy index 3454fcdc..ed0b09ce 100644 --- a/numass-test/src/main/groovy/inr/numass/scripts/TestStorageAccess.groovy +++ b/numass-test/src/main/groovy/inr/numass/scripts/TestStorageAccess.groovy @@ -38,7 +38,7 @@ new NumassClient("127.0.0.1",8335).withCloseable{ for(int i = 0; i<5; i++){ - data.putNode(DataPoint.toMeta(new ValueMap(names,i, 2*i,3*i))); + data.putNode(DataPoint.write(new ValueMap(names,i, 2*i,3*i))); }