Fix issue 153 #154
Merged
Fix issue 153 #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Factor some complexity out of make_mth5_from_fdsn_client - factor (duplicated code) into stream_boundaries [Issue(s): #156]
Codecov ReportPatch coverage:
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. Additional details and impacted files@@ Coverage Diff @@
## fix_issue_147 #154 +/- ##
=================================================
+ Coverage 59.73% 59.79% +0.06%
=================================================
Files 128 128
Lines 13019 13022 +3
=================================================
+ Hits 7777 7787 +10
+ Misses 5242 5235 -7
☔ View full report in Codecov by Sentry. |
Six instances of the same block of three lines replaced with one call. [Issue(s): #153]
Also, in loop where there is only 1 run in runlist, but multiple streams from FDSN, cast start,end from times[0],[1] so that the rest of the logic is same as other cases [Issue(s): #153]
Clean up logic for case n_runs==1 We were checking n_times > 1, with an elif n_times == 1 BUT this logic lay within an elif following a check that n_runs==n_times Since to be in this block at all, means that n_runs!=n_times, then if n_runs==1 we know that n_times!=1, so we don't need to check/handle that [Issue(s): #153]
This method is key to merging wrangle_runs_into_containers_v1 and wrangle_runs_into_containers_v2, because a v1 mth5 object can get a survey group with the same method as can a v2 survey_group Thus we can replace: run_group = m.stations_group.get_station(station_id).add_run(run_id) & run_group = survey_group.stations_group.get_station(station_id).add_run(run_id) with: run_group = mth5_obj_or_survey.stations_group.get_station(station_id).add_run(run_id) [Issue(s): #153]
- cast start_times and end_times to UTCDateTime in stream_boundaries, as they are only accessed in that form later - add run_timings_match_stream_timing method to greatly simplify len(run_list) != n_times case logic. [Issue(s): #153]
replaced with get_station_streams method [Issue(s): #153
also simplify interact logic at end of make [Issue(s): #153]
Remove cruft. [Issue(s): #153]
|
This is ready to merge - if possible adding test coverage would be nice, but not required. |
kujaku11
reviewed
Jun 21, 2023
This was referenced Jun 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While fixing this, may as well fix issue #147 (its probably related)
Also, we should
mth5.clients.fdsn