Closedown

script/HarmonicScan.py

@@ -14,35 +14,27 @@ try:
         wait_device(energy_done, 1 )
         sensors = [signal_i0, signal_tey, 'ca://X07MA-PC-K428:2:getTotalGain', energy]
         
-        if MODE != "Manual":
-            POL = MODE
-            ALPHA = None
-            if MODE == "LINEAR H":
-                POL = "LINEAR"
-                ALPHA = 0
-            elif MODE == "LINEAR V":
-                POL = "LINEAR"
-                ALPHA = 90
-            caput('X07MA-ID:MODE', POL)
-            time.sleep(1.0)
-            if POL == 'LINEAR':
-                caput('X07MA-ID:ALPHA', ALPHA)
-            wait_channel('X07MA-ID:DONE', 'DONE', type = 's')
-
+        if MODE =="C+":
+            set_pol_cplus()
+        if MODE =="C-":
+            set_pol_cminus()
+        if MODE == "LH":
+            set_pol_lin(0.0)                 
+        elif MODE == "LV":
+            set_pol_lin(90.0)                 
+       
     else: 
         sensors = [sin, energy]
         
-    def before(position, scan):
-        #wait_device(energy_done, 1 )
-        sleep( 0.3 ) # Settling time              
-
-    #ret = lscan(energy, [signal_i0, signal_tey, 'ca://X07MA-PC-K428:2:getTotalGain', 'ca://X07MA-ID:MODE?type=d', pol_angle, current, energy, pol_offset, 'ca://X07MA-ID-GAP:READ','ca://X07MA-ID-SHIFT:READ'], ID_ENERGY-HALFWIDTH, ID_ENERGY+HALFWIDTH, STEP, before_read = before)
-    ret = lscan(energy, sensors, ID_ENERGY-HALFWIDTH, ID_ENERGY+HALFWIDTH, STEP, before_read = before)
+    ret = lscan(energy, sensors, ID_ENERGY-HALFWIDTH, ID_ENERGY+HALFWIDTH, STEP, latency = 0.3)
+    
     xdata = ret.getPositions(0)
     ydata = ret.getReadable(0)
     ymin = min(ydata)
-    xminmin = xdata[ydata.index(min(ydata))]
-    print "Emin=",xminmin,"ymin = ",ymin
+    e0 = xdata[ydata.index(min(ydata))]
+    new_offset =ID_ENERGY – e0 + pol_offset.take()
+      
+    set_return(new_offset);
     
 except:   
     print("Aborting...")