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

Remaking descriptors

Browse Source
This commit is contained in:
Alexander Nozik 2018-07-03 10:26:12 +03:00
parent 8759747c9d
commit 464c53c465
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/src/main/kotlin/inr/numass/actions/MergeDataAction.kt
View File

@ -60,7 +60,7 @@ object MergeDataAction : ManyToOneAction<Table, Table>() {
} }
override fun afterGroup(context: Context, groupName: String, outputMeta: Meta, output: Table) { override fun afterGroup(context: Context, groupName: String, outputMeta: Meta, output: Table) {
context.output[name, groupName].render(NumassUtils.wrap(output, outputMeta)) context.output.get(name, groupName).render(NumassUtils.wrap(output, outputMeta))
super.afterGroup(context, groupName, outputMeta, output) super.afterGroup(context, groupName, outputMeta, output)
} }

24
numass-main/src/main/kotlin/inr/numass/scripts/models/IntegralSpectrum.kt
View File

@ -16,15 +16,15 @@
package inr.numass.scripts.models package inr.numass.scripts.models
import hep.dataforge.context.Global import hep.dataforge.fx.output.FXOutputManager
import hep.dataforge.fx.plots.display import hep.dataforge.kodex.buildContext
import hep.dataforge.kodex.configure import hep.dataforge.kodex.configure
import hep.dataforge.kodex.step import hep.dataforge.kodex.step
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.plots.Plot import hep.dataforge.plots.Plot
import hep.dataforge.plots.data.DataPlot import hep.dataforge.plots.data.DataPlot
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.plots.jfreechart.JFreeChartPlugin import hep.dataforge.plots.jfreechart.JFreeChartPlugin
import hep.dataforge.plots.output.plot
import hep.dataforge.stat.fit.ParamSet import hep.dataforge.stat.fit.ParamSet
import inr.numass.NumassPlugin import inr.numass.NumassPlugin
import inr.numass.models.NBkgSpectrum import inr.numass.models.NBkgSpectrum
@ -32,10 +32,14 @@ import inr.numass.models.sterile.SterileNeutrinoSpectrum
fun main(args: Array<String>) { fun main(args: Array<String>) {
JFreeChartPlugin().startGlobal()
NumassPlugin().startGlobal()
val sp = SterileNeutrinoSpectrum(Global, Meta.empty()) val context = buildContext("NUMASS", NumassPlugin::class.java, JFreeChartPlugin::class.java) {
output = FXOutputManager()
rootDir = "D:\\Work\\Numass\\sterile2018_04"
dataDir = "D:\\Work\\Numass\\data\\2018_04"
}
val sp = SterileNeutrinoSpectrum(context, Meta.empty())
//beta.setCaching(false); //beta.setCaching(false);
val spectrum = NBkgSpectrum(sp) val spectrum = NBkgSpectrum(sp)
@ -55,7 +59,7 @@ fun main(args: Array<String>) {
fun plotSpectrum(name: String, vararg override: Pair<String, Double>): Plot { fun plotSpectrum(name: String, vararg override: Pair<String, Double>): Plot {
val pars = params.copy().apply { val pars = params.copy().apply {
override.forEach { override.forEach {
setParValue(it.first,it.second) setParValue(it.first, it.second)
} }
} }
val x = (14000.0..18600.0).step(100.0).toList() val x = (14000.0..18600.0).step(100.0).toList()
@ -63,8 +67,9 @@ fun main(args: Array<String>) {
return DataPlot.plot(name, x.toDoubleArray(), y.toDoubleArray()) return DataPlot.plot(name, x.toDoubleArray(), y.toDoubleArray())
} }
Global.display {
JFreeChartFrame().apply {
context.plot("default") {
plots.configure { plots.configure {
"showLine" to true "showLine" to true
"showSymbol" to false "showSymbol" to false
@ -73,6 +78,5 @@ fun main(args: Array<String>) {
add(plotSpectrum("base")) add(plotSpectrum("base"))
add(plotSpectrum("noTrap", "trap" to 0.0)) add(plotSpectrum("noTrap", "trap" to 0.0))
} }
}
} }