Skip to content

AVHRR changed reflectance channel uncertainty units #5

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

Open
patternizer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AVHRR changed reflectance channel uncertainty units #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions fiduceo/fcdr/test/writer/templates/avhrr_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_add_original_variables(self):
Assertions.assert_geolocation_variables(self, ds, 409, 5)
Assertions.assert_quality_flags(self, ds, 409, 5)

time = ds.variables["Time"]
time = ds.variables["time"]
self.assertEqual((5,), time.shape)
self.assertTrue(np.isnan(time.data[2]))
self.assertTrue(np.isnan(time.attrs["_FillValue"]))
Expand Down Expand Up @@ -73,12 +73,12 @@ def test_add_easy_fcdr_variables(self):
ds = xr.Dataset()
AVHRR.add_easy_fcdr_variables(ds, 5)

self._assert_correct_refl_uncertainty_variable(ds, "u_independent_Ch1", long_name="independent uncertainty per pixel for channel 1", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "u_structured_Ch1", long_name="structured uncertainty per pixel for channel 1", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "u_independent_Ch2", long_name="independent uncertainty per pixel for channel 2", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "u_structured_Ch2", long_name="structured uncertainty per pixel for channel 2", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "u_independent_Ch3a", long_name="independent uncertainty per pixel for channel 3a", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "u_structured_Ch3a", long_name="structured uncertainty per pixel for channel 3a", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "u_independent_Ch1", long_name="independent uncertainty per pixel for channel 1", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "u_structured_Ch1", long_name="structured uncertainty per pixel for channel 1", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "u_independent_Ch2", long_name="independent uncertainty per pixel for channel 2", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "u_structured_Ch2", long_name="structured uncertainty per pixel for channel 2", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "u_independent_Ch3a", long_name="independent uncertainty per pixel for channel 3a", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "u_structured_Ch3a", long_name="structured uncertainty per pixel for channel 3a", units="1")

self._assert_correct_bt_uncertainty_variable(ds, "u_independent_Ch3b", long_name="independent uncertainty per pixel for channel 3b")
self._assert_correct_bt_uncertainty_variable(ds, "u_structured_Ch3b", long_name="structured uncertainty per pixel for channel 3b")
Expand Down Expand Up @@ -227,9 +227,9 @@ def test_add_full_fcdr_variables(self):
self._assert_correct_counts_uncertainty_variable(ds, "Ch5_u_Ce", "Ch5 Uncertainty on earth counts")
self._assert_earth_counts_pdf(ds, "Ch5_u_Ce")

self._assert_correct_refl_uncertainty_variable(ds, "Ch1_u_Refl", long_name="Ch1 Total uncertainty on toa reflectance", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "Ch2_u_Refl", long_name="Ch2 Total uncertainty on toa reflectance", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "Ch3a_u_Refl", long_name="Ch3a Total uncertainty on toa reflectance", units="percent")
self._assert_correct_refl_uncertainty_variable(ds, "Ch1_u_Refl", long_name="Ch1 Total uncertainty on toa reflectance", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "Ch2_u_Refl", long_name="Ch2 Total uncertainty on toa reflectance", units="1")
self._assert_correct_refl_uncertainty_variable(ds, "Ch3a_u_Refl", long_name="Ch3a Total uncertainty on toa reflectance", units="1")

self._assert_correct_bt_uncertainty_variable(ds, "Ch3b_u_Bt", long_name="Ch3b Total uncertainty on brightness temperature")
self._assert_correct_bt_uncertainty_variable(ds, "Ch4_u_Bt", long_name="Ch4 Total uncertainty on brightness temperature")
Expand Down
6 changes: 3 additions & 3 deletions fiduceo/fcdr/writer/templates/avhrr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ def add_original_variables(dataset, height):
tu.add_geolocation_variables(dataset, SWATH_WIDTH, height)
tu.add_quality_flags(dataset, SWATH_WIDTH, height)

# Time
# time
default_array = DefaultData.create_default_vector(height, np.float64, fill_value=np.NaN)
variable = Variable(["y"], default_array)
tu.add_fill_value(variable, np.NaN)
tu.add_units(variable, "s")
variable.attrs["standard_name"] = "time"
variable.attrs["long_name"] = "Acquisition time in seconds since 1970-01-01 00:00:00"
dataset["Time"] = variable
dataset["time"] = variable

# relative_azimuth_angle
default_array = DefaultData.create_default_array(SWATH_WIDTH, height, np.float32, fill_value=np.NaN)
Expand Down Expand Up @@ -308,7 +308,7 @@ def _create_refl_uncertainty_variable(height, long_name=None, structured=False):
default_array = DefaultData.create_default_array(SWATH_WIDTH, height, np.float32, fill_value=np.NaN)
variable = Variable(["y", "x"], default_array)

tu.add_units(variable, "percent")
tu.add_units(variable, "1")
variable.attrs["long_name"] = long_name

if structured:
Expand Down