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

[no commit message]

Browse Source
This commit is contained in:
Alexander Nozik 2016-07-29 12:30:54 +03:00
parent af157dc3fa
commit bdd81ea455
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
numass-main/src/main/java/inr/numass/NumassContext.java
View File

@ -23,8 +23,6 @@ import hep.dataforge.description.DescriptorFormatter;
import hep.dataforge.description.DescriptorUtils; import hep.dataforge.description.DescriptorUtils;
import hep.dataforge.description.TextDescriptorFormatter; import hep.dataforge.description.TextDescriptorFormatter;
import hep.dataforge.exceptions.DescriptorException; import hep.dataforge.exceptions.DescriptorException;
import hep.dataforge.maths.integration.GaussRuleIntegrator;
import hep.dataforge.maths.integration.UnivariateIntegrator;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import java.io.PrintWriter; import java.io.PrintWriter;
@ -51,7 +49,6 @@ public class NumassContext extends Context {
private void init() { private void init() {
GlobalContext.registerContext(this); GlobalContext.registerContext(this);
loadPlugin("hep.dataforge:actions");
loadPlugin("inr.numass:numass"); loadPlugin("inr.numass:numass");
setIO(new NumassIO()); setIO(new NumassIO());
} }

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

@ -24,6 +24,7 @@ import hep.dataforge.fitting.FitPlugin;
import hep.dataforge.fitting.models.ModelManager; import hep.dataforge.fitting.models.ModelManager;
import hep.dataforge.fitting.models.WeightedXYModel; import hep.dataforge.fitting.models.WeightedXYModel;
import hep.dataforge.fitting.models.XYModel; import hep.dataforge.fitting.models.XYModel;
import hep.dataforge.maths.MathPlugin;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.plotfit.PlotFitResultAction; import hep.dataforge.plotfit.PlotFitResultAction;
import hep.dataforge.plots.PlotDataAction; import hep.dataforge.plots.PlotDataAction;
@ -64,7 +65,7 @@ import org.apache.commons.math3.util.FastMath;
* @author Alexander Nozik * @author Alexander Nozik
*/ */
@PluginDef(group = "inr.numass", name = "numass", @PluginDef(group = "inr.numass", name = "numass",
dependsOn = {"hep.dataforge:MINUIT", "hep.dataforge:plots"}, dependsOn = {"hep.dataforge:actions", "hep.dataforge:math", "hep.dataforge:MINUIT", "hep.dataforge:plots"},
description = "Numass data analysis tools") description = "Numass data analysis tools")
public class NumassPlugin extends BasicPlugin { public class NumassPlugin extends BasicPlugin {
@ -72,8 +73,8 @@ public class NumassPlugin extends BasicPlugin {
public void attach(Context context) { public void attach(Context context) {
// StorageManager.buildFrom(context); // StorageManager.buildFrom(context);
FitManager fm = context.provide("fitting", FitPlugin.class).getFitManager(); FitManager fm = context.provide("fitting", FitPlugin.class).getFitManager();
ModelManager mm = fm.getModelManager(); loadModels(fm.getModelManager());
loadModels(mm); loadMath(MathPlugin.buildFrom(context));
ActionManager actions = ActionManager.buildFrom(context); ActionManager actions = ActionManager.buildFrom(context);
actions.registerAction(SlicingAction.class); actions.registerAction(SlicingAction.class);
@ -97,6 +98,11 @@ public class NumassPlugin extends BasicPlugin {
} }
private void loadMath(MathPlugin math){
}
/** /**
* Load all numass model factories * Load all numass model factories
* *