[no commit message]

numass-main/build.gradle

@@ -16,8 +16,8 @@ dependencies {
     compile group: 'commons-io', name: 'commons-io', version:'2.+'
     compile project(':dataforge-fitting:dataforge-minuit')
     compile project(':dataforge-fx')
-    compile project(':dataforge-grind')
     compile project(':dataforge-plots')
+    compile project(':numass-storage')
 }
 
 task runNumass(dependsOn: classes, type : JavaExec){

numass-main/gradle.properties

@@ -1,15 +0,0 @@
-# 
-# Copyright 2015 Alexander Nozik.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 

numass-main/src/main/java/inr/numass/NumassIO.java

@@ -20,9 +20,9 @@ import hep.dataforge.data.binary.Binary;
 import hep.dataforge.io.BasicIOManager;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.names.Name;
-import inr.numass.data.NumassDataReader;
+import inr.numass.storage.NumassDataReader;
 import inr.numass.data.NumassPawReader;
-import inr.numass.data.RawNMFile;
+import inr.numass.storage.RawNMFile;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;

numass-main/src/main/java/inr/numass/WorkspaceTest.java

@@ -0,0 +1,32 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package inr.numass;
+
+import hep.dataforge.meta.MetaBuilder;
+import hep.dataforge.storage.commons.StorageDataFactory;
+import hep.dataforge.workspace.BasicWorkspace;
+import hep.dataforge.workspace.Workspace;
+
+/**
+ *
+ * @author Alexander Nozik
+ */
+public class WorkspaceTest {
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        
+        String storagepath = "D:\\Work\\Numass\\data\\";
+        Workspace workspace = BasicWorkspace.builder()
+                .setContext(new NumassContext())
+                .loadData("", new StorageDataFactory(), new MetaBuilder("storage").putValue("path", storagepath))
+                
+                .build();
+    }
+    
+}

numass-main/src/main/java/inr/numass/actions/BorderData.java

@@ -18,8 +18,8 @@ package inr.numass.actions;
 import hep.dataforge.tables.MapPoint;
 import hep.dataforge.tables.SimplePointSource;
 import hep.dataforge.values.Value;
-import inr.numass.data.NMFile;
-import inr.numass.data.NMPoint;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.NMPoint;
 import java.util.HashMap;
 import java.util.Map;
 

numass-main/src/main/java/inr/numass/actions/DebunchAction.java

@@ -22,8 +22,8 @@ import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.reports.Reportable;
 import hep.dataforge.meta.Laminate;
-import inr.numass.data.RawNMFile;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.RawNMFile;
+import inr.numass.storage.RawNMPoint;
 import inr.numass.debunch.DebunchReport;
 import inr.numass.debunch.FrameAnalizer;
 import java.io.PrintWriter;

numass-main/src/main/java/inr/numass/actions/FindBorderAction.java

@@ -22,8 +22,8 @@ import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.reports.Reportable;
 import hep.dataforge.meta.Laminate;
-import inr.numass.data.NMFile;
-import inr.numass.data.NMPoint;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.NMPoint;
 import java.io.OutputStream;
 
 /**

numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java

@@ -30,9 +30,9 @@ import hep.dataforge.tables.ListTable;
 import hep.dataforge.tables.MapPoint;
 import hep.dataforge.tables.Table;
 import hep.dataforge.tables.TableFormat;
-import inr.numass.data.NMFile;
-import inr.numass.data.NMPoint;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.NMPoint;
+import inr.numass.storage.RawNMPoint;
 import java.io.OutputStream;
 import java.time.Instant;
 import java.util.ArrayList;

numass-main/src/main/java/inr/numass/actions/ReadNumassDataAction.java

@@ -25,8 +25,8 @@ import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.reports.Reportable;
 import hep.dataforge.meta.Laminate;
 import static inr.numass.NumassIO.getNumassData;
-import inr.numass.data.NMFile;
-import inr.numass.data.RawNMFile;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.RawNMFile;
 
 /**
  *

numass-main/src/main/java/inr/numass/actions/ShowSpectrumAction.java

@@ -26,8 +26,8 @@ import hep.dataforge.meta.Meta;
 import hep.dataforge.plots.fx.FXPlotUtils;
 import hep.dataforge.plots.jfreechart.JFreeChartFrame;
 import inr.numass.data.ESpectrum;
-import inr.numass.data.NMFile;
-import inr.numass.data.NMPoint;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.NMPoint;
 import java.awt.Color;
 import java.io.OutputStream;
 import java.util.ArrayList;

numass-main/src/main/java/inr/numass/actions/SlicedData.java

@@ -19,8 +19,8 @@ import hep.dataforge.tables.MapPoint;
 import hep.dataforge.tables.SimplePointSource;
 import hep.dataforge.tables.TableFormat;
 import hep.dataforge.values.Value;
-import inr.numass.data.NMFile;
-import inr.numass.data.NMPoint;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.NMPoint;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

numass-main/src/main/java/inr/numass/actions/SlicingAction.java

@@ -23,8 +23,8 @@ import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.reports.Reportable;
 import hep.dataforge.meta.Laminate;
 import hep.dataforge.meta.Meta;
-import inr.numass.data.NMFile;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMFile;
+import inr.numass.storage.RawNMPoint;
 import java.io.OutputStream;
 import java.util.LinkedHashMap;
 import java.util.List;

numass-main/src/main/java/inr/numass/data/ESpectrum.java

@@ -15,6 +15,7 @@
  */
 package inr.numass.data;
 
