diff --git a/build.gradle b/build.gradle index ca38708b..5becde7c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'idea' + subprojects { apply plugin: 'java' apply plugin: 'idea' diff --git a/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java b/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java index 1726f76a..e55f9fdd 100644 --- a/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java +++ b/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java @@ -27,18 +27,15 @@ import hep.dataforge.meta.Laminate; import hep.dataforge.meta.MetaBuilder; import hep.dataforge.plots.PlotFrame; import hep.dataforge.plots.PlotUtils; -import hep.dataforge.plots.data.PlottableData; import hep.dataforge.plots.data.PlottableXYFunction; import hep.dataforge.stat.fit.FitState; import hep.dataforge.stat.fit.FitTaskResult; import hep.dataforge.stat.fit.Param; import hep.dataforge.stat.fit.ParamSet; -import hep.dataforge.stat.models.Histogram; import hep.dataforge.stat.simulation.GaussianParameterGenerator; import hep.dataforge.tables.ListTable; import hep.dataforge.tables.MapPoint; import hep.dataforge.tables.Table; -import hep.dataforge.tables.XYAdapter; import hep.dataforge.values.NamedValueSet; import inr.numass.models.ExperimentalVariableLossSpectrum; import inr.numass.models.LossCalculator; @@ -264,13 +261,13 @@ public class ShowLossSpectrumAction extends OneToOneAction { .filter(d -> !Double.isNaN(d)) .toArray(); - Histogram hist = new Histogram(0.3, 0.5, 0.002); - hist.fill(res); - PlotFrame frame = PlotUtils.getPlotManager(context) - .buildPlotFrame(getName(), name + ".ionRatio", - new MetaBuilder("plot").setValue("plotTitle", "Ion ratio Distribution for " + name) - ); - frame.add(PlottableData.plot("ionRatio", new XYAdapter("binCenter", "count"), hist)); +// Histogram hist = new Histogram(0.3, 0.5, 0.002); +// hist.fill(res); +// PlotFrame frame = PlotUtils.getPlotManager(context) +// .buildPlotFrame(getName(), name + ".ionRatio", +// new MetaBuilder("plot").setValue("plotTitle", "Ion ratio Distribution for " + name) +// ); +// frame.add(PlottableData.plot("ionRatio", new XYAdapter("binCenter", "count"), hist)); return new DescriptiveStatistics(res).getStandardDeviation(); } diff --git a/numass-storage/numass-server/build.gradle b/numass-storage/numass-server/build.gradle index 5f959876..c7268b7f 100644 --- a/numass-storage/numass-server/build.gradle +++ b/numass-storage/numass-server/build.gradle @@ -6,6 +6,8 @@ dependencies { compile 'commons-daemon:commons-daemon:1.+' } -processResources { +//processResources { // from configurations.compile.files {"hep.dataforge:storage-servlet"}.find {'/src/main/resources/ratpack'} -} \ No newline at end of file +//} + + diff --git a/numass-storage/numass-server/src/main/java/inr/numass/server/NumassRun.java b/numass-storage/numass-server/src/main/java/inr/numass/server/NumassRun.java index 89685df2..f4e67732 100644 --- a/numass-storage/numass-server/src/main/java/inr/numass/server/NumassRun.java +++ b/numass-storage/numass-server/src/main/java/inr/numass/server/NumassRun.java @@ -71,7 +71,7 @@ public class NumassRun implements Annotated, Responder { public NumassRun(String path, NumassStorage workStorage, MessageFactory factory) throws StorageException { this.storage = workStorage; this.states = LoaderFactory.buildStateLoder(storage, RUN_STATE, null); - this.noteLoader = (ObjectLoader) LoaderFactory.buildObjectLoder(storage, RUN_NOTES, null); + this.noteLoader = LoaderFactory.buildObjectLoder(storage, RUN_NOTES, null); this.factory = factory; this.runPath = path; logger = LoggerFactory.getLogger("CURRENT_RUN"); diff --git a/numass-storage/numass-server/src/main/java/inr/numass/server/NumassStorageHandler.java b/numass-storage/numass-server/src/main/java/inr/numass/server/NumassStorageHandler.java index 689225d6..de15c808 100644 --- a/numass-storage/numass-server/src/main/java/inr/numass/server/NumassStorageHandler.java +++ b/numass-storage/numass-server/src/main/java/inr/numass/server/NumassStorageHandler.java @@ -43,6 +43,7 @@ public class NumassStorageHandler extends StorageRatpackHandler { } @Override + @SuppressWarnings("unchecked") protected void renderObjects(Context ctx, ObjectLoader loader) { if (loader instanceof NumassData) { diff --git a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java index 590d85e5..6758ed1d 100644 --- a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java +++ b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java @@ -39,6 +39,7 @@ import java.util.function.Consumer; */ public class NumassLoaderTreeBuilder { + @SuppressWarnings("unchecked") public void build(Work callback, TreeTableView numassLoaderDataTree, NumassStorage rootStorage, diff --git a/settings.gradle b/settings.gradle index 7664fc28..cddf47c3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,19 +1,18 @@ rootProject.name = 'numass' -if(file("../dataforge").exists()){ - includeBuild('../dataforge') -} - include ":numass-control" include ":numass-control:cryotemp" include ":numass-control:magnet" include ":numass-control:msp" - +// include ":numass-main" - +// include ":numass-storage" include ":numass-storage:numass-client" include ":numass-storage:numass-server" - +// include ":numass-viewer" +if(file("../dataforge").exists()){ + includeBuild('../dataforge') +} \ No newline at end of file