diff --git a/ch.psi.fda.xscan/pom.xml b/ch.psi.fda.xscan/pom.xml index 9072351..1004065 100644 --- a/ch.psi.fda.xscan/pom.xml +++ b/ch.psi.fda.xscan/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.psi.fda ch.psi.fda.xscan - 2.6.1 + 2.6.2 diff --git a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java index 9f9b2db..2acf5db 100644 --- a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java +++ b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java @@ -115,6 +115,10 @@ public class ScrlogicLoop implements ActionLoop { @Override public void propertyChange(PropertyChangeEvent evt) { if(evt.getPropertyName().equals("value")){ + + // Merging values this way it is not 100% accurate as theoretically values does not need to come in + // in the correct time sequence. However we tradeoff this accuracy as we are not precise anyway + DoubleTimestamp v = (DoubleTimestamp) evt.getNewValue(); currentValues.set(0, v.getTimestamp().getTime()); currentValues.set(1, v.getNanosecondOffset());