Skip to content

Commit 99a9c48

Browse files
author
Daniel Buscombe
committed
Sun Jan 21 12:58:28 MST 2018
1 parent 171e39c commit 99a9c48

File tree

11 files changed

+2581
-3471
lines changed

11 files changed

+2581
-3471
lines changed

‎PyHum/_pyhum_read.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,10 @@ def read(humfile, sonpath, cs2cs_args="epsg:26949", c=1450.0, draft=0.3, doplot=
320320
#c=1450; bedpick=1; fliplr=1; chunk = 'd100'
321321
#model=998; cog=1; calc_bearing=0; filt_bearing=0
322322

323-
f = 455
323+
if model==2:
324+
f = 1000
325+
else:
326+
f = 455
324327

325328
try:
326329
print("Checking the epsg code you have chosen for compatibility with Basemap ... ")

‎PyHum/_pyhum_texture2.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ def plot_class(dist_m, shape_port, dat_port, dat_star, dat_class, ft, humfile, s
416416
plt.imshow(np.vstack((np.flipud(dat_port), dat_star)),cmap='gray',
417417
extent=[min(Zdist), max(Zdist), -extent*(1/ft), extent*(1/ft)],origin='upper')
418418
im = ax.imshow(dat_class, alpha=0.5,extent=[min(Zdist), max(Zdist), -extent*(1/ft), extent*(1/ft)],
419-
origin='upper', cmap='YlOrRd', vmin=0.25, vmax=5)
419+
origin='upper', cmap='YlOrRd', vmin=0, vmax=3)
420420
plt.ylabel('Horizontal distance (m)');
421421
plt.xlabel('Distance along track (m)')
422422
plt.axis('tight')
@@ -483,7 +483,7 @@ def plot_kmeans(dist_m, shape_port, dat_port, dat_star, dat_kclass, ft, humfile,
483483
plt.imshow(np.vstack((np.flipud(dat_port), dat_star)), cmap='gray',extent=[min(Zdist), max(Zdist), -extent*(1/ft), extent*(1/ft)],origin='upper')
484484

485485
CS = plt.contourf(np.flipud(dat_kclass), alpha=0.4, extent=[min(Zdist), max(Zdist), -extent*(1/ft), extent*(1/ft)],
486-
origin='upper', cmap='YlOrRd', vmin=0.25, vmax=5)
486+
origin='upper', cmap='YlOrRd', vmin=0, vmax=3)
487487
plt.ylabel('Horizontal distance (m)')
488488
plt.xlabel('Distance along track (m)')
489489
plt.axis('tight')

‎PyHum/pyread.c‎

Lines changed: 1344 additions & 1774 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PyHum/pyread.o‎

-17.9 KB
Binary file not shown.

‎PyHum/pyread.pyx‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ cdef class pyread:
241241
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps1
242242
head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # heading_deg
243243

244-
if model==1199 or model==0 or model==2: #onix, mega
244+
if model==1199 or model==0 or model==1 or model==2: #onix, mega
245245
spacer = self._fread(fid, 1, 'B')
246246
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2
247247
head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # speed_ms
@@ -258,23 +258,6 @@ cdef class pyread:
258258
spacer = self._fread(fid, 15, 'B')
259259
head.append(linesize) #struct.unpack('>i', ''.join(fread(fid,4,'c')) )[0]) #sentlen 2438
260260

261-
elif model==1: #helix
262-
spacer = self._fread(fid, 1, 'B')
263-
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2
264-
head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # speed_ms
265-
spacer = self._fread(fid, 1, 'B')
266-
267-
head.append(float(struct.unpack('>i', ''.join(self._fread(fid,4,'c')) )[0])/10) # depth_m
268-
spacer = self._fread(fid, 1, 'B')
269-
#%0 (50 or 83 kHz), 1 (200 kHz), 2 (SI Poort), 3 (SI Starboard)
270-
head.append(self._fread(fid, 1, 'B')[0]) #beam
271-
spacer = self._fread(fid, 1, 'B')
272-
head.append(self._fread(fid, 1, 'B')[0]) #voltscale
273-
spacer = self._fread(fid, 1, 'B')
274-
head.append(struct.unpack('>i', ''.join(self._fread(fid,4,'c')) )[0]/1000) # freq_khz
275-
spacer = self._fread(fid, 15, 'B')
276-
head.append(linesize) #struct.unpack('>i', ''.join(fread(fid,4,'c')) )[0]) #sentlen 2438
277-
278261
elif model==798:
279262
spacer = self._fread(fid, 1, 'B')
280263
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2

‎PyHum/pyread.so‎

-12 KB
Binary file not shown.

‎PyHum/pyread_single.c‎

Lines changed: 1225 additions & 1655 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PyHum/pyread_single.o‎

-17.9 KB
Binary file not shown.

‎PyHum/pyread_single.pyx‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ cdef class pyread:
246246
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps1
247247
head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # heading_deg
248248

249-
if model==1199 or model==0 or model==2: #onix, mega
249+
if model==1199 or model==0 or model==1 or model==2: #onix, helix, mega
250250
spacer = self._fread(fid, 1, 'B')
251251
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2
252252
head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # speed_ms
@@ -263,23 +263,6 @@ cdef class pyread:
263263
spacer = self._fread(fid, 15, 'B')
264264
head.append(linesize) #struct.unpack('>i', ''.join(fread(fid,4,'c')) )[0]) #sentlen 2438
265265

266-
elif model==1: #helix
267-
spacer = self._fread(fid, 1, 'B')
268-
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2
269-
head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # speed_ms
270-
spacer = self._fread(fid, 1, 'B')
271-
272-
head.append(float(struct.unpack('>i', ''.join(self._fread(fid,4,'c')) )[0])/10) # depth_m
273-
spacer = self._fread(fid, 1, 'B')
274-
#%0 (50 or 83 kHz), 1 (200 kHz), 2 (SI Poort), 3 (SI Starboard)
275-
head.append(self._fread(fid, 1, 'B')[0]) #beam
276-
spacer = self._fread(fid, 1, 'B')
277-
head.append(self._fread(fid, 1, 'B')[0]) #voltscale
278-
spacer = self._fread(fid, 1, 'B')
279-
head.append(struct.unpack('>i', ''.join(self._fread(fid,4,'c')) )[0]/1000) # freq_khz
280-
spacer = self._fread(fid, 15, 'B')
281-
head.append(linesize) #struct.unpack('>i', ''.join(fread(fid,4,'c')) )[0]) #sentlen 2438
282-
283266
elif model==798:
284267
spacer = self._fread(fid, 1, 'B')
285268
head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2

‎PyHum/pyread_single.so‎

-8 KB
Binary file not shown.

0 commit comments

Comments
 (0)