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

Plots structure update

Browse Source
This commit is contained in:
Alexander Nozik 2017-10-12 22:05:54 +03:00
parent ad73dc8fe6
commit 7ba31edb13
21 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8ViewConnection.kt
View File

@ -10,8 +10,6 @@ import hep.dataforge.meta.Meta
import hep.dataforge.plots.PlotUtils
import hep.dataforge.plots.data.TimePlot
import hep.dataforge.plots.data.TimePlottableGroup
import hep.dataforge.plots.fx.FXPlotFrame
import hep.dataforge.plots.fx.PlotContainer
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import inr.numass.control.DeviceViewConnection
import javafx.application.Platform

2
numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspViewConnection.kt
View File

@ -26,8 +26,6 @@ import hep.dataforge.meta.MetaBuilder
import hep.dataforge.plots.PlotUtils
import hep.dataforge.plots.data.TimePlot
import hep.dataforge.plots.data.TimePlottableGroup
import hep.dataforge.plots.fx.FXPlotFrame
import hep.dataforge.plots.fx.PlotContainer
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.values.Value
import inr.numass.control.DeviceViewConnection

1
numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt
View File

@ -3,7 +3,6 @@ package inr.numass.control
import hep.dataforge.kodex.KMetaBuilder
import hep.dataforge.plots.Plot
import hep.dataforge.plots.PlotFrame
import hep.dataforge.plots.fx.PlotContainer
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.values.Value
import javafx.beans.value.ObservableValue

1
numass-main/src/main/groovy/inr/numass/scripts/ShowTransmission.groovy
View File

@ -4,7 +4,6 @@ import hep.dataforge.context.Context
import hep.dataforge.context.Global
import hep.dataforge.grind.GrindShell
import hep.dataforge.grind.helpers.PlotHelper
import hep.dataforge.plots.fx.FXPlotManager
import hep.dataforge.stat.fit.ParamSet
import inr.numass.NumassPlugin
import inr.numass.models.sterile.NumassResolution

2
numass-main/src/main/groovy/inr/numass/scripts/SignificanceTest.groovy
View File

@ -90,7 +90,7 @@ SpectrumInformation sign = new SpectrumInformation(spectrum);
// cov = sign.getExpetedCovariance(allPars, config,"U2","E0","N","X");
//
// printNamedMatrix(out, cov);
//PlotManager pm = new PlotManager();
//PlotPlugin pm = new PlotPlugin();
Map<String, UnivariateFunction> functions = new HashMap<>();

2
numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy
View File

@ -66,7 +66,7 @@ allPars.setParValue("trap", 1d);
allPars.setParError("trap", 0.01d);
allPars.setParDomain("trap", 0d, Double.POSITIVE_INFINITY);
// PlotManager pm = new PlotManager();
// PlotPlugin pm = new PlotPlugin();
// String plotTitle = "Tritium spectrum";
// pm.plotFunction(ParametricUtils.getSpectrumFunction(spectrum, allPars), 14000, 18600, 500,plotTitle, null);
// PrintNamed.printSpectrum(Out.onComplete, beta.trapping, allPars, 14000d, 18600d, 500);

1
numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy
View File

@ -5,7 +5,6 @@ import hep.dataforge.context.Global
import hep.dataforge.grind.Grind
import hep.dataforge.grind.GrindShell
import hep.dataforge.grind.helpers.PlotHelper
import hep.dataforge.plots.fx.FXPlotManager
import hep.dataforge.stat.fit.ParamSet
import hep.dataforge.utils.MetaMorph
import hep.dataforge.values.Values

1
numass-main/src/main/groovy/inr/numass/scripts/times/Histogram.groovy
View File

@ -6,7 +6,6 @@ import hep.dataforge.grind.GrindShell
import hep.dataforge.io.ColumnedDataWriter
import hep.dataforge.maths.histogram.SimpleHistogram
import hep.dataforge.meta.Meta
import hep.dataforge.plots.fx.FXPlotManager
import inr.numass.NumassPlugin
import inr.numass.data.analyzers.TimeAnalyzer
import inr.numass.data.api.NumassSet

1
numass-main/src/main/groovy/inr/numass/scripts/times/MultiPointHistogram.groovy
View File

@ -5,7 +5,6 @@ import hep.dataforge.context.Global
import hep.dataforge.grind.Grind
import hep.dataforge.grind.GrindShell
import hep.dataforge.grind.helpers.PlotHelper
import hep.dataforge.plots.fx.FXPlotManager
import inr.numass.NumassPlugin
import inr.numass.data.PointAnalyzer
import inr.numass.data.analyzers.TimeAnalyzer

1
numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy
View File

@ -6,7 +6,6 @@ import hep.dataforge.data.DataSet
import hep.dataforge.grind.Grind
import hep.dataforge.grind.GrindShell
import hep.dataforge.meta.Meta
import hep.dataforge.plots.fx.FXPlotManager
import inr.numass.NumassPlugin
import inr.numass.actions.TimeAnalyzedAction
import inr.numass.data.NumassDataUtils

1
numass-main/src/main/groovy/inr/numass/scripts/times/TestProto.groovy
View File

