From c0551807764e2589c1104d740d04e30eb97018a9 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Sat, 10 Sep 2016 16:11:58 +0200
Subject: [PATCH] Closedown

---
 script/RefocusManipulatorScan.py     |  2 +-
 script/RefocusRoZManipulatorZScan.py | 38 ----------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 script/RefocusRoZManipulatorZScan.py

diff --git a/script/RefocusManipulatorScan.py b/script/RefocusManipulatorScan.py
index cada7370..31254e8f 100644
--- a/script/RefocusManipulatorScan.py
+++ b/script/RefocusManipulatorScan.py
@@ -36,8 +36,8 @@ set_adc_averaging()
 
 def trig_sensors():
     wait_beam()
-    trig_scienta()
     caput("X03DA-OP-10ADC:TRG.PROC", 1)
+    trig_scienta()
     
 try:
     lscan(MOTOR, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=trig_sensors, after_read = after_readout)
diff --git a/script/RefocusRoZManipulatorZScan.py b/script/RefocusRoZManipulatorZScan.py
deleted file mode 100644
index 649b5b81..00000000
--- a/script/RefocusRoZManipulatorZScan.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-Scan refocusing mirror ROZ and manipulator X in parallel  (to find analyser focus).
-Beam stays on same spot on the sample.
-
-set scan parameters below.
-set analyser parameters separately!
-move manipulator and mirror to center position before start!
-"""
-
-import math
-
-# adjust the following parameters
-STEPS = 25
-LATENCY = 0.0
-ENDSCAN = False
-
-# do not edit below
-
-MOTOR = (RefocusZRot, ManipulatorZ)
-SENSORS = (Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution)
-
-STARTPOS = (-2.000, 114.9)
-ENDPOS = (-1.259, 115.1)
-RELATIVE = False
-
-adjust_sensors()
-set_adc_averaging()
-
-def trig_sensors():
-    wait_beam()
-    trig_scienta()
-    caput("X03DA-OP-10ADC:TRG.PROC", 1)
-    
-try:
-    lscan(MOTOR, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=trig_sensors, after_read = after_readout)
-finally:
-    if ENDSCAN:
-        after_scan()