From 6cc2d5596ed8ffed0e0b17e99df93477cae10a76 Mon Sep 17 00:00:00 2001
From: darksnake <darksnake@daetron>
Date: Wed, 14 Jun 2017 21:47:55 +0300
Subject: [PATCH] Fixing Bayesian tools

---
 .../src/main/groovy/inr/numass/scripts/TritiumTest.groovy     | 2 +-
 .../src/main/java/inr/numass/models/LossCalculator.java       | 2 +-
 .../src/main/java/inr/numass/models/NamedSpectrumCaching.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy b/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy
index 08c7e022..45660406 100644
--- a/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy
+++ b/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy
@@ -68,7 +68,7 @@ allPars.setParDomain("trap", 0d, Double.POSITIVE_INFINITY);
 
 //        PlotManager pm = new PlotManager();
 //        String plotTitle = "Tritium spectrum";
-//        pm.plotFunction(FunctionUtils.getSpectrumFunction(spectrum, allPars), 14000, 18600, 500,plotTitle, null);
+//        pm.plotFunction(ParametricUtils.getSpectrumFunction(spectrum, allPars), 14000, 18600, 500,plotTitle, null);
 //        PrintNamed.printSpectrum(Out.onComplete, beta.trapping, allPars, 14000d, 18600d, 500);
 //        double e = 18570d;
 //        trans.alpha = 1e-4;
diff --git a/numass-main/src/main/java/inr/numass/models/LossCalculator.java b/numass-main/src/main/java/inr/numass/models/LossCalculator.java
index 198734b8..fe25de38 100644
--- a/numass-main/src/main/java/inr/numass/models/LossCalculator.java
+++ b/numass-main/src/main/java/inr/numass/models/LossCalculator.java
@@ -15,11 +15,11 @@
  */
 package inr.numass.models;
 
+import hep.dataforge.maths.functions.FunctionCaching;
 import hep.dataforge.maths.integration.GaussRuleIntegrator;
 import hep.dataforge.maths.integration.UnivariateIntegrator;
 import hep.dataforge.plots.PlotFrame;
 import hep.dataforge.plots.data.PlottableXYFunction;
-import hep.dataforge.stat.parametric.FunctionCaching;
 import hep.dataforge.values.NamedValueSet;
 import org.apache.commons.math3.analysis.BivariateFunction;
 import org.apache.commons.math3.analysis.UnivariateFunction;
diff --git a/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java b/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java
index 6ef315ba..b5d2ec0d 100644
--- a/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java
+++ b/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java
@@ -29,8 +29,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import static hep.dataforge.stat.parametric.FunctionUtils.getSpectrumDerivativeFunction;
-import static hep.dataforge.stat.parametric.FunctionUtils.getSpectrumFunction;
+import static hep.dataforge.stat.parametric.ParametricUtils.getSpectrumDerivativeFunction;
+import static hep.dataforge.stat.parametric.ParametricUtils.getSpectrumFunction;
 
 /**
  *