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

Fix in JFreeChart and general plotting

Browse Source
This commit is contained in:
Alexander Nozik 2018-07-25 20:01:06 +03:00
parent 753555e13e
commit 500037fd42
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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) cr / 1e6 * initialEstimate.getInt(NumassAnalyzer.COUNT_KEY) * binSize * Math.exp(-it * cr / 1e6)
} }
context.plot(listOf(histogramPlot, functionPlot), "histogram", name) { context.plot(listOf(histogramPlot, functionPlot), stage = this.name, name = "histogram") {
"xAxis" to { "xAxis" to {
"title" to "delay" "title" to "delay"
"units" to "us" "units" to "us"
@ -98,7 +98,7 @@ object TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
configure(inputMeta.getMetaOrEmpty("plot")) configure(inputMeta.getMetaOrEmpty("plot"))
} }
context.plot(statPlot, "stat-method", name) { context.plot(statPlot, stage = this.name, name = "stat-method") {
"xAxis" to { "xAxis" to {
"title" to "delay" "title" to "delay"
"units" to "us" "units" to "us"
@ -118,7 +118,7 @@ object TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
1.0 1.0
} }
(0..steps).map { minT0 + (maxT0-minT0)/steps*it }.map { t -> (0..steps).map { minT0 + (maxT0 - minT0) / steps * it }.map { t ->
val result = analyzer.analyze(input, analyzerMeta.builder.setValue("t0", t)) val result = analyzer.analyze(input, analyzerMeta.builder.setValue("t0", t))
if (Thread.currentThread().isInterrupted) { if (Thread.currentThread().isInterrupted) {

2
numass-main/src/main/kotlin/inr/numass/scripts/timeanalysis/TestBunch.kt
View File

@ -69,4 +69,6 @@ fun main(args: Array<String>) {
} }
TimeAnalyzerAction.simpleRun(point, meta); TimeAnalyzerAction.simpleRun(point, meta);
readLine()
} }