diff --git a/config/variables.properties b/config/variables.properties index dbe9a69d..bf692edc 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Tue Sep 21 11:25:34 CEST 2021 +#Tue Sep 21 11:28:42 CEST 2021 LastRunDate=210921 -FileSequentialNumber=8647 -DaySequentialNumber=6 +FileSequentialNumber=8649 +DaySequentialNumber=8 diff --git a/plugins/Scienta.java b/plugins/Scienta.java index 69ede0ae..50c6b103 100644 --- a/plugins/Scienta.java +++ b/plugins/Scienta.java @@ -59,8 +59,8 @@ public class Scienta extends ch.psi.pshell.epics.Scienta { @Override protected void doInitialize() throws IOException, InterruptedException { super.doInitialize(); - spectrum.setSize(ChannelDoubleArray.KEEP_TO_VALID); - spectrumX.setSize(ChannelDoubleArray.KEEP_TO_VALID); + //spectrum.setSize(ChannelDoubleArray.KEEP_TO_VALID); + //spectrumX.setSize(ChannelDoubleArray.KEEP_TO_VALID); } @@ -101,14 +101,14 @@ public class Scienta extends ch.psi.pshell.epics.Scienta { setAccessType(AccessType.Read); } - /* + @Override protected double[] doRead() throws IOException, InterruptedException { //getNumChannels().getValue(); setSizeToValidElements(); return super.doRead(); } - */ + @Override @@ -120,7 +120,8 @@ public class Scienta extends ch.psi.pshell.epics.Scienta { Double cb = channelRange.get(0); Double ce = channelRange.get(1); //scale = (ce - cb) / Math.max(getNumChannels().getValue()- 1, 1); - scale = (ce - cb) / Math.max(take().length - 1, 1); + setSizeToValidElements(); + scale = (ce - cb) / Math.max(this.getSize() - 1, 1); offset = cb; } catch (Exception ex) { } @@ -146,7 +147,7 @@ public class Scienta extends ch.psi.pshell.epics.Scienta { } return x; */ - //spectrumX.setSizeToValidElements(); + spectrumX.setSizeToValidElements(); return spectrumX.read(); }