pshell_config/ncs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Script execution

Browse Source
This commit is contained in:
boccioli_m
2015-06-18 08:06:11 +02:00
parent 2f13996d7c
commit 778850ae55
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py
View File

@@ -74,7 +74,7 @@ for setpoint1 in range(0, loopTimes):
count = count + 1
sleep( 2 ) # Settling time
#RegionPositioner idInkr
for setpoint2 in frange(start, end, direction):
for setpoint2 in frange(start, end, direction, true):
readback1 = setpoint1
################### beginning of C ##################
idInkr = setpoint2 # idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout
@@ -119,14 +119,14 @@ for setpoint1 in range(0, loopTimes):
idDiff01 = a-b
countSteps = countSteps + 1
scan.append ([countSteps], [countSteps], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, idDiff02, idDiff01])
if endH>0.0 or (direction > 0.0 and setpoint2 >= end ):
if endH>0.0 or (direction > 0.0 and setpoint2 >= end-1 ):
#invert direction and swap start with end of translation
end = startDefault
start = setpoint2 - direction
direction = -1.0
print 'End of span (' + str(setpoint2) + '), changing direction to ' + str(direction)
break
if endL>0.0 or ( direction < 0.0 and setpoint2 <= end ):
if endL>0.0 or ( direction < 0.0 and setpoint2 <= end+1 ):
#invert direction and swap start with end of translation
end = endDefault
start = setpoint2 - direction