Skip to content

Commit

Permalink
1.0.5, bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
d-chambers committed Dec 15, 2015
1 parent 5952272 commit 72dee87
Show file tree
Hide file tree
Showing 11 changed files with 618 additions and 516 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*~
11 changes: 10 additions & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,21 @@ Changed the name of writeTemplateKeyFromEQSearchSum to eqSearch2TemplateKey, and

Changed the name of several arguments slightly to be more consistent, should be mostly backward compatible

added the NumStations to results tables
Added the NumStations to results tables

Version 1.0.4
-------------
Fixed bug in detex.results._deleteDups where detections from different stations can get grouped together

Changed the intro tutorial slightly

Version 1.0.5
-------------
Removed consisLen argument from createCluster, fillZeros=True will produce approximately the same behavior as consisLen = False

Changed input of __init__.deb from varlist to *varlist

Removed subSamp parameter from createCluster. Will by default calculate subsamples but store the decimal sample in a separate DataFrame.

Fxed issues 15, 16, 17, 18, 19.

148 changes: 0 additions & 148 deletions ChangeLog.txt~

This file was deleted.

10 changes: 5 additions & 5 deletions detex/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# import all modules in detex directory
#modules = glob.glob(os.path.dirname(__file__)+"/*.py")
#__all__ = [os.path.basename(f)[:-3] for f in modules if os.path.isfile(f)]
#warnings.filterwarnings('error') #uncomment this to make all warnings errors
warnings.filterwarnings('error') #uncomment this to make all warnings errors

# Imports for lazy people (ie make detex.createCluster callable)
from construct import createCluster, createSubSpace
Expand All @@ -41,7 +41,7 @@
maxSize = 10 * 1024*1024 # max size log file can be in bytes (10 mb defualt)
verbose = True # set to false to avoid printing to screen
makeLog = False # set to false to not make log file
__version__='1.0.4' # current detex version
__version__ = '1.0.5' # current detex version

## Configure logger to be used across all of Detex
def setLogger(filename='detex_log.log'):
Expand Down Expand Up @@ -69,7 +69,8 @@ def setLogger(filename='detex_log.log'):
fh.setLevel(logging.DEBUG)
fmat = '%(asctime)s\t%(name)s\t%(levelname)s\t%(message)s'
formatter = logging.Formatter(fmat)
fh.setFormatter(formatter)
fh.setFormatter(formatter)
global logger
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
logger.addHandler(fh)
Expand Down Expand Up @@ -137,12 +138,11 @@ def closeLogger():
handler.close()
logger.removeHandler(handler)

def deb(varlist):
def deb(*varlist):
global de
de = varlist
sys.exit(1)


if makeLog:
logger, lpath = setLogger()

Expand Down
Loading

0 comments on commit 72dee87

Please sign in to comment.