Commit Graph

1785 Commits

Author SHA1 Message Date
e341994825 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-31 11:15:38 +02:00
0520df5963 bugfix 2016-05-31 11:15:30 +02:00
ae2fc73d89 parallelization 2016-05-31 11:14:51 +02:00
51aa949b56 debugging in progress 2016-05-30 17:08:35 +02:00
36b0aea86c [edit] fixing bugs (in progress) 2016-05-27 12:53:34 +02:00
618dd10c23 [task] further steps to implement pick comparison from QtPyLoT 2016-05-27 11:25:47 +02:00
a1d29a45cb Merge branch 'develop' 2016-05-27 07:45:04 +02:00
163a501ae9 introducing automatic data into QtPyLoT 2016-05-27 07:43:54 +02:00
53614bb5b9 [fix] fixing a bug introduced accidently by merge 2016-05-27 06:49:20 +02:00
0dd69a0e19 added default value for cores 2016-05-25 14:28:25 +02:00
ecf4a7ced7 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-25 14:24:51 +02:00
5057664b1d code changes for parallelization 2016-05-25 14:24:19 +02:00
e46e8cb71b [reformat] corrected formatting after merge 2016-05-25 14:22:08 +02:00
f8db6b1d9f [merge] resolved conflicts in utils due to two-sided coding 2016-05-25 14:05:25 +02:00
8ca87bc777 changes while testing parallelization of autopicker 2016-05-24 14:20:59 +02:00
a6eaac6c33 Changes during parallelization tests of autopicker 2016-05-24 14:19:37 +02:00
sebastianp
d49c90026d Merge branch 'master' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot 2016-05-24 13:23:08 +02:00
sebastianp
4962561d6c changes made to have better control of the output directory 2016-05-24 13:21:38 +02:00
46ccd44e16 changed to generation of reference grids 2016-05-23 14:25:24 +02:00
d9844fff17 added worker 2016-05-23 14:25:06 +02:00
42cbfeb787 temporary retaining of parallel tests 2016-05-23 14:24:02 +02:00
25ca11f572 minor tweaks 2016-05-23 14:22:52 +02:00
093f750aa1 tried worker function 2016-05-23 12:06:55 +02:00
41b7ca6968 [task] reformatting activeSeismoPick and editing pool mapping to work properly 2016-05-23 11:53:22 +02:00
3cc77f4868 bugfixes 2016-05-23 11:24:01 +02:00
73d71a61d5 restructuring for parallization 2016-05-23 11:23:23 +02:00
1f47f3dd85 parallization of picking algorithm 2016-05-23 11:22:39 +02:00
392a556ac4 [restructure] Wall-E wasting time 2016-05-20 14:46:10 +02:00
08df7c3304 [edit] decreased unwanted verbosity 2016-05-20 10:11:40 +02:00
54b557930f [edit] inserted verbosity option to control the amount of output 2016-05-20 09:58:10 +02:00
sebastianp
9b7db91037 [task] started to implement data processing step for checking corrupted GSE files 2016-05-19 15:35:11 +02:00
db17cb4f8d code cleanup 2016-05-19 14:24:48 +02:00
4edd5f8e52 code cleanup 2016-05-19 11:21:24 +02:00
5f740783f0 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-19 11:20:47 +02:00
3138bbfa93 code cleanup and commenting 2016-05-19 11:20:37 +02:00
7c5aff0a27 [fix] correctly formatting the timestring now 2016-05-19 11:16:28 +02:00
731acc7117 [double-checked] code has been double checked before running on data 2016-05-19 10:51:37 +02:00
sebastianp
521de9ee89 Merge branch 'master' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot 2016-05-19 10:25:19 +02:00
dc5d76efb8 [fix] fixing docstring problem caused by merge of conflicting files 2016-05-18 13:17:05 +02:00
eb5f028a47 Merge branch 'develop'
Conflicts:
	pylot/core/io/phases.py
2016-05-18 13:02:51 +02:00
c315b917b8 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-18 12:55:43 +02:00
e62ff9d68c [fix] returning variables now, docstrings corrected to be able to use single quotes in docstrings 2016-05-18 12:55:04 +02:00
dbaead4754 code cleanup + commenting 2016-05-18 12:00:45 +02:00
30e8f0c96a code cleanup and commenting 2016-05-17 16:19:44 +02:00
ca77b06293 Code cleanup 2016-05-17 11:53:32 +02:00
sebastianp
c84632fb27 Merge remote-tracking branch 'origin/master'
Conflicts:
	pylot/core/util/dataprocessing.py
2016-05-13 14:57:27 +02:00
4a836fd1f7 [task] started to implement data processing step for checking corrupted GSE files 2016-05-13 14:56:42 +02:00
019b801603 code rearrange and minor processing changes 2016-05-12 14:01:18 +02:00
f09af16120 [task] started to implement data processing step for checking corrupted GSE files 2016-05-12 10:08:29 +02:00
a2b0854345 Merged branch develop into master 2016-05-11 14:51:30 +02:00