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:36:52 +03:00
parent 500037fd42
commit b02c14eb34
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,17 +94,34 @@ object TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
"showLine" to true
"thickness" to 4
"title" to "${name}_${input.voltage}"
}.apply {
configure(inputMeta.getMetaOrEmpty("plot"))
update(inputMeta.getMetaOrEmpty("plot"))
}
context.plot(statPlot, stage = this.name, name = "stat-method") {
val errorPlot = DataPlot(name).configure{
"showLine" to true
"showErrors" to false
"showSymbol" to false
"thickness" to 4
"title" to "${name}_${input.voltage}"
}
context.plot(statPlot, stage = this.name, name = "count rate") {
"xAxis" to {
"title" to "delay"
"units" to "us"
}
"yAxis" to {
"title" to "Relative count rate"
"title" to "Reconstructed count rate"
}
}
context.plot(errorPlot, stage = this.name, name = "error"){
"xAxis" to {
"title" to "delay"
"units" to "us"
}
"yAxis" to {
"title" to "Statistical error"
}
}
@ -131,6 +148,10 @@ object TimeAnalyzerAction : OneToOneAction<NumassPoint, Table>() {
result.getDouble(NumassAnalyzer.COUNT_RATE_ERROR_KEY) / norm
)
)
errorPlot.append(
Adapters.buildXYDataPoint(t/1000.0, result.getDouble(NumassAnalyzer.COUNT_RATE_ERROR_KEY) / norm)
)
}

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

@ -49,7 +49,7 @@ fun main(args: Array<String>) {
.generateEvents(cr)
val bunches = NumassGenerator
.generateBunches(6.0, 0.001, 5.0)
.generateBunches(10.0, 0.001, 5.0)
val discharges = NumassGenerator
.generateBunches(50.0,0.001,0.1)