Mon Feb 23 21:46:00 MST 2015

DigitalGrainSize · Feb 24, 2015 · dde3a49 · dde3a49
1 parent da836f5
commit dde3a49
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/DGS/__init__.py b/DGS/__init__.py
@@ -15,6 +15,7 @@
            United States Geological Survey
            Flagstaff, AZ 86001
            [email protected]
+ Revision Feb 23, 2015
  First Revision January 18 2013   
 
 For more information visit https://github.com/dbuscombe-usgs/pyDGS
@@ -63,7 +64,7 @@
     
 """
 
-__version__ = '2.5.6'
+__version__ = '2.7.0'
 
 #-----------------------------------------------------------------------------
 # Imports

diff --git a/DGS/__init__.pyc b/DGS/__init__.pyc
diff --git a/DGS/_dgs_class.py b/DGS/_dgs_class.py
@@ -15,6 +15,7 @@
            United States Geological Survey
            Flagstaff, AZ 86001
            [email protected]
+ Revision Feb 23, 2015
  First Revision January 18 2013   
 
 For more information visit https://github.com/dbuscombe-usgs/pyDGS
@@ -63,7 +64,7 @@
     
 """
 
-from __future__ import division
+#from __future__ import division
 import numpy as np
 import matplotlib.pyplot as mpl
 import sys, getopt, os, glob
@@ -327,9 +328,9 @@ def dgs(folder, density, doplot, resolution):
       mn = min(nx,ny)
 
       if isodd(mn/4):
-           window_size = (mn/4)
+           window_size = (int(mn/4))
       else:
-           window_size = (mn/4)-1
+           window_size = (int(mn/4))-1
 
       if iseven(window_size):
          window_size = window_size+1

diff --git a/DGS/_dgs_class.pyc b/DGS/_dgs_class.pyc
diff --git a/README.md b/README.md
@@ -74,6 +74,7 @@ Buscombe, D. (2013) Transferable Wavelet Method for Grain-Size Distribution from
            United States Geological Survey
            Flagstaff, AZ 86001
            [email protected]
+ Revision Feb 23, 2015
  First Revision January 18 2013
 
 For more information visit https://github.com/dbuscombe-usgs/pyDGS

diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@
            United States Geological Survey
            Flagstaff, AZ 86001
            [email protected]
+ Revision Feb 23, 2015
  First Revision January 18 2013   
 
 For more information visit https://github.com/dbuscombe-usgs/pyDGS
@@ -147,7 +148,7 @@ def setupPackage():
          ext_modules=ext_modules,
          platforms='OS Independent',
          include_dirs = [np.get_include()],
-         package_data={'DGS': ['*.JPG',]}
+         package_data={'DGS': ['*.JPG','*.jpg',]}
    )
 
 if __name__ == '__main__':