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

Fix 1246: var_list not being applied appropriately to obs_vars from networks #1249

Merged
merged 6 commits into from
Jul 8, 2024

Conversation

lewisblake
Copy link
Member

@lewisblake lewisblake commented Jul 8, 2024

Change Summary

  • colocator.py::_filter_var_matches_var_names() checks on string equality not subset inclusion
  • pyaerocom/aeroval/experiment_processor.py: code has been added such that if a var_list is given, only run against the obs networks which contain that variable
  • A test has been added which checks the above functionality

Related issue number

Fix #1246

Checklist

  • Start with a draft-PR
  • The PR title is a good summary of the changes
  • PR is set to AeroTools and a tentative milestone
  • Documentation reflects the changes where applicable
  • Tests for the changes exist where applicable
  • Tests pass locally
  • Tests pass on CI
  • At least 1 reviewer is selected
  • Make PR ready to review

Copy link

codecov bot commented Jul 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.33%. Comparing base (b1fa238) to head (77da745).
Report is 447 commits behind head on main-dev.

Additional details and impacted files
@@             Coverage Diff              @@
##           main-dev    #1249      +/-   ##
============================================
- Coverage     79.33%   79.33%   -0.01%     
============================================
  Files           133      133              
  Lines         20289    20308      +19     
============================================
+ Hits          16096    16111      +15     
- Misses         4193     4197       +4     
Flag Coverage Δ
unittests 79.33% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lewisblake lewisblake added this to the m2024-08 milestone Jul 8, 2024
@lewisblake lewisblake marked this pull request as ready for review July 8, 2024 12:42
Copy link
Member

@heikoklein heikoklein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks.

@heikoklein heikoklein merged commit 9784dda into main-dev Jul 8, 2024
8 checks passed
@lewisblake lewisblake deleted the fix1246 branch July 8, 2024 12:57
@lewisblake
Copy link
Member Author

After some subsequent testing I worry that this fix may have broken something with _sync_heatmaps_with_menu_and_regions, so will need to keep an eye out for that.

@heikoklein
Copy link
Member

I had problems with _sync_heatmaps_with_menu_and_regions before, i.e. I could not add EEA to a run which previously only had EBAS observations without deleting all data. (key error in the heatmaps-data)

@heikoklein
Copy link
Member

I'm not sure why the config runs ana.update_interface() before ana.run()? (ana.run() runs update_interface internally, if I understand correctly.)

@lewisblake
Copy link
Member Author

I had problems with _sync_heatmaps_with_menu_and_regions before, i.e. I could not add EEA to a run which previously only had EBAS observations without deleting all data. (key error in the heatmaps-data)

Yes this key error is the same one I encountered.

I'm not sure why the config runs ana.update_interface() before ana.run()? (ana.run() runs update_interface internally, if I understand correctly.)

Not quite sure either, I'd have to debug, but I expect it's to avoid key errors when writing the json files.

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.

DataCoverageError when running pyaeroval ana.run with var_list and multiple obs-setups
2 participants