Skip to content

Commit 8602ff5

Browse files
committed
Disabling auto depth, will return in near future (#31)
1 parent c6690bd commit 8602ff5

6 files changed

Lines changed: 658 additions & 647 deletions

File tree

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ procData/*
22
__pycache__/*
33
oldFiles/*
44
testData/*
5+
/src/__pycache__/*
6+
models/*
57
models/bedpick/Old
68
models/bedpick/Zheng2021/old
7-
/src/__pycache__/*
89

910
main_batch.py
1011
main_batchFolder.py
11-
rectify_test_affine.py
12+
/src/funcs_bedpick.py
1213

1314
!procData/OutputsHere.txt

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Anaconda](https://img.shields.io/badge/conda-342B029.svg?&style=for-the-badge&logo=anaconda&logoColor=white)](https://www.anaconda.com/)
77
[![Numpy](https://img.shields.io/badge/Numpy-791a9d?style=for-the-badge&logo=numpy&logoColor=white)](https://numpy.org/)
88
[![Pandas](https://img.shields.io/badge/Pandas-2C2D72?style=for-the-badge&logo=pandas&logoColor=white)](https://pandas.pydata.org/)
9-
[![Tensorflow](https://img.shields.io/badge/TensorFlow-FF6F00?style=for-the-badge&logo=TensorFlow&logoColor=white)](https://www.tensorflow.org/)
9+
<!-- [![Tensorflow](https://img.shields.io/badge/TensorFlow-FF6F00?style=for-the-badge&logo=TensorFlow&logoColor=white)](https://www.tensorflow.org/) -->
1010

1111
![PING-Mapper](./docs/attach/PINGMapper_Logo.png)
1212

@@ -16,7 +16,7 @@
1616

1717
<img src="../main/docs/attach/Suwa_Son.gif" width="800"/>
1818

19-
*Video made with [HumViewer](https://humviewer.cm-johansen.dk/)*
19+
*Video made with [HumViewer](https://humviewer.cm-johansen.dk/)*
2020

2121
`...into scientific datasets!`
2222

@@ -117,21 +117,21 @@ Windows users: Make sure your filepaths are structured in one of the three follo
117117

118118
7. Line 35-36: Export un-rectified sonar tiles with water column present AND/OR water column removed.
119119

120-
8. Line 37: Option to use Humminbird depth (`detectDepth=0`), automatically detect depth through thresholding (`detectDepth=1`), automatically detect depth with Residual U-Net (`detectDepth=2`), or do both automatic depth picking methods (`detectDepth=3`). NOTE: this will soon be updated with a new method, stay tuned...
120+
<!-- 8. Line 37: Option to use Humminbird depth (`detectDepth=0`), automatically detect depth through thresholding (`detectDepth=1`), automatically detect depth with Residual U-Net (`detectDepth=2`), or do both automatic depth picking methods (`detectDepth=3`). NOTE: this will soon be updated with a new method, stay tuned... -->
121121

122-
9. Line 39: Smooth the depth data before removing water column. This may help with any strange issues or noisy depth data.
122+
8. Line 39: Smooth the depth data before removing water column. This may help with any strange issues or noisy depth data.
123123

124-
10. Line 40: Additional depth adjustment in number of pixels for water column removal.
124+
9. Line 40: Additional depth adjustment in number of pixels for water column removal.
125125

126-
11. Line 41: Plot bedick(s) on non-rectified sonogram for visual inspection.
126+
10. Line 41: Plot bedick(s) on non-rectified sonogram for visual inspection.
127127

128-
12. Line 43-44: Export georectified sonar imagery (water-column-present AND/OR water-column-removed/slant-range-corrected) for use in GIS.
128+
11. Line 43-44: Export georectified sonar imagery (water-column-present AND/OR water-column-removed/slant-range-corrected) for use in GIS.
129129

130-
13. Line 46: Option to mosaic georectified sonar imagery (exported from step 12).
130+
12. Line 46: Option to mosaic georectified sonar imagery (exported from step 12).
131131

132-
14. Save the file.
132+
13. Save the file.
133133

134-
15. Run PING Mapper:
134+
14. Run PING Mapper:
135135
```
136136
python main.py
137137
```

main.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
exportUnknown = True #Option to export Unknown ping metadata
3636
wcp = True #Export tiles with water column present
3737
wcr = True #Export Tiles with water column removed (and slant range corrected)
38-
detectDepth = 0 #0==Use Humminbird depth; 1==Auto detect depth w/ Zheng et al. 2021;
39-
## 2==Auto detect depth w/ Thresholding
4038
smthDep = True #Smooth depth before water column removal
4139
adjDep = 0 #Aditional depth adjustment (in pixels) for water column removaL
4240
pltBedPick = True #Plot bedpick on sonogram
@@ -61,7 +59,7 @@
6159
print('===========================================')
6260
print('***** READING *****')
6361
print("working on "+projDir)
64-
read_master_func(sonFiles, humFile, projDir, t, nchunk, exportUnknown, wcp, wcr, detectDepth, smthDep, adjDep, pltBedPick, threadCnt)
62+
read_master_func(sonFiles, humFile, projDir, t, nchunk, exportUnknown, wcp, wcr, 0, smthDep, adjDep, pltBedPick, threadCnt)
6563

6664
#==================================================
6765
if rect_wcp or rect_wcr:

0 commit comments

Comments
 (0)