From bdd81ea4558c6650f0661cc1afc79c202327405f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 29 Jul 2016 12:30:54 +0300
Subject: [PATCH] [no commit message]

---
 .../src/main/java/inr/numass/NumassContext.java      |  3 ---
 .../src/main/java/inr/numass/NumassPlugin.java       | 12 +++++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/numass-main/src/main/java/inr/numass/NumassContext.java b/numass-main/src/main/java/inr/numass/NumassContext.java
index dd4cb42e..a5c9ba38 100644
--- a/numass-main/src/main/java/inr/numass/NumassContext.java
+++ b/numass-main/src/main/java/inr/numass/NumassContext.java
@@ -23,8 +23,6 @@ import hep.dataforge.description.DescriptorFormatter;
 import hep.dataforge.description.DescriptorUtils;
 import hep.dataforge.description.TextDescriptorFormatter;
 import hep.dataforge.exceptions.DescriptorException;
-import hep.dataforge.maths.integration.GaussRuleIntegrator;
-import hep.dataforge.maths.integration.UnivariateIntegrator;
 import hep.dataforge.meta.Meta;
 import java.io.PrintWriter;
 
@@ -51,7 +49,6 @@ public class NumassContext extends Context {
 
     private void init() {
         GlobalContext.registerContext(this);
-        loadPlugin("hep.dataforge:actions");
         loadPlugin("inr.numass:numass");
         setIO(new NumassIO());
     }
diff --git a/numass-main/src/main/java/inr/numass/NumassPlugin.java b/numass-main/src/main/java/inr/numass/NumassPlugin.java
index c3cfd366..0553f1db 100644
--- a/numass-main/src/main/java/inr/numass/NumassPlugin.java
+++ b/numass-main/src/main/java/inr/numass/NumassPlugin.java
@@ -24,6 +24,7 @@ import hep.dataforge.fitting.FitPlugin;
 import hep.dataforge.fitting.models.ModelManager;
 import hep.dataforge.fitting.models.WeightedXYModel;
 import hep.dataforge.fitting.models.XYModel;
+import hep.dataforge.maths.MathPlugin;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.plotfit.PlotFitResultAction;
 import hep.dataforge.plots.PlotDataAction;
@@ -64,7 +65,7 @@ import org.apache.commons.math3.util.FastMath;
  * @author Alexander Nozik
  */
 @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")
 public class NumassPlugin extends BasicPlugin {
 
@@ -72,8 +73,8 @@ public class NumassPlugin extends BasicPlugin {
     public void attach(Context context) {
 //        StorageManager.buildFrom(context);
         FitManager fm = context.provide("fitting", FitPlugin.class).getFitManager();
-        ModelManager mm = fm.getModelManager();
-        loadModels(mm);
+        loadModels(fm.getModelManager());
+        loadMath(MathPlugin.buildFrom(context));
 
         ActionManager actions = ActionManager.buildFrom(context);
         actions.registerAction(SlicingAction.class);
@@ -96,6 +97,11 @@ public class NumassPlugin extends BasicPlugin {
     public void detach() {
 
     }
+    
+    private void loadMath(MathPlugin math){
+        
+    }
+    
 
     /**
      * Load all numass model factories