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-09-21 11:31:31 +02:00
parent 07225609d1
commit d8ba0707ed
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Scienta.java
View File

@@ -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();
}