Commit Graph

586 Commits

Author SHA1 Message Date
Marcel Paffrath
03eac54ced added new files to pylot active 2015-09-30 13:58:13 +02:00
Marcel Paffrath
2308695fa8 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-09-30 13:55:01 +02:00
Marcel Paffrath
3473ce732c changed structure -> all FMTOMO to vtk functions to one module 2015-09-30 13:06:51 +02:00
Ludger Küperkoch
708f0a1f1a Some cosmetics on DCfc of class magnitude. 2015-09-29 14:55:15 +02:00
Ludger Küperkoch
f4b905c2e6 Removed inserted plot command for debugging purposes. 2015-09-29 11:19:25 +02:00
Ludger Küperkoch
ce57f184e7 In order to calculate DC value and corner frequency of source spectrum a synthetic spectrum is calculated and optimized using scipys curve_fit. 2015-09-29 11:17:47 +02:00
Ludger Küperkoch
8035903fa5 Zero crossings are calculated to derive only P pulse for calculating source spectrum. 2015-09-29 11:15:51 +02:00
Marcel Paffrath
5b8e2da59e *** empty log message *** 2015-09-28 12:24:28 +02:00
Marcel Paffrath
48c889129a Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-09-28 12:22:09 +02:00
4bd92565b9 reformat code (fix indentation and python 3.x issues) 2015-09-28 10:57:48 +02:00
Marcel Paffrath
fd3d4cc476 -> import numpy 2015-09-28 10:23:41 +02:00
Marcel Paffrath
f7878cdb4a implemented vgrids2VTK to surveyUtils 2015-09-28 10:20:26 +02:00
3dc9bb3d06 some pick plotting issues solved; replotting main window if picks have been changed, otherwise just plot additional/deleted picks 2015-09-25 15:06:59 +02:00
33164d4d1f corrected for some python 3 compatibility issues; added a new delete picks button to the picking window 2015-09-25 09:03:59 +02:00
Marcel Paffrath
98df4db95d cosmetics 2015-09-24 10:14:39 +02:00
Ludger Küperkoch
b391f5e082 Modified class DCfc: calculation of fft bins after Bath. 2015-09-23 17:02:27 +02:00
Ludger Küperkoch
c790b4f353 Implemented new class DCfc. 2015-09-23 16:32:18 +02:00
Ludger Küperkoch
30ee81a39d New class DCfc of object Magnitude for calculating source spectrum and to derive DC value and corner frequency. 2015-09-23 16:31:48 +02:00
Marcel Paffrath
d38adb75b2 deleted import * from pylab 2015-09-23 14:11:24 +02:00
Marcel Paffrath
9d5b7ad5ae name change 2015-09-22 14:38:27 +02:00
Marcel Paffrath
19e4435497 name change 2015-09-22 14:36:19 +02:00
Marcel Paffrath
bb97df6179 name change 2015-09-22 14:35:04 +02:00
Marcel Paffrath
217db9bbdd [bugfix] updated EPick nan fix 2015-09-22 13:41:19 +02:00
844708bbac [hotfix] earllatepicker recursively modifies isignal to obtain zero-crossing also for low frequency onsets 2015-09-22 12:29:42 +02:00
Marcel Paffrath
dedf6eff00 Changed earllatepicker. If EPick = Nan, signal window is doubled. 2015-09-22 11:58:43 +02:00
130dc8db4e [bugfix] wrong functions import fixed 2015-09-22 10:31:37 +02:00
34d31a1aa8 Merge branch 'develop' 2015-09-18 09:54:43 +02:00
2b42583999 debugged some code fragments while trying to solve the load event data problem 2015-09-17 17:55:40 +02:00
7a47594614 debugged some code fragments while trying to solve the load event data problem 2015-09-17 17:45:10 +02:00
Marcel Paffrath
26c958b421 initial import of new modules working on active seismic data 2015-09-17 11:09:30 +02:00
Marcel Paffrath
61c7e9f417 removed stashed changes 2015-09-17 11:07:22 +02:00
Marcel Paffrath
57a9444478 commiting changes to suppress output; necessary for fast calculation in active mode 2015-09-14 11:01:23 +02:00
49cbfd92e5 Merge branch 'develop' of ariadne:/data/git/pylot into 176 2015-09-05 09:40:52 +02:00
Ludger Küperkoch
cfca52e576 Debuged slope determination [counts/s] within AICPicker. 2015-09-04 15:28:37 +02:00
4eef4d238b 176 open event failure 2015-09-04 15:01:59 +02:00
Ludger Küperkoch
0753071cfb Removed import of scipy as this is no more necessary. 2015-09-04 11:23:59 +02:00
Ludger Küperkoch
254c745f25 Marginal changes. 2015-09-04 11:19:57 +02:00
Ludger Küperkoch
23430c9d90 Modofied checksignallength: uses RMS trace of all components (if available) to check signal length. This avoids skipping of P pick, if P coda is very weak. If only vertical trace is available, rms of vertical trace is used instead with smaller required minimum signal length. 2015-09-04 11:16:34 +02:00
Ludger Küperkoch
de608798b9 Modified checking of signal length, uses RMS trace of all components now (if available). 2015-09-04 11:13:52 +02:00
Ludger Küperkoch
0dc1091078 restituteWFData: introduced return flag restflag to indicate whether restitution could be performed or not. 2015-09-04 11:12:25 +02:00
Ludger Küperkoch
ab1d27747a Some reformating. 2015-09-03 15:42:20 +02:00
Ludger Küperkoch
60b9f176f0 Cosmetics, changed print commands to keep compatibility to Python 3. 2015-09-03 14:55:25 +02:00
cc0b1e0a5b 176 open event failure 2015-09-03 13:21:46 +02:00
81b95e6a22 [addresses #167] started fixing the multiple phase saving issue 2015-09-03 09:15:31 +02:00
Ludger Küperkoch
bf1194ec3b Changed?? 2015-09-01 14:32:36 +02:00
Ludger Küperkoch
3ba57cfc56 Introduced new class DCfc for calculating the source spectrum and to derive the DC-value and the corner frquency of the source spectrum. Just at the beginning! 2015-09-01 14:32:09 +02:00
Ludger Küperkoch
258b8b1ff4 Marginal changes only. 2015-09-01 14:30:54 +02:00
Ludger Küperkoch
de5c65bc1d Wood-Anderson peak-to-peak amplitude is now calculated even if S weight is 4. At least P pick must be confident, if S weight > 3 a larger window for getting maximum peak-to-peak amplitude is used. 2015-09-01 14:25:48 +02:00
c940b092d0 Merge branch 'master' into develop 2015-08-31 13:47:22 +02:00
Ludger Küperkoch
fb3b599f50 restituteWFData: If input streams is None, a copy of streams derived by self.getWFData() is used for further processing. 2015-08-31 10:24:17 +02:00
Ludger Küperkoch
d756f5d2e1 Replaced hard coded window length for getting Wood-Anderson peak-to-peak amplitude with formerly set window length for calculating CF for S-picking. 2015-08-31 10:10:42 +02:00
Ludger Küperkoch
d0d38b81cb Removed indentation error. 2015-08-31 09:38:18 +02:00
Ludger Küperkoch
69c17f9fdb Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2015-08-31 09:02:16 +02:00
1f7049691c [addresses #167] started fixing the multiple phase saving issue 2015-08-28 16:01:42 +02:00
Ludger Küperkoch
eb592a3426 Claculation of Wood-Anderson amplitude only, if S-weight < 4. 2015-08-28 11:39:39 +02:00
Ludger Küperkoch
533ccc7b5c Implemented new class wapp to calculate Wood-Anderson amplitudes for local magnitude calculation. Before calculating Wood-Anderson amplitude the certain traces are instrument corrected. 2015-08-28 11:29:00 +02:00
Ludger Küperkoch
ef8ebc300e New object to calculate magnitude. Finished class wapp to calculate amplitude as seen on Wood-Anderson seismograph. 2015-08-28 11:27:09 +02:00
497ca39c91 reformatted data.py to meet coding conventions 2015-08-28 10:15:28 +02:00
038caf4d54 reformat code 2015-08-28 09:05:50 +02:00
6597c881a6 reformatting code 2015-08-27 15:42:51 +02:00
779b9e7313 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
Conflicts:
	pylot/core/read/data.py
2015-08-27 15:42:01 +02:00
7785bd1900 Merge branch 'master' into develop
Conflicts:
	pylot/core/read/data.py
2015-08-27 15:28:54 +02:00
Ludger Küperkoch
ee777b4beb Removed import pdb. 2015-08-27 14:26:15 +02:00
Ludger Küperkoch
3e164fd0c6 restituteWFData: More output for user. 2015-08-27 14:24:52 +02:00
3dd65b9cc3 [addresses #167] started fixing the multiple phase saving issue 2015-08-27 12:55:34 +02:00
Ludger Küperkoch
96395f6a1a restituteWFData: searches now for keyword processing to check, whether this trace has already been corrected or not. 2015-08-27 11:40:42 +02:00
Ludger Küperkoch
845fd6a7b3 restituteWFData: able to handle several dataless-, inventory- or resp-files, calculates prefiltering from sampling rate of trace. Processing with inventory- or resp-file has yet not been checked! 2015-08-27 11:04:46 +02:00
Ludger Küperkoch
4bfe4ce047 Marginal changes. 2015-08-27 09:53:05 +02:00
Ludger Küperkoch
8af4f8ad1e Finished (temporary!) new function restitueWFData. 2015-08-26 17:00:17 +02:00
Ludger Küperkoch
def9760f4b Cosmetics. 2015-08-13 11:02:07 +02:00
Ludger Küperkoch
ceed663a77 AICPicker: if iplot > 1, figure with waveform and CF is raised, even when slope is calculation failed. 2015-08-13 10:57:46 +02:00
Ludger Küperkoch
64b8e1a9e8 checksignallength: Added more detailed information for user. 2015-08-13 10:54:17 +02:00
Ludger Küperkoch
fba2aad664 Added more detailed information for user about skipped picks. 2015-08-13 10:52:07 +02:00
Ludger Küperkoch
2668f4435c Removed unsused import-pdb command. 2015-08-13 09:01:47 +02:00
Ludger Küperkoch
4f634cc43a Debuged getDataArray: Reliable cutting of waveforms independetn from actual waveform lengths. 2015-08-12 16:48:55 +02:00
d9cb3517cc [closes #160] the picking window has now a home button for easy reset of zoom 2015-07-21 08:10:15 +02:00
0e3576d193 [closes #157] filter defaults are now read from text file like the sample filter.in coming with this commit simply copy to .pylot folder in your home directory (this is preliminary because the filter parameters should be settable project wide by one responsible person) 2015-07-21 07:41:41 +02:00
0b02e8c213 Merge branch 'export-and-save-picks' into develop 2015-07-18 16:13:37 +02:00
0b6fbd22c5 reformatting code to meet coding conventions 2015-07-18 16:13:11 +02:00
f4f744e22c export and save picks implemented successfully 2015-07-18 16:11:20 +02:00
fc86179c39 [closes #145], [addresses #146] this commit introduces the handling of picks as obspy event objects 2015-07-18 16:09:50 +02:00
17933c75f0 file format for exporting event data is controlled by the extension used; this behavior is more convenient for a GUI driven file selection 2015-07-18 15:59:42 +02:00
2115864d5c revert RELEASE-VERSION manually 2015-07-14 08:32:05 +02:00
49bf0ecd3c make the naming of the Thread self explaining 2015-07-14 08:08:02 +02:00
092852d745 fix import error on debian machine 2015-07-13 15:15:37 +02:00
8802267628 fix zooming issue after S Pick is set 2015-07-13 10:03:43 +02:00
e31890d8fc export and save picks to hard drive 2015-07-13 09:24:16 +02:00
108d6c75d6 Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop 2015-07-13 06:41:02 +02:00
da22dcce90 renaming run_autopicking to autopickstation 2015-07-13 06:40:51 +02:00
d79165a9f2 [bugfix] pick times are absolute times, thus for plotting the start time has to be subtracted 2015-07-13 06:40:10 +02:00
Ludger Küperkoch
707618c6b1 Found bug in fmpicker, copy-and-paste error. 2015-07-10 15:23:48 +02:00
ea976295d0 huge structural rearrangement to resolve circular import problems
[add] new feature added to QtPyLoT capable of automatically picking an event from overview window
2015-07-10 09:22:58 +02:00
f704d8b258 Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop 2015-07-09 11:37:11 +02:00
398a25f902 non-working commit of autoPyLoT functionality in overview window 2015-07-09 11:37:03 +02:00
120f2743d2 preparing call to autoPyLoT from QtPyLoT 2015-07-09 11:34:41 +02:00
Ludger Küperkoch
dde7d73d2a Improved text output on stdout for some control routines. 2015-07-09 09:17:10 +02:00
0236a19db1 [bugfix] the type of obspy.core.event.Event objects resource_id attribute is of type obspy.core.event.ResourceID but must be of type str; simple conversion fixed this 2015-07-08 15:00:51 +02:00
ec9840839e preserve the occurrence of the authority id in the filenames for write support of event information 2015-07-08 14:58:42 +02:00
05d38f583f corrected names for the output format to write event information on disk 2015-07-08 14:57:22 +02:00
cf944358dd removed unnecessary apply button 2015-07-07 11:23:29 +02:00
ca1b41511c draw picks from main window to the picking window 2015-07-07 11:23:01 +02:00
b8c92ed551 preparing to parse the picks to the picking window 2015-07-07 11:02:46 +02:00
b8aabfce99 implement changes proposed by deprecation warning from matplotlib 2015-07-07 10:49:42 +02:00
f99f5dbc8f unified icon set used for PyLoT in order to match the license restriction 2015-07-07 10:31:39 +02:00
Ludger Küperkoch
b5e279a318 removed fixed iplot flag. 2015-07-06 15:53:56 +02:00
Ludger Küperkoch
8463a87507 Introduced saftey factor for jackknife test to be less conservative. 2015-07-06 15:52:25 +02:00
29de650b4e reformatting code to avoid mixing up whitespace and tabulator characters 2015-07-06 10:57:34 +02:00
76f04bec6f [task] starting method to make PyLoT capable of restituting waveform data with given inventory xml files 2015-07-06 10:20:25 +02:00
a08c9e91e0 Ludger reported a Qt Problem that the MPLWidget was not recognized as an PySide.QtGui.QWidget; the problem was not reproducible on my system; maybe the problem was caused because getnoisewin is now imported from pick/utils and there matplotlib is imported for plotting reasons but to clarify the Qt backend used by matplotlib, it should not be imported before 2015-07-06 09:51:59 +02:00
97aaa0b0d3 convenience imports and implementation of initial pick set for S phases (including zooming to re-scaled horizontal data) 2015-07-02 10:40:01 +02:00
a5c1f68f03 [bugfix] draw all picked phases not only the actually picked one 2015-07-02 10:37:31 +02:00
5e6173b351 [bugfix] fixes an issue where the zoom action is not reset when setting the initial pick 2015-07-02 10:36:33 +02:00
d05e9320e5 make MPLWidget able to distinguish scaled and unscaled data; additionally make plotting noise levels more convenient 2015-07-02 10:35:36 +02:00
a46b0db583 new method to return the traceID for given channel names 2015-07-02 10:32:35 +02:00
f77ba344c3 make the implementation of the picking dialog widget initialization method better readable 2015-07-02 10:31:39 +02:00
e99d2630a1 moved static methods as functions to the util package for flexibility reasons 2015-07-02 10:29:50 +02:00
Ludger Küperkoch
0d8b6b4446 New key in pick dictionary: marker, indicating if pick has been rejected by checksignallength or checkZ4S. 2015-07-02 09:26:05 +02:00
Ludger Küperkoch
8282a7aa12 Marginal changes. 2015-07-02 09:23:51 +02:00
Ludger Küperkoch
82d9d45abf Marginal changes. 2015-07-01 15:37:07 +02:00
Ludger Küperkoch
3e81adfec6 Marginal changes. 2015-07-01 15:31:50 +02:00
Ludger Küperkoch
5bb616ffc5 Marginal changes. 2015-07-01 15:31:02 +02:00
Ludger Küperkoch
fb956f381a Implmented new quality control function checkZ4S. 2015-07-01 15:30:13 +02:00
1af88fbe85 default values changed to the defaults from autopylot 2015-06-29 16:23:46 +02:00
327a22818a added static method demeanWFData which simply returns the demeaned waveform stream object while the individual trace data are decreased by the average value of the waveform in a given window 2015-06-29 16:21:17 +02:00
9aa8a5bf13 function getSNR re-implemented in order to allow SNR calculation for stream object with more than one trace; the resulting SNR is the maximum SNR found over all traces in the stream object 2015-06-29 16:16:59 +02:00
0fcd6fab9d clean-up to meet coding conventions 2015-06-29 16:14:11 +02:00
a46fb88282 Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop 2015-06-28 19:35:08 +02:00
a854cf2762 use default filter options for all expected phases set up by the project leader 2015-06-28 19:35:01 +02:00
Ludger Küperkoch
99adb5ce9c Finialized new function checkPonset. 2015-06-26 15:59:50 +02:00
Ludger Küperkoch
0789f51d69 Implemented additional quality control function checkPonsets, using subfunction jackknife to skip misspicks. Yet not entirely finished. 2015-06-26 08:48:24 +02:00
Ludger Küperkoch
ab840fbcf1 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Try to solve conflict, only marginal changes.
Conflicts:
	pylot/core/pick/utils.py
2015-06-25 11:17:32 +02:00
Ludger Küperkoch
edd925af99 Some cosmetics. 2015-06-25 11:11:19 +02:00
e542aa70d9 doctesting added without having doctests inserted (pending) 2015-06-25 10:36:45 +02:00
4292197818 [bugfix] switching between zooming types now does not cause weird mouse event behavior anymore 2015-06-25 10:35:58 +02:00
ec3ecd04bb pick colors now depend on the type of phase picked; blueish colors for compressional wave (p) phases and reddish colors for shear wave (s) phases 2015-06-25 10:34:15 +02:00
a383f8c769 [bugfix] labels are now drawn correctly after picking an onset 2015-06-25 10:31:55 +02:00
cb5bd7dc09 differentiate between initial picks for p and s phases as they are picked from different components; zoom window determination for s phases not implemented yet 2015-06-25 10:30:59 +02:00
bb52f8ac83 moved the determination of the time resolution window to the utils module within the pick package 2015-06-25 10:27:00 +02:00
7635f790fd [bugfix] one filter parameter was type string and caused problems when parsing the parameters to the filter function of an obspy object 2015-06-25 10:24:17 +02:00
7ec28664b4 new function getResolutionWindow and doc testing added 2015-06-25 10:21:52 +02:00
Ludger Küperkoch
c9f07b6540 getSNR: demean using only mean determined from noise window. 2015-06-25 10:07:35 +02:00
Ludger Küperkoch
2cd7572ee4 Removed fixed plotting flag. 2015-06-24 16:44:15 +02:00
Ludger Küperkoch
7281220b55 wadaticheck: bug fixed, initialization of running index at wrong place. 2015-06-24 16:42:50 +02:00
Ludger Küperkoch
1abcb9d9a9 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop 2015-06-24 15:47:14 +02:00
Ludger Küperkoch
c68597ce62 Debugging. 2015-06-24 15:43:59 +02:00
c840e07635 filtering of the waveform in the picking window implemented (work in progress, still bugs inside which have to be located and fixed) 2015-06-24 14:33:19 +02:00
0d3fb8be93 [bugfix] false indentation corrected (broken program logic fixed) 2015-06-24 14:31:43 +02:00
8dd100792e [bugfix] obspy filter function do not use order but corners as parameter name (keyword changed for argument parser) 2015-06-24 14:30:48 +02:00
4548f361e4 Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop 2015-06-24 14:24:20 +02:00
Ludger Küperkoch
017532272f Modified: new function checksignallength added. 2015-06-24 14:17:43 +02:00