marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity
2,958 Commits 9 Branches 3 Tags
8c46b1ed18644d0e49fcadbca597dc7d1c2ab56a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Darius Arnold dd2efe7514 Remove unused code of old PickingParameters 2019-04-09 22:13:49 +02:00
Darius Arnold 49f7ba3eab Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop 2019-04-09 20:41:08 +02:00
Darius Arnold d4fa0a7697 Replace all usages of signal_length_params with corresponding pickparams 2019-04-09 20:34:06 +02:00
Darius Arnold 7b2973982d Replace all usages of first_motion_params with corresponding pickparams 2019-04-09 18:45:07 +02:00
Darius Arnold dce00caf25 Replace all usages of s_params with corresponding pickparams 2019-04-09 18:41:41 +02:00
Darius Arnold 076c498fab Replace all usages of p_params with corresponding pickparams 2019-04-09 18:39:24 +02:00
Darius Arnold 281e92e2a9 Add init to AR3Ccf that extracts parameters from pickparam 2019-04-09 18:19:26 +02:00
Darius Arnold cd63896060 Add init to ARHcf that extracts parameters from pickparam 2019-04-09 18:18:17 +02:00
Darius Arnold 790cf803d7 Add init to ARZcf that extracts parameters from pickparams 
t1, t2 cant be extracted in the init function since they are not the same during the first and the second instantiation.
 2019-04-09 17:43:30 +02:00
Darius Arnold ab6e74c482 Add init to HOScf that extracts parameters from pickparams 2019-04-09 17:30:05 +02:00
Darius Arnold d45a5ccf0d Change checkZ4S so it extracts the required parameters 2019-04-09 17:05:51 +02:00
Darius Arnold c45f52510b Change checksignallength so it extracts the required parameters 
from the PylotParameter instance itself. The function is only used in one place, so this change wont break anything else.
 2019-04-09 17:00:43 +02:00
Darius Arnold 8a4be00ac6 Make correct_iplot use real_bool 2019-04-09 16:55:11 +02:00
Darius Arnold 242d8e3b1d Remove unwanted indentation in autopickstation test input file 2019-04-09 16:49:01 +02:00
Darius Arnold 531d33946f Remove needless bool checking 
in Operator returns a bool that can directly be returned.
 2019-04-09 16:46:20 +02:00
Darius Arnold af43d247c6 Bugfix #270: Create path for Symmetric picking error so it can be drawn 
The function shape() will generate the missing path without side effects.
 2019-03-22 10:42:16 +01:00
Darius Arnold f0e2fdb470 [bugfix]/[improvement] handle station id lacking location, related to #266 
Unpack depending on length of station id after split, if something unexpected happens, initialise with default values.
This is related to https://ariadne.geophysik.ruhr-uni-bochum.de/trac/PyLoT/ticket/266. This should fix the missing station information in the title of the TuneAutopicker waveform plot.
 2018-12-07 13:12:13 +01:00
Darius Arnold f892225229 [bugfix] Strip star from event path when getting text from eventBox 
See https://ariadne.geophysik.ruhr-uni-bochum.de/trac/PyLoT/ticket/264
 2018-12-07 12:47:06 +01:00
Darius Arnold 2a22409145 Change "not a in b" to more readable "a not in b", add comments in Metadata class 2018-12-07 11:24:11 +01:00
Darius Arnold 45949afca6 [bugfix] #267 Remove stations from ArrayMap whose metadata files were removed 
Fixes https://ariadne.geophysik.ruhr-uni-bochum.de/trac/PyLoT/ticket/267
 2018-12-07 11:19:54 +01:00
Darius Arnold f1690edf71 [Bugfix]: Fix stationlist in TuneAutopicker dialog, partial fix of #266 
Remove the channel from the station id
 2018-12-07 09:44:12 +01:00
Darius Arnold 6a0c1dda9d [Bugfix]: Fix plot title in TuneAutopicker, partial fix of #266 
For some reason the network.station.location.channel string wasn't split.
 2018-12-07 09:34:47 +01:00
