From 5d71b0ad86bd2b017f1123c300ad725fd4a3d6cf Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Thu, 6 Aug 2015 15:08:33 +0200
Subject: [PATCH] Closedown

---
 script/tests/tests/Linear Slide Tests/.config |  2 -
 .../Linear Slide Tests/Calibrate/.config      | 11 ++-
 .../Calibrate/Calibrate.xml                   | 73 -------------------
 .../Linear Slide Tests/Calibrate/doit.sh      |  2 -
 .../Linear Slide Tests/Check Status/.config   |  3 -
 .../Check Status/Check Status.xml             | 56 --------------
 6 files changed, 8 insertions(+), 139 deletions(-)
 delete mode 100644 script/tests/tests/Linear Slide Tests/.config
 delete mode 100644 script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml
 delete mode 100644 script/tests/tests/Linear Slide Tests/Calibrate/doit.sh
 delete mode 100644 script/tests/tests/Linear Slide Tests/Check Status/.config
 delete mode 100644 script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml

diff --git a/script/tests/tests/Linear Slide Tests/.config b/script/tests/tests/Linear Slide Tests/.config
deleted file mode 100644
index 8f517bb..0000000
--- a/script/tests/tests/Linear Slide Tests/.config	
+++ /dev/null
@@ -1,2 +0,0 @@
-name=Linear Slide Tests
-description=Tests on the OPTIS2 linear slides
diff --git a/script/tests/tests/Linear Slide Tests/Calibrate/.config b/script/tests/tests/Linear Slide Tests/Calibrate/.config
index e75c90e..e97fcc1 100644
--- a/script/tests/tests/Linear Slide Tests/Calibrate/.config	
+++ b/script/tests/tests/Linear Slide Tests/Calibrate/.config	
@@ -1,3 +1,8 @@
-name=Calibrate
-description=Calibrates the device              
-filename=Calibrate.xml
+name=Calibrate
+description=Initialises the motor
+help = \
+This test sends a INIT command to the device, as many times as configured with the parameter RepeatTimes.
+
+#optional parameters. Description is compulsory. Syntax:
+#parameters=<parameter1Name>:<parameter1Value>:<Parameter 1 description>[;<parameter2Name>:<parameter2Value>:<Parameter 2 description>]
+parameters=repeatTimes:2:Repeat N times;delayS:4:Delay between each initialisation [s]
\ No newline at end of file
diff --git a/script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml b/script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml
deleted file mode 100644
index 866c3cd..0000000
--- a/script/tests/tests/Linear Slide Tests/Calibrate/Calibrate.xml	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0">
-    <data fileName="Calibrate.xml"/>
-    <scan>
-    
-        <!-- Send Calibrate Command -->
-        <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ShellAction" command="/bin/sleep 2" exitValue="0"/>
-        <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="PO2TC-NCS-{DEVICE}:INIT.PROC" value="1"/> 
- 
-        <dimension>
-            <!-- Set up a Pseudo Positioner that samples every 50ms for 1500  samples -->
-           <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" settlingTime="0.05" id="id000000">
-                <counts>1000</counts>
-            </positioner>
-            
-            <!-- Motor Drive Status -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.MSTA" id="id000001"/>
-
-            <!-- Position Counter: Raw -->
-	    <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.RVAL" id="id000002"/> 
-	    
-            <!-- Position Counter: Processed -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.VAL"  id="id000003"/> 
-            
-            <!--  Motor Home Switch -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.ATHM" id="id000004"/> 
-            
-            <!--  Motor Low Limit Switch -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.LLS"  id="id000005"/> 
-            
-            <!--  Motor High Limit Switch -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.HLS"  id="id000006"/> 
-	    
-            <!-- Enocder Raw -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:ENCODERraw" id="id000007"/> 
-            
-            <!-- Encoder Processed -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:ENCODER"    id="id000008"/> 
-
-            <!-- Ready -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:RDY"        id="id000009"/> 
-
-            <!-- Interlock -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:ILK"        id="id000010"/> 
-
-                  
-        </dimension>
-        <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" id="idResult">
-            <mapping xsi:type="IDParameterMapping" refid="id000009" variable="ready"/>
-            <mapping xsi:type="IDParameterMapping" refid="id000010" variable="interlock"/>
-            <mapping xsi:type="IDParameterMapping" refid="id000000" variable="count"/>
-            <script>def process(ready,interlock,count):
-    if count &lt; 800:
-        return (0, "Note: the {DEVICE} calibration procedure did not complete.")
-    if ready == 1 and interlock == 1:
-       return(0, "The {DEVICE} drive was successfully initialised. The RDY and ILK signals indicate the drive is ready.")
-    else:   
-       return(1, "The RS calibration procedure failed. The RDY and ILK signals indicate the drive was NOT ready at the expected time (after 40s).")
-</script>
-        </manipulation>
-        
-    </scan>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000001" title="Motor Status (MSTA)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000002" title="Motor Step Count (RVAL)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000003" title="Motor Position (VAL)" /> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000004" title="Motor Home Switch (ATHM)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000005" title="Motor Low Limit Switch (LLS)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000006" title="Motor High Limit Switch (HLS)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000007" title="Encoder Count (ENCODERraw)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000008" title="Encoder Position (ENCODER)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000009" title="Drive Ready (RDY)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000010" title="Drive interlock (ILK)"/> 
-</configuration>
diff --git a/script/tests/tests/Linear Slide Tests/Calibrate/doit.sh b/script/tests/tests/Linear Slide Tests/Calibrate/doit.sh
deleted file mode 100644
index 4807a72..0000000
--- a/script/tests/tests/Linear Slide Tests/Calibrate/doit.sh	
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sleep 5
diff --git a/script/tests/tests/Linear Slide Tests/Check Status/.config b/script/tests/tests/Linear Slide Tests/Check Status/.config
deleted file mode 100644
index 35dbf62..0000000
--- a/script/tests/tests/Linear Slide Tests/Check Status/.config	
+++ /dev/null
@@ -1,3 +0,0 @@
-name=Check Status
-description=Checks the drive status                  
-filename=Check Status.xml
diff --git a/script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml b/script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml
deleted file mode 100644
index 369cae6..0000000
--- a/script/tests/tests/Linear Slide Tests/Check Status/Check Status.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0">
-    <data fileName="Check Status.xml"/>
-    <scan>
-    
-        <dimension>
-            <!-- Set up a Pseudo Positioner that samples every 50ms for 1500  samples -->
-           <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" settlingTime="0.05" id="id000000">
-                <counts>1000</counts>
-            </positioner>
-            
-            <!-- Motor Drive Status -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.MSTA" id="id000001"/>
-
-            <!-- Position Counter: Raw -->
-	    <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.RVAL" id="id000002"/> 
-	    
-            <!-- Position Counter: Processed -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.VAL"  id="id000003"/> 
-            
-            <!--  Motor Home Switch -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.ATHM" id="id000004"/> 
-            
-            <!--  Motor Low Limit Switch -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.LLS"  id="id000005"/> 
-            
-            <!--  Motor High Limit Switch -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:MOTOR.HLS"  id="id000006"/> 
-	    
-            <!-- Enocder Raw -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:ENCODERraw" id="id000007"/> 
-            
-            <!-- Encoder Processed -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:ENCODER"    id="id000008"/> 
-
-            <!-- Ready -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:RDY"        id="id000009"/> 
-
-            <!-- Interlock -->
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="PO2TC-NCS-{DEVICE}:ILK"        id="id000010"/> 
-
-                  
-        </dimension>
-        
-    </scan>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000001" title="Motor Status (MSTA)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000002" title="Motor Step Count (RVAL)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000003" title="Motor Position (VAL)" /> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000004" title="Motor Home Switch (ATHM)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000005" title="Motor Low Limit Switch (LLS)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000006" title="Motor High Limit Switch (HLS)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000007" title="Encoder Count (ENCODERraw)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000008" title="Encoder Position (ENCODER)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000009" title="Drive Ready (RDY)"/> 
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id000000" y="id000010" title="Drive interlock (ILK)"/> 
-</configuration>