Fix IeRen database for up5k

1 files changed, 40 insertions, 97 deletions

diff --git a/icebox/icebox.py b/icebox/icebox.py
index 327a229..cf5c4d1 100644
--- a/icebox/icebox.py
+++ b/icebox/icebox.py
@@ -2069,103 +2069,46 @@ ieren_db = {
         ( 7,  6, 0,  7,  6, 1),
         ( 7,  6, 1,  7,  6, 0),
     ],
-    "5k": [ #TODO: is this correct?
-        (1 ,  0, 0, 1 ,  0, 0),
-        (1 ,  0, 1, 1 ,  0, 1),
-        (1 , 31, 0, 1 , 31, 0),
-        (1 , 31, 1, 1 , 31, 1),
-        (2 ,  0, 0, 2 ,  0, 0),
-        (2 ,  0, 1, 2 ,  0, 1),
-        (2 , 31, 0, 2 , 31, 0),
-        (2 , 31, 1, 2 , 31, 1),
-        (3 ,  0, 0, 3 ,  0, 0),
-        (3 ,  0, 1, 3 ,  0, 1),
-        (3 , 31, 0, 3 , 31, 0),
-        (3 , 31, 1, 3 , 31, 1),
-        (4 ,  0, 0, 4 ,  0, 0),
-        (4 ,  0, 1, 4 ,  0, 1),
-        (4 , 31, 0, 4 , 31, 0),
-        (4 , 31, 1, 4 , 31, 1),
-        (5 ,  0, 0, 5 ,  0, 0),
-        (5 ,  0, 1, 5 ,  0, 1),
-        (5 , 31, 0, 5 , 31, 0),
-        (5 , 31, 1, 5 , 31, 1),
-        (6 ,  0, 0, 6 ,  0, 0),
-        (6 ,  0, 1, 6 ,  0, 1),
-        (6 , 31, 0, 6 , 31, 0),
-        (6 , 31, 1, 6 , 31, 1),
-        (7 ,  0, 0, 7 ,  0, 0),
-        (7 ,  0, 1, 7 ,  0, 1),
-        (7 , 31, 0, 7 , 31, 0),
-        (7 , 31, 1, 7 , 31, 1),
-        (8 ,  0, 0, 8 ,  0, 0),
-        (8 ,  0, 1, 8 ,  0, 1),
-        (8 , 31, 0, 8 , 31, 0),
-        (8 , 31, 1, 8 , 31, 1),
-        (9 ,  0, 0, 9 ,  0, 0),
-        (9 ,  0, 1, 9 ,  0, 1),
-        (9 , 31, 0, 9 , 31, 0),
-        (9 , 31, 1, 9 , 31, 1),
-        (10,  0, 0, 10,  0, 0),
-        (10,  0, 1, 10,  0, 1),
-        (10, 31, 0, 10, 31, 0),
-        (10, 31, 1, 10, 31, 1),
-        (11,  0, 0, 11,  0, 0),
-        (11,  0, 1, 11,  0, 1),
-        (11, 31, 0, 11, 31, 0),
-        (11, 31, 1, 11, 31, 1),
-        (12,  0, 0, 12,  0, 0),
-        (12,  0, 1, 12,  0, 1),
-        (12, 31, 0, 12, 31, 0),
-        (12, 31, 1, 12, 31, 1),
-        (13,  0, 0, 13,  0, 0),
-        (13,  0, 1, 13,  0, 1),
-        (13, 31, 0, 13, 31, 0),
-        (13, 31, 1, 13, 31, 1),
-        (14,  0, 0, 14,  0, 0),
-        (14,  0, 1, 14,  0, 1),
-        (14, 31, 0, 14, 31, 0),
-        (14, 31, 1, 14, 31, 1),
-        (15,  0, 0, 15,  0, 0),
-        (15,  0, 1, 15,  0, 1),
-        (15, 31, 0, 15, 31, 0),
-        (15, 31, 1, 15, 31, 1),
-        (16,  0, 0, 16,  0, 0),
-        (16,  0, 1, 16,  0, 1),
-        (16, 31, 0, 16, 31, 0),
-        (16, 31, 1, 16, 31, 1),
-        (17,  0, 0, 17,  0, 0),
-        (17,  0, 1, 17,  0, 1),
-        (17, 31, 0, 17, 31, 0),
-        (17, 31, 1, 17, 31, 1),
-        (18,  0, 0, 18,  0, 0),
-        (18,  0, 1, 18,  0, 1),
-        (18, 31, 0, 18, 31, 1),
-        (18, 31, 1, 18, 31, 0),
-        (19,  0, 0, 19,  0, 0),
-        (19,  0, 1, 19,  0, 1),
-        (19, 31, 0, 19, 31, 0),
-        (19, 31, 1, 19, 31, 1),
-        (20,  0, 0, 20,  0, 0),
-        (20,  0, 1, 20,  0, 1),
-        (20, 31, 0, 20, 31, 0),
-        (20, 31, 1, 20, 31, 1),
-        (21,  0, 0, 21,  0, 0),
-        (21,  0, 1, 21,  0, 1),
-        (21, 31, 0, 21, 31, 0),
-        (21, 31, 1, 21, 31, 1),
-        (22,  0, 0, 22,  0, 0),
-        (22,  0, 1, 22,  0, 1),
-        (22, 31, 0, 22, 31, 0),
-        (22, 31, 1, 22, 31, 1),
-        (23,  0, 0, 23,  0, 0),
-        (23,  0, 1, 23,  0, 1),
-        (23, 31, 0, 23, 31, 0),
-        (23, 31, 1, 23, 31, 1),
-        (24,  0, 0, 24,  0, 0),
-        (24,  0, 1, 24,  0, 1),
-        (24, 31, 0, 24, 31, 0),
-        (24, 31, 1, 24, 31, 1)
+    "5k": [
+        ( 8,  0,  0,  8,  0,  1),
+        ( 9,  0,  1,  9,  0,  0),
+        ( 9,  0,  0,  9,  0,  1),
+        (13,  0,  1, 13,  0,  0),
+        (15,  0,  0, 15,  0,  1),
+        (16,  0,  0, 16,  0,  1),
+        (17,  0,  0, 17,  0,  1),
+        (18,  0,  0, 18,  0,  1),
+        (19,  0,  0, 19,  0,  1),
+        (23,  0,  0, 23,  0,  1),
+        (24,  0,  0, 24,  0,  1),
+        (24,  0,  1, 24,  0,  0),
+        (23,  0,  1, 23,  0,  0),
+        (22,  0,  1, 22,  0,  0),
+        (21,  0,  1, 21,  0,  0),
+        (19,  0,  1, 19,  0,  0),
+        (18,  0,  1, 18,  0,  0),
+        (19, 31,  0, 19, 31,  1),
+        (19, 31,  1, 19, 31,  0),
+        (18, 31,  0, 18, 31,  1),
+        (18, 31,  1, 18, 31,  0),
+        (17, 31,  0, 17, 31,  1),
+        (16, 31,  1, 16, 31,  0),
+        (16, 31,  0, 16, 31,  1),
+        (13, 31,  1, 13, 31,  0),
+        (12, 31,  1, 12, 31,  0),
+        ( 9, 31,  1,  9, 31,  0),
+        (13, 31,  0, 13, 31,  1),
+        ( 4, 31,  0,  4, 31,  1),
+        ( 5, 31,  0,  5, 31,  1),
+        ( 6, 31,  0,  6, 31,  1),
+        ( 8, 31,  1,  8, 31,  0),
+        ( 8, 31,  0,  8, 31,  1),
+        ( 9, 31,  0,  9, 31,  1),
+        ( 6,  0,  1,  6,  0,  0),
+        ( 7,  0,  1,  7,  0,  0),
+        ( 5,  0,  0,  5,  0,  1),
+        ( 6,  0,  0,  6,  0,  1),
+        ( 7,  0,  0,  7,  0,  1)
     ]
 }