Features

.flake8

@@ -3,6 +3,6 @@ ignore = E501, W605, W503, E203, F401, E722
 #,E402, E203,E722 
 #F841, E402, E722
 #ignore = E203, E266, E501, W503, F403, F401
-max-line-length = 88
+max-line-length = 80
 max-complexity = 18
 select = B,C,E,F,W,T4,B9

.github/workflows/tests.yml

@@ -18,7 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, "3.11"]
+#        python-version: [3.8, 3.9, "3.10", "3.11"]
 #        python-version: ["3.10", ] 
 
     steps:
@@ -33,17 +34,19 @@ jobs:
     - name: Install Env
       run: |
         python --version
+        echo $CONDA_PREFIX
         conda install -c conda-forge pytest pytest-cov certifi">=2017.4.17" pandoc
         pip install -r requirements-dev.txt
-        # pip install git+https://github.com/kujaku11/mt_metadata.git@main
-        # pip install git+https://github.com/kujaku11/mth5.git@master
-        # pip install git+https://github.com/MTgeophysics/mtpy-v2.git@main
+        pip install git+https://github.com/kujaku11/mt_metadata.git@features
+        pip install git+https://github.com/kujaku11/mth5.git@features
         pip install git+https://github.com/MTgeophysics/mtpy-v2.git@main
         pip uninstall aurora -y
 
     - name: Install Our Package
       run: |
+        echo $CONDA_PREFIX
         pip install -e .
+        echo "Install complete"
         conda list
         pip freeze
 

aurora/config/config_creator.py

@@ -13,7 +13,7 @@
 from aurora.config.metadata import Processing
 from aurora.sandbox.io_helpers.emtf_band_setup import EMTFBandSetupFile
 
-from mt_metadata.transfer_functions.processing.aurora.window import Window
+from mt_metadata.transfer_functions.processing.window import Window
 
 
 SUPPORTED_BAND_SPECIFICATION_STYLES = ["EMTF", "band_edges"]
@@ -108,9 +108,7 @@ def determine_band_specification_style(self) -> None:
             logger.info(msg)
             self._emtf_band_file = BANDS_DEFAULT_FILE
             self._band_specification_style = "EMTF"
-        elif (self._emtf_band_file is not None) & (
-            self._band_edges is not None
-        ):
+        elif (self._emtf_band_file is not None) & (self._band_edges is not None):
             msg = "Bands defined twice, and possibly inconsistently"
             logger.error(msg)
             raise ValueError(msg)
@@ -152,6 +150,8 @@ def create_from_kernel_dataset(
 
           Theoretically, you could also use the number of decimations implied by bands_dict but this is sloppy, because it would assume the decimation factor.
 
+         3. 2024-12-29 Added setting of decimation_obj.stft.per_window_detrend_type = "linear"
+          This makes tests pass following a refactoring of mt_metadata.  Could use more testing.
 
         Parameters
         ----------
@@ -178,9 +178,7 @@ def create_from_kernel_dataset(
             Object storing the processing parameters.
         """
 
-        processing_obj = Processing(
-            id=kernel_dataset.processing_id
-        )  # , **kwargs)
+        processing_obj = Processing(id=kernel_dataset.processing_id)  # , **kwargs)
 
         # pack station and run info into processing object
         processing_obj.stations.from_dataset_dataframe(kernel_dataset.df)
@@ -209,9 +207,7 @@ def create_from_kernel_dataset(
                 decimation_factors[0] = 1
             if num_samples_window is None:
                 default_window = Window()
-                num_samples_window = num_decimations * [
-                    default_window.num_samples
-                ]
+                num_samples_window = num_decimations * [default_window.num_samples]
             elif isinstance(num_samples_window, int):
                 num_samples_window = num_decimations * [num_samples_window]
             # now you can define the frequency bands
@@ -241,11 +237,13 @@ def create_from_kernel_dataset(
                 decimation_obj.output_channels = output_channels
 
             if num_samples_window is not None:
-                decimation_obj.window.num_samples = num_samples_window[key]
+                decimation_obj.stft.window.num_samples = num_samples_window[key]
             # set estimator if provided as kwarg
             if estimator:
                 try:
                     decimation_obj.estimator.engine = estimator["engine"]
                 except KeyError:
                     pass
+            decimation_obj.stft.per_window_detrend_type = "linear"
+
         return processing_obj