From 7ceb5ef2e3c3a8dbb02e4d90ca674f2e7f9bcc5b Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-02.psi.ch>
Date: Sat, 19 Aug 2023 16:14:57 +0200
Subject: [PATCH] Script execution

---
 .../optics/microfocus/ManipulatorFlyScan.py   | 41 ++-----------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/script/optics/microfocus/ManipulatorFlyScan.py b/script/optics/microfocus/ManipulatorFlyScan.py
index 9968cf04..40aae293 100644
--- a/script/optics/microfocus/ManipulatorFlyScan.py
+++ b/script/optics/microfocus/ManipulatorFlyScan.py
@@ -10,35 +10,9 @@ note that the motors have a limited speed range!
 import math
 
 MOTORS = (ManipulatorY)
-CENTER = -0.6
-WIDTH = 1.
-RANGE = (CENTER - WIDTH / 2., CENTER + WIDTH / 2.)
+RANGE = (2.70, -1.0)
 STEP = 0.0010
-
-#MOTORS = (ManipulatorY)
-#RANGE = (-3.5, +3.5)
-#STEP = 0.1
-
-# Z axis cannot be used in fly scan. minimum speed is too high.
-#MOTORS = (ManipulatorZ)
-#RANGE = (112., 118.)
-#STEP = 0.4
-
-#MOTORS = (ManipulatorTheta)
-#RANGE = (-9., 81.)
-## minimum speed 0.001, maximum speed 0.5 deg/s
-#SPEED = 0.1
-
-#MOTORS = (ManipulatorTilt)
-#RANGE = (-20., +20.)
-## minimum speed 0.1, maximum speed 1.4 mm/s
-#SPEED = 1.0
-
-#MOTORS = (ManipulatorPhi)
-#RANGE = (-179., +180.)
-## minimum speed 0.6, maximum speed 6.0 mm/s
-#SPEED = 1.0
-
+SPEED = 0.0105
 
 SENSORS = (SampleCurrent, RefCurrent, MachineCurrent)
 
@@ -50,18 +24,9 @@ LATENCY = 0.0
 ZIGZAG = False
 ENDSCAN = False
 
-#adjust_sensors()
-#set_adc_averaging()
-
-step_time = 0.1
-print "step time: ", step_time
-
-# time for one scan in seconds
-SPEED = STEP / step_time
-print "speed: ", SPEED
 fly_time = (RANGE[1] - RANGE[0]) / SPEED
 STEPS = int(fly_time / step_time) + 1
 print "scan time: ", fly_time
 
-cscan(MOTORS, SENSORS, RANGE[0], RANGE[1], STEPS, time=fly_time, before_read=before_readout, check_positions = False)
+cscan(MOTORS, SENSORS, RANGE[0], RANGE[1], STEPS, time=fly_time, check_positions = False)
         
\ No newline at end of file