Commit Graph

1436 Commits

Author SHA1 Message Date
c52277e4a2 [new] added attributes, properties and special method __str__ to the Magnitude superclass -> improves significantly convenience of sub-class programming 2016-09-26 15:56:40 +02:00
9288a169a4 [change] if folder selection is canceled do not empty editable text 2016-09-26 14:49:29 +02:00
dc38bd6e79 [fix, refactor] started major refactoring of magnitude.py and fixed some smaller bugs 2016-09-26 14:47:50 +02:00
eaa3c2e75d [change] do some major refactoring on Magnitude and subclasses to be more efficient and clean 2016-09-26 10:49:02 +02:00
51f4082e04 [fix] imported Magnitude overwrite prevented by renamed import; changed wrong function call 2016-09-23 15:21:34 +02:00
0dffe37d3b [namefix] rename data file and corresponding function 2016-09-23 15:12:43 +02:00
bfa7ffc960 [move] moving functions for Richter and moment magnitude calculation to magnitude module for re-use in autoPyLoT 2016-09-23 15:12:04 +02:00
65740e6cff [namefix] rename data file and corresponding function 2016-09-23 14:28:02 +02:00
Ludger Küperkoch
d0a46eb2bb Changed iplot flag. 2016-09-23 10:31:42 +02:00
Ludger Küperkoch
dc677062f4 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Something unholy happend!
2016-09-23 10:25:52 +02:00
Ludger Küperkoch
18f8fc25a8 Marginal changes. 2016-09-23 10:25:48 +02:00
04ec43c699 [fix] restitute waveform data prior to Wood-Anderson simulation 2016-09-22 14:12:24 +02:00
8307974edf [new] added richter magnitude calculation (to be tested) 2016-09-22 11:39:07 +02:00
bcb3eca8b2 [new] added data file and a function that evaluates the Gutenberg-Richter relation for a given distance 2016-09-22 10:54:37 +02:00
f35559e7c0 [new] added data file and a function that evaluates the Gutenberg-Richter relation for a given distance 2016-09-22 10:53:09 +02:00
Ludger Küperkoch
180cd25b51 Fixed bug in read_metadata.py: path to inventory file was not taken into account. 2016-09-21 14:36:25 +02:00
80e0ca99d7 [new] added function to calculate symmetrized pickerror on the fly 2016-09-21 14:12:58 +02:00
a215ba35b1 Merge branch 'feature/magnitude4QtPyLoT'
Conflicts:
	pylot/core/analysis/magnitude.py
2016-09-21 10:41:38 +02:00
ca7ce5f13c [change] signature of calcMoMw changed; renamed getinvdir to get_metadata
removed an unused remnant parameter invdir from definition of calcMoMw; method getinvdir from Magnitude class has been renamed and modified and returns now the metadata information and not only the inventory directory
2016-09-21 10:27:47 +02:00
777941b669 [fix] corrected docstring for new signature 2016-09-21 10:13:25 +02:00
Ludger Küperkoch
db3347b17c Removed pdb. 2016-09-20 15:29:45 +02:00
Ludger Küperkoch
a95a33abc9 Implemented read_metadata.py in calcsourcespec.py (was this intended?). 2016-09-20 15:26:55 +02:00
Ludger Küperkoch
e4c1912896 Additional screen output for read_metadata.py. 2016-09-20 15:25:26 +02:00
Ludger Küperkoch
ee2f462c92 Fixed bug in read_metadata.py: path to inventory file was not taken into account. 2016-09-20 14:30:24 +02:00
21042bc071 Merge branch 'feature/magnitude4QtPyLoT'
Conflicts:
	pylot/core/util/dataprocessing.py
	pylot/core/util/widgets.py
2016-09-20 13:24:37 +02:00
Ludger Küperkoch
6a2bbe3f91 Stabilized zero-crosings determination for source spectrum estimation from P pulse. 2016-09-20 13:22:05 +02:00
Ludger Küperkoch
f46c618748 Stabilized zero-crosings determination for source spectrum estimation from P pulse. 2016-09-20 10:40:21 +02:00
df002ce9ac [change] use read in metadata information instead of reading metadata each time invoked 2016-09-20 09:58:33 +02:00
7e76bf7577 [change] make use of new metadata reading utility function to improve performance 2016-09-20 09:57:09 +02:00
4a6b653a72 [new] added new function to read metadata from disk
this new function prevents multiple reading of large dataless seed volume to enhance overall performance
2016-09-20 09:55:54 +02:00
Ludger Küperkoch
c60689c8ad Removed import pdb 2016-09-19 13:35:35 +02:00
Ludger Küperkoch
aacfbf3bbb Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2016-09-19 13:22:50 +02:00
Ludger Küperkoch
93f9070396 Fixed bug: path seperator was not taken inot account. 2016-09-19 13:22:46 +02:00
84739ed8ab [new] added new function to find common time window within a stream 2016-09-19 11:43:16 +02:00
420f382051 [cherry-pick] merged conflicts after cherry-pick of commit [17585f9381] 2016-09-19 11:42:52 +02:00
f34262d931 [enhancement] catch possible exceptions during restitution process without losing code's verbosity 2016-09-19 11:39:15 +02:00
ce4ac4fd04 [pep8] use naming and style conventions 2016-09-19 11:36:51 +02:00
8d37e9299c [new] added new function to find common time window within a stream 2016-09-19 11:32:00 +02:00
17585f9381 [rename] renaming getGlobalTimes for consistency and introduction of similar new function in future commit 2016-09-19 11:29:33 +02:00
c8d8525c11 [bugs fixed and found] dataprocessing doesn't work as expected, np.bool_ substituted by bool 2016-09-15 14:51:11 +02:00
1e4b1d691a [bugfix] using get method and account for not existing autopylot input file 2016-09-15 12:14:43 +02:00
4233af55c6 [bugfix] which now also uses the nllocbin parameter from the input file 2016-09-15 12:11:24 +02:00
fa42134a00 [modified] use os.path to create path strings for reading data 2016-09-15 11:41:30 +02:00
Ludger Küperkoch
d099e4b466 Bug fixed: Parser could not find dless-file as path was not given. 2016-09-14 13:43:10 +02:00
d7680f8ae3 Merge branch 'feature/magnitude4QtPyLoT'
Conflicts:
	pylot/core/util/utils.py
