genred instrument recognition problem

was causing problems with colours

hipercam/scripts/genred.py

@@ -297,7 +297,7 @@ def genred(args=None):
                 nccd = 1
                 ccd = '1'
 
-            else:
+            elif instrument == "other":
 
                 # unrecognised instrument need extra stuff
                 nccd = cl.get_value("nccd", "how many CCDs?", 3, 1)
@@ -345,6 +345,11 @@ def genred(args=None):
                     "gain", "gain, electrons/ADU, (float or file name)", "1.1"
                 )
 
+            else:
+                raise hcam.HipercamError(
+                    "Programming error: instrument unrecognised"
+                )
+
 
             if ccd not in aper:
                 # make sure 'ccd' is in aper, even if our
@@ -497,28 +502,28 @@ def genred(args=None):
         souter = 1.4*sinner
 
     # standard colours for CCDs
-    if instrument == "hipercam":
+    if instrument.startswith("hipercam"):
         CCD_COLS = {
-            "1": "purple",
+            "1": "blue",
             "2": "green",
             "3": "orange",
             "4": "red",
             "5": "darkred",
         }
 
-    elif instrument == "ultracam":
+    elif instrument.startswith("ultracam"):
         CCD_COLS = {
             "1": "red",
             "2": "green",
             "3": "blue",
         }
 
-    elif instrument == "ultraspec":
+    elif instrument.startswith("ultraspec"):
         CCD_COLS = {
             "1": "green",
         }
 
-    else:
+    elif instrument == "other":
         # 'other'
         CCD_COLS = {
             "1": "green",
@@ -527,6 +532,10 @@ def genred(args=None):
             "4": "orange",
             "5": "purple",
         }
+    else:
+        raise hcam.HipercamError(
+            "Programming error: instrument unrecognised"
+        )
 
     # Extraction lines
     extraction = ""