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

Updates in FX output

Browse Source
This commit is contained in:
Alexander Nozik 2018-05-13 18:25:51 +03:00
parent 122c71c51d
commit c57969b392
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
numass-core/src/main/kotlin/inr/numass/data/analyzers/TimeAnalyzer.kt
View File

@ -34,6 +34,7 @@ import java.util.stream.Stream
import kotlin.streams.asSequence import kotlin.streams.asSequence
import kotlin.streams.asStream import kotlin.streams.asStream
/** /**
* An analyzer which uses time information from events * An analyzer which uses time information from events
* Created by darksnake on 11.07.2017. * Created by darksnake on 11.07.2017.
@ -51,11 +52,29 @@ class TimeAnalyzer @JvmOverloads constructor(private val processor: SignalProces
val upChannel = config.getInt("window.up", Integer.MAX_VALUE) val upChannel = config.getInt("window.up", Integer.MAX_VALUE)
val t0 = getT0(block, config).toLong() val t0 = getT0(block, config).toLong()
val chunkSize = config.getInt("chunkSize", 1000)
val res = getEventsWithDelay(block, config).asSequence().chunked(chunkSize) {
analyzeSequence(it.asSequence(), t0)
}.reduce(this::combineBlockResults) ?: ValueMap.ofPairs(
NumassAnalyzer.LENGTH_KEY to 0,
NumassAnalyzer.COUNT_KEY to 0,
NumassAnalyzer.COUNT_RATE_KEY to 0,
NumassAnalyzer.COUNT_RATE_ERROR_KEY to 0
)
return ValueMap.Builder(res)
.putValue(NumassAnalyzer.WINDOW_KEY, arrayOf(loChannel, upChannel))
.putValue(NumassAnalyzer.TIME_KEY, block.startTime)
.putValue(T0_KEY, t0.toDouble() / 1000.0)
.build()
}
private fun analyzeSequence(sequence: Sequence<Pair<NumassEvent, Long>>, t0: Long): Values {
val totalN = AtomicLong(0) val totalN = AtomicLong(0)
val totalT = AtomicLong(0) val totalT = AtomicLong(0)
sequence.filter { pair -> pair.second >= t0 }
getEventsWithDelay(block, config)
.filter { pair -> pair.second >= t0 }
.forEach { pair -> .forEach { pair ->
totalN.incrementAndGet() totalN.incrementAndGet()
//TODO add progress listener here //TODO add progress listener here
@ -67,15 +86,21 @@ class TimeAnalyzer @JvmOverloads constructor(private val processor: SignalProces
val length = totalT.get() / 1e9 val length = totalT.get() / 1e9
val count = (length * countRate).toLong() val count = (length * countRate).toLong()
return ValueMap.of(NAME_LIST, return ValueMap.ofPairs(
length, NumassAnalyzer.LENGTH_KEY to length,
count, NumassAnalyzer.COUNT_KEY to count,
countRate, NumassAnalyzer.COUNT_RATE_KEY to countRate,
countRateError, NumassAnalyzer.COUNT_RATE_ERROR_KEY to countRateError
arrayOf(loChannel, upChannel),
block.startTime,
t0.toDouble() / 1000.0
) )
// ValueMap.of(NAME_LIST,
// length,
// count,
// countRate,
// countRateError,
// arrayOf(loChannel, upChannel),
// block.startTime,
// t0.toDouble() / 1000.0
// )
} }
override fun analyzeParent(point: ParentBlock, config: Meta): Values { override fun analyzeParent(point: ParentBlock, config: Meta): Values {
@ -86,7 +111,7 @@ class TimeAnalyzer @JvmOverloads constructor(private val processor: SignalProces
.reduce(null) { v1, v2 -> this.combineBlockResults(v1, v2) } .reduce(null) { v1, v2 -> this.combineBlockResults(v1, v2) }
val map = HashMap(res.asMap()) val map = HashMap(res.asMap())
if(point is NumassPoint) { if (point is NumassPoint) {
map[HV_KEY] = Value.of(point.voltage) map[HV_KEY] = Value.of(point.voltage)
} }
return ValueMap(map) return ValueMap(map)
@ -120,15 +145,12 @@ class TimeAnalyzer @JvmOverloads constructor(private val processor: SignalProces
val countRateErr = Math.sqrt(Math.pow(t1 * err1 / (t1 + t2), 2.0) + Math.pow(t2 * err2 / (t1 + t2), 2.0)) val countRateErr = Math.sqrt(Math.pow(t1 * err1 / (t1 + t2), 2.0) + Math.pow(t2 * err2 / (t1 + t2), 2.0))
return ValueMap.of(NAME_LIST, return ValueMap.Builder(v1)
v1.getDouble(NumassAnalyzer.LENGTH_KEY) + v2.getDouble(NumassAnalyzer.LENGTH_KEY), .putValue(NumassAnalyzer.LENGTH_KEY, t1 + t2)
v1.getInt(NumassAnalyzer.COUNT_KEY) + v2.getInt(NumassAnalyzer.COUNT_KEY), .putValue(NumassAnalyzer.COUNT_KEY, v1.getInt(NumassAnalyzer.COUNT_KEY) + v2.getInt(NumassAnalyzer.COUNT_KEY))
countRate, .putValue(NumassAnalyzer.COUNT_RATE_KEY, countRate)
countRateErr, .putValue(NumassAnalyzer.COUNT_RATE_ERROR_KEY, countRateErr)
v1.getValue(NumassAnalyzer.WINDOW_KEY), .build()
v1.getValue(NumassAnalyzer.TIME_KEY),
v1.getDouble(T0_KEY)
)
} }
@ValueDefs( @ValueDefs(