Darius Arnold 3abeabc75c [bugfix] File wasn't closed explicitly, add implicit close by with statement 2018-11-30 11:20:47 +01:00
Darius Arnold 48d5406639 [Add] section describing the event info CSV file 2018-11-30 11:03:30 +01:00
Darius Arnold 0964139799 Merge branch 'develop' into feature/documentation 2018-11-30 10:27:42 +01:00
Darius Arnold 6afb61b666 [change] order to Day/Month/Year when reading csv file for event info 2018-11-30 10:26:57 +01:00
Darius Arnold 815a18f2f3 [bugfix] error in check during loading of event info csv file 
Original condition didn't check for eventID in event.origins.
 2018-11-30 10:21:54 +01:00
Darius Arnold 718172dcd1 [minor] change axis label for comparison dialog 2018-11-30 09:50:14 +01:00
Darius Arnold 5e6d2e7211 [Bugfix] Merge traces treating overlaps as data instead of gaps 
Could not open the Pickwindow on some stations. 
Gaps were merged so that overlapping values were marked as gaps, which lead to an error when those traces were processed. Method 1 takes data from traces instead, see https://docs.obspy.org/packages/autogen/obspy.core.trace.Trace.__add__.html
 2018-11-30 09:42:22 +01:00
Darius Arnold b01c15d755 Fix errors, add picking window description 2018-10-23 11:47:02 +02:00
Darius Arnold 86035d3cd6 Add description of comparison options 2018-10-19 12:01:25 +02:00
Darius Arnold 4ab453899a Add linebreak that was missing in exported document 2018-10-15 14:38:07 +02:00
Darius Arnold 6c3998285b Add invisible character to increase size of column in table 
Otherwise icons were squished when exporting
 2018-10-15 14:37:39 +02:00
Darius Arnold 974be21a06 Correct some errors, add some information 2018-10-12 11:22:19 +02:00
Darius Arnold 637b821582 Add description of Waveform Plot buttons 2018-10-01 12:55:54 +02:00
Darius Arnold d0503d4261 Add description of the tune autopicker window 2018-09-24 12:54:32 +02:00
Darius Arnold 18308a7168 Add description of jackknife and wadati check 2018-09-24 11:02:23 +02:00
Darius Arnold f56087b68e More work on GUI.md 2018-09-17 12:00:55 +02:00
Darius Arnold 7dbc2cb334 Worked on GUI documenation, added images 2018-09-14 23:31:36 +02:00
Darius Arnold 2d233a7099 Merge branch 'develop' into feature/documentation 2018-09-14 21:46:29 +02:00
Darius Arnold 6936cfcfa6 [bugfix] Taupy didn't check return of get_coordinates 
For a station not in the metadata, get_coordinates would return None which wasn't checked for.
This includes a test for a station which is not in metadata.
 2018-08-13 22:42:19 +02:00
Darius Arnold 96adbddeba [remove] unused parameter in create_arrivals 
The station id is no longer passed into the function and used to retrieve the station coordinates, but the id is taken from the vertical stream instead.
 2018-08-13 22:37:48 +02:00
Darius Arnold dcd0bc40d7 [remove] old autopickstation code 2018-08-13 22:35:38 +02:00
Darius Arnold b7d3568498 [bugfix] Taupy used even if disabled when p start time > 0 
If Taupy was disabled, but pstart was larger than zero, the and would lead to the function that modifies starttimes not exiting. This resulted in taupy being used even though it was disabled when the p starttime was above 0.
 2018-08-09 10:03:25 +02:00
Darius Arnold 9929e3d441 [change] testPickingResults.py in accordance with bugfix 2018-08-08 19:25:41 +02:00
Darius Arnold 45370e2c67 [bugfix] PickingResults raised incorrect error on missing attribute 
Accessing a non existing attribute raised a KeyError instead of an AttributeError, breaking methods that relied on the correct error type. Maybe this fixes the __setstate__ bug during event picking from GUI.
 2018-08-08 19:25:11 +02:00
Darius Arnold d4e2f4a070 [bugfix] maxDiff not correctly set in test_autopickstation 2018-08-08 09:11:34 +02:00
Darius Arnold 146da1d794 [change] Quality class determination documentation improvement 
Also change order of expected/actual values in test assert methods to improve output of test function.
The first parameter is supposed to be the expected value, the second one the actual result.
 2018-08-07 13:58:59 +02:00