@ -4,7 +4,6 @@ import hep.dataforge.context.Context
import hep.dataforge.context.Global
import hep.dataforge.grind.GrindShell
import hep.dataforge.grind.helpers.PlotHelper
import hep.dataforge.plots.fx.FXPlotManager
import hep.dataforge.tables.ValueMap
import inr.numass.NumassPlugin
import inr.numass.data.PointAnalyzer

1
numass-main/src/main/groovy/inr/numass/scripts/underflow/ResponseFunction.groovy
View File

@ -7,7 +7,6 @@ import hep.dataforge.data.DataNode
import hep.dataforge.grind.GrindShell
import hep.dataforge.io.ColumnedDataWriter
import hep.dataforge.meta.Meta
import hep.dataforge.plots.fx.FXPlotManager
import hep.dataforge.tables.ColumnTable
import hep.dataforge.tables.Table
import inr.numass.NumassPlugin

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

@ -16,7 +16,6 @@ import hep.dataforge.io.ColumnedDataWriter
import hep.dataforge.meta.Meta
import hep.dataforge.plots.data.PlotData
import hep.dataforge.plots.data.PlottableGroup
import hep.dataforge.plots.fx.FXPlotManager
import hep.dataforge.tables.Table
import hep.dataforge.tables.TableTransform
import hep.dataforge.tables.XYAdapter

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

@ -24,7 +24,6 @@ import hep.dataforge.meta.Meta;
import hep.dataforge.plotfit.PlotFitResultAction;
import hep.dataforge.plots.PlotDataAction;
import hep.dataforge.plots.fx.FXPlotUtils;
import hep.dataforge.plots.fx.PlotContainer;
import hep.dataforge.plots.jfreechart.JFreeChartFrame;
import hep.dataforge.stat.fit.FitManager;
import hep.dataforge.stat.models.ModelManager;

4
numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzedAction.kt
View File

@ -7,7 +7,7 @@ import hep.dataforge.kodex.buildMeta
import hep.dataforge.kodex.configure
import hep.dataforge.maths.histogram.UnivariateHistogram
import hep.dataforge.meta.Laminate
import hep.dataforge.plots.PlotManager
import hep.dataforge.plots.PlotPlugin
import hep.dataforge.plots.data.PlotData
import hep.dataforge.tables.Table
import hep.dataforge.tables.ValueMap
@ -42,7 +42,7 @@ class TimeAnalyzedAction : OneToOneAction<NumassPoint, Table>() {
val t0 = inputMeta.getDouble("t0", 30e3);
val loChannel = inputMeta.getInt("window.lo", 500);
val upChannel = inputMeta.getInt("window.up", 10000);
val pm = context.getFeature(PlotManager::class.java);
val pm = context.getFeature(PlotPlugin::class.java);
val trueCR = analyzer.analyze(input, buildMeta {

5
numass-viewer/build.gradle
View File

@ -24,11 +24,8 @@ compileKotlin.kotlinOptions.jvmTarget = "1.8"
dependencies {
compile project(':numass-core')
compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc')
compile "hep.dataforge:kodex"
compile "hep.dataforge:kodex-fx"
compile 'com.jcraft:jsch:0.1.54'
compile 'org.controlsfx:controlsfx:8.40.12'
compile "no.tornado:tornadofx:1.7.8"
}
apply plugin: 'kotlin'

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

@ -28,7 +28,6 @@ import hep.dataforge.names.Name;
import hep.dataforge.plots.PlotUtils;
import hep.dataforge.plots.data.PlotDataUtils;
import hep.dataforge.plots.data.XYPlot;
import hep.dataforge.plots.fx.PlotContainer;
import hep.dataforge.plots.jfreechart.JFreeChartFrame;
import hep.dataforge.storage.api.PointLoader;
import hep.dataforge.storage.api.Storage;

1
numass-viewer/src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt
View File

@ -11,7 +11,6 @@ import hep.dataforge.plots.data.PlotData
import hep.dataforge.plots.data.PlotDataUtils
import hep.dataforge.plots.data.PlottableGroup
import hep.dataforge.plots.data.TimePlot
import hep.dataforge.plots.fx.PlotContainer
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.storage.commons.JSONMetaWriter
import hep.dataforge.tables.Table

1
numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt
View File

@ -5,7 +5,6 @@ import hep.dataforge.kodex.configure
import hep.dataforge.meta.Meta
import hep.dataforge.plots.Plot
import hep.dataforge.plots.data.PlotData
import hep.dataforge.plots.fx.PlotContainer
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.storage.api.PointLoader
import hep.dataforge.storage.api.ValueIndex

2
numass-viewer/src/main/kotlin/inr/numass/viewer/Viewer.kt
View File

@ -15,7 +15,7 @@ import tornadofx.*
class Viewer : App(MainView::class) {
override fun start(stage: Stage) {
stage.icons += Image(Global::class.java.getResourceAsStream("/img/df.png"))
stage.icons += Image(Global::class.java.getResourceAsStream("/resource/img/df.png"))
(LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger).level = Level.INFO
Global.setDefaultContext(Global.instance())
StorageManager().startGlobal()

1
numass-viewer/src/main/kotlin/inr/numass/viewer/test/JFCTest.kt
View File

@ -1,7 +1,6 @@
package inr.numass.viewer.test
import hep.dataforge.plots.data.PlotData
import hep.dataforge.plots.fx.PlotContainer
import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.tables.ValueMap
import hep.dataforge.tables.XYAdapter