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

Major refactoring. Removing Content class

Browse Source
This commit is contained in:
Alexander Nozik 2016-03-09 22:27:52 +03:00
parent 98fc2a1c0b
commit 87b70a02f7
42 changed files with 140 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java
View File

@ -21,7 +21,7 @@ import hep.dataforge.control.collectors.RegularPointCollector;
import hep.dataforge.control.measurements.DataDevice; import hep.dataforge.control.measurements.DataDevice;
import hep.dataforge.control.ports.PortHandler; import hep.dataforge.control.ports.PortHandler;
import hep.dataforge.control.ports.TcpPortHandler; import hep.dataforge.control.ports.TcpPortHandler;
import hep.dataforge.data.FormatBuilder; import hep.dataforge.points.FormatBuilder;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.PortException; import hep.dataforge.exceptions.PortException;
import hep.dataforge.exceptions.StorageException; import hep.dataforge.exceptions.StorageException;

8
numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
View File

@ -22,10 +22,10 @@ import hep.dataforge.control.measurements.AbstractMeasurement;
import hep.dataforge.control.measurements.Measurement; import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.ports.PortHandler; import hep.dataforge.control.ports.PortHandler;
import hep.dataforge.control.ports.TcpPortHandler; import hep.dataforge.control.ports.TcpPortHandler;
import hep.dataforge.data.Format; import hep.dataforge.points.Format;
import hep.dataforge.data.FormatBuilder; import hep.dataforge.points.FormatBuilder;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.MeasurementException; import hep.dataforge.exceptions.MeasurementException;
import hep.dataforge.exceptions.PortException; import hep.dataforge.exceptions.PortException;

2
numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
View File

@ -17,7 +17,7 @@ package inr.numass.control.msp.fx;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.context.GlobalContext; import hep.dataforge.context.GlobalContext;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.PortException; import hep.dataforge.exceptions.PortException;
import hep.dataforge.io.MetaFileReader; import hep.dataforge.io.MetaFileReader;

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

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

6
numass-control/vac/src/main/java/inr/numass/readvac/VACFileReader.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.readvac; package inr.numass.readvac;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.io.LineIterator; import hep.dataforge.io.LineIterator;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import hep.dataforge.data.PointParser; import hep.dataforge.points.PointParser;
/** /**
* *

2
numass-control/vac/src/main/java/inr/numass/readvac/VACFrame.java
View File

@ -21,7 +21,7 @@ import ch.qos.logback.core.AppenderBase;
import ch.qos.logback.core.encoder.EchoEncoder; import ch.qos.logback.core.encoder.EchoEncoder;
import ch.qos.logback.core.encoder.Encoder; import ch.qos.logback.core.encoder.Encoder;
import hep.dataforge.context.GlobalContext; import hep.dataforge.context.GlobalContext;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.io.BasicIOManager; import hep.dataforge.io.BasicIOManager;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;

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

@ -15,8 +15,8 @@
*/ */
package inr.numass.readvac; package inr.numass.readvac;
import hep.dataforge.data.FormatBuilder; import hep.dataforge.points.FormatBuilder;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.exceptions.StorageException; import hep.dataforge.exceptions.StorageException;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.storage.api.PointLoader; import hep.dataforge.storage.api.PointLoader;

2
numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java
View File

@ -10,7 +10,7 @@ import hep.dataforge.control.collectors.ValueCollector;
import hep.dataforge.control.measurements.AbstractMeasurement; import hep.dataforge.control.measurements.AbstractMeasurement;
import hep.dataforge.control.measurements.Measurement; import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.Sensor; import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.MeasurementException; import hep.dataforge.exceptions.MeasurementException;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;

2
numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java
View File

@ -11,7 +11,7 @@ import hep.dataforge.control.devices.DeviceListener;
import hep.dataforge.control.measurements.Measurement; import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.MeasurementListener; import hep.dataforge.control.measurements.MeasurementListener;
import hep.dataforge.control.measurements.Sensor; import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.MeasurementException; import hep.dataforge.exceptions.MeasurementException;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;

4
numass-main/src/main/java/hep/dataforge/plotfit/PlotFitResultAction.java
View File

@ -17,7 +17,7 @@ package hep.dataforge.plotfit;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.datafitter.FitState; import hep.dataforge.datafitter.FitState;
import hep.dataforge.datafitter.models.XYModel; import hep.dataforge.datafitter.models.XYModel;
import hep.dataforge.description.NodeDef; import hep.dataforge.description.NodeDef;
@ -31,7 +31,7 @@ import hep.dataforge.plots.XYPlotFrame;
import hep.dataforge.plots.data.PlottableData; import hep.dataforge.plots.data.PlottableData;
import hep.dataforge.plots.data.PlottableFunction; import hep.dataforge.plots.data.PlottableFunction;
import org.apache.commons.math3.analysis.UnivariateFunction; import org.apache.commons.math3.analysis.UnivariateFunction;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

