diff --git a/config/config.properties b/config/config.properties index d4e3ce9c..5656188c 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Thu Nov 04 15:46:06 CET 2021 +#Wed Nov 10 15:34:29 CET 2021 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -26,7 +26,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/chen/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index e3010f9a..e34545f1 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Thu Nov 04 15:46:06 CET 2021 -pgroup=p18329 -proposal=20191502 -proposer=chen +#Wed Nov 10 15:34:29 CET 2021 +pgroup=p17274 +proposal= +proposer=bl-dev prefix= sample= authors= diff --git a/config/variables.properties b/config/variables.properties index c2c90771..6d97143e 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Nov 04 21:07:42 CET 2021 -LastRunDate=211104 -FileSequentialNumber=9823 -DaySequentialNumber=5 +#Wed Nov 10 16:17:54 CET 2021 +LastRunDate=211110 +FileSequentialNumber=9937 +DaySequentialNumber=4 diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java index 1d17c249..59a4d34d 100644 --- a/plugins/XPSSpectrum.java +++ b/plugins/XPSSpectrum.java @@ -10,6 +10,7 @@ import ch.psi.pshell.epics.Scienta; import ch.psi.pshell.plot.LinePlotSeries; import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection; import ch.psi.pshell.ui.Panel; +import ch.psi.utils.Convert; import ch.psi.utils.IO; import ch.psi.utils.Serializer; import ch.psi.utils.State; @@ -203,9 +204,11 @@ public class XPSSpectrum extends Panel { } else { Object[] ret = (Object[]) ((Object[]) result)[0]; if (ret.length > 0) { - //double[] data = (double[]) Convert.wrapperArrayToPrimitiveArray(ret[0], Double.class); - double[] xdata = (double[]) ret[0]; - double[] ydata = (double[]) ret[1]; + double[] xdata = (double[]) Convert.toPrimitiveArray(ret[0], Double.class); + double[] ydata = (double[]) Convert.toPrimitiveArray(ret[1], Double.class); + + //double[] xdata = (double[]) ret[0]; + //double[] ydata = (double[]) ret[1]; //double[] data = new double[]{1.0,1.0,1.0,1.0,1.0}; LinePlotSeries series = new LinePlotSeries("Data");