src/main/java/ch/psi/mxsc/Puck.java

@@ -97,7 +97,19 @@ public class Puck extends DeviceBase {
         Minispine,
         Unipuck,
         Error,
-        Unknown,
+        Unknown;
+        
+        public boolean isDefined(){
+            return (this==Minispine) || (this==Unipuck);
+        } 
+        
+    }
+    
+    public String getStatus(){
+        if ((detection==Detection.Present) && puckType.isDefined()) {
+            return puckType.toString();
+        }
+        return detection.toString();
     }
     
     public double getAngle() {