2
numass-main/src/main/java/inr/numass/NumassIO.java
View File

@ -15,8 +15,6 @@
*/ */
package inr.numass; package inr.numass;
import hep.dataforge.data.BinaryData;
import hep.dataforge.data.FileData;
import hep.dataforge.io.BasicIOManager; import hep.dataforge.io.BasicIOManager;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.names.Name; import hep.dataforge.names.Name;

9
numass-main/src/main/java/inr/numass/NumassPlugin.java
View File

@ -19,7 +19,7 @@ import hep.dataforge.actions.ActionManager;
import hep.dataforge.context.BasicPlugin; import hep.dataforge.context.BasicPlugin;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.context.PluginDef; import hep.dataforge.context.PluginDef;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.datafitter.FitManager; import hep.dataforge.datafitter.FitManager;
import hep.dataforge.datafitter.FitPlugin; import hep.dataforge.datafitter.FitPlugin;
import hep.dataforge.datafitter.models.Model; import hep.dataforge.datafitter.models.Model;
@ -53,7 +53,7 @@ import inr.numass.models.TransmissionInterpolator;
import inr.numass.models.VariableLossSpectrum; import inr.numass.models.VariableLossSpectrum;
import org.apache.commons.math3.analysis.BivariateFunction; import org.apache.commons.math3.analysis.BivariateFunction;
import org.apache.commons.math3.analysis.UnivariateFunction; import org.apache.commons.math3.analysis.UnivariateFunction;
import hep.dataforge.data.PointAdapter; import hep.dataforge.points.PointAdapter;
/** /**
* *
@ -159,7 +159,7 @@ public class NumassPlugin extends BasicPlugin {
double weightReductionFactor = an.getDouble("weightReductionFactor", 2.0); double weightReductionFactor = an.getDouble("weightReductionFactor", 2.0);
Model res = new WeightedXYModel("scatter-variable", spectrum, getAdapter(an), (dp) -> weightReductionFactor); WeightedXYModel res = new WeightedXYModel("scatter-variable", spectrum, getAdapter(an), (dp) -> weightReductionFactor);
res.setMeta(an); res.setMeta(an);
return res; return res;
}); });
@ -195,7 +195,8 @@ public class NumassPlugin extends BasicPlugin {
double weightReductionFactor = an.getDouble("weightReductionFactor", 2.0); double weightReductionFactor = an.getDouble("weightReductionFactor", 2.0);
Model res = new WeightedXYModel("scatter-empiric-experimental", spectrum, getAdapter(an), (dp) -> weightReductionFactor); WeightedXYModel res
= new WeightedXYModel("scatter-empiric-experimental", spectrum, getAdapter(an), (dp) -> weightReductionFactor);
res.setMeta(an); res.setMeta(an);
return res; return res;
}); });

8
numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java
View File

@ -7,15 +7,15 @@ package inr.numass.actions;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.io.log.Logable; import hep.dataforge.io.log.Logable;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* Adjust errors for all numass points in the dataset * Adjust errors for all numass points in the dataset

4
numass-main/src/main/java/inr/numass/actions/BorderData.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.actions; package inr.numass.actions;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;
import inr.numass.data.NMFile; import inr.numass.data.NMFile;
import inr.numass.data.NMPoint; import inr.numass.data.NMPoint;

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

@ -19,9 +19,9 @@ import hep.dataforge.actions.ManyToOneAction;
import hep.dataforge.actions.GroupBuilder; import hep.dataforge.actions.GroupBuilder;
import hep.dataforge.content.NamedGroup; import hep.dataforge.content.NamedGroup;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.description.NodeDef; import hep.dataforge.description.NodeDef;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.io.ColumnedDataWriter; import hep.dataforge.io.ColumnedDataWriter;
@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

8
numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java
View File

@ -18,9 +18,9 @@ package inr.numass.actions;
import hep.dataforge.actions.ActionResult; import hep.dataforge.actions.ActionResult;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.description.ValueDef; import hep.dataforge.description.ValueDef;
import hep.dataforge.exceptions.ContentException; import hep.dataforge.exceptions.ContentException;
@ -36,7 +36,7 @@ import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

10
numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
View File

@ -17,10 +17,10 @@ package inr.numass.actions;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.Format; import hep.dataforge.points.Format;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.description.ValueDef; import hep.dataforge.description.ValueDef;
import hep.dataforge.exceptions.ContentException; import hep.dataforge.exceptions.ContentException;
@ -35,7 +35,7 @@ import java.io.OutputStream;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

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

@ -17,7 +17,7 @@ package inr.numass.actions;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.FileData; import hep.dataforge.points.FileData;
import hep.dataforge.description.NodeDef; import hep.dataforge.description.NodeDef;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.description.ValueDef; import hep.dataforge.description.ValueDef;

8
numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java
View File

@ -17,9 +17,9 @@ package inr.numass.actions;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.datafitter.FitState; import hep.dataforge.datafitter.FitState;
import hep.dataforge.datafitter.FitTaskResult; import hep.dataforge.datafitter.FitTaskResult;
import hep.dataforge.datafitter.Param; import hep.dataforge.datafitter.Param;
@ -53,7 +53,7 @@ import org.apache.commons.math3.analysis.interpolation.UnivariateInterpolator;
import org.apache.commons.math3.stat.StatUtils; import org.apache.commons.math3.stat.StatUtils;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

6
numass-main/src/main/java/inr/numass/actions/SlicedData.java
View File

@ -15,9 +15,9 @@
*/ */
package inr.numass.actions; package inr.numass.actions;
import hep.dataforge.data.Format; import hep.dataforge.points.Format;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;
import inr.numass.data.NMFile; import inr.numass.data.NMFile;
import inr.numass.data.NMPoint; import inr.numass.data.NMPoint;

