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.

Sign up for GitHub

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

Jump to bottom

Replace BW and RGBCompositor with GenericCompositor #180

Merged
merged 25 commits into from Feb 10, 2018
Merged

Replace BW and RGBCompositor with GenericCompositor #180

merged 25 commits into from Feb 10, 2018

Conversation

pnuu
Copy link
Member

@pnuu pnuu commented Feb 2, 2018 •
edited

This PR replaces to existing compositors with a more generic one, and it makes it possible to create also LA and RGBA composites.

  • Tests added
  • Tests passed
  • Passes git diff origin/develop **/*py | flake8 --diff
  • Fully documented

@coveralls
Copy link

coveralls commented Feb 2, 2018 •
edited

Coverage Status

Coverage increased (+0.02%) to 57.726% when pulling 0bd8ae5 on feature_generic_compositor into 907d75f on bugfixes-xarray.

@pnuu pnuu changed the base branch from maint/0.8 to develop February 8, 2018 20:14
@djhoese djhoese self-assigned this Feb 9, 2018
@djhoese djhoese added the enhancement code enhancements, features, improvements label Feb 9, 2018
@djhoese
Copy link
Member

djhoese commented Feb 9, 2018

I've been working on updating this for xarray and I've come up with a couple questions after comparing how @mraspaud updated the previous version of the RGBCompositor and how @pnuu did the GenericCompositor.

  1. When should wavelength, calibration, units, and modifiers get removed from the metadata? Only for modes that aren't "L" and "LA" mode? For all?
  2. @mraspaud had done some stuff with calculating the times/mid-time of the input datasets, but it looks like it modifies the metadata of the inputs which I'm not a fan of. @mraspaud what was the end goal of this functionality? Is the 'time' being modified a dimension/coordinate or a metadata attribute?

pnuu and others added 13 commits February 9, 2018 20:45
@pnuu @djhoese
Add GenericCompositor
fda0be0
@pnuu @djhoese
Add depracition warnings to BWCompositor and RGBCompositor
ac59500
@pnuu @djhoese
Replace BWCompositor and RGBCompositor with GenericCompositor in YAML
8dc13a0
@pnuu @djhoese
Replace RGBCompositor with GenericCompositor in abi.yaml
58e3bd8
@pnuu @djhoese
Use GenericCompositor instead of RGBCompositor
be4bb03
@pnuu @djhoese
Use GenericCompositor in documentation
34b0fb0
@pnuu @djhoese
Add two missing deprecation warning lines
ecbe6fa
@djhoese
Update abi_l1b.yaml to allow C01 filename
9577b22 
C01 filename from Eumetcast has -{chid:6d}_0 suffix just like C02
@mraspaud @djhoese
Fix the nc_nwcsaf_pps reader config for file finding compatibility
5be0b0a
@mraspaud @djhoese
Make flake8 happy
e52f15c
@djhoese
Add missing nodata tiff tag
1ca18e1
@djhoese
Update GenericCompositor to be compatible with xarray
d41a213
@djhoese
Merge branch 'feature-generic-compositor-xarray' into feature_generic…
24c24a6 
…_compositor

# Conflicts:
#	satpy/composites/__init__.py
#	satpy/composites/sar.py
#	satpy/etc/composites/viirs.yaml
@djhoese djhoese changed the base branch from develop to bugfixes-xarray February 10, 2018 02:59
@djhoese
Copy link
Member

djhoese commented Feb 10, 2018

Ok so the commit history for all this got real messed up, but this should merge fine in to bugfixes-xarray. It includes the bug fixes that were merged to develop which is what I originally based my changes on. So...after we answer my questions and resolve the TODOs I added I think we can merge this.

@djhoese djhoese merged commit 6d4e6ae into bugfixes-xarray Feb 10, 2018
@djhoese djhoese deleted the feature_generic_compositor branch February 10, 2018 18:04
@djhoese djhoese changed the title Replace BW and RGBCompositor with a more generic one Replace BW and RGBCompositor with GenericCompositor Apr 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@djhoese djhoese

Labels
enhancement code enhancements, features, improvements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@pnuu @coveralls @djhoese @adybbroe @mraspaud