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

minor refactoring

Browse Source
This commit is contained in:
darksnake 2016-12-21 16:39:28 +03:00
parent 6cd3ef7846
commit 4f60d08b24
9 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-main/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'application'
if (!hasProperty('mainClass')) {
ext.mainClass = 'inr.numass.Main'
ext.mainClass = 'inr.numass.LaunchGrindShell'
}
mainClassName = mainClass

3
numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy
View File

@ -15,7 +15,8 @@ import inr.numass.utils.UnderflowCorrection
//File dataDir = new File("D:\\Work\\Numass\\data\\2016_04\\T2_data\\Fill_2_2\\set_7_b2a3433e54010000")
//File dataDir = new File("D:\\Work\\Numass\\data\\2016_04\\T2_data\\Fill_2_2\\set_6_e26d123e54010000")
File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Fill_1\\set_28")
//File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Fill_1\\set_28")
File dataDir = new File("D:\\Work\\Numass\\data\\2016_10\\Adiabacity_19kV_4_dark\\set_1")
if(!dataDir.exists()){
println "dataDir directory does not exist"
}

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

@ -7,11 +7,11 @@ package inr.numass.workspace;
import hep.dataforge.actions.Action;
import hep.dataforge.actions.ManyToOneAction;
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.context.Context;
import hep.dataforge.data.DataNode;
import hep.dataforge.data.DataSet;
import hep.dataforge.description.TypedActionDef;
import hep.dataforge.goals.ProgressCallback;
import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.meta.Meta;
import hep.dataforge.stat.fit.FitState;

2
numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java
View File

@ -6,9 +6,9 @@
package inr.numass.workspace;
import hep.dataforge.actions.Action;
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.data.DataNode;
import hep.dataforge.data.DataTree;
import hep.dataforge.goals.ProgressCallback;
import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.stat.fit.FitAction;

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

@ -6,11 +6,11 @@
package inr.numass.workspace;
import hep.dataforge.actions.GenericAction;
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.context.Context;
import hep.dataforge.data.*;
import hep.dataforge.description.DescriptorBuilder;
import hep.dataforge.description.NodeDescriptor;
import hep.dataforge.goals.ProgressCallback;
import hep.dataforge.meta.Meta;
import hep.dataforge.meta.Template;
import hep.dataforge.storage.api.Loader;

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

@ -16,11 +16,11 @@
package inr.numass.workspace;
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.data.Data;
import hep.dataforge.data.DataNode;
import hep.dataforge.data.DataTree;
import hep.dataforge.data.DataUtils;
import hep.dataforge.goals.ProgressCallback;
import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder;

2
numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java
View File

@ -15,13 +15,13 @@
*/
package inr.numass.viewer;
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.context.Context;
import hep.dataforge.context.Global;
import hep.dataforge.exceptions.StorageException;
import hep.dataforge.fx.fragments.FragmentWindow;
import hep.dataforge.fx.fragments.LogFragment;
import hep.dataforge.fx.work.WorkManagerFragment;
import hep.dataforge.goals.ProgressCallback;
import inr.numass.NumassProperties;
import inr.numass.storage.NumassData;
import inr.numass.storage.NumassStorage;

2
numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java
View File

@ -15,8 +15,8 @@
*/
package inr.numass.viewer;
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.exceptions.StorageException;
import hep.dataforge.goals.ProgressCallback;
import inr.numass.storage.NumassData;
import inr.numass.storage.NumassStorage;
import javafx.application.Platform;

2
numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
View File

@ -21,8 +21,8 @@ package inr.numass.viewer;
* and open the template in the editor.
*/
import hep.dataforge.computation.ProgressCallback;
import hep.dataforge.context.Context;
import hep.dataforge.goals.ProgressCallback;
import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder;