marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	scripts/pylot-reasses-pilot-event.py
This commit is contained in:
Sebastian Wehling-Benatelli 2016-05-03 08:58:33 +02:00
commit ecb3670aeb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylot/core/pick/utils.py
View File

@ -938,6 +938,10 @@ def checkZ4S(X, pick, zfac, checkwin, iplot):
return returnflag return returnflag
def reassess_pilot_event():
pass
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest

2
scripts/pylot-reasses-pilot-event.py
View File

@ -2,6 +2,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import argparse import argparse
from pylot.core.pick.utils import reassess_pilot_event
from pylot.core.util.version import get_git_version as _getVersionString from pylot.core.util.version import get_git_version as _getVersionString
from pylot.core.io.phases import reassess_pilot_event from pylot.core.io.phases import reassess_pilot_event