Commit Graph

2074 Commits

Author SHA1 Message Date
marcel
b140dd4f53 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2017-06-28 09:27:21 +02:00
795733cc5f Merge branch 'develop' 2017-06-27 15:30:18 +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
96ce713337 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2017-06-27 14:00:00 +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
f1a9726f91 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-27 13:54:51 +02:00
02da277f04 [bugfix] loading data from XML used same event multiple times as it was still part of current data object 2017-06-27 13:54:13 +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
ab260e45f2 [add/bugfix] data._new = False after first picks application 2017-06-27 10:39:44 +02:00
Ludger Küperkoch
987f5c4d62 Additional info for user. 2017-06-27 10:11:11 +02:00
Ludger Küperkoch
4e735b3672 [Bugfix] If too few onsets are available, no export of phases (except xml). 2017-06-27 09:57:00 +02:00
Ludger Küperkoch
a8bfc3c68f Parameter eventID uses wildcard (*) if all events of database supposed to be processed. 2017-06-27 09:44:38 +02:00
53089a3279 [add] rootpath will be applied to QSettings as well 2017-06-26 18:02:07 +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
a0633cafa4 Prevent export of phases when tuning picker. 2017-06-26 16:19:57 +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
b0405cf213 [change] load AUTO picks button will be reused now (old function deprecated as there is only one file for both types of picks) to automatically load all event information for all events given (TODO: currently only XML files!) 2017-06-26 14:22:00 +02:00
42c288ad82 [bugfix] return when no file is selected on load_data 2017-06-26 14:10:40 +02:00
c07642653d [change] default open path for load_data is event folder 2017-06-26 14:08:17 +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
410fe18390 Merge branch 'develop' of ariadne:/data/git/pylot into develop 2017-06-22 16:32:31 +02:00
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
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
2b6297859b Merge branch 'develop' 2017-06-22 13:28:34 +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