script/devices/eiger.py

@@ -99,7 +99,8 @@ def grab_frame(source, roi=None, wait_next=False, rmv_outliers=True):
         data = data.getRoi(Rectangle(roi[0], roi[1], roi[2], roi[3]))
     #ret = load_image(img)
     if rmv_outliers:
-        data = remove_outliers(data)
+        #data = remove_outliers(data)
+        data.threshold(1e9, False, None)
     return data
     
 def grab_frames(source, samples, roi=None, wait_next=False, sleep=0, rmv_outliers=True):
@@ -125,6 +126,7 @@ def average_frames(frames):
         ret.div(len(frames))        
     return ret 
 
+"""
 def remove_outliers(imgdata, threshold = 1e9, replace_value=None):
     if replace_value is None:
         if str(imgdata.getType()) in  ('float', 'double'):
@@ -136,7 +138,8 @@ def remove_outliers(imgdata, threshold = 1e9, replace_value=None):
         for j in range(data.height):
             if data.getElementDbl(j,i, False) >=threshold:
                 data.setElement(j*data.width + i, replace_value)
-    return data    
+    return data
+"""
 
 def save_as_tiff(data, filename, check=False, show = False):
     if type(data) == Data:

script/devices/id.py

@@ -1,5 +1,5 @@
 
-POL_IDS={    "Circ_Plus": 1, "Circ_Minus": 2, "Lin_Hor":3, "Lin_Ver": 4}
+POL_IDS={    "Circ_Plus": 1, "Circ_Minus": 2, "Lin_Hor":3, "Lin_Ver": 4, "Lin": 5}
 
 
 
@@ -31,13 +31,23 @@ def get_id_pol(id, as_string=False):
     # 4: Lin V
     # 5: LIn
     if id<1 or id>2: raise Exception("Invalid id")
-    ret = caget ("X11MA-ID1:MODE" if id==1 else "X11MA-ID2:MODE", 's' if as_string else  'i')
-    if ret!=0: return ret
-    #linear mode
-    alpha = get_alpha_id(id)
-    if alpha==0 : return 3
-    if alpha==90 : return 4
-    return 5
+    #ret = caget ("X11MA-ID1:MODE" if id==1 else "X11MA-ID2:MODE", 's' if as_string else  'i')
+    ret = caget ("X11MA-ID1:MODE" if id==1 else "X11MA-ID2:MODE", 'i')
+    if ret==0:
+        #linear mode
+        alpha = get_alpha_id(id)
+        if alpha==0 : 
+            ret = 3
+        elif alpha==90: 
+            ret = 4
+        else:
+            ret = 5
+    if as_string:
+        for (k,v) in POL_IDS.items():
+            if v==ret:
+                return k
+        return "Unknown"
+    return ret   
 
 def get_alpha_id(id): 
     if id<1 or id>2:    raise Exception("Invalid id")     
@@ -66,7 +76,11 @@ def put_id_pol(id, pol, alpha=None):
         
     pv1="X11MA-ID1:MODE" if (id==1) else  "X11MA-ID2:MODE"
     pv2="X11MA-ID1:ALPHA" if (id==1) else "X11MA-ID2:ALPHA"
-    
+
+
+    if is_string(pol):
+        pol=POL_IDS[v]
+            
     if pol == 1:        
     	caput(pv1,1)
     elif pol == 2: