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

separate grind terminal

Browse Source
This commit is contained in:
Alexander Nozik 2016-12-16 13:56:26 +03:00
parent 01c5419c32
commit c63de01a42
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/build.gradle
View File

@ -14,7 +14,7 @@ dependencies {
compile project(':dataforge-fx') compile project(':dataforge-fx')
compile project(':dataforge-plots:plots-jfc') compile project(':dataforge-plots:plots-jfc')
compile project(':numass-storage') compile project(':numass-storage')
compile project(':dataforge-grind') compile project(':dataforge-grind:grind-terminal')
} }
task listActions(dependsOn: classes, type: JavaExec) { task listActions(dependsOn: classes, type: JavaExec) {

6
numass-main/src/main/groovy/inr/numass/LaunchGrindShell.groovy
View File

@ -1,8 +1,8 @@
package inr.numass package inr.numass
import hep.dataforge.context.Global import hep.dataforge.context.Global
import hep.dataforge.grind.GrindShell
import hep.dataforge.grind.GrindWorkspaceBuilder import hep.dataforge.grind.GrindWorkspaceBuilder
import hep.dataforge.grind.terminal.GrindTerminal
/** /**
* Created by darksnake on 29-Aug-16. * Created by darksnake on 29-Aug-16.
@ -21,11 +21,11 @@ println "Starting Grind shell"
if(cfgPath) { if(cfgPath) {
try { try {
new GrindShell().launch { GrindTerminal.dumb().launch {
GrindWorkspaceBuilder numass = new GrindWorkspaceBuilder() GrindWorkspaceBuilder numass = new GrindWorkspaceBuilder()
.withSpec(NumassWorkspaceSpec) .withSpec(NumassWorkspaceSpec)
.from(new File(cfgPath)) .from(new File(cfgPath))
bind("numass", numass) shell.bind("numass", numass)
} }
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();

4
numass-main/src/main/java/inr/numass/workspace/NumassFitTask.java
View File

@ -51,8 +51,8 @@ public class NumassFitTask extends SingleActionTask<Table, FitState> {
} }
@Override @Override
protected Action getAction(TaskModel model) { protected Action<Table, FitState> getAction(TaskModel model) {
Action action = new FitAction(); Action<Table, FitState> action = new FitAction();
if (model.meta().getBoolean("fit.plot", false)) { if (model.meta().getBoolean("fit.plot", false)) {
return ActionUtils.compose(action, new PlotFitResultAction()); return ActionUtils.compose(action, new PlotFitResultAction());
} else { } else {

1
numass-main/src/test/java/inr/numass/models/TestNeLossParametrisation.java
View File

@ -25,6 +25,7 @@ import org.apache.commons.math3.analysis.UnivariateFunction;
* *
* @author Alexander Nozik * @author Alexander Nozik
*/ */
@SuppressWarnings("unchecked")
public class TestNeLossParametrisation { public class TestNeLossParametrisation {
/** /**