update to custom parser to account for remote electrodes

hkexgroup · Aug 31, 2021 · 0ec6144 · 0ec6144
1 parent 2fb1a5f
commit 0ec6144
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/resipy/parsers.py b/src/resipy/parsers.py
@@ -257,10 +257,12 @@ def syscalParser(fname):#, spacing=None):
         # NOTE: remote electrode identification is done in R2.setElec()
         # but we notice that setting same number for remote (-99999) makes
         # the pseudo-section of remote electrode survey nicer...
-        remoteFlags = np.array([-9999999, -999999, -99999,-9999,-999,
-                                9999999, 999999, 99999, 9999, 999])
-        iremote = np.in1d(val, remoteFlags)
-        elec[iremote, 0] = -99999
+        remoteFlags_p1 = np.array([-9999999, -999999, -99999,-9999,-999])
+        remoteFlags_p2 = np.array([9999999, 999999, 99999, 9999, 999])
+        iremote_p1 = np.in1d(val, remoteFlags_p1)
+        elec[iremote_p1, 0] = -99999
+        iremote_p2 = np.in1d(val, remoteFlags_p2)
+        elec[iremote_p2, 0] = 99999
 
         if np.all(df['dev'].values == 0) and 'Dev. M' in df.columns: # Prosys III has to Dev. lists, assuming Dev. Rho (%) == 0 and Dev. M != 0 when IP data is collected.
             df['dev'] = df['Dev. M'].values

diff --git a/src/ui.py b/src/ui.py
@@ -2236,6 +2236,12 @@ def parserFunc(fname):
                     zval = np.zeros_like(val)
                     yval = np.zeros_like(val) # 2D so Y values are all zeros
                     elec = np.c_[val, yval, zval]
+                    remoteFlags_p1 = np.array([-9999999, -999999, -99999,-9999,-999])
+                    remoteFlags_p2 = np.array([9999999, 999999, 99999, 9999, 999])
+                    iremote_p1 = np.in1d(val, remoteFlags_p1)
+                    elec[iremote_p1, 0] = -99999
+                    iremote_p2 = np.in1d(val, remoteFlags_p2)
+                    elec[iremote_p2, 0] = 99999
 
                     ##### Old way