script/motion/tools.py

@@ -142,15 +142,17 @@ def get_puck_name(segment, puck):
     try:
         assert_valid_address(segment, puck, 1)
         if type(segment) is int:
-            segment = chr( ord('A') + (pos-1))
-        elif type(segment) is str:
-            segment = pos.upper()    
+            segment = chr( ord('A') + (segment-1))
+        elif is_string(segment):
+            segment = segment.upper()    
         else:
             return None
         return segment + str(puck)         
     except:
         return None
 
-
+def get_sample_name(segment, puck, sample):
+    puck_name = get_puck_name(segment, puck)
+    return None if (puck_name is None) else puck_name + str(sample)