From 5a472d881a5e3f53405b9d669cddb2f81add9c80 Mon Sep 17 00:00:00 2001
From: Kevin Peterson <kmpeters@anl.gov>
Date: Thu, 11 Oct 2012 19:51:48 +0000
Subject: [PATCH] Updated labTransform.py and myTransform.py for addition of
enablePv
git-svn-id: https://subversion.xray.aps.anl.gov/kmp/transform/trunk@353 f095f811-4e88-6c84-d33e-e382bdb4531c
---
labTransform.py | 11 ++++++++---
myTransform.py | 8 +++++---
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/labTransform.py b/labTransform.py
index da2cc96..dffaae6 100644
--- a/labTransform.py
+++ b/labTransform.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
+#start this with epd python: /APSshare/epd/rh5-x86/bin/python labTransform.py
+
import transform
from numpy import matrix, sin, cos, degrees, radians
@@ -52,9 +54,12 @@ class myTransform(transform.transform):
if __name__ == "__main__":
prefix = '34idc:'
+ labStr = 'lab'
realMotors = ["%s%s" % (prefix, x) for x in ('m58:c3:m5', 'm58:c3:m6', 'm58:c0:m8') ]
+# realMotors = ["%s%s" % (prefix, x) for x in ('npt:c0:m1', 'npt:c0:m2', 'npt:c0:m3') ]
transformMotors = ["%s%s" % (prefix, x) for x in ('aero:c0:m1', 'm58:c3:m1', 'm58:c3:m2') ]
- softMotors = ["%s%s" % (prefix, x) for x in ('lab:m1', 'lab:m2', 'lab:m3') ]
- print realMotors, transformMotors, softMotors
- MyTrans = myTransform(realMotors, transformMotors, softMotors)
+ softMotors = ["%s%s:%s" % (prefix, labStr, x) for x in ('m1', 'm2', 'm3') ]
+ enablePv = "%s%s:enable" % (prefix, labStr)
+ print realMotors, transformMotors, softMotors, enablePv
+ MyTrans = myTransform(realMotors, transformMotors, softMotors, enablePv)
MyTrans.main()
diff --git a/myTransform.py b/myTransform.py
index b7c1cef..014d4aa 100644
--- a/myTransform.py
+++ b/myTransform.py
@@ -49,9 +49,11 @@ class myTransform(transform.transform):
if __name__ == "__main__":
prefix = 'kmp2:'
+ labStr = 'lab'
realMotors = ["%s%s" % (prefix, x) for x in ('m1', 'm2', 'm3') ]
transformMotors = ["%s%s" % (prefix, x) for x in ('m4', 'm5', 'm6') ]
- softMotors = ["%s%s" % (prefix, x) for x in ('lab:m1', 'lab:m2', 'lab:m3') ]
- print realMotors, transformMotors, softMotors
- MyTrans = myTransform(realMotors, transformMotors, softMotors)
+ softMotors = ["%s%s:%s" % (prefix, labStr, x) for x in ('m1', 'm2', 'm3') ]
+ enablePv = "%s%s:enable" % (prefix, labStr)
+ print realMotors, transformMotors, softMotors, enablePv
+ MyTrans = myTransform(realMotors, transformMotors, softMotors, enablePv)
MyTrans.main()
--
GitLab