Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patches #330

Merged
merged 321 commits into from
Aug 29, 2024
Merged

Patches #330

merged 321 commits into from
Aug 29, 2024

Conversation

kkappler
Copy link
Collaborator

@kkappler kkappler commented Jun 6, 2024

No description provided.

kujaku11 and others added 30 commits July 1, 2024 08:34
- Added reference to MTH5 paper
- Capitalized `Python`
- Added some to acknowledgements a statement needed by USGS
- use increment() and reset() functions instead
- move some previously hard coded values (r0,u0, tolerance)
to be args.  This will eventually get populated from the config
- relates to #107
- merged regression params into mt_metadata patches branch
- modifies trnasfer_function_helpers to set regression params from the config
- rename check_number_of_observations_xy_consistent to be an underscore function
- make X, Y explicit arguments to RegressionEstimator, not kwargs
- add typehinting for their current xr.Dataset dtypes
- factor the assignement to numpy arrays into its own method _set_up_regression_variables
- move _check_number_of_observations_xy_consistent under _set_up_regression_variables()
- remove unneeded extra call to that in TRME_RR
- can't see any reason to allow it, and it adds a bunch of checks
later in the code
- add support for dataarray in regression
- add a test to confirm dataarray OK
- if we pass a dataarray made from .sel() of a single channel the
underlying numpy is 1D.  Force this to be 2D to make things smooth
- add attrs _input_channel_names, _output_channel_names to base regression
- allow these to be passed if desired, otherwise deduce from xarray, or assign to numpy array
- update m_estimator to use these attrs instead of assuming self._X, self._Y are xr.datasets
- see #203. It will be easier to initialize an mt_metadata TF to replace this
class rather than create a new version of TF
kkappler and others added 18 commits August 23, 2024 16:51
- sometimes when running this locally,
you have a v0.2.0 mth5 file.
- on github its v0.1.0.
- added handling for local tests
- move helper function for mth5 data path into the only moudle that uses
  it (synthetic/paths.py)
- reorganize tests
- comment out work in progress
- some zfiles and plots were landing in different folders
- now everything should land in data/parkfield
- prepping to make WindowedTimeSeries have an FFT method
- add apply_fft method to WindowedTimeSeries
- move fft_xr_ds into windowed_time_series from WindowingScheme
- simplify windowing scheme,
  - remove duplicate logic for dataarrays and datasets
  - comment out apply_spectral_density_calibration (no longer used)
- make process_mth5 (time_series_helpers) call new WindowedTimeSeries method
updating to main branches for testing
changed mth5 main to master
- have just merged move_to_mth5, sans ipynb
- these will manual merge soon
- uncomment jupyter tests
@kkappler
Copy link
Collaborator Author

Before merging in patches, we merged move_to_mth5 into patches. This was slightly complicated due to ipynbs changing. A git merge got a little messy, so we reverted to the last good commits of patches and move_to_mth5 and did this:

Patches well behaved pre-merge is: 8988ff5\

move_to_mth5 well beahved before merge d94bc18

  • forked d94bc18 to a branch named merging
  • on merging, checked out the 4 conflict ipynbs from patches, and committed.
  • merged merging into patches.

Then manually fixed notebooks and committed on patches.

When the smoke cleared, there were a few files that didn't seem to have merged as desired -- it is not clear why, at least a few of these were worked on quite recently. The files were:

test_process_parkfield_run.py
test_process_parkfield_run_rr.py
test_fourier_coefficients.py
test_multi_run.py
test_processing.py

Minor changes were applied to these, taking the latest, correct code from both branches.

- otherwise the output makes the user think there is a warning.

Also, switch to patches on mth5 to test hotfix there
- also add draft CITATION.cff (pending hash)
@kkappler kkappler merged commit ca403e6 into main Aug 29, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants