From 8520015b9c2d84e3390bd240690896fd4f8538da Mon Sep 17 00:00:00 2001 From: darksnake Date: Mon, 1 Aug 2016 13:51:01 +0300 Subject: [PATCH] [no commit message] --- .../src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy | 2 +- .../src/main/groovy/inr/numass/scripts/Loss2014.groovy | 5 +++-- .../scripts/TestExperimentalVariableLossSpectrum.groovy | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy b/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy index 5bb4e2fe..9eb516c7 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy @@ -26,7 +26,7 @@ import org.apache.commons.math3.analysis.UnivariateFunction import org.apache.commons.math3.analysis.solvers.BisectionSolver import inr.numass.models.LossCalculator import inr.numass.models.ResolutionFunction -import inr.numass.NumassContext +import inr.numass.Numass diff --git a/numass-main/src/main/groovy/inr/numass/scripts/Loss2014.groovy b/numass-main/src/main/groovy/inr/numass/scripts/Loss2014.groovy index 1934f561..e55e36f1 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/Loss2014.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/Loss2014.groovy @@ -15,14 +15,15 @@ */ package inr.numass.scripts +import hep.dataforge.context.Context import hep.dataforge.data.DataNode import hep.dataforge.fitting.FitTaskResult import inr.numass.Main -import inr.numass.NumassContext +import inr.numass.Numass //Main.main("-lc") -NumassContext context = new NumassContext(); +Context context = Numass.buildContext(); context.putValue("integralThreshold", 15d); DataNode resultPack = Main.run(context, "-c","D:\\sterile-new\\loss2014-11\\d2_19_1.xml") FitTaskResult result = resultPack.getData().get() diff --git a/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy b/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy index add23256..a3acf1ba 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy @@ -21,7 +21,7 @@ import hep.dataforge.plots.jfreechart.JFreeChartFrame import inr.numass.models.ExperimentalVariableLossSpectrum import org.apache.commons.math3.analysis.UnivariateFunction -import inr.numass.NumassContext +import inr.numass.Numass import hep.dataforge.fitting.ParamSet import hep.dataforge.io.PrintFunction