minor refactoring

numass-main/build.gradle

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

numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy

@@ -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"
 }

numass-main/src/main/java/inr/numass/workspace/NumassFitScanSummaryTask.java

@@ -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;

numass-main/src/main/java/inr/numass/workspace/NumassFitScanTask.java

@@ -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;

numass-main/src/main/java/inr/numass/workspace/NumassPrepareTask.java

@@ -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;

numass-main/src/main/java/inr/numass/workspace/NumassSubstractEmptySourceTask.java

@@ -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;

numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java

@@ -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;

numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java

@@ -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;

numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java

@@ -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;