+import inr.numass.storage.NMPoint;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.tables.MapPoint;
 import hep.dataforge.tables.SimplePointSource;

numass-main/src/main/java/inr/numass/data/NumassPawReader.java

@@ -15,6 +15,7 @@
  */
 package inr.numass.data;
 
+import inr.numass.storage.RawNMFile;
 import hep.dataforge.data.binary.Binary;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

numass-main/src/main/java/inr/numass/debunch/DebunchData.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.NMEvent;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMPoint;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

numass-main/src/main/java/inr/numass/debunch/DebunchEvent.java

@@ -15,7 +15,7 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.NMEvent;
+import inr.numass.storage.NMEvent;
 
 /**
  *

numass-main/src/main/java/inr/numass/debunch/DebunchReport.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.NMEvent;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMPoint;
 import java.util.List;
 
 /**

numass-main/src/main/java/inr/numass/debunch/DebunchReportImpl.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.NMEvent;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMPoint;
 import java.util.ArrayList;
 import java.util.List;
 

numass-main/src/main/java/inr/numass/debunch/Debuncher.java

@@ -15,7 +15,7 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.RawNMPoint;
 
 /**
  *

numass-main/src/main/java/inr/numass/debunch/Frame.java

@@ -15,7 +15,7 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.NMEvent;
+import inr.numass.storage.NMEvent;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.math3.distribution.PoissonDistribution;

numass-main/src/main/java/inr/numass/debunch/FrameAnalizer.java

@@ -15,7 +15,7 @@
  */
 package inr.numass.debunch;
 
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.RawNMPoint;
 import org.apache.commons.math3.analysis.UnivariateFunction;
 import org.apache.commons.math3.analysis.interpolation.LinearInterpolator;
 import org.apache.commons.math3.util.FastMath;

numass-main/src/main/java/inr/numass/generators/BunchGenerator.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.generators;
 
-import inr.numass.data.NMEvent;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMPoint;
 import java.util.ArrayList;
 import org.apache.commons.math3.random.MersenneTwister;
 import org.apache.commons.math3.random.RandomGenerator;

numass-main/src/main/java/inr/numass/generators/EventChainGenerator.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.generators;
 
-import inr.numass.data.NMEvent;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMPoint;
 import static java.lang.Math.max;
 import java.util.ArrayList;
 import java.util.List;

numass-main/src/main/java/inr/numass/generators/EventGenerator.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.generators;
 
-import inr.numass.data.NMEvent;
-import inr.numass.data.RawNMPoint;
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMPoint;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

numass-storage/build.gradle

@@ -1,10 +1,4 @@
-configurations{
-    all*.exclude module: 'commons-math3'
-    all*.exclude group: 'org.jfree'    
-}
-
 dependencies {
-    compile(project(':numass-main')){transitive = false}
     compile project(':dataforge-storage')
     compile project(':dataforge-grind')
 }

numass-storage/numass-client/build.gradle

