Skip to content

Commit

Permalink
Mon Sep 7 15:10:00 MST 2015
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Buscombe committed Sep 7, 2015
1 parent 51c3cfb commit 1ab6311
Show file tree
Hide file tree
Showing 27 changed files with 80 additions and 76 deletions.
4 changes: 4 additions & 0 deletions PyHum/_pyhum_correct.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,10 @@ def correct(humfile, sonpath, maxW=1000, doplot=1, dofilt=0, correct_withwater=0
else:
print "Phase preserving filter will be applied"

if correct_withwater:
correct_withwater = int(correct_withwater)
if correct_withwater==1:
print "Correction will be applied without removing water column"

# start timer
if os.name=='posix': # true if linux/mac or cygwin on windows
Expand Down
2 changes: 1 addition & 1 deletion PyHum/test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def dotest():

# correction specific settings
maxW = 1000 # rms output wattage
dofilt = 1 # apply a phase preserving filter (WARNING!! takes a very long time for large scans)
dofilt = 0 # 1 = apply a phase preserving filter (WARNING!! takes a very long time for large scans)
correct_withwater = 0 # don't retain water column in radiometric correction (1 = retains water column for radiomatric corrections)

# for shadow removal
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ which carries out the following operations:
# correction specific settings
maxW = 1000 # rms output wattage
dofilt = 1 # apply a phase preserving filter (WARNING!! takes a very long time for large scans)
dofilt = 0 # 1=apply a phase preserving filter (WARNING!! takes a very long time for large scans)
correct_withwater = 0 # don't retain water column in radiometric correction (1 = retains water column for radiomatric corrections)
# for shadow removal
Expand Down
2 changes: 1 addition & 1 deletion docs/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ which carries out the following operations::
# correction specific settings
maxW = 1000 # rms output wattage
dofilt = 1 # apply a phase preserving filter (WARNING!! takes a very long time for large scans)
dofilt = 0 # 1=apply a phase preserving filter (WARNING!! takes a very long time for large scans)
correct_withwater = 0 # don't retain water column in radiometric correction (1 = retains water column for radiomatric corrections)

# for shadow removal
Expand Down
Binary file modified docs/_build/doctrees/README.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/examples.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/index.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/pyhum.map.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/pyhum.read.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/.buildinfo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 71a759cea4207085537259d56964f2c3
config: 998a16042a5a9e95d517d0501fd75e7e
tags: 645f666f9bcd5a90fca523b33c5a78b7
12 changes: 6 additions & 6 deletions docs/_build/html/README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>Getting started &mdash; PyHum 1.3.2 documentation</title>
<title>Getting started &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.3 documentation" href="index.html" />
<link rel="next" title="Modules" href="modules.html" />
<link rel="prev" title="PyHum: Python program for reading and processing low-cost sidescan sonar data" href="index.html" />
</head>
Expand All @@ -40,7 +40,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="index.html" title="PyHum: Python program for reading and processing low-cost sidescan sonar data"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -244,7 +244,7 @@ <h2>Installation on Amazon Linux EC-2 instance<a class="headerlink" href="#insta

<span class="c"># correction specific settings</span>
<span class="n">maxW</span> <span class="o">=</span> <span class="mi">1000</span> <span class="c"># rms output wattage</span>
<span class="n">dofilt</span> <span class="o">=</span> <span class="mi">1</span> <span class="c"># apply a phase preserving filter (WARNING!! takes a very long time for large scans)</span>
<span class="n">dofilt</span> <span class="o">=</span> <span class="mi">0</span> <span class="c"># 1=apply a phase preserving filter (WARNING!! takes a very long time for large scans)</span>
<span class="n">correct_withwater</span> <span class="o">=</span> <span class="mi">0</span> <span class="c"># don&#39;t retain water column in radiometric correction (1 = retains water column for radiomatric corrections)</span>

<span class="c"># for shadow removal</span>
Expand Down Expand Up @@ -516,7 +516,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="index.html" title="PyHum: Python program for reading and processing low-cost sidescan sonar data"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/_sources/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ which carries out the following operations::

# correction specific settings
maxW = 1000 # rms output wattage
dofilt = 1 # apply a phase preserving filter (WARNING!! takes a very long time for large scans)
dofilt = 0 # 1=apply a phase preserving filter (WARNING!! takes a very long time for large scans)
correct_withwater = 0 # don't retain water column in radiometric correction (1 = retains water column for radiomatric corrections)

# for shadow removal
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/examples.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>&lt;no title&gt; &mdash; PyHum 1.3.2 documentation</title>
<title>&lt;no title&gt; &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.3 documentation" href="index.html" />
<link rel="prev" title="pyhum.e1e2 module" href="pyhum.e1e2.html" />
</head>
<body role="document">
Expand All @@ -36,7 +36,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.e1e2.html" title="pyhum.e1e2 module"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -99,7 +99,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.e1e2.html" title="pyhum.e1e2 module"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/genindex.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>Index &mdash; PyHum 1.3.2 documentation</title>
<title>Index &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.3 documentation" href="index.html" />
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
Expand All @@ -33,7 +33,7 @@ <h3>Navigation</h3>
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
accesskey="I">index</a></li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -95,7 +95,7 @@ <h3>Navigation</h3>
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
>index</a></li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>PyHum: python module for Humminbird analysis &mdash; PyHum 1.3.2 documentation</title>
<title>PyHum: python module for Humminbird analysis &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="#" />
<link rel="top" title="PyHum 1.3.3 documentation" href="#" />
<link rel="next" title="Getting started" href="README.html" />
</head>
<body role="document">
Expand All @@ -36,7 +36,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
accesskey="N">next</a> |</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -161,7 +161,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
>next</a> |</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/modules.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>Modules &mdash; PyHum 1.3.2 documentation</title>
<title>Modules &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.3 documentation" href="index.html" />
<link rel="next" title="PyHum package" href="pyhum.html" />
<link rel="prev" title="Getting started" href="README.html" />
</head>
Expand All @@ -40,7 +40,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -135,7 +135,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
Binary file modified docs/_build/html/objects.inv
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions docs/_build/html/pyhum.correct.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>pyhum.correct module &mdash; PyHum 1.3.2 documentation</title>
<title>pyhum.correct module &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.3 documentation" href="index.html" />
<link rel="up" title="PyHum package" href="pyhum.html" />
<link rel="next" title="pyhum.rmshadows module" href="pyhum.rmshadows.html" />
<link rel="prev" title="pyhum.read module" href="pyhum.read.html" />
Expand All @@ -41,7 +41,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.read.html" title="pyhum.read module"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="pyhum.html" accesskey="U">PyHum package</a> &raquo;</li>
</ul>
</div>
Expand Down Expand Up @@ -195,7 +195,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.read.html" title="pyhum.read module"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="pyhum.html" >PyHum package</a> &raquo;</li>
</ul>
</div>
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/pyhum.e1e2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>pyhum.e1e2 module &mdash; PyHum 1.3.2 documentation</title>
<title>pyhum.e1e2 module &mdash; PyHum 1.3.3 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.3.2',
VERSION: '1.3.3',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.3.2 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.3 documentation" href="index.html" />
<link rel="up" title="PyHum package" href="pyhum.html" />
<link rel="next" title="&lt;no title&gt;" href="examples.html" />
<link rel="prev" title="pyhum.map_texture module" href="pyhum.map_texture.html" />
Expand All @@ -41,7 +41,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.map_texture.html" title="pyhum.map_texture module"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="pyhum.html" accesskey="U">PyHum package</a> &raquo;</li>
</ul>
</div>
Expand Down Expand Up @@ -207,7 +207,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.map_texture.html" title="pyhum.map_texture module"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.2 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.3 documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="pyhum.html" >PyHum package</a> &raquo;</li>
</ul>
</div>
Expand Down
Loading

0 comments on commit 1ab6311

Please sign in to comment.