Commit Graph
2853 Commits
Author SHA1 Message Date
marcel 42c288ad82 [bugfix] return when no file is selected on load_data 2017-06-26 14:10:40 +02:00
marcel c07642653d [change] default open path for load_data is event folder 2017-06-26 14:08:17 +02:00
marcel 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
marcel 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
marcel d08bd4cc9e [move] class Event finally moved to new module event 2017-06-26 12:03:04 +02:00
marcel 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
marcel 8e6c4d06ce [add] array_map now plotting event location if given 2017-06-23 15:40:13 +02:00
marcel 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
marcel f409861d10 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-23 14:16:06 +02:00
marcel 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
marcel 929f58b942 merge origin/develop into develop 2017-06-23 12:12:55 +02:00
marcel 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
marcel 410fe18390 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-22 16:32:31 +02:00
marcel c44f351636 [add] new method to load multiple XML files at once for all events, WIP: picks loaded from XML files cannot be saved afterwards 2017-06-22 16:30:22 +02:00
marcel 8e60268fc5 [hotfix] output XML name clipped 2017-06-22 15:52:28 +02:00
Ludger Küperkoch 33d81eb538 Bugfix: Wrong naming of module in previous commit: PyLoTParameter - PylotParameter. 2017-06-22 15:18:19 +02:00
Ludger Küperkoch 9f9d492b8b Restored former changes of Marcel (AutoPickParameter - PyLoTParameter). 2017-06-22 15:09:40 +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
marcel 2b6297859b Merge branch 'develop' 2017-06-22 13:28:34 +02:00
marcel ca1d3dca38 [add] filter parameters added to default parameters 2017-06-22 12:01:22 +02:00
marcel 97ee03b443 Merge branch 'develop' into filterOptions 2017-06-22 11:26:02 +02:00
marcel 8e8b3e0462 [rename] AutoPickPara ---> PylotPara 2017-06-22 11:22:17 +02:00
marcel f91e1cde6f [change] structure changed to make parabox more flexible 2017-06-22 11:03:24 +02:00
marcel 203974cd83 [bugfix] parameters interchanged 2017-06-22 10:54:17 +02:00
marcel f6a20c4ea2 [bugfix] advanced_cb acciddently pushed to bottom of layout 2017-06-22 10:53:56 +02:00
marcel 9dc472f907 Merge branch 'develop' 2017-06-22 10:28:15 +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
marcel 5928967e28 [closes #212] tuneAutopicker always tries to load current event in mainwindow 2017-06-21 15:33:49 +02:00
marcel 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
marcel b0dcf5ff4b [change] local magnitude section added 2017-06-21 14:20:22 +02:00
marcel d77abdc1d0 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-21 14:10:24 +02:00
marcel 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
marcel c10639b49c [merge] manual merging to new function structure (widget insertion with position) 2017-06-21 13:28:44 +02:00
marcel 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
marcel 0a6ad8b663 [add] folder structure automatically recognized when adding events 2017-06-21 11:45:35 +02:00
marcel be463c2adf [add] functionality to display one groupbox of AutoPickParaBox exclusively 2017-06-21 10:36:22 +02:00
marcel 6daccad341 [add] testing: saveProjectAs option 'always' enabled when project is active 2017-06-20 16:30:13 +02:00
marcel d5a7e1f35f Merge branch 'develop' 2017-06-20 16:26:32 +02:00
marcel 1b512a0864 [closes #207, closes #208] when supressing user prompt, applyEVTData to data object was accidently removed 2017-06-20 16:23:54 +02:00