Commit Graph

1039 Commits

Author SHA1 Message Date
3705eb567b [fix] overcome numerical instabilities
due to the usage of large absolute values (timestamp) on time axis the estimation of the expectation value gets instable
2016-05-09 12:06:47 +02:00
4480854ee5 [workaround] set minimum difference of mpp with lpp and epp
this workaround elevates the difference between the uncertainty-picks and the mpp to a minimum value of three samples (needed for a reasonable pdf represetation of the pick)
2016-05-06 12:04:27 +02:00
d8a764db31 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-05-04 10:22:06 +02:00
f58c5a5f9d merge correction 2016-05-04 10:21:39 +02:00
fd27a43110 fixing import problems 2016-05-03 15:09:51 +02:00
41991c5d81 [edit] further restructuring and bugfixing 2016-05-03 13:54:59 +02:00
a82c1d39c6 [fix] fixing obvious problems in advance 2016-05-03 09:35:31 +02:00
ecb3670aeb Merge branch 'master' into develop
Conflicts:
	scripts/pylot-reasses-pilot-event.py
2016-05-03 08:58:33 +02:00
210d39882d further development on the reassessment routines for PILOT data 2016-05-03 08:46:13 +02:00
ae0c08eeb2 Merge branch 'master' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot 2016-05-02 14:10:41 +02:00
8cb4f11bf8 [edit] implementing reassessment functions 2016-05-02 14:10:11 +02:00
ec42e1bd15 added first version of fmtomo_parallel script 2016-05-02 12:08:58 +02:00
dbe47690eb Merged branch develop into master 2016-05-02 11:31:17 +02:00
ddb1ad4a15 Resolved conflicts fmtomoUtils 2016-05-02 11:28:56 +02:00
Marcel Paffrath
f906211064 fmtomo2vtk merged with fmtomoUtils 2016-05-02 11:19:06 +02:00
edd8920d54 WALL-E --- Small robot, big job! Restructuring the code and preparing implementation of a re-assessment tool for PILOT phases. 2016-05-01 21:10:30 +02:00
df44979337 [reorganize] some reorganization done to hand program to partner 2016-04-28 14:18:42 +02:00
37f9292c39 renamed class method 2016-04-28 14:03:32 +02:00
c489fad6ba [bugfix] comparison should not through an KeyError due to missing picks 2016-04-12 14:50:21 +02:00
416f4c7aa7 [bugfix] special method __nonzero__ should always return type bool 2016-04-12 14:48:57 +02:00
6181829ef6 [bugfix] make uncertainties from autoPyLoT may be corrupted
consequently there is minimum uncertainty gap between mpp and lpp/epp
2016-04-12 14:47:49 +02:00
4a9c02e1d1 [closes 195] in principle comparing automatic and manual picks works 2016-04-12 04:55:04 +02:00
9359338e81 [refs #195] make autoPyLoT export automatic picks in QuakeML format 2016-04-11 13:59:32 +02:00
9519372247 [bugfix] autopick accidently interchanged latest and earliest possible pick 2016-04-11 13:57:59 +02:00
2139674afa [bugfix] guessed that checking the same variable twice was not intended
instead of checking for mpickX's twice it was probably meant to check for lpickX's value
2016-04-11 12:39:46 +02:00
a9cd53886b [enhancement, task] there was no routine to read obs pick files available; default values for autopicking should be the same for all parts of PyLoT, thus defaults should be defined only once 2016-04-11 05:47:38 +02:00
2a8729c39b [refs #195] changed some default parameters for plotting the histograms 2016-04-08 14:35:20 +02:00
f15e27e81d [refs #195] hitsogram plots implemented for expectation and standard deviation 2016-04-07 16:29:29 +02:00
b5345bb5d3 [refs #195] implementation of histogram plots 2016-04-07 15:47:11 +02:00
27e334609c [refs #195] plotting method for Comparison object implemented 2016-04-06 11:27:09 +02:00
5f9a9242d1 [refs #195] realized an object oriented implementation of comparison
comparing pdf represented picks should be easy, thus objects returning everything needed are implemented; histograms and other plots are planned next
2016-04-05 22:19:55 +02:00
a475b366d4 [adresses #195] comparison dictionaries can now be compiled from QuakeML files 2016-03-31 14:29:29 +02:00
5fcaddb028 [adresses #195] started to implement comparison function 2016-03-31 09:00:49 +02:00
1fecec1696 [adresses #195] read_data now working correctly on QuakeML data 2016-03-31 08:50:09 +02:00
bd2bad7367 [adresses #195] task related new function introduced 2016-03-30 15:25:06 +02:00
76788c0223 [refs #195] initial import of new interfaces module 2016-03-30 11:45:49 +02:00
7a712ca37c [fixes #194] automatic filtering works also when switching phase selection
Switching the phase selection without picking the last onset did not filter according to the selected phase filter parameter. With this revision a displaying bug showing muliple '( filtered, filtered, filtered)' statements due to switching the phases is fixed as well.
2016-03-30 09:12:56 +02:00
d7cfd0d176 WALL-E: Einmal aufräumen und zurück! 2016-03-30 08:14:58 +02:00
320b7b7219 [bugfix] pick blocker was not reset after phase was picked 2016-03-29 14:42:51 +02:00
2d66248cf9 [fixes #172] now also in overview all horizontals are plotted 2016-03-29 14:06:57 +02:00
fef1a95391 [fixes #193] fixed bug introduced by component mapping
fixes a bug which was introduced in revision b8d680f54f
2016-03-29 11:40:16 +02:00
4c5b58dbf1 [addresses #190, closes #192] handles unknown picker information
pick tag is set to 'Unknown' for loaded data that do not provide picker information when saved with PyLoT prior to revision 06576586c6
2016-03-29 08:24:32 +02:00
cee48146d0 [closes #178] makes use of the new status variable pick_block introduced as filter_block to solve #174 2016-03-29 07:58:20 +02:00
a1c79b554a Merge branch '174' into develop 2016-03-25 05:08:09 +01:00
65df2c7dde [closes #174] now the filter button in the picking window is no toggle button anymore and has no effect when in picking mode 2016-03-25 05:07:18 +01:00
06576586c6 [edit] make use of new pick tag
find out the person's name for tagging the picks set within PyLoT
2016-03-23 12:00:54 +01:00
722e21f582 [edit] avoid catching unspecified Exceptions
specific Exception catchment is better than general; additionally errors are raised for better debugging control
2016-03-23 11:57:07 +01:00
31d56cb287 [edit] introducing picker tag
New tag introduced to distinguish between pickers (either person's or programs name)
2016-03-23 11:48:58 +01:00
438b2706b7 [edit] removed calls to names marked as deprecated
with the last update of obspy some modules and functions names will be removed in future releases and consequently have been marked as deprecated; PyLoT now uses the desired names
2016-03-22 10:52:20 +01:00
cad6ed2274 [edit] exit if no waveform files are selected
PyLoT will only start if waveformfiles are selected
2016-03-22 10:49:06 +01:00
7225da87db [edit] reformatted code
Code indentation and PEP 8 violations automatically reduced with IDE tool
2016-03-22 08:42:09 +01:00
fa6626d62a [edit] catch reference before assignment
charactersitic function variable might be referenced before they are assigned; now they are assigned as None and calls to assert help finding wrong definitions if not assigned correctly within if clause
2016-03-21 12:06:11 +01:00
d954c3bbe8 [edit] restructuring autopicking module
renamed several function and classes, moved script files to scripts
2016-03-21 11:14:16 +01:00
b8d680f54f 189 Channels shown in wrong order. 2016-03-18 15:35:12 +01:00
15080f1699 [fix] fixed the nonzero test for pdf definition that all values have to be greater than zero and the integration over the whole interval has to evaluate to 1 with given precision 2016-03-09 11:21:33 +01:00
a5fe838514 added a str representation for the pdf class 2016-03-09 06:22:26 +01:00
f3467221cc finished implementation of summation of two independent variables represented by a pdf 2016-03-09 06:21:48 +01:00
2de79eac77 [change] moved recursive function for broadcasting pdf in a new shape into the class' body 2016-03-09 06:19:41 +01:00
c651b5ca78 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2016-03-08 20:36:12 +01:00
db4dd47daa [bugfixes] made some fixes to the subtraction method; in some cases ValueErrors are raised which are now handled but raised as Warning 2016-03-08 20:35:56 +01:00
e6f404a219 [closes #188] picks are set correctly now
earliest and latest possible picks are now derived from the actually displayed (in some cases filtered) waveforms
2016-03-07 10:15:42 +01:00
9f7f00314a [closes #187] pdf methods for some values like expectation and plotting ready 2016-03-04 14:13:44 +01:00
e6b5848f36 [add] untested implementations of standard deviation and probability value determination methods to class ProbabilityDensityFunction 2016-03-04 06:27:11 +01:00
78a5a5117a [add] new function added which return the index of the value of an array which is nearest to a desired value 2016-03-04 06:25:17 +01:00
4606f84809 [new] implementing comparison methods into pdf class 2016-03-03 15:14:17 +01:00
18785edf68 [fixes #186] filteroptions are only parsed if they are not NoneType 2016-03-03 14:02:49 +01:00
c2168dbef3 [fixes #185] filtering of waveforms now conserved for picking 2016-03-03 11:12:27 +01:00
6108519acb [closes #182]
noiselevel now determined as the maximum of the absolute values of the noisewindow (holds also for signallevel); now the SNR and noiselevel is determined from the filtered waveform
2016-03-03 10:40:20 +01:00
848d11270b [fixes #181] now picking on horizontal components 1, 2 and N,E is possible 2016-03-02 13:37:40 +01:00
827a0da210 [fix] imports to obspy's read_events changed due to deprecated naming of function readEvents 2016-03-02 13:36:18 +01:00
c09a3271f9 make use of new option to getSNR 2016-03-02 11:08:14 +01:00
8c7a2af2db [fix] do not try to proceed if no picks are available 2016-03-02 11:07:32 +01:00
5e26519d66 [fix] avoid usage of hardly programmed indices 2016-03-02 11:06:31 +01:00
96ea0d7ac3 improved readability of formula 2016-03-01 12:26:56 +01:00
e7b454bae8 [edit] just style related changes 2016-02-16 08:47:42 +01:00
3ee221b8eb [edit] implementation of difference of two independent random variable as the correlation of the PDFs completed; summation pending due to unclear axis determination of the resultant PDF 2016-02-15 20:15:54 +01:00
f2cad2e151 [edit] changed implementation name from findlimits to commonlimits which is probably more intuitive for the user along with a new signature using other instead of giving the limits in advance 2016-02-15 20:15:54 +01:00
d5e16d64da [edit] implemented method to derive limits for the special methods for addition and subtraction 2016-02-15 20:15:54 +01:00
2956f3b733 [edit] subclassing has been substituted by classmethod fromPick opportunity for creating a PDF object 2016-02-15 20:15:54 +01:00
e7a5e388f6 [edit] implementation of probability density function interface ready for testing 2016-02-15 20:15:54 +01:00
303a5f9cf0 [edit] probability density function superclass implemented due to the different character of these functions 2016-02-15 20:15:54 +01:00
ada9f4e780 [new] started implementation of probability density representation routines 2016-02-15 20:15:54 +01:00
sebastianp
0d0b43103b editing of Docstring 2016-02-03 14:49:16 +01:00
sebastianp
8f6f6cf8b6 completition of Docstring 2016-02-03 14:35:07 +01:00
Marcel Paffrath
8893a8ec6b statistic plots added 2016-02-01 11:18:42 +01:00
5170a0b1c6 [new] implementation of a probability density function representation of the pick (untested) 2016-02-01 06:13:17 +01:00
70f2761003 [reformat] reformatted indentation 2016-02-01 06:11:25 +01:00
Marcel Paffrath
ce705888f1 bugfixes and other not further specified changes 2016-01-19 10:31:06 +01:00
Marcel Paffrath
7edee1266a Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
Conflicts:
	pylot/core/active/activeSeismoPick.py
2016-01-19 10:29:45 +01:00
Marcel Paffrath
acd9e942f9 improved SNR plots 2016-01-04 15:47:46 +01:00
Marcel Paffrath
3c1be950b9 removed most of the folm = 0.6 default values 2016-01-04 15:47:05 +01:00
Marcel Paffrath
3b4e1dcd1e added changes for manual picks 2016-01-04 15:46:24 +01:00
Ludger Küperkoch
5f0e59d95a Additional comments to make the code clearer. 2015-12-14 09:34:56 +01:00
Ludger Küperkoch
f6930618f2 calcMoMw: modified for calculating Mo and Mw using metric units. calcsourcespec: modified correction for attenutation using an exponential including Q(f). 2015-12-11 15:53:35 +01:00
Marcel Paffrath
0b1f16866b added plotHist 2015-12-11 11:08:06 +01:00
Ludger Küperkoch
534718aadf Improved figure caption, shows vertical trace including station ID and channel even if no or only bad pick is available. 2015-12-10 15:50:36 +01:00
Ludger Küperkoch
d2b39ff078 Improved some print output, bugfix: avoids getting negative value for pstart when iterative re-picking. 2015-12-10 14:30:38 +01:00
537b18774a [fix] fixed multiple calls to print by print one formatted message 2015-12-10 13:16:44 +01:00
Marcel Paffrath
17c3dd4f69 plot2dttc textposition changes etc 2015-12-09 14:03:20 +01:00
Marcel Paffrath
29c14fb512 added plot2dttc mode to plotAllShots 2015-12-09 14:02:58 +01:00
Marcel Paffrath
943432dfb3 updated plot of 2d ttcs 2015-12-09 13:39:58 +01:00
Marcel Paffrath
a866bf5228 added methods for auto to manual comparisons 2015-12-09 12:01:41 +01:00
Marcel Paffrath
490ad0f0c2 bugfix: setParameters for shot not working, because survey needed parameters on init 2015-12-09 11:18:49 +01:00
Marcel Paffrath
ee16cef901 renaming 2015-12-08 13:50:19 +01:00
Marcel Paffrath
c9a75ca2d0 renaming 2015-12-08 13:50:08 +01:00
Marcel Paffrath
feab50af28 bugfixes + renaming 2015-12-08 13:49:47 +01:00
Marcel Paffrath
cb3f9804f9 implemented setting manual picks from file 2015-12-08 11:34:55 +01:00
Marcel Paffrath
cdf924e8c2 bugfix: earliest and latest pp not changed when repicking manually 2015-12-07 11:47:57 +01:00
Marcel Paffrath
5083c5a876 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-12-07 11:21:50 +01:00
Marcel Paffrath
1a9f68f741 bugfixes (minSNR was 1, problem in for loop with break?) 2015-12-07 11:21:11 +01:00
Marcel Paffrath
d5b277db99 implemented cleanBySPE and plotSPE 2015-12-07 11:20:30 +01:00
Ludger Küperkoch
0c7c5645b6 Implemented correction for attenuation in calcsourcespek. 2015-12-04 16:05:53 +01:00
sebastianp
74794061f6 alphabetical sorting of functions and editing docstring 2015-12-03 17:20:05 +01:00
0d8324a4ae Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-12-03 15:25:24 +01:00
2b90c73f9f changed quotes for consistency 2015-12-03 15:25:04 +01:00
Ludger Küperkoch
67e37fe530 Initialization of picks dictionary including Mo, Mw, w0 and fc. 2015-12-03 14:59:39 +01:00
Ludger Küperkoch
d6ae82e070 Included rotation of seismograms using Obspys stream.rotation for a more reliable estimation of source spectra. 2015-12-03 14:57:44 +01:00
Marcel Paffrath
df5f0f41b4 comment 2015-12-03 12:21:18 +01:00
Marcel Paffrath
69d3f43db9 code commenting 2015-12-03 12:19:34 +01:00
1a5eed5559 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
Conflicts:
	pylot/core/pick/autopick.py
2015-12-02 22:05:47 +01:00
f3ba22b235 [new] introduced verbose flag to suppress to much output during auto picking (slows down especially to GUI triggered auto picking process) 2015-12-02 19:17:04 +01:00
Ludger Küperkoch
46cbe96a43 Extended class MoMw for calculating source spectrum. New functions calcsourcespec, calcMoMw and run_calcMoMw implemented. 2015-12-02 10:12:37 +01:00
Ludger Küperkoch
40f38ebf84 Removed calculation of source spectrum from autopick, as azimuth and angle of incidence are necessary and thus a location is needed for a reliable calculation of the source spectrum. Source spectrum is now calculated after locating the event. 2015-12-02 10:09:17 +01:00
Ludger Küperkoch
30970b8451 Modified class MoMw: new functio run_calcMoMw using subfunction calcMoMw, gets hypocentral distances from NLLoc-location file. Returns modified pick dictionary including individual seismic moments and corresponding moment magnitudes. 2015-12-01 15:41:37 +01:00
ed7a323c50 [new] reverting stdout redirection after auto picking is done; added method finalizeAutoPick for purposes to be done after the auto picking thread has finished 2015-12-01 05:04:26 +01:00
Ludger Küperkoch
41a495371d Changed average radiation pattern for P-waves to exact definition in Aki and Richards, 1980. 2015-11-30 16:45:29 +01:00
Ludger Küperkoch
23b9fda5e4 New class M0Mw for calculating seismic moment and moment magnitude. 2015-11-30 16:35:58 +01:00
Ludger Küperkoch
9f93c25aa8 Put additional parameters w0 and fc to picks dictionary. 2015-11-30 14:41:59 +01:00
Ludger Küperkoch
466e0020a6 w0fc: Plateau omega0 and corner frequency are are now taken as the median of previously calculated values from different functions synthsourcespek and fitSourceModel. 2015-11-30 13:27:08 +01:00
Ludger Küperkoch
957d2ccfe7 New function to derive plateau and corner frequency of observed source spectrum. Additional to scipys implicit function curve_fit, as seismic moment is sensitive to estimated plateau of source spectrum, which in turn is sensitivec to estimated corner frequency. 2015-11-30 13:14:23 +01:00
5f8569c7d9 [bugfix] now catching all cases 2015-11-30 09:53:55 +01:00
d67556796c [bugfix] plotting autopicks has to be done within thread because code outside the threads scope is executed in parallel 2015-11-30 09:52:31 +01:00
ae21c9a149 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-26 05:18:10 +01:00
50a5586355 [bugfix] autoPickListWidget is directly attached to the main window and autoScrolls to the latest entry 2015-11-26 05:17:26 +01:00
Ludger Küperkoch
7f05568f65 Bugfix: Captured error, if earllatepicker returns None for lpickS1/2, epickS1/2, and Serror1/2. 2015-11-24 13:35:23 +01:00
Ludger Küperkoch
ab8775c58d PragPicker: Upweight of left pick. 2015-11-24 13:31:14 +01:00
Marcel Paffrath
a2eb5868a7 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-24 12:38:16 +01:00
Marcel Paffrath
b310062687 changed SNR threshold (scaled by exp function) 2015-11-24 12:37:53 +01:00
f1cee0cbfd [fixes #168] now any TypeError is handled by try ... except clause 2015-11-24 11:30:58 +01:00
7a9c44198f [bugfix] currently set data structure now selected in QComboBox widget 2015-11-24 11:05:19 +01:00
69efd4d411 finished implementation of location tool tab in properties window (used to modify settings from the GUI) 2015-11-24 10:27:35 +01:00
Ludger Küperkoch
0a1d177d60 Additional picking parameters to be temporary modified for iterative picking. 2015-11-23 16:40:24 +01:00
cffca858aa Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-23 15:07:50 +01:00
8a4ac82c3a [new] added a new location tools tab to the properties widget (not working yet) 2015-11-23 15:07:43 +01:00
Marcel Paffrath
fdd7ff003b [bugfix] SNR minimum for setFittedSNR is now 1 2015-11-23 13:01:36 +01:00
4fdcf1cf60 [bugsearch] trying to fix UnpicklingError by clearing GUI element containing attributes 2015-11-23 12:11:04 +01:00
1f1d0aa118 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-23 11:41:14 +01:00
851da7eb15 re-design of the properties tabbed window 2015-11-23 11:41:04 +01:00
Marcel Paffrath
56a89ae386 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-23 11:38:36 +01:00
Marcel Paffrath
bd0d96c2ff changed input for generateFMTOMOinpu 2015-11-23 11:35:15 +01:00
Ludger Küperkoch
8a16643bd8 Marginal changes. 2015-11-20 16:02:25 +01:00
Ludger Küperkoch
67ac580778 Suppressed print output in setParam. 2015-11-20 15:53:25 +01:00
Ludger Küperkoch
07bbc2926e New function iteratepicker for iterative picking. 2015-11-20 15:51:22 +01:00
386131e9f3 started implementation of NLLoc properties selection into manualPyLoT; new utility routine to find indices throughout QComboBox' items 2015-11-20 09:06:52 +01:00
Marcel Paffrath
7f85ed99c0 bugfix textoutput 2015-11-19 11:38:54 +01:00
Marcel Paffrath
82089a6490 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-18 17:22:51 +01:00
Marcel Paffrath
657472f576 added shifting of SNR threshold along y axis 2015-11-18 17:22:18 +01:00
Marcel Paffrath
0a00aab3ba changed pickerror to SPE for exportFMTOMO
minor additions
2015-11-18 17:21:29 +01:00
Marcel Paffrath
abc45a4c8f bugfix: getPickError (/2)
added earliest and latest to plot_traces
2015-11-18 17:20:46 +01:00
Ludger Küperkoch
96fcc2470b Modified pick dictionary: writes dummy onset times (start of seismic trace) into dictionary in order to derive theoretical onset times later needed for iterative picking. 2015-11-18 11:12:53 +01:00
Ludger Küperkoch
e1c2629f97 Modified writephases for NLLoc: writes dummy onset times (start of seismic trace) into phase file in order to derive theoretical onset times later needed for iterative picking. 2015-11-18 11:11:10 +01:00
Ludger Küperkoch
8592557613 Minor changes 2015-11-18 10:28:46 +01:00
Ludger Küperkoch
1d6d786dbb Modyfied picksExport: additional parameter locrt to choose location routine, i.e. phase-file format. 2015-11-17 17:05:36 +01:00
Marcel Paffrath
f192a72ad7 slimmed down the code 2015-11-17 10:29:32 +01:00
Marcel Paffrath
b700940f54 bugfix: seismicshot dictionary for repick button was overwritten 2015-11-17 10:28:18 +01:00
Marcel Paffrath
160ee81c44 improved and fixed delete button 2015-11-16 12:11:42 +01:00
Marcel Paffrath
647fddb904 bugfix: could not highlight pick after it was deleted in plot_traces 2015-11-16 12:09:00 +01:00
Marcel Paffrath
0f1427a9f0 first try of shot.plot_traces delete button 2015-11-16 11:50:09 +01:00
Marcel Paffrath
78d61a9822 added writeVTK files 2015-11-16 11:49:57 +01:00
Marcel Paffrath
0a0ab4bfa9 added checkerboard to fmtomo utils and added different checkerboard ampl. functions 2015-11-16 11:48:45 +01:00
Marcel Paffrath
165419cb88 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-12 19:09:08 +01:00
Marcel Paffrath
db3429e780 improved text output and fixed some bugs 2015-11-12 19:08:33 +01:00
Marcel Paffrath
d53e4b7c0c implemented a function that generates all grids for FMTOMO 2015-11-12 13:24:48 +01:00
Marcel Paffrath
d611b8606e finished generatePropgrid, changed getThetaPhiFromArray output to the right order 2015-11-12 11:25:51 +01:00
d933c30148 [bugfix] now the whole line containing LOCFILES is replaced with a modified string using the getPatternLine utility function 2015-11-12 09:25:33 +01:00
1f383579b4 [new] added a new utility function to find a pattern in a text file and returning the particular line as a string or None if not found 2015-11-12 09:23:28 +01:00
Ludger Küperkoch
a1fbea98be Debuged: checks minimum number of zero crossings before calculating source spectrum from P pulse. 2015-11-11 16:11:25 +01:00
Marcel Paffrath
39a12bd1d1 bugfix: rays2vtk last point not displayed 2015-11-11 15:45:56 +01:00
Marcel Paffrath
54cb6d2f9a added interfaces generation for FMTOMO from SeisArray
still working on propgrid generation for FMTOMO from SeisArray
2015-11-11 15:36:43 +01:00
Ludger Küperkoch
b5b7453214 Debuged writephases: if first motion (fm) is None, ? is written to NLLoc-phase file. 2015-11-11 15:09:50 +01:00
Ludger Küperkoch
2ea2db0791 Debuged: Calculates real onset times for pick dictionary only, if earliest and latest possible pick are not None. 2015-11-11 14:53:50 +01:00
Ludger Küperkoch
c01c88b657 earllatepicker: take half wavelength for getting earliest possible pick as suggested by Diehl et al.. 2015-11-11 14:51:14 +01:00
Ludger Küperkoch
cd26d85f7c Debuged: Checks additionally for component 3 if component Z not available. 2015-11-11 14:10:44 +01:00
Ludger Küperkoch
7ed1ad2983 Debuged indentation error at lines 341 to 345. 2015-11-11 14:04:06 +01:00
Ludger Küperkoch
4f67e3e31a Debuged: Checks additionally for component 3 if component Z not available. 2015-11-11 13:58:25 +01:00
Marcel Paffrath
7aedc35c16 first implementation of a checkerboard modification for a given vgrids.in file 2015-11-09 16:12:12 +01:00
Marcel Paffrath
2a15ec75d2 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-05 12:20:12 +01:00
Marcel Paffrath
c28e2bda2a added surface2VTK 2015-11-05 12:19:56 +01:00
06337b4d66 [bugsearch] tried to figure out why topography correction did not work for fmtomo model output 2015-11-05 12:16:08 +01:00
Marcel Paffrath
5d378f9f0f Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-05 10:14:34 +01:00
Marcel Paffrath
f2fc5e5071 working on implementing of gradients for different layers 2015-11-05 10:13:04 +01:00
5ee85d89a3 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-05 09:17:29 +01:00
afb7a189ad [new] preparing new modules for location routines planned to be implemented 2015-11-05 09:17:20 +01:00
0f8b228931 [new] module "nll" containing utility function to handle NonLinLoc input and output as well as execution of the external program from python 2015-11-05 09:16:11 +01:00
d69db63132 [new] started to implement a new package containing modules for location purposes featuring different external location programs like NonLinLoc 2015-11-05 09:14:36 +01:00
Ludger Küperkoch
f738160a8b Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	autoPyLoT.py
2015-11-05 08:47:06 +01:00
Ludger Küperkoch
3fa4a31978 Extended function writephases for writing phases to HYPO71-input phase file. 2015-11-04 16:53:03 +01:00
Marcel Paffrath
d8a59ac81d bugfix: not yet done: problem with cusioning around topography 2015-11-04 10:13:52 +01:00
Marcel Paffrath
dc4d19ba88 bugfixes: formula for gradients in multiple layers for vgrid corrected, fixed issue with integer division that would lead to a wrong spacing 2015-11-04 10:04:05 +01:00
Marcel Paffrath
c5fc9ee89c Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-11-03 10:31:18 +01:00
Marcel Paffrath
c28641d629 changed plot traces for presentation (SNR, _drawStream etc.) 2015-11-03 10:29:09 +01:00
Marcel Paffrath
1c08152e65 vkt file "rel" changed to changes in percent 2015-11-03 10:27:06 +01:00
Marcel Paffrath
bcc6c8a73d enabled use of parameter file "mygrid.in" for generation of a starting model, prepared generation of vgrid model from array dimensions 2015-11-03 10:25:52 +01:00
Marcel Paffrath
1b95ed0da7 relative velocities in percent 2015-10-30 12:37:41 +01:00
Marcel Paffrath
422a76012e vert. exag for surface plot 2015-10-30 12:00:03 +01:00
Marcel Paffrath
84f1639e59 added transformation to vgrids vtk with relative values using vgrids.in and vgridsref.in from FMTOMO 2015-10-30 11:56:45 +01:00
809b6bea61 make use of the new __nonzero__ method 2015-10-30 08:33:05 +01:00
0cd427486c [modified] updateUi method for the FilterOptionsDlg has been restructured and simplified 2015-10-30 06:16:00 +01:00
9b1f7541fd [added] isSorted function for iterables 2015-10-30 06:12:23 +01:00
43f9e6fe0d [added] __nonzero__ method for boolean tests on FilterOptions object 2015-10-30 06:11:15 +01:00
Ludger Küperkoch
94448297bb Marginal changes. 2015-10-28 09:13:30 +01:00
Ludger Küperkoch
a315384417 New function writephases.py for writing phases files for various kinds of location routines. Started with NLLoc-phase file. 2015-10-27 10:01:07 +01:00
Ludger Küperkoch
c0ca788c5c Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	autoPyLoT.py
	pylot/core/analysis/magnitude.py
	pylot/core/pick/utils.py
2015-10-27 09:25:29 +01:00
Ludger Küperkoch
69a023e048 Introduced new function for writing phases files for various kinds of location tools. 2015-10-26 09:41:02 +01:00
Ludger Küperkoch
158da88523 Marginal changes only. 2015-10-26 09:40:07 +01:00
Marcel Paffrath
30680a7820 cosmetics for array plots (title, legend) 2015-10-22 10:54:24 +02:00
Marcel Paffrath
0223869df6 commit after recover of scripts from .pyc:
implementation of buttons for plotAllPicks/region object, printOutput to figure window, refreshing now with SNR, PE, SPE
2015-10-21 13:35:02 +02:00
Marcel Paffrath
eb873fd69f commit after recover of scripts from .pyc:
code cleanup after transfer of functions to survey methods
2015-10-21 13:33:47 +02:00
Marcel Paffrath
52e304b0af commit after recover of scripts from .pyc:
repick button for .plot_traces implemented
2015-10-21 13:33:11 +02:00
Marcel Paffrath
2b3e40b3b6 commit after recover of scripts from .pyc:
figure refreshing of plotAllPicks, cbar, survey.recover()
2015-10-21 13:30:55 +02:00
0064ff1889 Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2015-10-20 12:02:01 +02:00
Marcel Paffrath
21ffbcabc8 deleted obsolete files 2015-10-20 10:52:05 +02:00
Marcel Paffrath
2dd36379a8 prepared application of stealth mode 2015-10-20 10:38:00 +02:00
Marcel Paffrath
195352a7ca merged 3 files
Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

Conflicts:
	pylot/core/active/activeSeismoPick.py
	pylot/core/active/seismicshot.py
	pylot/core/active/surveyPlotTools.py
2015-10-19 13:15:28 +02:00
0a7b02c04a general clean-up 2.0 even more checks made and issues resolved 2015-10-19 11:25:15 +02:00
Marcel Paffrath
793e09910c *** empty log message *** 2015-10-19 10:34:45 +02:00
Marcel Paffrath
4498c72c90 repick button for plot_traces 2015-10-19 10:33:51 +02:00
0fa701a878 general code clean-up 2015-10-19 05:32:10 +02:00
b49206407a Merge using remote to resolve conflicts 2015-10-18 21:23:09 +02:00
Marcel Paffrath
d78b0f1cff added polygon selection!! 2015-10-13 18:41:55 +02:00
Marcel Paffrath
07395802b7 minor changes (plotAllPicks: inkByVal) 2015-10-12 15:13:08 +02:00
Marcel Paffrath
ddbfb03f27 *** empty log message *** 2015-10-12 15:10:53 +02:00
Marcel Paffrath
cdd33d7e2f improvements, refreshFigure() now possible and done automatically after deleting of picks 2015-10-12 14:40:29 +02:00
Marcel Paffrath
34abad46e2 refresh plot for plotAllPicks by replotting 2015-10-12 14:39:40 +02:00
Marcel Paffrath
a19cdc4fee implied stealth mode 2015-10-12 13:00:09 +02:00
Marcel Paffrath
0adc890aef implied stealth mode to suppress huge amounts of text output 2015-10-12 12:59:53 +02:00
Marcel Paffrath
5bb50d5be4 added captions for shotnumbers in plotArray2D 2015-10-08 12:16:03 +02:00
Marcel Paffrath
8e7b2e5b8a removed pick_backup. implied flag for each pick instead 2015-10-07 14:53:10 +02:00
Marcel Paffrath
c71e28ecb7 shots no longer None if they are removed, but flag = 0 2015-10-07 14:51:20 +02:00
Marcel Paffrath
09f0cd3e71 shots no longer None if they are deleted, but flag = 0 2015-10-07 14:51:00 +02:00
Marcel Paffrath
cfbcc9d362 bugfix: if invalid ray is generated by FMTOMO it will be skipped 2015-10-06 11:42:33 +02:00
4109696800 meet style conventions 2015-10-02 06:06:26 +02:00
Marcel Paffrath
7120a20499 changed vtk file structure for vgrids, making it way faster and smaller and enabling paraview to display surfaces instead of points 2015-10-01 17:30:57 +02:00
Marcel Paffrath
3d3cac7085 cosmetics 2015-10-01 17:21:18 +02:00
Marcel Paffrath
9faf42fd79 bugfix: import numpy missing 2015-10-01 17:20:01 +02:00
Marcel Paffrath
376d1cc6f8 name change 2015-10-01 13:14:44 +02:00
Marcel Paffrath
c58bb53002 output cosmetics 2015-10-01 11:33:39 +02:00
Marcel Paffrath
4399004277 cleaned up surveyUtils 2015-10-01 11:32:28 +02:00
Marcel Paffrath
3e7e693a66 changed structure: plot option -> survey method 2015-10-01 11:30:46 +02:00
Marcel Paffrath
2c1e9c63d8 changed structure: added plot option to survey methods 2015-10-01 11:30:16 +02:00
Marcel Paffrath
dd5523b2ac *** empty log message *** 2015-10-01 10:35:47 +02:00
Marcel Paffrath
e41b1436f9 *** empty log message *** 2015-09-30 14:32:08 +02:00
Marcel Paffrath
e78314461b *** empty log message *** 2015-09-30 14:31:55 +02:00
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