From 36ad7cf5c907ab45ac196d51b7aa4bc2213e73e8 Mon Sep 17 00:00:00 2001
From: ebner <ebner@ebner.psi.ch>
Date: Tue, 8 Nov 2011 11:15:22 +0100
Subject: [PATCH] Testcase for trigger count if 2 triggers are specified

---
 .../scans/templates/cscan1d-crlogic-2.xml     | 43 +++++++++++++++++++
 .../home/scans/templates/cscan1d-crlogic.xml  |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml

diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml b/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml
new file mode 100644
index 0000000..ec8e856
--- /dev/null
+++ b/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration numberOfExecution="0" xmlns="http://www.psi.ch/~ebner/models/scan/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.psi.ch/~ebner/models/scan/1.0 ../../../src/model-v1.xsd">
+	<data format="txt" />
+	<scan id="">
+
+		<!-- Ensure that scaler is configured the correct way -->
+		<preAction xsi:type="ChannelAction" channel="MTEST-HW3:JS.CONT" value="OneShot" operation="putq"/> <!-- Mode -->
+		<preAction xsi:type="ChannelAction" channel="MTEST-HW3:JS.G1" value="0" /> <!-- Gate -->
+		<preAction xsi:type="ChannelAction" channel="MTEST-HW3:JS.PR1" value="0" /> <!-- Preset Count -->
+
+		<cdimension zigzag="false">
+			
+			<!-- start scaler -->
+			<preAction xsi:type="ChannelAction" channel="MTEST-HW3:JS.CNT" value="Count" operation="putq" />
+
+			<positioner id="id0" name="MTEST-HW3:MOT1" xsi:type="ContinuousPositioner">
+				<start>0.0</start>
+				<end>2.0</end>
+				<stepSize>0.01</stepSize>
+				<integrationTime>0.01</integrationTime>
+			</positioner>
+			<detector id="idD0" xsi:type="SimpleScalarDetector" name="TRIGGER0" />
+			<detector id="idD1" xsi:type="SimpleScalarDetector" name="TRIGGER1" />
+			<!-- <detector id="jsChannel2" xsi:type="SimpleScalarDetector" name="MTEST-HW3:JS.S2"/> -->
+
+			<scaler id="scaler0" channel="0" />
+			<scaler id="scaler1" channel="1" />
+			<!-- <scaler id="scaler2" channel="2"/> -->
+			<timestamp id="test" />
+
+			<!-- stop scaler -->
+			<postAction xsi:type="ChannelAction" channel="MTEST-HW3:JS.CNT" value="Done" />
+		</cdimension>
+
+
+	</scan>
+
+	<visualization title="Scaler 0" xsi:type="LinePlot" x="id0" y="scaler0" />
+	<visualization title="Scaler 1" xsi:type="LinePlot" x="id0" y="scaler1" />
+	<visualization title="Trigger Count 1" xsi:type="LinePlot" x="id0" y="idD0"/>
+	<visualization title="Trigger Count 2" xsi:type="LinePlot" x="id0" y="idD1"/>
+	<visualization xsi:type="LinePlot" x="id0" y="test" title="Timestamp" />
+</configuration>
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic.xml b/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic.xml
index f81c8f7..141e66d 100644
--- a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic.xml
+++ b/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic.xml
@@ -36,6 +36,6 @@
 
 	<visualization title="Scaler 0" xsi:type="LinePlot" x="id0" y="scaler0" />
 	<visualization title="Scaler 1" xsi:type="LinePlot" x="id0" y="scaler1" />
-	<!-- <visualization title="Scaler 1 Count via CA" xsi:type="LinePlot" x="id0" y="jsChannel2"/> -->
+	<visualization title="Trigger Count" xsi:type="LinePlot" x="id0" y="idD0"/>
 	<visualization xsi:type="LinePlot" x="id0" y="test" title="Timestamp" />
 </configuration>