fix parallel computation for spectrum in viewer

dataforge-plots/src/main/kotlin/hep/dataforge/plots/PlotGroup.kt

@@ -112,36 +112,28 @@ class PlotGroup(override  val name: String, descriptor: NodeDescriptor = NodeDes
     }
 
     @ProvidesNames(PLOT_TARGET)
-    fun list(): Stream<String> {
+    fun list(): Stream<String> = stream().map { it.first.toString() }
-        return stream().map { it.first.toString() }
-    }
 
     /**
      * Recursive stream of all plots excluding intermediate nodes
      *
      * @return
      */
-    fun stream(recursive: Boolean = true): Stream<Pair<Name, Plottable>> {
+    fun stream(recursive: Boolean = true): Stream<Pair<Name, Plottable>> = plots.stream().flatMap {
-        return plots.stream().flatMap {
+        if (recursive && it is PlotGroup) {
-            if (recursive && it is PlotGroup) {
+            it.stream().map { pair -> Pair(Name.ofSingle(it.name) + pair.first, pair.second) }
-                it.stream().map { pair -> Pair(Name.ofSingle(it.name) + pair.first, pair.second) }
+        } else {
-            } else {
+            Stream.of(Pair(Name.ofSingle(it.name), it))
-                Stream.of(Pair(Name.ofSingle(it.name), it))
-            }
         }
     }
 
     @Provides(PLOT_TARGET)
-    operator fun get(name: String): Plottable? {
+    operator fun get(name: String): Plottable? = get(Name.of(name))
-        return get(Name.of(name))
-    }
 
-    operator fun get(name: Name): Plottable? {
+    operator fun get(name: Name): Plottable? = when (name.length) {
-        return when {
+        0 -> this
-            name.length == 0 -> this
+        1 -> plots.find { it.name == name.unescaped }
-            name.length == 1 -> plots.find { it.name == name.unescaped }
+        else -> (get(name.cutLast()) as? PlotGroup)?.get(name.last)
-            else -> (get(name.cutLast()) as? PlotGroup)?.get(name.last)
-        }
     }
 
     /**
@@ -203,9 +195,7 @@ class PlotGroup(override  val name: String, descriptor: NodeDescriptor = NodeDes
      *
      * @return
      */
-    override fun iterator(): Iterator<Plottable> {
+    override fun iterator(): Iterator<Plottable> = this.plots.iterator()
-        return this.plots.iterator()
-    }
 
     class Wrapper : hep.dataforge.io.envelopes.Wrapper<PlotGroup> {
 

numass-viewer/build.gradle.kts

@@ -19,7 +19,7 @@ application {
     mainClass.set("inr.numass.viewer.Viewer")
 }
 
-version = "0.6.1"
+version = "0.6.2"
 
 description = "The viewer for numass data"
 

numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt

@@ -12,6 +12,7 @@ import inr.numass.data.analyzers.NumassAnalyzer
 import inr.numass.data.analyzers.withBinning
 import javafx.beans.binding.DoubleBinding
 import javafx.beans.property.SimpleBooleanProperty
+import javafx.beans.property.SimpleIntegerProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.collections.FXCollections
 import javafx.collections.MapChangeListener
@@ -49,17 +50,17 @@ class AmplitudeView : View(title = "Numass amplitude spectrum plot", icon = Imag
         }.setType<DataPlot>()
     }
 
-    val binningProperty = SimpleObjectProperty(20)
+    val binningProperty = SimpleIntegerProperty(2)
-    var binning by binningProperty
+    var binning: Int by binningProperty
 
     val normalizeProperty = SimpleBooleanProperty(true)
     var normalize by normalizeProperty
 
 
     private val plotContainer = PlotContainer(frame).apply {
-        val binningSelector: ChoiceBox<Int> = ChoiceBox(FXCollections.observableArrayList(1, 2, 8, 16, 32, 50)).apply {
+        val binningSelector: ChoiceBox<Int> = ChoiceBox(FXCollections.observableArrayList(1, 2, 8, 16, 32)).apply {
             minWidth = 0.0
-            selectionModel.selectLast()
+            selectionModel.select(binning as Int?)
             binningProperty.bind(this.selectionModel.selectedItemProperty())
         }
         val normalizeSwitch: CheckBox = CheckBox("Normalize").apply {
@@ -106,7 +107,11 @@ class AmplitudeView : View(title = "Numass amplitude spectrum plot", icon = Imag
 
     private fun replotOne(key: String, point: DataController.CachedPoint) {
         plotJobs[key]?.cancel()
+        frame.plots.remove(Name.ofSingle(key))
         plotJobs[key] = app.context.launch {
+            withContext(Dispatchers.JavaFx) {
+                progress.invalidate()
+            }
             val valueAxis = if (normalize) {
                 NumassAnalyzer.COUNT_RATE_KEY
             } else {
@@ -134,7 +139,6 @@ class AmplitudeView : View(title = "Numass amplitude spectrum plot", icon = Imag
                 }
                 group
             }
-            ensureActive()
             withContext(Dispatchers.JavaFx) {
                 frame.add(plot)
             }

numass-viewer/src/main/kotlin/inr/numass/viewer/DataController.kt

@@ -40,15 +40,15 @@ class DataController : Controller(), ContextAware {
 
         val meta = point.meta
 
-        val channelSpectra: Deferred<Map<Int, Table>> = context.async {
+        val channelSpectra: Deferred<Map<Int, Table>> = context.async(start = CoroutineStart.LAZY) {
             point.channels.mapValues { (_, value) -> analyzer.getAmplitudeSpectrum(value) }
         }
 
-        val spectrum: Deferred<Table> = context.async {
+        val spectrum: Deferred<Table> = context.async(start = CoroutineStart.LAZY){
             analyzer.getAmplitudeSpectrum(point)
         }
 
-        val timeSpectrum: Deferred<Table> = context.async {
+        val timeSpectrum: Deferred<Table> = context.async(start = CoroutineStart.LAZY) {
             val cr = spectrum.await().sumOf {
                 it.getValue(NumassAnalyzer.COUNT_KEY).int
             }.toDouble() / point.length.toMillis() * 1000

numass-viewer/src/main/kotlin/inr/numass/viewer/DirectoryWatchView.kt

@@ -40,7 +40,7 @@ class DirectoryWatchView : View(title = "Numass storage", icon = dfIconView) {
                     val name = Name.of(path.map { it.toString().asName() })
                     text = null
                     graphic = checkbox(path.fileName.toString()).apply {
-                        isSelected = false
+                        isSelected = dataController.points.containsKey(name)
                         selectedProperty().onChange {
                             if (it) {
                                 app.context.launch {

numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt

@@ -15,10 +15,8 @@ import javafx.geometry.Insets
 import javafx.geometry.Orientation
 import javafx.scene.image.ImageView
 import javafx.util.converter.NumberStringConverter
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
 import kotlinx.coroutines.javafx.JavaFx
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.controlsfx.control.RangeSlider
 import tornadofx.*
 import java.util.concurrent.atomic.AtomicInteger
@@ -117,18 +115,19 @@ class SpectrumView : View(title = "Numass spectrum plot", icon = ImageView(dfIco
         val totalProgress = data.values.stream().mapToInt { it.points.size }.sum()
 
         data.forEach { (name, set) ->
-            val plot: DataPlot =
+            val plot: DataPlot = frame.plots[name] as DataPlot? ?: DataPlot(name.toString()).apply {
-                frame.plots[name] as DataPlot? ?: DataPlot(name.toString()).apply { frame.add(this) }
+                frame.add(this)
+            }
 
             app.context.launch {
-                val points = set.points.map {
+                val points = set.points.map { point ->
-                    dataController.getCachedPoint(Name.join("$name","${it.voltage}[${it.index}]"), it)
+                    dataController.getCachedPoint(Name.join("$name","${point.voltage}[${point.index}]"), point).also {
+                        it.spectrum.start()
+                    }
                 }.map { cachedPoint ->
                     val count = cachedPoint.spectrum.await().countInWindow(loChannel.toShort(), upChannel.toShort())
                     val seconds = cachedPoint.length.toMillis() / 1000.0
-                    launch(Dispatchers.JavaFx) {
+
-                        container.progress = progress.incrementAndGet().toDouble() / totalProgress
-                    }
                     Adapters.buildXYDataPoint(
                         cachedPoint.voltage,
                         (count / seconds),