Descriptor fixes

This commit is contained in:
darksnake 2016-09-07 16:48:25 +03:00
parent ffbf97dc0c
commit efc6a5bb8b
2 changed files with 11 additions and 4 deletions

View File

@ -2,17 +2,14 @@ package inr.numass
import hep.dataforge.grind.GrindLauncher import hep.dataforge.grind.GrindLauncher
import hep.dataforge.grind.GrindShell import hep.dataforge.grind.GrindShell
import hep.dataforge.workspace.Workspace
/** /**
* Created by darksnake on 29-Aug-16. * Created by darksnake on 29-Aug-16.
*/ */
new GrindShell().start { new GrindShell().start {
Workspace numass = new GrindLauncher() GrindLauncher numass = new GrindLauncher()
.withSpec(NumassWorkspaceSpec) .withSpec(NumassWorkspaceSpec)
.from(new File("D:\\Work\\Numass\\sterile2016\\workspace.groovy")) .from(new File("D:\\Work\\Numass\\sterile2016\\workspace.groovy"))
.buildWorkspace()
setContext(numass.getContext())
bind("numass", numass) bind("numass", numass)
} }

View File

@ -9,6 +9,8 @@ import hep.dataforge.actions.Action;
import hep.dataforge.computation.ProgressCallback; import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.*; import hep.dataforge.data.*;
import hep.dataforge.description.DescriptorBuilder;
import hep.dataforge.description.NodeDescriptor;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.meta.Template; import hep.dataforge.meta.Template;
@ -166,4 +168,12 @@ public class NumassPrepareTask extends AbstractTask<Table> {
return "numass.prepare"; return "numass.prepare";
} }
@Override
public NodeDescriptor getDescriptor() {
return new DescriptorBuilder(getName())
.addNode("prepare", PrepareDataAction.class)
.addNode("monitor", MonitorCorrectAction.class)
.addNode("merge", MergeDataAction.class)
.build();
}
} }