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

Rebuilt FX meta editor from scratch

Browse Source
This commit is contained in:
Alexander Nozik 2017-05-01 19:56:11 +03:00
parent 77858190e0
commit edc39204d9
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package inr.numass
import hep.dataforge.context.Global import hep.dataforge.context.Global
import hep.dataforge.grind.GrindWorkspaceBuilder import hep.dataforge.grind.GrindWorkspaceBuilder
import hep.dataforge.grind.terminal.GrindTerminal import hep.dataforge.grind.terminal.GrindTerminal
import inr.numass.tasks.*
/** /**
* Created by darksnake on 29-Aug-16. * Created by darksnake on 29-Aug-16.
@ -16,23 +15,13 @@ println cli.usage
String cfgPath = cli.parse(args).c; String cfgPath = cli.parse(args).c;
println "Loading config file from $cfgPath" println "Loading config file from $cfgPath"
//println "Starting numass plugin in GLOBAL"
//Global.instance().pluginManager().load("inr.numass:numass")
println "Starting Grind shell" println "Starting Grind shell"
if (cfgPath) { if (cfgPath) {
try { try {
GrindTerminal.system().launch { GrindTerminal.system().launch {
GrindWorkspaceBuilder numass = new GrindWorkspaceBuilder(it.shell.context).read(new File(cfgPath)).startup { GrindWorkspaceBuilder numass = new GrindWorkspaceBuilder(context).read(new File(cfgPath))
it.loadTask(NumassPrepareTask) bind("numass", numass)
it.loadTask(NumassTableFilterTask)
it.loadTask(NumassFitScanTask)
it.loadTask(NumassSubstractEmptySourceTask)
it.loadTask(NumassFitScanSummaryTask)
it.loadTask(NumassFitTask)
it.loadTask(NumassFitSummaryTask)
}
it.shell.bind("numass", numass)
} }
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();

9
numass-main/src/main/java/inr/numass/NumassPlugin.java
View File

@ -35,6 +35,7 @@ import hep.dataforge.tables.XYAdapter;
import inr.numass.actions.*; import inr.numass.actions.*;
import inr.numass.models.*; import inr.numass.models.*;
import inr.numass.models.sterile.SterileNeutrinoSpectrum; import inr.numass.models.sterile.SterileNeutrinoSpectrum;
import inr.numass.tasks.*;
import org.apache.commons.math3.analysis.UnivariateFunction; import org.apache.commons.math3.analysis.UnivariateFunction;
import org.apache.commons.math3.util.FastMath; import org.apache.commons.math3.util.FastMath;
@ -91,6 +92,14 @@ public class NumassPlugin extends BasicPlugin {
actions.putAction(AdjustErrorsAction.class); actions.putAction(AdjustErrorsAction.class);
actions.putAction(ShowEnergySpectrumAction.class); actions.putAction(ShowEnergySpectrumAction.class);
actions.putAction(SubstractSpectrumAction.class); actions.putAction(SubstractSpectrumAction.class);
actions.putTask(NumassPrepareTask.class);
actions.putTask(NumassTableFilterTask.class);
actions.putTask(NumassFitScanTask.class);
actions.putTask(NumassSubstractEmptySourceTask.class);
actions.putTask(NumassFitScanSummaryTask.class);
actions.putTask(NumassFitTask.class);
actions.putTask(NumassFitSummaryTask.class);
} }
@Override @Override