minor fixes
This commit is contained in:
parent
dfbc1c6f5a
commit
ddb6fcdeb4
@ -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();
|
||||
|
||||
|
@ -42,7 +42,7 @@ public class NumassFitScanSummaryTask extends AbstractTask<Table> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateModel(TaskModel.Builder model, Meta meta) {
|
||||
protected void buildModel(TaskModel.Builder model, Meta meta) {
|
||||
model.dependsOn("fitscan", meta, "fitscan");
|
||||
}
|
||||
|
||||
|
@ -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<FitResult> {
|
||||
}
|
||||
|
||||
@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")) {
|
||||
|
@ -50,7 +50,7 @@ public class NumassFitSummaryTask extends SingleActionTask<FitState, Table> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateModel(TaskModel.Builder model, Meta meta) {
|
||||
protected void buildModel(TaskModel.Builder model, Meta meta) {
|
||||
model.dependsOn("fit", meta, "fit");
|
||||
}
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ public class NumassFitTask extends SingleActionTask<Table, FitResult> {
|
||||
|
||||
|
||||
@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")) {
|
||||
|
@ -85,7 +85,7 @@ public class NumassPrepareTask extends AbstractTask<Table> {
|
||||
}
|
||||
|
||||
@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"))
|
||||
|
@ -66,7 +66,7 @@ public class NumassSubstractEmptySourceTask extends AbstractTask<Table> {
|
||||
|
||||
|
||||
@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"))
|
||||
|
@ -36,7 +36,7 @@ public class NumassTableFilterTask extends SingleActionTask<Table, Table> {
|
||||
|
||||
|
||||
@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 {
|
||||
|
Loading…
Reference in New Issue
Block a user