diff --git a/devices/ps1img.properties b/devices/ps1img.properties index 83f2801e..a2572556 100644 --- a/devices/ps1img.properties +++ b/devices/ps1img.properties @@ -1,8 +1,8 @@ -#Tue Feb 19 09:43:45 CET 2019 +#Wed May 29 21:25:49 CEST 2019 colormap=Grayscale -colormapAutomatic=true +colormapAutomatic=false colormapLogarithmic=false -colormapMax=4169.819 +colormapMax=1000.0 colormapMin=0.0 dataMonitoring=false dataPolling=500 diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java index 9e03354c..fa45d319 100644 --- a/plugins/XPSSpectrum.java +++ b/plugins/XPSSpectrum.java @@ -115,11 +115,14 @@ public class XPSSpectrum extends Panel { scienta.getCurrentChannel().addListener(progressListener); dvpAcqTime.setDevice(scienta.getAcquisitionTime()); startTimer(500, 100); - + manualInitPlotData(); + } + + void manualInitPlotData(){ //Setting data so cam define ranges for detailed without initial LinePlotSeries series = new LinePlotSeries("Data"); rangeSelectionPanel.setSeries(series); - series.setData(new double[]{valueLow.getValue(), valueHigh.getValue()}, new double[]{Double.NaN,Double.NaN}); + series.setData(new double[]{valueLow.getValue(), valueHigh.getValue()}, new double[]{Double.NaN,Double.NaN}); } @Override @@ -143,6 +146,11 @@ public class XPSSpectrum extends Panel { case "XPSSpectrum": if (result instanceof Exception) { //SwingUtils.showMessage(getComponent(), "Error in " + fileName, exception.getMessage()); + if (detailedScan) { + + } else { + manualInitPlotData(); + } } else { if (detailedScan) { diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index c99e64a4..241a0e89 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -36,10 +36,11 @@ plots = plot(None, names) for p in plots[1:]: p.getAxis(p.AxisId.X).label = "kinetic energy" p.getAxis(p.AxisId.X2).setLabel("binding energy") - #p.getAxis(p.AxisId.X2).inverted = True + p.getAxis(p.AxisId.X2).inverted = True p = plots[0] be_axis = plots[0].getAxis(p.AxisId.X2) +be_axis.inverted=True be_axis.setLabel("binding energy") spectrum_series = p.getSeries(0) @@ -54,7 +55,7 @@ def get_binding_range(): ephot = ehi eb1 = ephot - elo - workfunc eb2 = ephot - ehi - workfunc - return eb1, eb2 + return eb2, eb1 eb2, eb1 = get_binding_range()