feat!: drop obsolete application.kt
This commit is contained in:
@@ -39,11 +39,6 @@ graalvmNative {
|
||||
|
||||
// ← добавляем блок с настройками для нескольких бинарников
|
||||
binaries {
|
||||
named("main") {
|
||||
imageName = "mass-app"
|
||||
mainClass = "ru.inr.mass.scripts.ApplicationKt"
|
||||
}
|
||||
|
||||
// создаём дополнительные бинарники
|
||||
register("grid-fit") {
|
||||
imageName = "grid-fit"
|
||||
@@ -78,20 +73,12 @@ tasks.register<CreateStartScripts>("fitCustomStartScripts") {
|
||||
outputDir = layout.buildDirectory.dir("scripts-fit").get().asFile
|
||||
}
|
||||
|
||||
tasks.register<CreateStartScripts>("appStartScripts") {
|
||||
applicationName = "mass-app"
|
||||
mainClass.set("ru.inr.mass.scripts.ApplicationKt")
|
||||
classpath = files(tasks.named<Jar>("jar"), configurations.runtimeClasspath)
|
||||
outputDir = layout.buildDirectory.dir("scripts-app").get().asFile
|
||||
}
|
||||
|
||||
// Добавляем все скрипты в дистрибутив
|
||||
distributions.named("main") {
|
||||
contents {
|
||||
into("bin") {
|
||||
from(tasks.named("gridFitStartScripts"))
|
||||
from(tasks.named("fitCustomStartScripts"))
|
||||
from(tasks.named("appStartScripts"))
|
||||
// fileMode = "0755"
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
}
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
package ru.inr.mass.scripts
|
||||
|
||||
import com.charleskorn.kaml.Yaml
|
||||
import com.charleskorn.kaml.decodeFromStream
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.serialization.Serializable
|
||||
import ru.inr.mass.models.NBkgSpectrum
|
||||
import ru.inr.mass.models.NumassBeta
|
||||
import ru.inr.mass.models.NumassTransmission
|
||||
import space.kscience.kmath.expressions.Symbol
|
||||
import java.io.File
|
||||
import kotlin.io.path.Path
|
||||
import kotlin.io.path.exists
|
||||
|
||||
// TODO: sync params with fit-custom
|
||||
@Serializable
|
||||
data class FitParams(
|
||||
val norm: Double = 254159.0,
|
||||
val bkg: Double = 0.2,
|
||||
val mnu2: Double = 0.0,
|
||||
val e0: Double = 18569.0,
|
||||
val msterile2: Double = 36e6,
|
||||
val u2: Double = 0.0,
|
||||
val thickness: Double = 0.3,
|
||||
val trap: Double = 1.0,
|
||||
val rearWall: Double = 0.01
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class FitCustomParams(
|
||||
val spectrum: String = "TABLE_SLICE.tsv",
|
||||
val full: String = "TABLE_FULL.tsv",
|
||||
val postfix: String = "sample",
|
||||
val fitParams: FitParams = FitParams(),
|
||||
val fixBkg: Boolean = false,
|
||||
val fixU2: Boolean = false,
|
||||
val fixTrap: Boolean = false,
|
||||
val trapFunc: TrapModel = TrapModel.FINE_5DAY,
|
||||
val fixRWall: Boolean = false,
|
||||
val fixE0: Boolean = false,
|
||||
val wallFunc: WallModel = WallModel.TSV_2025_12_01,
|
||||
val noAdiabacity: Boolean = false,
|
||||
val adiabacityFunc: AdiabaticityModel = AdiabaticityModel.`2024_11`
|
||||
)
|
||||
|
||||
fun main (args: Array<String>) {
|
||||
val usage = """
|
||||
Usage:
|
||||
application CONFIG_PATH # start fitting with configuration from CONFIG_PATH
|
||||
application sample # prints configuration template
|
||||
""".trimIndent()
|
||||
|
||||
if(args.size != 1) {
|
||||
println(usage)
|
||||
return
|
||||
}
|
||||
if(args[0] == "sample") {
|
||||
val yaml = Yaml.default.encodeToString(FitCustomParams.serializer(), FitCustomParams())
|
||||
println(yaml)
|
||||
return
|
||||
}
|
||||
if (!Path(args[0]).exists()) {
|
||||
println(usage)
|
||||
return
|
||||
}
|
||||
|
||||
val config = Yaml.default.decodeFromStream(FitCustomParams.serializer(), File(args[0]).inputStream())
|
||||
|
||||
println("using wall=${config.wallFunc}")
|
||||
println("using trap=${config.trapFunc}")
|
||||
println("using adiabacity=${config.adiabacityFunc}")
|
||||
|
||||
val fitParams: Map<Symbol, Double> = mapOf(
|
||||
NBkgSpectrum.norm to config.fitParams.norm,
|
||||
NBkgSpectrum.bkg to config.fitParams.bkg,
|
||||
NumassBeta.mnu2 to config.fitParams.mnu2,
|
||||
NumassBeta.e0 to config.fitParams.e0,
|
||||
NumassBeta.msterile2 to config.fitParams.msterile2,
|
||||
NumassBeta.u2 to config.fitParams.u2,
|
||||
NumassTransmission.thickness to config.fitParams.thickness,
|
||||
NumassTransmission.trap to config.fitParams.trap,
|
||||
rearWall to config.fitParams.rearWall
|
||||
)
|
||||
|
||||
runBlocking {
|
||||
processCustom(
|
||||
spectrumFile = config.spectrum,
|
||||
full =config.full,
|
||||
postfix = config.postfix,
|
||||
fitParams = fitParams,
|
||||
fixBkg = config.fixBkg,
|
||||
fixU2 = config.fixU2,
|
||||
fixTrap = config.fixTrap,
|
||||
trapFunc = config.trapFunc,
|
||||
fixRwall = config.fixRWall,
|
||||
fixE0 = config.fixE0,
|
||||
wallFunc = config.wallFunc,
|
||||
adiabacityFunc = config.adiabacityFunc
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user