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

minor fixes

Browse Source
This commit is contained in:
Alexander Nozik 2017-09-18 16:38:44 +03:00
parent dfbc1c6f5a
commit ddb6fcdeb4
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy
View File

@ -25,18 +25,18 @@ ctx.pluginManager().load(NumassPlugin.class)
new GrindShell(ctx).eval { new GrindShell(ctx).eval {
PlotHelper plot = plots 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); NumassStorage storage = NumassStorageFactory.buildLocal(rootDir);
def set = "set_2" def set = "set_43"
def hv = 14000; def hv = 14000;
def loader = storage.provide("loader::$set", NumassSet.class).get(); def loader = storage.provide("loader::$set", NumassSet.class).get();
def point = loader.provide("$hv", NumassPoint.class).get() def point = loader.provide("$hv", NumassPoint.class).get()
def loChannel = 450; def loChannel = 450;
def upChannel = 1800; def upChannel = 3100;
def histogram = PointAnalyzer.histogram(point, loChannel, upChannel, 1, 500).asTable(); def histogram = PointAnalyzer.histogram(point, loChannel, upChannel, 1, 500).asTable();

2
numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java
View File

@ -42,7 +42,7 @@ public class NumassFitScanSummaryTask extends AbstractTask<Table> {
} }
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
model.dependsOn("fitscan", meta, "fitscan"); model.dependsOn("fitscan", meta, "fitscan");
} }

3
numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java
View File

@ -6,7 +6,6 @@
package inr.numass.tasks; package inr.numass.tasks;
import hep.dataforge.actions.Action; import hep.dataforge.actions.Action;
import hep.dataforge.data.Data;
import hep.dataforge.data.DataNode; import hep.dataforge.data.DataNode;
import hep.dataforge.data.DataTree; import hep.dataforge.data.DataTree;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
@ -79,7 +78,7 @@ public class NumassFitScanTask extends AbstractTask<FitResult> {
} }
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
model.configure(meta.getMetaOrEmpty("scan")); model.configure(meta.getMetaOrEmpty("scan"));
model.configure(it->it.putNode(meta.getMetaOrEmpty("fit"))); model.configure(it->it.putNode(meta.getMetaOrEmpty("fit")));
if (meta.hasMeta("filter")) { if (meta.hasMeta("filter")) {

2
numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java
View File

@ -50,7 +50,7 @@ public class NumassFitSummaryTask extends SingleActionTask<FitState, Table> {
} }
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
model.dependsOn("fit", meta, "fit"); model.dependsOn("fit", meta, "fit");
} }
} }

2
numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java
View File

@ -66,7 +66,7 @@ public class NumassFitTask extends SingleActionTask<Table, FitResult> {
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
if (meta.hasMeta("filter")) { if (meta.hasMeta("filter")) {
model.dependsOn("filter", meta, "prepare"); model.dependsOn("filter", meta, "prepare");
} else if (meta.hasMeta("empty")) { } else if (meta.hasMeta("empty")) {

2
numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java
View File

@ -85,7 +85,7 @@ public class NumassPrepareTask extends AbstractTask<Table> {
} }
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
model.configure( model.configure(
new MetaBuilder() new MetaBuilder()
.putNode(meta.getMetaOrEmpty("data")) .putNode(meta.getMetaOrEmpty("data"))

2
numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java
View File

@ -66,7 +66,7 @@ public class NumassSubstractEmptySourceTask extends AbstractTask<Table> {
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
model.dependsOn("prepare", meta, "prepare"); model.dependsOn("prepare", meta, "prepare");
MetaBuilder emptyCfg = new MetaBuilder("prepare") MetaBuilder emptyCfg = new MetaBuilder("prepare")
.setNode(meta.getMeta("prepare")) .setNode(meta.getMeta("prepare"))

2
numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java
View File

@ -36,7 +36,7 @@ public class NumassTableFilterTask extends SingleActionTask<Table, Table> {
@Override @Override
protected void updateModel(TaskModel.Builder model, Meta meta) { protected void buildModel(TaskModel.Builder model, Meta meta) {
if (meta.hasMeta("empty")) { if (meta.hasMeta("empty")) {
model.dependsOn("subtractEmpty", meta, "prepare"); model.dependsOn("subtractEmpty", meta, "prepare");
} else { } else {