10
numass-main/src/main/java/inr/numass/actions/SummaryAction.java
View File

@ -19,10 +19,10 @@ import hep.dataforge.actions.ManyToOneAction;
import hep.dataforge.actions.GroupBuilder; import hep.dataforge.actions.GroupBuilder;
import hep.dataforge.content.NamedGroup; import hep.dataforge.content.NamedGroup;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.Format; import hep.dataforge.points.Format;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.datafitter.FitState; import hep.dataforge.datafitter.FitState;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.io.ColumnedDataWriter; import hep.dataforge.io.ColumnedDataWriter;
@ -32,7 +32,7 @@ import hep.dataforge.values.Value;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

6
numass-main/src/main/java/inr/numass/data/ESpectrum.java
View File

@ -15,9 +15,9 @@
*/ */
package inr.numass.data; package inr.numass.data;
import hep.dataforge.data.Format; import hep.dataforge.points.Format;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.io.ColumnedDataWriter; import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;
import hep.dataforge.values.ValueFormat; import hep.dataforge.values.ValueFormat;

4
numass-main/src/main/java/inr/numass/data/NMPoint.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.data; package inr.numass.data;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

2
numass-main/src/main/java/inr/numass/data/NumassDataReader.java
View File

@ -15,7 +15,7 @@
*/ */
package inr.numass.data; package inr.numass.data;
import hep.dataforge.data.BinaryData; import hep.dataforge.points.BinaryData;
import hep.dataforge.meta.MergeRule; import hep.dataforge.meta.MergeRule;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;

8
numass-main/src/main/java/inr/numass/data/SpectrumDataAdapter.java
View File

@ -15,15 +15,15 @@
*/ */
package inr.numass.data; package inr.numass.data;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.exceptions.DataFormatException; import hep.dataforge.exceptions.DataFormatException;
import hep.dataforge.exceptions.NameNotFoundException; import hep.dataforge.exceptions.NameNotFoundException;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;
import hep.dataforge.data.PointAdapter; import hep.dataforge.points.PointAdapter;
/** /**
* *

4
numass-main/src/main/java/inr/numass/data/SpectrumGenerator.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.data; package inr.numass.data;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.datafitter.ParamSet; import hep.dataforge.datafitter.ParamSet;
import hep.dataforge.datafitter.models.Generator; import hep.dataforge.datafitter.models.Generator;
import hep.dataforge.datafitter.models.XYModel; import hep.dataforge.datafitter.models.XYModel;

4
numass-main/src/main/java/inr/numass/data/SpectrumInformation.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.data; package inr.numass.data;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.functions.ParametricFunction; import hep.dataforge.functions.ParametricFunction;
import static hep.dataforge.maths.MatrixOperations.inverse; import static hep.dataforge.maths.MatrixOperations.inverse;
import hep.dataforge.maths.NamedDoubleSet; import hep.dataforge.maths.NamedDoubleSet;

4
numass-main/src/main/java/inr/numass/models/FSS.java
View File

@ -15,13 +15,13 @@
*/ */
package inr.numass.models; package inr.numass.models;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.io.IOUtils; import hep.dataforge.io.IOUtils;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.commons.math3.util.Pair; import org.apache.commons.math3.util.Pair;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

