diff --git a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt index c78ae0d9..a5d4622a 100644 --- a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt +++ b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt @@ -8,13 +8,20 @@ import inr.numass.data.analyzers.SmartAnalyzer import inr.numass.data.api.NumassSet import inr.numass.utils.NumassUtils -val selectDataTask = task("data") { +val selectDataTask = task("select") { + model { + data("*") + configure(meta.getMetaOrEmpty("data")) + } transform { data -> CustomDataFilter(meta).filter(data.checked(NumassSet::class.java)) } } val monitorTableTask = task("monitor") { + model { + dependsOn("select", meta) + } join { result { data -> val monitorVoltage = meta.getDouble("monitorVoltage", 16000.0); @@ -28,7 +35,7 @@ val monitorTableTask = task("monitor") { .map { it -> analyzer.analyzePoint(it, analyzerMeta) } ) - context.io().out("numass.monitor",name).use { + context.io().out("numass.monitor", name).use { NumassUtils.write(it, meta, builder.build()) }