diff --git a/PyHum/_pyhum_correct.py b/PyHum/_pyhum_correct.py index f4d6cf7..6bc53fa 100755 --- a/PyHum/_pyhum_correct.py +++ b/PyHum/_pyhum_correct.py @@ -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 diff --git a/PyHum/test.py b/PyHum/test.py index 615a659..6c1eee2 100755 --- a/PyHum/test.py +++ b/PyHum/test.py @@ -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 diff --git a/README.md b/README.md index 7d91cb8..9222661 100755 --- a/README.md +++ b/README.md @@ -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 diff --git a/docs/README.rst b/docs/README.rst index 8095f6f..0632ae5 100755 --- a/docs/README.rst +++ b/docs/README.rst @@ -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 diff --git a/docs/_build/doctrees/README.doctree b/docs/_build/doctrees/README.doctree index d3446c7..4609d6c 100644 Binary files a/docs/_build/doctrees/README.doctree and b/docs/_build/doctrees/README.doctree differ diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle index 6040ede..43ba99f 100644 Binary files a/docs/_build/doctrees/environment.pickle and b/docs/_build/doctrees/environment.pickle differ diff --git a/docs/_build/doctrees/examples.doctree b/docs/_build/doctrees/examples.doctree index e49961f..529b9b8 100644 Binary files a/docs/_build/doctrees/examples.doctree and b/docs/_build/doctrees/examples.doctree differ diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree index 3d8981f..8541074 100644 Binary files a/docs/_build/doctrees/index.doctree and b/docs/_build/doctrees/index.doctree differ diff --git a/docs/_build/doctrees/pyhum.map.doctree b/docs/_build/doctrees/pyhum.map.doctree index 62960a3..5b7268a 100644 Binary files a/docs/_build/doctrees/pyhum.map.doctree and b/docs/_build/doctrees/pyhum.map.doctree differ diff --git a/docs/_build/doctrees/pyhum.read.doctree b/docs/_build/doctrees/pyhum.read.doctree index ab241a1..f790e45 100644 Binary files a/docs/_build/doctrees/pyhum.read.doctree and b/docs/_build/doctrees/pyhum.read.doctree differ diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo index c3ba668..c47b42c 100644 --- a/docs/_build/html/.buildinfo +++ b/docs/_build/html/.buildinfo @@ -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 diff --git a/docs/_build/html/README.html b/docs/_build/html/README.html index 988d0cc..9d7f259 100644 --- a/docs/_build/html/README.html +++ b/docs/_build/html/README.html @@ -6,7 +6,7 @@ - Getting started — PyHum 1.3.2 documentation + Getting started — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@

Navigation

  • previous |
  • - + @@ -244,7 +244,7 @@

    Installation on Amazon Linux EC-2 instance# 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 @@ -516,7 +516,7 @@

    Navigation

  • previous |
  • - + @@ -99,7 +99,7 @@

    Navigation

  • previous |
  • - + @@ -161,7 +161,7 @@

    Navigation

  • next |
  • - + @@ -135,7 +135,7 @@

    Navigation

  • previous |
  • - + @@ -195,7 +195,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/pyhum.e1e2.html b/docs/_build/html/pyhum.e1e2.html index e813f54..7d0db6b 100644 --- a/docs/_build/html/pyhum.e1e2.html +++ b/docs/_build/html/pyhum.e1e2.html @@ -6,7 +6,7 @@ - pyhum.e1e2 module — PyHum 1.3.2 documentation + pyhum.e1e2 module — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@

    Navigation

  • previous |
  • - + @@ -207,7 +207,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/pyhum.html b/docs/_build/html/pyhum.html index 8d4eec6..c7848c5 100644 --- a/docs/_build/html/pyhum.html +++ b/docs/_build/html/pyhum.html @@ -6,7 +6,7 @@ - PyHum package — PyHum 1.3.2 documentation + PyHum package — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@

    Navigation

  • previous |
  • - + @@ -171,7 +171,7 @@

    Navigation

  • previous |
  • - + @@ -181,7 +181,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/pyhum.map_texture.html b/docs/_build/html/pyhum.map_texture.html index 7bea02a..920bd5e 100644 --- a/docs/_build/html/pyhum.map_texture.html +++ b/docs/_build/html/pyhum.map_texture.html @@ -6,7 +6,7 @@ - pyhum.map_texture module — PyHum 1.3.2 documentation + pyhum.map_texture module — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@

    Navigation

  • previous |
  • - + @@ -203,7 +203,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/pyhum.read.html b/docs/_build/html/pyhum.read.html index 1656c38..3551aae 100644 --- a/docs/_build/html/pyhum.read.html +++ b/docs/_build/html/pyhum.read.html @@ -6,7 +6,7 @@ - pyhum.read module — PyHum 1.3.2 documentation + pyhum.read module — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@

    Navigation

  • previous |
  • - + @@ -239,7 +239,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/pyhum.rmshadows.html b/docs/_build/html/pyhum.rmshadows.html index 00c5565..329bb1a 100644 --- a/docs/_build/html/pyhum.rmshadows.html +++ b/docs/_build/html/pyhum.rmshadows.html @@ -6,7 +6,7 @@ - pyhum.rmshadows module — PyHum 1.3.2 documentation + pyhum.rmshadows module — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@

    Navigation

  • previous |
  • - + @@ -171,7 +171,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/pyhum.texture.html b/docs/_build/html/pyhum.texture.html index 3bb81cb..b0ea54d 100644 --- a/docs/_build/html/pyhum.texture.html +++ b/docs/_build/html/pyhum.texture.html @@ -6,7 +6,7 @@ - pyhum.texture module — PyHum 1.3.2 documentation + pyhum.texture module — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@

    Navigation

  • previous |
  • - + @@ -185,7 +185,7 @@

    Navigation

  • previous |
  • - + diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html index 08ec440..b88e2db 100644 --- a/docs/_build/html/search.html +++ b/docs/_build/html/search.html @@ -6,7 +6,7 @@ - Search — PyHum 1.3.2 documentation + Search — PyHum 1.3.3 documentation @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@

    Navigation

  • index
  • - + @@ -102,7 +102,7 @@

    Navigation

  • index
  • - +