Grind fixes
This commit is contained in:
parent
d6b93d67e5
commit
cce0372cf8
@ -41,6 +41,7 @@ allprojects {
|
|||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
|
freeCompilerArgs = ['-Xjvm-default=enable']
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "1.8"
|
||||||
javaParameters = true
|
javaParameters = true
|
||||||
}
|
}
|
||||||
@ -48,7 +49,7 @@ allprojects {
|
|||||||
|
|
||||||
compileTestKotlin {
|
compileTestKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
freeCompilerArgs = ['-Xenable-jvm-default']
|
freeCompilerArgs = ['-Xjvm-default=enable']
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "1.8"
|
||||||
javaParameters = true
|
javaParameters = true
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package inr.numass
|
|||||||
|
|
||||||
import hep.dataforge.context.Global
|
import hep.dataforge.context.Global
|
||||||
import hep.dataforge.grind.terminal.GrindTerminal
|
import hep.dataforge.grind.terminal.GrindTerminal
|
||||||
|
import hep.dataforge.grind.workspace.GrindWorkspace
|
||||||
import hep.dataforge.workspace.FileBasedWorkspace
|
import hep.dataforge.workspace.FileBasedWorkspace
|
||||||
import hep.dataforge.workspace.Workspace
|
import hep.dataforge.workspace.Workspace
|
||||||
|
|
||||||
@ -23,7 +24,7 @@ try {
|
|||||||
GrindTerminal.system().launch {
|
GrindTerminal.system().launch {
|
||||||
if (cfgPath) {
|
if (cfgPath) {
|
||||||
Workspace numass = FileBasedWorkspace.build(context, new File(cfgPath as String).toPath())
|
Workspace numass = FileBasedWorkspace.build(context, new File(cfgPath as String).toPath())
|
||||||
bind("numass", numass)
|
bind("numass", new GrindWorkspace(numass))
|
||||||
} else {
|
} else {
|
||||||
println "No configuration path. Provide path via --config option"
|
println "No configuration path. Provide path via --config option"
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ import org.apache.commons.math3.util.FastMath
|
|||||||
@PluginDef(
|
@PluginDef(
|
||||||
group = "inr.numass",
|
group = "inr.numass",
|
||||||
name = "numass",
|
name = "numass",
|
||||||
dependsOn = arrayOf("hep.dataforge:functions", "hep.dataforge:MINUIT", "hep.dataforge:actions"),
|
dependsOn = ["hep.dataforge:functions", "hep.dataforge:MINUIT", "hep.dataforge:actions"],
|
||||||
support = false,
|
support = false,
|
||||||
info = "Numass data analysis tools"
|
info = "Numass data analysis tools"
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user