58
numass-main/src/main/java/inr/numass/models/Transmission.java
View File

@ -13,32 +13,32 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package inr.numass.models; package inr.numass.models;
import hep.dataforge.functions.ParametricFunction; import hep.dataforge.functions.ParametricFunction;
import hep.dataforge.maths.NamedDoubleSet; import hep.dataforge.maths.NamedDoubleSet;
import hep.dataforge.names.NamedSet; import org.apache.commons.math3.analysis.BivariateFunction;
import org.apache.commons.math3.analysis.BivariateFunction; import hep.dataforge.names.NameSet;
/** /**
* *
* @author Darksnake * @author Darksnake
*/ */
public interface Transmission extends NamedSet{ public interface Transmission extends NameSet{
double getValue(NamedDoubleSet set, double input, double output); double getValue(NamedDoubleSet set, double input, double output);
double getDeriv(String name, NamedDoubleSet set, double input, double output); double getDeriv(String name, NamedDoubleSet set, double input, double output);
boolean providesDeriv(String name); boolean providesDeriv(String name);
ParametricFunction getConvolutedSpectrum(RangedNamedSetSpectrum bare); ParametricFunction getConvolutedSpectrum(RangedNamedSetSpectrum bare);
default BivariateFunction getBivariateFunction(final NamedDoubleSet params){ default BivariateFunction getBivariateFunction(final NamedDoubleSet params){
return (double input, double output) -> getValue(params, input, output); return (double input, double output) -> getValue(params, input, output);
} }
default BivariateFunction getBivariateDerivFunction(final String name, final NamedDoubleSet params){ default BivariateFunction getBivariateDerivFunction(final String name, final NamedDoubleSet params){
return (double input, double output) -> getDeriv(name, params, input, output); return (double input, double output) -> getDeriv(name, params, input, output);
} }
} }

4
numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java
View File

@ -18,7 +18,7 @@ package inr.numass.models;
import hep.dataforge.actions.ActionResult; import hep.dataforge.actions.ActionResult;
import hep.dataforge.actions.RunManager; import hep.dataforge.actions.RunManager;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.io.ColumnedDataReader; import hep.dataforge.io.ColumnedDataReader;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import java.io.File; import java.io.File;
@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.commons.math3.analysis.UnivariateFunction; import org.apache.commons.math3.analysis.UnivariateFunction;
import org.apache.commons.math3.analysis.interpolation.LinearInterpolator; import org.apache.commons.math3.analysis.interpolation.LinearInterpolator;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

6
numass-main/src/main/java/inr/numass/utils/DataModelUtils.java
View File

@ -15,9 +15,9 @@
*/ */
package inr.numass.utils; package inr.numass.utils;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
/** /**

6
numass-main/src/main/java/inr/numass/utils/OldDataReader.java
View File

@ -16,9 +16,9 @@
package inr.numass.utils; package inr.numass.utils;
import hep.dataforge.context.GlobalContext; import hep.dataforge.context.GlobalContext;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import inr.numass.data.SpectrumDataAdapter; import inr.numass.data.SpectrumDataAdapter;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

8
numass-main/src/main/java/inr/numass/utils/TritiumUtils.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.utils; package inr.numass.utils;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import inr.numass.data.SpectrumDataAdapter; import inr.numass.data.SpectrumDataAdapter;
import static java.lang.Math.abs; import static java.lang.Math.abs;
import static java.lang.Math.exp; import static java.lang.Math.exp;
@ -25,6 +25,10 @@ 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;
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 static java.lang.Math.abs;
import static java.lang.Math.abs;
/** /**
* *

4
numass-prop/src/main/java/inr/numass/prop/PoissonAdapter.java
View File

@ -15,8 +15,8 @@
*/ */
package inr.numass.prop; package inr.numass.prop;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.exceptions.NameNotFoundException; import hep.dataforge.exceptions.NameNotFoundException;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;

4
numass-prop/src/main/java/inr/numass/prop/PropTest.java
View File

