script/test/Diagnostics.py

@@ -13,7 +13,7 @@ diag_channels = { \
      "girder z": "X11MA-HG:Z1", \
      "girder pitch": "X11MA-HG:PITCH1", \
      "girder yaw": "X11MA-HG:YAW1", \
-     "girder roll set": "X11MA-HG:ROLL_SET", \
+     "girder roll": "X11MA-HG:ROLL1", \         
      "CMU ox": "X11MA-OP-CM:ox", \
      "CMU oy": "X11MA-OP-CM:oy", \
      "CMU oz": "X11MA-OP-CM:oz", \
@@ -69,12 +69,12 @@ def get_diags():
         try:
             ret[k]=str(v.read())
         except:
-            ret[k]="Error: " + sys.exc_info()[1]
+            ret[k]="Error: " + str(sys.exc_info()[1])
     for k,v in diag_channels.items():
         try:
             ret[k]=caget(v,'s')
         except:
-            ret[k]="Error: " + sys.exc_info()[1]
+            ret[k]="Error: " + str(sys.exc_info()[1])
     ret["exposure time"] = str(eiger.getExposure())
     return OrderedDict(sorted(ret.items(), key=lambda i: i[0].lower()))
 

script/test/Simu2Img.py

@@ -85,7 +85,8 @@ def assert_status_ok():
 #Initialize vartiables
 if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
     open_vg10()
-
+if not get_dry_run() and str(get_setting("AUTO_SWITCH_SHUTTER")).lower() == "true":
+    caput(FAST_SHTR, 'Open')
 
 active_id = 1
 current_pol=None
@@ -259,6 +260,8 @@ try:
             save_image_file(av, -1, i)        
 finally:     
     if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
-        close_vg10()   
+        close_vg10()
+    if not get_dry_run() and str(get_setting("AUTO_SWITCH_SHUTTER")).lower() == "true":
+        caput(FAST_SHTR, 'Close')
     #restore_eiger()
     print "Running time: " + str(time.time() - start)

script/test/SimuAbsSpec.py

@@ -85,6 +85,8 @@ sensors.append(averager) #sensors.append(eiger.getDataMatrix())
 #Initialize vartiables
 if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
     open_vg10()
+if not get_dry_run() and str(get_setting("AUTO_SWITCH_SHUTTER")).lower() == "true":
+    caput(FAST_SHTR, 'Open')
 
 #put_id_offset(1, OFFSET_ID_1) #offset on ID1
 #put_id_offset(2, OFFSET_ID_2) #offset on ID2
@@ -117,6 +119,8 @@ finally:
         for i in range(len(rois)):  
             rois[i].parent.monitored = False # Remove listeners on the image
     if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
-        close_vg10()   
+        close_vg10()
+    if not get_dry_run() and str(get_setting("AUTO_SWITCH_SHUTTER")).lower() == "true":
+        caput(FAST_SHTR, 'Close')
     #restore_eiger()
     print "Running time: " + str(time.time() - start)

script/test/TestEiger.py

@@ -0,0 +1,12 @@
+EXPOSURE = 1.0
+AVERAGE = 2
+
+counter = 0
+while(True):
+    print "-> Averaging %d..." % (counter,)
+    init_eiger(exposure=EXPOSURE)
+    av = average_eiger_frames(AVERAGE, roi=None, wait_next=True)
+    plot(av.matrix)
+    print "-> Restoring %d..." % (counter,)
+    restore_eiger()
+    counter = counter+1

script/test/Test_AK.py

@@ -0,0 +1,14 @@
+def neutralize_position(retries = 3):
+    for i in range(retries):
+        try:
+            if abs(manip_x.readback.read()) > 50:
+                manip_x.write(0.0)
+            if abs(manip_y.readback.read()) > 50:
+                manip_y.write(0.0)
+                
+            time.sleep(1)
+            break
+        except:
+            if i>=(retries-1):
+                raise
+            log("neutralize_position error - retrying: " + sys.exc_info()[1])