2016-09-13 12:02:21 +02:00
15700b074d [major, refs #200] major change for the magnitude estimation from GUI
restitution of waveform data has been moved to dataprocessing; the routines have been cleaned up and work in changed order now:
new function restitute_data is a wrapper function in order to restitute seismic data with the most popular kinds of station metadata
2016-09-13 12:00:37 +02:00
8a5fcf05bf [move] pseudo method restituteWFData changed to function restitute_data and moved to dataprocessing 2016-09-10 13:24:42 +02:00
7c5b8cb646 [move] pseudo method restituteWFData changed to function restitute_data and moved to dataprocessing 2016-09-10 13:24:12 +02:00
3d41e0abcd [refs #200] take advantage of the newly imported input file for magnitude calculation 2016-09-08 15:31:23 +02:00
fd8abd18b5 Merge branch 'develop'
[bugfixes] bringing bugfixes into master
2016-09-08 09:56:57 +02:00
49b07163ad [bugfix] saving data did not work properly due to changed variable signature; picking on just one horizontal component now possible, crash was caused by mismatching component labels -> new function added to find these labels from the available data 2016-09-08 09:54:43 +02:00
d953609419 [bugfix] just parse filter options if available 2016-09-07 12:17:51 +02:00
9632ecf41f [bugfix] cover all possible cases (some correct components have been dropped before) 2016-09-07 11:10:51 +02:00
e6b788d423 Merge branch 'develop'
Conflicts:
	QtPyLoT.py
	pylot/core/io/data.py
2016-09-02 14:24:34 +02:00
76a856aa11 [clean-up] some code cosmetics and started to implement eventinformation 2016-09-02 14:21:59 +02:00
d98ecea18a [refs #200] now merging picks without destroyed reference resource IDs 2016-09-01 14:21:25 +02:00
f1d806c154 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-08-30 15:00:34 +02:00
a8e56dba8b added repicking layout UI 2016-08-30 14:59:38 +02:00
280e954cac [closes #137] location out of QtPyLoT now possible 2016-08-30 14:53:58 +02:00
a4c2666584 adding repicking qt layout 2016-08-30 11:54:38 +02:00
ad91504211 [ref #137] removing last bugs before closing feature 2016-08-29 15:52:58 +02:00
eb1d7c07a0 preparations for QT repicking interface 2016-08-26 14:31:09 +02:00
30ccd331d4 [refs #137] bugfix in widgets.py badly formatted string corrupted load of settings; added a functionality to utils' which function to also look for NLLoc installation in the settings' binary path 2016-08-26 10:48:16 +02:00
b29c7068e3 [refs #137] some improvements in autoPyLoT and ongoing work in the QtPyLoT NLL implementation 2016-08-25 21:32:41 +02:00
e53dd99d75 [refs #137] implementation of GUI driven NonLinLoc location started 2016-08-25 13:31:51 +02:00
135ac0ef80 successfully implemented a working version of QT postprocessing interface 2016-08-24 14:58:51 +02:00
e51704f2b7 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-08-24 13:13:41 +02:00
9c3770ea9f working on postprocessing GUI 2016-08-24 13:13:24 +02:00
f428a72e86 [enhancement] improved functionality and flexibility of PDFstatistics class 2016-08-19 16:32:31 +02:00
c500f1b8bb [add] added new utility function to find a substring in a list of strings 2016-08-19 16:09:29 +02:00
f9d40439a9 [change] oversampling reduced to avoid computational overhead 2016-08-19 16:08:18 +02:00
71f59b3c64 [change] extracted plotting and started new module for plotting; improved docstring quality 2016-08-18 10:22:30 +02:00
5228657a60 small changes for synthetic tests 2016-08-15 13:35:01 +02:00
7921d12c80 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
Conflicts:
	pylot/core/util/utils.py
2016-08-12 19:57:11 +02:00
49727b25df [change] improved docstrings and testing of utils.py 2016-08-12 09:50:36 +02:00
sebastianp
36e7bc1bb2 [documentation] adding docstring to all the methods. 2016-08-11 16:13:53 +02:00
a6ce93cd9f [modification] added missing docstring content 2016-08-10 16:30:28 +02:00
c72ed1e169 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-08-10 14:24:40 +02:00
7b9d1f172a semi working QT interface for postprocessing 2016-08-10 14:24:07 +02:00
sebastianp
dd6bce89fb Merge remote-tracking branch 'origin/develop' into develop 2016-08-10 10:06:48 +02:00
sebastianp
14c22d73b7 [enhancement] adding a save option for plotting 2016-08-10 10:06:34 +02:00
94782f6758 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-08-09 13:10:49 +02:00
f8623fc454 [enhancement] added capability of searching for files in subdirectories 2016-08-09 13:10:25 +02:00
sebastianp
37ed561f73 removing unnecessary code 2016-08-09 12:21:00 +02:00
28d2464aee got working window layout for postprocessing (no functions yet) 2016-08-09 11:48:37 +02:00
sebastianp
a4c7e61e1a Merge remote-tracking branch 'origin/develop' into develop 2016-08-09 11:07:26 +02:00
sebastianp
7c8a437dd8 [task] additional changes for phase separation 2016-08-09 11:07:18 +02:00
9f15376fd8 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-08-09 10:38:19 +02:00
9d51339268 start of improving postprocessing ui 2016-08-09 10:37:26 +02:00
sebastianp
f4bdb38e16 [task] PDFStatistics object is now far more flexible 2016-08-09 10:07:27 +02:00
sebastianp
b72e16aaed Merge remote-tracking branch 'origin/develop' into develop 2016-08-04 16:07:47 +02:00
sebastianp
87f87ffb95 [task] rewriting some functions to make them more flexible 2016-08-04 16:07:01 +02:00
4c42e9ceb5 bugfixes, added fullscreen mode 2016-08-04 14:17:22 +02:00
30049baf94 added constant SNR possibility (plotting), changed replotting structure 2016-08-04 12:16:25 +02:00
3efb237452 fix: wait for process obsdata (p.wait()) 2016-08-04 10:35:09 +02:00
471cfe755b [fix] be sure to start the external programs in the right directory 2016-08-03 13:28:54 +02:00
c13bdd2cf2 code cleanup 2016-08-02 12:21:25 +02:00
a8522d0fae pre code cleanup 2016-08-02 11:54:28 +02:00
sebastianp
2a798a554b [task] read statistics from file 2016-07-29 12:01:34 +02:00
sebastianp
10fbfe5554 Merge remote-tracking branch 'origin/develop' into develop 2016-07-28 13:43:23 +02:00
sebastianp
19ced8b8c5 [task] plot routine for quantile distance quotients 2016-07-28 13:42:50 +02:00
638f552d6d changed structure of callFMTOMO to class 2016-07-27 14:42:11 +02:00
adfe9cc027 bugfixes 2016-07-27 13:46:42 +02:00
8bd9f7debc rename 2016-07-27 11:13:20 +02:00
987ee597fd Release version modified!?!? 2016-07-27 11:12:27 +02:00
48c0dbacfb changed structure of active GUI code, autopicker window changed to class 2016-07-26 14:48:08 +02:00
3273709b54 code for first three windows changed to class structure 2016-07-19 15:19:03 +02:00
05cc8e52b9 last commit before structural changes (classes for each window) 2016-07-19 12:16:37 +02:00
c7f7d9785b Rearranged Main Layout (buttons to top menu), several tweaks for plotDynSNR 2016-07-18 11:54:29 +02:00
fb8d888845 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-07-18 11:12:43 +02:00
8ee075c2b1 added SNR modification/plot 2016-07-14 13:59:52 +02:00
sebastianp
1ed83d786d implementen some new functions to PDFStatistics 2016-07-13 15:26:36 +02:00
8433767b22 [change] consequently use new pdf evaluation concept throughout the entire code 2016-07-13 14:37:12 +02:00
sebastianp
d4fd93ed8f Merge remote-tracking branch 'origin/develop' into develop 2016-07-13 14:15:50 +02:00
sebastianp
c7d8d0ecf5 undid earlier changes in PDFStatistics 2016-07-13 14:15:44 +02:00
6ad78acc85 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-07-13 14:15:30 +02:00
63ff8e48c5 changed generateFMTOMOinput from z, y, x to x, y, z 2016-07-13 14:15:01 +02:00
sebastianp
6fd1f9e2cc Merge remote-tracking branch 'origin/develop' into develop 2016-07-13 11:00:51 +02:00
sebastianp
38d225fbcf undid earlier changes in PDFStatistics 2016-07-13 11:00:30 +02:00
fd569823f8 bugfix typo 2016-07-13 10:58:39 +02:00
288bbe13d7 bugfix fstart before path 2016-07-13 10:52:42 +02:00
5890e905fc Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-07-13 10:04:48 +02:00
e3100562da pseudo 2D model generation working after some fixes (+2 cushion for propgrid) 2016-07-13 10:04:13 +02:00
8cef8ff2db [bugfix] due to changes in the usage of ProbabiltyDensityFunction.data expectation and standard deviation were wrongly calculated 2016-07-12 16:19:27 +02:00
39184ef150 [change] new concept for evaluation of the pdf instead of holding a sampled array works now also for difference pdfs using a scipy's spline interpolation capabilities 2016-07-12 15:31:59 +02:00
ed85d0ef12 added minimum cushion for 2D case (for input file generation) 2016-07-12 14:39:28 +02:00
546dfad722 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-07-12 14:09:50 +02:00
c47bf7911a GUI refinements, added 2D structure for plots, adde input filename specifications 2016-07-12 14:09:08 +02:00
ef613e48a4 [change] pdf for difference of picks estimated via curve_fit (to be tested) 2016-07-11 14:15:41 +02:00
08fc5d554b [change] introducing a whole new concept of handling pdfs; evaluating function on demand rather than holding a sampled array 2016-07-11 10:42:04 +02:00
950696053c [fixed] pdf values are now evaluated on demand not stored in an array in advance 2016-07-08 14:16:48 +02:00
sebastianp
7eded42142 [bugfixing] quantile function loops inifinte for small epsilon. See docstring. 2016-07-07 15:30:05 +02:00
55a589b525 Added Surface plots, text windows and plotting of single shots. 2016-07-07 14:25:37 +02:00
5293bb6ec7 activating vtk_tools widget, bugfix on merging rays.dat (too many linebreaks) 2016-07-06 11:40:08 +02:00
0be69de6f7 busy adding VTK tools to main UI 2016-07-05 13:59:01 +02:00
5c7123af66 added a feature to generate a survey object from a SeisArray 2016-07-05 10:38:28 +02:00
e8cbc2f377 [change] implementation of quantile calculation corrected 2016-06-30 13:14:38 +02:00
sebastianp
4f47f9f343 Merge remote-tracking branch 'origin/develop' into develop 2016-06-29 15:31:00 +02:00
sebastianp
a8b7eff561 [task] implementing new methods for pdf comparison. 2016-06-29 15:29:58 +02:00
9e3f3b29d2 changed general structure of seisarray and survey. survey object can now be generated by using a seismic array (also in GUI). 2016-06-28 14:57:48 +02:00
8714616d1b Working on input file format (SEG2/SEGY) etc. 2016-06-27 15:20:17 +02:00
253e9f4b1e Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-06-27 14:47:44 +02:00
a813eb462f adding tooltips 2016-06-27 14:47:34 +02:00
4591b7b1d9 [bugfix] changed the order of trying to read seismic data for reassessment 2016-06-27 10:59:50 +02:00
4bbb40c8b7 window resizing pt.3 2016-06-23 12:06:59 +02:00
3bec20bd45 window resizing pt.2 2016-06-23 11:59:12 +02:00
30d911b5cc window resizing 2016-06-23 11:55:54 +02:00
47bd7384f8 bugfixes, replotting of SeisArray figure 2016-06-23 11:42:09 +02:00
0abbb79e64 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-06-21 13:29:28 +02:00
806b974011 further GUI implementations, plot of seismic array in main window 2016-06-21 13:29:10 +02:00
043f60dc2a [change] make Python 3 compatible calls to print 2016-06-21 09:32:37 +02:00
952a2ea535 make use of formerly implemented subprocess call routine 2016-06-21 09:31:26 +02:00
8393f283c7 GUI changes and updates 2016-06-17 13:14:20 +02:00
f01187615b fix 2016-06-16 14:00:04 +02:00
579461f7b4 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-06-16 13:57:50 +02:00
9f71bf8082 restructured GUI and added first Seismic Array options 2016-06-16 13:57:15 +02:00
b3acef0bcd [closes #198] comparison dialog now available from QtPyLoT 2016-06-15 14:52:42 +02:00
c3d134e6ca changed GUI organization (single files for each window) 2016-06-15 12:19:11 +02:00
1ec468a586 bugfix, boxes clickable 2016-06-15 10:01:28 +02:00
3583f70e2b [CAUTION] this rev is not working, implementation of the individaul pdf plots for the picks pending 2016-06-14 15:26:16 +02:00
e554330154 [change] now the station selector entries are sorted for convience 2016-06-14 15:03:13 +02:00
3c4cbff9f3 [fix] do not try to add a Layout to a QWidget which already has one 2016-06-14 14:56:15 +02:00
78ebb1f8db [change] decreased verbosity 2016-06-14 14:55:18 +02:00
073ed658b3 [edit] changed calculation of difference pdf to include large differences also 2016-06-14 14:28:46 +02:00
4093dd0ce7 name change 2016-06-13 14:37:56 +02:00
410b3c2f55 added GUI 2016-06-13 14:37:12 +02:00
d02bb369ec Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-06-13 14:35:47 +02:00
69b5b410f0 minor changes for GUI 2016-06-13 14:35:29 +02:00
3cee0e6df9 [change] added plots for debugging 2016-06-13 14:23:42 +02:00
79f0982558 [bugfix] use only vaild values for plotting 2016-06-13 11:27:16 +02:00
3568a8a59a [bugfix] changed the way the the expectation and the std array are calculated; not sure how to deal with values 'inf' 2016-06-11 08:03:16 +02:00
467f0ae79b [new] histogram plot added; debugging in progress 2016-06-10 14:37:33 +02:00
280f8544e4 [prepare] starting implementation of a histogram overview plot from pick comparison dialog 2016-06-10 09:04:10 +02:00
be326cba7b [bugfix] automatic data with the S-P time saved in the pickdict caused Exception in the ProbabilityDensityFunction constructor 2016-06-10 09:03:16 +02:00
b5d94eed61 [closes #195] implementation of comparison within GUI ready for testing 2016-06-08 15:00:47 +02:00
b96366e321 [ref #195] implementation done; some bugs have to be fixed 2016-06-08 13:14:38 +02:00
e6d8701411 Merged branch 195 into develop 2016-06-07 14:09:41 +02:00
8e09fd7c42 [refs #195] pushing GUI element implementation forward 2016-06-07 13:51:03 +02:00
661b4d11c0 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-06-07 13:39:34 +02:00
f3769846ba GUI testing 2016-06-07 13:39:21 +02:00
7e33502824 GUI tests 2016-06-07 13:38:35 +02:00
536019259e [adresses 195] preparing GUI elements for a new dialog widget for interactive comparison 2016-06-06 14:10:46 +02:00
de89fc83ce moved widget to utils widgets for consistency and reusability
additionally the filter for PHASES and LOC files has been modified to avoid false selection
2016-06-02 09:39:01 +02:00
2395c12b26 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-06-01 14:15:14 +02:00
a255718f59 added script to VC 2016-06-01 14:14:57 +02:00
9c8c5bb842 - 2016-06-01 14:14:12 +02:00
02117399b5 output change 2016-06-01 14:13:15 +02:00
9996033ca5 cleanup (worker) 2016-06-01 14:12:49 +02:00
0d7ee9d779 [fixed] loading of automatic picks did not plot any result (fixed in this rev) 2016-06-01 08:55:43 +02:00
7965239a92 [closes #124] PILOT event data can be loaded now 2016-05-31 15:53:23 +02:00
724032b3f6 capturing multiply stored station labels 2016-05-31 13:12:42 +02:00
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
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
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
79e429db8d [edit] rearrangement fastens up a bit 2016-05-11 14:50:52 +02:00
8a79addb4e Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-11 12:02:43 +02:00
67c11558f3 Merged branch develop into master 2016-05-11 12:02:37 +02:00
46c152b7a1 improved speed on writing to file (write instead of writelines) 2016-05-11 12:02:09 +02:00
Ludger Küperkoch
c34fbe1228 Removed needless terminal output 2016-05-11 10:51:33 +02:00
Ludger Küperkoch
97ca69a07d Modified for controlling amount of terminal output using new input parameter apverbose 2016-05-11 09:54:33 +02:00
f8807a7ea6 [edit] docstring added and returning the figure instead of showing the plot
additionally hide_labels is now defined only once before going into the loop
2016-05-11 09:49:19 +02:00
63ac0107d0 [edit] implemented a plotting method for pdf dictionaries 2016-05-11 06:01:26 +02:00
c7d7acd7e3 [edit] implemented loop over PILOT database for reassessment
additionally the output of reassess_pilot_event is more verbose now
2016-05-10 09:54:21 +02:00
3705eb567b [fix] overcome numerical instabilities
due to the usage of large absolute values (timestamp) on time axis the estimation of the expectation value gets instable
2016-05-09 12:06:47 +02:00
4480854ee5 [workaround] set minimum difference of mpp with lpp and epp
this workaround elevates the difference between the uncertainty-picks and the mpp to a minimum value of three samples (needed for a reasonable pdf represetation of the pick)
2016-05-06 12:04:27 +02:00
d8a764db31 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-04 10:22:06 +02:00
f58c5a5f9d merge correction 2016-05-04 10:21:39 +02:00
fd27a43110 fixing import problems 2016-05-03 15:09:51 +02:00
41991c5d81 [edit] further restructuring and bugfixing 2016-05-03 13:54:59 +02:00
a82c1d39c6 [fix] fixing obvious problems in advance 2016-05-03 09:35:31 +02:00
ecb3670aeb Merge branch 'master' into develop
Conflicts:
	scripts/pylot-reasses-pilot-event.py
2016-05-03 08:58:33 +02:00
210d39882d further development on the reassessment routines for PILOT data 2016-05-03 08:46:13 +02:00
ae0c08eeb2 Merge branch 'master' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot 2016-05-02 14:10:41 +02:00
8cb4f11bf8 [edit] implementing reassessment functions 2016-05-02 14:10:11 +02:00
ec42e1bd15 added first version of fmtomo_parallel script 2016-05-02 12:08:58 +02:00
dbe47690eb Merged branch develop into master 2016-05-02 11:31:17 +02:00
ddb1ad4a15 Resolved conflicts fmtomoUtils 2016-05-02 11:28:56 +02:00
Marcel Paffrath
f906211064 fmtomo2vtk merged with fmtomoUtils 2016-05-02 11:19:06 +02:00
edd8920d54 WALL-E --- Small robot, big job! Restructuring the code and preparing implementation of a re-assessment tool for PILOT phases. 2016-05-01 21:10:30 +02:00
df44979337 [reorganize] some reorganization done to hand program to partner 2016-04-28 14:18:42 +02:00
37f9292c39 renamed class method 2016-04-28 14:03:32 +02:00
c489fad6ba [bugfix] comparison should not through an KeyError due to missing picks 2016-04-12 14:50:21 +02:00
416f4c7aa7 [bugfix] special method __nonzero__ should always return type bool 2016-04-12 14:48:57 +02:00
6181829ef6 [bugfix] make uncertainties from autoPyLoT may be corrupted
consequently there is minimum uncertainty gap between mpp and lpp/epp
2016-04-12 14:47:49 +02:00
4a9c02e1d1 [closes 195] in principle comparing automatic and manual picks works 2016-04-12 04:55:04 +02:00
9359338e81 [refs #195] make autoPyLoT export automatic picks in QuakeML format 2016-04-11 13:59:32 +02:00
9519372247 [bugfix] autopick accidently interchanged latest and earliest possible pick 2016-04-11 13:57:59 +02:00
2139674afa [bugfix] guessed that checking the same variable twice was not intended
instead of checking for mpickX's twice it was probably meant to check for lpickX's value
2016-04-11 12:39:46 +02:00
a9cd53886b [enhancement, task] there was no routine to read obs pick files available; default values for autopicking should be the same for all parts of PyLoT, thus defaults should be defined only once 2016-04-11 05:47:38 +02:00
2a8729c39b [refs #195] changed some default parameters for plotting the histograms 2016-04-08 14:35:20 +02:00
f15e27e81d [refs #195] hitsogram plots implemented for expectation and standard deviation 2016-04-07 16:29:29 +02:00
b5345bb5d3 [refs #195] implementation of histogram plots 2016-04-07 15:47:11 +02:00
27e334609c [refs #195] plotting method for Comparison object implemented 2016-04-06 11:27:09 +02:00
5f9a9242d1 [refs #195] realized an object oriented implementation of comparison
comparing pdf represented picks should be easy, thus objects returning everything needed are implemented; histograms and other plots are planned next
2016-04-05 22:19:55 +02:00
a475b366d4 [adresses #195] comparison dictionaries can now be compiled from QuakeML files 2016-03-31 14:29:29 +02:00
5fcaddb028 [adresses #195] started to implement comparison function 2016-03-31 09:00:49 +02:00
1fecec1696 [adresses #195] read_data now working correctly on QuakeML data 2016-03-31 08:50:09 +02:00
bd2bad7367 [adresses #195] task related new function introduced 2016-03-30 15:25:06 +02:00
76788c0223 [refs #195] initial import of new interfaces module 2016-03-30 11:45:49 +02:00
7a712ca37c [fixes #194] automatic filtering works also when switching phase selection
Switching the phase selection without picking the last onset did not filter according to the selected phase filter parameter. With this revision a displaying bug showing muliple '( filtered, filtered, filtered)' statements due to switching the phases is fixed as well.
2016-03-30 09:12:56 +02:00
d7cfd0d176 WALL-E: Einmal aufräumen und zurück! 2016-03-30 08:14:58 +02:00
320b7b7219 [bugfix] pick blocker was not reset after phase was picked 2016-03-29 14:42:51 +02:00
2d66248cf9 [fixes #172] now also in overview all horizontals are plotted 2016-03-29 14:06:57 +02:00
fef1a95391 [fixes #193] fixed bug introduced by component mapping
fixes a bug which was introduced in revision b8d680f54f
2016-03-29 11:40:16 +02:00
4c5b58dbf1 [addresses #190, closes #192] handles unknown picker information
pick tag is set to 'Unknown' for loaded data that do not provide picker information when saved with PyLoT prior to revision 06576586c6
2016-03-29 08:24:32 +02:00
cee48146d0 [closes #178] makes use of the new status variable pick_block introduced as filter_block to solve #174 2016-03-29 07:58:20 +02:00
a1c79b554a Merge branch '174' into develop 2016-03-25 05:08:09 +01:00
65df2c7dde [closes #174] now the filter button in the picking window is no toggle button anymore and has no effect when in picking mode 2016-03-25 05:07:18 +01:00
06576586c6 [edit] make use of new pick tag
find out the person's name for tagging the picks set within PyLoT
2016-03-23 12:00:54 +01:00
722e21f582 [edit] avoid catching unspecified Exceptions
specific Exception catchment is better than general; additionally errors are raised for better debugging control
2016-03-23 11:57:07 +01:00
31d56cb287 [edit] introducing picker tag
New tag introduced to distinguish between pickers (either person's or programs name)
2016-03-23 11:48:58 +01:00
438b2706b7 [edit] removed calls to names marked as deprecated
with the last update of obspy some modules and functions names will be removed in future releases and consequently have been marked as deprecated; PyLoT now uses the desired names
2016-03-22 10:52:20 +01:00
cad6ed2274 [edit] exit if no waveform files are selected
PyLoT will only start if waveformfiles are selected
2016-03-22 10:49:06 +01:00
7225da87db [edit] reformatted code
Code indentation and PEP 8 violations automatically reduced with IDE tool
2016-03-22 08:42:09 +01:00
fa6626d62a [edit] catch reference before assignment
charactersitic function variable might be referenced before they are assigned; now they are assigned as None and calls to assert help finding wrong definitions if not assigned correctly within if clause
2016-03-21 12:06:11 +01:00
d954c3bbe8 [edit] restructuring autopicking module
renamed several function and classes, moved script files to scripts
2016-03-21 11:14:16 +01:00
b8d680f54f 189 Channels shown in wrong order. 2016-03-18 15:35:12 +01:00
15080f1699 [fix] fixed the nonzero test for pdf definition that all values have to be greater than zero and the integration over the whole interval has to evaluate to 1 with given precision 2016-03-09 11:21:33 +01:00
a5fe838514 added a str representation for the pdf class 2016-03-09 06:22:26 +01:00
f3467221cc finished implementation of summation of two independent variables represented by a pdf 2016-03-09 06:21:48 +01:00
2de79eac77 [change] moved recursive function for broadcasting pdf in a new shape into the class' body 2016-03-09 06:19:41 +01:00
c651b5ca78 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-03-08 20:36:12 +01:00
db4dd47daa [bugfixes] made some fixes to the subtraction method; in some cases ValueErrors are raised which are now handled but raised as Warning 2016-03-08 20:35:56 +01:00
e6f404a219 [closes #188] picks are set correctly now
earliest and latest possible picks are now derived from the actually displayed (in some cases filtered) waveforms
2016-03-07 10:15:42 +01:00
9f7f00314a [closes #187] pdf methods for some values like expectation and plotting ready 2016-03-04 14:13:44 +01:00
e6b5848f36 [add] untested implementations of standard deviation and probability value determination methods to class ProbabilityDensityFunction 2016-03-04 06:27:11 +01:00
78a5a5117a [add] new function added which return the index of the value of an array which is nearest to a desired value 2016-03-04 06:25:17 +01:00
4606f84809 [new] implementing comparison methods into pdf class 2016-03-03 15:14:17 +01:00
18785edf68 [fixes #186] filteroptions are only parsed if they are not NoneType 2016-03-03 14:02:49 +01:00
c2168dbef3 [fixes #185] filtering of waveforms now conserved for picking 2016-03-03 11:12:27 +01:00
6108519acb [closes #182]
noiselevel now determined as the maximum of the absolute values of the noisewindow (holds also for signallevel); now the SNR and noiselevel is determined from the filtered waveform
2016-03-03 10:40:20 +01:00
848d11270b [fixes #181] now picking on horizontal components 1, 2 and N,E is possible 2016-03-02 13:37:40 +01:00
827a0da210 [fix] imports to obspy's read_events changed due to deprecated naming of function readEvents 2016-03-02 13:36:18 +01:00
c09a3271f9 make use of new option to getSNR 2016-03-02 11:08:14 +01:00
8c7a2af2db [fix] do not try to proceed if no picks are available 2016-03-02 11:07:32 +01:00
5e26519d66 [fix] avoid usage of hardly programmed indices 2016-03-02 11:06:31 +01:00
96ea0d7ac3 improved readability of formula 2016-03-01 12:26:56 +01:00
e7b454bae8 [edit] just style related changes 2016-02-16 08:47:42 +01:00
3ee221b8eb [edit] implementation of difference of two independent random variable as the correlation of the PDFs completed; summation pending due to unclear axis determination of the resultant PDF 2016-02-15 20:15:54 +01:00
f2cad2e151 [edit] changed implementation name from findlimits to commonlimits which is probably more intuitive for the user along with a new signature using other instead of giving the limits in advance 2016-02-15 20:15:54 +01:00
d5e16d64da [edit] implemented method to derive limits for the special methods for addition and subtraction 2016-02-15 20:15:54 +01:00
2956f3b733 [edit] subclassing has been substituted by classmethod fromPick opportunity for creating a PDF object 2016-02-15 20:15:54 +01:00
e7a5e388f6 [edit] implementation of probability density function interface ready for testing 2016-02-15 20:15:54 +01:00
303a5f9cf0 [edit] probability density function superclass implemented due to the different character of these functions 2016-02-15 20:15:54 +01:00
ada9f4e780 [new] started implementation of probability density representation routines 2016-02-15 20:15:54 +01:00
sebastianp
0d0b43103b editing of Docstring 2016-02-03 14:49:16 +01:00
sebastianp
8f6f6cf8b6 completition of Docstring 2016-02-03 14:35:07 +01:00
Marcel Paffrath
8893a8ec6b statistic plots added 2016-02-01 11:18:42 +01:00
5170a0b1c6 [new] implementation of a probability density function representation of the pick (untested) 2016-02-01 06:13:17 +01:00
70f2761003 [reformat] reformatted indentation 2016-02-01 06:11:25 +01:00
Marcel Paffrath
ce705888f1 bugfixes and other not further specified changes 2016-01-19 10:31:06 +01:00
Marcel Paffrath
7edee1266a Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
Conflicts:
	pylot/core/active/activeSeismoPick.py
2016-01-19 10:29:45 +01:00
Marcel Paffrath
acd9e942f9 improved SNR plots 2016-01-04 15:47:46 +01:00
Marcel Paffrath
3c1be950b9 removed most of the folm = 0.6 default values 2016-01-04 15:47:05 +01:00
Marcel Paffrath
3b4e1dcd1e added changes for manual picks 2016-01-04 15:46:24 +01:00
Ludger Küperkoch
5f0e59d95a Additional comments to make the code clearer. 2015-12-14 09:34:56 +01:00
Ludger Küperkoch
f6930618f2 calcMoMw: modified for calculating Mo and Mw using metric units. calcsourcespec: modified correction for attenutation using an exponential including Q(f). 2015-12-11 15:53:35 +01:00
Marcel Paffrath
0b1f16866b added plotHist 2015-12-11 11:08:06 +01:00
Ludger Küperkoch
534718aadf Improved figure caption, shows vertical trace including station ID and channel even if no or only bad pick is available. 2015-12-10 15:50:36 +01:00
Ludger Küperkoch
d2b39ff078 Improved some print output, bugfix: avoids getting negative value for pstart when iterative re-picking. 2015-12-10 14:30:38 +01:00
537b18774a [fix] fixed multiple calls to print by print one formatted message 2015-12-10 13:16:44 +01:00
Marcel Paffrath
17c3dd4f69 plot2dttc textposition changes etc 2015-12-09 14:03:20 +01:00
Marcel Paffrath
29c14fb512 added plot2dttc mode to plotAllShots 2015-12-09 14:02:58 +01:00
Marcel Paffrath
943432dfb3 updated plot of 2d ttcs 2015-12-09 13:39:58 +01:00
Marcel Paffrath
a866bf5228 added methods for auto to manual comparisons 2015-12-09 12:01:41 +01:00
Marcel Paffrath
490ad0f0c2 bugfix: setParameters for shot not working, because survey needed parameters on init 2015-12-09 11:18:49 +01:00
Marcel Paffrath
ee16cef901 renaming 2015-12-08 13:50:19 +01:00
Marcel Paffrath
c9a75ca2d0 renaming 2015-12-08 13:50:08 +01:00
Marcel Paffrath
feab50af28 bugfixes + renaming 2015-12-08 13:49:47 +01:00
Marcel Paffrath
cb3f9804f9 implemented setting manual picks from file 2015-12-08 11:34:55 +01:00
Marcel Paffrath
cdf924e8c2 bugfix: earliest and latest pp not changed when repicking manually 2015-12-07 11:47:57 +01:00
Marcel Paffrath
5083c5a876 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-12-07 11:21:50 +01:00
Marcel Paffrath
1a9f68f741 bugfixes (minSNR was 1, problem in for loop with break?) 2015-12-07 11:21:11 +01:00
Marcel Paffrath
d5b277db99 implemented cleanBySPE and plotSPE 2015-12-07 11:20:30 +01:00
Ludger Küperkoch
0c7c5645b6 Implemented correction for attenuation in calcsourcespek. 2015-12-04 16:05:53 +01:00
sebastianp
74794061f6 alphabetical sorting of functions and editing docstring 2015-12-03 17:20:05 +01:00
0d8324a4ae Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-12-03 15:25:24 +01:00
2b90c73f9f changed quotes for consistency 2015-12-03 15:25:04 +01:00
Ludger Küperkoch
67e37fe530 Initialization of picks dictionary including Mo, Mw, w0 and fc. 2015-12-03 14:59:39 +01:00
Ludger Küperkoch
d6ae82e070 Included rotation of seismograms using Obspys stream.rotation for a more reliable estimation of source spectra. 2015-12-03 14:57:44 +01:00
Marcel Paffrath
df5f0f41b4 comment 2015-12-03 12:21:18 +01:00
Marcel Paffrath
69d3f43db9 code commenting 2015-12-03 12:19:34 +01:00
1a5eed5559 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
Conflicts:
	pylot/core/pick/autopick.py
2015-12-02 22:05:47 +01:00
f3ba22b235 [new] introduced verbose flag to suppress to much output during auto picking (slows down especially to GUI triggered auto picking process) 2015-12-02 19:17:04 +01:00
Ludger Küperkoch
46cbe96a43 Extended class MoMw for calculating source spectrum. New functions calcsourcespec, calcMoMw and run_calcMoMw implemented. 2015-12-02 10:12:37 +01:00
Ludger Küperkoch
40f38ebf84 Removed calculation of source spectrum from autopick, as azimuth and angle of incidence are necessary and thus a location is needed for a reliable calculation of the source spectrum. Source spectrum is now calculated after locating the event. 2015-12-02 10:09:17 +01:00
Ludger Küperkoch
30970b8451 Modified class MoMw: new functio run_calcMoMw using subfunction calcMoMw, gets hypocentral distances from NLLoc-location file. Returns modified pick dictionary including individual seismic moments and corresponding moment magnitudes. 2015-12-01 15:41:37 +01:00
ed7a323c50 [new] reverting stdout redirection after auto picking is done; added method finalizeAutoPick for purposes to be done after the auto picking thread has finished 2015-12-01 05:04:26 +01:00
Ludger Küperkoch
41a495371d Changed average radiation pattern for P-waves to exact definition in Aki and Richards, 1980. 2015-11-30 16:45:29 +01:00
Ludger Küperkoch
23b9fda5e4 New class M0Mw for calculating seismic moment and moment magnitude. 2015-11-30 16:35:58 +01:00
Ludger Küperkoch
9f93c25aa8 Put additional parameters w0 and fc to picks dictionary. 2015-11-30 14:41:59 +01:00
Ludger Küperkoch
466e0020a6 w0fc: Plateau omega0 and corner frequency are are now taken as the median of previously calculated values from different functions synthsourcespek and fitSourceModel. 2015-11-30 13:27:08 +01:00
Ludger Küperkoch
957d2ccfe7 New function to derive plateau and corner frequency of observed source spectrum. Additional to scipys implicit function curve_fit, as seismic moment is sensitive to estimated plateau of source spectrum, which in turn is sensitivec to estimated corner frequency. 2015-11-30 13:14:23 +01:00
5f8569c7d9 [bugfix] now catching all cases 2015-11-30 09:53:55 +01:00
d67556796c [bugfix] plotting autopicks has to be done within thread because code outside the threads scope is executed in parallel 2015-11-30 09:52:31 +01:00
ae21c9a149 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-26 05:18:10 +01:00
50a5586355 [bugfix] autoPickListWidget is directly attached to the main window and autoScrolls to the latest entry 2015-11-26 05:17:26 +01:00
Ludger Küperkoch
7f05568f65 Bugfix: Captured error, if earllatepicker returns None for lpickS1/2, epickS1/2, and Serror1/2. 2015-11-24 13:35:23 +01:00
Ludger Küperkoch
ab8775c58d PragPicker: Upweight of left pick. 2015-11-24 13:31:14 +01:00
Marcel Paffrath
a2eb5868a7 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-24 12:38:16 +01:00
Marcel Paffrath
b310062687 changed SNR threshold (scaled by exp function) 2015-11-24 12:37:53 +01:00
f1cee0cbfd [fixes #168] now any TypeError is handled by try ... except clause 2015-11-24 11:30:58 +01:00
7a9c44198f [bugfix] currently set data structure now selected in QComboBox widget 2015-11-24 11:05:19 +01:00
69efd4d411 finished implementation of location tool tab in properties window (used to modify settings from the GUI) 2015-11-24 10:27:35 +01:00
Ludger Küperkoch
0a1d177d60 Additional picking parameters to be temporary modified for iterative picking. 2015-11-23 16:40:24 +01:00
cffca858aa Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-23 15:07:50 +01:00
8a4ac82c3a [new] added a new location tools tab to the properties widget (not working yet) 2015-11-23 15:07:43 +01:00
Marcel Paffrath
fdd7ff003b [bugfix] SNR minimum for setFittedSNR is now 1 2015-11-23 13:01:36 +01:00
4fdcf1cf60 [bugsearch] trying to fix UnpicklingError by clearing GUI element containing attributes 2015-11-23 12:11:04 +01:00
1f1d0aa118 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-23 11:41:14 +01:00
851da7eb15 re-design of the properties tabbed window 2015-11-23 11:41:04 +01:00
Marcel Paffrath
56a89ae386 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-23 11:38:36 +01:00
Marcel Paffrath
bd0d96c2ff changed input for generateFMTOMOinpu 2015-11-23 11:35:15 +01:00
Ludger Küperkoch
8a16643bd8 Marginal changes. 2015-11-20 16:02:25 +01:00
Ludger Küperkoch
67ac580778 Suppressed print output in setParam. 2015-11-20 15:53:25 +01:00
Ludger Küperkoch
07bbc2926e New function iteratepicker for iterative picking. 2015-11-20 15:51:22 +01:00
386131e9f3 started implementation of NLLoc properties selection into manualPyLoT; new utility routine to find indices throughout QComboBox' items 2015-11-20 09:06:52 +01:00
Marcel Paffrath
7f85ed99c0 bugfix textoutput 2015-11-19 11:38:54 +01:00
Marcel Paffrath
82089a6490 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-18 17:22:51 +01:00
Marcel Paffrath
657472f576 added shifting of SNR threshold along y axis 2015-11-18 17:22:18 +01:00
Marcel Paffrath
0a00aab3ba changed pickerror to SPE for exportFMTOMO
minor additions
2015-11-18 17:21:29 +01:00
Marcel Paffrath
abc45a4c8f bugfix: getPickError (/2)
added earliest and latest to plot_traces
2015-11-18 17:20:46 +01:00
Ludger Küperkoch
96fcc2470b Modified pick dictionary: writes dummy onset times (start of seismic trace) into dictionary in order to derive theoretical onset times later needed for iterative picking. 2015-11-18 11:12:53 +01:00
Ludger Küperkoch
e1c2629f97 Modified writephases for NLLoc: writes dummy onset times (start of seismic trace) into phase file in order to derive theoretical onset times later needed for iterative picking. 2015-11-18 11:11:10 +01:00
Ludger Küperkoch
8592557613 Minor changes 2015-11-18 10:28:46 +01:00
Ludger Küperkoch
1d6d786dbb Modyfied picksExport: additional parameter locrt to choose location routine, i.e. phase-file format. 2015-11-17 17:05:36 +01:00
Marcel Paffrath
f192a72ad7 slimmed down the code 2015-11-17 10:29:32 +01:00
Marcel Paffrath
b700940f54 bugfix: seismicshot dictionary for repick button was overwritten 2015-11-17 10:28:18 +01:00
Marcel Paffrath
160ee81c44 improved and fixed delete button 2015-11-16 12:11:42 +01:00
Marcel Paffrath
647fddb904 bugfix: could not highlight pick after it was deleted in plot_traces 2015-11-16 12:09:00 +01:00
Marcel Paffrath
0f1427a9f0 first try of shot.plot_traces delete button 2015-11-16 11:50:09 +01:00
Marcel Paffrath
78d61a9822 added writeVTK files 2015-11-16 11:49:57 +01:00
Marcel Paffrath
0a0ab4bfa9 added checkerboard to fmtomo utils and added different checkerboard ampl. functions 2015-11-16 11:48:45 +01:00
Marcel Paffrath
165419cb88 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-12 19:09:08 +01:00
Marcel Paffrath
db3429e780 improved text output and fixed some bugs 2015-11-12 19:08:33 +01:00
Marcel Paffrath
d53e4b7c0c implemented a function that generates all grids for FMTOMO 2015-11-12 13:24:48 +01:00
Marcel Paffrath
d611b8606e finished generatePropgrid, changed getThetaPhiFromArray output to the right order 2015-11-12 11:25:51 +01:00
d933c30148 [bugfix] now the whole line containing LOCFILES is replaced with a modified string using the getPatternLine utility function 2015-11-12 09:25:33 +01:00
1f383579b4 [new] added a new utility function to find a pattern in a text file and returning the particular line as a string or None if not found 2015-11-12 09:23:28 +01:00
Ludger Küperkoch
a1fbea98be Debuged: checks minimum number of zero crossings before calculating source spectrum from P pulse. 2015-11-11 16:11:25 +01:00
Marcel Paffrath
39a12bd1d1 bugfix: rays2vtk last point not displayed 2015-11-11 15:45:56 +01:00
Marcel Paffrath
54cb6d2f9a added interfaces generation for FMTOMO from SeisArray
still working on propgrid generation for FMTOMO from SeisArray
2015-11-11 15:36:43 +01:00
Ludger Küperkoch
b5b7453214 Debuged writephases: if first motion (fm) is None, ? is written to NLLoc-phase file. 2015-11-11 15:09:50 +01:00
Ludger Küperkoch
2ea2db0791 Debuged: Calculates real onset times for pick dictionary only, if earliest and latest possible pick are not None. 2015-11-11 14:53:50 +01:00
Ludger Küperkoch
c01c88b657 earllatepicker: take half wavelength for getting earliest possible pick as suggested by Diehl et al.. 2015-11-11 14:51:14 +01:00
Ludger Küperkoch
cd26d85f7c Debuged: Checks additionally for component 3 if component Z not available. 2015-11-11 14:10:44 +01:00
Ludger Küperkoch
7ed1ad2983 Debuged indentation error at lines 341 to 345. 2015-11-11 14:04:06 +01:00
Ludger Küperkoch
4f67e3e31a Debuged: Checks additionally for component 3 if component Z not available. 2015-11-11 13:58:25 +01:00
Marcel Paffrath
7aedc35c16 first implementation of a checkerboard modification for a given vgrids.in file 2015-11-09 16:12:12 +01:00
Marcel Paffrath
2a15ec75d2 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-05 12:20:12 +01:00
Marcel Paffrath
c28e2bda2a added surface2VTK 2015-11-05 12:19:56 +01:00
06337b4d66 [bugsearch] tried to figure out why topography correction did not work for fmtomo model output 2015-11-05 12:16:08 +01:00
Marcel Paffrath
5d378f9f0f Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-05 10:14:34 +01:00
Marcel Paffrath
f2fc5e5071 working on implementing of gradients for different layers 2015-11-05 10:13:04 +01:00
5ee85d89a3 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-05 09:17:29 +01:00
afb7a189ad [new] preparing new modules for location routines planned to be implemented 2015-11-05 09:17:20 +01:00
0f8b228931 [new] module "nll" containing utility function to handle NonLinLoc input and output as well as execution of the external program from python 2015-11-05 09:16:11 +01:00
d69db63132 [new] started to implement a new package containing modules for location purposes featuring different external location programs like NonLinLoc 2015-11-05 09:14:36 +01:00
Ludger Küperkoch
f738160a8b Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	autoPyLoT.py
2015-11-05 08:47:06 +01:00
Ludger Küperkoch
3fa4a31978 Extended function writephases for writing phases to HYPO71-input phase file. 2015-11-04 16:53:03 +01:00
Marcel Paffrath
d8a59ac81d bugfix: not yet done: problem with cusioning around topography 2015-11-04 10:13:52 +01:00
Marcel Paffrath
dc4d19ba88 bugfixes: formula for gradients in multiple layers for vgrid corrected, fixed issue with integer division that would lead to a wrong spacing 2015-11-04 10:04:05 +01:00
Marcel Paffrath
c5fc9ee89c Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-03 10:31:18 +01:00
Marcel Paffrath
c28641d629 changed plot traces for presentation (SNR, _drawStream etc.) 2015-11-03 10:29:09 +01:00
Marcel Paffrath
1c08152e65 vkt file "rel" changed to changes in percent 2015-11-03 10:27:06 +01:00
Marcel Paffrath
bcc6c8a73d enabled use of parameter file "mygrid.in" for generation of a starting model, prepared generation of vgrid model from array dimensions 2015-11-03 10:25:52 +01:00
Marcel Paffrath
1b95ed0da7 relative velocities in percent 2015-10-30 12:37:41 +01:00
Marcel Paffrath
422a76012e vert. exag for surface plot 2015-10-30 12:00:03 +01:00
Marcel Paffrath
84f1639e59 added transformation to vgrids vtk with relative values using vgrids.in and vgridsref.in from FMTOMO 2015-10-30 11:56:45 +01:00
809b6bea61 make use of the new __nonzero__ method 2015-10-30 08:33:05 +01:00
0cd427486c [modified] updateUi method for the FilterOptionsDlg has been restructured and simplified 2015-10-30 06:16:00 +01:00
9b1f7541fd [added] isSorted function for iterables 2015-10-30 06:12:23 +01:00
43f9e6fe0d [added] __nonzero__ method for boolean tests on FilterOptions object 2015-10-30 06:11:15 +01:00
Ludger Küperkoch
94448297bb Marginal changes. 2015-10-28 09:13:30 +01:00
Ludger Küperkoch
a315384417 New function writephases.py for writing phases files for various kinds of location routines. Started with NLLoc-phase file. 2015-10-27 10:01:07 +01:00
Ludger Küperkoch
c0ca788c5c Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	autoPyLoT.py
	pylot/core/analysis/magnitude.py
	pylot/core/pick/utils.py
2015-10-27 09:25:29 +01:00
Ludger Küperkoch
69a023e048 Introduced new function for writing phases files for various kinds of location tools. 2015-10-26 09:41:02 +01:00
Ludger Küperkoch
158da88523 Marginal changes only. 2015-10-26 09:40:07 +01:00
Marcel Paffrath
30680a7820 cosmetics for array plots (title, legend) 2015-10-22 10:54:24 +02:00
Marcel Paffrath
0223869df6 commit after recover of scripts from .pyc:
implementation of buttons for plotAllPicks/region object, printOutput to figure window, refreshing now with SNR, PE, SPE
2015-10-21 13:35:02 +02:00
Marcel Paffrath
eb873fd69f commit after recover of scripts from .pyc:
code cleanup after transfer of functions to survey methods
2015-10-21 13:33:47 +02:00
Marcel Paffrath
52e304b0af commit after recover of scripts from .pyc:
repick button for .plot_traces implemented
2015-10-21 13:33:11 +02:00
Marcel Paffrath
2b3e40b3b6 commit after recover of scripts from .pyc:
figure refreshing of plotAllPicks, cbar, survey.recover()
2015-10-21 13:30:55 +02:00
0064ff1889 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-10-20 12:02:01 +02:00
Marcel Paffrath
21ffbcabc8 deleted obsolete files 2015-10-20 10:52:05 +02:00
Marcel Paffrath
2dd36379a8 prepared application of stealth mode 2015-10-20 10:38:00 +02:00
Marcel Paffrath
195352a7ca merged 3 files
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

Conflicts:
	pylot/core/active/activeSeismoPick.py
	pylot/core/active/seismicshot.py
	pylot/core/active/surveyPlotTools.py
2015-10-19 13:15:28 +02:00
0a7b02c04a general clean-up 2.0 even more checks made and issues resolved 2015-10-19 11:25:15 +02:00
Marcel Paffrath
793e09910c *** empty log message *** 2015-10-19 10:34:45 +02:00
Marcel Paffrath
4498c72c90 repick button for plot_traces 2015-10-19 10:33:51 +02:00
0fa701a878 general code clean-up 2015-10-19 05:32:10 +02:00
b49206407a Merge using remote to resolve conflicts 2015-10-18 21:23:09 +02:00
Marcel Paffrath
d78b0f1cff added polygon selection!! 2015-10-13 18:41:55 +02:00
Marcel Paffrath
07395802b7 minor changes (plotAllPicks: inkByVal) 2015-10-12 15:13:08 +02:00
Marcel Paffrath
ddbfb03f27 *** empty log message *** 2015-10-12 15:10:53 +02:00
Marcel Paffrath
cdd33d7e2f improvements, refreshFigure() now possible and done automatically after deleting of picks 2015-10-12 14:40:29 +02:00
Marcel Paffrath
34abad46e2 refresh plot for plotAllPicks by replotting 2015-10-12 14:39:40 +02:00
Marcel Paffrath
a19cdc4fee implied stealth mode 2015-10-12 13:00:09 +02:00
Marcel Paffrath
0adc890aef implied stealth mode to suppress huge amounts of text output 2015-10-12 12:59:53 +02:00
Marcel Paffrath
5bb50d5be4 added captions for shotnumbers in plotArray2D 2015-10-08 12:16:03 +02:00
Marcel Paffrath
8e7b2e5b8a removed pick_backup. implied flag for each pick instead 2015-10-07 14:53:10 +02:00
Marcel Paffrath
c71e28ecb7 shots no longer None if they are removed, but flag = 0 2015-10-07 14:51:20 +02:00
Marcel Paffrath
09f0cd3e71 shots no longer None if they are deleted, but flag = 0 2015-10-07 14:51:00 +02:00
Marcel Paffrath
cfbcc9d362 bugfix: if invalid ray is generated by FMTOMO it will be skipped 2015-10-06 11:42:33 +02:00
4109696800 meet style conventions 2015-10-02 06:06:26 +02:00
Marcel Paffrath
7120a20499 changed vtk file structure for vgrids, making it way faster and smaller and enabling paraview to display surfaces instead of points 2015-10-01 17:30:57 +02:00
Marcel Paffrath
3d3cac7085 cosmetics 2015-10-01 17:21:18 +02:00
Marcel Paffrath
9faf42fd79 bugfix: import numpy missing 2015-10-01 17:20:01 +02:00
Marcel Paffrath
376d1cc6f8 name change 2015-10-01 13:14:44 +02:00
Marcel Paffrath
c58bb53002 output cosmetics 2015-10-01 11:33:39 +02:00
Marcel Paffrath
4399004277 cleaned up surveyUtils 2015-10-01 11:32:28 +02:00
Marcel Paffrath
3e7e693a66 changed structure: plot option -> survey method 2015-10-01 11:30:46 +02:00
Marcel Paffrath
2c1e9c63d8 changed structure: added plot option to survey methods 2015-10-01 11:30:16 +02:00
Marcel Paffrath
dd5523b2ac *** empty log message *** 2015-10-01 10:35:47 +02:00
Marcel Paffrath
e41b1436f9 *** empty log message *** 2015-09-30 14:32:08 +02:00
Marcel Paffrath
e78314461b *** empty log message *** 2015-09-30 14:31:55 +02:00