NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix output

Browse Source
This commit is contained in:
Alexander Nozik 2018-07-12 09:37:43 +03:00
parent 1d2464df82
commit 5c11fe4fac
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
View File

@ -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
}

4
numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
View File

@ -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"

4
numass-main/src/main/kotlin/inr/numass/actions/TimeSpectrumAction.kt
View File

@ -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 {

4
numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
View File

@ -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;
}