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

minor fixes

Browse Source
This commit is contained in:
Alexander Nozik 2018-05-15 16:56:15 +03:00
parent 93bb93e837
commit 0a18e10275
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import hep.dataforge.kodex.configure
import hep.dataforge.maths.histogram.UnivariateHistogram import hep.dataforge.maths.histogram.UnivariateHistogram
import hep.dataforge.meta.Laminate import hep.dataforge.meta.Laminate
import hep.dataforge.plots.PlotPlugin import hep.dataforge.plots.PlotPlugin
import hep.dataforge.plots.XYFunctionPlot
import hep.dataforge.plots.data.DataPlot import hep.dataforge.plots.data.DataPlot
import hep.dataforge.tables.Adapters import hep.dataforge.tables.Adapters
import hep.dataforge.tables.Table import hep.dataforge.tables.Table
@ -82,6 +83,14 @@ class TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
}.fillData(histogram) }.fillData(histogram)
histPlot.add(histogramPlot) histPlot.add(histogramPlot)
//val cr = input.events.count().toDouble() / input.length.toMillis() *1000
histPlot.add(
XYFunctionPlot.plot(name + "_theory", 0.0, binSize * binNum) {
trueCR * Math.exp(- it * trueCR / 1e6)
}
)
} }
if (inputMeta.getBoolean("plotStat", true)) { if (inputMeta.getBoolean("plotStat", true)) {

10
numass-main/src/main/kotlin/inr/numass/scripts/timeanalysis/TestAnalyzer.kt
View File

@ -11,16 +11,15 @@ import inr.numass.data.api.timeOffset
import inr.numass.data.generateBlock import inr.numass.data.generateBlock
import org.apache.commons.math3.random.JDKRandomGenerator import org.apache.commons.math3.random.JDKRandomGenerator
import org.apache.commons.math3.random.RandomGenerator import org.apache.commons.math3.random.RandomGenerator
import java.lang.Math.exp
import java.time.Instant import java.time.Instant
fun main(args: Array<String>) { fun main(args: Array<String>) {
FXPlotManager().startGlobal() FXPlotManager().startGlobal()
NumassPlugin().startGlobal() NumassPlugin().startGlobal()
val cr = 10e3; val cr = 30e3
val length = 30e9.toLong(); val length = 30e9.toLong()
val num = 20; val num = 20
val dt = 6.5 val dt = 6.5
val rnd = JDKRandomGenerator() val rnd = JDKRandomGenerator()
@ -35,7 +34,8 @@ fun main(args: Array<String>) {
val chain = MarkovChain(OrphanNumassEvent(1000, 0)) { event -> val chain = MarkovChain(OrphanNumassEvent(1000, 0)) { event ->
val deltaT = rnd.nextDeltaTime(cr * exp(- event.timeOffset / 1e11)) //val deltaT = rnd.nextDeltaTime(cr * exp(- event.timeOffset / 1e11))
val deltaT = rnd.nextDeltaTime(cr)
OrphanNumassEvent(1000, event.timeOffset + deltaT) OrphanNumassEvent(1000, event.timeOffset + deltaT)
} }