Darius Arnold d3fee396b2 [modify] test_autopickstation to work with new return value 2018-08-03 13:50:41 +02:00
Darius Arnold 0c4085ed76 [bugfix] station name was in dictionary instead of a list item for autopickstations return value 
Old implementation of autopickstation returned a list containing a dcitionary with results as a first value and a string with the station name as a second value. The new version used to return a single dict with a key/value station name pair, which the calling code could not unpack. The new implementation now also returns a list with picking results and station name.
 2018-08-03 13:50:14 +02:00
Darius Arnold 2b9cf655ae [change] autopickstation works with new Metadata class 2018-08-03 13:47:46 +02:00
Darius Arnold 86f6584d91 Modify test_autopickstation's MockMetadata to work with the new Metadata class 2018-08-03 13:23:52 +02:00
Darius Arnold a45e817213 Merge remote-tracking branch 'origin/develop' into feature/refactor 2018-08-03 11:55:13 +02:00
Darius Arnold b9cf219b39 Adding/modifying documentation in autopick.py 2018-08-03 11:05:42 +02:00
Darius Arnold 7b2ae2fa8f Disable NonLinLoc in testing parameter file 2018-08-03 11:01:58 +02:00
Darius Arnold 108ba80b83 [minor] disable length limit when printing diff of picking results 
By default the difference printed when two picking result dictionaries are compared is limited in length, this disables the limit.
 2018-08-03 11:00:53 +02:00
Darius Arnold 8dcea2a8c3 [change] PickingResults now only stores actual results, PickingContainer stores intermediary values 
PickingResults now stores only the actual results of picking, which are returned from the autopickstation function. 
To store intermediary results during picking, the new class PickingContainer is used.
 2018-08-03 10:59:10 +02:00
Darius Arnold 076115f7f5 [add] Station A106 to tests 
This station has invalid values recorded on both N and E component, but a pick can still be found on Z
 2018-07-30 14:32:32 +02:00
Darius Arnold d14e789e97 Modify test to test that picking is possible for station with only vertical component 2018-07-30 14:31:56 +02:00
Darius Arnold 7bbcb489bf [refactor] add current_figure attribute 
This instance attribute holds the current figure,which removes the need for an external function to extract the correct figure from the fig_dict and the need to pass the figure into instance methods (it can now be directly accessed by the attribute).
 2018-07-30 14:28:21 +02:00
Darius Arnold 97458b5b42 [minor] small code changes 2018-07-30 14:08:49 +02:00
Darius Arnold b4316ae717 [refactor] improving S pick code by extracting functions 2018-07-30 13:36:09 +02:00
Darius Arnold c89e47ac43 [change] Extract function that calculates cuttimes 2018-07-30 12:43:56 +02:00
Darius Arnold da2b1ed133 [change] Enable picking on traces with only one vertical component 
Only the P pick will be calculated
 2018-07-30 12:03:33 +02:00
Darius Arnold 09721c7bb9 [add] station CH.FIESA to test_autopickstation 2018-07-20 15:06:15 +02:00
Darius Arnold 653e7c9b9a [remove] unused function for creating an error message for autopickstation tests 2018-07-20 15:05:42 +02:00
Darius Arnold 1b815a27b8 [add] HidePrint can be configured to skip hiding for quick debugging of tests 2018-07-20 15:04:48 +02:00
Darius Arnold 7fe5d0f7a3 [remove] Redundant checks for missing waveform data 
Missing waveform data is now handled before picking starts, so it is not necessary to check during picking.
 2018-07-20 14:50:27 +02:00
Darius Arnold 61b14dc770 [change] Create clean PickingResults instance with only required values 
During picking, intermediary values were saved in p_results or s_results PickingResults instance.
Additionally the PickingResults class contained members that were only used during picking but not when returning the results, thus wasting space after picking, because they stayed in the instance. 
Now autopickstation generates a clean PickingResults containing only the members that are expected in the results.
 2018-07-20 14:49:10 +02:00
Darius Arnold 153beff663 [add] tests for picking with missing trace in stream 2018-07-20 13:02:57 +02:00
Darius Arnold 318ca25ef8 [add] handling missing traces 
either a missing vertical or missing both vertical traces in the wfstream will fail picking and return None. This is the same behaviour as before refactoring.
 2018-07-20 13:00:19 +02:00
