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

fix(fit-custom): display correct counts in fit output

Browse Source
This commit is contained in:
Vasily Chernov
2025-04-03 14:38:46 +03:00
parent 0dded083ba
commit 1d164bca3c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
numass-workspace/src/main/kotlin/ru/inr/mass/scripts/fit-custom.kt
View File

@@ -229,15 +229,6 @@ suspend fun processCustom(
mode = ScatterMode.lines
x.buffer = data.x
y.numbers = x.doubles.map { spectrum(it, fitParams + fit.result) }
File(dataPath.parent.toString(), dataPath.nameWithoutExtension + postfix + ".fit")
.printWriter().use {
out -> out.println("U_sp\tcounts\tresidials")
data.indices.map{
val value = spectrum(data.x[it], fitParams + fit.result)
val dif = data.y[it] - value
out.println("${data.x[it]}\t${data.y[it]}\t${dif/data.yErr[it]}")
}
}
}
scatter {
name = "Fit"
@@ -259,6 +250,17 @@ suspend fun processCustom(
val dif = testData.y[it] - value
dif/testData.yErr[it]
}
File(dataPath.parent.toString(), dataPath.nameWithoutExtension + postfix + ".fit.tsv")
.printWriter().use {
out -> out.println("U_sp\tcounts\tresidials")
testData.indices.forEach{
val value = spectrum(testData.x[it], fitParams + fit.result)
val dif = testData.y[it] - value
val residial = dif/testData.yErr[it]
out.println("${testData.x[it]}\t${value}\t$residial")
}
}
}
}
plot {
@@ -296,11 +298,16 @@ suspend fun processCustom(
table {
tr {
th { +"U_sp" }
th { +"Counts" }
th { +"residials" }
}
testData.indices.forEach {
tr {
td { +testData.x[it].toString() }
td {
val value = spectrum(testData.x[it], fitParams + fit.result)
+value.toString()
}
td {
val value = spectrum(testData.x[it], fitParams + fit.result)
val dif = testData.y[it] - value