From 5c11fe4faca0dd5bf9a7269ec66490d7ec9d0638 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 12 Jul 2018 09:37:43 +0300
Subject: [PATCH] Fix output

---
 .../src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt | 2 +-
 .../src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt  | 4 ++--
 .../src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt  | 4 ++--
 numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
index c78308c9..114d685b 100644
--- a/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
+++ b/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
@@ -68,7 +68,7 @@ object PlotFitResultAction : OneToOneAction<FitResult, FitResult>() {
         StreamSupport.stream(data.spliterator(), false)
                 .map { dp -> Adapters.getXValue(adapter, dp).double }.sorted().forEach{ fit.calculateIn(it) }
 
-        context.plot(this.name, name, listOf(fit,DataPlot.plot("data", adapter, data)))
+        context.plot(listOf(fit,DataPlot.plot("data", adapter, data)), this.name, name)
 
         return input
     }
diff --git a/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
index 9f8074b0..d73647fa 100644
--- a/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
+++ b/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
@@ -77,7 +77,7 @@ object TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
                 cr / 1e6 * initialEstimate.getInt(NumassAnalyzer.COUNT_KEY) * binSize * Math.exp(-it * cr / 1e6)
             }
 
-            context.plot("histogram", name, listOf(histogramPlot, functionPlot)) {
+            context.plot(listOf(histogramPlot, functionPlot), "histogram", name) {
                 "xAxis" to {
                     "title" to "delay"
                     "units" to "us"
@@ -98,7 +98,7 @@ object TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
                 configure(inputMeta.getMetaOrEmpty("plot"))
             }
 
-            context.plot("stat-method", name, statPlot) {
+            context.plot(statPlot, "stat-method", name) {
                 "xAxis" to {
                     "title" to "delay"
                     "units" to "us"
diff --git a/numass-main/src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt
index 1fa24755..f12a6f55 100644
--- a/numass-main/src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt
+++ b/numass-main/src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt
@@ -82,7 +82,7 @@ object TimeSpectrumAction : OneToOneAction<NumassPoint, Table>() {
                     .fillData(histogram)
 
 
-            context.plot("histogram", name, histogramPlot) {
+            context.plot(histogramPlot, "histogram", name) {
                 "xAxis" to {
                     "title" to "delay"
                     "units" to "us"
@@ -103,7 +103,7 @@ object TimeSpectrumAction : OneToOneAction<NumassPoint, Table>() {
                 configure(inputMeta.getMetaOrEmpty("plot"))
             }
 
-            context.plot("stat-method", name, statPlot)
+            context.plot(statPlot, "stat-method", name)
 
             (1..100).map { 1000 * it }.map { t ->
                 val result = analyzer.analyze(input, buildMeta {
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 20b826ea..47ea4c2f 100644
--- a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
+++ b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
@@ -90,7 +90,7 @@ val monitorTableTask = task("monitor") {
 
         if (meta.getBoolean("showPlot", true)) {
             val plot = DataPlot.plot(name, Adapters.buildXYAdapter("timestamp", "cr", "crErr"), res)
-            context.plot("numass.monitor", name, plot) {
+            context.plot(plot, "numass.monitor", name) {
                 "xAxis.title" to "time"
                 "xAxis.type" to "time"
                 "yAxis.title" to "Count rate"
@@ -251,7 +251,7 @@ val plotFitTask = task("plotFit") {
 
         val dataPlot = DataPlot.plot("data", adapter, data)
 
-        context.plot("numass.plotFit", name, listOf(fit, dataPlot))
+        context.plot(listOf(fit, dataPlot), "numass.plotFit", name)
 
         return@pipe input;
     }