script/devices/LEEM2000.py

@@ -367,7 +367,7 @@ class ListenerAzimuth (DeviceListener):
                 set_azimuth_rot(value)
             except:
                 if self.debug:
-                    self.getLogger().warning(str(sys.exc_info()[1]))  
+                    log(str(sys.exc_info()[1]))  
 listenerAzimuth = ListenerAzimuth()
 listenerAzimuth.debug=True
 azimuth_rot.addListener(listenerAzimuth)

script/devices/diag.py

@@ -103,6 +103,7 @@ diag_devices = {
      "PEEM high voltage": microscope.high_voltage, \
      "Tilt vertical": tilt_vertical, \
      "Tilt horizontal": tilt_horizontal, \
+     "ai1 current": ai1, \
     }
 
 

script/devices/eiger.py

@@ -224,6 +224,7 @@ def _shift_and_save_as_tiff(data, filename, reference=None, roi=None, image_drif
     except:
         print "-> Error shifting image: " + str(sys.exc_info()[1])
         return
+    metadata["roi"] = str(roi)
     save_as_tiff(shifted_frame, filename, check, show, parallel=False, metadata=metadata)        
 
 def shift_and_save_as_tiff(data, filename, reference=None, roi=None, shift=None, check=False, show = False, parallel=True, metadata={}):
@@ -426,10 +427,12 @@ class ProcImage(Filter):
         self.outliers_mask =None
         
     def processData(self, data):    
+        if data is None:
+          return None
         outliers_threshold = get_outliers_threshold() if (self.outliers_threshold is None) else self.outliers_threshold
         outliers_mask = get_outliers_mask() if (self.outliers_mask is None) else self.outliers_mask
         roi = self.roi
-        data=data.copy()
+        data=data.copy()        
         if roi is not None:
             data = data.getRoi(Rectangle(roi[0], roi[1], roi[2], roi[3]))
         #ret = load_image(img)