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

fix parallel computation for spectrum in viewer

Browse Source
This commit is contained in:
Alexander Nozik 2021-12-05 17:24:53 +03:00
parent 48c7c27af4
commit cadfc20e54
6 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dataforge-plots/src/main/kotlin/hep/dataforge/plots/PlotGroup.kt
View File

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

2
numass-viewer/build.gradle.kts
View File

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

14
numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt
View File

@ -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)
var binning by binningProperty
val binningProperty = SimpleIntegerProperty(2)
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)
}

6
numass-viewer/src/main/kotlin/inr/numass/viewer/DataController.kt
View File

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

2
numass-viewer/src/main/kotlin/inr/numass/viewer/DirectoryWatchView.kt
View File

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

19
numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt
View File

@ -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 =
frame.plots[name] as DataPlot? ?: DataPlot(name.toString()).apply { frame.add(this) }
val plot: DataPlot = frame.plots[name] as DataPlot? ?: DataPlot(name.toString()).apply {
frame.add(this)
}
app.context.launch {
val points = set.points.map {
dataController.getCachedPoint(Name.join("$name","${it.voltage}[${it.index}]"), it)
val points = set.points.map { point ->
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),