Darius Arnold 27f5a0d50c [remove] unused function, check was moved to init method 
In the init method of autopickstation the N trace will be copied to the E trace or reversed if one of them is missing, so checking for it during S picking has become redundant.
 2018-07-17 14:01:23 +02:00
Darius Arnold 85b34177c4 [add] default values for parameters of AutoPickStation init method 2018-07-17 13:59:46 +02:00
Darius Arnold 775d3de46c Change whitespace, add comments/documentation 2018-07-17 13:59:13 +02:00
Darius Arnold 6d26338f2e Decrease indentation in pick_s_phase 
Instead of checking if(condition){DoSomething()}; check if (!condition){ErrorOut()}; DoSomething();.
This allows to decrease the indentation of the potentially large codeblock DoSomething().
 2018-07-17 13:56:25 +02:00
Darius Arnold 02873938cb [change] minSlope value decreased due to difference in slope calculation 2018-07-17 11:37:29 +02:00
Darius Arnold d84be68694 [add] tests for file where metadata has changed due to changed instruments 2018-07-17 11:18:07 +02:00
Darius Arnold 787c46eeaf [add] tests for file where metadata is available at multiple time intervals 2018-07-17 11:17:23 +02:00
Darius Arnold da29b286f1 [add] tests for read_single_file 2018-07-17 10:56:53 +02:00
Darius Arnold 7734650d2e Move the metadata files used ofr testing into own folder 2018-07-17 10:34:42 +02:00
Darius Arnold f5c1fea159 [Change] use HidePrints to clean output of test results 2018-07-13 23:25:11 +02:00
Darius Arnold 6ae5a213d1 [update] Metadata docstrings improved 2018-07-13 23:10:47 +02:00
Darius Arnold 10aa0360bc [Add] Utility class to hide prints during testing 
Provides with HidePrints context manager and @HidePrints.hide decorator
 2018-07-13 21:33:45 +02:00
Darius Arnold c308415aa5 Move test_autopickstation to subdirectory in pylot/tests 2018-07-13 09:45:57 +02:00
Darius Arnold 2c92f6f2fd Merge branch 'develop' into feature/refactor 2018-07-13 09:28:50 +02:00
Darius Arnold 869ede96a9 Rewrite check4rotated function to work with new Metadata class 2018-07-12 09:46:52 +02:00
Darius Arnold 82ac08157c [bugfix] azimuth <45° was misattributed as E instead of N trace in check4rotated 2018-07-10 21:41:07 +02:00
Darius Arnold 0dc4d64826 Rewrite check4rotated function to work with new Metadata class 2018-07-10 20:22:25 +02:00
Darius Arnold 51f2ded063 [add] basic unittests for Metadata class 2018-07-10 17:07:46 +02:00
Darius Arnold 1ff50c000e Decrease indentation by returning from error condition 2018-07-06 16:17:07 +02:00
Darius Arnold 71d8626fa3 [bugfix] parameters tpred2z and tdet2z were unused 2018-07-06 11:10:02 +02:00
Darius Arnold 67cf1f9010 Change tests to work with updated AIC 2018-07-06 10:51:50 +02:00
Darius Arnold b1a1e8924a Merging picker.py did not work correctly 2018-07-06 10:51:17 +02:00
Darius Arnold 5258a7e9b4 Merge remote-tracking branch 'origin/develop' into feature/refactor 2018-07-06 09:49:52 +02:00
Darius Arnold 4581025b4d Bugfix: typo l/1 in figure name 2018-07-03 13:56:29 +02:00
Darius Arnold 59e67b51d5 Bugfix where not giving origin with taupy would still use negative starttime 2018-07-03 13:55:51 +02:00
Darius Arnold 80835bc56e Transfer plotting of results in GUI after picking 2018-07-03 13:55:04 +02:00
Darius Arnold 86419220e2 Minor changes in autopick.py 2018-06-29 15:57:58 +02:00
Darius Arnold 68b2917e7f Refactor quality control of initial pick into own function 2018-06-29 15:56:32 +02:00
Darius Arnold d4e279aeba Refactor taupy usage 2018-06-29 14:21:03 +02:00