Active workspace development started

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.2.41"
+    ext.kotlin_version = "1.2.50"
     repositories {
         jcenter()
         maven {

numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8Channel.kt

@@ -17,11 +17,7 @@
 package inr.numass.control.cryotemp
 
 import hep.dataforge.Named
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.*
-import hep.dataforge.kodex.stringValue
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaBuilder
-import hep.dataforge.meta.Metoid
 
 
 internal fun createChannel(name: String): PKT8Channel =

numass-control/dante/src/main/kotlin/inr/numass/control/dante/DanteClient.kt

@@ -16,9 +16,9 @@
 
 package inr.numass.control.dante
 
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.orElse
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.buildMeta
 import inr.numass.control.dante.DanteClient.Companion.CommandType.*
 import inr.numass.control.dante.DanteClient.Companion.Register.*
 import inr.numass.data.NumassProto

numass-control/dante/src/main/kotlin/inr/numass/control/dante/DanteTest.kt

@@ -19,10 +19,10 @@ package inr.numass.control.dante
 import hep.dataforge.context.Context
 import hep.dataforge.context.Global
 import hep.dataforge.fx.plots.display
-import hep.dataforge.kodex.KMetaBuilder
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.configure
 import hep.dataforge.kodex.nullable
+import hep.dataforge.meta.KMetaBuilder
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.data.DataPlot
 import hep.dataforge.plots.jfreechart.chart
 import hep.dataforge.tables.Adapters

numass-control/magnet/src/main/kotlin/inr/numass/control/magnet/LambdaMagnet.kt

@@ -22,8 +22,8 @@ import hep.dataforge.control.ports.PortFactory
 import hep.dataforge.description.ValueDef
 import hep.dataforge.exceptions.ControlException
 import hep.dataforge.exceptions.PortException
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.states.StateDef
 import hep.dataforge.states.StateDefs
 import hep.dataforge.states.valueState

numass-control/magnet/src/test/kotlin/inr/numass/control/magnet/VirtualLambdaPortTest.kt

@@ -17,13 +17,13 @@
 package inr.numass.control.magnet
 
 import hep.dataforge.context.Global
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
 class VirtualLambdaPortTest{
     val magnetMeta = buildMeta {
-        node("magnet"){
+        node("magnet") {
             "address" to 2
         }
     }

numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt

@@ -1,7 +1,7 @@
 package inr.numass.control
 
 import hep.dataforge.fx.plots.PlotContainer
-import hep.dataforge.kodex.KMetaBuilder
+import hep.dataforge.meta.KMetaBuilder
 import hep.dataforge.plots.PlotFrame
 import hep.dataforge.plots.Plottable
 import hep.dataforge.plots.jfreechart.JFreeChartFrame

numass-main/src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt

@@ -3,10 +3,10 @@ package inr.numass.actions
 import hep.dataforge.actions.OneToOneAction
 import hep.dataforge.context.Context
 import hep.dataforge.description.*
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.configure
 import hep.dataforge.maths.histogram.UnivariateHistogram
 import hep.dataforge.meta.Laminate
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.data.DataPlot
 import hep.dataforge.plots.output.plot
 import hep.dataforge.tables.Adapters

numass-main/src/main/kotlin/inr/numass/data/Visualization.kt

@@ -19,10 +19,10 @@ package inr.numass.data
 import hep.dataforge.context.Context
 import hep.dataforge.context.Global
 import hep.dataforge.fx.plots.display
-import hep.dataforge.kodex.KMetaBuilder
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.configure
 import hep.dataforge.kodex.nullable
+import hep.dataforge.meta.KMetaBuilder
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.data.DataPlot
 import hep.dataforge.plots.jfreechart.JFreeChartFrame
 import hep.dataforge.tables.Adapters

numass-main/src/main/kotlin/inr/numass/models/mc/BetaSampler.kt

@@ -2,8 +2,8 @@ package inr.numass.models.mc
 
 import hep.dataforge.context.Global
 import hep.dataforge.fx.plots.display
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.maths.chain.Chain
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.XYFunctionPlot
 import hep.dataforge.plots.jfreechart.chart
 import hep.dataforge.stat.PolynomialDistribution

numass-main/src/main/kotlin/inr/numass/scripts/Bunches.kt

@@ -1,6 +1,6 @@
 package inr.numass.scripts
 
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
 import inr.numass.actions.TimeAnalyzerAction
 import inr.numass.data.NumassGenerator
 import inr.numass.data.api.SimpleNumassPoint

numass-main/src/main/kotlin/inr/numass/scripts/Correlation.kt

@@ -17,7 +17,7 @@
 package inr.numass.scripts
 
 import hep.dataforge.kodex.buildContext
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
 import inr.numass.NumassPlugin
 import inr.numass.data.NumassDataUtils
 import inr.numass.data.analyzers.SmartAnalyzer

numass-main/src/main/kotlin/inr/numass/scripts/DifferentialSpectrum.kt

@@ -18,9 +18,9 @@ package inr.numass.scripts
 
 import hep.dataforge.description.Descriptors
 import hep.dataforge.kodex.buildContext
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
-import hep.dataforge.kodex.replaceColumn
 import hep.dataforge.plots.data.DataPlot
+import hep.dataforge.tables.replaceColumn
 import inr.numass.NumassPlugin
 import inr.numass.data.NumassDataUtils
 import inr.numass.data.analyzers.NumassAnalyzer

numass-main/src/main/kotlin/inr/numass/scripts/InversedChain.kt

@@ -18,7 +18,7 @@ package inr.numass.scripts
 
 import hep.dataforge.description.Descriptors
 import hep.dataforge.kodex.buildContext
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.data.DataPlot
 import inr.numass.NumassPlugin
 import inr.numass.data.NumassDataUtils

numass-main/src/main/kotlin/inr/numass/scripts/InversedChainProto.kt

@@ -18,7 +18,7 @@ package inr.numass.scripts
 
 import hep.dataforge.description.Descriptors
 import hep.dataforge.kodex.buildContext
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.data.DataPlot
 import inr.numass.NumassPlugin
 import inr.numass.data.analyzers.NumassAnalyzer.Companion.AMPLITUDE_ADAPTER

numass-main/src/main/kotlin/inr/numass/scripts/timeanalysis/AnalyzePoint.kt

@@ -3,7 +3,7 @@ package inr.numass.scripts.timeanalysis
 import hep.dataforge.data.DataSet
 import hep.dataforge.fx.output.FXOutputManager
 import hep.dataforge.kodex.buildContext
-import hep.dataforge.kodex.buildMeta
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.jfreechart.JFreeChartPlugin
 import inr.numass.NumassPlugin
 import inr.numass.actions.TimeAnalyzerAction

numass-main/src/main/kotlin/inr/numass/scripts/timeanalysis/Histogram.kt

@@ -17,8 +17,8 @@
 package inr.numass.scripts.timeanalysis
 
 import hep.dataforge.kodex.buildContext
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.maths.histogram.SimpleHistogram
+import hep.dataforge.meta.buildMeta
 import inr.numass.NumassPlugin
 import inr.numass.data.NumassDataUtils
 import inr.numass.data.analyzers.TimeAnalyzer

numass-main/src/main/kotlin/inr/numass/scripts/timeanalysis/TestAnalyzer.kt

@@ -2,8 +2,8 @@ package inr.numass.scripts.timeanalysis
 
 import hep.dataforge.context.Global
 import hep.dataforge.fx.output.FXOutputManager
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.coroutineContext
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.jfreechart.JFreeChartPlugin
 import inr.numass.NumassPlugin
 import inr.numass.actions.TimeAnalyzerAction

numass-main/src/main/kotlin/inr/numass/scripts/timeanalysis/TestBunch.kt

@@ -20,8 +20,8 @@ import hep.dataforge.context.Global
 import hep.dataforge.fx.output.FXOutputManager
 import hep.dataforge.goals.generate
 import hep.dataforge.goals.join
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.coroutineContext
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.jfreechart.JFreeChartPlugin
 import inr.numass.NumassPlugin
 import inr.numass.actions.TimeAnalyzerAction

numass-main/src/main/kotlin/inr/numass/scripts/utils/ScanTree.kt

@@ -2,11 +2,11 @@ package inr.numass.scripts.utils
 
 import hep.dataforge.context.Global
 import hep.dataforge.io.XMLMetaWriter
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.useValue
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
 import hep.dataforge.meta.MetaUtils
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.storage.api.Storage
 import inr.numass.data.storage.NumassDataLoader
 import inr.numass.data.storage.NumassStorageFactory

numass-main/src/main/kotlin/inr/numass/subthreshold/Threshold.kt

@@ -3,9 +3,9 @@ package inr.numass.subthreshold
 import hep.dataforge.context.Context
 import hep.dataforge.data.DataNode
 import hep.dataforge.data.DataSet
-import hep.dataforge.kodex.buildMeta
 import hep.dataforge.kodex.pipe
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.storage.commons.StorageUtils
 import hep.dataforge.tables.ListTable
 import hep.dataforge.tables.Table

numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt

@@ -7,11 +7,10 @@ import hep.dataforge.data.DataUtils
 import hep.dataforge.description.ValueDef
 import hep.dataforge.description.ValueDefs
 import hep.dataforge.io.output.stream
-import hep.dataforge.kodex.buildMeta
-import hep.dataforge.kodex.task
 import hep.dataforge.kodex.useMeta
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaUtils
+import hep.dataforge.meta.buildMeta
 import hep.dataforge.plots.XYFunctionPlot
 import hep.dataforge.plots.data.DataPlot
 import hep.dataforge.plots.jfreechart.JFreeChartFrame
@@ -23,6 +22,7 @@ import hep.dataforge.stat.models.XYModel
 import hep.dataforge.tables.*
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.Values
+import hep.dataforge.workspace.tasks.task
 import inr.numass.NumassUtils
 import inr.numass.actions.MergeDataAction
 import inr.numass.actions.MergeDataAction.Companion.MERGE_NAME