[no commit message]

numass-control/magnet/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'application'
 
-version = "0.2.5"
+version = "0.3.0"
 
 if (!hasProperty('mainClass')) {
     ext.mainClass = 'inr.numass.control.magnet.fx.MagnetControllerApp'

numass-control/magnet/src/main/java/inr/numass/control/magnet/SetCurrent.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.control.magnet;
 
-import hep.dataforge.control.ports.PortHandler;
 import hep.dataforge.control.ports.ComPortHandler;
+import hep.dataforge.control.ports.PortHandler;
 import jssc.SerialPortException;
 
 /**

numass-control/magnet/src/main/java/inr/numass/control/magnet/VirtualLambdaPort.java

@@ -15,9 +15,9 @@
  */
 package inr.numass.control.magnet;
 
-import hep.dataforge.meta.Meta;
 import hep.dataforge.control.ports.VirtualPort;
 import hep.dataforge.exceptions.PortException;
+import hep.dataforge.meta.Meta;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;

numass-control/magnet/src/main/java/inr/numass/control/magnet/fx/MagnetControllerApp.java

@@ -32,7 +32,6 @@ import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import org.slf4j.ILoggerFactory;
 import org.slf4j.LoggerFactory;
 
 /**

numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java

@@ -15,7 +15,6 @@
  */
 package inr.numass.control.msp;
 
-import hep.dataforge.context.Context;
 import hep.dataforge.control.connections.Roles;
 import hep.dataforge.control.connections.StorageConnection;
 import hep.dataforge.control.devices.SingleMeasurementDevice;

numass-control/vac/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'application'
 
-version = "0.3.1"
+version = "0.4.0-SNAPSHOT"
 
 if (!hasProperty('mainClass')) {
     ext.mainClass = 'inr.numass.readvac.Main'

numass-control/vac/src/main/java/inr/numass/readvac/Main.java

@@ -15,11 +15,11 @@
  */
 package inr.numass.readvac;
 
-import hep.dataforge.meta.Meta;
 import hep.dataforge.context.Context;
 import hep.dataforge.context.GlobalContext;
 import static hep.dataforge.context.GlobalContext.out;
 import hep.dataforge.io.MetaFileReader;
+import hep.dataforge.meta.Meta;
 import hep.dataforge.storage.api.Storage;
 import hep.dataforge.storage.commons.StorageManager;
 import java.io.File;

numass-control/vac/src/main/java/inr/numass/readvac/VACDeviceReader.java

@@ -15,9 +15,9 @@
  */
 package inr.numass.readvac;
 
-import hep.dataforge.meta.Meta;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.MapDataPoint;
+import hep.dataforge.meta.Meta;
 import hep.dataforge.values.Value;
 import java.math.BigDecimal;
 import java.math.RoundingMode;

numass-control/vac/src/main/java/inr/numass/readvac/VACManager.java

@@ -16,9 +16,9 @@
 package inr.numass.readvac;
 
 import hep.dataforge.data.DataFormatBuilder;
-import hep.dataforge.meta.Meta;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.exceptions.StorageException;
+import hep.dataforge.meta.Meta;
 import hep.dataforge.storage.api.PointLoader;
 import hep.dataforge.storage.api.Storage;
 import hep.dataforge.storage.commons.LoaderFactory;

numass-control/vac/src/main/java/inr/numass/readvac/devices/CM32Device.java

@@ -5,15 +5,13 @@
  */
 package inr.numass.readvac.devices;
 
-import hep.dataforge.context.Context;
-import hep.dataforge.control.measurements.SimpleMeasurement;
 import hep.dataforge.control.measurements.Measurement;
 import hep.dataforge.control.measurements.Sensor;
+import hep.dataforge.control.measurements.SimpleMeasurement;
 import hep.dataforge.control.ports.ComPortHandler;
 import hep.dataforge.control.ports.PortHandler;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ControlException;
-import hep.dataforge.meta.Meta;
 
 /**
  *

numass-control/vac/src/main/java/inr/numass/readvac/devices/MKSVacDevice.java

@@ -5,15 +5,13 @@
  */
 package inr.numass.readvac.devices;
 
-import hep.dataforge.context.Context;
-import hep.dataforge.control.measurements.SimpleMeasurement;
 import hep.dataforge.control.measurements.Measurement;
 import hep.dataforge.control.measurements.Sensor;
+import hep.dataforge.control.measurements.SimpleMeasurement;
 import hep.dataforge.control.ports.ComPortHandler;
 import hep.dataforge.control.ports.PortHandler;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ControlException;
-import hep.dataforge.meta.Meta;
 import hep.dataforge.values.Value;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

numass-control/vac/src/main/java/inr/numass/readvac/devices/VITVacDevice.java

@@ -5,15 +5,13 @@
  */
 package inr.numass.readvac.devices;
 
-import hep.dataforge.context.Context;
-import hep.dataforge.control.measurements.SimpleMeasurement;
 import hep.dataforge.control.measurements.Measurement;
 import hep.dataforge.control.measurements.Sensor;
+import hep.dataforge.control.measurements.SimpleMeasurement;
 import hep.dataforge.control.ports.ComPortHandler;
 import hep.dataforge.control.ports.PortHandler;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ControlException;
-import hep.dataforge.meta.Meta;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.regex.Matcher;

numass-control/vac/src/main/java/inr/numass/readvac/test/TestVac.java

@@ -5,7 +5,6 @@
  */
 package inr.numass.readvac.test;
 
-import hep.dataforge.context.GlobalContext;
 import hep.dataforge.control.measurements.Sensor;
 import hep.dataforge.control.virtual.SensorFactory;
 import hep.dataforge.control.virtual.Virtual;
@@ -13,13 +12,10 @@ import hep.dataforge.meta.MetaBuilder;
 import inr.numass.readvac.devices.VacCollectorDevice;
 import inr.numass.readvac.fx.VacCollectorController;
 import java.time.Duration;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import org.slf4j.LoggerFactory;
 
 /**
  *

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

@@ -11,7 +11,6 @@ import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
-
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.io.log.Logable;
 import hep.dataforge.meta.Meta;

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

@@ -16,12 +16,12 @@
 package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.description.ValueDef;
-import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.context.Context;
+import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import inr.numass.data.RawNMFile;
 import inr.numass.data.RawNMPoint;
 import inr.numass.debunch.DebunchReport;

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

@@ -16,12 +16,12 @@
 package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.context.Context;
+import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import inr.numass.data.NMFile;
 import inr.numass.data.NMPoint;
 import java.io.OutputStream;

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

@@ -16,18 +16,18 @@
 package inr.numass.actions;
 
 import hep.dataforge.actions.ManyToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.content.NamedGroup;
 import hep.dataforge.content.GroupBuilder;
-import hep.dataforge.description.NodeDef;
-import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.content.NamedGroup;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
+import hep.dataforge.description.NodeDef;
+import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

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

@@ -17,17 +17,17 @@ package inr.numass.actions;
 
 import hep.dataforge.actions.ActionResult;
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
-import hep.dataforge.description.ValueDef;
 import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import hep.dataforge.values.Value;
 import java.io.OutputStream;
 import java.time.LocalDateTime;

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

@@ -16,19 +16,19 @@
 package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.description.ValueDef;
-import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataFormat;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
+import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.XMLMetaWriter;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import inr.numass.data.NMFile;
 import inr.numass.data.NMPoint;
 import inr.numass.data.RawNMPoint;

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

@@ -16,14 +16,14 @@
 package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.description.NodeDef;
-import hep.dataforge.description.ValueDef;
-import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.FileData;
+import hep.dataforge.description.NodeDef;
+import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import static inr.numass.NumassIO.getNumassData;
 import inr.numass.data.NMFile;
 import inr.numass.data.RawNMFile;

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

@@ -19,10 +19,10 @@ import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.exceptions.ContentException;
-import hep.dataforge.plots.fx.FXPlotUtils;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.log.Logable;
 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;

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

@@ -16,20 +16,20 @@
 package inr.numass.actions;
 
 import hep.dataforge.actions.ManyToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.content.NamedGroup;
 import hep.dataforge.content.GroupBuilder;
-import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.content.NamedGroup;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataFormat;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
-import hep.dataforge.values.Value;
 import hep.dataforge.datafitter.FitState;
+import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
+import hep.dataforge.values.Value;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;

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

@@ -18,11 +18,11 @@ package inr.numass.data;
 import hep.dataforge.data.DataFormat;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
+import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.values.Value;
 import hep.dataforge.values.ValueFormat;
 import hep.dataforge.values.ValueFormatFactory;
 import hep.dataforge.values.ValueType;
-import hep.dataforge.io.ColumnedDataWriter;
 import java.io.OutputStream;
 import static java.lang.String.format;
 import java.util.ArrayList;
@@ -30,9 +30,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import static java.lang.String.format;
-import static java.lang.String.format;
-import static java.lang.String.format;
 
 /**
  *

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

@@ -20,10 +20,10 @@ import hep.dataforge.data.MapDataPoint;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
+import static java.util.Arrays.sort;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import static java.util.Arrays.sort;
 
 /**
  *

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

@@ -16,12 +16,12 @@
 package inr.numass.data;
 
 import hep.dataforge.data.DataAdapter;
-import hep.dataforge.meta.Meta;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.MapDataPoint;
 import hep.dataforge.data.XYDataAdapter;
 import hep.dataforge.exceptions.DataFormatException;
 import hep.dataforge.exceptions.NameNotFoundException;
+import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.values.Value;
 

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

@@ -27,7 +27,6 @@ import java.util.Iterator;
 import org.apache.commons.math3.random.JDKRandomGenerator;
 import org.apache.commons.math3.random.RandomDataGenerator;
 import org.apache.commons.math3.random.RandomGenerator;
-import static java.lang.Double.isNaN;
 
 /**
  * Генератор наборов данных для спектров. На входе требуется набор данных,

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

@@ -21,9 +21,6 @@ import static java.lang.Math.max;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import static java.lang.Math.max;
-import static java.lang.Math.max;
-import static java.lang.Math.max;
 
 /**
  *

numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java

@@ -15,12 +15,10 @@
  */
 package inr.numass.models;
 
-import hep.dataforge.context.GlobalContext;
 import hep.dataforge.functions.AbstractParametricFunction;
 import static hep.dataforge.functions.FunctionUtils.getSpectrumDerivativeFunction;
 import static hep.dataforge.functions.FunctionUtils.getSpectrumFunction;
 import hep.dataforge.functions.ParametricFunction;
-import hep.dataforge.io.log.Logable;
 import hep.dataforge.maths.NamedDoubleArray;
 import hep.dataforge.maths.NamedDoubleSet;
 import hep.dataforge.names.AbstractNamedSet;

numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java

@@ -17,12 +17,11 @@ package inr.numass.models;
 
 import hep.dataforge.actions.ActionResult;
 import hep.dataforge.actions.RunManager;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.context.Context;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.io.ColumnedDataReader;
+import hep.dataforge.meta.Meta;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;

numass-main/src/main/java/inr/numass/models/TritiumSpectrumCaching.java

@@ -15,15 +15,10 @@
  */
 package inr.numass.models;
 
-import hep.dataforge.context.GlobalContext;
 import hep.dataforge.functions.ParametricFunction;
-import hep.dataforge.io.log.Logable;
 import hep.dataforge.maths.NamedDoubleArray;
 import hep.dataforge.maths.NamedDoubleSet;
 import static java.lang.Math.abs;
-import static java.lang.Math.abs;
-import static java.lang.Math.abs;
-import static java.lang.Math.abs;
 import org.slf4j.LoggerFactory;
 
 /**

numass-main/src/main/java/inr/numass/utils/OldDataReader.java

@@ -23,8 +23,8 @@ import inr.numass.data.SpectrumDataAdapter;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Locale;
-import java.util.Scanner;
 import static java.util.Locale.setDefault;
+import java.util.Scanner;
 
 /**
  *

numass-main/src/main/java/inr/numass/utils/TritiumUtils.java

@@ -18,13 +18,10 @@ package inr.numass.utils;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.ListDataSet;
 import inr.numass.data.SpectrumDataAdapter;
+import static java.lang.Math.abs;
 import static java.lang.Math.exp;
 import static java.lang.Math.sqrt;
 import org.apache.commons.math3.analysis.UnivariateFunction;
-import static java.lang.Math.abs;
-import static java.lang.Math.abs;
-import static java.lang.Math.abs;
-import static java.lang.Math.abs;
 
 /**
  *

numass-main/src/main/java/inr/numass/workbench/PlotOutputTab.java

@@ -5,8 +5,8 @@
  */
 package inr.numass.workbench;
 
-import hep.dataforge.plots.fx.PlotContainer;
 import hep.dataforge.meta.Meta;
+import hep.dataforge.plots.fx.PlotContainer;
 import hep.dataforge.plots.jfreechart.JFreeChartFrame;
 
 public class PlotOutputTab extends OutputTab {

numass-main/src/test/java/inr/numass/run/NumassSpectrumTest.java

@@ -24,69 +24,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Locale;
 import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
-import static java.util.Locale.setDefault;
 
 /**
  *

numass-prop/src/main/java/inr/numass/prop/PropTest.java

@@ -25,7 +25,6 @@ import hep.dataforge.datafitter.ParamSet;
 import hep.dataforge.datafitter.models.HistogramGenerator;
 import hep.dataforge.datafitter.models.HistogramModel;
 import hep.dataforge.functions.ParametricFunction;
-import hep.dataforge.io.log.Log;
 import hep.dataforge.maths.MatrixOperations;
 import hep.dataforge.maths.RandomUtils;
 import inr.numass.models.BetaSpectrum;

numass-prop/src/main/java/inr/numass/prop/ar/FitJNAData.java

@@ -16,7 +16,6 @@
 package inr.numass.prop.ar;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
@@ -28,12 +27,12 @@ import hep.dataforge.datafitter.FitState;
 import hep.dataforge.datafitter.ParamSet;
 import hep.dataforge.datafitter.models.Model;
 import hep.dataforge.datafitter.models.XYModel;
-import hep.dataforge.description.ValueDef;
 import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.io.log.Log;
 import hep.dataforge.io.log.Logable;
-import hep.dataforge.values.ValueType;
+import hep.dataforge.meta.Meta;
 import inr.numass.prop.PoissonAdapter;
 import inr.numass.prop.SplitNormalSpectrum;
 import java.io.OutputStream;

numass-prop/src/main/java/inr/numass/prop/ar/JNAEpisode.java

@@ -15,8 +15,8 @@
  */
 package inr.numass.prop.ar;
 
-import hep.dataforge.meta.Meta;
 import hep.dataforge.content.NamedMetaHolder;
+import hep.dataforge.meta.Meta;
 import java.util.Iterator;
 import java.util.List;
 

numass-prop/src/main/java/inr/numass/prop/ar/JNASpectrum.java

@@ -15,15 +15,15 @@
  */
 package inr.numass.prop.ar;
 
-import hep.dataforge.meta.Meta;
-import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.content.NamedMetaHolder;
-import hep.dataforge.description.NodeDef;
-import hep.dataforge.description.ValueDef;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.ListDataSet;
 import hep.dataforge.data.MapDataPoint;
+import hep.dataforge.description.NodeDef;
+import hep.dataforge.description.ValueDef;
+import hep.dataforge.meta.Meta;
+import hep.dataforge.meta.MetaBuilder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;

numass-prop/src/main/java/inr/numass/prop/ar/MergeJNADataAction.java

@@ -16,11 +16,11 @@
 package inr.numass.prop.ar;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
 import hep.dataforge.context.Context;
-import hep.dataforge.description.ValueDef;
 import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.io.log.Logable;
+import hep.dataforge.meta.Meta;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

numass-prop/src/main/java/inr/numass/prop/ar/ReadJNADataAction.java

@@ -16,19 +16,18 @@
 package inr.numass.prop.ar;
 
 import hep.dataforge.actions.OneToOneAction;
-import hep.dataforge.meta.Meta;
-import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.context.Context;
 import hep.dataforge.data.DataPoint;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.FileData;
-import hep.dataforge.description.ValueDef;
 import hep.dataforge.description.TypedActionDef;
+import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
 import hep.dataforge.io.ColumnedDataReader;
 import hep.dataforge.io.IOUtils;
 import hep.dataforge.io.log.Logable;
-import hep.dataforge.values.ValueType;
+import hep.dataforge.meta.Meta;
+import hep.dataforge.meta.MetaBuilder;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;

numass-prop/src/test/java/inr/numass/prop/TestFit.java

@@ -15,12 +15,12 @@
  */
 package inr.numass.prop;
 
-import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.context.GlobalContext;
 import hep.dataforge.data.DataSet;
 import hep.dataforge.data.FileData;
 import hep.dataforge.datafitter.MINUITPlugin;
 import hep.dataforge.io.ColumnedDataWriter;
+import hep.dataforge.meta.MetaBuilder;
 import inr.numass.prop.ar.FitJNAData;
 import inr.numass.prop.ar.JNAEpisode;
 import inr.numass.prop.ar.ReadJNADataAction;

numass-prop/src/test/java/inr/numass/prop/TestReader.java

@@ -15,17 +15,17 @@
  */
 package inr.numass.prop;
 
-import hep.dataforge.meta.Meta;
-import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.context.GlobalContext;
 import hep.dataforge.data.FileData;
 import hep.dataforge.data.XYDataAdapter;
+import hep.dataforge.meta.Meta;
+import hep.dataforge.meta.MetaBuilder;
+import hep.dataforge.plots.PlotFrame;
+import hep.dataforge.plots.data.PlottableData;
 import hep.dataforge.plots.fx.FXPlotUtils;
 import inr.numass.prop.ar.JNAEpisode;
 import inr.numass.prop.ar.JNASpectrum;
 import inr.numass.prop.ar.ReadJNADataAction;
-import hep.dataforge.plots.PlotFrame;
-import hep.dataforge.plots.data.PlottableData;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Map;

numass-storage/numass-server/src/main/java/inr/numass/server/HandlerUtils.java

@@ -5,10 +5,7 @@
  */
 package inr.numass.server;
 
-import hep.dataforge.exceptions.StorageException;
-import hep.dataforge.storage.api.Loader;
 import hep.dataforge.storage.api.StateLoader;
-import hep.dataforge.storage.api.Storage;
 import hep.dataforge.values.Value;
 
 /**