From 5bbfc94eb35ed2db23521c989c9cb8d1844fbc8a Mon Sep 17 00:00:00 2001
From: ebner <simon.ebner@psi.ch>
Date: Wed, 19 Aug 2015 09:50:15 +0200
Subject: [PATCH] updated version and added comment about unprecise data merge

---
 ch.psi.fda.xscan/pom.xml                                      | 2 +-
 .../src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi.fda</groupId>
 	<artifactId>ch.psi.fda.xscan</artifactId>
-	<version>2.6.1</version>
+	<version>2.6.2</version>
 
 	<dependencies>
 
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());