Commit Graph

1627 Commits

Author SHA1 Message Date
154e7b459f [add] --ncores flag added to autoPyLoT call, also enabled in GUI widget 2017-08-03 11:49:15 +02:00
90006809a5 [add] new autopick options added to file menu 2017-08-03 11:10:26 +02:00
e8a0a87dad [change] removed __del__ method reimplementation from thread objects
causing problems (no idea why it is there at all)
2017-08-03 11:09:50 +02:00
85a01fb0f1 [minor] cosmetics in print 2017-08-03 10:33:58 +02:00
5e2dc6c9f9 [add] improved submit functions 2017-08-03 10:15:54 +02:00
20b31a1c5c [reformat] code reformatting with PyCharm 2017-08-03 09:41:54 +02:00
4107f0249d [add] widgets for GUI independent spawning of autoPyLoT processes, WIP 2017-08-02 15:20:32 +02:00
482ae112e8 [bugfix] missing string emitting signal 2017-08-02 13:19:09 +02:00
d5645cf979 [bugfix] string transformation of None values 2017-08-02 11:02:24 +02:00
a5a3087283 [add] system specific path SEPERATOR 2017-08-02 10:47:41 +02:00
c60c659608 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-07-31 17:00:55 +02:00
aa5d11d735 [WIP] changed multiThread structure to QThreadPool 2017-07-31 17:00:19 +02:00
Ludger Küperkoch
8b7496a2fb Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	pylot/RELEASE-VERSION
2017-07-31 15:40:11 +02:00
c353c24283 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-07-31 14:57:36 +02:00
7ca6509611 [bugfix] has_keys not a method of dict in python3 2017-07-31 14:56:59 +02:00
bd62115e5d Merge remote-tracking branch 'origin/develop' into develop 2017-07-31 14:56:31 +02:00
Ludger Küperkoch
290a623664 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-07-31 14:18:40 +02:00
Ludger Küperkoch
7009983925 [Bugfix] Wrong derivation of method_id. 2017-07-31 14:17:06 +02:00
17e6169cee [bugfix] untabify code 2017-07-31 13:52:57 +02:00
06b8c8413f merge release version 2017-07-31 13:44:37 +02:00
121ef4357f [WIP] using multiThread to call autopylot 2017-07-31 13:43:06 +02:00
Ludger Küperkoch
4244c4209b New function to derive onset quality classes and to plot them if desired. 2017-07-31 12:04:03 +02:00
f13542840f [add] MultiThread class added 2017-07-31 10:40:03 +02:00
f86f33b22f [minor] removed output 2017-07-20 16:18:00 +02:00
04d43f67c5 [bugfix] default phases from obspy not unique
[add] toggle button for checking phases
2017-07-20 15:11:07 +02:00
f93713fdad [bugfixes] filtering should be possible for all recognized phases now 2017-07-20 14:09:35 +02:00
d48d29f7ec [change] code restructured for flexibility 2017-07-20 11:50:57 +02:00
9c089329f3 [bugfix] string changed by accident 2017-07-20 11:42:31 +02:00
389965e573 [add] plot arrivals option added
[change] code reformated by PyCharm
2017-07-20 11:33:01 +02:00
c644095b5a [add] phase defaults for phasesTab 2017-07-19 15:12:01 +02:00
548c863f10 [minor] tight_layout for waveformwidget figure 2017-07-18 16:17:04 +02:00
d21afcf31a [minor] changed linewidth of wf plot slightly 2017-07-18 16:12:33 +02:00
be588252cf [add] events can be removed by clicking a button in event_table 2017-07-18 16:07:08 +02:00
60594c97cf [bugfix] wrong if cause in for loop in read_eventfile_info
[add] function to remove events from project
2017-07-18 15:27:52 +02:00
37875d5c87 [add] finished remove picks feature, testing needed 2017-07-18 14:34:09 +02:00
dbb3fab6d0 [add] possibility to remove picks added to pickDlg 2017-07-18 13:54:47 +02:00
1918c11b42 [bugfix/improvement] checkZ4s independent of different trace starttimes and sampling rates 2017-07-17 18:02:29 +02:00
176f13db09 [bugfix] slope window was used for calculation of checkz4s leading to huge problems 2017-07-17 16:58:40 +02:00
547355fbdf [change] updated parameters of function call exportEvent in autoPyLoT 2017-07-17 13:44:38 +02:00
f41a330606 [add] default event output name += .xml 2017-07-17 13:10:02 +02:00
2633f4b9cf [bugfix] error-prone check for method_id.id 2017-07-17 11:58:32 +02:00
7e0f4efbcc [bugfix] wrong usage of instrinsic function list() 2017-07-17 11:50:51 +02:00
7f0ab4dd94 [merge] merged changes in QtPyLoT manually 2017-07-17 11:38:50 +02:00
e5f5ab8412 [change] improved code behavior; exportEvent now checks for magnitudes and origins as well 2017-07-17 11:32:38 +02:00
b286290797 [change] exportEvent now checks for existing picks of type 'fcheck' in xml file and replaces them with new picks 2017-07-17 10:55:02 +02:00
90e27f1d08 [WIP] autopicks -> update xml file 2017-07-14 16:24:37 +02:00
a017c4deb4 [bugfix] various bugfixes while testing on Windows with py3 2017-07-14 15:26:39 +02:00
3869922378 [bugfix] typo in variable name 2017-07-14 14:16:12 +02:00
227112cbac [change] parameter evtdata of class Data has to be called as str object
(instead of outdated basestring) to make the class python 3 compatible
2017-07-14 13:30:54 +02:00
20e86cee5a Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-07-14 11:11:49 +02:00
68f864e93a [bugfixes] changed iplot flag default to 0, intercept Exception on false
filter settings
2017-07-14 11:09:18 +02:00
Ludger Küperkoch
01fe32c9b2 [Bugfix] Reversed change of a former commit supposed to make it compatible to Python3. 2017-07-14 11:05:09 +02:00
a560f4140b [update] icons will be imported depending on python version 2017-07-14 09:51:43 +02:00
Sebastian Wehling-Benatelli
e46f9066d9 [change] increased inter platform compatibility 2017-07-13 17:40:21 +02:00
f57aa37d99 [change] changed some functions to work with Python 3 and Windows 2017-07-13 17:27:48 +02:00
721874dbb7 [change] layout of sub-parameters of PylotParameter changed back to vertical alignment to save horizontal space in tuneautopick window 2017-07-12 16:49:11 +02:00
aa6f4324d0 Merge branch 'filterOptions' into develop 2017-07-12 16:33:14 +02:00
818fb7a296 [change] final adjustments made to filteroptionsdialog and parabox, ready for testing 2017-07-12 16:24:50 +02:00
Ludger Küperkoch
76a99005ec [Change] Save picks in cnv-, xml, and obs-format simultaneously. cnv not working! 2017-07-12 15:24:55 +02:00
Ludger Küperkoch
351d473cbf [Bugfix] Wrong format of nested if conditions. 2017-07-12 13:05:43 +02:00
Ludger Küperkoch
da372b435c [Bugfix] Wrong processing flow for checking picks. 2017-07-12 12:09:08 +02:00
Ludger Küperkoch
9ee32ee95e [Bugfix] Save only real determined onsets. 2017-07-12 10:45:22 +02:00
Ludger Küperkoch
2a0cb9f6c8 Additional screen output to inform the user about pick saving details. 2017-07-12 09:58:19 +02:00
Ludger Küperkoch
34d5f9bf7d Additional screen output when saving picks. 2017-07-11 20:43:28 +02:00
Ludger Küperkoch
49092a928e Save only picks for NLLoc, VELEST, etc. that not exceed adjusted uncertainties. 2017-07-11 16:23:23 +02:00
43116ec2c6 [add] filtering in pickDlg will not be done by default anymore, changes in pushing filter in main traces window, still WIP (not going back to original wf after first filtering?) 2017-07-11 16:22:22 +02:00
1d9e52f577 [change] several updates updates to filterOptions, FILTERDEFAULTS now loaded from pylot.in, filterOptions should be 'shared' between filterOptionsDialog and pylotParameter 2017-07-11 16:03:24 +02:00
e0926c6b20 [change] phase/expected phase arrivals text position now stays readable around pickDlg axes 2017-07-10 15:39:44 +02:00
8dcff4a467 Merge branch 'master' into taup 2017-07-10 11:30:37 +02:00
d0b5626c91 Merge branch 'master' into filterOptions 2017-07-10 11:29:16 +02:00
fedb7c2c0d [hotfix refs #220] Missmatching ressource_id's only produced warning on exporting picks, but did not prevent event mixing 2017-07-07 13:15:20 +02:00
a9334372e8 [add] working version of expected arrivals of chosen phases 2017-07-07 12:16:38 +02:00
f7e54275c3 [change] structural changes to filteroptions WIP 2017-07-06 17:22:23 +02:00
09b2dfa5d1 [hotfix] could not load multiple parameters from pylot.in if values are type==string 2017-07-06 09:53:13 +02:00
dbc38385b5 [add] semi working version of filterOption dialog, WIP 2017-07-04 16:37:05 +02:00
097222a43d [add] namestrings for default parameters, filteroptions connected to parameters (WIP)
[change] layout of pylotparabox
2017-07-04 14:39:10 +02:00
1b3c29c47e [bugfix] missing comma in dictionary definition, also corrected misspelling 2017-07-04 10:31:23 +02:00
5bc9f14074 Merge branch 'develop' into filterOptions 2017-07-04 10:19:42 +02:00
74393432da [bugfix] do not show file menu when embedded, stretch changed (still problems on ludgers machine) 2017-06-30 15:06:17 +02:00
8e12bb1bc6 [bugfix] when no settings are given for phases use empty list 2017-06-30 14:43:06 +02:00
1c610d22f0 [add] restore default options for some tabs 2017-06-30 14:29:37 +02:00
beed46229a [add] plot phase name in pickDlg, also plot network code 2017-06-30 13:56:59 +02:00
533f7ea353 merge origin/develop into develop 2017-06-30 13:31:19 +02:00
3c0db3efa4 [add] different phases can now be selected in picks_menu on pickDlg depending on phases set in preferences 2017-06-30 13:26:46 +02:00
Ludger Küperkoch
13666312fa [Bugfix] Enable locate button as soon as manual picks are available. 2017-06-30 11:04:49 +02:00
Ludger Küperkoch
92f4ae3923 [Bugfix] One argument for export was missing. 2017-06-30 10:41:47 +02:00
a61eebba29 [proposal] use checkable QPushButtons for phases instead of QLineEdit, as line edit is highly vulnerable to incorrect user input 2017-06-30 09:42:36 +02:00
Ludger Küperkoch
9b22d0f8d6 Started activating PhasesTab for phase declaration. 2017-06-29 17:20:36 +02:00
9e6b376c62 [bugfix] reintroduced previous bugfix 2017-06-29 17:02:05 +02:00
Ludger Küperkoch
647cb1e32b Reintroduced changes of MP spuriously removed by previous commit. 2017-06-29 16:41:09 +02:00
Ludger Küperkoch
1e99ae8272 File extention for output taken from preferences OutputsTab. 2017-06-29 16:35:52 +02:00
574704cc49 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-29 10:24:27 +02:00
3ae166b147 [bugfix] picks not plotted in PickDlg if type(picks .or. picksdict) was AttribDict instead of dict 2017-06-29 10:23:45 +02:00
Ludger Küperkoch
5564fb54dc Additional screen output to inform the user about status of saving picks. 2017-06-29 09:51:24 +02:00
Ludger Küperkoch
e7bd1c8d31 Export for VELEST-cnv format. 2017-06-28 16:55:12 +02:00
4f8631e829 [revert] changes of previous commit reverted as problems with QDialog seem to be caused by windows XServer 2017-06-28 16:40:44 +02:00
marcel
afd7a94852 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-06-28 16:26:16 +02:00
marcel
2f7033329b [bugfix] possible that dialog was hidden behind other windows 2017-06-28 16:24:24 +02:00
Ludger Küperkoch
d31fec8781 Before exporting phases, check for manual picks and export them instead of automatic picks. 2017-06-28 14:23:24 +02:00
Ludger Küperkoch
f52b42f009 [Bugfix] Write header only, if export has been successfull. 2017-06-28 12:40:03 +02:00
Ludger Küperkoch
85829b22eb Write header in ObsPy-generated NLLoc-observation file. 2017-06-28 12:38:21 +02:00
cb1fb60eec Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-27 15:11:06 +02:00
f1f9295370 [add] user prompt when event_id not matching on load_data 2017-06-27 15:08:19 +02:00
Ludger Küperkoch
a3487b66ea [Bugfix] Take care that chosen window lengths fit to length of time series. 2017-06-27 13:59:00 +02:00
Ludger Küperkoch
68ef127617 [Bugfix] Network code was missing. 2017-06-27 11:46:21 +02:00
a90e0bd78b [change] data._new moved to applyEVTData 2017-06-27 10:49:11 +02:00
Ludger Küperkoch
987f5c4d62 Additional info for user. 2017-06-27 10:11:11 +02:00
30e2e1df84 [bugfix] query for data flag/attribute isNew changed 2017-06-26 17:41:08 +02:00
71da6ded2b [bugfix] Error when getEventFromPath returned None 2017-06-26 17:40:36 +02:00
Ludger Küperkoch
c56a11634a Uncomment setNew, though still not sure, what its all about. 2017-06-26 16:10:18 +02:00
Ludger Küperkoch
bec8604904 autoPyLoT appends manual picks to xml-file, and manualPyLoT appends automatic picks to xml-file. 2017-06-26 14:47:36 +02:00
581a85b81f [bugfix] missing network code in picksdict_from_picks triggered silent Exception using picks generated by picks_from_picksdict 2017-06-26 13:58:26 +02:00
b10b79ea79 [change] renamed picks attribute for pylot to pylot_picks, picks attribute of events will now be used exclusively for ObsPy picks 2017-06-26 12:19:06 +02:00
d08bd4cc9e [move] class Event finally moved to new module event 2017-06-26 12:03:04 +02:00
acaf592590 [move] class Event moved to pylot.core.util.utils 2017-06-26 10:47:40 +02:00
Ludger Küperkoch
0f05be6a50 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	pylot/RELEASE-VERSION
2017-06-23 15:47:09 +02:00
Ludger Küperkoch
9746913f8b Consistent prefix for all PyLoT-output. 2017-06-23 15:45:45 +02:00
8e6c4d06ce [add] array_map now plotting event location if given 2017-06-23 15:40:13 +02:00
ed4c112e99 [add] additional event information will be displayed in eventlist tab
[bugfix] project.search_eventfile_info was using relative path for filename
2017-06-23 14:56:56 +02:00
f409861d10 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-23 14:16:06 +02:00
103ae716a2 [add] additional event information can now be read by project from a simple textfile and added to each event (time, location, magnitude) 2017-06-23 14:14:42 +02:00
Ludger Küperkoch
c9f0b126df Equal xml-file name for both automatic and manual picks, i.e. PyLoT_evID.xml. 2017-06-23 14:11:35 +02:00
929f58b942 merge origin/develop into develop 2017-06-23 12:12:55 +02:00
7bb2d54f6e [change] Event class now bases on ObsPy Event class which should be more efficient in future, origin time will be read from notes file if possible 2017-06-23 12:04:26 +02:00
Ludger Küperkoch
27597e6b4b Take into account parameter extent when writing header for PyLoT-input file. 2017-06-23 11:32:08 +02:00
Ludger Küperkoch
5958e05f3b Cosmetics. 2017-06-23 10:26:49 +02:00
Ludger Küperkoch
6ebad273a9 Improved screen output. 2017-06-23 10:10:45 +02:00
Ludger Küperkoch
71876638c8 Flexible calculation of local magnitude including station magntiude scaling as well as network magnitude scaling.
auoPyLot-output-file names have prefix event ID.
2017-06-22 15:04:16 +02:00
ca1d3dca38 [add] filter parameters added to default parameters 2017-06-22 12:01:22 +02:00
97ee03b443 Merge branch 'develop' into filterOptions 2017-06-22 11:26:02 +02:00
8e8b3e0462 [rename] AutoPickPara ---> PylotPara 2017-06-22 11:22:17 +02:00
f91e1cde6f [change] structure changed to make parabox more flexible 2017-06-22 11:03:24 +02:00
203974cd83 [bugfix] parameters interchanged 2017-06-22 10:54:17 +02:00
f6a20c4ea2 [bugfix] advanced_cb acciddently pushed to bottom of layout 2017-06-22 10:53:56 +02:00
Ludger Küperkoch
9f164fc075 Still in progress: flexible local magnitude estimation. 2017-06-21 16:42:26 +02:00
Ludger Küperkoch
477aacbb4a Preparation of flexible local magnitude estimation. 2017-06-21 15:43:12 +02:00
Ludger Küperkoch
cf200e1425 Preparation of flexible local magnitude estimation, renamed module. 2017-06-21 15:41:12 +02:00
5928967e28 [closes #212] tuneAutopicker always tries to load current event in mainwindow 2017-06-21 15:33:49 +02:00
6feffaeadb [closes #209] spacebar can now be used to accept pickDlg, also added a checkbox to automatically open next station (experimental) 2017-06-21 15:20:36 +02:00
b0dcf5ff4b [change] local magnitude section added 2017-06-21 14:20:22 +02:00
d77abdc1d0 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-21 14:10:24 +02:00
5214d31908 [add] space hotkey to close window 2017-06-21 14:09:39 +02:00
Ludger Küperkoch
b96af41324 In progress: new parametters for magnitude estimation 2017-06-21 13:53:53 +02:00
c10639b49c [merge] manual merging to new function structure (widget insertion with position) 2017-06-21 13:28:44 +02:00
43c314a1f8 [add/change] dataroot added to project file, improvements in behavior of create/save project 2017-06-21 13:24:45 +02:00
Ludger Küperkoch
9dc1545b63 Renamed/added new main parameter sequence Seismic Moment and Local Magnitude. 2017-06-21 13:03:17 +02:00
Ludger Küperkoch
51be558560 New parameters added for local magnitude estimation and scaling. 2017-06-21 13:01:14 +02:00
0a6ad8b663 [add] folder structure automatically recognized when adding events 2017-06-21 11:45:35 +02:00
be463c2adf [add] functionality to display one groupbox of AutoPickParaBox exclusively 2017-06-21 10:36:22 +02:00
1b512a0864 [closes #207, closes #208] when supressing user prompt, applyEVTData to data object was accidently removed 2017-06-20 16:23:54 +02:00
ab979e9b10 [bugfix] events not properly provided to autoPyLoT by TuneAutopicker, wrong parameter name in plotting routine 2017-06-20 14:32:21 +02:00
0ff6f78a6c [add] parameter localMag added 2017-06-20 12:10:56 +02:00
718879fad0 merge origin/develop into develop 2017-06-20 09:57:52 +02:00
300ff9215b [fixes #210] missing paranthesis in function call 2017-06-20 09:54:23 +02:00
Ludger Küperkoch
16003b6353 Bugfix: Different number of elements in used arrays. 2017-06-19 18:21:38 +02:00
Ludger Küperkoch
2601ec2865 Bugfix: Empty polyfit-object is avoided. 2017-06-19 16:35:51 +02:00
1b17842f63 [fixes #201] test events will be skipped when using TuneAutopicker 2017-06-19 16:30:39 +02:00
0717f491aa [closes #203] events can be saved as pickle now, not intended to save back event notes to notes.txt file as it is only used for automatically generated event folders 2017-06-19 13:54:43 +02:00
Ludger Küperkoch
9aba69686d Richter magnitude scaling is hard-wired, should not be handled internal. First step to flexible local-
magnitude estimation.
2017-06-19 11:37:08 +02:00
08b9cec674 [refs #206] savepicks XML now opens current event folder by default, also gives default filename
[bugfix] could not save XML files with . in name
[change] removed user prompt when changing picks on different event (redundant)
2017-06-19 11:28:11 +02:00
053caa5cf6 [change] replot after manual picking only if necessary (picks changed) 2017-06-19 10:37:24 +02:00
aea77cd49c [change] removed redundant propmpt because new picks have to be accepted in the first place when closing PickDlg 2017-06-19 10:30:08 +02:00
7257d43155 [fixes #205] call replot thread after manual picking 2017-06-19 10:23:39 +02:00
754883c5c9 [refs #204] adding application name/organisation/domain when building app before calling settings 2017-06-14 16:22:26 +02:00
d2d8498739 [bugfix] stream oabject overwritten when using alter_comp causing traces to disappear in plot 2017-06-12 14:36:38 +02:00
5412de8249 [add] notes can be read from event folders 2017-06-12 11:34:45 +02:00
ddedd3ed7a [hotfix] ignoring error when mouseclick signal cannot be disconnected 2017-06-12 10:42:44 +02:00
marcel
01c556562e [bugfix] newer version of pyqtgraph could not cope with UTCDatetime, now min/max_range for axes working 2017-06-09 13:51:20 +02:00
8e839df718 [add] pyqtgraph now part of Settings object; if installed will be used by default but can be deactivated 2017-06-09 13:23:16 +02:00
b061c81b2c [change] removed axes on startup 2017-06-08 16:58:44 +02:00
d6dd8bfaa8 [bugfix] several bugfixes mostly refering to plotting from plotWaveformDataThread, now only plot data are generated from within thread 2017-06-08 16:36:47 +02:00
909e2241a7 [change] working version of pyqtgraph for dataPlot, WIP: fill not working on versions lower 0.9.9 2017-06-08 14:09:01 +02:00
a07162d668 first semi-working plot of all traces 2017-06-07 17:05:48 +02:00
be8035e118 [bugfix] update to previous commit 2017-06-07 11:31:03 +02:00
9e85a9df47 [bugfix] using default channel components in case QSettings is not working with OS 2017-06-07 11:29:38 +02:00
66c5142cb9 [change] major changes in AutoPickParaBox layout, now structured as groupboxes that can be hidden individually 2017-06-07 10:30:15 +02:00
0af795969b [add] parameters now changed as part of project, some small fixes 2017-06-06 16:30:27 +02:00
f7d0e49458 [change] some updates of main window title changed to new QtPyLoT 2017-06-06 15:51:06 +02:00
20300daecf [change] metadata not saved as part of project file anymore (files might get really big), still possible to load same project, idea: add QSetting whether to save or not to PyLoTprefs 2017-06-06 15:28:43 +02:00
bdc85fa56a [bugfix] channel order mixed 2017-06-06 14:43:36 +02:00
9007197786 [add] network code added to station map 2017-06-06 14:08:19 +02:00
4077ec207c [bugfix] contourf plot not shown in station map. min() max() was not working when nan in list 2017-06-06 13:49:40 +02:00
86c76c6f61 [bugfix] 3 comp. window, time correction for trace overdone 2017-06-06 11:16:57 +02:00
530a629d15 [bugfix] changed code order for QSettings 2017-06-02 14:02:08 +02:00
f7af1d0b1b Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-02 11:52:39 +02:00
6434366e55 [bugfixes] several fixes relating to Channel Components, main issue: SetChannelComponents object was newly initated every time. Now: One object saved inside global QSettings. Testing needed. 2017-06-02 11:51:00 +02:00
Ludger Küperkoch
1e03541d6d Stabilized slope calculation for quality control. 2017-06-02 11:41:52 +02:00
Ludger Küperkoch
e2c1b8501e Exception for ValueError, if autoPyLoT has been started from terminal.
Raise SacIOError if obspy.read spuriously wants to read SAC data.
2017-06-02 11:09:32 +02:00
0fb6e5d4df [bugfix] pickDlg takes into account timeshift of trace.starttime for different components
[add] initial pick displayed in pickDlg
2017-06-01 15:25:43 +02:00
04304d3db8 [hotfix] adding decimals to AutopickParaBox 2017-06-01 14:01:43 +02:00
eaa4849a20 added network code to TuneAutopicker, small bugfix 2017-05-31 17:31:58 +02:00
cf399ed747 added parameter selection with ParameterBox to QtPyLoT Mainwindow 2017-05-31 17:12:34 +02:00
7d736823b1 [bugfix] min/max values of automatically generated spinboxes changed to -10e7 to 10e7 2017-05-31 16:28:05 +02:00
cd612def81 WIP: working on saving filter options as part of project 2017-05-31 16:25:46 +02:00
62fa3ad8b1 several updates to internal refreshing of widgets when manual picks are set 2017-05-31 15:41:25 +02:00
02a59f46a9 [bugfix] fixed filter settings for pylot.in file on open/save action in AutoPickParaBox 2017-05-31 14:35:52 +02:00
5897113140 [bugfix] fixed behavior of createNewProject, changed some hotkeys and renamed actions in file tools
[new] added saveAs button for prject, TO DO: possibly change saveAs icon slightly from save icon
2017-05-31 14:30:06 +02:00
eb5cf08d58 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-31 13:46:37 +02:00
16c2ecb82f added main window zoom with [STRG] and [SHIFT] + mousewheel 2017-05-31 13:45:48 +02:00
Ludger Küperkoch
33e34ef194 Removed former changes, made it worse! 2017-05-31 12:21:40 +02:00
c540cd0f81 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-31 11:48:51 +02:00
17cdffe735 some updates on saving/closing and user interaction 2017-05-31 11:48:16 +02:00
Ludger Küperkoch
d7abd3bef9 Stabilized slope determination. 2017-05-31 11:41:24 +02:00
1ff3b845bb some changes on dirty flag, added keyPress/release Events for Ctrl-Key 2017-05-31 10:56:45 +02:00
60c882fe04 [bugfix] changes in default_parameters not applied 2017-05-31 10:33:45 +02:00
396555b4b4 changes in resolution window (added parameter for extent), TRIAL: changes in YLims of pickwindow after init Pick 2017-05-31 10:28:31 +02:00
f493359c26 [bugfix] fixes and modifications for (inhomogeneous) global datasets, WIP 2017-05-30 16:27:38 +02:00
ceed165307 [bugfix] accidential function rename in code fixed 2017-05-30 11:45:53 +02:00
a745381e8e some changes in propertiesDlg 2017-05-30 10:17:07 +02:00
395295a295 changed some things in properties dialog to keep settings when opened again. added settings 'nth_sample' to speed up plotting a little bit 2017-05-29 18:03:31 +02:00
0f1292e9f2 [bugfix] setValue not working when type(item) in QLineEdit was 'int' instead of 'str'(i.e. 'unicode') 2017-05-29 16:24:44 +02:00
41a870d720 some changes in dataPlot resizing/height adjustments 2017-05-29 16:21:36 +02:00
5115705c4e Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-29 13:50:30 +02:00
a2ca96ae57 wfDataPlot stations now sorted by network and then by name 2017-05-29 13:49:34 +02:00
Ludger Küperkoch
b542f83201 Bugfix, sligthly changed SNR and noise-level calculation. 2017-05-29 12:02:56 +02:00
cb91911313 Merge remote-tracking branch 'origin/develop' into develop 2017-05-29 11:57:14 +02:00
b2d48cd523 changed some dirty things 2017-05-29 11:56:22 +02:00
3ad82c0c9e small fix on saving back loaded project 2017-05-29 11:34:22 +02:00
8975913143 added load project option from command line (QtPyLoT.py -p) 2017-05-29 11:31:09 +02:00
Ludger Küperkoch
5e593fc932 New class for getting/setting channel order, replaces old globals COMPNAME_MAP and COMPPOS_MAP. 2017-05-29 11:23:39 +02:00
b3a4470910 slightly changed qtpylot to call it from console 2017-05-24 15:28:52 +02:00
69b2daaab8 Merge remote-tracking branch 'origin/develop' into develop 2017-05-24 14:13:43 +02:00
50129fc8d9 [fix] some small fixes, new QtPylot functions commented 2017-05-24 14:12:41 +02:00
Ludger Küperkoch
9bc6f601a1 A littlebit more pythonic. 2017-05-24 11:23:35 +02:00
Ludger Küperkoch
c954614544 Bugfix: PyLoT can now cope with databases named with number (e.g. year). 2017-05-24 10:19:50 +02:00
Ludger Küperkoch
74b19ac094 Bugfix: PyLoT could not cope with input file if not called pylot.in. 2017-05-24 10:12:12 +02:00
Ludger Küperkoch
92525732a3 Cosmetics. 2017-05-23 16:36:02 +02:00
Ludger Küperkoch
3da76e9f1c Connected new ChannelOrderTab to component positions and names. 2017-05-23 16:13:58 +02:00
Ludger Küperkoch
36b4a2a05f Removed needless print output. 2017-05-23 15:33:19 +02:00
Ludger Küperkoch
4b3687fd2b New preferences tap ChannelOrderTab for assigning channel numbers to components. 2017-05-23 15:31:13 +02:00
840610cb18 [new] added some mousewheel zooming for array map 2017-05-23 13:34:39 +02:00
83fd0efd83 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-05-22 15:36:35 +02:00
22eb46999c map beautification 2017-05-22 15:34:07 +02:00
Ludger Küperkoch
eb0cb7d5ab Cosmetics: Reasonable name for autopick-tune tap. 2017-05-22 14:59:48 +02:00
Ludger Küperkoch
cf4615a438 Removed obsolete class ParametersTab (Now done in class TuneAutopicker). 2017-05-22 14:38:48 +02:00
ba56bfbd25 added scroll functionality when mouse inside dataPlot canvas 2017-05-22 10:53:20 +02:00
Ludger Küperkoch
a3fbeafeac TuneAutopicker now gets event id independent from input of pylot.in. 2017-05-19 15:39:43 +02:00
5a3b77dc7b Merge remote-tracking branch 'origin/develop' into develop 2017-05-19 13:54:33 +02:00
f3a96ae200 small bugfix 2017-05-19 13:53:58 +02:00
Ludger Küperkoch
092aeb4cec autoPyLoT button works nearly properly now. 2017-05-19 13:22:04 +02:00
Ludger Küperkoch
4767add68f Re-initialized autoPyLoT from GUI, new input parameter eventid to make sure processing the right event. Buggy! 2017-05-19 12:30:03 +02:00
e911262c3e added some buttons for setting current event to ref/test, made ref/test color settings 'global', some fixes 2017-05-19 10:56:27 +02:00
cf971d6a87 Mainwindow plotWidget size fix 2017-05-19 09:23:02 +02:00
1143d97f36 added manual picks to tune autopick figures 2017-05-18 15:24:30 +02:00
Ludger Küperkoch
f814ec8656 Bugfix: if no plotflag set, fig was not assigned. 2017-05-18 13:53:22 +02:00
a8861dfdab [bugfix] multiprocessing problem fixed, caused by a general bug passing wrong argument [fig_dict] to AIC instead of [fig_dict[key]]; also iplot flag is correctly read from parameter file now 2017-05-18 13:16:53 +02:00
46236eeb55 changed PyQt import to PySide import! 2017-05-18 11:44:51 +02:00
11a7f17655 small fix preventing eventID from being changed in TuneAutopick when parameters are loaded 2017-05-18 11:41:14 +02:00
Ludger Küperkoch
b979649e82 Cosmetics. 2017-05-18 10:31:59 +02:00
Ludger Küperkoch
45ff145616 Take into account, that input_dict is not available when calling from terminal. 2017-05-18 10:09:51 +02:00
Ludger Küperkoch
f4f7615bf8 Take into account, that key eventID is not always available. 2017-05-18 09:55:07 +02:00
fa2b65ea3d removed focmec parameter 2017-05-17 14:52:50 +02:00
d81fb3e2e9 several bugfixes, mainly on map_projection with updated pick structure as part of event class 2017-05-17 13:25:41 +02:00
55bc0de036 working on connection between picks/autopicks of different tools [WIP], to do: fix array map number of picks/points mismatch in map 2017-05-16 17:26:42 +02:00
ba58cb548b bugfix iterating over same index as eventBox index 2017-05-16 14:20:32 +02:00
f43611aeda added pickdlg to tune autopick, small fixes; to do: add manual picks 2017-05-16 13:41:35 +02:00
c9d872d52b added load/save buttons for parameters 2017-05-15 18:12:26 +02:00
cae5c961b0 some fixes calling autopylot (figures=None), added log for autoTuner 2017-05-15 17:21:22 +02:00
a2ab98c202 added station list to TuneAutopicker 2017-05-15 12:03:53 +02:00
4d9c7b02cf autoPyLoT: figure beautification
also added nav toolbar to TuneAutopicker
2017-05-15 11:21:45 +02:00
77b076d560 threading for tuneAutopicker working now, to do: change figures (vfill), tight layout? 2017-05-12 15:40:19 +02:00
12e6106227 first working version of threaded tuneAutopicker 2017-05-12 13:58:05 +02:00
184983bc87 WIP: figure generating in threads partly working 2017-05-12 11:03:41 +02:00
f58d17be14 WIP restructuring fig_dict to be created inside Qt Main Thread 2017-05-11 17:15:20 +02:00
6847bfe8c4 WIP autopick parameters
to do: save/load/station+trace selection
2017-05-10 16:28:07 +02:00
dc656e5c57 merge origin develop into develop 2017-05-10 15:48:02 +02:00
862fb3240a added parameters tab to TuneAutopicker widget. Enabled direct call of autoPyLoT with AP-Settings object 2017-05-10 15:46:08 +02:00
d96bc3c621 updated autopick parameter writing routine 2017-05-10 14:56:29 +02:00
7d56e15ccf WIP autopicker tuning
added default parameters and widget to show/edit them
2017-05-10 13:17:58 +02:00
aeaa13e277 WIP on autopick settings widget 2017-05-10 11:06:55 +02:00
Ludger Küperkoch
89a70aae0b Enabled comparison button if manual and automatic picks are available. 2017-05-09 18:22:23 +02:00
Ludger Küperkoch
141dd3c9e6 Bugfix: wrong parameter naming 2017-05-09 18:12:00 +02:00
29915f3669 added first small qwidget for later tuning of autopicker with figures (tight_layout not working?) 2017-05-08 17:48:59 +02:00
3090d5fca0 added two missing figures 2017-05-08 16:23:10 +02:00
a8577ac80a Merge remote-tracking branch 'origin/develop' into develop 2017-05-08 15:43:09 +02:00
c784d46521 changed whole autoPyLoT figure structure to fig/ax structure to keep connections to figures in memory, iPlot now part of autoPyLoT function call parameters (not yet in argparser) 2017-05-08 15:38:41 +02:00
Ludger Küperkoch
2ef647251e Modified plot output. 2017-05-05 14:07:35 +02:00
Ludger Küperkoch
f4a76680ad Use maximum of HOS/AR-CF instead of AIC-CF to start searching for global minimum in AIC function. 2017-05-05 14:06:58 +02:00
6563b01293 bugfix self._inputs not assigned 2017-05-04 11:50:28 +02:00
Ludger Küperkoch
2628e9d568 Partly fixed bug when plotting corrupted trace, formerly killed by ValueError. 2017-05-03 16:19:08 +02:00
Ludger Küperkoch
e9660eea9c Exchanged Reference Set with Tuning Set to be consistent to reference picking cook book. 2017-05-03 15:38:54 +02:00
50ee351995 added scrollbar vor main wf plot for huge datasets, some changes in basemap figure size 2017-05-03 15:16:48 +02:00
efe47d7a20 fix for station scatter error 2017-05-03 12:00:34 +02:00
413a921e5d small fixes 2017-05-03 11:28:43 +02:00
fce0c98a89 Merge remote-tracking branch 'origin/develop' into develop 2017-05-02 12:19:16 +02:00
b0c80075fa small fix, preventing access to drag and drop in open folders dialog 2017-05-02 12:13:55 +02:00
Ludger Küperkoch
e5189fd3aa Disable additional buttons when overview plot is cleared 2017-04-28 16:01:31 +02:00
Ludger Küperkoch
94bf08df60 Disabled/enabled locationInfo button. 2017-04-28 13:56:28 +02:00
Ludger Küperkoch
312932ce5e Disabled/enabled saveProject button. 2017-04-28 13:47:24 +02:00
Ludger Küperkoch
39a7ce2d89 New project icon. 2017-04-28 13:42:57 +02:00
Ludger Küperkoch
62254e8af0 methodID also taken into account for automatic picks. 2017-04-28 11:47:56 +02:00
Ludger Küperkoch
1b3fc717a6 Not really fixed, but bypassed bug occuring when saving picks and no channel nor station coding is available. 2017-04-27 15:50:08 +02:00
Ludger Küperkoch
d1cb6fe41f Detrend of waveforms for overview plot. 2017-04-26 15:59:29 +02:00
08dfe35620 final commit of first project/event branch, ready for merging to develop [open issues: no differentiation between auto and manual picks mainly for map (internal structure change incoming), new icon integration failed...] 2017-04-21 15:46:57 +02:00
6b7dbe3f9a some bugfixes 2017-04-20 17:06:36 +02:00
b23228253a [bugfix] plotting pick of lower most channel 2017-04-20 15:28:43 +02:00
29701ea68b plotting picks problem was no bug, but resulted from a high sensitivity of the code to random files or folders in the event directory causing HUGE problems... [fix this] 2017-04-20 15:08:36 +02:00
bcc58e4937 changed eventlist string and coloring, [bug]: picks not displayed 2017-04-20 14:03:26 +02:00
f5dcfc654d added eventlist, some changes in tab structure (layouts for each tab to keep tabs when refreshing) 2017-04-20 12:05:34 +02:00
227faf14c2 saving picks in events as part of project 2017-04-19 16:51:19 +02:00
f935da8296 few bugfixes 2017-04-19 16:05:45 +02:00
80577dcfc7 added map_projection plot 2017-04-19 15:40:22 +02:00
fd70ef2251 adding some tabs for map_projection, WIP 2017-04-18 17:17:46 +02:00
62876dd01d added first project structure and event lists (testing needed) 2017-04-18 16:24:26 +02:00
3092b4f657 Merge branch 'map_projection' into develop 2017-04-18 09:48:00 +02:00
486aadd791 color change in map projection 2017-04-13 15:51:58 +02:00
22ced8c07c [fix] parameters tab window flag for new qwidget window with parent 2017-04-13 11:55:09 +02:00
de38b60893 qlineedit for autopylot parameter settings 2017-04-13 11:26:01 +02:00
54222b7f11 added method for array plotting to QtPyLoT, to do: button to call array plot 2017-04-12 16:43:29 +02:00
e75c34afeb button color changed, 3 comp. window 2017-04-12 15:20:06 +02:00
bb60093657 changed PickDlg layout to simpler button layout with hotkeys 2017-04-12 12:14:01 +02:00
Ludger Küperkoch
79163206f8 First step to realize GUI based setting of picking parameters in pylot.in-file. 2017-04-11 16:55:07 +02:00
Ludger Küperkoch
b3a4928a9c Implemented push buttons for selecting parameters to change within the PyLoT.in file. Work in progress. 2017-04-11 11:41:54 +02:00
Ludger Küperkoch
640ed1acda Removed location tool popup from Preferences GUI, as there is yet only NonLonLoc as location routine available. Changed size of GUI. Implemented additional diaolg for picking parameters, yet not finished. 2017-04-11 10:55:29 +02:00
085eee7d75 added autopicks in 3 component windows, also added vertical dashed lines for autopicks for better visibility 2017-04-10 15:06:30 +02:00
50d3c5f235 added ipython support for developing 2017-04-10 13:32:53 +02:00
3f7a61736a changed PyQT import to PySide import 2017-04-10 13:22:56 +02:00
8bc390fb74 small bugfix 2017-04-06 16:18:08 +02:00
393289245f multiprocessing implemented for restitution and autopicker 2017-04-06 15:37:54 +02:00
ef1755a80f added new files as well 2017-04-06 13:17:06 +02:00
c90b061de9 coppied files from Ludgers Laptop 2017-04-06 13:16:28 +02:00
b8840dff13 [version] edited release version 2016-10-04 06:40:48 +02:00
91c181ef2d [README] added some necessary information to the README for first release; renamed pylot_sample.in for convenience and removed an obsolete import 2016-10-04 06:32:10 +02:00
ae0cc5e160 [remove] moved correlation code from PyLoT to the seisobs utils scope 2016-10-03 08:56:23 +02:00
45184fd888 [move] acitveSeismoPick3D removed from PyLoT project
will be under version control on its own
2016-10-03 08:20:54 +02:00
ad909804d1 Merge branch 'master'
Conflicts:
	pylot/core/analysis/magnitude.py
	pylot/core/pick/autopick.py
	pylot/core/util/dataprocessing.py
2016-09-29 14:01:15 +02:00
04da34deec Merge branch 'feature/magnitude4QtPyLoT' into develop
Conflicts:
	pylot/core/analysis/magnitude.py
	pylot/core/util/widgets.py
2016-09-29 13:54:18 +02:00
2e840cdfeb [fix] reformatted code and fixed magnitude_type bug 2016-09-29 12:44:37 +02:00
900c7af931 [new] added referenced information on Magnitude properties to the recently introduced Magnitude objects 2016-09-29 11:53:25 +02:00
010963dcd1 [bugfix] not all processing entries have to contain remove but at least one of them 2016-09-28 15:07:49 +02:00
019a3ae0f3 [new] added origin information to the net_magnitude 2016-09-28 14:58:27 +02:00
d093349b50 changed function position 2016-09-28 14:38:16 +02:00
231e7dafa9 [new] added a function to easily add amplitude information to a given Obspy event object 2016-09-28 11:01:09 +02:00
4e520df145 [new] added Wood-Anderson amplitude output for further analysis 2016-09-28 10:59:50 +02:00
ae967b3429 [remove] removed Wood-Anderson peak-to-peak amplitude reading from autopick.py; newly introduced in autoPyLoT in a future commit 2016-09-28 10:57:52 +02:00
c1bddd5c0b [change] improved verbosity and plotting control for Magnitude objects 2016-09-28 10:56:05 +02:00
699ba6f122 [new] added a new Error -> ProcessingError raised in case of failed restitution 2016-09-27 15:14:48 +02:00
cf514ae024 [change] traces that could not be restituted are now removed from trace 2016-09-27 15:13:51 +02:00
28a5cedbc6 [refactor] further refactoring done -> obsolete functions deleted, imports optimized, output suppressed and calculation done in __init__ 2016-09-27 15:12:14 +02:00
405402ffdc [refactor] major refactoring of Magnitude objects finished
now the changed usage of the Magnitude object has to be implemented into autoPyLoT and QtPyLoT (pending)
2016-09-27 13:57:14 +02:00
d4481e4acd [new] added peak_to_peak, get and net_magnitude giving Wood-Anderson simulated peak amplitude, single station magnitudes and network magnitude for a given event, respectively 2016-09-26 16:04:09 +02:00
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