@ -17,7 +17,7 @@ package inr.numass.prop;
import hep.dataforge.context.GlobalContext; import hep.dataforge.context.GlobalContext;
import static hep.dataforge.context.GlobalContext.out; import static hep.dataforge.context.GlobalContext.out;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.datafitter.FitManager; import hep.dataforge.datafitter.FitManager;
import hep.dataforge.datafitter.FitState; import hep.dataforge.datafitter.FitState;
import hep.dataforge.datafitter.ParamSet; import hep.dataforge.datafitter.ParamSet;
@ -29,7 +29,7 @@ import hep.dataforge.maths.RandomUtils;
import inr.numass.models.BetaSpectrum; import inr.numass.models.BetaSpectrum;
import inr.numass.models.NBkgSpectrum; import inr.numass.models.NBkgSpectrum;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* Hello world! * Hello world!

8
numass-prop/src/main/java/inr/numass/prop/ar/FitJNAData.java
View File

@ -17,9 +17,9 @@ package inr.numass.prop.ar;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.datafitter.FitManager; import hep.dataforge.datafitter.FitManager;
import hep.dataforge.datafitter.FitPlugin; import hep.dataforge.datafitter.FitPlugin;
import hep.dataforge.datafitter.FitState; import hep.dataforge.datafitter.FitState;
@ -37,7 +37,7 @@ import inr.numass.prop.SplitNormalSpectrum;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

8
numass-prop/src/main/java/inr/numass/prop/ar/JNASpectrum.java
View File

@ -16,9 +16,9 @@
package inr.numass.prop.ar; package inr.numass.prop.ar;
import hep.dataforge.content.NamedMetaHolder; import hep.dataforge.content.NamedMetaHolder;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.description.NodeDef; import hep.dataforge.description.NodeDef;
import hep.dataforge.description.ValueDef; import hep.dataforge.description.ValueDef;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
@ -28,7 +28,7 @@ import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

6
numass-prop/src/main/java/inr/numass/prop/ar/ReadJNADataAction.java
View File

@ -17,8 +17,8 @@ package inr.numass.prop.ar;
import hep.dataforge.actions.OneToOneAction; import hep.dataforge.actions.OneToOneAction;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.FileData; import hep.dataforge.points.FileData;
import hep.dataforge.description.TypedActionDef; import hep.dataforge.description.TypedActionDef;
import hep.dataforge.description.ValueDef; import hep.dataforge.description.ValueDef;
import hep.dataforge.exceptions.ContentException; import hep.dataforge.exceptions.ContentException;
@ -38,7 +38,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Scanner; import java.util.Scanner;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

4
numass-prop/src/test/java/inr/numass/prop/TestFit.java
View File

@ -16,7 +16,7 @@
package inr.numass.prop; package inr.numass.prop;
import hep.dataforge.context.GlobalContext; import hep.dataforge.context.GlobalContext;
import hep.dataforge.data.FileData; import hep.dataforge.points.FileData;
import hep.dataforge.datafitter.MINUITPlugin; import hep.dataforge.datafitter.MINUITPlugin;
import hep.dataforge.io.ColumnedDataWriter; import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
@ -25,7 +25,7 @@ import inr.numass.prop.ar.JNAEpisode;
import inr.numass.prop.ar.ReadJNADataAction; import inr.numass.prop.ar.ReadJNADataAction;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* *

4
numass-prop/src/test/java/inr/numass/prop/TestReader.java
View File

@ -16,8 +16,8 @@
package inr.numass.prop; package inr.numass.prop;
import hep.dataforge.context.GlobalContext; import hep.dataforge.context.GlobalContext;
import hep.dataforge.data.FileData; import hep.dataforge.points.FileData;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.plots.PlotFrame; import hep.dataforge.plots.PlotFrame;

4
numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java
View File

@ -20,8 +20,8 @@ package inr.numass.viewer;
* To change this template file, choose Tools | Templates * To change this template file, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.plots.PlotUtils; import hep.dataforge.plots.PlotUtils;
import hep.dataforge.plots.data.DynamicPlottable; import hep.dataforge.plots.data.DynamicPlottable;
import hep.dataforge.plots.data.DynamicPlottableSet; import hep.dataforge.plots.data.DynamicPlottableSet;

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

@ -20,10 +20,10 @@ package inr.numass.viewer;
* To change this template file, choose Tools | Templates * To change this template file, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
import hep.dataforge.data.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.data.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.data.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.data.XYAdapter; import hep.dataforge.points.XYAdapter;
import hep.dataforge.io.ColumnedDataWriter; import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
@ -72,7 +72,7 @@ import org.controlsfx.validation.ValidationSupport;
import org.controlsfx.validation.Validator; import org.controlsfx.validation.Validator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import hep.dataforge.data.PointSet; import hep.dataforge.points.PointSet;
/** /**
* FXML Controller class * FXML Controller class