pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2021-11-10 16:18:45 +01:00
parent 0c39d78c44
commit 4d9c8ec958
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.properties
View File

@@ -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

8
config/settings.properties
View File

@@ -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=

8
config/variables.properties
View File

@@ -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

9
plugins/XPSSpectrum.java
View File

@@ -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");