diff --git a/script/tests/devices/AMA1/.config b/script/tests/devices/AMA1/.config
deleted file mode 100644
index fc7fe9d..0000000
--- a/script/tests/devices/AMA1/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 15:07:43 CEST 2017
-name=AMA1
-tests=RPS Tests Interlocklilmits
-parameters=ilkInExpectedValS&"0x91DD"&"[hex] Interlock Input expected value for small values of magnet";magnetCh&"AMA1\:SOL\:1"&"Magnet epics channel";ilkInCh&"J102025\:REG\:R\:6"&"Interlock Input epics channel";ilkInExpectedValIni&"0x1DDD"&"[hex] Interlock Input expected initial value";ilkOutExpectedValL&"0x0000"&"[hex] Interlock Output expected value for large values of magnet";magnetEndVal&"50000"&"[int] magnet final value for scan sequence";ilkOutCh&"J102025\:REG\:R\:3"&"Interlock Output epics channel";ilkOutExpectedValIni&"0x0000"&"[hex] Interlock Output expected initial value";ilkOutExpectedValS&"0x000C"&"[hex] Interlock Output expected value for small values of magnet";magnetInitVal&"0"&"[int] magnet initial value for scan sequence";setGetDelay&"1"&"[s] delay between set and get";mode&"2,IQCOM,$GNT2,1,DIA"&"operating mode";
-description=Ablenkungsmagnet AMA1
diff --git a/script/tests/devices/Gantry1/.config b/script/tests/devices/Gantry1/.config
deleted file mode 100644
index 53a0996..0000000
--- a/script/tests/devices/Gantry1/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=Gantry1
-tests=RPS Tests Betriebsmode
-description=rps section till Gantry 1
-parameters=mode&"2,IQCOM,$GNT1,1,DIA"&"betriebsmode";expectedVal14&"0x0040"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/Gantry2/.config b/script/tests/devices/Gantry2/.config
deleted file mode 100644
index e1a8365..0000000
--- a/script/tests/devices/Gantry2/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=Gantry2
-tests=RPS Tests Betriebsmode
-description=rps section till Gantry 2
-parameters=mode&"2,IQCOM,$GNT2,1,DIA"&"betriebsmode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0004"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/Gantry3/.config b/script/tests/devices/Gantry3/.config
deleted file mode 100644
index 7c2fa77..0000000
--- a/script/tests/devices/Gantry3/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=Gantry3
-tests=RPS Tests Betriebsmode
-description=rps section till Gantry 3
-parameters=mode&"2,IQCOM,$GNT3,1,DIA"&"betriebsmode";expectedVal14&"0x0400"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/Optis/.config b/script/tests/devices/Optis/.config
deleted file mode 100644
index 99ea97c..0000000
--- a/script/tests/devices/Optis/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=Optis
-tests=RPS Tests Betriebsmode
-description=rps section till Optis
-parameters=mode&"2,IQCOM,$OPT,1,DIA"&"betriebsmode";expectedVal14&"0x4000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/PIF/.config b/script/tests/devices/PIF/.config
deleted file mode 100644
index 8c21914..0000000
--- a/script/tests/devices/PIF/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=PIF
-tests=RPS Tests Betriebsmode
-description=rps section till PIF
-parameters=mode&"2,IQCOM,$PIF,1,DIA"&"betriebsmode";expectedVal14&"0x0400"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/XMA0310/.config b/script/tests/devices/XMA0310/.config
deleted file mode 100644
index 60eb5e9..0000000
--- a/script/tests/devices/XMA0310/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:57:25 CEST 2017
-name=XMA0310
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J101030"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA0311/.config b/script/tests/devices/XMA0311/.config
deleted file mode 100644
index 24c2268..0000000
--- a/script/tests/devices/XMA0311/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:58:05 CEST 2017
-name=XMA0311
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J101030"&"RPS module EPICS channel name";expectedValue2&"0x0001"&"[hex] expected value 2";expectedValue1&"0x000D"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA0410/.config b/script/tests/devices/XMA0410/.config
deleted file mode 100644
index c07e7dd..0000000
--- a/script/tests/devices/XMA0410/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:58:37 CEST 2017
-name=XMA0410
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:7"&"RPS EPICS attribute";rpsModule&"J101046"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA1115/.config b/script/tests/devices/XMA1115/.config
deleted file mode 100644
index 958b3d6..0000000
--- a/script/tests/devices/XMA1115/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:53:14 CEST 2017
-name=XMA1115
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:4"&"RPS EPICS attribute";rpsModule&"J102007"&"RPS module EPICS channel name";expectedValue2&"0x0100"&"[hex] expected value 2";expectedValue1&"0x0D00"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA1116/.config b/script/tests/devices/XMA1116/.config
deleted file mode 100644
index 1f8c70d..0000000
--- a/script/tests/devices/XMA1116/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:41:43 CEST 2017
-name=XMA1116
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:4"&"RPS EPICS attribute";rpsModule&"J102007"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA1117/.config b/script/tests/devices/XMA1117/.config
deleted file mode 100644
index 1454885..0000000
--- a/script/tests/devices/XMA1117/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:53:44 CEST 2017
-name=XMA1117
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:4"&"RPS EPICS attribute";rpsModule&"J102007"&"RPS module EPICS channel name";expectedValue2&"0x1000"&"[hex] expected value 2";expectedValue1&"0xD000"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA1118/.config b/script/tests/devices/XMA1118/.config
deleted file mode 100644
index 04bc1ae..0000000
--- a/script/tests/devices/XMA1118/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:40:33 CEST 2017
-name=XMA1118
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:7"&"RPS EPICS attribute";rpsModule&"J102025"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMA1119/.config b/script/tests/devices/XMA1119/.config
deleted file mode 100644
index 49addfb..0000000
--- a/script/tests/devices/XMA1119/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:41:13 CEST 2017
-name=XMA1119
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:4"&"RPS EPICS attribute";rpsModule&"J102007"&"RPS module EPICS channel name";expectedValue2&"0x0001"&"[hex] expected value 2";expectedValue1&"0x000D"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMB0510/.config b/script/tests/devices/XMB0510/.config
deleted file mode 100644
index fdc4185..0000000
--- a/script/tests/devices/XMB0510/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 14:02:17 CEST 2017
-name=XMB0510
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J108053"&"RPS module EPICS channel name";expectedValue2&"0x0100"&"[hex] expected value 2";expectedValue1&"0x0D00"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMC0610/.config b/script/tests/devices/XMC0610/.config
deleted file mode 100644
index bf9394b..0000000
--- a/script/tests/devices/XMC0610/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 14:00:49 CEST 2017
-name=XMC0610
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J110060"&"RPS module EPICS channel name";expectedValue2&"0x0100"&"[hex] expected value 2";expectedValue1&"0x0D00"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMC2010/.config b/script/tests/devices/XMC2010/.config
deleted file mode 100644
index 2753f2e..0000000
--- a/script/tests/devices/XMC2010/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 14:01:23 CEST 2017
-name=XMC2010
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J117065"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMC2011/.config b/script/tests/devices/XMC2011/.config
deleted file mode 100644
index 3dc2824..0000000
--- a/script/tests/devices/XMC2011/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 14:01:52 CEST 2017
-name=XMC2011
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J117065"&"RPS module EPICS channel name";expectedValue2&"0x0100"&"[hex] expected value 2";expectedValue1&"0x0D00"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMD0710/.config b/script/tests/devices/XMD0710/.config
deleted file mode 100644
index 14e1a37..0000000
--- a/script/tests/devices/XMD0710/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:59:03 CEST 2017
-name=XMD0710
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J124081"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMD0711/.config b/script/tests/devices/XMD0711/.config
deleted file mode 100644
index c262689..0000000
--- a/script/tests/devices/XMD0711/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:59:41 CEST 2017
-name=XMD0711
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J124081"&"RPS module EPICS channel name";expectedValue2&"0x0100"&"[hex] expected value 2";expectedValue1&"0x0D00"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XMD0717/.config b/script/tests/devices/XMD0717/.config
deleted file mode 100644
index 2c935f5..0000000
--- a/script/tests/devices/XMD0717/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 14:00:11 CEST 2017
-name=XMD0717
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:4"&"RPS EPICS attribute";rpsModule&"J124092"&"RPS module EPICS channel name";expectedValue2&"0x0001"&"[hex] expected value 2";expectedValue1&"0x000D"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XME1310/.config b/script/tests/devices/XME1310/.config
deleted file mode 100644
index a66d3fc..0000000
--- a/script/tests/devices/XME1310/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:54:46 CEST 2017
-name=XME1310
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:6"&"RPS EPICS attribute";rpsModule&"J112009"&"RPS module EPICS channel name";expectedValue2&"0x0001"&"[hex] expected value 2";expectedValue1&"0x000D"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XME1311/.config b/script/tests/devices/XME1311/.config
deleted file mode 100644
index c42d1e2..0000000
--- a/script/tests/devices/XME1311/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:55:53 CEST 2017
-name=XME1311
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:4"&"RPS EPICS attribute";rpsModule&"J112023"&"RPS module EPICS channel name";expectedValue2&"0x0100"&"[hex] expected value 2";expectedValue1&"0x0D00"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XME1410/.config b/script/tests/devices/XME1410/.config
deleted file mode 100644
index 1d114f8..0000000
--- a/script/tests/devices/XME1410/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:56:25 CEST 2017
-name=XME1410
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J112023"&"RPS module EPICS channel name";expectedValue2&"0x0001"&"[hex] expected value 2";expectedValue1&"0x000D"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/XME1411/.config b/script/tests/devices/XME1411/.config
deleted file mode 100644
index f874918..0000000
--- a/script/tests/devices/XME1411/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Oct 20 13:56:53 CEST 2017
-name=XME1411
-tests=RPS Tests Diagnostic
-parameters=rpsAttribute&"REG\:R\:5"&"RPS EPICS attribute";rpsModule&"J112023"&"RPS module EPICS channel name";expectedValue2&"0x0010"&"[hex] expected value 2";expectedValue1&"0x00D0"&"[hex] expected value 1";
-description=Diagnostic module
diff --git a/script/tests/devices/bis-BMA1/.config b/script/tests/devices/bis-BMA1/.config
deleted file mode 100644
index 9fbf4a2..0000000
--- a/script/tests/devices/bis-BMA1/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:10 CEST 2017
-name=bis-BMA1
-tests=RPS Tests Betriebsmode
-parameters=mode&"2,IQCOM,$BMA1,1,DIAG"&"operating mode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
-description=rps section till BMA1
diff --git a/script/tests/devices/bis-BMC1/.config b/script/tests/devices/bis-BMC1/.config
deleted file mode 100644
index dd62c9f..0000000
--- a/script/tests/devices/bis-BMC1/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:10 CEST 2017
-name=bis-BMC1
-tests=RPS Tests Betriebsmode
-parameters=mode&"2,IQCOM,$BMC1,1,DIAG"&"operating mode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
-description=rps section till BMC1
diff --git a/script/tests/devices/bis-BMD1/.config b/script/tests/devices/bis-BMD1/.config
deleted file mode 100644
index 163d7d8..0000000
--- a/script/tests/devices/bis-BMD1/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=bis-BMD1
-tests=RPS Tests Betriebsmode
-description=rps section till BMD1
-parameters=mode&"2,IQCOM,$BMD1,1,DIA"&"betriebsmode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/bis-BME1/.config b/script/tests/devices/bis-BME1/.config
deleted file mode 100644
index 6ae20bb..0000000
--- a/script/tests/devices/bis-BME1/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Oct 18 10:54:16 CEST 2017
-name=bis-BME1
-tests=RPS Tests Betriebsmode
-description=rps section till BME1
-parameters=mode&"2,IQCOM,$BME1,1,DIA"&"betriebsmode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";
diff --git a/script/tests/devices/newbx84/.config b/script/tests/devices/newbx84/.config
deleted file mode 100644
index 927ba6b..0000000
--- a/script/tests/devices/newbx84/.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Mar 20 09:48:39 CET 2018
-name=newbx84
-tests=New Structure Tests
-parameters=par1&"1"&"override param 1";par3&"p3"&"device specific param";
-description=bx84 device for new testing list structure
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index b4139d7..fff372e 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
#TestingList for pshell: configuration properties
-#Tue Mar 20 13:49:25 CET 2018
+#Tue Mar 20 14:04:44 CET 2018
customPanel=
showEnabledTestsOnly=
listFilter=rps-test
diff --git a/script/tests/tests/New Structure Tests/new bx84 2/.config b/script/tests/tests/New Structure Tests/new bx84 2/.config
deleted file mode 100644
index d88084e..0000000
--- a/script/tests/tests/New Structure Tests/new bx84 2/.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Mar 20 13:40:52 CET 2018
-name=new bx84 2
-parameters=
-description=bla
diff --git a/script/tests/tests/New Structure Tests/new bx84 2/help.html b/script/tests/tests/New Structure Tests/new bx84 2/help.html
deleted file mode 100644
index 9b5aa70..0000000
--- a/script/tests/tests/New Structure Tests/new bx84 2/help.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-Description
-bla
-Parameters
-
-Contact
-Marco Boccioli
-Tel. 3078
-
-
-
diff --git a/script/tests/tests/New Structure Tests/new bx84 2/new bx84 2.py b/script/tests/tests/New Structure Tests/new bx84 2/new bx84 2.py
deleted file mode 100644
index e1adb8b..0000000
--- a/script/tests/tests/New Structure Tests/new bx84 2/new bx84 2.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# Test name: new bx84 2
-# bla
-# Copyright (c) 2015 Paul Scherrer Institute. All rights reserved.
-
-###### Init - DO NOT MODIFY THE CODE BELOW ######
-global sys, inspect, os, traceback
-import sys, inspect, os, traceback
-
-
-def startTest(testName, DEVICE, params):
- """
- Main method running the test
- """
- # by default, assume the test failed:
- ret = 'Test failed'
- status = False
- # put the whole custom code under try/catch.
- try:
- # get the path of this script:
- testPath = inspect.getfile(inspect.currentframe())
- # init the testing tool class:
- test = TestingTool(testName, testPath, DEVICE, params)
-
-################ END OF Init #####################
-######### WRITE YOUR CODE HERE BELOW #############
-
- """
- All the code in this section # WRITE YOUR CODE HERE BELOW # is just an example and can be modified/deleted.
- It must be indented to the same level as this comment.
- -----------------------------------
- GETTING INPUTS:
- -----------------------------------
- If needed, the following methods are available:
-
- test.getPath() string, path of this test file
- test.getName() string, name of this test
- test.getDeviceName() string, device for which the test must run (typically it is the beginning of a process variable name)
- test.getPlotName() string, name to be given to the plot when using setPlotTitle(). Example: scan.setPlotTitle(test.getPlotName())
- -----------------------------------
- GETTING TEST PARAMETERS:
- -----------------------------------
- if you need to get parameters for the test, use:
-
- myParamValue = test.getParam('myParamName')
-
- the calls to getParam are added to the code automatically, one per parameter, when creating the new test.
- NOTE: Casting may be necessary.
- See the test config for the list of parameters specific to the test.
- -----------------------------------
- SETTING OUTPUTS:
- -----------------------------------
- When the test has ended (error or success), this method must be called in order to return to pshell:
-
- test.sendFeedback(ret,success)
-
- ret string, a text summarizing the result of the test.
- success bool, True = test successful. False = test failed.
- -----------------------------------
- LOG INFO:
- -----------------------------------
- when some information must be shown on the log on pshell, use the following line:
- test.log('text to log')
- """
-
- ########## Example (can be removed) ######
-
- # print the list of parameters passed. If any error, stop and send feedback.
- test.log("Example - Test name: " + test.getName())
- test.log("Example - Device name: " + test.getDeviceName() )
- try:
- test.log("Running test with the following parameters:")
- test.printParams()
- # If present, use the parameters here below for your test script.
- # These parameters were automatically generated: you might need to change the casting.
-
- except:
- import traceback
- # test failed, write the report into the variables ret and success and send feedback:
- ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
- return
-
- # loop to read channels for a while and plot the channels values.
- # initialise plot tab with 2 plots: pass here the axis names:
- scan = ManualScan(['sample'], ['Status (MSTA)', 'Position (VAL)'])
- # set plot name(tab title):
- scan.setPlotTitle(test.getPlotName())
- # start plots. See further below how to add points to the plots (scan):
- scan.start()
-
- # inject a sinus into the plot, as example
- from math import sin
- motor_msta = 0
- # take 100 samples of a sinus and a jigsaw plot them:
- for sample in range(0, 100):
- readback1 = sample #the x axis.
- sleep(0.1) # settling time.
- # get value (it is translated to a caget):
- motor_msta = motor_msta + +1
- if motor_msta > 50:
- motor_msta = 0
- # get value:
- motor_val = sin(float(sample)/10.0)*10.0-10.0
- # add values to plot:
- scan.append([readback1], [readback1], [motor_msta, motor_val])
-
- # now try with data from real device: this part will most probably fail: correct the PV names with existing ones.
- try:
- # set up connection to channels. "type" of data can be "d" (= double), "l" (= long).
- pv_motor_msta = Channel(test.getDeviceName() + ':IST:2' , type='d')
- pv_motor_val = Channel(test.getDeviceName() + ':IST:1' , type='d')
- pv_motor_com = Channel(test.getDeviceName() + ':COM:2' , type='d')
- except:
- import traceback
- # prepare return information: return text:
- ret = 'Unable to create channel - ' + traceback.format_exc()
- # prepare return information: return success:
- success = False
- # send return information:
- test.sendFeedback(ret, success)
- return
- # send a command to a channel (it is translated to a caput): uncomment this line below to try it
- #pv_motor_com.put(1.0, timeout=None) # optionally, a timeout can be given.
- # take 100 samples of the channels and plot them:
- for sample in range(0, 100):
- readback1 = sample #the x axis.
- sleep(0.1) # settling time.
- # get value (it is translated to a caget):
- motor_msta = pv_motor_msta.get()
- # get value:
- motor_val = pv_motor_val.get()
- # add values to plot:
- scan.append([readback1], [readback1], [motor_msta, motor_val])
-
- # Closing channels: all channels that were opened with Channel() must be closed before exit:
- pv_motor_msta.close()
- pv_motor_val.close()
- pv_motor_com.close()
-
- # IMPORTANT: if the test was successful, write the report into the variables ret and success.
- # for example, write the following:
- ret = "Example - Test successful, here some detail: ..."
- success = True
- test.sendFeedback(ret, success)
- # once the test is finished, no need to do anything. The code below yours will do the rest.
- ################ End of Example ##########
-
-################ END OF YOUR CODE ################
-###### Final - DO NOT MODIFY THE CODE BELOW ######
-
- # just in case the feedback was forgotten.
- test.sendFeedback(ret, success)
- except (KeyboardInterrupt):
- # user stop error handler.
- import traceback
- ret = 'Test stopped by user.'
- success = False
- test.sendFeedback(ret, success)
- except:
- # generic error handler.
- import traceback
- ret = traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
-
-
-# launch the test.
-startTest(test, device, parameters)
-
-################ END OF Final ####################
-#### IF NEEDED, ADD YOUR FUNCTIONS HERE BELOW ####
-# Indent to end left
-# def yourCustomFunction:
diff --git a/script/tests/tests/New Structure Tests/new structure monitor/.config b/script/tests/tests/New Structure Tests/new structure monitor/.config
deleted file mode 100644
index 455814d..0000000
--- a/script/tests/tests/New Structure Tests/new structure monitor/.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Mar 20 09:47:18 CET 2018
-name=new structure monitor
-parameters=par1&"1"&"param 1";par2&"p2"&"param 2";
-description=Buld new tests with new testing list structure
diff --git a/script/tests/tests/New Structure Tests/new structure monitor/help.html b/script/tests/tests/New Structure Tests/new structure monitor/help.html
deleted file mode 100644
index bf018dc..0000000
--- a/script/tests/tests/New Structure Tests/new structure monitor/help.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-Description
-Buld new tests with new testing list structure
-Parameters
-
-par1 | param 1 |
-par2 | param 2 |
-
-
-Contact
-Marco Boccioli
-Tel. 3078
-
-
-
diff --git a/script/tests/tests/New Structure Tests/new structure monitor/new structure monitor.py b/script/tests/tests/New Structure Tests/new structure monitor/new structure monitor.py
deleted file mode 100644
index 4c160f1..0000000
--- a/script/tests/tests/New Structure Tests/new structure monitor/new structure monitor.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# Test name: new structure monitor
-# Buld new tests with new testing list structure
-# Copyright (c) 2015 Paul Scherrer Institute. All rights reserved.
-
-###### Init - DO NOT MODIFY THE CODE BELOW ######
-global sys, inspect, os, traceback
-import sys, inspect, os, traceback
-
-
-def startTest(testName, DEVICE, params):
- """
- Main method running the test
- """
- # by default, assume the test failed:
- ret = 'Test failed'
- status = False
- # put the whole custom code under try/catch.
- try:
- # get the path of this script:
- testPath = inspect.getfile(inspect.currentframe())
- # init the testing tool class:
- test = TestingTool(testName, testPath, DEVICE, params)
-
-################ END OF Init #####################
-######### WRITE YOUR CODE HERE BELOW #############
-
- """
- All the code in this section # WRITE YOUR CODE HERE BELOW # is just an example and can be modified/deleted.
- It must be indented to the same level as this comment.
- -----------------------------------
- GETTING INPUTS:
- -----------------------------------
- If needed, the following methods are available:
-
- test.getPath() string, path of this test file
- test.getName() string, name of this test
- test.getDeviceName() string, device for which the test must run (typically it is the beginning of a process variable name)
- test.getPlotName() string, name to be given to the plot when using setPlotTitle(). Example: scan.setPlotTitle(test.getPlotName())
- -----------------------------------
- GETTING TEST PARAMETERS:
- -----------------------------------
- if you need to get parameters for the test, use:
-
- myParamValue = test.getParam('myParamName')
-
- the calls to getParam are added to the code automatically, one per parameter, when creating the new test.
- NOTE: Casting may be necessary.
- See the test config for the list of parameters specific to the test.
- -----------------------------------
- SETTING OUTPUTS:
- -----------------------------------
- When the test has ended (error or success), this method must be called in order to return to pshell:
-
- test.sendFeedback(ret,success)
-
- ret string, a text summarizing the result of the test.
- success bool, True = test successful. False = test failed.
- -----------------------------------
- LOG INFO:
- -----------------------------------
- when some information must be shown on the log on pshell, use the following line:
- test.log('text to log')
- """
-
- ########## Example (can be removed) ######
-
- # print the list of parameters passed. If any error, stop and send feedback.
- test.log("Example - Test name: " + test.getName())
- test.log("Example - Device name: " + test.getDeviceName() )
- try:
- test.log("Running test with the following parameters:")
- test.printParams()
- # If present, use the parameters here below for your test script.
- # These parameters were automatically generated: you might need to change the casting.
- par1 = float(test.getParam('par1')) ; par2 = float(test.getParam('par2')) ;
- except:
- import traceback
- # test failed, write the report into the variables ret and success and send feedback:
- ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
- return
-
- # loop to read channels for a while and plot the channels values.
- # initialise plot tab with 2 plots: pass here the axis names:
- scan = ManualScan(['sample'], ['Status (MSTA)', 'Position (VAL)'])
- # set plot name(tab title):
- scan.setPlotTitle(test.getPlotName())
- # start plots. See further below how to add points to the plots (scan):
- scan.start()
-
- # inject a sinus into the plot, as example
- from math import sin
- motor_msta = 0
- # take 100 samples of a sinus and a jigsaw plot them:
- for sample in range(0, 100):
- readback1 = sample #the x axis.
- sleep(0.1) # settling time.
- # get value (it is translated to a caget):
- motor_msta = motor_msta + +1
- if motor_msta > 50:
- motor_msta = 0
- # get value:
- motor_val = sin(float(sample)/10.0)*10.0-10.0
- # add values to plot:
- scan.append([readback1], [readback1], [motor_msta, motor_val])
-
- # now try with data from real device: this part will most probably fail: correct the PV names with existing ones.
- try:
- # set up connection to channels. "type" of data can be "d" (= double), "l" (= long).
- pv_motor_msta = Channel(test.getDeviceName() + ':IST:2' , type='d')
- pv_motor_val = Channel(test.getDeviceName() + ':IST:1' , type='d')
- pv_motor_com = Channel(test.getDeviceName() + ':COM:2' , type='d')
- except:
- import traceback
- # prepare return information: return text:
- ret = 'Unable to create channel - ' + traceback.format_exc()
- # prepare return information: return success:
- success = False
- # send return information:
- test.sendFeedback(ret, success)
- return
- # send a command to a channel (it is translated to a caput): uncomment this line below to try it
- #pv_motor_com.put(1.0, timeout=None) # optionally, a timeout can be given.
- # take 100 samples of the channels and plot them:
- for sample in range(0, 100):
- readback1 = sample #the x axis.
- sleep(0.1) # settling time.
- # get value (it is translated to a caget):
- motor_msta = pv_motor_msta.get()
- # get value:
- motor_val = pv_motor_val.get()
- # add values to plot:
- scan.append([readback1], [readback1], [motor_msta, motor_val])
-
- # Closing channels: all channels that were opened with Channel() must be closed before exit:
- pv_motor_msta.close()
- pv_motor_val.close()
- pv_motor_com.close()
-
- # IMPORTANT: if the test was successful, write the report into the variables ret and success.
- # for example, write the following:
- ret = "Example - Test successful, here some detail: ..."
- success = True
- test.sendFeedback(ret, success)
- # once the test is finished, no need to do anything. The code below yours will do the rest.
- ################ End of Example ##########
-
-################ END OF YOUR CODE ################
-###### Final - DO NOT MODIFY THE CODE BELOW ######
-
- # just in case the feedback was forgotten.
- test.sendFeedback(ret, success)
- except (KeyboardInterrupt):
- # user stop error handler.
- import traceback
- ret = 'Test stopped by user.'
- success = False
- test.sendFeedback(ret, success)
- except:
- # generic error handler.
- import traceback
- ret = traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
-
-
-# launch the test.
-startTest(test, device, parameters)
-
-################ END OF Final ####################
-#### IF NEEDED, ADD YOUR FUNCTIONS HERE BELOW ####
-# Indent to end left
-# def yourCustomFunction:
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config
deleted file mode 100644
index 390438b..0000000
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Oct 16 14:28:18 CEST 2017
-name=Betriebsmode
-description=Verify that the different RPS Modes give correct Outputs on the RPS modules
-parameters=mode&"2,IQCOM,$BMA1,1,DIA"&"vla";rpsCh14&"J102003:REG:R:3"&"rps channel 1-4";rpsCh58&"J102003:REG:R:34"&"rps channel 5-8";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";setGetDelay&"1"&"[s] delay between set and get";
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py
deleted file mode 100644
index c950c51..0000000
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py
+++ /dev/null
@@ -1,171 +0,0 @@
-# Test name: Betriebsmode (old caRPSTest test #1)
-# betriebsmode
-# Copyright (c) 2015 Paul Scherrer Institute. All rights reserved.
-
-###### Init - DO NOT MODIFY THE CODE BELOW ######
-global sys, inspect, os, traceback
-import sys, inspect, os, traceback
-
-
-def startTest(testName, DEVICE, params):
- """
- Main method running the test
- """
- # by default, assume the test failed:
- ret = 'Test failed'
- status = False
- # put the whole custom code under try/catch.
- try:
- # get the path of this script:
- testPath = inspect.getfile(inspect.currentframe())
- # init the testing tool class:
- test = TestingTool(testName, testPath, DEVICE, params)
-
-################ END OF Init #####################
-######### WRITE YOUR CODE HERE BELOW #############
-
- """
- All the code in this section # WRITE YOUR CODE HERE BELOW # is just an example and can be modified/deleted.
- It must be indented to the same level as this comment.
- -----------------------------------
- GETTING INPUTS:
- -----------------------------------
- If needed, the following methods are available:
-
- test.getPath() string, path of this test file
- test.getName() string, name of this test
- test.getDeviceName() string, device for which the test must run (typically it is the beginning of a process variable name)
- test.getPlotName() string, name to be given to the plot when using setPlotTitle(). Example: scan.setPlotTitle(test.getPlotName())
- -----------------------------------
- GETTING TEST PARAMETERS:
- -----------------------------------
- if you need to get parameters for the test, use:
-
- myParamValue = test.getParam('myParamName')
-
- the calls to getParam are added to the code automatically, one per parameter, when creating the new test.
- NOTE: Casting may be necessary.
- See the test config for the list of parameters specific to the test.
- -----------------------------------
- SETTING OUTPUTS:
- -----------------------------------
- When the test has ended (error or success), this method must be called in order to return to pshell:
-
- test.sendFeedback(ret,success)
-
- ret string, a text summarizing the result of the test.
- success bool, True = test successful. False = test failed.
- -----------------------------------
- LOG INFO:
- -----------------------------------
- when some information must be shown on the log on pshell, use the following line:
- test.log('text to log')
- """
-
-
- # print the list of parameters passed. If any error, stop and send feedback.
- test.log("Test " + test.getName() + " for " + test.getDeviceName() )
- try:
- test.log("Running test with the following parameters:")
- test.printParams()
- # fetch paramenters
- rpsChName14 = (test.getParam('rpsCh14'))
- rpsChName58 = (test.getParam('rpsCh58'))
- expectedVal14 = (test.getParam('expectedVal14'))
- expectedVal58 = (test.getParam('expectedVal58'))
- mode = (test.getParam('mode'))
- setGetDelay = float(test.getParam('setGetDelay')) ;
- except:
- import traceback
- # test failed, write the report into the variables ret and success and send feedback:
- ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
- return
-
- # now try with data from real device: this part will most probably fail: correct the PV names with existing ones.
- rpsMask14 = 0x4440 # mask for outputs 2-4
- rpsMask58 = 0x0004 # mask for output 5
- ilk = Interlock()
- ilk.setInterlockMode(mode)
- sleep(setGetDelay)
- ilk.masterReset()
- sleep(setGetDelay)
- modeRead = ilk.getInterlockMode();
- if not modeRead:
- ret = 'No mode received'
- success = False
- test.sendFeedback(ret, success)
- return
- try:
- modePresent = modeRead.index(mode)
- except:
- modePresent = -1
- ret = 'Could not set mode ' + mode
- success = False
- test.sendFeedback(ret, success)
- return
- try:
- # set up connection to channels. "type" of data can be "d" (= double), "l" (= long).
- # outputs 1-4
- rpsCh14 = Channel(rpsChName14, type='d')
- # outputs 5-8
- rpsCh58 = Channel(rpsChName58, type='d')
-
- rpsVal14 = rpsCh14.get()
- rpsVal58 = rpsCh58.get()
-
- success = True
- if ((rpsVal14 & rpsMask14) == expectedVal14):
- ret = 'Interlocks outputs (1-4) of ' + rpsChName14 + ': ' + rpsVal14 + ' as expected'
- else:
- ret = 'Interlocks outputs (1-4) of ' + rpsChName14 + ': ' + rpsVal14 + ' was expected: ' + expectedVal14
- success = False
-
- if ((rpsVal58 & rpsMask58) == expectedVal58):
- ret = ret + '\nInterlocks outputs (5-8) of ' + rpsChName58 + ': ' + rpsVal58 + ' as expected'
- else:
- ret = ret + '\nInterlocks outputs (5-8) of ' + rpsChName58 + ': ' + rpsVal58 + ' was expected: ' + expectedVal58
- success = False
- except:
- import traceback
- # prepare return information: return text:
- ret = 'Unable to connect to channel - ' + traceback.format_exc()
- # prepare return information: return success:
- success = False
- # send return information:
- test.sendFeedback(ret, success)
- return
-
- # Closing channels: all channels that were opened with Channel() must be closed before exit:
- rpsCh14.close()
- rpsCh58.close()
-
- # once the test is finished, no need to do anything. The code below yours will do the rest.
-
-################ END OF YOUR CODE ################
-###### Final - DO NOT MODIFY THE CODE BELOW ######
-
- # just in case the feedback was forgotten.
- test.sendFeedback(ret, success)
- except (KeyboardInterrupt):
- # user stop error handler.
- import traceback
- ret = 'Test stopped by user.'
- success = False
- test.sendFeedback(ret, success)
- except:
- # generic error handler.
- import traceback
- ret = traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
-
-
-# launch the test.
-startTest(test, device, parameters)
-
-################ END OF Final ####################
-#### IF NEEDED, ADD YOUR FUNCTIONS HERE BELOW ####
-# Indent to end left
-# def yourCustomFunction:
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html
deleted file mode 100644
index adb0ce7..0000000
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/help.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-Description
-Verify that the different RPS Modes give correct Outputs on the RPS modules (Test n. 1 in old caRPS_Tests)
-Parameters
-
-mode | [string] Betriebs mode |
-expectedVal14 | [hex] Expected value for channels 1-4 |
-expectedVal58 | [hex] Expected value for channels 5-8 |
-setGetDelay | [ms] delay between set and get |
-
-
-Contact
-Marco Boccioli
-Tel. 3078
-
-
-
diff --git a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/.config b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/.config
deleted file mode 100644
index 8460d43..0000000
--- a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 13:31:23 CEST 2017
-name=Diagnostic
-parameters=setGetDelay&"1"&"[s] delay between set and get";
-description=Test interlocks of diagnostic modules by generating a pulse
diff --git a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py
deleted file mode 100644
index 8abf082..0000000
--- a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# Test name: Diagnostic
-# Test interlocks of diagnostic modules by generating a pulse
-# Copyright (c) 2015 Paul Scherrer Institute. All rights reserved.
-
-###### Init - DO NOT MODIFY THE CODE BELOW ######
-global sys, inspect, os, traceback
-import sys, inspect, os, traceback
-
-
-def startTest(testName, DEVICE, params):
- """
- Main method running the test
- """
- # by default, assume the test failed:
- ret = 'Test failed'
- status = False
- # put the whole custom code under try/catch.
- try:
- # get the path of this script:
- testPath = inspect.getfile(inspect.currentframe())
- # init the testing tool class:
- test = TestingTool(testName, testPath, DEVICE, params)
-
-################ END OF Init #####################
-######### WRITE YOUR CODE HERE BELOW #############
-
- """
- All the code in this section # WRITE YOUR CODE HERE BELOW # is just an example and can be modified/deleted.
- It must be indented to the same level as this comment.
- -----------------------------------
- GETTING INPUTS:
- -----------------------------------
- If needed, the following methods are available:
-
- test.getPath() string, path of this test file
- test.getName() string, name of this test
- test.getDeviceName() string, device for which the test must run (typically it is the beginning of a process variable name)
- test.getPlotName() string, name to be given to the plot when using setPlotTitle(). Example: scan.setPlotTitle(test.getPlotName())
- -----------------------------------
- GETTING TEST PARAMETERS:
- -----------------------------------
- if you need to get parameters for the test, use:
-
- myParamValue = test.getParam('myParamName')
-
- the calls to getParam are added to the code automatically, one per parameter, when creating the new test.
- NOTE: Casting may be necessary.
- See the test config for the list of parameters specific to the test.
- -----------------------------------
- SETTING OUTPUTS:
- -----------------------------------
- When the test has ended (error or success), this method must be called in order to return to pshell:
-
- test.sendFeedback(ret,success)
-
- ret string, a text summarizing the result of the test.
- success bool, True = test successful. False = test failed.
- -----------------------------------
- LOG INFO:
- -----------------------------------
- when some information must be shown on the log on pshell, use the following line:
- test.log('text to log')
- """
-
- ########## Example (can be removed) ######
-
- # print the list of parameters passed. If any error, stop and send feedback.
- test.log("Example - Test name: " + test.getName())
- test.log("Example - Device name: " + test.getDeviceName() )
- try:
- test.log("Running test with the following parameters:")
- test.printParams()
- # If present, use the parameters here below for your test script.
- # These parameters were automatically generated: you might need to change the casting.
- setGetDelay = float(test.getParam('setGetDelay'))
- rpsAttribute = test.getParam('rpsAttribute')
- rpsModule = test.getParam('rpsModule')
- expectedValue2 = test.getParam('expectedValue2')
- expectedValue1 = test.getParam('expectedValue1')
- except:
- import traceback
- # test failed, write the report into the variables ret and success and send feedback:
- ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
- return
-
- # now try with data from real device: this part will most probably fail: correct the PV names with existing ones.
- try:
- # set up connection to channels. "type" of data can be "d" (= double), "l" (= long).
- #rpsCh = Channel(test.getDeviceName() + ':' + rpsAttribute , type='d')
- test.log('doing nothing here...')
- except:
- import traceback
- # prepare return information: return text:
- ret = 'Unable to create channel - ' + traceback.format_exc()
- # prepare return information: return success:
- success = False
- # send return information:
- test.sendFeedback(ret, success)
- return
- # send a command to a channel (it is translated to a caput): uncomment this line below to try it
- #pv_motor_com.put(1.0, timeout=None) # optionally, a timeout can be given.
- # take 100 samples of the channels and plot them:
- # get value (it is translated to a caget):
- # motor_msta = pv_motor_msta.get()
-
- # Closing channels: all channels that were opened with Channel() must be closed before exit:
- #rpsCh.close()
-
- # IMPORTANT: if the test was successful, write the report into the variables ret and success.
- # for example, write the following:
- ret = "Success, nothing was done :-)"
- success = True
- # once the test is finished, no need to do anything. The code below yours will do the rest.
- ################ End of Example ##########
-
-################ END OF YOUR CODE ################
-###### Final - DO NOT MODIFY THE CODE BELOW ######
-
- # just in case the feedback was forgotten.
- test.sendFeedback(ret, success)
- except (KeyboardInterrupt):
- # user stop error handler.
- import traceback
- ret = 'Test stopped by user.'
- success = False
- test.sendFeedback(ret, success)
- except:
- # generic error handler.
- import traceback
- ret = traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
-
-
-# launch the test.
-startTest(test, device, parameters)
-
-################ END OF Final ####################
-#### IF NEEDED, ADD YOUR FUNCTIONS HERE BELOW ####
-# Indent to end left
-# def yourCustomFunction:
diff --git a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html
deleted file mode 100644
index c2f029f..0000000
--- a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-Description
-Test interlocks of diagnostic modules by generating a pulse (Test n. 5 in old caRPS_Tests)
-Parameters
-
-setGetDelay | [s] delay between set and get |
-rpsAttribute | RPS EPICS attribute |
-rpsModule | RPS module EPICS channel name |
-expectedValue2 | [hex] expected value 2 |
-expectedValue1 | [hex] expected value 1 |
-
-Contact
-Marco Boccioli
-Tel. 3078
-
-
-
diff --git a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/.config b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/.config
deleted file mode 100644
index cb621ab..0000000
--- a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/.config
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Oct 18 14:59:58 CEST 2017
-name=RPSlimits
-parameters=
-description=Verify that for different modes, the RPS behaves correctly when scanning the current settings of the Ablenkungsmagnet
diff --git a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py
deleted file mode 100644
index 317e2cb..0000000
--- a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# Test name: Interlocklimits
-# Interlock Limits for Ablenksmagnet
-# Copyright (c) 2015 Paul Scherrer Institute. All rights reserved.
-
-###### Init - DO NOT MODIFY THE CODE BELOW ######
-global sys, inspect, os, traceback
-import sys, inspect, os, traceback
-
-
-def startTest(testName, DEVICE, params):
- """
- Main method running the test
- """
- # by default, assume the test failed:
- ret = 'Test failed'
- status = False
- # put the whole custom code under try/catch.
- try:
- # get the path of this script:
- testPath = inspect.getfile(inspect.currentframe())
- # init the testing tool class:
- test = TestingTool(testName, testPath, DEVICE, params)
-
-################ END OF Init #####################
-######### WRITE YOUR CODE HERE BELOW #############
-
- """
- All the code in this section # WRITE YOUR CODE HERE BELOW # is just an example and can be modified/deleted.
- It must be indented to the same level as this comment.
- -----------------------------------
- GETTING INPUTS:
- -----------------------------------
- If needed, the following methods are available:
-
- test.getPath() string, path of this test file
- test.getName() string, name of this test
- test.getDeviceName() string, device for which the test must run (typically it is the beginning of a process variable name)
- test.getPlotName() string, name to be given to the plot when using setPlotTitle(). Example: scan.setPlotTitle(test.getPlotName())
- -----------------------------------
- GETTING TEST PARAMETERS:
- -----------------------------------
- if you need to get parameters for the test, use:
-
- myParamValue = test.getParam('myParamName')
-
- the calls to getParam are added to the code automatically, one per parameter, when creating the new test.
- NOTE: Casting may be necessary.
- See the test config for the list of parameters specific to the test.
- -----------------------------------
- SETTING OUTPUTS:
- -----------------------------------
- When the test has ended (error or success), this method must be called in order to return to pshell:
-
- test.sendFeedback(ret,success)
-
- ret string, a text summarizing the result of the test.
- success bool, True = test successful. False = test failed.
- -----------------------------------
- LOG INFO:
- -----------------------------------
- when some information must be shown on the log on pshell, use the following line:
- test.log('text to log')
- """
-
- ########## Example (can be removed) ######
-
- # print the list of parameters passed. If any error, stop and send feedback.
- test.log("Test " + test.getName() + " for " + test.getDeviceName() )
- try:
- test.log("Running test with the following parameters:")
- test.printParams()
- ret = 'Success, nothing was done :-)'
- success = True
- test.sendFeedback(ret, success)
- return
- # fetch parameters
- mode = (test.getParam('mode'))
- ilkInExpectedValS = (test.getParam('ilkInExpectedValS'))
- magnetChName = (test.getParam('magnetCh'))
- ilkInChName = (test.getParam('ilkInCh'))
- ilkInExpectedValIni = (test.getParam('ilkInExpectedValIni'))
- ilkOutExpectedValL = (test.getParam('ilkOutExpectedValL'))
- magnetEndVal = int(test.getParam('magnetEndVal'))
- ilkOutChName = (test.getParam('ilkOutCh'))
- ilkOutExpectedValIni = (test.getParam('ilkOutExpectedValIni'))
- ilkOutExpectedValS = (test.getParam('ilkOutExpectedValS'))
- magnetInitVal = int(test.getParam('magnetInitVal'))
- setGetDelay = float(test.getParam('setGetDelay'))
- except:
- import traceback
- # test failed, write the report into the variables ret and success and send feedback:
- ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
- return
-
- rpsMask14 = 0x4440 # mask for outputs 2-4
- rpsMask58 = 0x0004 # mask for output 5
- ilk = Interlock()
- ilk.setInterlockMode(mode)
- sleep(setGetDelay)
- ilk.masterReset()
- # loop to read channels for a while and plot the channels values.
- # initialise plot tab with 3 plots:
- scan = ManualScan(['units'], ['Magnet', 'Interlock-In', 'Interlock-Out'])
- # set plot name(tab title):
- scan.setPlotTitle(test.getPlotName())
- # start plots. See further below how to add points to the plots (scan):
- scan.start()
- # now try with data from real device: this part will most probably fail: correct the PV names with existing ones.
- try:
- # set up connection to channels. "type" of data can be "d" (= double), "l" (= long).
- #magnetCh = Channel(magnetChName , type='d')
- #ilkInCh = Channel(ilkInChName , type='d')
- #ilkOutCh = Channel(ilkOutChName , type='d')
- print magnetChName
- except:
- import traceback
- # prepare return information: return text:
- ret = 'Unable to create channel - ' + traceback.format_exc()
- # prepare return information: return success:
- success = False
- # send return information:
- test.sendFeedback(ret, success)
- return
- # check RPS status
- #ilkInVal = ilkInCh.get()
- #ilkOutVal = ilkOutCh.get()
- ilkInVal = ilkInExpectedValIni #delete!!
- ilkOutVal = ilkOutExpectedValIni #delete!!
- if (ilkInVal == ilkInExpectedValIni):
- test.log(ilkInChName + ' ok')
- else:
- ret = ilkInChName + ' wrong - expected: ' + ilkInExpectedValIni + ' got: ' + ilkInVal
- success = False
- return
- if ((ilkOutVal & 0x000C) == ilkOutExpectedValIni):
- test.log(ilkOutChName + ' ok')
- else:
- ret = ilkOutChName + ' wrong - expected: ' + ilkOutExpectedValIni + ' got: ' + (ilkOutVal & 0x000C)
- success = False
- return
-
- # start scan of magnet
- # inject a sinus into the plot, as example
- from math import sin
- for sample in range(magnetInitVal, magnetEndVal, 10):
- readback1 = sample #the x axis.
- sleep(0.01) # settling time.
- # get value (it is translated to a caget):
- magnetVal = sample
- # get value:
- ilkInVal = sin(float(sample)/10.0)*10.0-10.0
- ilkOutVal = ilkInVal*0.5+10
- # add values to plot:
- scan.append([readback1], [readback1], [magnetVal, ilkInVal, ilkOutVal])
-
- #magnetCh.close()
- #ilkInCh.close()
- #ilkOutCh.close()
-
- ret = "Success, because..."
- success = True
- ################ End of Example ##########
-
-################ END OF YOUR CODE ################
-###### Final - DO NOT MODIFY THE CODE BELOW ######
-
- # just in case the feedback was forgotten.
- test.sendFeedback(ret, success)
- except (KeyboardInterrupt):
- # user stop error handler.
- import traceback
- ret = 'Test stopped by user.'
- success = False
- test.sendFeedback(ret, success)
- except:
- # generic error handler.
- import traceback
- ret = traceback.format_exc()
- success = False
- test.sendFeedback(ret, success)
-
-
-# launch the test.
-startTest(test, device, parameters)
-
-################ END OF Final ####################
-#### IF NEEDED, ADD YOUR FUNCTIONS HERE BELOW ####
-# Indent to end left
-# def yourCustomFunction:
diff --git a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html
deleted file mode 100644
index 7a07635..0000000
--- a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-Description
-Interlock Limits for Ablenksmagnet (Test n. 2 in old caRPS_Tests)
-Parameters
-
-ilkInExpectedValS | [hex] Interlock Input expected value for small values of magnet |
-magnetCh | Magnet epics channel |
-ilkInCh | Interlock Input epics channel |
-ilkInExpectedValIni | [hex] Interlock Input expected initial value |
-ilkOutExpectedValL | [hex] Interlock Output expected value for large values of magnet |
-magnetEndVal | [int] magnet final value for scan sequence |
-ilkOutCh | Interlock Output epics channel |
-ilkOutExpectedValIni | [hex] Interlock Output expected initial value |
-ilkOutExpectedValS | [hex] Interlock Output expected value for small values of magnet |
-magnetInitVal | [int] magnet initial value for scan sequence |
-setGetDelay | [s] delay between set and get |
-
-
-Contact
-Marco Boccioli
-Tel. 3078
-
-
-