From 68bac0a5aa18dd9589bd8829840fd92e2360aa54 Mon Sep 17 00:00:00 2001
From: bcolsen <bcolsen@gmail.com>
Date: Mon, 21 Oct 2019 15:28:06 -0600
Subject: [PATCH 1/4] Added RCMP column and column debug info

---
 galvani/BioLogic.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index 3bffec9..bb36234 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -166,6 +166,7 @@ VMPdata_colID_dtype_map = {
     125: ('Capacitance charge/µF', '<f8'),
     126: ('Capacitance discharge/µF', '<f8'),
     131: ('Ns', '<u2'),
+    168: ('Rcmp/Ohm', '<f4'),
     169: ('Cs/µF', '<f4'),
     172: ('Cp/µF', '<f4'),
     434: ('(Q-Qo)/C', '<f4'),
@@ -236,6 +237,9 @@ def VMPdata_dtype_from_colIDs(colIDs):
                 unique_field_name = field_name
             type_list.append((unique_field_name, field_type))
         else:
+            print('ColIDs: ',
+                  [colID for colID in colIDs if colID not in VMPdata_colID_flag_map])
+            print('Types: ', type_list[1:])
             raise NotImplementedError("column type %d not implemented" % colID)
     return np.dtype(type_list), flags_dict
 

From 4098890c05a958b55ca1d310719bbaf7798ccf16 Mon Sep 17 00:00:00 2001
From: bcolsen <bcolsen@gmail.com>
Date: Tue, 7 Jul 2020 17:54:21 -0600
Subject: [PATCH 2/4] changed error to report previous column name

---
 galvani/BioLogic.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index bb36234..1758ab5 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -237,10 +237,8 @@ def VMPdata_dtype_from_colIDs(colIDs):
                 unique_field_name = field_name
             type_list.append((unique_field_name, field_type))
         else:
-            print('ColIDs: ',
-                  [colID for colID in colIDs if colID not in VMPdata_colID_flag_map])
-            print('Types: ', type_list[1:])
-            raise NotImplementedError("column type %d not implemented" % colID)
+            raise NotImplementedError("Column ID {cid} after column {prev} "
+                "is unknown".format(cid=colID, prev=type_list[-1][0]))
     return np.dtype(type_list), flags_dict
 
 

From 18e8a450fa5e8ea95c53cf80c945114f84a8191b Mon Sep 17 00:00:00 2001
From: bcolsen <bcolsen@gmail.com>
Date: Tue, 7 Jul 2020 18:07:30 -0600
Subject: [PATCH 3/4] pep8 fix

---
 galvani/BioLogic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index 1758ab5..0a0db5f 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -238,7 +238,7 @@ def VMPdata_dtype_from_colIDs(colIDs):
             type_list.append((unique_field_name, field_type))
         else:
             raise NotImplementedError("Column ID {cid} after column {prev} "
-                "is unknown".format(cid=colID, prev=type_list[-1][0]))
+                    "is unknown".format(cid=colID, prev=type_list[-1][0]))
     return np.dtype(type_list), flags_dict
 
 

From 18a1ce6848e342b6275bde7a7d4ecbe1373b4cc9 Mon Sep 17 00:00:00 2001
From: bcolsen <bcolsen@gmail.com>
Date: Tue, 7 Jul 2020 18:13:53 -0600
Subject: [PATCH 4/4] fix pep

---
 galvani/BioLogic.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index 0a0db5f..3654b02 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -238,7 +238,9 @@ def VMPdata_dtype_from_colIDs(colIDs):
             type_list.append((unique_field_name, field_type))
         else:
             raise NotImplementedError("Column ID {cid} after column {prev} "
-                    "is unknown".format(cid=colID, prev=type_list[-1][0]))
+                                      "is unknown"
+                                      .format(cid=colID,
+                                              prev=type_list[-1][0]))
     return np.dtype(type_list), flags_dict