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

[no commit message]

Browse Source
This commit is contained in:
Alexander Nozik 2016-07-31 12:28:51 +03:00
parent 75e026d44f
commit e6de0037ae
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
View File

@ -42,7 +42,7 @@ import java.util.Map;
* @author Darksnake * @author Darksnake
*/ */
@TypedActionDef(name = "merge", inputType = Table.class, outputType = Table.class, info = "Merge different numass data files into one.") @TypedActionDef(name = "merge", inputType = Table.class, outputType = Table.class, info = "Merge different numass data files into one.")
@NodeDef(name = "grouping", info = "The defenition of grouping rule for this merge", target = "method::hep.dataforge.actions.GroupBuilder.byAnnotation") @NodeDef(name = "grouping", info = "The defenition of grouping rule for this merge", target = "method::hep.dataforge.actions.GroupBuilder.byMeta")
public class MergeDataAction extends ManyToOneAction<Table, Table> { public class MergeDataAction extends ManyToOneAction<Table, Table> {
public static final String MERGE_NAME = "mergeName"; public static final String MERGE_NAME = "mergeName";

1
numass-main/src/main/java/inr/numass/actions/ReadNumassStorageAction.java
View File

@ -41,6 +41,7 @@ public class ReadNumassStorageAction extends GenericAction<Void, NumassData> {
boolean forwardOnly = actionMeta.getBoolean("forwardOnly", false); boolean forwardOnly = actionMeta.getBoolean("forwardOnly", false);
boolean reverseOnly = actionMeta.getBoolean("reverseOnly", false); boolean reverseOnly = actionMeta.getBoolean("reverseOnly", false);
//FIXME make Work actually submitted only when calculation starts
Work<DataSet<NumassData>> process = getContext().workManager() Work<DataSet<NumassData>> process = getContext().workManager()
.<DataSet<NumassData>>post(getName(), (Callback callback) -> { .<DataSet<NumassData>>post(getName(), (Callback callback) -> {
//FIXME remove in later revisions //FIXME remove in later revisions