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

Update in data loaders and exec action

Browse Source
This commit is contained in:
Alexander Nozik 2017-08-30 19:05:58 +03:00
parent fedff5f651
commit 789e8b04c8
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.gradle
View File

@ -25,19 +25,3 @@ subprojects {
} }
} }
// id 'project-report'
// id 'build-dashboard'
//htmlDependencyReport {
// projects = project.allprojects
//}
task wrapper(type: Wrapper) {
gradleVersion = '3.5.0'
}

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

@ -35,7 +35,7 @@ import java.util.*;
* @author Darksnake * @author Darksnake
*/ */
@TypedActionDef(name = "numass.merge", inputType = Table.class, outputType = Table.class, info = "Merge different numass data files into one.") @TypedActionDef(name = "numass.merge", inputType = Table.class, outputType = Table.class, info = "Merge different numass data files into one.")
@NodeDef(name = "grouping", info = "The definition of grouping rule for this merge", target = "method::hep.dataforge.actions.GroupBuilder.byMeta") @NodeDef(name = "grouping", info = "The definition of grouping rule for this merge", from = "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";

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

@ -34,7 +34,7 @@ import static inr.numass.utils.NumassUtils.pointExpression;
@ValueDef(name = "correction", @ValueDef(name = "correction",
info = "An expression to correct count number depending on potential `U`, point length `T` and point itself as `point`") info = "An expression to correct count number depending on potential `U`, point length `T` and point itself as `point`")
@ValueDef(name = "utransform", info = "Expression for voltage transformation. Uses U as input") @ValueDef(name = "utransform", info = "Expression for voltage transformation. Uses U as input")
@NodeDef(name = "correction", multiple = true, target = "method::inr.numass.actions.TransformDataAction.makeCorrection") @NodeDef(name = "correction", multiple = true, from = "method::inr.numass.actions.TransformDataAction.makeCorrection")
public class TransformDataAction extends OneToOneAction<Table, Table> { public class TransformDataAction extends OneToOneAction<Table, Table> {
@Override @Override