Browse Source

Transmitter version 6 fixes

HEAD
Trevor Irons 7 years ago
parent
commit
6873916616
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      akvo/tressel/mrsurvey.py

+ 5
- 5
akvo/tressel/mrsurvey.py View File

@@ -209,13 +209,13 @@ class GMRDataProcessor(SNMRDataProcessor):
209 209
 
210 210
         #######################################################
211 211
         # Circuit gain
212
-        # proprietary of VC. 
212
+        # From MRSMatlab 
213 213
         w = 2*np.pi*self.transFreq
214 214
         # 1e6 due to uF of reported capacitance
215 215
         L_coil = 1e6/(self.TuneCapacitance*(w**2))
216 216
         R_coil = 1.
217 217
         Z1_in = .5 + 1j*.5*w
218
-        Z2_in = 1./(1j*w*.0000016) #1616 in notes, but this is what MRSMatlab uses
218
+        Z2_in = 1./(1j*w*.000001616) 
219 219
         Z_eq_inv = (1./Z1_in) + (1./Z2_in)
220 220
         Zeq = 1./Z_eq_inv
221 221
         Zsource = R_coil + 1j*w*L_coil
@@ -226,9 +226,9 @@ class GMRDataProcessor(SNMRDataProcessor):
226 226
 
227 227
         ######################################################
228 228
         # PreAmp gain
229
-        if self.nTransVersion >= 4:
229
+        if self.nTransVersion == 4:
230 230
             self.PreAmpGain = 1000.
231
-        elif self.nTransVersion == 1 or self.nTransVersion == 2 or self.nTransVersion == 3:
231
+        elif self.nTransVersion == 1 or self.nTransVersion == 2 or self.nTransVersion == 3 or self.nTransVersion == 6:
232 232
             self.PreAmpGain = 500.
233 233
         else:
234 234
             print ("unsupported transmitter version")
@@ -1811,7 +1811,7 @@ class GMRDataProcessor(SNMRDataProcessor):
1811 1811
                         self.DATADICT[pulse]["CURRENT"][ipm][istack] = np.zeros(3) 
1812 1812
 
1813 1813
         ##############################################
1814
-        # Read in binary (.npy) data
1814
+        # Read in binary (.lvm) data
1815 1815
         iistack = 0
1816 1816
         hack = False
1817 1817
         for istack in procStacks:

Loading…
Cancel
Save