From 5cd5ff8dd2984463acf5965d43b578795d354aec Mon Sep 17 00:00:00 2001
From: boccioli_m <boccioli_m@PC11577.psi.ch>
Date: Wed, 20 May 2015 15:04:52 +0200
Subject: [PATCH] Closedown

---
 script/Marco/motor-slide.py  | 20 ++++++++++----------
 script/Marco/power-supply.py | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/script/Marco/motor-slide.py b/script/Marco/motor-slide.py
index 531e8e3..597822e 100644
--- a/script/Marco/motor-slide.py
+++ b/script/Marco/motor-slide.py
@@ -1,9 +1,9 @@
-#Script imported from: PTEST-VME-HW_mot.xml
+#Script imported from: PO2DV-NCS-LS_mot.xml
 
 #Pre-actions
-caput('PTEST-VME-HW:MOTOR.TWF', '0')
+caput('PO2DV-NCS-LS:MOTOR.TWF', '0')
 sleep(0.5)
-caput('PTEST-VME-HW:MOTOR.RDBD', '0.1')
+caput('PO2DV-NCS-LS:MOTOR.RDBD', '0.1')
 
 #TODO: Set the diplay names of positioners and detectors
 scan = ManualScan(['VAL'], ['time', 'RVAL', 'TWF', 'RBV', 'Busy'] , [40.0], [44.0], [22])
@@ -11,17 +11,17 @@ scan.start()
 
 #Creating channels: dimension 1
 #RegionPositioner VAL
-VAL = Channel('PTEST-VME-HW:MOTOR.VAL', type = 'd')
-VALReadback = Channel('PTEST-VME-HW:MOTOR.RBV', type = 'd')
+VAL = Channel('PO2DV-NCS-LS:MOTOR.VAL', type = 'd')
+VALReadback = Channel('PO2DV-NCS-LS:MOTOR.RBV', type = 'd')
 #Timestamp time
 #ScalarDetector RVAL
-RVAL = Channel('PTEST-VME-HW:MOTOR.RVAL', type = 'd')
+RVAL = Channel('PO2DV-NCS-LS:MOTOR.RVAL', type = 'd')
 #ScalarDetector TWF
-TWF = Channel('PTEST-VME-HW:MOTOR.TWF', type = 'd')
+TWF = Channel('PO2DV-NCS-LS:MOTOR.TWF', type = 'd')
 #ScalarDetector RBV
-RBV = Channel('PTEST-VME-HW:MOTOR.RBV', type = 'd')
+RBV = Channel('PO2DV-NCS-LS:MOTOR.RBV', type = 'd')
 #ScalarDetector Busy
-Busy = Channel('PTEST-VME-HW:MOTOR.DMOV', type = 'd')
+Busy = Channel('PO2DV-NCS-LS:MOTOR.DMOV', type = 'd')
 
 #Dimension 1
 #RegionPositioner VAL
@@ -53,4 +53,4 @@ Busy.close()
 scan.end()
 
 #Post-actions
-caput('PTEST-VME-HW:MOTOR.RDBD', '1')
+caput('PO2DV-NCS-LS:MOTOR.RDBD', '1')
diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py
index 8cf59aa..d9f43eb 100644
--- a/script/Marco/power-supply.py
+++ b/script/Marco/power-supply.py
@@ -1,9 +1,9 @@
-#Script imported from: PTEST-VME-HW_ps.xml
+#Script imported from: PO2DV-NCS-HW_ps.xml
 
 #Pre-actions
-caput('PTEST-VME-VHQ1:Set-RampA', '25')
+caput('PO2DV-NCS-VHQ1:Set-RampA', '25')
 sleep(1.0)
-caput('PTEST-VME-VHQ1:Set-VA', '0')
+caput('PO2DV-NCS-VHQ1:Set-VA', '0')
 sleep(4.0)
 
 #TODO: Set the diplay names of positioners and detectors
@@ -12,10 +12,10 @@ scan.start()
 
 #Creating channels: dimension 1
 #LinearPositioner SetVA
-SetVA = Channel('PTEST-VME-VHQ1:Set-VA', type = 'd')
+SetVA = Channel('PO2DV-NCS-VHQ1:Set-VA', type = 'd')
 #Timestamp time
 #ScalarDetector ActualVA
-ActualVA = Channel('PTEST-VME-VHQ1:Actual-VA', type = 'd')
+ActualVA = Channel('PO2DV-NCS-VHQ1:Actual-VA', type = 'd')
 
 #Dimension 1
 #LinearPositioner SetVA
@@ -40,5 +40,5 @@ ActualVA.close()
 scan.end()
 
 #Post-actions
-caput('PTEST-VME-VHQ1:Set-VA', '0')
+caput('PO2DV-NCS-VHQ1:Set-VA', '0')
 sleep(4.0)