@@ -18,8 +18,7 @@ task runClient(type: JavaExec) {
 }
 
 dependencies {
-    compile(project(':numass-storage')){transitive = false}
-    compile project(':dataforge-storage')
+    compile(project(':numass-storage'))
     compile 'commons-cli:commons-cli:1.3.1'
     compile 'org.zeroturnaround:zt-zip:1.9'
 }

numass-storage/src/main/java/inr/numass/storage/NMEvent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
 /**
  *

numass-storage/src/main/java/inr/numass/storage/NMFile.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.meta.Meta;

numass-storage/src/main/java/inr/numass/storage/NMPoint.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
 import hep.dataforge.tables.DataPoint;
 import hep.dataforge.tables.MapPoint;

numass-storage/src/main/java/inr/numass/storage/NumassData.java

@@ -3,8 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
+import inr.numass.storage.NMPoint;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.names.Named;
 import java.time.Instant;

numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java

@@ -24,10 +24,6 @@ import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.storage.api.ObjectLoader;
 import hep.dataforge.storage.api.Storage;
 import hep.dataforge.storage.loaders.AbstractLoader;
-import inr.numass.data.NMEvent;
-import inr.numass.data.NMPoint;
-import inr.numass.data.NumassData;
-import inr.numass.data.RawNMPoint;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

numass-storage/src/main/java/inr/numass/storage/NumassDataReader.java

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
+import inr.numass.storage.NMEvent;
+import inr.numass.storage.RawNMFile;
+import inr.numass.storage.RawNMPoint;
 import hep.dataforge.data.FileDataFactory;
 import hep.dataforge.data.binary.Binary;
 import hep.dataforge.meta.Meta;

numass-storage/src/main/java/inr/numass/storage/NumassStorage.java

@@ -22,8 +22,6 @@ import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.storage.filestorage.FileStorage;
 import hep.dataforge.storage.filestorage.VFSUtils;
-import inr.numass.data.NMFile;
-import inr.numass.data.NumassData;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

numass-storage/src/main/java/inr/numass/storage/RawNMFile.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
 import hep.dataforge.names.NamedMetaHolder;
 import java.io.BufferedOutputStream;
@@ -109,7 +109,7 @@ public class RawNMFile extends NamedMetaHolder {
         return points;
     }
 
-    void putEvent(double U, short chanel, double time) {
+    public void putEvent(double U, short chanel, double time) {
         for (RawNMPoint point : this.getData()) {
             if (U == point.getUread()) {
                 point.putEvent(new NMEvent(chanel, time));

numass-storage/src/main/java/inr/numass/storage/RawNMPoint.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.data;
+package inr.numass.storage;
 
 import java.time.Instant;
 import java.util.ArrayList;

numass-viewer/build.gradle

@@ -11,8 +11,6 @@ description = "The viewer for numass data"
 
 dependencies {
     compile project(':numass-main')
-//    compile project(':dataforge-storage')
-    compile project(':numass-storage')
     compile project(':dataforge-fx')
     compile 'com.jcraft:jsch:0.1.53'
 }

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

@@ -21,7 +21,7 @@ import hep.dataforge.context.ProcessManager;
 import hep.dataforge.exceptions.StorageException;
 import hep.dataforge.fx.ConsoleFragment;
 import hep.dataforge.fx.ProcessManagerFragment;
-import inr.numass.data.NumassData;
+import inr.numass.storage.NumassData;
 import inr.numass.storage.NumassStorage;
 import java.io.File;
 import java.net.URL;

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

@@ -19,7 +19,7 @@ import hep.dataforge.context.ProcessManager;
 import hep.dataforge.exceptions.StorageException;
 import hep.dataforge.storage.api.Loader;
 import hep.dataforge.storage.api.Storage;
-import inr.numass.data.NumassData;
+import inr.numass.storage.NumassData;
 import inr.numass.storage.NumassStorage;
 import java.time.Instant;
 import java.util.ArrayList;

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

@@ -37,8 +37,8 @@ import hep.dataforge.tables.ListTable;
 import hep.dataforge.tables.MapPoint;
 import hep.dataforge.tables.Table;
 import hep.dataforge.tables.XYAdapter;
-import inr.numass.data.NMPoint;
-import inr.numass.data.NumassData;
+import inr.numass.storage.NMPoint;
+import inr.numass.storage.NumassData;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;