f49d323c13
[add] no data label
2018-04-27 10:45:20 +02:00
65f0d23f07
[revert] changes not working due to Thread
2018-04-26 16:37:57 +02:00
2554f6ca7e
[new] dont show plot if no data
2018-04-26 16:32:05 +02:00
3d1d97dd26
Merge branch 'develop' into feature/obspy_dmt_interface
2018-04-26 15:01:29 +02:00
b02a0e8f9a
[bugfix] os.getlogin not working on all OS/python versions
2018-04-26 15:00:40 +02:00
4c42d34adc
[bugfix] check for time_ax not working this way
2018-04-26 14:52:17 +02:00
073a71e150
[add] origin/mag to eventBox
2018-04-24 15:37:15 +02:00
d3de33a12b
[add] lineEdit showing if using processed/raw data
2018-04-23 17:00:52 +02:00
e6648a3cec
[add] read event info from obsDMT pickle file
2018-04-23 16:49:01 +02:00
36a4f0df8a
[bugfix] error when there is nothing to plot
2018-04-23 13:33:05 +02:00
9b0ef55b70
[bugfix] wasnt using processed data
2018-04-20 13:51:21 +02:00
4d3b300e17
[removed] check4gaps/doubled, plotting merged instead
2018-04-19 17:03:11 +02:00
a876384338
[add] info for user on min/max plot
2018-04-19 13:38:17 +02:00
964aa9ce6c
[change] set downsampling to false again (creating errors when plotting
...
picks)
2018-04-18 16:46:21 +02:00
af54cb0d4b
[add] auto set plotmethod 'fast' for large dataset
2018-04-18 16:44:33 +02:00
726210daeb
[add] plot-method = 'fast' for min/max plot
2018-04-18 16:21:27 +02:00
e72111a6fb
[add] obspy-like min/max function, removed testing area
2018-04-18 16:17:54 +02:00
5fcb07e647
[change] prepTimeAxis using linspace (is that ok?)
2018-04-18 16:17:16 +02:00
Darius Arnold
0366181532
[refactor] picking parameters into dictionaries
2018-04-17 11:53:47 +02:00
ba37d587a6
[update] testing min/max plot (WIP)
2018-04-13 10:56:52 +02:00
Darius Arnold
1edc745903
Merge branch 'develop' into feature/refactor
2018-04-06 13:53:04 +02:00
4cf785a135
[add] synthetic data plot (not yet flexible)
2018-04-05 15:33:40 +02:00
f3627033b1
[bugfix] auto downsampling not working
2018-04-05 15:06:23 +02:00
bd086e6cd4
Merge branch 'develop' into feature/obspy_dmt_interface
2018-04-04 15:20:30 +02:00
a201b99c2e
[bugfix] closes #256 , not asking for filteroptions if no filterphase
2018-04-04 15:17:55 +02:00
889628ceee
[remove] RELEASE VERSION!!!
2018-04-04 15:17:55 +02:00
366db9aef0
[initial] first changes to supply an interface to an obspyDMT database
2018-04-04 14:57:54 +02:00
8f5292b957
[minor] added Error if phase can not be identified
2018-03-28 10:24:24 +02:00
4002ccfd1a
[bugfix] pickdlg not deleted, consuming tons of memory
2018-03-28 10:24:24 +02:00
Darius Arnold
aba1a16f98
Merge branch 'feature/parameter_limits' into develop
2018-03-19 11:44:22 +01:00
Darius Arnold
8f78b6d8c8
[Add] Parameters clamped according to min/max values in default_parameters
2018-03-07 14:24:41 +01:00
Darius Arnold
a44ada9938
[minor] correct misspelling in min value key in default_parameters
2018-03-07 14:23:36 +01:00
Darius Arnold
ef8c19b747
Merge branch 'develop' into feature/parameter_limits
2018-03-07 11:16:37 +01:00
f9203d92e8
[bugfix] tuneAutopicker not working without 'P' and 'S' in picks
2018-03-05 17:49:40 +01:00
39f9238a06
[new] function to modify project/event rootpath (called on loading project)
2018-03-05 17:45:07 +01:00
8dabfb41d8
[add] check for event data
2018-03-05 16:51:06 +01:00
4918448d92
[bugfix] some fixes on hovering/renaming picks
2018-02-23 10:37:23 +01:00
9e74ff04c2
[add] linear detrend for manual picking...
2018-02-22 16:31:01 +01:00
39b925f475
[bugfix] init of Filteroptions class not working with kwargs
2018-02-22 16:26:46 +01:00
b076ee90fa
[add] cb for overwriteFilter, else filter automatically again
2018-02-22 16:03:11 +01:00
bff888c98a
[bugfix] emitted signal disturbing reset feature
2018-02-22 11:33:14 +01:00
2e5ed974f0
[bugfix] filteroptions were not loaded from project
2018-02-22 11:28:46 +01:00
08b3c70497
[add] labels auto/manu
2018-02-22 11:16:56 +01:00
69955ff439
[add] reset (to auto settings) button
2018-02-22 10:51:26 +01:00
fa46385a52
[add] color representation of auto filter values
2018-02-22 10:05:57 +01:00
144ecda61e
Merge branch 'feature/additional_channel_display' into develop
2018-02-21 13:39:49 +01:00
ff65fd2290
[minor] some updates
2018-02-21 13:36:43 +01:00
Ludger Küperkoch
f56d32b661
New button for showing pick qualities. Still work in progress.
2018-02-01 11:42:34 +01:00
Ludger Küperkoch
da06115886
New button for getting histogram of pick qualities, in progress.
2018-01-30 16:16:41 +01:00
Ludger Küperkoch
dc6c6445a9
Default for input parameter iplot.
2018-01-30 11:11:57 +01:00
Ludger Küperkoch
1b85625643
[Bugfix] Two times "def calPick(self)" (accidently?).
2018-01-30 10:06:22 +01:00
Ludger Küperkoch
af393d5118
Take into account that dip/azimut might be 0 when not available.
2018-01-25 11:34:37 +01:00
819e4d7076
[bugfix] skip unknown channels for everything but comparison option
2018-01-17 16:38:11 +01:00
60a2863629
[bugfix] copy/paste failure
2018-01-17 16:28:50 +01:00
c6cd6b2d69
[bugfix] use filter selected for ini pick not auto, save this filteropt.
2018-01-17 12:19:32 +01:00
0e057af39b
[cleanup] simplifaction of setIniPickP/S functions, merge into one
2018-01-17 12:04:07 +01:00
473529961e
[update] EVERY trace now scaled relative to its own noiselevel
2018-01-17 11:47:52 +01:00
d2437b5014
Merge branch 'develop' into feature/additional_channel_display
2018-01-17 10:31:40 +01:00
97de485c99
[bugfix] case pg=False: internal change of pylot canvas updated
2018-01-17 10:30:38 +01:00
98f7ff8406
[update] resetZoom after picking
2018-01-16 16:17:18 +01:00
f4632ac1f5
[update] enable/disable comboboxes in pick mode
2018-01-16 16:10:47 +01:00
c520c7c212
[new] HUGE rearrangement of initial pick behavior (untested)
...
- zooms on selected channels after initial pick
- ylims not relying on noiselevel anymore (better overview and not possible with more than one phase),
xlims now based on mean snr of all selected channels for initial pick instead of snr of one 'random' channel
2018-01-16 16:06:24 +01:00
ec394d447d
[new] choose channels to pick on for each phase
2018-01-16 13:33:12 +01:00
a22e64889d
[add] scaling by channel (untested)
2018-01-15 16:35:19 +01:00
4835c0ca8a
[change] possible to select one of all available channels for comparison
2018-01-15 15:29:46 +01:00
975bd64266
Merge branch 'develop' into feature/additional_channel_display
2018-01-15 14:43:26 +01:00
de8886b73b
[update] leave rename phase mode when picking initiated
2018-01-15 14:37:07 +01:00
f4839bb609
[bugfix] too many arguments in function (outdated)
2018-01-15 14:31:42 +01:00
5b5902a329
[update] keep filter corresponding to phase when refreshing plot
2018-01-15 14:28:08 +01:00
1c51ed12fc
[bugfix] missing paranthesis
2018-01-15 14:21:10 +01:00
49de0fb22e
[add] Hotkey for renaming
2018-01-15 14:20:48 +01:00
b191bd8cf4
[update] warn/do not save picks with unknown phase ID
2018-01-15 14:17:14 +01:00
4589f92a1a
[new] renaming of phases (untested)
2018-01-15 13:52:31 +01:00
44f63f8163
[change] ax.vlines -> ax.axvline (infinite)
2018-01-15 11:38:07 +01:00
a1ee8d408c
[add] user_help to status bar
...
[bugfix] missing change to mouseevent button
2018-01-15 11:32:02 +01:00
d6400562d6
[change] DELETE PICK WITH MIDDLE MOUSE BUTTON (else deleted using zoom)
2018-01-15 11:28:25 +01:00
0013d099f3
[new] tooltip for phases on mouseover (untested)
2018-01-15 11:21:43 +01:00
534222e241
[bugfix] Exception when pick.filter_id was None
2018-01-15 11:16:26 +01:00
796eea87a1
[new] show time and pick info on left click in 3 comp window!
2018-01-12 15:14:57 +01:00
bb395d2514
[new] preparation for pick info on click
2018-01-12 14:42:16 +01:00
5aef50f922
[new] save filteroptions as strings in XML (untested)
2018-01-12 14:07:36 +01:00
ffa30e92e9
[bugfix] tried to filter without active event
2018-01-12 10:15:30 +01:00
23ed5ceb5c
[update] filter hotkeys changed to P, S, Ctrl+F
2018-01-12 10:10:51 +01:00
185cc14e38
[add] P and S Filter options for main window
...
[bugfix] wforiginal not pre-processed
2018-01-12 10:07:14 +01:00
80d2ff508b
Merge branch 'develop' into feature/additional_channel_display
2018-01-11 10:56:14 +01:00
c7dc1481a1
[bugfix] wrong parent set for TuneAutoPicker
2018-01-10 16:59:34 +01:00
0ebc6e11f8
[add] prev/next event button (~~had to remove min button width)
2018-01-10 16:54:26 +01:00
78d5ee58b5
[update] apply new filter settings after selection
2018-01-10 16:08:28 +01:00
8d6de02afe
[bugfix] filter settings will be retained when leaving picking mode etc
2018-01-10 16:00:34 +01:00
7ab13ebaad
Merge branch 'develop' into feature/additional_channel_display
2018-01-10 14:50:46 +01:00
a76dd06497
[update] add detrend/taper to 3comp filter (better only one function!)
2018-01-10 14:50:37 +01:00
7c61c7c471
Merge branch 'develop' into feature/additional_channel_display
2018-01-09 15:37:01 +01:00
39e048cf2f
[bugfix] rectangle zoom connection
2018-01-09 13:46:21 +01:00
440c2c7bf3
[bugfix] reconnect interactive zoom after rectangle zoom
2018-01-09 13:37:53 +01:00
7be9fc28fa
[minor] beautification
2018-01-09 12:21:49 +01:00
a81c98c0b8
[update] pickdlg maximized by default
2018-01-09 12:18:47 +01:00
fe81bd9719
[bugfix] enable buttons when switching between P and S by hotkey
2018-01-09 12:15:55 +01:00
fde0de26f2
[update] added hotkeys for picking
2018-01-09 12:14:34 +01:00
acdcf74c63
[bugfix] corrected hotkey
2018-01-09 12:04:43 +01:00
1324bf3d7c
[bugfix] retain filtering when switching events
2018-01-09 12:04:03 +01:00
00cdbb5052
[update] changed frame color to pick color on init pick
2018-01-09 11:54:46 +01:00
4150e7f7d4
[update/bugfix] big update on filter options:
...
- added toggle and QSetting for automatic filtering when picking
- filtering in 3comp window independent from main plot, current filter options are copied after 3comp. init though
- several bugfixes when activating/deactivating filter
2018-01-09 11:44:22 +01:00
8badba4a89
Merge branch 'develop' into feature/additional_channel_display
2018-01-09 09:55:09 +01:00
549700bf7a
[update] changed plot/filter behavior for 3comp window
2018-01-09 09:54:39 +01:00
c39303042f
Merge branch 'develop' into feature/additional_channel_display
2018-01-08 14:46:58 +01:00
fb4753ca83
[add] improved filteroptions and fixed some bugs
2018-01-08 14:45:29 +01:00
08703bf691
[add] some hacks to display air pressure in plot
2018-01-08 13:47:40 +01:00
8c9fded873
[update] working on filter bugs WIP
2017-12-21 13:13:44 +01:00
1296e914c3
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-12-06 14:53:18 +01:00
e0e106d898
[bugfix] no more zoom reset entering picking mode
2017-12-06 14:52:31 +01:00
aada482b19
[add] some fancy color stuff for picking
2017-11-22 14:25:42 +01:00
Darius Arnold
b6fddaf208
[add] docstrings for event.py
2017-11-15 11:37:13 +01:00
Darius Arnold
fc3a825e73
Merge remote-tracking branch 'origin/feature/refactor' into feature/refactor
2017-11-15 11:36:14 +01:00
Darius Arnold
983e4c25a3
[add] docstrings in pylot/core/loc
2017-11-13 11:45:25 +01:00
Darius Arnold
6aacd2dd55
[add] docstrings in pylot/core/io
2017-11-13 11:44:57 +01:00
Darius Arnold
b2f211516a
[change] docstrings in picker.py
2017-11-13 09:49:44 +01:00
Darius Arnold
16a8170e49
[add] an exception if unable to find minimum in AIC cf
2017-11-13 09:32:39 +01:00
Darius Arnold
8280a5043c
[bugfix] snr calculation takes offset from cutting into account
2017-11-10 10:23:50 +01:00
Ludger Küperkoch
55101c9e9e
Reset some former changes, net_magnitude still buggy, as it returns Nonetype if no reliable picks are available!
2017-11-09 14:58:06 +01:00
Ludger Küperkoch
615ca54640
Make sure calculating Ml only from reliable onset times.
2017-11-09 10:30:01 +01:00
Ludger Küperkoch
f01860b6f1
Calculate Mo only from reliable onset times.
2017-11-09 10:15:58 +01:00
Ludger Küperkoch
3f50dae2de
[Bugfix]Wrong application of title, wrong onset plotting, removed obsolete intrinsic ObsPy-plot.
2017-11-07 15:15:23 +01:00
Darius Arnold
887eeba6ec
[minor] small docstring changes
2017-10-25 21:55:19 +02:00
Darius Arnold
8f721da643
refactoring picker.py (AICPicker and PragPicker)
2017-10-25 21:54:25 +02:00
deaa67bb30
[bugfix] wront parent used for style
2017-10-20 11:04:03 +02:00
Darius Arnold
149fe3f74d
[change] docstrings in util/utils.py
2017-10-16 21:55:24 +02:00
Darius Arnold
7086d43076
[change] cleanup in pick/utils.py
2017-10-16 21:10:21 +02:00
Darius Arnold
a5b3c5da1b
[change] docstrings in pick/utils.py
2017-10-16 21:04:37 +02:00
Darius Arnold
fab1f53a41
[change] docstrings in compare.py
2017-10-16 21:02:04 +02:00
4d37abc7d8
[update] flexibility for full_range
...
teach PyLoT to cope with future (synthetic) events as well
2017-10-11 11:52:51 +02:00
Ludger Küperkoch
7d3196bf21
[Bugfix] argrelmax not working if array contains only one element.
2017-10-09 14:40:26 +02:00
Darius Arnold
f1cd250cb1
[minor] one min/max key was forgotten in previous commit
2017-10-05 18:25:00 +02:00
Darius Arnold
da6f35d76b
[change] some tooltips for the picking parameters
2017-10-05 18:23:47 +02:00
Darius Arnold
b10432f3bf
[add] min/max values for most keys in default_parameters
2017-10-05 18:22:13 +02:00
Darius Arnold
87b4ce1345
[cleanup] in charfuns.py using code inspection
2017-10-05 16:52:36 +02:00
Darius Arnold
9a8d7da0e6
[change] docstrings for functions in charfuns.py
2017-10-05 16:50:53 +02:00
Darius Arnold
5931331b1d
[cleanup] code cleanup in autopick.py using code inspection
2017-10-05 16:07:29 +02:00
Darius Arnold
6f65789844
[change] docstrings for functions in autopick.py
2017-10-05 16:06:11 +02:00
Darius Arnold
c61277f429
[bugfix] pciking dialog initiated in arrayMap had no _style attribute
2017-10-04 16:52:18 +02:00
255eca3c05
[update] rename QtPylot -> PyLoT (suggestion)
2017-09-21 15:36:17 +02:00
1f2b3147fd
[cleanup] remove old files pt.2
2017-09-21 15:03:14 +02:00
43930a07cb
[minor] remove navigation toolbar for tap
2017-09-21 14:42:19 +02:00
2a987cbdfa
[cleanup] removed unused old code and output
2017-09-21 14:38:56 +02:00
238998e626
[cleanup] removed old unused class
2017-09-21 14:27:42 +02:00
b465ba2111
[minor] color for qstatusbar missing
2017-09-21 14:26:35 +02:00
370e8a7074
[update] make HELP work again
2017-09-21 13:31:45 +02:00
259538f0b0
[minor] add some description to exp. histograms
2017-09-21 10:54:34 +02:00
3096ee4573
[bugfix] usage of unordered dict for comparison
...
implicit extraction of pdf names (auto, manu) for comparison from a list generated within dict iteration lead to possible flipping (auto - manu .or. manu - auto) of compared pdfs (and with that histograms)
2017-09-21 10:34:21 +02:00
92b12537eb
[update] small improvements on comparison figures
2017-09-21 10:31:29 +02:00
e9ce9635e0
[update] tuneAutoPicker color/pick visualisation
2017-09-20 11:03:30 +02:00
c70222972c
[update] small change in comparison figures
2017-09-19 16:08:04 +02:00
961be8ccbc
[bugfix] ibad referenced before assignment
2017-09-18 15:10:52 +02:00
7522201e06
[minor] beautiful progressbar
2017-09-18 15:06:50 +02:00
69ad0bf23b
[bugfix] self.pdlg_widget not initiated
2017-09-18 15:06:33 +02:00
eab416df3f
[bugfix] reset stdout in Worker
2017-09-18 14:46:29 +02:00
0949a6deac
[update] apw saved, proper deletion of figures
2017-09-18 14:44:18 +02:00
6acb0ad580
[minor] wadata/jk improvements
2017-09-18 12:20:48 +02:00
316d19ba9e
[bugfix] one replacement of i -> index missing
2017-09-18 11:39:27 +02:00
8a2bb65581
Merge remote-tracking branch 'origin/develop' into develop
2017-09-18 11:24:57 +02:00
330e15441e
[bugfix] fig._tight=True tried to be set on None type
2017-09-18 11:23:52 +02:00
365657064f
[cleanup] pycharm code inspection
2017-09-18 10:41:27 +02:00
a5d863bf95
[cleanup] method without usage
2017-09-18 10:15:07 +02:00
Darius Arnold
586abea874
[bugfix] same treatment of waveform data in tune autopicker and load waveform
...
fixes #217 . While generating the station list for the tune autopicker dialog, waveform data was loaded and some traces were removed (gaps, doubled, rotated). However, not all the functions were called on wfdat, so some stations would be unavailable in the general waveform overview for the event, but could be selected in the tune autopicker.
2017-09-15 20:48:22 +02:00
Darius Arnold
2ee3c9a304
[change] show more stations in stationbox of tune autopicker dialog
2017-09-15 18:59:17 +02:00
Darius Arnold
2e6c33de45
[bugfix] allow picking of S phase in lower area of waveform plot
...
Fixes bug report #211
2017-09-15 18:56:04 +02:00
Darius Arnold
27a6af6636
improved jackknife/median plot
...
added different colors to markers for accepted picks, jackknife reject picks and median rejected picks, added lines indicating median tolerance
2017-09-15 18:31:20 +02:00
Darius Arnold
62625d6941
improved wadati plot
...
added names of stations, added lines indicating wadati tolerance
2017-09-15 18:28:33 +02:00
Darius Arnold
7c528a4bfd
[change] jackknife and wadati plot show one instead of two points in legend
2017-09-15 16:48:08 +02:00
Darius Arnold
8dc5be8e49
[bugfix] removed unneccessary command added during tight layout change
2017-09-15 16:47:12 +02:00
Darius Arnold
a7fd239574
[bugfix] improvements to removal of NaNs during Cf calculation
2017-09-15 16:28:27 +02:00
6a40eef3fc
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-09-15 14:47:44 +02:00
183f9e77c0
[ fixes #249 ] stylesheet path relative to style_settings
2017-09-15 14:47:05 +02:00
Darius Arnold
c8affae0c2
Merge branch 'tightlayout_tuneauto' into develop
2017-09-15 14:12:33 +02:00
Darius Arnold
ec8d471ce1
[change] enabled tight layout for tune autopicker plots
2017-09-15 14:11:28 +02:00
Darius Arnold
a96f8dcb7d
[add] wadati, jackknife and median test print excluded stations
2017-09-15 13:24:13 +02:00
Darius Arnold
ff891cacdc
add tight layout to overview plots of tune autopicker dialog
2017-09-15 13:15:30 +02:00
Darius Arnold
00df77e723
[add] remove mean from traces to avoid filtering artifact
...
Traces with constant offset (mean != 0) produce a large, low period artifact when filtered, even with tapering.
2017-09-15 12:09:56 +02:00
Darius Arnold
219d2d0e5a
Merge remote-tracking branch 'origin/develop' into develop
2017-09-15 11:38:06 +02:00
f2f908f8b5
[bugfix] missing parameter in getGlobalLimits
2017-09-12 15:31:02 +02:00
4bf03ef0d9
[minor] update radioButton StyleSheet
2017-09-12 13:30:38 +02:00
cc0281f9dc
[add] color for tune/test events on MultiEventWidget
2017-09-12 12:09:59 +02:00
1d253b5ee5
[minor] text color changed in stylesheet
2017-09-12 11:58:24 +02:00
0eeb07583b
[change] major change: wadati/JK checked picks REMOVED from autopicks
...
before, all picks were saved as XML automatically by autoPyLoT (also weight 8, 9), maybe change this to a more convenient way in the futur (e.g. add pick weight as ObsPy.Pick.comment ?)
2017-09-12 11:50:26 +02:00
0cf46a0cc3
[minor] improve user output on used CPU cores
2017-09-12 11:02:08 +02:00
7027f9ca58
[update] stylename active used to init combobox
2017-09-11 16:06:25 +02:00
c23fc0f303
[minor] stylesheet changes
2017-09-11 16:01:03 +02:00
197164f849
[issue] trying to solve FigureCanvas already deleted exception WIP
2017-09-11 15:15:33 +02:00
a4c697d250
[minor] solving some parental issues
2017-09-11 14:39:46 +02:00
bed5c8ffcf
[minor] stylesheet changes
2017-09-11 14:23:42 +02:00
f0e4ba5ab2
[add] style settings option
2017-09-11 13:27:32 +02:00
6e43e67172
[minor] stylesheet modifications
2017-09-11 10:24:22 +02:00
e5b0210c27
[update] bright stylesheet
2017-09-08 17:25:29 +02:00
78ba5484c6
[bugfix] old usage of _parent
2017-09-08 17:19:34 +02:00
f1fdd3b17b
[update] bright stylesheet
2017-09-08 17:19:18 +02:00
104a8dda64
[update] add linecolor settings to autoPyLoT figs
2017-09-08 17:01:36 +02:00
7ef784f2d2
[minor] color changes
2017-09-08 15:50:08 +02:00
d15828a058
[add] pick trace button color
2017-09-08 12:25:30 +02:00
51fe48553d
[update] bright stylesheet
2017-09-08 12:21:56 +02:00
a97258513e
[bugfix] missing variable name change
2017-09-08 10:28:54 +02:00
e310e1b6a6
Merge branch 'develop' into style_options
2017-09-08 09:39:47 +02:00
38a071ac5b
[minor] suppress rotation warning in GUI
2017-09-08 09:36:34 +02:00
8717df836a
[add] bright stylesheet
2017-09-08 09:27:47 +02:00
9d540fdd9b
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-09-07 16:57:34 +02:00
91340b66e9
[minor] add window title to pickDlg
2017-09-07 16:57:10 +02:00
cacfb37468
[minor] some updates, added bright style sheet
2017-09-07 16:51:56 +02:00
Darius Arnold
49adc5418f
[bugfix] calculate slope up to first local maximum only
...
before it was calculated to global maximum in slope window
2017-09-07 16:47:42 +02:00
Darius Arnold
8a600e1bfa
Merge remote-tracking branch 'origin/develop' into develop
2017-09-07 16:43:21 +02:00
9c63621ba4
[update] style_settings
2017-09-07 16:07:43 +02:00
bab34a23c4
[add] settings for styles
2017-09-07 10:59:09 +02:00
7ecf976401
[add] dark stylesheet
2017-09-06 18:34:59 +02:00
7f0d3c2ab4
[new] missing parents added, some preperations
2017-09-06 18:02:09 +02:00
bf36e5e6a5
[bugfix] shift traces on wfPG plot
2017-09-05 15:31:02 +02:00
88bf4c8f67
[bugfix] delete picks after jk/wadati not working
2017-09-05 15:03:03 +02:00
c6105330e0
[add] Ctrl+S to save fig (has to be clicked firsts)
2017-09-04 15:03:30 +02:00
39b450b005
[add] panZoom implemented
2017-09-01 15:44:42 +02:00
Darius Arnold
e6d5dccb74
[bugfix] add default values when wadaticheck fails
...
Else plotting crashes due to unset variables
2017-08-31 21:58:13 +02:00
9a61a7f27d
[change] fix legend locations to prevent them from bouncing on zoom
2017-08-31 15:41:59 +02:00
8e59845558
Merge branch 'develop' into update_waveformwidget
2017-08-31 15:28:07 +02:00
699575f9d5
Merge branch 'compare_events' into develop
2017-08-31 15:02:27 +02:00
33bc4e060f
[minor] change layout and add groupbox
2017-08-31 15:01:48 +02:00
9eea1e9b14
Merge remote-tracking branch 'origin/develop' into develop
2017-08-31 14:32:12 +02:00
79cbaf3397
[update] working version to compare several events
2017-08-31 14:31:33 +02:00
eaa7a993af
[add] compare widget for multiple events added
2017-08-31 11:16:38 +02:00
ba001fb53d
[change] restructured comparison widget
2017-08-31 09:49:09 +02:00
Darius Arnold
9e1af65af7
[bugfix] AIC-CF was smoothed using wrong parameter
...
aictsmooth was unused in pylot, instead the tsmoothP parameter was used two times.
aictsmooth should smooth the AIC-CF during the determination of the preliminary onset. tsmoothP is used to smooth the HOS-CF during pragmatic picking.
2017-08-31 00:07:38 +02:00
ca5167cb04
[bugfix] check type(picks) in dict/Attribdict
2017-08-30 14:45:20 +02:00
aea58b3c11
[update] made autopickwidget concept more flexible
2017-08-30 14:44:39 +02:00
f21fc7bb37
[ fixes #244 ] parameters passed to pickDlg explicit
2017-08-30 10:51:20 +02:00
34ae5dddd2
[update] phaseText refreshing working (maybe slow)
...
if replotting slows down user interaction too much, change replot to pan-release instead of -move action, or add refresh timer
2017-08-29 16:32:42 +02:00
e2b69d043c
Merge branch 'develop' into update_waveformwidget
2017-08-29 15:57:04 +02:00
21f02bf675
[minor] add absolute time to WfWidgetPG
2017-08-29 15:55:36 +02:00
881cc39e0e
[bugfix] add default value to jackfactor
...
if not done, autoPyLoT will raise an error on old pylot.in files (or projects with old parameter obj.)
2017-08-29 15:23:25 +02:00
89dc390125
[minor] readd taupy tooltip
2017-08-29 15:08:28 +02:00
Darius Arnold
1ceb347602
[bugfix] avoid indexing an empty array when there are no NaNs at start of CF
2017-08-29 15:05:34 +02:00
Darius Arnold
bac6d6f5ec
[add] jackknife safety factor no longer hardcoded, GUI parameter added
2017-08-29 15:05:10 +02:00
Darius Arnold
71973a5348
[bugfix] Earllate-Picker would use wrong timearray for plotting
...
signal-timearray gets doubled if not enough zero crossings are found to calculate valid signal period. Plotting would then use the old "single" timearray.
2017-08-29 14:58:20 +02:00
Darius Arnold
b232a2a194
[bugfix] check4rotated unable to access metadata in TuneAutopicker
2017-08-29 14:40:26 +02:00
Darius Arnold
5648fc1870
[change] replace NaN's in HOScf by first NaN value instead of zero
2017-08-29 14:40:05 +02:00
Darius Arnold
0852bf0f80
[bugfix] handle to short zero crossings window
2017-08-29 14:39:30 +02:00
Darius Arnold
afd03da178
[change] more readable indexing during slope determination
2017-08-29 14:39:09 +02:00
Darius Arnold
8ce9e40d49
[bugfix] catch empty index array during slope determination
2017-08-29 14:38:57 +02:00
Darius Arnold
19566715a7
[add] tune autopicker displays picked onset time and error in seconds
2017-08-29 14:38:36 +02:00
8e4fa5edca
[cherrypick] from darius: rotate and taupy tooltip
2017-08-29 14:37:05 +02:00
726544bf3b
[update] canvas finally working again
2017-08-24 17:16:21 +02:00
c83671f140
[update] canvas used for tune-fig, not yet pan
2017-08-24 11:35:53 +02:00
070c32e007
[change] disable multicursor by default
2017-08-23 15:18:24 +02:00
1bbb686778
[updates] first usage of PylotCanvas for other fig
2017-08-23 14:45:46 +02:00
3cfd2371fc
[change] scroll zoom now part of WFwidget
2017-08-23 12:17:51 +02:00
47a79c7660
[add] wadaticheck added to widget (problem:
...
picking weights showing wadati/jk check
will be lost on saving/loading XML)
2017-08-23 11:51:59 +02:00
0e650dfb75
[update] working version of autopickwidget
2017-08-23 10:25:46 +02:00
9a5196c33f
[minor] cosmetics
2017-08-23 09:20:59 +02:00
62610cd592
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-22 16:43:57 +02:00
c6c13f85bc
[new] first working version of jackknife plots for multiple events (WIP)
2017-08-22 16:43:09 +02:00
d818e6aef9
[new] widget for picking interactive inside GUI
2017-08-22 13:21:06 +02:00
0f2660e20b
[change] number of picks regards pick quality
2017-08-22 11:53:19 +02:00
Ludger Küperkoch
f7cada6d09
[Bugfix] Some typo.
2017-08-22 10:34:58 +02:00
a5097e1da6
[add] updates to jackknife from GUI (WIP, experimental)
2017-08-21 17:19:08 +02:00
Ludger Küperkoch
6722024749
Take renaming of existing function into account.
2017-08-21 16:16:09 +02:00
Ludger Küperkoch
dabd7f463c
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-21 16:11:41 +02:00
Ludger Küperkoch
75d206b9b1
Revised function using already existing functions.
2017-08-21 16:11:10 +02:00
ed994e987f
[change] ComparisonDlg -> ComparisonWidget
2017-08-21 16:07:57 +02:00
b30ab69ad2
[bugfix] teach comparison to cope without pick
2017-08-21 15:33:00 +02:00
50e7b83812
[new] new function to exclude picks by quality
2017-08-21 15:11:07 +02:00
2b0aa38b37
[change] restructure identifyPhase functions
2017-08-21 14:59:28 +02:00
55a54ae154
[rename] getQualityFromUncertainty
2017-08-21 14:50:18 +02:00
e9dd34eca7
[change] py3 histogram changes merged to develop
2017-08-21 14:11:41 +02:00
b9bdaa391b
[change] use timedelta if (epick or lpick)=mpick
2017-08-21 13:51:54 +02:00
bdcb0ba649
[change] islope calculation with 2 samples
2017-08-21 13:38:50 +02:00
Darius Arnold
09374f8242
[bugfix] compare now shows histogram for all stations
2017-08-21 12:19:23 +02:00
a9f05d3572
[ fixes #238 ] missing parenthesis in if statement
2017-08-21 10:28:47 +02:00
4faf007e0b
[change] try set ncores flag explicitly (WIP)
2017-08-18 13:18:21 +02:00
2b942338b0
[bugfix] merge_picks not checking for method_id
...
[cleanup] removed unnecessary Data()
2017-08-17 15:47:42 +02:00
Ludger Küperkoch
76144252ea
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-17 12:32:54 +02:00
Ludger Küperkoch
24ded1cf2b
Reversed changes made in previous commit, initialize ObsPy-event object including path.
2017-08-17 12:31:42 +02:00
d067d4787e
[bugfix] doubled picks saving XML files
2017-08-17 11:54:01 +02:00
Ludger Küperkoch
5920c64ec5
Reversed some changes of former commit accidently made.
2017-08-16 16:49:47 +02:00
Ludger Küperkoch
b64009e525
[Bugfix] It might happen, that Lc is negative and/or pstop smaller than pstart!
2017-08-16 16:48:04 +02:00
Ludger Küperkoch
9f48b23d88
Use writephases for exporting to VELEST-input file, as VELEST can handle only 4-string station IDs which is already implemented in source code.
2017-08-16 16:24:35 +02:00
Ludger Küperkoch
db628a5228
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-16 15:33:16 +02:00
Ludger Küperkoch
606dc6a596
Enable compare button only if automatic as well as manual picks are available for same stations.
2017-08-16 15:32:25 +02:00
17f94228ab
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-16 15:14:15 +02:00
879282657a
[change] get comparison working with alparray/py3
2017-08-16 15:13:55 +02:00
8e6237a08d
[add]function to check for doubled channels in stream
2017-08-16 15:13:28 +02:00
ec095c572d
[bugfix] if no cuttimes are set for h-comp skip S
2017-08-16 13:23:40 +02:00
Ludger Küperkoch
5d076511ec
[Bugfix] Input are already picks, no more event object.
2017-08-16 12:12:04 +02:00
4b6b3de547
[change] check for real bool
2017-08-16 11:19:25 +02:00
Ludger Küperkoch
e3f758fa63
[Bugfix] get_evt_data().path no more existent.
2017-08-16 10:43:05 +02:00
c6fa6d8ff8
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-16 10:04:23 +02:00
256f3b6838
[ closes #232 ] load autopicks automatically
2017-08-16 10:03:10 +02:00
2c054161c1
[refs #229 ] same issue found in islope calculation
2017-08-16 09:56:41 +02:00
Ludger Küperkoch
95a2f21675
Removed hard coded station name introduced for bug fixing.
2017-08-15 17:02:50 +02:00
Ludger Küperkoch
cc25a8e6cf
Rearranged changes accidently got lost by former commit.
2017-08-15 17:01:27 +02:00
Ludger Küperkoch
fe8128a61a
Use mean for noise level determination instead of max.
2017-08-15 16:57:52 +02:00
Ludger Küperkoch
4d8dc912ac
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-15 16:56:17 +02:00
Ludger Küperkoch
1dacc08b26
Leave picking parameters for onsets with small residuum unchanged.
2017-08-15 16:55:20 +02:00
81f3758414
[change] rearranged menu (pick para, preferences)
2017-08-15 16:28:38 +02:00
9bfba65aee
[bugfix] station names in pgplot
2017-08-15 16:15:49 +02:00
8f1943b48f
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-15 15:49:22 +02:00
15e76e4932
[refs #229 ] use last item in t instead of len(t)
2017-08-15 15:47:59 +02:00
Ludger Küperkoch
b211294b94
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-15 15:10:58 +02:00
Ludger Küperkoch
2e24c406ac
Use abs instead of RMS.
2017-08-15 15:10:36 +02:00
f6774cb592
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-15 15:03:41 +02:00
90dae62922
[bugfix] pickDlg manipulate pick copy, rba error
2017-08-15 15:02:45 +02:00
Ludger Küperkoch
503f72d6b0
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-15 14:49:11 +02:00
Ludger Küperkoch
f1d2467780
Smaller CF-recalculation window for iterative picking.
2017-08-15 14:48:19 +02:00
a23af62d23
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-15 14:15:18 +02:00
604edea95a
[change] pick plot style (spe->fill_between)
2017-08-15 14:14:39 +02:00
c45b997aec
[add] phase text color sync to phase marker color
2017-08-15 14:00:16 +02:00
67b3f4f363
[bugfix] TypeError has no attr. 'message'
2017-08-15 13:52:26 +02:00
8ce4f05a05
[bugfix] manual phase text not shown
2017-08-15 13:46:05 +02:00
Ludger Küperkoch
b542a99293
Relaxed checkZ4S, vertical component RMS must exceed average RMS of both horizontal components.
2017-08-15 13:06:26 +02:00
Ludger Küperkoch
ec1f9bc3f2
Calculate SNR from HOS/AR-CF instead of AIC-CF.
2017-08-15 12:43:09 +02:00
Ludger Küperkoch
66da4bd442
[Bugfix] Take into account None for Perror, removed needles parameters.
2017-08-15 12:02:46 +02:00
4bb616492c
[bugfix] use identifyPhase instead of phase[0]
2017-08-15 10:02:46 +02:00
ff1ab722df
[minor] code cleanup
2017-08-15 09:49:10 +02:00
0f61799024
[add] new colors appl. to matplot, added quality
2017-08-14 16:59:39 +02:00
37373864ce
[add] new flexible linestyles and colors pyqtgraph
2017-08-14 16:15:42 +02:00
7ec2006967
[workaround] python 3 raw_input
2017-08-14 14:29:31 +02:00
07c16695ba
[minor] bugfix in unused function
2017-08-14 14:13:35 +02:00
100a39afd9
[bugfix] prevent error on mousewheel zoom outside axis
2017-08-14 13:56:08 +02:00
fda9de5738
[idea] copy pick not event and add to blank event
2017-08-14 13:44:38 +02:00
3cd64d09de
[add] parameter savexml added to autoPyLoT
2017-08-14 13:30:27 +02:00
0a8f6f8a39
[bugfix] regard uncertainty == None
2017-08-14 11:43:09 +02:00
e0077524f4
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-14 11:40:48 +02:00
b585f571da
[bugfix] no quality set if else was hit
2017-08-14 11:40:22 +02:00
3c8ed2e44e
[add] traceback for error in Thread
2017-08-14 11:29:32 +02:00
Ludger Küperkoch
f1f6082cd8
Enabled terminal based plotting.
2017-08-11 17:33:41 +02:00
Ludger Küperkoch
df2d5929d3
[Bugfix] If Sweight >= 4, SNR and/or slope might be None.
2017-08-11 17:32:59 +02:00
Ludger Küperkoch
a48bb60809
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-11 16:59:26 +02:00
Ludger Küperkoch
537b7cb4a3
[Bugfix] Take into account different formats of input arguments iplot and fig.
2017-08-11 16:57:10 +02:00
b3b3dca41a
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-11 16:07:43 +02:00
2554534759
[bugfix] a lot of different bugfixes
2017-08-11 16:07:23 +02:00
Ludger Küperkoch
f393585831
New function to get quality classes from uncertainties, plot only automatic picks, if pick qualities are less than 4.
2017-08-11 16:04:18 +02:00
Ludger Küperkoch
fe2957f76d
Cosmetics
2017-08-11 15:02:47 +02:00
039f98a811
[add] check for nsamples and negative slope of cf
2017-08-11 15:01:32 +02:00
e6aa1ad031
[add] continue if no station coords
...
[bugfix] return if no isignal window
2017-08-11 14:50:12 +02:00
Ludger Küperkoch
571b90e5b7
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-11 12:49:18 +02:00
Ludger Küperkoch
e9a0be347c
[Bugfix] Take into account different formats of input argument iplot.
2017-08-11 12:48:43 +02:00
fe2a2a9714
[add] trim_station_comp also for tuneAutopicker
2017-08-11 10:28:35 +02:00
7846e1303a
[bugfix] in tuneautopicker
2017-08-11 10:24:25 +02:00
9b97937049
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-11 10:15:42 +02:00
Ludger Küperkoch
b36f20ff59
[Bugfix] Take into account that initial pick might be very close to start of CF.
2017-08-10 17:54:50 +02:00
Ludger Küperkoch
526cd4303e
[Bugfix] Still unclear, sometimes time array larger than data array.
2017-08-10 17:23:08 +02:00
874fdd730a
[add] check for gaps and trim traces for one station
...
[change] restitute data only if necessary!
2017-08-10 16:25:32 +02:00
Ludger Küperkoch
42dcf7576b
Deleted annotated line.
2017-08-10 15:11:14 +02:00
Ludger Küperkoch
8023ba2993
[Bugfix] Wrong use of indices.
2017-08-10 15:10:15 +02:00
Ludger Küperkoch
55c1a38f29
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-10 14:06:59 +02:00
Ludger Küperkoch
7ae8f651d3
[Bugfix] Slope must be counts/s!
2017-08-10 14:06:33 +02:00
fd2b82e978
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-10 14:01:55 +02:00
4e6a6dc2a8
[bugfix] self used in function (not method)
2017-08-10 14:01:25 +02:00
Ludger Küperkoch
726c823646
Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
2017-08-10 12:47:08 +02:00
Ludger Küperkoch
071c18f649
Take into account very small prediction errors (synthetics!), [Bugfix] take into account very close zero crossings
2017-08-10 12:44:28 +02:00
460af0e094
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-10 12:25:42 +02:00
2cc05329f9
[bugfix] huge bug in slope calculation
2017-08-10 12:25:03 +02:00
8a80af78cf
[bugfix] use z-trace starttime instead of full_range
2017-08-10 12:00:43 +02:00
1ed4f73e5c
[bugfix] darius: comparison of P-pick slope to minAIC-S-slope instead of S-pick slope
2017-08-10 11:04:46 +02:00
Ludger Küperkoch
a450189ba2
Take empty trace into account.
2017-08-09 17:37:11 +02:00
fd9e4f0c05
[add] remove automatic phases possible from pickDlg
2017-08-09 15:10:36 +02:00
5c6f1eb564
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
2017-08-09 14:16:45 +02:00
acaf7f5172
[add] differentiation between automatic and manual picks imported from new
...
style XML file
2017-08-09 14:15:50 +02:00
Ludger Küperkoch
1b16c13525
[Bugfix] autoPyLoT was running always non-parallel due to iplot argument.
2017-08-09 13:28:00 +02:00
Ludger Küperkoch
87b617b924
[Bugfix] Control figure output of autoPyLoT via optional input argument iplot.
2017-08-09 13:17:54 +02:00
29165aadc7
[bugfix] fixed former bugfix
2017-08-09 09:44:01 +02:00
Ludger Küperkoch
a7b02c68de
Re-introduced multicore processing, temporarly disabled for bug fixing.
2017-08-08 17:09:17 +02:00
Ludger Küperkoch
9e48bb1fa4
Removed hard coded, unnecessary saftey gap.
2017-08-08 17:06:41 +02:00
Ludger Küperkoch
811f52c95c
Enabled plotting of figures when called from terminal.
2017-08-08 16:38:29 +02:00
Ludger Küperkoch
ab410b790c
If one horizontal component is missing, AR prediction is calculated on original trace and copy of it.
2017-08-08 14:19:13 +02:00
Ludger Küperkoch
cc2da4fc41
[Bugfix] 'NoneType' object has no attribute 'axes'.
2017-08-08 11:53:21 +02:00
Ludger Küperkoch
6891591ae9
[Bugfix] Wrong use of boolean variable.
2017-08-08 11:26:40 +02:00
Ludger Küperkoch
7d5bfe8107
ilen was referenced before assignment.
2017-08-08 10:24:12 +02:00
2fa9a60023
[rename] functions renamed
2017-08-07 16:41:50 +02:00
014152e30e
[add] saveAllEvents now connected to export for Autopick process and saveProject
2017-08-07 16:33:45 +02:00
17a93cf62f
[add] for global seismology CF pick windows will now be calculated
...
relative to estimated tt from TauPy, metadata and source location (in XML
file) needed
[TO DO]: automatic export of XML (esp. source loc) before autopicking
2017-08-07 11:21:20 +02:00
60ebaa6528
[bugfix] few typos
2017-08-04 11:05:52 +02:00
9499688887
[add] parameter taup_model
2017-08-04 11:03:10 +02:00
41e5c004b2
[add] new parameter use_taup
2017-08-04 10:28:00 +02:00
04bf655cf1
[bugfix] init Checkbox if parameter is not found
2017-08-04 10:27:23 +02:00
ddb1fb8b97
[add] multiple eventIDs possible as eventID pylot_parameter (testing needed)
2017-08-03 14:49:32 +02:00
cab9061030
[change] abortButton for Thread removed by default, cause it was not
...
working properly
2017-08-03 14:39:58 +02:00
125b72a582
[bugfix] autoPyLoT crashed when getSlope() method of AICPicker returned
...
None (comparing None to float), workaround: if not slope: slope=0
2017-08-03 12:05:19 +02:00
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
