From ddb6fcdeb470e5c67541e4e5d1d2cbce156a4781 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 18 Sep 2017 16:38:44 +0300 Subject: [PATCH] minor fixes --- .../inr/numass/scripts/times/TestPointAnalyzer.groovy | 6 +++--- .../java/inr/numass/tasks/NumassFitScanSummaryTask.java | 2 +- .../src/main/java/inr/numass/tasks/NumassFitScanTask.java | 3 +-- .../main/java/inr/numass/tasks/NumassFitSummaryTask.java | 2 +- .../src/main/java/inr/numass/tasks/NumassFitTask.java | 2 +- .../src/main/java/inr/numass/tasks/NumassPrepareTask.java | 2 +- .../inr/numass/tasks/NumassSubstractEmptySourceTask.java | 2 +- .../main/java/inr/numass/tasks/NumassTableFilterTask.java | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy b/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy index 84b736a3..7445d44c 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy @@ -25,18 +25,18 @@ ctx.pluginManager().load(NumassPlugin.class) new GrindShell(ctx).eval { PlotHelper plot = plots - File rootDir = new File("D:\\Work\\Numass\\data\\2017_05\\Fill_2") + File rootDir = new File("D:\\Work\\Numass\\data\\2017_05\\Fill_3") NumassStorage storage = NumassStorageFactory.buildLocal(rootDir); - def set = "set_2" + def set = "set_43" def hv = 14000; def loader = storage.provide("loader::$set", NumassSet.class).get(); def point = loader.provide("$hv", NumassPoint.class).get() def loChannel = 450; - def upChannel = 1800; + def upChannel = 3100; def histogram = PointAnalyzer.histogram(point, loChannel, upChannel, 1, 500).asTable(); diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java index a7e6d800..cbe95171 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java @@ -42,7 +42,7 @@ public class NumassFitScanSummaryTask extends AbstractTask { } @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { model.dependsOn("fitscan", meta, "fitscan"); } diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java index a3edce4e..b181753e 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java @@ -6,7 +6,6 @@ package inr.numass.tasks; import hep.dataforge.actions.Action; -import hep.dataforge.data.Data; import hep.dataforge.data.DataNode; import hep.dataforge.data.DataTree; import hep.dataforge.meta.Meta; @@ -79,7 +78,7 @@ public class NumassFitScanTask extends AbstractTask { } @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { model.configure(meta.getMetaOrEmpty("scan")); model.configure(it->it.putNode(meta.getMetaOrEmpty("fit"))); if (meta.hasMeta("filter")) { diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java index b567fe3e..50633e25 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java @@ -50,7 +50,7 @@ public class NumassFitSummaryTask extends SingleActionTask { } @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { model.dependsOn("fit", meta, "fit"); } } diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java index 4b7b366d..2a7e3f0e 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java @@ -66,7 +66,7 @@ public class NumassFitTask extends SingleActionTask { @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { if (meta.hasMeta("filter")) { model.dependsOn("filter", meta, "prepare"); } else if (meta.hasMeta("empty")) { diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java index 7f2ba2e0..6e183357 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java @@ -85,7 +85,7 @@ public class NumassPrepareTask extends AbstractTask
{ } @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { model.configure( new MetaBuilder() .putNode(meta.getMetaOrEmpty("data")) diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java index 72cced99..67936fad 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java @@ -66,7 +66,7 @@ public class NumassSubstractEmptySourceTask extends AbstractTask
{ @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { model.dependsOn("prepare", meta, "prepare"); MetaBuilder emptyCfg = new MetaBuilder("prepare") .setNode(meta.getMeta("prepare")) diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java index e985fc5a..feda3f93 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java @@ -36,7 +36,7 @@ public class NumassTableFilterTask extends SingleActionTask { @Override - protected void updateModel(TaskModel.Builder model, Meta meta) { + protected void buildModel(TaskModel.Builder model, Meta meta) { if (meta.hasMeta("empty")) { model.dependsOn("subtractEmpty", meta, "prepare"); } else {