Merge branch 'rc'

FYNCH-BIO · Sep 24, 2019 · b471119 · b471119
2 parents 9e09ff4 + fa6fe5f
commit b471119
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 171 deletions.
diff --git a/cal_schema.json b/cal_schema.json
@@ -0,0 +1,25 @@
+[
+    {
+        "name": "string",
+        "measuredData":[[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]],
+        "calibrationType": "string",
+        "raw": [
+            {
+                "param":"string",
+                "vialData": [[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]],
+                "timeCollected": "number",
+                "name": "string"
+            }
+        ],
+        "fits": [
+            {
+                "name": "string",
+                "coefficients": [[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]],
+                "type": "string",
+                "timeFit": "number",
+                "active": "boolean",
+                "params": []
+            }
+        ]
+    }
+]
diff --git a/evolver/blink.py b/evolver/blink.py