Velest #18
Closed
Velest #18
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
miili
requested changes
Jul 11, 2024
miili
requested changes
Jul 13, 2024
src/qseek/exporters/velest.py
Outdated
Comment on lines
67
to
68
| with file.open("w") as fp: | ||
| fp.write(CONTROL_FILE_TPL.format(**self._asdict())) |
There was a problem hiding this comment.
Use file.write_text(CONTROL_FILE_TPL.format(**self._asdict()) here.
src/qseek/exporters/velest.py
Outdated
Comment on lines
24
to
85
| min_pick_semblance = FloatPrompt.ask("Minimum pick confidence", default=0.3) | ||
|
|
||
| min_pick_semblance = FloatPrompt.ask("Minimum pick confidence", default=0.2) |
There was a problem hiding this comment.
rename to min_event_semblance. Use default values from self. Here self.min_event_semblance.
src/qseek/exporters/velest.py
Outdated
Comment on lines
177
to
180
| if float(d) / 1000 not in dep_velest: | ||
| dep_velest.append(float(d) / 1000) | ||
| vp_velest.append(float(vp[i]) / 1000) | ||
| vs_velest.append(float(vs[i]) / 1000) |
There was a problem hiding this comment.
Instead of using 1000 introduce a constant KM = 1e3. This gives context what is happening here.
Consider using a zip: for d, vp, vs in zip(dep, vp, vs)
src/qseek/exporters/velest.py
Outdated
| ) | ||
| file.write("\n") | ||
| if count_p == 0 and count_s == 0: | ||
| logging.warning("Warning:No phases obesered for event{event.time}, removed") |
There was a problem hiding this comment.
Log suggestion:
logger.warning("Removing event {event.time}: No phases observed")
src/qseek/exporters/velest.py
Outdated
| fpout.write("\n") | ||
|
|
||
| @staticmethod | ||
| def make_velmod_file(modname: Path, vp: list, vs: list, dep: list): |
There was a problem hiding this comment.
please complete typing for list... I suppose this is list[float]?
This can be a simple function, no need for a staticmethod.
src/qseek/exporters/velest.py
Outdated
Comment on lines
188
to
197
| def velest_location(self, location: Location) -> str: | ||
| if location.effective_lat < 0: | ||
| velest_lat = f"{location.effective_lat:7.4f}S" | ||
| else: | ||
| velest_lat = f"{location.effective_lat:7.4f}N" | ||
| if location.effective_lon < 0: | ||
| velest_lon = f"{location.effective_lon:8.4f}W" | ||
| else: | ||
| velest_lon = f"{location.effective_lon:8.4f}E" | ||
| return velest_lat, velest_lon |
There was a problem hiding this comment.
This can be a simple function, not a class method. self is not used.
miili
reviewed
Jul 14, 2024
src/qseek/exporters/velest.py
Outdated
Comment on lines
123
to
127
| for event in catalog: | ||
| if event.semblance < min_pick_semblance: | ||
| continue | ||
| if event.receivers.n_observations(phase_p) < min_receivers_number: | ||
| continue |
There was a problem hiding this comment.
Also filter out events which are too close to the border.
miili
reviewed
Jul 16, 2024
src/qseek/exporters/velest.py
Outdated
Comment on lines
175
to
186
| dep = search.ray_tracers.root[0].earthmodel.layered_model.profile("z") | ||
| vp = search.ray_tracers.root[0].earthmodel.layered_model.profile("vp") | ||
| vs = search.ray_tracers.root[0].earthmodel.layered_model.profile("vs") | ||
| dep_velest = [] | ||
| vp_velest = [] | ||
| vs_velest = [] | ||
| km = 1000.0 | ||
| for d, vpi, vsi in zip(dep, vp, vs, strict=False): | ||
| if float(d) / km not in dep_velest: | ||
| dep_velest.append(float(d) / km) | ||
| vp_velest.append(float(vpi) / km) | ||
| vs_velest.append(float(vsi) / km) |
There was a problem hiding this comment.
I dont understand this part.
Why not:
depths = [depth/KM for depth in search.ray_tracers.root[0].earth
velocity_p = [vp/KM for vp in search.ray_tracers.root[0].earthmodel.layered_model.profile("vp")]
velocity_s = [vs/KM for vsin search.ray_tracers.root[0].earthmodel.layered_model.profile("vs")]There was a problem hiding this comment.
Hi, thank you so much for the review! This is because the velocity model for velest requires only one value for each depth, but the velocity model of qseek is layered model with two velocity at one depth, so I need to remove another value.
src/qseek/exporters/velest.py
Outdated
Comment on lines
202
to
234
| with outfile.open("a") as file: | ||
| file.write( | ||
| f"{event.time:%y%m%d %H%M %S.%f}"[:-4] | ||
| + f" {lat} {lon} {event.depth/1000:7.2f} {mag:5.2f}\n" | ||
| ) | ||
| count_p = 0 | ||
| count_s = 0 | ||
| for rec, dectection in observed_arrivals: | ||
| if dectection.observed.detection_value < 0.4: | ||
| quality_weight = 3 | ||
| elif dectection.observed.detection_value < 0.6: | ||
| quality_weight = 2 | ||
| elif dectection.observed.detection_value < 0.8: | ||
| quality_weight = 1 | ||
| else: | ||
| quality_weight = 0 | ||
| if dectection.phase.endswith("P"): | ||
| phase = "P" | ||
| count_p += 1 | ||
| else: | ||
| phase = "S" | ||
| count_s += 1 | ||
| traveltime = (dectection.observed.time - event.time).total_seconds() | ||
| file.write( | ||
| f" {rec.station:6s} {phase:1s} {quality_weight:1d} {traveltime:7.2f}\n" | ||
| ) | ||
| file.write("\n") | ||
| if count_p == 0 and count_s == 0: | ||
| logger.warning("Removing event {event.time}: No phases observed") | ||
| with outfile.open("r") as file: | ||
| lines = file.readlines() | ||
| with outfile.open("w") as file: | ||
| file.writelines(lines[:-2]) |
There was a problem hiding this comment.
Here store the file output in a string
write_out = f"{event.time}..."
for rec_detection in observed_arrivals:
write_out += f"..."
if count_p or count_s:
with outfile.open("a") as file:
file.write(write_out)
src/qseek/exporters/velest.py
Outdated
| allow_low_velocity: bool = False | ||
|
|
||
| def write_config_file(self, file: Path): | ||
| with file.open("w") as fp: |
src/qseek/exporters/velest.py
Outdated
Comment on lines
87
to
101
| min_receivers_number = IntPrompt.ask( | ||
| "Minimum number of receivers (P phase)", default=10 | ||
| ) | ||
| min_distance_to_border = FloatPrompt.ask( | ||
| "Minimum distance to border(m)", default=500.0 | ||
| ) | ||
| min_p_phase_confidence = FloatPrompt.ask( | ||
| "Minimum pick probability for P phase", default=0.3 | ||
| ) | ||
| min_s_phase_confidence = FloatPrompt.ask( | ||
| "Minimum pick probability for S phase", default=0.3 | ||
| ) | ||
| max_traveltime_delay = FloatPrompt.ask( | ||
| "Maximum difference between theoretical and observed arrival", default=2.5 | ||
| ) |
src/qseek/exporters/velest.py
Outdated
Comment on lines
210
to
217
| if dectection.observed.detection_value < 0.4: | ||
| quality_weight = 3 | ||
| elif dectection.observed.detection_value < 0.6: | ||
| quality_weight = 2 | ||
| elif dectection.observed.detection_value < 0.8: | ||
| quality_weight = 1 | ||
| else: | ||
| quality_weight = 0 |
There was a problem hiding this comment.
Consider using
np.digitize(dectection.observed.detection_value, [1.0, 0.8, 0.6, 0.4, 0.0])
|
Merged in |
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.
add velest exporter